From 60e5b328df1b6ce88c5f5c91004f8fb870bcde4a Mon Sep 17 00:00:00 2001
From: ycastonguay <ycastonguay@mp4m.org>
Date: Thu, 26 Sep 2013 20:41:42 -0400
Subject: [PATCH] Android: Added AddMarker presenter/view/fragment. Fixed crash
 bug with notification bar for Android 4.0.3.

Related to issue #406.
---
 MPfm/MPfm.Android/Classes/Application.cs      |    5 +-
 .../Classes/Fragments/AddMarkerFragment.cs    |  109 ++
 ...listFragment.cs => AddPlaylistFragment.cs} |   22 +-
 .../Classes/Fragments/MarkersFragment.cs      |    6 +-
 .../Classes/Services/NotificationService.cs   |   29 +-
 MPfm/MPfm.Android/MPfm.Android.csproj         |    8 +-
 .../Resources/Layout/AddMarker.axml           |   76 ++
 .../{AddNewPlaylist.axml => AddPlaylist.axml} |    6 +-
 .../Resources/Resource.Designer.cs            | 1127 +++++++++--------
 MPfm/MPfm.MVP/Bootstrap/Bootstrapper.cs       |    5 +-
 MPfm/MPfm.MVP/MPfm.MVP.Android.csproj         |    9 +-
 .../Navigation/MobileNavigationManager.cs     |   44 +-
 ...stPresenter.cs => AddPlaylistPresenter.cs} |   12 +-
 ...istPresenter.cs => IAddMarkerPresenter.cs} |    6 +-
 .../Interfaces/IAddPlaylistPresenter.cs       |   28 +
 MPfm/MPfm.MVP/Presenters/MarkersPresenter.cs  |   19 +-
 .../Presenters/SelectPlaylistPresenter.cs     |    4 +-
 MPfm/MPfm.MVP/Views/IAddMarkerView.cs         |   35 +
 ...NewPlaylistView.cs => IAddPlaylistView.cs} |    6 +-
 MPfm/MPfm.MVP/Views/IMarkersView.cs           |    3 +-
 20 files changed, 942 insertions(+), 617 deletions(-)
 create mode 100644 MPfm/MPfm.Android/Classes/Fragments/AddMarkerFragment.cs
 rename MPfm/MPfm.Android/Classes/Fragments/{AddNewPlaylistFragment.cs => AddPlaylistFragment.cs} (82%)
 create mode 100644 MPfm/MPfm.Android/Resources/Layout/AddMarker.axml
 rename MPfm/MPfm.Android/Resources/Layout/{AddNewPlaylist.axml => AddPlaylist.axml} (92%)
 rename MPfm/MPfm.MVP/Presenters/{AddNewPlaylistPresenter.cs => AddPlaylistPresenter.cs} (81%)
 rename MPfm/MPfm.MVP/Presenters/Interfaces/{IAddNewPlaylistPresenter.cs => IAddMarkerPresenter.cs} (81%)
 create mode 100644 MPfm/MPfm.MVP/Presenters/Interfaces/IAddPlaylistPresenter.cs
 create mode 100644 MPfm/MPfm.MVP/Views/IAddMarkerView.cs
 rename MPfm/MPfm.MVP/Views/{IAddNewPlaylistView.cs => IAddPlaylistView.cs} (87%)

diff --git a/MPfm/MPfm.Android/Classes/Application.cs b/MPfm/MPfm.Android/Classes/Application.cs
index 0c965c80..e21d65f7 100644
--- a/MPfm/MPfm.Android/Classes/Application.cs
+++ b/MPfm/MPfm.Android/Classes/Application.cs
@@ -1,4 +1,4 @@
-// Copyright © 2011-2013 Yanick Castonguay
+// Copyright © 2011-2013 Yanick Castonguay
 //
 // This file is part of MPfm.
 //
@@ -174,7 +174,8 @@ private void BootstrapApp()
             container.Register<ILibraryPreferencesView, LibraryPreferencesFragment>().AsMultiInstance();
             container.Register<IAboutView, AboutActivity>().AsMultiInstance();
             container.Register<ISelectPlaylistView, SelectPlaylistFragment>().AsMultiInstance();
-            container.Register<IAddNewPlaylistView, AddNewPlaylistFragment>().AsMultiInstance();
+            container.Register<IAddPlaylistView, AddPlaylistFragment>().AsMultiInstance();
+            container.Register<IAddMarkerView, AddMarkerFragment>().AsMultiInstance();
         }
     }
 }
diff --git a/MPfm/MPfm.Android/Classes/Fragments/AddMarkerFragment.cs b/MPfm/MPfm.Android/Classes/Fragments/AddMarkerFragment.cs
new file mode 100644
index 00000000..258413f7
--- /dev/null
+++ b/MPfm/MPfm.Android/Classes/Fragments/AddMarkerFragment.cs
@@ -0,0 +1,109 @@
+// Copyright © 2011-2013 Yanick Castonguay
+//
+// This file is part of MPfm.
+//
+// MPfm is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// MPfm is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with MPfm. If not, see <http://www.gnu.org/licenses/>.
+
+using System;
+using System.Collections.Generic;
+using System.Runtime.InteropServices;
+using Android.App;
+using Android.Content;
+using Android.OS;
+using Android.Views;
+using Android.Widget;
+using MPfm.Android.Classes.Adapters;
+using MPfm.Android.Classes.Fragments.Base;
+using MPfm.MVP.Presenters;
+using MPfm.MVP.Views;
+
+namespace MPfm.Android.Classes.Fragments
+{
+    public class AddMarkerFragment : BaseDialogFragment, IAddMarkerView
+    {
+        private View _view;
+        private RadioButton _radioVerse;
+        private RadioButton _radioChorus;
+        private RadioButton _radioBridge;
+        private RadioButton _radioSolo;
+        private Button _btnCancel;
+        private Button _btnCreate;
+
+        public AddMarkerFragment() : base(null)
+        {
+        }
+
+        public AddMarkerFragment(Action<IBaseView> onViewReady) 
+            : base(onViewReady)
+        {
+        }
+
+        public override View OnCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState)
+        {
+            Dialog.SetTitle("Select marker template");
+            _view = inflater.Inflate(Resource.Layout.AddMarker, container, false);
+
+            _btnCancel = _view.FindViewById<Button>(Resource.Id.addMarker_btnCancel);
+            _btnCreate = _view.FindViewById<Button>(Resource.Id.addMarker_btnCreate);
+            _radioVerse = _view.FindViewById<RadioButton>(Resource.Id.addMarker_radioVerse);
+            _radioChorus = _view.FindViewById<RadioButton>(Resource.Id.addMarker_radioChorus);
+            _radioBridge = _view.FindViewById<RadioButton>(Resource.Id.addMarker_radioBridge);
+            _radioSolo = _view.FindViewById<RadioButton>(Resource.Id.addMarker_radioSolo);
+            _btnCancel.Click += (sender, args) => Dismiss();
+            _btnCreate.Click += (sender, args) =>
+            {
+                MarkerTemplateNameType template = MarkerTemplateNameType.None;
+                if(_radioVerse.Checked)
+                    template = MarkerTemplateNameType.Verse;
+                else if (_radioChorus.Checked)
+                    template = MarkerTemplateNameType.Chorus;
+                else if (_radioBridge.Checked)
+                    template = MarkerTemplateNameType.Bridge;
+                else if (_radioSolo.Checked)
+                    template = MarkerTemplateNameType.Solo;
+
+                OnAddMarker(template);
+                Dismiss();
+            };
+            _radioVerse.Checked = true;
+
+            return _view;
+        }
+
+        public override void OnCreate(Bundle savedInstanceState)
+        {
+            base.OnCreate(savedInstanceState);
+            SetStyle((int)DialogFragmentStyle.Normal, (int)Resource.Style.DialogTheme);            
+        }
+
+        #region IAddMarkerView implementation
+
+        public Action<MarkerTemplateNameType> OnAddMarker { get; set; }
+
+        public void AddMarkerError(Exception ex)
+        {
+            Activity.RunOnUiThread(() =>
+            {
+                AlertDialog ad = new AlertDialog.Builder(Activity).Create();
+                ad.SetCancelable(false);
+                ad.SetMessage(string.Format("An error has occured in AddMarker: {0}", ex));
+                ad.SetButton("OK", (sender, args) => ad.Dismiss());
+                ad.Show();
+            });
+        }
+
+        #endregion
+
+    }
+}
diff --git a/MPfm/MPfm.Android/Classes/Fragments/AddNewPlaylistFragment.cs b/MPfm/MPfm.Android/Classes/Fragments/AddPlaylistFragment.cs
similarity index 82%
rename from MPfm/MPfm.Android/Classes/Fragments/AddNewPlaylistFragment.cs
rename to MPfm/MPfm.Android/Classes/Fragments/AddPlaylistFragment.cs
index 12a38011..fd55b2a2 100644
--- a/MPfm/MPfm.Android/Classes/Fragments/AddNewPlaylistFragment.cs
+++ b/MPfm/MPfm.Android/Classes/Fragments/AddPlaylistFragment.cs
@@ -1,4 +1,4 @@
-// Copyright © 2011-2013 Yanick Castonguay
+// Copyright © 2011-2013 Yanick Castonguay
 //
 // This file is part of MPfm.
 //
@@ -29,18 +29,18 @@
 
 namespace MPfm.Android.Classes.Fragments
 {
-    public class AddNewPlaylistFragment : BaseDialogFragment, IAddNewPlaylistView
+    public class AddPlaylistFragment : BaseDialogFragment, IAddPlaylistView
     {
         private View _view;
         private Button _btnCancel;
         private Button _btnCreate;
         private EditText _txtName;
 
-        public AddNewPlaylistFragment() : base(null)
+        public AddPlaylistFragment() : base(null)
         {
         }
 
-        public AddNewPlaylistFragment(Action<IBaseView> onViewReady) 
+        public AddPlaylistFragment(Action<IBaseView> onViewReady) 
             : base(onViewReady)
         {
         }
@@ -48,11 +48,11 @@ public AddNewPlaylistFragment(Action<IBaseView> onViewReady)
         public override View OnCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState)
         {
             Dialog.SetTitle("Add new playlist");
-            _view = inflater.Inflate(Resource.Layout.AddNewPlaylist, container, false);
+            _view = inflater.Inflate(Resource.Layout.AddPlaylist, container, false);
 
-            _txtName = _view.FindViewById<EditText>(Resource.Id.addNewPlaylist_txtName);
-            _btnCancel = _view.FindViewById<Button>(Resource.Id.addNewPlaylist_btnCancel);
-            _btnCreate = _view.FindViewById<Button>(Resource.Id.addNewPlaylist_btnCreate);
+            _txtName = _view.FindViewById<EditText>(Resource.Id.addPlaylist_txtName);
+            _btnCancel = _view.FindViewById<Button>(Resource.Id.addPlaylist_btnCancel);
+            _btnCreate = _view.FindViewById<Button>(Resource.Id.addPlaylist_btnCreate);
             _btnCancel.Click += (sender, args) => Dismiss();
             _btnCreate.Click += (sender, args) =>
             {
@@ -72,17 +72,17 @@ public override void OnCreate(Bundle savedInstanceState)
             SetStyle((int)DialogFragmentStyle.Normal, (int)Resource.Style.DialogTheme);            
         }
 
-        #region IAddNewPlaylistView implementation
+        #region IAddPlaylistView implementation
 
         public Action<string> OnSavePlaylist { get; set; }
 
-        public void AddNewPlaylistError(Exception ex)
+        public void AddPlaylistError(Exception ex)
         {
             Activity.RunOnUiThread(() =>
             {
                 AlertDialog ad = new AlertDialog.Builder(Activity).Create();
                 ad.SetCancelable(false);
-                ad.SetMessage(string.Format("An error has occured in AddNewPlaylist: {0}", ex));
+                ad.SetMessage(string.Format("An error has occured in AddPlaylist: {0}", ex));
                 ad.SetButton("OK", (sender, args) => ad.Dismiss());
                 ad.Show();
             });
diff --git a/MPfm/MPfm.Android/Classes/Fragments/MarkersFragment.cs b/MPfm/MPfm.Android/Classes/Fragments/MarkersFragment.cs
index 219e2aeb..be194fa6 100644
--- a/MPfm/MPfm.Android/Classes/Fragments/MarkersFragment.cs
+++ b/MPfm/MPfm.Android/Classes/Fragments/MarkersFragment.cs
@@ -50,7 +50,7 @@ public override View OnCreateView(LayoutInflater inflater, ViewGroup container,
             _view = inflater.Inflate(Resource.Layout.Markers, container, false);
             _listView = _view.FindViewById<ListView>(Resource.Id.markers_listView);
             _btnAdd = _view.FindViewById<Button>(Resource.Id.markers_btnAdd);
-            _btnAdd.Click += (sender, args) => OnAddMarker(MarkerTemplateNameType.Verse);
+            _btnAdd.Click += (sender, args) => OnAddMarker();
 
             _listAdapter = new MarkersListAdapter(Activity, new List<Marker>());
             _listView.SetAdapter(_listAdapter);            
@@ -64,6 +64,7 @@ private void ListViewOnItemClick(object sender, AdapterView.ItemClickEventArgs i
         {
             Console.WriteLine("MarkersFragment - ItemClick - itemPosition: {0}", itemClickEventArgs.Position);
             OnSelectMarker(_markers[itemClickEventArgs.Position]);
+            _listView.ClearFocus();
         }
 
         private void ListViewOnItemLongClick(object sender, AdapterView.ItemLongClickEventArgs itemLongClickEventArgs)
@@ -116,7 +117,8 @@ public override void OnDetach()
 
         #region IMarkersView implementation
 
-        public Action<MarkerTemplateNameType> OnAddMarker { get; set; }
+        public Action OnAddMarker { get; set; }
+        public Action<MarkerTemplateNameType> OnAddMarkerWithTemplate { get; set; }
         public Action<Marker> OnEditMarker { get; set; }
         public Action<Marker> OnSelectMarker { get; set; }
         public Action<Marker> OnDeleteMarker { get; set; }
diff --git a/MPfm/MPfm.Android/Classes/Services/NotificationService.cs b/MPfm/MPfm.Android/Classes/Services/NotificationService.cs
index e7df5f34..15003293 100644
--- a/MPfm/MPfm.Android/Classes/Services/NotificationService.cs
+++ b/MPfm/MPfm.Android/Classes/Services/NotificationService.cs
@@ -38,8 +38,8 @@
 
 namespace org.sessionsapp.android
 {
-    //[Service(Name = "org.sessionsapp.android.NotificationService", Label = "Sessions Widget Service")]//, Process = ":.widget.process")]
-    [Service(Label = "Sessions Notification Service")]//, Process = ":widgetprocess")]
+    //[Service(Name = "org.sessionsapp.android.NotificationService", Label = "Sessions Widget Service")]//, Process = ":.widget.process")] //, Process = ":widgetprocess")]
+    [Service(Label = "Sessions Notification Service")]
     public class NotificationService : Service
     {
         private ITinyMessengerHub _messengerHub;
@@ -142,11 +142,14 @@ private void Initialize()
 
         private Notification CreateNotificationView()
         {
-            var notification = new Notification.Builder(this)
-                .SetOngoing(true)
-                .SetPriority((int)NotificationPriority.Max)
-                .SetSmallIcon(Resource.Drawable.Icon)
-                .Build();
+            var notificationBuilder = new NotificationCompat.Builder(this);
+            notificationBuilder.SetOngoing(true);
+            notificationBuilder.SetSmallIcon(Resource.Drawable.Icon);
+
+            if (((int) global::Android.OS.Build.VERSION.SdkInt) >= 16)
+                notificationBuilder.SetPriority((int) NotificationPriority.Max);
+
+            var notification = notificationBuilder.Build();
 
             // Use the big notification style for Android 4.1+;
             //#if __ANDROID_16__
@@ -168,25 +171,29 @@ private Notification CreateNotificationView()
             intentPlayPause.SetAction(SessionsWidgetActions.SessionsWidgetPlayPause.ToString());
             PendingIntent pendingIntentPlayPause = PendingIntent.GetService(this, 0, intentPlayPause, PendingIntentFlags.UpdateCurrent);
             _notification.ContentView.SetOnClickPendingIntent(Resource.Id.notificationPlayer_btnPlayPause, pendingIntentPlayPause);
-            _notification.BigContentView.SetOnClickPendingIntent(Resource.Id.bigNotificationPlayer_btnPlayPause, pendingIntentPlayPause);
 
             Intent intentPrevious = new Intent(this, typeof(NotificationService));
             intentPrevious.SetAction(SessionsWidgetActions.SessionsWidgetPrevious.ToString());
             PendingIntent pendingIntentPrevious = PendingIntent.GetService(this, 0, intentPrevious, PendingIntentFlags.UpdateCurrent);
             _notification.ContentView.SetOnClickPendingIntent(Resource.Id.notificationPlayer_btnPrevious, pendingIntentPrevious);
-            _notification.BigContentView.SetOnClickPendingIntent(Resource.Id.bigNotificationPlayer_btnPrevious, pendingIntentPrevious);
 
             Intent intentNext = new Intent(this, typeof(NotificationService));
             intentNext.SetAction(SessionsWidgetActions.SessionsWidgetNext.ToString());
             PendingIntent pendingIntentNext = PendingIntent.GetService(this, 0, intentNext, PendingIntentFlags.UpdateCurrent);
             _notification.ContentView.SetOnClickPendingIntent(Resource.Id.notificationPlayer_btnNext, pendingIntentNext);
-            _notification.BigContentView.SetOnClickPendingIntent(Resource.Id.bigNotificationPlayer_btnNext, pendingIntentNext);
 
             Intent intentClose = new Intent(this, typeof(NotificationService));
             intentClose.SetAction(SessionsWidgetActions.SessionsWidgetClose.ToString());
             PendingIntent pendingIntentClose = PendingIntent.GetService(this, 0, intentClose, PendingIntentFlags.UpdateCurrent);
             _notification.ContentView.SetOnClickPendingIntent(Resource.Id.notificationPlayer_btnClose, pendingIntentClose);
-            _notification.BigContentView.SetOnClickPendingIntent(Resource.Id.bigNotificationPlayer_btnClose, pendingIntentClose);
+
+            if (((int) global::Android.OS.Build.VERSION.SdkInt) >= 16)
+            {
+                _notification.BigContentView.SetOnClickPendingIntent(Resource.Id.bigNotificationPlayer_btnPlayPause, pendingIntentPlayPause);
+                _notification.BigContentView.SetOnClickPendingIntent(Resource.Id.bigNotificationPlayer_btnPrevious, pendingIntentPrevious);
+                _notification.BigContentView.SetOnClickPendingIntent(Resource.Id.bigNotificationPlayer_btnNext, pendingIntentNext);
+                _notification.BigContentView.SetOnClickPendingIntent(Resource.Id.bigNotificationPlayer_btnClose, pendingIntentClose);
+            }
 
             Intent notificationIntent = new Intent(this, typeof(PlayerActivity));
             //notificationIntent.SetFlags(ActivityFlags.NewTask | ActivityFlags.ClearTop | ActivityFlags.SingleTop); 
diff --git a/MPfm/MPfm.Android/MPfm.Android.csproj b/MPfm/MPfm.Android/MPfm.Android.csproj
index 6f0b5b8b..8c906afd 100644
--- a/MPfm/MPfm.Android/MPfm.Android.csproj
+++ b/MPfm/MPfm.Android/MPfm.Android.csproj
@@ -100,7 +100,8 @@
     <Compile Include="Classes\Fragments\Base\BaseFragment.cs" />
     <Compile Include="Classes\Fragments\AudioPreferencesFragment.cs" />
     <Compile Include="Classes\Fragments\Base\BaseDialogFragment.cs" />
-    <Compile Include="Classes\Fragments\AddNewPlaylistFragment.cs" />
+    <Compile Include="Classes\Fragments\AddPlaylistFragment.cs" />
+    <Compile Include="Classes\Fragments\AddMarkerFragment.cs" />
     <Compile Include="Classes\Fragments\SelectPlaylistFragment.cs" />
     <Compile Include="Classes\Fragments\SyncManualConnectFragment.cs" />
     <Compile Include="Classes\Fragments\PlayerMetadataFragment.cs" />
@@ -269,7 +270,10 @@
     <AndroidResource Include="Resources\layout\PlaylistCell.axml">
       <SubType>Designer</SubType>
     </AndroidResource>
-    <AndroidResource Include="Resources\layout\AddNewPlaylist.axml">
+    <AndroidResource Include="Resources\layout\AddPlaylist.axml">
+      <SubType>Designer</SubType>
+    </AndroidResource>
+    <AndroidResource Include="Resources\layout\AddMarker.axml">
       <SubType>Designer</SubType>
     </AndroidResource>
   </ItemGroup>
diff --git a/MPfm/MPfm.Android/Resources/Layout/AddMarker.axml b/MPfm/MPfm.Android/Resources/Layout/AddMarker.axml
new file mode 100644
index 00000000..cf70c03a
--- /dev/null
+++ b/MPfm/MPfm.Android/Resources/Layout/AddMarker.axml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+  android:layout_width="200dp"
+  android:layout_height="56dp"
+  android:orientation="vertical">
+  <TextView
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:gravity="center_vertical"
+    android:paddingTop="12dp" 
+    android:paddingLeft="12dp" 
+    android:paddingRight="12dp" 
+    android:paddingBottom="0dp" 
+    android:text="Please select a marker template:"
+    android:textColor="#AAAAAA"
+    android:textSize="14dp" />
+  <RadioGroup
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+    <RadioButton android:id="@+id/addMarker_radioVerse"
+      android:layout_width="fill_parent"
+      android:layout_height="wrap_content"
+      android:padding="8dp"      
+      android:text="Verse" 
+      android:textSize="14dp" />
+    <RadioButton android:id="@+id/addMarker_radioChorus"
+      android:layout_width="fill_parent"
+      android:layout_height="wrap_content"
+      android:padding="8dp"
+      android:text="Chorus"
+      android:textSize="14dp" />
+    <RadioButton android:id="@+id/addMarker_radioBridge"
+      android:layout_width="fill_parent"
+      android:layout_height="wrap_content"
+      android:padding="8dp"
+      android:text="Bridge"
+      android:textSize="14dp" />
+    <RadioButton android:id="@+id/addMarker_radioSolo"
+      android:layout_width="fill_parent"
+      android:layout_height="wrap_content"
+      android:padding="8dp"
+      android:text="Solo"
+      android:textSize="14dp" />
+  </RadioGroup>
+  <LinearLayout
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="4dp"
+    android:orientation="horizontal">
+    <Button
+      android:id="@+id/addMarker_btnCancel"
+      android:layout_width="0dp"
+      android:layout_height="wrap_content"
+      android:layout_weight="1"
+      android:drawableLeft="@drawable/actionbar_cancel"
+      android:drawablePadding="2dp"      
+      android:background="@drawable/dialogbutton"
+      android:text="Cancel"
+      android:textColor="@color/dialogbutton_text"
+      android:textSize="14dp"
+      android:padding="6dp" />
+    <Button
+      android:id="@+id/addMarker_btnCreate"
+      android:layout_width="0dp"
+      android:layout_height="wrap_content"
+      android:layout_weight="1"
+      android:drawableLeft="@drawable/selectimage"
+      android:drawablePadding="2dp"      
+      android:background="@drawable/dialogbutton"
+      android:text="Create"
+      android:textColor="@color/dialogbutton_text"
+      android:textSize="14dp"
+      android:padding="6dp" />
+  </LinearLayout>    
+</LinearLayout>
\ No newline at end of file
diff --git a/MPfm/MPfm.Android/Resources/Layout/AddNewPlaylist.axml b/MPfm/MPfm.Android/Resources/Layout/AddPlaylist.axml
similarity index 92%
rename from MPfm/MPfm.Android/Resources/Layout/AddNewPlaylist.axml
rename to MPfm/MPfm.Android/Resources/Layout/AddPlaylist.axml
index 51c34263..382a2875 100644
--- a/MPfm/MPfm.Android/Resources/Layout/AddNewPlaylist.axml
+++ b/MPfm/MPfm.Android/Resources/Layout/AddPlaylist.axml
@@ -15,7 +15,7 @@
     android:textColor="#AAAAAA"
     android:textSize="14dp" />
   <EditText
-    android:id="@+id/addNewPlaylist_txtName"
+    android:id="@+id/addPlaylist_txtName"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"    
     android:paddingTop="2dp"
@@ -33,7 +33,7 @@
     android:layout_marginTop="4dp"
     android:orientation="horizontal">
     <Button
-      android:id="@+id/addNewPlaylist_btnCancel"
+      android:id="@+id/addPlaylist_btnCancel"
       android:layout_width="0dp"
       android:layout_height="wrap_content"
       android:layout_weight="1"
@@ -45,7 +45,7 @@
       android:textSize="14dp"
       android:padding="6dp" />
     <Button
-      android:id="@+id/addNewPlaylist_btnCreate"
+      android:id="@+id/addPlaylist_btnCreate"
       android:layout_width="0dp"
       android:layout_height="wrap_content"
       android:layout_weight="1"
diff --git a/MPfm/MPfm.Android/Resources/Resource.Designer.cs b/MPfm/MPfm.Android/Resources/Resource.Designer.cs
index 214c6495..b8881ebd 100644
--- a/MPfm/MPfm.Android/Resources/Resource.Designer.cs
+++ b/MPfm/MPfm.Android/Resources/Resource.Designer.cs
@@ -472,824 +472,842 @@ public partial class Id
 			// aapt resource value: 0x7f0c0001
 			public const int about_webView = 2131492865;
 			
-			// aapt resource value: 0x7f0c0005
-			public const int addNewPlaylist_btnCancel = 2131492869;
+			// aapt resource value: 0x7f0c0008
+			public const int addMarker_btnCancel = 2131492872;
+			
+			// aapt resource value: 0x7f0c0009
+			public const int addMarker_btnCreate = 2131492873;
 			
 			// aapt resource value: 0x7f0c0006
-			public const int addNewPlaylist_btnCreate = 2131492870;
+			public const int addMarker_radioBridge = 2131492870;
+			
+			// aapt resource value: 0x7f0c0005
+			public const int addMarker_radioChorus = 2131492869;
+			
+			// aapt resource value: 0x7f0c0007
+			public const int addMarker_radioSolo = 2131492871;
 			
 			// aapt resource value: 0x7f0c0004
-			public const int addNewPlaylist_txtName = 2131492868;
+			public const int addMarker_radioVerse = 2131492868;
 			
-			// aapt resource value: 0x7f0c000d
-			public const int albumCell_albumTitle = 2131492877;
+			// aapt resource value: 0x7f0c000b
+			public const int addPlaylist_btnCancel = 2131492875;
 			
 			// aapt resource value: 0x7f0c000c
-			public const int albumCell_artistName = 2131492876;
+			public const int addPlaylist_btnCreate = 2131492876;
 			
 			// aapt resource value: 0x7f0c000a
-			public const int albumCell_btnAddToPlaylist = 2131492874;
-			
-			// aapt resource value: 0x7f0c000b
-			public const int albumCell_btnDelete = 2131492875;
+			public const int addPlaylist_txtName = 2131492874;
 			
-			// aapt resource value: 0x7f0c0009
-			public const int albumCell_btnPlay = 2131492873;
-			
-			// aapt resource value: 0x7f0c0008
-			public const int albumCell_image = 2131492872;
+			// aapt resource value: 0x7f0c0013
+			public const int albumCell_albumTitle = 2131492883;
 			
-			// aapt resource value: 0x7f0c0007
-			public const int albumCell_layout = 2131492871;
+			// aapt resource value: 0x7f0c0012
+			public const int albumCell_artistName = 2131492882;
 			
 			// aapt resource value: 0x7f0c0010
-			public const int bigNotificationPlayer = 2131492880;
+			public const int albumCell_btnAddToPlaylist = 2131492880;
 			
 			// aapt resource value: 0x7f0c0011
-			public const int bigNotificationPlayer_btnClose = 2131492881;
+			public const int albumCell_btnDelete = 2131492881;
 			
-			// aapt resource value: 0x7f0c0018
-			public const int bigNotificationPlayer_btnNext = 2131492888;
+			// aapt resource value: 0x7f0c000f
+			public const int albumCell_btnPlay = 2131492879;
 			
-			// aapt resource value: 0x7f0c0017
-			public const int bigNotificationPlayer_btnPlayPause = 2131492887;
+			// aapt resource value: 0x7f0c000e
+			public const int albumCell_image = 2131492878;
+			
+			// aapt resource value: 0x7f0c000d
+			public const int albumCell_layout = 2131492877;
 			
 			// aapt resource value: 0x7f0c0016
-			public const int bigNotificationPlayer_btnPrevious = 2131492886;
+			public const int bigNotificationPlayer = 2131492886;
 			
-			// aapt resource value: 0x7f0c0012
-			public const int bigNotificationPlayer_imageAlbum = 2131492882;
+			// aapt resource value: 0x7f0c0017
+			public const int bigNotificationPlayer_btnClose = 2131492887;
 			
-			// aapt resource value: 0x7f0c0014
-			public const int bigNotificationPlayer_lblAlbumTitle = 2131492884;
+			// aapt resource value: 0x7f0c001e
+			public const int bigNotificationPlayer_btnNext = 2131492894;
 			
-			// aapt resource value: 0x7f0c0013
-			public const int bigNotificationPlayer_lblArtistName = 2131492883;
+			// aapt resource value: 0x7f0c001d
+			public const int bigNotificationPlayer_btnPlayPause = 2131492893;
 			
-			// aapt resource value: 0x7f0c0015
-			public const int bigNotificationPlayer_lblSongTitle = 2131492885;
+			// aapt resource value: 0x7f0c001c
+			public const int bigNotificationPlayer_btnPrevious = 2131492892;
+			
+			// aapt resource value: 0x7f0c0018
+			public const int bigNotificationPlayer_imageAlbum = 2131492888;
 			
 			// aapt resource value: 0x7f0c001a
-			public const int equalizerPresetCell_imageCheck = 2131492890;
+			public const int bigNotificationPlayer_lblAlbumTitle = 2131492890;
 			
 			// aapt resource value: 0x7f0c0019
-			public const int equalizerPresetCell_lblName = 2131492889;
-			
-			// aapt resource value: 0x7f0c0110
-			public const int equalizerPresetDetailsMenu_item_save = 2131493136;
+			public const int bigNotificationPlayer_lblArtistName = 2131492889;
 			
-			// aapt resource value: 0x7f0c0022
-			public const int equalizerPresetDetails_btnDelete = 2131492898;
+			// aapt resource value: 0x7f0c001b
+			public const int bigNotificationPlayer_lblSongTitle = 2131492891;
 			
 			// aapt resource value: 0x7f0c0020
-			public const int equalizerPresetDetails_btnNormalize = 2131492896;
+			public const int equalizerPresetCell_imageCheck = 2131492896;
 			
-			// aapt resource value: 0x7f0c0021
-			public const int equalizerPresetDetails_btnReset = 2131492897;
+			// aapt resource value: 0x7f0c001f
+			public const int equalizerPresetCell_lblName = 2131492895;
 			
-			// aapt resource value: 0x7f0c001c
-			public const int equalizerPresetDetails_graphView = 2131492892;
+			// aapt resource value: 0x7f0c0116
+			public const int equalizerPresetDetailsMenu_item_save = 2131493142;
 			
-			// aapt resource value: 0x7f0c001d
-			public const int equalizerPresetDetails_lblPresetName = 2131492893;
+			// aapt resource value: 0x7f0c0028
+			public const int equalizerPresetDetails_btnDelete = 2131492904;
 			
-			// aapt resource value: 0x7f0c001f
-			public const int equalizerPresetDetails_listView = 2131492895;
+			// aapt resource value: 0x7f0c0026
+			public const int equalizerPresetDetails_btnNormalize = 2131492902;
 			
-			// aapt resource value: 0x7f0c001b
-			public const int equalizerPresetDetails_mainLayout = 2131492891;
+			// aapt resource value: 0x7f0c0027
+			public const int equalizerPresetDetails_btnReset = 2131492903;
 			
-			// aapt resource value: 0x7f0c001e
-			public const int equalizerPresetDetails_txtPresetName = 2131492894;
+			// aapt resource value: 0x7f0c0022
+			public const int equalizerPresetDetails_graphView = 2131492898;
 			
 			// aapt resource value: 0x7f0c0023
-			public const int equalizerPresetFaderCell_lblFrequency = 2131492899;
+			public const int equalizerPresetDetails_lblPresetName = 2131492899;
 			
 			// aapt resource value: 0x7f0c0025
-			public const int equalizerPresetFaderCell_lblValue = 2131492901;
-			
-			// aapt resource value: 0x7f0c0024
-			public const int equalizerPresetFaderCell_seekBar = 2131492900;
-			
-			// aapt resource value: 0x7f0c0111
-			public const int equalizerPresetsMenu_item_add = 2131493137;
+			public const int equalizerPresetDetails_listView = 2131492901;
 			
-			// aapt resource value: 0x7f0c002c
-			public const int equalizerPresets_btnBypass = 2131492908;
+			// aapt resource value: 0x7f0c0021
+			public const int equalizerPresetDetails_mainLayout = 2131492897;
 			
-			// aapt resource value: 0x7f0c002b
-			public const int equalizerPresets_lblBypass = 2131492907;
+			// aapt resource value: 0x7f0c0024
+			public const int equalizerPresetDetails_txtPresetName = 2131492900;
 			
 			// aapt resource value: 0x7f0c0029
-			public const int equalizerPresets_lblMasterVolume = 2131492905;
-			
-			// aapt resource value: 0x7f0c002d
-			public const int equalizerPresets_listView = 2131492909;
-			
-			// aapt resource value: 0x7f0c0026
-			public const int equalizerPresets_mainLayout = 2131492902;
+			public const int equalizerPresetFaderCell_lblFrequency = 2131492905;
 			
-			// aapt resource value: 0x7f0c0028
-			public const int equalizerPresets_outputMeterView = 2131492904;
+			// aapt resource value: 0x7f0c002b
+			public const int equalizerPresetFaderCell_lblValue = 2131492907;
 			
 			// aapt resource value: 0x7f0c002a
-			public const int equalizerPresets_seekBarVolume = 2131492906;
+			public const int equalizerPresetFaderCell_seekBar = 2131492906;
 			
-			// aapt resource value: 0x7f0c0027
-			public const int equalizerPresets_topLayout = 2131492903;
+			// aapt resource value: 0x7f0c0117
+			public const int equalizerPresetsMenu_item_add = 2131493143;
 			
-			// aapt resource value: 0x7f0c000f
-			public const int fragment_audioSettings_lblTitle = 2131492879;
+			// aapt resource value: 0x7f0c0032
+			public const int equalizerPresets_btnBypass = 2131492914;
 			
-			// aapt resource value: 0x7f0c000e
-			public const int fragment_audioSettings_mainLayout = 2131492878;
+			// aapt resource value: 0x7f0c0031
+			public const int equalizerPresets_lblBypass = 2131492913;
 			
 			// aapt resource value: 0x7f0c002f
-			public const int fragment_generalSettings_lblTitle = 2131492911;
-			
-			// aapt resource value: 0x7f0c002e
-			public const int fragment_generalSettings_mainLayout = 2131492910;
-			
-			// aapt resource value: 0x7f0c0105
-			public const int fragment_updateLibrary_button = 2131493125;
-			
-			// aapt resource value: 0x7f0c0104
-			public const int fragment_updateLibrary_lblSubtitle = 2131493124;
-			
-			// aapt resource value: 0x7f0c0103
-			public const int fragment_updateLibrary_lblTitle = 2131493123;
+			public const int equalizerPresets_lblMasterVolume = 2131492911;
 			
-			// aapt resource value: 0x7f0c0100
-			public const int fragment_updateLibrary_mainLayout = 2131493120;
+			// aapt resource value: 0x7f0c0033
+			public const int equalizerPresets_listView = 2131492915;
 			
-			// aapt resource value: 0x7f0c0102
-			public const int fragment_updateLibrary_progressBar = 2131493122;
+			// aapt resource value: 0x7f0c002c
+			public const int equalizerPresets_mainLayout = 2131492908;
 			
-			// aapt resource value: 0x7f0c0101
-			public const int fragment_updateLibrary_relativeLayout = 2131493121;
+			// aapt resource value: 0x7f0c002e
+			public const int equalizerPresets_outputMeterView = 2131492910;
 			
 			// aapt resource value: 0x7f0c0030
-			public const int genericcell_image = 2131492912;
+			public const int equalizerPresets_seekBarVolume = 2131492912;
 			
-			// aapt resource value: 0x7f0c0031
-			public const int genericcell_title = 2131492913;
+			// aapt resource value: 0x7f0c002d
+			public const int equalizerPresets_topLayout = 2131492909;
 			
-			// aapt resource value: 0x7f0c0035
-			public const int libraryPreferences_btnEnableSync = 2131492917;
+			// aapt resource value: 0x7f0c0015
+			public const int fragment_audioSettings_lblTitle = 2131492885;
 			
-			// aapt resource value: 0x7f0c0038
-			public const int libraryPreferences_btnResetLibrary = 2131492920;
+			// aapt resource value: 0x7f0c0014
+			public const int fragment_audioSettings_mainLayout = 2131492884;
 			
-			// aapt resource value: 0x7f0c0039
-			public const int libraryPreferences_btnUpdateLibrary = 2131492921;
+			// aapt resource value: 0x7f0c0035
+			public const int fragment_generalSettings_lblTitle = 2131492917;
 			
 			// aapt resource value: 0x7f0c0034
-			public const int libraryPreferences_lblEnableSync = 2131492916;
+			public const int fragment_generalSettings_mainLayout = 2131492916;
 			
-			// aapt resource value: 0x7f0c0036
-			public const int libraryPreferences_lblHTTPPort = 2131492918;
+			// aapt resource value: 0x7f0c010b
+			public const int fragment_updateLibrary_button = 2131493131;
 			
-			// aapt resource value: 0x7f0c0033
-			public const int libraryPreferences_lblTitle = 2131492915;
+			// aapt resource value: 0x7f0c010a
+			public const int fragment_updateLibrary_lblSubtitle = 2131493130;
 			
-			// aapt resource value: 0x7f0c0032
-			public const int libraryPreferences_mainLayout = 2131492914;
+			// aapt resource value: 0x7f0c0109
+			public const int fragment_updateLibrary_lblTitle = 2131493129;
 			
-			// aapt resource value: 0x7f0c0037
-			public const int libraryPreferences_txtHTTPPort = 2131492919;
+			// aapt resource value: 0x7f0c0106
+			public const int fragment_updateLibrary_mainLayout = 2131493126;
 			
-			// aapt resource value: 0x7f0c0048
-			public const int lockScreen_btnClose = 2131492936;
+			// aapt resource value: 0x7f0c0108
+			public const int fragment_updateLibrary_progressBar = 2131493128;
 			
-			// aapt resource value: 0x7f0c0046
-			public const int lockScreen_btnNext = 2131492934;
+			// aapt resource value: 0x7f0c0107
+			public const int fragment_updateLibrary_relativeLayout = 2131493127;
 			
-			// aapt resource value: 0x7f0c0045
-			public const int lockScreen_btnPlayPause = 2131492933;
+			// aapt resource value: 0x7f0c0036
+			public const int genericcell_image = 2131492918;
 			
-			// aapt resource value: 0x7f0c0044
-			public const int lockScreen_btnPrevious = 2131492932;
+			// aapt resource value: 0x7f0c0037
+			public const int genericcell_title = 2131492919;
 			
-			// aapt resource value: 0x7f0c0043
-			public const int lockScreen_btnRepeat = 2131492931;
+			// aapt resource value: 0x7f0c003b
+			public const int libraryPreferences_btnEnableSync = 2131492923;
 			
-			// aapt resource value: 0x7f0c0047
-			public const int lockScreen_btnShuffle = 2131492935;
+			// aapt resource value: 0x7f0c003e
+			public const int libraryPreferences_btnResetLibrary = 2131492926;
 			
 			// aapt resource value: 0x7f0c003f
-			public const int lockScreen_imageAlbum = 2131492927;
+			public const int libraryPreferences_btnUpdateLibrary = 2131492927;
 			
-			// aapt resource value: 0x7f0c003b
-			public const int lockScreen_layoutPosition = 2131492923;
+			// aapt resource value: 0x7f0c003a
+			public const int libraryPreferences_lblEnableSync = 2131492922;
 			
-			// aapt resource value: 0x7f0c0041
-			public const int lockScreen_lblAlbumTitle = 2131492929;
+			// aapt resource value: 0x7f0c003c
+			public const int libraryPreferences_lblHTTPPort = 2131492924;
 			
-			// aapt resource value: 0x7f0c0040
-			public const int lockScreen_lblArtistName = 2131492928;
+			// aapt resource value: 0x7f0c0039
+			public const int libraryPreferences_lblTitle = 2131492921;
 			
-			// aapt resource value: 0x7f0c003e
-			public const int lockScreen_lblLength = 2131492926;
+			// aapt resource value: 0x7f0c0038
+			public const int libraryPreferences_mainLayout = 2131492920;
 			
-			// aapt resource value: 0x7f0c003c
-			public const int lockScreen_lblPosition = 2131492924;
+			// aapt resource value: 0x7f0c003d
+			public const int libraryPreferences_txtHTTPPort = 2131492925;
 			
-			// aapt resource value: 0x7f0c0042
-			public const int lockScreen_lblSongTitle = 2131492930;
+			// aapt resource value: 0x7f0c004e
+			public const int lockScreen_btnClose = 2131492942;
 			
-			// aapt resource value: 0x7f0c003a
-			public const int lockScreen_mainLayout = 2131492922;
+			// aapt resource value: 0x7f0c004c
+			public const int lockScreen_btnNext = 2131492940;
 			
-			// aapt resource value: 0x7f0c003d
-			public const int lockScreen_seekBar = 2131492925;
+			// aapt resource value: 0x7f0c004b
+			public const int lockScreen_btnPlayPause = 2131492939;
 			
 			// aapt resource value: 0x7f0c004a
-			public const int loops_btnAdd = 2131492938;
+			public const int lockScreen_btnPrevious = 2131492938;
 			
 			// aapt resource value: 0x7f0c0049
-			public const int loops_lblTitle = 2131492937;
+			public const int lockScreen_btnRepeat = 2131492937;
 			
-			// aapt resource value: 0x7f0c004b
-			public const int loops_listView = 2131492939;
+			// aapt resource value: 0x7f0c004d
+			public const int lockScreen_btnShuffle = 2131492941;
 			
-			// aapt resource value: 0x7f0c0061
-			public const int main_fragmentContainer = 2131492961;
+			// aapt resource value: 0x7f0c0045
+			public const int lockScreen_imageAlbum = 2131492933;
 			
-			// aapt resource value: 0x7f0c004c
-			public const int main_layout = 2131492940;
+			// aapt resource value: 0x7f0c0041
+			public const int lockScreen_layoutPosition = 2131492929;
 			
-			// aapt resource value: 0x7f0c004e
-			public const int main_miniplayer = 2131492942;
+			// aapt resource value: 0x7f0c0047
+			public const int lockScreen_lblAlbumTitle = 2131492935;
 			
-			// aapt resource value: 0x7f0c0056
-			public const int main_miniplayer_btnNext = 2131492950;
+			// aapt resource value: 0x7f0c0046
+			public const int lockScreen_lblArtistName = 2131492934;
 			
-			// aapt resource value: 0x7f0c0055
-			public const int main_miniplayer_btnPlayPause = 2131492949;
+			// aapt resource value: 0x7f0c0044
+			public const int lockScreen_lblLength = 2131492932;
 			
-			// aapt resource value: 0x7f0c0054
-			public const int main_miniplayer_btnPrevious = 2131492948;
+			// aapt resource value: 0x7f0c0042
+			public const int lockScreen_lblPosition = 2131492930;
 			
-			// aapt resource value: 0x7f0c0058
-			public const int main_miniplayer_btnRight = 2131492952;
+			// aapt resource value: 0x7f0c0048
+			public const int lockScreen_lblSongTitle = 2131492936;
 			
-			// aapt resource value: 0x7f0c004f
-			public const int main_miniplayer_imageAlbum = 2131492943;
+			// aapt resource value: 0x7f0c0040
+			public const int lockScreen_mainLayout = 2131492928;
 			
-			// aapt resource value: 0x7f0c0052
-			public const int main_miniplayer_lblAlbumTitle = 2131492946;
+			// aapt resource value: 0x7f0c0043
+			public const int lockScreen_seekBar = 2131492931;
+			
+			// aapt resource value: 0x7f0c0050
+			public const int loops_btnAdd = 2131492944;
+			
+			// aapt resource value: 0x7f0c004f
+			public const int loops_lblTitle = 2131492943;
 			
 			// aapt resource value: 0x7f0c0051
-			public const int main_miniplayer_lblArtistName = 2131492945;
+			public const int loops_listView = 2131492945;
 			
-			// aapt resource value: 0x7f0c0057
-			public const int main_miniplayer_lblSongPosition = 2131492951;
+			// aapt resource value: 0x7f0c0067
+			public const int main_fragmentContainer = 2131492967;
 			
-			// aapt resource value: 0x7f0c0053
-			public const int main_miniplayer_lblSongTitle = 2131492947;
+			// aapt resource value: 0x7f0c0052
+			public const int main_layout = 2131492946;
 			
-			// aapt resource value: 0x7f0c0050
-			public const int main_miniplayer_text = 2131492944;
+			// aapt resource value: 0x7f0c0054
+			public const int main_miniplayer = 2131492948;
 			
-			// aapt resource value: 0x7f0c0059
-			public const int main_miniplaylist = 2131492953;
+			// aapt resource value: 0x7f0c005c
+			public const int main_miniplayer_btnNext = 2131492956;
+			
+			// aapt resource value: 0x7f0c005b
+			public const int main_miniplayer_btnPlayPause = 2131492955;
 			
 			// aapt resource value: 0x7f0c005a
-			public const int main_miniplaylist_btnLeft = 2131492954;
+			public const int main_miniplayer_btnPrevious = 2131492954;
 			
-			// aapt resource value: 0x7f0c005c
-			public const int main_miniplaylist_btnPlaylist = 2131492956;
+			// aapt resource value: 0x7f0c005e
+			public const int main_miniplayer_btnRight = 2131492958;
 			
-			// aapt resource value: 0x7f0c005f
-			public const int main_miniplaylist_btnRepeat = 2131492959;
+			// aapt resource value: 0x7f0c0055
+			public const int main_miniplayer_imageAlbum = 2131492949;
 			
-			// aapt resource value: 0x7f0c0060
-			public const int main_miniplaylist_btnShuffle = 2131492960;
+			// aapt resource value: 0x7f0c0058
+			public const int main_miniplayer_lblAlbumTitle = 2131492952;
 			
-			// aapt resource value: 0x7f0c005b
-			public const int main_miniplaylist_cboPlaylist = 2131492955;
+			// aapt resource value: 0x7f0c0057
+			public const int main_miniplayer_lblArtistName = 2131492951;
 			
 			// aapt resource value: 0x7f0c005d
-			public const int main_miniplaylist_lblPlaylistCount = 2131492957;
+			public const int main_miniplayer_lblSongPosition = 2131492957;
 			
-			// aapt resource value: 0x7f0c005e
-			public const int main_miniplaylist_lblPlaylistLength = 2131492958;
+			// aapt resource value: 0x7f0c0059
+			public const int main_miniplayer_lblSongTitle = 2131492953;
 			
-			// aapt resource value: 0x7f0c004d
-			public const int main_viewflipper = 2131492941;
+			// aapt resource value: 0x7f0c0056
+			public const int main_miniplayer_text = 2131492950;
+			
+			// aapt resource value: 0x7f0c005f
+			public const int main_miniplaylist = 2131492959;
+			
+			// aapt resource value: 0x7f0c0060
+			public const int main_miniplaylist_btnLeft = 2131492960;
 			
 			// aapt resource value: 0x7f0c0062
-			public const int markerCell_letter = 2131492962;
+			public const int main_miniplaylist_btnPlaylist = 2131492962;
+			
+			// aapt resource value: 0x7f0c0065
+			public const int main_miniplaylist_btnRepeat = 2131492965;
+			
+			// aapt resource value: 0x7f0c0066
+			public const int main_miniplaylist_btnShuffle = 2131492966;
+			
+			// aapt resource value: 0x7f0c0061
+			public const int main_miniplaylist_cboPlaylist = 2131492961;
 			
 			// aapt resource value: 0x7f0c0063
-			public const int markerCell_name = 2131492963;
+			public const int main_miniplaylist_lblPlaylistCount = 2131492963;
 			
 			// aapt resource value: 0x7f0c0064
-			public const int markerCell_position = 2131492964;
-			
-			// aapt resource value: 0x7f0c0066
-			public const int markerDetails_lblTitle = 2131492966;
+			public const int main_miniplaylist_lblPlaylistLength = 2131492964;
 			
-			// aapt resource value: 0x7f0c0065
-			public const int markerDetails_mainLayout = 2131492965;
+			// aapt resource value: 0x7f0c0053
+			public const int main_viewflipper = 2131492947;
 			
 			// aapt resource value: 0x7f0c0068
-			public const int markers_btnAdd = 2131492968;
-			
-			// aapt resource value: 0x7f0c0067
-			public const int markers_lblTitle = 2131492967;
+			public const int markerCell_letter = 2131492968;
 			
 			// aapt resource value: 0x7f0c0069
-			public const int markers_listView = 2131492969;
+			public const int markerCell_name = 2131492969;
 			
-			// aapt resource value: 0x7f0c0085
-			public const int mobileLibraryBrowserCell_imageAdd = 2131492997;
+			// aapt resource value: 0x7f0c006a
+			public const int markerCell_position = 2131492970;
 			
-			// aapt resource value: 0x7f0c0079
-			public const int mobileLibraryBrowserCell_imageAlbum1 = 2131492985;
+			// aapt resource value: 0x7f0c006c
+			public const int markerDetails_lblTitle = 2131492972;
 			
-			// aapt resource value: 0x7f0c007a
-			public const int mobileLibraryBrowserCell_imageAlbum2 = 2131492986;
+			// aapt resource value: 0x7f0c006b
+			public const int markerDetails_mainLayout = 2131492971;
 			
-			// aapt resource value: 0x7f0c007b
-			public const int mobileLibraryBrowserCell_imageAlbum3 = 2131492987;
+			// aapt resource value: 0x7f0c006e
+			public const int markers_btnAdd = 2131492974;
 			
-			// aapt resource value: 0x7f0c0086
-			public const int mobileLibraryBrowserCell_imageDelete = 2131492998;
+			// aapt resource value: 0x7f0c006d
+			public const int markers_lblTitle = 2131492973;
 			
-			// aapt resource value: 0x7f0c0087
-			public const int mobileLibraryBrowserCell_imageNowPlaying = 2131492999;
+			// aapt resource value: 0x7f0c006f
+			public const int markers_listView = 2131492975;
 			
-			// aapt resource value: 0x7f0c0084
-			public const int mobileLibraryBrowserCell_imagePlay = 2131492996;
+			// aapt resource value: 0x7f0c008b
+			public const int mobileLibraryBrowserCell_imageAdd = 2131493003;
 			
-			// aapt resource value: 0x7f0c007e
-			public const int mobileLibraryBrowserCell_index = 2131492990;
+			// aapt resource value: 0x7f0c007f
+			public const int mobileLibraryBrowserCell_imageAlbum1 = 2131492991;
 			
-			// aapt resource value: 0x7f0c007c
-			public const int mobileLibraryBrowserCell_layoutAlbumCount = 2131492988;
+			// aapt resource value: 0x7f0c0080
+			public const int mobileLibraryBrowserCell_imageAlbum2 = 2131492992;
 			
-			// aapt resource value: 0x7f0c0078
-			public const int mobileLibraryBrowserCell_layoutAlbums = 2131492984;
+			// aapt resource value: 0x7f0c0081
+			public const int mobileLibraryBrowserCell_imageAlbum3 = 2131492993;
 			
-			// aapt resource value: 0x7f0c0083
-			public const int mobileLibraryBrowserCell_layoutMenu = 2131492995;
+			// aapt resource value: 0x7f0c008c
+			public const int mobileLibraryBrowserCell_imageDelete = 2131493004;
 			
-			// aapt resource value: 0x7f0c0080
-			public const int mobileLibraryBrowserCell_layoutSubtitle = 2131492992;
+			// aapt resource value: 0x7f0c008d
+			public const int mobileLibraryBrowserCell_imageNowPlaying = 2131493005;
 			
-			// aapt resource value: 0x7f0c007d
-			public const int mobileLibraryBrowserCell_lblAlbumCount = 2131492989;
+			// aapt resource value: 0x7f0c008a
+			public const int mobileLibraryBrowserCell_imagePlay = 2131493002;
+			
+			// aapt resource value: 0x7f0c0084
+			public const int mobileLibraryBrowserCell_index = 2131492996;
 			
 			// aapt resource value: 0x7f0c0082
-			public const int mobileLibraryBrowserCell_lblSubtitle = 2131492994;
+			public const int mobileLibraryBrowserCell_layoutAlbumCount = 2131492994;
 			
-			// aapt resource value: 0x7f0c007f
-			public const int mobileLibraryBrowserCell_lblTitle = 2131492991;
+			// aapt resource value: 0x7f0c007e
+			public const int mobileLibraryBrowserCell_layoutAlbums = 2131492990;
 			
-			// aapt resource value: 0x7f0c0081
-			public const int mobileLibraryBrowserCell_lblTitleWithSubtitle = 2131492993;
+			// aapt resource value: 0x7f0c0089
+			public const int mobileLibraryBrowserCell_layoutMenu = 2131493001;
 			
-			// aapt resource value: 0x7f0c006f
-			public const int mobileLibraryBrowser_gridViewAlbums = 2131492975;
+			// aapt resource value: 0x7f0c0086
+			public const int mobileLibraryBrowserCell_layoutSubtitle = 2131492998;
 			
-			// aapt resource value: 0x7f0c0072
-			public const int mobileLibraryBrowser_imageAlbum = 2131492978;
+			// aapt resource value: 0x7f0c0083
+			public const int mobileLibraryBrowserCell_lblAlbumCount = 2131492995;
 			
-			// aapt resource value: 0x7f0c0071
-			public const int mobileLibraryBrowser_layoutAlbum = 2131492977;
+			// aapt resource value: 0x7f0c0088
+			public const int mobileLibraryBrowserCell_lblSubtitle = 2131493000;
 			
-			// aapt resource value: 0x7f0c006a
-			public const int mobileLibraryBrowser_layoutBreadcrumb = 2131492970;
+			// aapt resource value: 0x7f0c0085
+			public const int mobileLibraryBrowserCell_lblTitle = 2131492997;
+			
+			// aapt resource value: 0x7f0c0087
+			public const int mobileLibraryBrowserCell_lblTitleWithSubtitle = 2131492999;
+			
+			// aapt resource value: 0x7f0c0075
+			public const int mobileLibraryBrowser_gridViewAlbums = 2131492981;
+			
+			// aapt resource value: 0x7f0c0078
+			public const int mobileLibraryBrowser_imageAlbum = 2131492984;
+			
+			// aapt resource value: 0x7f0c0077
+			public const int mobileLibraryBrowser_layoutAlbum = 2131492983;
 			
 			// aapt resource value: 0x7f0c0070
-			public const int mobileLibraryBrowser_layoutSongs = 2131492976;
+			public const int mobileLibraryBrowser_layoutBreadcrumb = 2131492976;
 			
 			// aapt resource value: 0x7f0c0076
-			public const int mobileLibraryBrowser_lblAlbumLength = 2131492982;
+			public const int mobileLibraryBrowser_layoutSongs = 2131492982;
 			
-			// aapt resource value: 0x7f0c0075
-			public const int mobileLibraryBrowser_lblAlbumSongCount = 2131492981;
+			// aapt resource value: 0x7f0c007c
+			public const int mobileLibraryBrowser_lblAlbumLength = 2131492988;
 			
-			// aapt resource value: 0x7f0c0074
-			public const int mobileLibraryBrowser_lblAlbumTitle = 2131492980;
+			// aapt resource value: 0x7f0c007b
+			public const int mobileLibraryBrowser_lblAlbumSongCount = 2131492987;
 			
-			// aapt resource value: 0x7f0c0073
-			public const int mobileLibraryBrowser_lblArtistName = 2131492979;
+			// aapt resource value: 0x7f0c007a
+			public const int mobileLibraryBrowser_lblAlbumTitle = 2131492986;
 			
-			// aapt resource value: 0x7f0c006b
-			public const int mobileLibraryBrowser_lblBreadcrumb = 2131492971;
+			// aapt resource value: 0x7f0c0079
+			public const int mobileLibraryBrowser_lblArtistName = 2131492985;
 			
-			// aapt resource value: 0x7f0c006e
-			public const int mobileLibraryBrowser_listViewArtists = 2131492974;
+			// aapt resource value: 0x7f0c0071
+			public const int mobileLibraryBrowser_lblBreadcrumb = 2131492977;
 			
-			// aapt resource value: 0x7f0c006d
-			public const int mobileLibraryBrowser_listViewPlaylists = 2131492973;
+			// aapt resource value: 0x7f0c0074
+			public const int mobileLibraryBrowser_listViewArtists = 2131492980;
 			
-			// aapt resource value: 0x7f0c0077
-			public const int mobileLibraryBrowser_listViewSongs = 2131492983;
+			// aapt resource value: 0x7f0c0073
+			public const int mobileLibraryBrowser_listViewPlaylists = 2131492979;
 			
-			// aapt resource value: 0x7f0c006c
-			public const int mobileLibraryBrowser_viewFlipper = 2131492972;
+			// aapt resource value: 0x7f0c007d
+			public const int mobileLibraryBrowser_listViewSongs = 2131492989;
 			
-			// aapt resource value: 0x7f0c0088
-			public const int notificationPlayer = 2131493000;
+			// aapt resource value: 0x7f0c0072
+			public const int mobileLibraryBrowser_viewFlipper = 2131492978;
 			
 			// aapt resource value: 0x7f0c008e
-			public const int notificationPlayer_btnClose = 2131493006;
+			public const int notificationPlayer = 2131493006;
 			
-			// aapt resource value: 0x7f0c008d
-			public const int notificationPlayer_btnNext = 2131493005;
+			// aapt resource value: 0x7f0c0094
+			public const int notificationPlayer_btnClose = 2131493012;
 			
-			// aapt resource value: 0x7f0c008c
-			public const int notificationPlayer_btnPlayPause = 2131493004;
+			// aapt resource value: 0x7f0c0093
+			public const int notificationPlayer_btnNext = 2131493011;
 			
-			// aapt resource value: 0x7f0c008b
-			public const int notificationPlayer_btnPrevious = 2131493003;
+			// aapt resource value: 0x7f0c0092
+			public const int notificationPlayer_btnPlayPause = 2131493010;
 			
-			// aapt resource value: 0x7f0c008a
-			public const int notificationPlayer_lblSubtitle = 2131493002;
+			// aapt resource value: 0x7f0c0091
+			public const int notificationPlayer_btnPrevious = 2131493009;
 			
-			// aapt resource value: 0x7f0c0089
-			public const int notificationPlayer_lblTitle = 2131493001;
+			// aapt resource value: 0x7f0c0090
+			public const int notificationPlayer_lblSubtitle = 2131493008;
 			
-			// aapt resource value: 0x7f0c0092
-			public const int pitchShifting_btnChangeKey = 2131493010;
+			// aapt resource value: 0x7f0c008f
+			public const int notificationPlayer_lblTitle = 2131493007;
 			
 			// aapt resource value: 0x7f0c0098
-			public const int pitchShifting_btnDecrement = 2131493016;
+			public const int pitchShifting_btnChangeKey = 2131493016;
+			
+			// aapt resource value: 0x7f0c009e
+			public const int pitchShifting_btnDecrement = 2131493022;
+			
+			// aapt resource value: 0x7f0c009f
+			public const int pitchShifting_btnIncrement = 2131493023;
+			
+			// aapt resource value: 0x7f0c00a0
+			public const int pitchShifting_btnReset = 2131493024;
 			
 			// aapt resource value: 0x7f0c0099
-			public const int pitchShifting_btnIncrement = 2131493017;
+			public const int pitchShifting_lblCurrentInterval = 2131493017;
+			
+			// aapt resource value: 0x7f0c009b
+			public const int pitchShifting_lblCurrentIntervalValue = 2131493019;
 			
 			// aapt resource value: 0x7f0c009a
-			public const int pitchShifting_btnReset = 2131493018;
+			public const int pitchShifting_lblNewKey = 2131493018;
 			
-			// aapt resource value: 0x7f0c0093
-			public const int pitchShifting_lblCurrentInterval = 2131493011;
+			// aapt resource value: 0x7f0c009c
+			public const int pitchShifting_lblNewKeyValue = 2131493020;
+			
+			// aapt resource value: 0x7f0c0096
+			public const int pitchShifting_lblReferenceKey = 2131493014;
+			
+			// aapt resource value: 0x7f0c0097
+			public const int pitchShifting_lblReferenceKeyValue = 2131493015;
 			
 			// aapt resource value: 0x7f0c0095
-			public const int pitchShifting_lblCurrentIntervalValue = 2131493013;
+			public const int pitchShifting_lblTitle = 2131493013;
 			
-			// aapt resource value: 0x7f0c0094
-			public const int pitchShifting_lblNewKey = 2131493012;
+			// aapt resource value: 0x7f0c009d
+			public const int pitchShifting_seekBar = 2131493021;
 			
-			// aapt resource value: 0x7f0c0096
-			public const int pitchShifting_lblNewKeyValue = 2131493014;
+			// aapt resource value: 0x7f0c0119
+			public const int playerMenu_item_effects = 2131493145;
 			
-			// aapt resource value: 0x7f0c0090
-			public const int pitchShifting_lblReferenceKey = 2131493008;
+			// aapt resource value: 0x7f0c0118
+			public const int playerMenu_item_playlist = 2131493144;
 			
-			// aapt resource value: 0x7f0c0091
-			public const int pitchShifting_lblReferenceKeyValue = 2131493009;
+			// aapt resource value: 0x7f0c00b7
+			public const int playerMetadata_lblAlbumTitle = 2131493047;
 			
-			// aapt resource value: 0x7f0c008f
-			public const int pitchShifting_lblTitle = 2131493007;
+			// aapt resource value: 0x7f0c00b6
+			public const int playerMetadata_lblArtistName = 2131493046;
 			
-			// aapt resource value: 0x7f0c0097
-			public const int pitchShifting_seekBar = 2131493015;
+			// aapt resource value: 0x7f0c00b8
+			public const int playerMetadata_lblSongTitle = 2131493048;
 			
-			// aapt resource value: 0x7f0c0113
-			public const int playerMenu_item_effects = 2131493139;
+			// aapt resource value: 0x7f0c00b3
+			public const int player_btnNext = 2131493043;
 			
-			// aapt resource value: 0x7f0c0112
-			public const int playerMenu_item_playlist = 2131493138;
+			// aapt resource value: 0x7f0c00b2
+			public const int player_btnPlayPause = 2131493042;
+			
+			// aapt resource value: 0x7f0c00b4
+			public const int player_btnPlaylist = 2131493044;
 			
 			// aapt resource value: 0x7f0c00b1
-			public const int playerMetadata_lblAlbumTitle = 2131493041;
+			public const int player_btnPrevious = 2131493041;
 			
 			// aapt resource value: 0x7f0c00b0
-			public const int playerMetadata_lblArtistName = 2131493040;
+			public const int player_btnRepeat = 2131493040;
 			
-			// aapt resource value: 0x7f0c00b2
-			public const int playerMetadata_lblSongTitle = 2131493042;
+			// aapt resource value: 0x7f0c00b5
+			public const int player_btnShuffle = 2131493045;
 			
-			// aapt resource value: 0x7f0c00ad
-			public const int player_btnNext = 2131493037;
+			// aapt resource value: 0x7f0c00aa
+			public const int player_carrouselDot1 = 2131493034;
+			
+			// aapt resource value: 0x7f0c00ab
+			public const int player_carrouselDot2 = 2131493035;
 			
 			// aapt resource value: 0x7f0c00ac
-			public const int player_btnPlayPause = 2131493036;
+			public const int player_carrouselDot3 = 2131493036;
 			
-			// aapt resource value: 0x7f0c00ae
-			public const int player_btnPlaylist = 2131493038;
+			// aapt resource value: 0x7f0c00ad
+			public const int player_carrouselDot4 = 2131493037;
 			
-			// aapt resource value: 0x7f0c00ab
-			public const int player_btnPrevious = 2131493035;
+			// aapt resource value: 0x7f0c00ae
+			public const int player_carrouselDot5 = 2131493038;
 			
-			// aapt resource value: 0x7f0c00aa
-			public const int player_btnRepeat = 2131493034;
+			// aapt resource value: 0x7f0c00a8
+			public const int player_imageViewAlbumArt = 2131493032;
 			
 			// aapt resource value: 0x7f0c00af
-			public const int player_btnShuffle = 2131493039;
+			public const int player_layoutButtons = 2131493039;
 			
-			// aapt resource value: 0x7f0c00a4
-			public const int player_carrouselDot1 = 2131493028;
+			// aapt resource value: 0x7f0c00a2
+			public const int player_layoutPosition = 2131493026;
 			
 			// aapt resource value: 0x7f0c00a5
-			public const int player_carrouselDot2 = 2131493029;
+			public const int player_lblLength = 2131493029;
 			
-			// aapt resource value: 0x7f0c00a6
-			public const int player_carrouselDot3 = 2131493030;
+			// aapt resource value: 0x7f0c00a3
+			public const int player_lblPosition = 2131493027;
 			
 			// aapt resource value: 0x7f0c00a7
-			public const int player_carrouselDot4 = 2131493031;
-			
-			// aapt resource value: 0x7f0c00a8
-			public const int player_carrouselDot5 = 2131493032;
+			public const int player_linearLayoutSubviews = 2131493031;
 			
-			// aapt resource value: 0x7f0c00a2
-			public const int player_imageViewAlbumArt = 2131493026;
+			// aapt resource value: 0x7f0c00a1
+			public const int player_mainLayout = 2131493025;
 			
 			// aapt resource value: 0x7f0c00a9
-			public const int player_layoutButtons = 2131493033;
-			
-			// aapt resource value: 0x7f0c009c
-			public const int player_layoutPosition = 2131493020;
+			public const int player_pager = 2131493033;
 			
-			// aapt resource value: 0x7f0c009f
-			public const int player_lblLength = 2131493023;
+			// aapt resource value: 0x7f0c00a4
+			public const int player_seekBar = 2131493028;
 			
-			// aapt resource value: 0x7f0c009d
-			public const int player_lblPosition = 2131493021;
+			// aapt resource value: 0x7f0c00a6
+			public const int player_waveFormView = 2131493030;
 			
-			// aapt resource value: 0x7f0c00a1
-			public const int player_linearLayoutSubviews = 2131493025;
+			// aapt resource value: 0x7f0c00c2
+			public const int playlistItemCell_imageDelete = 2131493058;
 			
-			// aapt resource value: 0x7f0c009b
-			public const int player_mainLayout = 2131493019;
+			// aapt resource value: 0x7f0c00c4
+			public const int playlistItemCell_imageMove = 2131493060;
 			
-			// aapt resource value: 0x7f0c00a3
-			public const int player_pager = 2131493027;
+			// aapt resource value: 0x7f0c00c3
+			public const int playlistItemCell_imageNowPlaying = 2131493059;
 			
-			// aapt resource value: 0x7f0c009e
-			public const int player_seekBar = 2131493022;
+			// aapt resource value: 0x7f0c00c1
+			public const int playlistItemCell_imagePlay = 2131493057;
 			
-			// aapt resource value: 0x7f0c00a0
-			public const int player_waveFormView = 2131493024;
+			// aapt resource value: 0x7f0c00be
+			public const int playlistItemCell_lblIndex = 2131493054;
 			
-			// aapt resource value: 0x7f0c00bc
-			public const int playlistItemCell_imageDelete = 2131493052;
+			// aapt resource value: 0x7f0c00c0
+			public const int playlistItemCell_lblSubtitle = 2131493056;
 			
-			// aapt resource value: 0x7f0c00be
-			public const int playlistItemCell_imageMove = 2131493054;
+			// aapt resource value: 0x7f0c00bf
+			public const int playlistItemCell_lblTitle = 2131493055;
 			
-			// aapt resource value: 0x7f0c00bd
-			public const int playlistItemCell_imageNowPlaying = 2131493053;
+			// aapt resource value: 0x7f0c00ba
+			public const int playlist_btnNew = 2131493050;
 			
 			// aapt resource value: 0x7f0c00bb
-			public const int playlistItemCell_imagePlay = 2131493051;
+			public const int playlist_btnShuffle = 2131493051;
 			
-			// aapt resource value: 0x7f0c00b8
-			public const int playlistItemCell_lblIndex = 2131493048;
+			// aapt resource value: 0x7f0c00b9
+			public const int playlist_listView = 2131493049;
 			
-			// aapt resource value: 0x7f0c00ba
-			public const int playlistItemCell_lblSubtitle = 2131493050;
+			// aapt resource value: 0x7f0c00bd
+			public const int playlistcell_count = 2131493053;
 			
-			// aapt resource value: 0x7f0c00b9
-			public const int playlistItemCell_lblTitle = 2131493049;
+			// aapt resource value: 0x7f0c00bc
+			public const int playlistcell_title = 2131493052;
 			
-			// aapt resource value: 0x7f0c00b4
-			public const int playlist_btnNew = 2131493044;
+			// aapt resource value: 0x7f0c00c5
+			public const int preferences_mainLayout = 2131493061;
 			
-			// aapt resource value: 0x7f0c00b5
-			public const int playlist_btnShuffle = 2131493045;
+			// aapt resource value: 0x7f0c00c6
+			public const int preferences_pager = 2131493062;
 			
-			// aapt resource value: 0x7f0c00b3
-			public const int playlist_listView = 2131493043;
+			// aapt resource value: 0x7f0c00c7
+			public const int preferences_pager_title_strip = 2131493063;
 			
-			// aapt resource value: 0x7f0c00b7
-			public const int playlistcell_count = 2131493047;
+			// aapt resource value: 0x7f0c00c8
+			public const int selectPlaylist_btnAddNewPlaylist = 2131493064;
 			
-			// aapt resource value: 0x7f0c00b6
-			public const int playlistcell_title = 2131493046;
+			// aapt resource value: 0x7f0c00ca
+			public const int selectPlaylist_btnCancel = 2131493066;
 			
-			// aapt resource value: 0x7f0c00bf
-			public const int preferences_mainLayout = 2131493055;
+			// aapt resource value: 0x7f0c00cb
+			public const int selectPlaylist_btnSelect = 2131493067;
 			
-			// aapt resource value: 0x7f0c00c0
-			public const int preferences_pager = 2131493056;
+			// aapt resource value: 0x7f0c00c9
+			public const int selectPlaylist_listView = 2131493065;
 			
-			// aapt resource value: 0x7f0c00c1
-			public const int preferences_pager_title_strip = 2131493057;
+			// aapt resource value: 0x7f0c00cc
+			public const int splash_layout = 2131493068;
 			
-			// aapt resource value: 0x7f0c00c2
-			public const int selectPlaylist_btnAddNewPlaylist = 2131493058;
+			// aapt resource value: 0x7f0c00cd
+			public const int splash_text = 2131493069;
 			
-			// aapt resource value: 0x7f0c00c4
-			public const int selectPlaylist_btnCancel = 2131493060;
+			// aapt resource value: 0x7f0c00d9
+			public const int syncDownload_lblCompleted = 2131493081;
 			
-			// aapt resource value: 0x7f0c00c5
-			public const int selectPlaylist_btnSelect = 2131493061;
+			// aapt resource value: 0x7f0c00d8
+			public const int syncDownload_lblCompletedValue = 2131493080;
 			
-			// aapt resource value: 0x7f0c00c3
-			public const int selectPlaylist_listView = 2131493059;
+			// aapt resource value: 0x7f0c00df
+			public const int syncDownload_lblCurrentFileProgress = 2131493087;
 			
-			// aapt resource value: 0x7f0c00c6
-			public const int splash_layout = 2131493062;
+			// aapt resource value: 0x7f0c00de
+			public const int syncDownload_lblCurrentFileProgressValue = 2131493086;
 			
-			// aapt resource value: 0x7f0c00c7
-			public const int splash_text = 2131493063;
+			// aapt resource value: 0x7f0c00e1
+			public const int syncDownload_lblDownloadSpeed = 2131493089;
 			
-			// aapt resource value: 0x7f0c00d3
-			public const int syncDownload_lblCompleted = 2131493075;
+			// aapt resource value: 0x7f0c00e0
+			public const int syncDownload_lblDownloadSpeedValue = 2131493088;
 			
-			// aapt resource value: 0x7f0c00d2
-			public const int syncDownload_lblCompletedValue = 2131493074;
+			// aapt resource value: 0x7f0c00e3
+			public const int syncDownload_lblErrors = 2131493091;
 			
-			// aapt resource value: 0x7f0c00d9
-			public const int syncDownload_lblCurrentFileProgress = 2131493081;
+			// aapt resource value: 0x7f0c00e2
+			public const int syncDownload_lblErrorsValue = 2131493090;
 			
-			// aapt resource value: 0x7f0c00d8
-			public const int syncDownload_lblCurrentFileProgressValue = 2131493080;
+			// aapt resource value: 0x7f0c00d7
+			public const int syncDownload_lblFileName = 2131493079;
 			
 			// aapt resource value: 0x7f0c00db
-			public const int syncDownload_lblDownloadSpeed = 2131493083;
+			public const int syncDownload_lblFilesDownloaded = 2131493083;
 			
 			// aapt resource value: 0x7f0c00da
-			public const int syncDownload_lblDownloadSpeedValue = 2131493082;
+			public const int syncDownload_lblFilesDownloadedValue = 2131493082;
+			
+			// aapt resource value: 0x7f0c00d6
+			public const int syncDownload_lblTitle = 2131493078;
 			
 			// aapt resource value: 0x7f0c00dd
-			public const int syncDownload_lblErrors = 2131493085;
+			public const int syncDownload_lblTotalFiles = 2131493085;
 			
 			// aapt resource value: 0x7f0c00dc
-			public const int syncDownload_lblErrorsValue = 2131493084;
+			public const int syncDownload_lblTotalFilesValue = 2131493084;
 			
-			// aapt resource value: 0x7f0c00d1
-			public const int syncDownload_lblFileName = 2131493073;
+			// aapt resource value: 0x7f0c00d4
+			public const int syncDownload_mainLayout = 2131493076;
 			
 			// aapt resource value: 0x7f0c00d5
-			public const int syncDownload_lblFilesDownloaded = 2131493077;
+			public const int syncDownload_progressBar = 2131493077;
 			
-			// aapt resource value: 0x7f0c00d4
-			public const int syncDownload_lblFilesDownloadedValue = 2131493076;
+			// aapt resource value: 0x7f0c00e4
+			public const int syncManualConnect_lblIPAddress = 2131493092;
 			
-			// aapt resource value: 0x7f0c00d0
-			public const int syncDownload_lblTitle = 2131493072;
+			// aapt resource value: 0x7f0c00e6
+			public const int syncManualConnect_lblPort = 2131493094;
 			
-			// aapt resource value: 0x7f0c00d7
-			public const int syncDownload_lblTotalFiles = 2131493079;
+			// aapt resource value: 0x7f0c00e5
+			public const int syncManualConnect_txtIPAddress = 2131493093;
 			
-			// aapt resource value: 0x7f0c00d6
-			public const int syncDownload_lblTotalFilesValue = 2131493078;
+			// aapt resource value: 0x7f0c00e7
+			public const int syncManualConnect_txtPort = 2131493095;
 			
-			// aapt resource value: 0x7f0c00ce
-			public const int syncDownload_mainLayout = 2131493070;
+			// aapt resource value: 0x7f0c00f3
+			public const int syncMenuCell_checkmark = 2131493107;
 			
-			// aapt resource value: 0x7f0c00cf
-			public const int syncDownload_progressBar = 2131493071;
+			// aapt resource value: 0x7f0c00f0
+			public const int syncMenuCell_image = 2131493104;
 			
-			// aapt resource value: 0x7f0c00de
-			public const int syncManualConnect_lblIPAddress = 2131493086;
+			// aapt resource value: 0x7f0c00f1
+			public const int syncMenuCell_index = 2131493105;
 			
-			// aapt resource value: 0x7f0c00e0
-			public const int syncManualConnect_lblPort = 2131493088;
+			// aapt resource value: 0x7f0c00f2
+			public const int syncMenuCell_title = 2131493106;
 			
-			// aapt resource value: 0x7f0c00df
-			public const int syncManualConnect_txtIPAddress = 2131493087;
+			// aapt resource value: 0x7f0c011a
+			public const int syncMenuMenu_item_sync = 2131493146;
 			
-			// aapt resource value: 0x7f0c00e1
-			public const int syncManualConnect_txtPort = 2131493089;
+			// aapt resource value: 0x7f0c00ef
+			public const int syncMenu_btnSelectAll = 2131493103;
 			
-			// aapt resource value: 0x7f0c00ed
-			public const int syncMenuCell_checkmark = 2131493101;
+			// aapt resource value: 0x7f0c00ee
+			public const int syncMenu_lblFreeSpace = 2131493102;
 			
 			// aapt resource value: 0x7f0c00ea
-			public const int syncMenuCell_image = 2131493098;
+			public const int syncMenu_lblStatus = 2131493098;
 			
-			// aapt resource value: 0x7f0c00eb
-			public const int syncMenuCell_index = 2131493099;
+			// aapt resource value: 0x7f0c00ed
+			public const int syncMenu_lblTotal = 2131493101;
 			
 			// aapt resource value: 0x7f0c00ec
-			public const int syncMenuCell_title = 2131493100;
-			
-			// aapt resource value: 0x7f0c0114
-			public const int syncMenuMenu_item_sync = 2131493140;
-			
-			// aapt resource value: 0x7f0c00e9
-			public const int syncMenu_btnSelectAll = 2131493097;
+			public const int syncMenu_listView = 2131493100;
 			
 			// aapt resource value: 0x7f0c00e8
-			public const int syncMenu_lblFreeSpace = 2131493096;
+			public const int syncMenu_loadingLayout = 2131493096;
 			
-			// aapt resource value: 0x7f0c00e4
-			public const int syncMenu_lblStatus = 2131493092;
+			// aapt resource value: 0x7f0c00eb
+			public const int syncMenu_mainLayout = 2131493099;
 			
-			// aapt resource value: 0x7f0c00e7
-			public const int syncMenu_lblTotal = 2131493095;
+			// aapt resource value: 0x7f0c00e9
+			public const int syncMenu_progressBar = 2131493097;
 			
-			// aapt resource value: 0x7f0c00e6
-			public const int syncMenu_listView = 2131493094;
+			// aapt resource value: 0x7f0c00f9
+			public const int syncWebBrowser_lblCode = 2131493113;
 			
-			// aapt resource value: 0x7f0c00e2
-			public const int syncMenu_loadingLayout = 2131493090;
+			// aapt resource value: 0x7f0c00f5
+			public const int syncWebBrowser_lblStep1 = 2131493109;
 			
-			// aapt resource value: 0x7f0c00e5
-			public const int syncMenu_mainLayout = 2131493093;
+			// aapt resource value: 0x7f0c00f6
+			public const int syncWebBrowser_lblStep1Details = 2131493110;
 			
-			// aapt resource value: 0x7f0c00e3
-			public const int syncMenu_progressBar = 2131493091;
+			// aapt resource value: 0x7f0c00f8
+			public const int syncWebBrowser_lblStep2 = 2131493112;
 			
-			// aapt resource value: 0x7f0c00f3
-			public const int syncWebBrowser_lblCode = 2131493107;
+			// aapt resource value: 0x7f0c00f7
+			public const int syncWebBrowser_lblUrl = 2131493111;
 			
-			// aapt resource value: 0x7f0c00ef
-			public const int syncWebBrowser_lblStep1 = 2131493103;
+			// aapt resource value: 0x7f0c00f4
+			public const int syncWebBrowser_mainLayout = 2131493108;
 			
-			// aapt resource value: 0x7f0c00f0
-			public const int syncWebBrowser_lblStep1Details = 2131493104;
+			// aapt resource value: 0x7f0c00d3
+			public const int sync_btnConnectManually = 2131493075;
 			
-			// aapt resource value: 0x7f0c00f2
-			public const int syncWebBrowser_lblStep2 = 2131493106;
+			// aapt resource value: 0x7f0c00cf
+			public const int sync_lblIPAddress = 2131493071;
 			
-			// aapt resource value: 0x7f0c00f1
-			public const int syncWebBrowser_lblUrl = 2131493105;
+			// aapt resource value: 0x7f0c00d1
+			public const int sync_lblStatus = 2131493073;
 			
-			// aapt resource value: 0x7f0c00ee
-			public const int syncWebBrowser_mainLayout = 2131493102;
+			// aapt resource value: 0x7f0c00d2
+			public const int sync_listView = 2131493074;
 			
-			// aapt resource value: 0x7f0c00cd
-			public const int sync_btnConnectManually = 2131493069;
+			// aapt resource value: 0x7f0c00ce
+			public const int sync_mainLayout = 2131493070;
 			
-			// aapt resource value: 0x7f0c00c9
-			public const int sync_lblIPAddress = 2131493065;
+			// aapt resource value: 0x7f0c00d0
+			public const int sync_progressBar = 2131493072;
 			
-			// aapt resource value: 0x7f0c00cb
-			public const int sync_lblStatus = 2131493067;
+			// aapt resource value: 0x7f0c0103
+			public const int timeShifting_btnDecrement = 2131493123;
 			
-			// aapt resource value: 0x7f0c00cc
-			public const int sync_listView = 2131493068;
+			// aapt resource value: 0x7f0c00fd
+			public const int timeShifting_btnDetectTempo = 2131493117;
 			
-			// aapt resource value: 0x7f0c00c8
-			public const int sync_mainLayout = 2131493064;
+			// aapt resource value: 0x7f0c0104
+			public const int timeShifting_btnIncrement = 2131493124;
 			
-			// aapt resource value: 0x7f0c00ca
-			public const int sync_progressBar = 2131493066;
+			// aapt resource value: 0x7f0c0105
+			public const int timeShifting_btnReset = 2131493125;
 			
-			// aapt resource value: 0x7f0c00fd
-			public const int timeShifting_btnDecrement = 2131493117;
+			// aapt resource value: 0x7f0c00fe
+			public const int timeShifting_lblCurrentTempo = 2131493118;
 			
-			// aapt resource value: 0x7f0c00f7
-			public const int timeShifting_btnDetectTempo = 2131493111;
+			// aapt resource value: 0x7f0c0100
+			public const int timeShifting_lblCurrentTempoValue = 2131493120;
 			
-			// aapt resource value: 0x7f0c00fe
-			public const int timeShifting_btnIncrement = 2131493118;
+			// aapt resource value: 0x7f0c00fb
+			public const int timeShifting_lblDetectedTempo = 2131493115;
+			
+			// aapt resource value: 0x7f0c00fc
+			public const int timeShifting_lblDetectedTempoValue = 2131493116;
 			
 			// aapt resource value: 0x7f0c00ff
-			public const int timeShifting_btnReset = 2131493119;
+			public const int timeShifting_lblReferenceTempo = 2131493119;
 			
-			// aapt resource value: 0x7f0c00f8
-			public const int timeShifting_lblCurrentTempo = 2131493112;
+			// aapt resource value: 0x7f0c0101
+			public const int timeShifting_lblReferenceTempoValue = 2131493121;
 			
 			// aapt resource value: 0x7f0c00fa
-			public const int timeShifting_lblCurrentTempoValue = 2131493114;
+			public const int timeShifting_lblTitle = 2131493114;
 			
-			// aapt resource value: 0x7f0c00f5
-			public const int timeShifting_lblDetectedTempo = 2131493109;
-			
-			// aapt resource value: 0x7f0c00f6
-			public const int timeShifting_lblDetectedTempoValue = 2131493110;
-			
-			// aapt resource value: 0x7f0c00f9
-			public const int timeShifting_lblReferenceTempo = 2131493113;
+			// aapt resource value: 0x7f0c0102
+			public const int timeShifting_seekBar = 2131493122;
 			
-			// aapt resource value: 0x7f0c00fb
-			public const int timeShifting_lblReferenceTempoValue = 2131493115;
+			// aapt resource value: 0x7f0c010c
+			public const int widgetPlayer = 2131493132;
 			
-			// aapt resource value: 0x7f0c00f4
-			public const int timeShifting_lblTitle = 2131493108;
+			// aapt resource value: 0x7f0c0114
+			public const int widgetPlayerLoading = 2131493140;
 			
-			// aapt resource value: 0x7f0c00fc
-			public const int timeShifting_seekBar = 2131493116;
+			// aapt resource value: 0x7f0c0115
+			public const int widgetPlayerLoading_lblMessage = 2131493141;
 			
-			// aapt resource value: 0x7f0c0106
-			public const int widgetPlayer = 2131493126;
+			// aapt resource value: 0x7f0c0113
+			public const int widgetPlayer_btnNext = 2131493139;
 			
-			// aapt resource value: 0x7f0c010e
-			public const int widgetPlayerLoading = 2131493134;
+			// aapt resource value: 0x7f0c0112
+			public const int widgetPlayer_btnPlayPause = 2131493138;
 			
-			// aapt resource value: 0x7f0c010f
-			public const int widgetPlayerLoading_lblMessage = 2131493135;
+			// aapt resource value: 0x7f0c0111
+			public const int widgetPlayer_btnPrevious = 2131493137;
 			
 			// aapt resource value: 0x7f0c010d
-			public const int widgetPlayer_btnNext = 2131493133;
-			
-			// aapt resource value: 0x7f0c010c
-			public const int widgetPlayer_btnPlayPause = 2131493132;
-			
-			// aapt resource value: 0x7f0c010b
-			public const int widgetPlayer_btnPrevious = 2131493131;
-			
-			// aapt resource value: 0x7f0c0107
-			public const int widgetPlayer_imageAlbum = 2131493127;
+			public const int widgetPlayer_imageAlbum = 2131493133;
 			
-			// aapt resource value: 0x7f0c0109
-			public const int widgetPlayer_lblAlbumTitle = 2131493129;
+			// aapt resource value: 0x7f0c010f
+			public const int widgetPlayer_lblAlbumTitle = 2131493135;
 			
-			// aapt resource value: 0x7f0c0108
-			public const int widgetPlayer_lblArtistName = 2131493128;
+			// aapt resource value: 0x7f0c010e
+			public const int widgetPlayer_lblArtistName = 2131493134;
 			
-			// aapt resource value: 0x7f0c010a
-			public const int widgetPlayer_lblSongTitle = 2131493130;
+			// aapt resource value: 0x7f0c0110
+			public const int widgetPlayer_lblSongTitle = 2131493136;
 			
 			static Id()
 			{
@@ -1311,124 +1329,127 @@ public partial class Layout
 			public const int actionbar_spinner_item = 2130903041;
 			
 			// aapt resource value: 0x7f030002
-			public const int AddNewPlaylist = 2130903042;
+			public const int AddMarker = 2130903042;
 			
 			// aapt resource value: 0x7f030003
-			public const int AlbumCell = 2130903043;
+			public const int AddPlaylist = 2130903043;
 			
 			// aapt resource value: 0x7f030004
-			public const int AudioPreferences = 2130903044;
+			public const int AlbumCell = 2130903044;
 			
 			// aapt resource value: 0x7f030005
-			public const int BigNotificationPlayer = 2130903045;
+			public const int AudioPreferences = 2130903045;
 			
 			// aapt resource value: 0x7f030006
-			public const int EqualizerPresetCell = 2130903046;
+			public const int BigNotificationPlayer = 2130903046;
 			
 			// aapt resource value: 0x7f030007
-			public const int EqualizerPresetDetails = 2130903047;
+			public const int EqualizerPresetCell = 2130903047;
 			
 			// aapt resource value: 0x7f030008
-			public const int EqualizerPresetFaderCell = 2130903048;
+			public const int EqualizerPresetDetails = 2130903048;
 			
 			// aapt resource value: 0x7f030009
-			public const int EqualizerPresets = 2130903049;
+			public const int EqualizerPresetFaderCell = 2130903049;
 			
 			// aapt resource value: 0x7f03000a
-			public const int GeneralPreferences = 2130903050;
+			public const int EqualizerPresets = 2130903050;
 			
 			// aapt resource value: 0x7f03000b
-			public const int GenericCell = 2130903051;
+			public const int GeneralPreferences = 2130903051;
 			
 			// aapt resource value: 0x7f03000c
-			public const int LibraryPreferences = 2130903052;
+			public const int GenericCell = 2130903052;
 			
 			// aapt resource value: 0x7f03000d
-			public const int LockScreen = 2130903053;
+			public const int LibraryPreferences = 2130903053;
 			
 			// aapt resource value: 0x7f03000e
-			public const int Loops = 2130903054;
+			public const int LockScreen = 2130903054;
 			
 			// aapt resource value: 0x7f03000f
-			public const int Main = 2130903055;
+			public const int Loops = 2130903055;
 			
 			// aapt resource value: 0x7f030010
-			public const int MarkerCell = 2130903056;
+			public const int Main = 2130903056;
 			
 			// aapt resource value: 0x7f030011
-			public const int MarkerDetails = 2130903057;
+			public const int MarkerCell = 2130903057;
 			
 			// aapt resource value: 0x7f030012
-			public const int Markers = 2130903058;
+			public const int MarkerDetails = 2130903058;
 			
 			// aapt resource value: 0x7f030013
-			public const int MobileLibraryBrowser = 2130903059;
+			public const int Markers = 2130903059;
 			
 			// aapt resource value: 0x7f030014
-			public const int MobileLibraryBrowserCell = 2130903060;
+			public const int MobileLibraryBrowser = 2130903060;
 			
 			// aapt resource value: 0x7f030015
-			public const int NotificationPlayer = 2130903061;
+			public const int MobileLibraryBrowserCell = 2130903061;
 			
 			// aapt resource value: 0x7f030016
-			public const int PitchShifting = 2130903062;
+			public const int NotificationPlayer = 2130903062;
 			
 			// aapt resource value: 0x7f030017
-			public const int Player = 2130903063;
+			public const int PitchShifting = 2130903063;
 			
 			// aapt resource value: 0x7f030018
-			public const int PlayerMetadata = 2130903064;
+			public const int Player = 2130903064;
 			
 			// aapt resource value: 0x7f030019
-			public const int Playlist = 2130903065;
+			public const int PlayerMetadata = 2130903065;
 			
 			// aapt resource value: 0x7f03001a
-			public const int playlist_spinner_item = 2130903066;
+			public const int Playlist = 2130903066;
 			
 			// aapt resource value: 0x7f03001b
-			public const int PlaylistCell = 2130903067;
+			public const int playlist_spinner_item = 2130903067;
 			
 			// aapt resource value: 0x7f03001c
-			public const int PlaylistItemCell = 2130903068;
+			public const int PlaylistCell = 2130903068;
 			
 			// aapt resource value: 0x7f03001d
-			public const int Preferences = 2130903069;
+			public const int PlaylistItemCell = 2130903069;
 			
 			// aapt resource value: 0x7f03001e
-			public const int SelectPlaylist = 2130903070;
+			public const int Preferences = 2130903070;
 			
 			// aapt resource value: 0x7f03001f
-			public const int Splash = 2130903071;
+			public const int SelectPlaylist = 2130903071;
 			
 			// aapt resource value: 0x7f030020
-			public const int Sync = 2130903072;
+			public const int Splash = 2130903072;
 			
 			// aapt resource value: 0x7f030021
-			public const int SyncDownload = 2130903073;
+			public const int Sync = 2130903073;
 			
 			// aapt resource value: 0x7f030022
-			public const int SyncManualConnect = 2130903074;
+			public const int SyncDownload = 2130903074;
 			
 			// aapt resource value: 0x7f030023
-			public const int SyncMenu = 2130903075;
+			public const int SyncManualConnect = 2130903075;
 			
 			// aapt resource value: 0x7f030024
-			public const int SyncMenuCell = 2130903076;
+			public const int SyncMenu = 2130903076;
 			
 			// aapt resource value: 0x7f030025
-			public const int SyncWebBrowser = 2130903077;
+			public const int SyncMenuCell = 2130903077;
 			
 			// aapt resource value: 0x7f030026
-			public const int TimeShifting = 2130903078;
+			public const int SyncWebBrowser = 2130903078;
 			
 			// aapt resource value: 0x7f030027
-			public const int UpdateLibrary = 2130903079;
+			public const int TimeShifting = 2130903079;
 			
 			// aapt resource value: 0x7f030028
-			public const int WidgetPlayer = 2130903080;
+			public const int UpdateLibrary = 2130903080;
 			
 			// aapt resource value: 0x7f030029
-			public const int WidgetPlayerLoading = 2130903081;
+			public const int WidgetPlayer = 2130903081;
+			
+			// aapt resource value: 0x7f03002a
+			public const int WidgetPlayerLoading = 2130903082;
 			
 			static Layout()
 			{
diff --git a/MPfm/MPfm.MVP/Bootstrap/Bootstrapper.cs b/MPfm/MPfm.MVP/Bootstrap/Bootstrapper.cs
index 915589c8..38a448be 100644
--- a/MPfm/MPfm.MVP/Bootstrap/Bootstrapper.cs
+++ b/MPfm/MPfm.MVP/Bootstrap/Bootstrapper.cs
@@ -1,4 +1,4 @@
-// Copyright © 2011-2013 Yanick Castonguay
+// Copyright © 2011-2013 Yanick Castonguay
 //
 // This file is part of MPfm.
 //
@@ -89,7 +89,8 @@ static Bootstrapper()
             container.Register<IMobileFirstRunPresenter, MobileFirstRunPresenter>().AsSingleton();
             container.Register<IAboutPresenter, AboutPresenter>().AsSingleton();
             container.Register<ISelectPlaylistPresenter, SelectPlaylistPresenter>().AsMultiInstance();
-            container.Register<IAddNewPlaylistPresenter, AddNewPlaylistPresenter>().AsMultiInstance();
+            container.Register<IAddPlaylistPresenter, AddPlaylistPresenter>().AsMultiInstance();
+            container.Register<IAddMarkerPresenter, AddMarkerPresenter>().AsMultiInstance();
         }
         
         /// <summary>
diff --git a/MPfm/MPfm.MVP/MPfm.MVP.Android.csproj b/MPfm/MPfm.MVP/MPfm.MVP.Android.csproj
index aa786507..2eb74581 100644
--- a/MPfm/MPfm.MVP/MPfm.MVP.Android.csproj
+++ b/MPfm/MPfm.MVP/MPfm.MVP.Android.csproj
@@ -137,8 +137,10 @@
     <Compile Include="Models\PlaylistEntity.cs" />
     <Compile Include="Navigation\MobileNavigationManager.cs" />
     <Compile Include="Presenters\AudioPreferencesPresenter.cs" />
-    <Compile Include="Presenters\AddNewPlaylistPresenter.cs" />
-    <Compile Include="Presenters\Interfaces\IAddNewPlaylistPresenter.cs" />
+    <Compile Include="Presenters\AddPlaylistPresenter.cs" />
+    <Compile Include="Presenters\AddMarkerPresenter.cs" />
+    <Compile Include="Presenters\Interfaces\IAddMarkerPresenter.cs" />
+    <Compile Include="Presenters\Interfaces\IAddPlaylistPresenter.cs" />
     <Compile Include="Presenters\Interfaces\ISelectPlaylistPresenter.cs" />
     <Compile Include="Presenters\SelectPlaylistPresenter.cs" />
     <Compile Include="Presenters\MobileFirstRunPresenter.cs" />
@@ -156,7 +158,8 @@
     <Compile Include="Presenters\Interfaces\IAudioPreferencesPresenter.cs" />
     <Compile Include="Presenters\UpdateLibraryPresenter.cs" />
     <Compile Include="Models\PlayerPositionEntity.cs" />
-    <Compile Include="Views\IAddNewPlaylistView.cs" />
+    <Compile Include="Views\IAddMarkerView.cs" />
+    <Compile Include="Views\IAddPlaylistView.cs" />
     <Compile Include="Views\ISelectPlaylistView.cs" />
     <Compile Include="Views\IMobileFirstRunView.cs" />
     <Compile Include="Views\IDesktopFirstRunView.cs" />
diff --git a/MPfm/MPfm.MVP/Navigation/MobileNavigationManager.cs b/MPfm/MPfm.MVP/Navigation/MobileNavigationManager.cs
index f56e398f..9b8d37ce 100644
--- a/MPfm/MPfm.MVP/Navigation/MobileNavigationManager.cs
+++ b/MPfm/MPfm.MVP/Navigation/MobileNavigationManager.cs
@@ -50,8 +50,8 @@ public abstract class MobileNavigationManager
         private IUpdateLibraryPresenter _updateLibraryPresenter;
         private ISelectPlaylistView _selectPlaylistView;
         private ISelectPlaylistPresenter _selectPlaylistPresenter;
-        private IAddNewPlaylistView _addNewPlaylistView;
-        private IAddNewPlaylistPresenter _addNewPlaylistPresenter;
+        private IAddPlaylistView _addPlaylistView;
+        private IAddPlaylistPresenter _addPlaylistPresenter;
         private IEqualizerPresetsView _equalizerPresetsView;
         private IEqualizerPresetsPresenter _equalizerPresetsPresenter;
         private IEqualizerPresetDetailsView _equalizerPresetDetailsView;
@@ -68,6 +68,8 @@ public abstract class MobileNavigationManager
         private ISyncDownloadPresenter _syncDownloadPresenter;
         private IPlaylistView _playlistView;
         private IPlaylistPresenter _playlistPresenter;
+        private IAddMarkerView _addMarkerView;
+        private IAddMarkerPresenter _addMarkerPresenter;
 
         // Player sub views
         private IPlayerMetadataView _playerMetadataView;
@@ -231,24 +233,44 @@ public virtual ISelectPlaylistView CreateSelectPlaylistView(LibraryBrowserEntity
             return _selectPlaylistView;
         }
 
-        public virtual IAddNewPlaylistView CreateAddNewPlaylistView()
+        public virtual IAddPlaylistView CreateAddPlaylistView()
         {
             // The view invokes the OnViewReady action when the view is ready. This means the presenter can be created and bound to the view.
             Action<IBaseView> onViewReady = (view) =>
             {
-                _addNewPlaylistPresenter = Bootstrapper.GetContainer().Resolve<IAddNewPlaylistPresenter>();
-                _addNewPlaylistPresenter.BindView((IAddNewPlaylistView)view);
+                _addPlaylistPresenter = Bootstrapper.GetContainer().Resolve<IAddPlaylistPresenter>();
+                _addPlaylistPresenter.BindView((IAddPlaylistView)view);
             };
 
             // Create view and manage view destruction
-            _addNewPlaylistView = Bootstrapper.GetContainer().Resolve<IAddNewPlaylistView>(new NamedParameterOverloads() { { "onViewReady", onViewReady } });
-            _addNewPlaylistView.OnViewDestroy = (view) =>
+            _addPlaylistView = Bootstrapper.GetContainer().Resolve<IAddPlaylistView>(new NamedParameterOverloads() { { "onViewReady", onViewReady } });
+            _addPlaylistView.OnViewDestroy = (view) =>
             {
-                _addNewPlaylistPresenter.ViewDestroyed();
-                _addNewPlaylistPresenter = null;
-                _addNewPlaylistView = null;
+                _addPlaylistPresenter.ViewDestroyed();
+                _addPlaylistPresenter = null;
+                _addPlaylistView = null;
             };
-            return _addNewPlaylistView;
+            return _addPlaylistView;
+        }
+
+        public virtual IAddMarkerView CreateAddMarkerView()
+        {
+            // The view invokes the OnViewReady action when the view is ready. This means the presenter can be created and bound to the view.
+            Action<IBaseView> onViewReady = (view) =>
+            {
+                _addMarkerPresenter = Bootstrapper.GetContainer().Resolve<IAddMarkerPresenter>();
+                _addMarkerPresenter.BindView((IAddMarkerView)view);
+            };
+
+            // Create view and manage view destruction
+            _addMarkerView = Bootstrapper.GetContainer().Resolve<IAddMarkerView>(new NamedParameterOverloads() { { "onViewReady", onViewReady } });
+            _addMarkerView.OnViewDestroy = (view) =>
+            {
+                _addMarkerPresenter.ViewDestroyed();
+                _addMarkerPresenter = null;
+                _addMarkerView = null;
+            };
+            return _addMarkerView;
         }
 
         protected virtual void CreatePreferencesViewInternal(Action<IBaseView> onViewReady)
diff --git a/MPfm/MPfm.MVP/Presenters/AddNewPlaylistPresenter.cs b/MPfm/MPfm.MVP/Presenters/AddPlaylistPresenter.cs
similarity index 81%
rename from MPfm/MPfm.MVP/Presenters/AddNewPlaylistPresenter.cs
rename to MPfm/MPfm.MVP/Presenters/AddPlaylistPresenter.cs
index 17bf3f52..d0319177 100644
--- a/MPfm/MPfm.MVP/Presenters/AddNewPlaylistPresenter.cs
+++ b/MPfm/MPfm.MVP/Presenters/AddPlaylistPresenter.cs
@@ -1,4 +1,4 @@
-// Copyright © 2011-2013 Yanick Castonguay
+// Copyright © 2011-2013 Yanick Castonguay
 //
 // This file is part of MPfm.
 //
@@ -28,20 +28,20 @@
 namespace MPfm.MVP.Presenters
 {
 	/// <summary>
-    /// Add New Playlist presenter.
+    /// Add Playlist presenter.
 	/// </summary>
-    public class AddNewPlaylistPresenter : BasePresenter<IAddNewPlaylistView>, IAddNewPlaylistPresenter
+    public class AddPlaylistPresenter : BasePresenter<IAddPlaylistView>, IAddPlaylistPresenter
 	{
 	    private readonly ITinyMessengerHub _messengerHub;
 	    private readonly ILibraryService _libraryService;
 
-	    public AddNewPlaylistPresenter(ITinyMessengerHub messengerHub, ILibraryService libraryService)
+	    public AddPlaylistPresenter(ITinyMessengerHub messengerHub, ILibraryService libraryService)
 	    {
 	        _messengerHub = messengerHub;
 	        _libraryService = libraryService;
 	    }
 
-	    public override void BindView(IAddNewPlaylistView view)
+	    public override void BindView(IAddPlaylistView view)
         {
             view.OnSavePlaylist = SavePlaylist;
 
@@ -60,7 +60,7 @@ private void SavePlaylist(string title)
             catch (Exception ex)
             {
                 Tracing.Log("An error occured while saving playlist: " + ex.Message);
-                View.AddNewPlaylistError(ex);
+                View.AddPlaylistError(ex);
             }
 	    }
 	}
diff --git a/MPfm/MPfm.MVP/Presenters/Interfaces/IAddNewPlaylistPresenter.cs b/MPfm/MPfm.MVP/Presenters/Interfaces/IAddMarkerPresenter.cs
similarity index 81%
rename from MPfm/MPfm.MVP/Presenters/Interfaces/IAddNewPlaylistPresenter.cs
rename to MPfm/MPfm.MVP/Presenters/Interfaces/IAddMarkerPresenter.cs
index d4416b9b..ce2697c2 100644
--- a/MPfm/MPfm.MVP/Presenters/Interfaces/IAddNewPlaylistPresenter.cs
+++ b/MPfm/MPfm.MVP/Presenters/Interfaces/IAddMarkerPresenter.cs
@@ -1,4 +1,4 @@
-// Copyright © 2011-2013 Yanick Castonguay
+// Copyright © 2011-2013 Yanick Castonguay
 //
 // This file is part of MPfm.
 //
@@ -20,9 +20,9 @@
 namespace MPfm.MVP.Presenters.Interfaces
 {
 	/// <summary>
-    /// Add New Playlist presenter interface.
+    /// Add Marker presenter interface.
 	/// </summary>
-    public interface IAddNewPlaylistPresenter : IBasePresenter<IAddNewPlaylistView>
+    public interface IAddMarkerPresenter : IBasePresenter<IAddMarkerView>
     {
 	}
 }
diff --git a/MPfm/MPfm.MVP/Presenters/Interfaces/IAddPlaylistPresenter.cs b/MPfm/MPfm.MVP/Presenters/Interfaces/IAddPlaylistPresenter.cs
new file mode 100644
index 00000000..3c3218e8
--- /dev/null
+++ b/MPfm/MPfm.MVP/Presenters/Interfaces/IAddPlaylistPresenter.cs
@@ -0,0 +1,28 @@
+// Copyright © 2011-2013 Yanick Castonguay
+//
+// This file is part of MPfm.
+//
+// MPfm is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// MPfm is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with MPfm. If not, see <http://www.gnu.org/licenses/>.
+
+using MPfm.MVP.Views;
+
+namespace MPfm.MVP.Presenters.Interfaces
+{
+	/// <summary>
+    /// Add Playlist presenter interface.
+	/// </summary>
+    public interface IAddPlaylistPresenter : IBasePresenter<IAddPlaylistView>
+    {
+	}
+}
diff --git a/MPfm/MPfm.MVP/Presenters/MarkersPresenter.cs b/MPfm/MPfm.MVP/Presenters/MarkersPresenter.cs
index bbb484c2..584d0be0 100644
--- a/MPfm/MPfm.MVP/Presenters/MarkersPresenter.cs
+++ b/MPfm/MPfm.MVP/Presenters/MarkersPresenter.cs
@@ -60,8 +60,9 @@ public MarkersPresenter(ITinyMessengerHub messageHub, ILibraryService librarySer
 		}
 
         public override void BindView(IMarkersView view)
-        {            
+        {
             view.OnAddMarker = AddMarker;
+            view.OnAddMarkerWithTemplate = AddMarkerWithTemplate;
             view.OnEditMarker = EditMarker;
             view.OnSelectMarker = SelectMarker;
             view.OnDeleteMarker = DeleteMarker;
@@ -102,7 +103,21 @@ private void CreateMarkerDetailsView(Guid markerId)
 #endif
         }
 
-        private void AddMarker(MarkerTemplateNameType markerTemplateNameType)
+	    private void AddMarker()
+	    {
+            try
+            {
+                var view = _mobileNavigationManager.CreateAddMarkerView();
+                _mobileNavigationManager.PushDialogView("Add Marker", View, view);
+            }
+            catch (Exception ex)
+            {
+                Tracing.Log("An error occured while creating AddMarker view: " + ex.Message);
+                View.MarkerError(ex);
+            }
+	    }
+
+        private void AddMarkerWithTemplate(MarkerTemplateNameType markerTemplateNameType)
         {
             try
             {
diff --git a/MPfm/MPfm.MVP/Presenters/SelectPlaylistPresenter.cs b/MPfm/MPfm.MVP/Presenters/SelectPlaylistPresenter.cs
index fab0278d..b2bbae16 100644
--- a/MPfm/MPfm.MVP/Presenters/SelectPlaylistPresenter.cs
+++ b/MPfm/MPfm.MVP/Presenters/SelectPlaylistPresenter.cs
@@ -1,4 +1,4 @@
-// Copyright © 2011-2013 Yanick Castonguay
+// Copyright © 2011-2013 Yanick Castonguay
 //
 // This file is part of MPfm.
 //
@@ -134,7 +134,7 @@ private void AddNewPlaylist()
 	    {
             try
             {
-                var view = _mobileNavigationManager.CreateAddNewPlaylistView();
+                var view = _mobileNavigationManager.CreateAddPlaylistView();
                 _mobileNavigationManager.PushDialogView("Add New Playlist", View, view);
             }
             catch (Exception ex)
diff --git a/MPfm/MPfm.MVP/Views/IAddMarkerView.cs b/MPfm/MPfm.MVP/Views/IAddMarkerView.cs
new file mode 100644
index 00000000..dfaeec0b
--- /dev/null
+++ b/MPfm/MPfm.MVP/Views/IAddMarkerView.cs
@@ -0,0 +1,35 @@
+// Copyright © 2011-2013 Yanick Castonguay
+//
+// This file is part of MPfm.
+//
+// MPfm is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// MPfm is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with MPfm. If not, see <http://www.gnu.org/licenses/>.
+
+using System;
+using System.Collections.Generic;
+using MPfm.MVP.Models;
+using MPfm.MVP.Presenters;
+using MPfm.Player.Objects;
+
+namespace MPfm.MVP.Views
+{
+	/// <summary>
+	/// Add Marker view interface.
+	/// </summary>
+	public interface IAddMarkerView : IBaseView
+	{
+        Action<MarkerTemplateNameType> OnAddMarker { get; set; }
+
+        void AddMarkerError(Exception ex);
+	}
+}
diff --git a/MPfm/MPfm.MVP/Views/IAddNewPlaylistView.cs b/MPfm/MPfm.MVP/Views/IAddPlaylistView.cs
similarity index 87%
rename from MPfm/MPfm.MVP/Views/IAddNewPlaylistView.cs
rename to MPfm/MPfm.MVP/Views/IAddPlaylistView.cs
index 19951044..6528ce47 100644
--- a/MPfm/MPfm.MVP/Views/IAddNewPlaylistView.cs
+++ b/MPfm/MPfm.MVP/Views/IAddPlaylistView.cs
@@ -23,12 +23,12 @@
 namespace MPfm.MVP.Views
 {
 	/// <summary>
-	/// Add New Playlist view interface.
+	/// Add Playlist view interface.
 	/// </summary>
-	public interface IAddNewPlaylistView : IBaseView
+	public interface IAddPlaylistView : IBaseView
 	{
         Action<string> OnSavePlaylist { get; set; }
     
-        void AddNewPlaylistError(Exception ex);
+        void AddPlaylistError(Exception ex);
 	}
 }
diff --git a/MPfm/MPfm.MVP/Views/IMarkersView.cs b/MPfm/MPfm.MVP/Views/IMarkersView.cs
index b66b18a8..51e3caa4 100644
--- a/MPfm/MPfm.MVP/Views/IMarkersView.cs
+++ b/MPfm/MPfm.MVP/Views/IMarkersView.cs
@@ -27,7 +27,8 @@ namespace MPfm.MVP.Views
 	/// </summary>
 	public interface IMarkersView : IBaseView
 	{
-        Action<MarkerTemplateNameType> OnAddMarker { get; set; }
+        Action OnAddMarker { get; set; }
+        Action<MarkerTemplateNameType> OnAddMarkerWithTemplate { get; set; }
         Action<Marker> OnEditMarker { get; set; }
         Action<Marker> OnSelectMarker { get; set; }
         Action<Marker> OnDeleteMarker { get; set; }