diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 00e69e0..5d4c73d 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -15,7 +15,7 @@
      limitations under the License.
  -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.cyanogenmod.eleven"
+    package="org.lineageos.eleven"
     android:versionCode="3"
     android:versionName="3.0" >
 
@@ -23,6 +23,8 @@
         android:minSdkVersion="14"
         android:targetSdkVersion="27" />
 
+    <original-package android:name="com.cyanogenmod.eleven" />
+
     <!-- Used for caching and creating new playlists -->
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <!-- Used to check for a network connection -->
@@ -52,14 +54,15 @@
     <uses-feature android:name="android.hardware.sensor.accelerometer" />
 
     <application
-        android:name="com.cyanogenmod.eleven.ElevenApplication"
+        android:name="org.lineageos.eleven.ElevenApplication"
         android:allowBackup="true"
         android:allowTaskReparenting="true"
         android:hardwareAccelerated="@bool/config_hardwareAccelerated"
-        android:icon="@mipmap/ic_launcher_eleven"
+        android:appCategory="audio"
+        android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:largeHeap="@bool/config_largeHeap"
-        android:taskAffinity="com.cyanogenmod.eleven.task"
+        android:taskAffinity="org.lineageos.eleven.task"
         android:theme="@style/Eleven.Theme">
 
         <!-- Searchable -->
@@ -68,7 +71,7 @@
             android:value=".ui.activities.SearchActivity" />
         <!-- Main activity -->
         <activity
-            android:name="com.cyanogenmod.eleven.ui.activities.HomeActivity"
+            android:name="org.lineageos.eleven.ui.activities.HomeActivity"
             android:windowSoftInputMode="adjustPan"
             android:launchMode="singleTop"
             android:exported="true"
@@ -91,7 +94,7 @@
                 <data android:mimeType="vnd.android.cursor.dir/artists" />
             </intent-filter>
             <intent-filter>
-                <action android:name="com.cyanogenmod.eleven.AUDIO_PLAYER" />
+                <action android:name="org.lineageos.eleven.AUDIO_PLAYER" />
 
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
@@ -99,7 +102,7 @@
 
         <!-- Search interface -->
         <activity
-            android:name="com.cyanogenmod.eleven.ui.activities.SearchActivity"
+            android:name="org.lineageos.eleven.ui.activities.SearchActivity"
             android:windowSoftInputMode="adjustResize"
             android:exported="true"
             android:theme="@style/Eleven.Theme">
@@ -116,7 +119,7 @@
         </activity>
         <!-- Used to set options -->
         <activity
-            android:name="com.cyanogenmod.eleven.ui.activities.SettingsActivity"
+            android:name="org.lineageos.eleven.ui.activities.SettingsActivity"
             android:label="@string/menu_settings"
             android:theme="@style/Eleven.Theme.ActionBar.Overlay" />
         <!-- Audio Preview -->
@@ -163,7 +166,7 @@
         </activity>
         <!-- 4x1 App Widget -->
         <receiver
-            android:name="com.cyanogenmod.eleven.appwidgets.AppWidgetSmall"
+            android:name="org.lineageos.eleven.appwidgets.AppWidgetSmall"
             android:exported="false"
             android:label="@string/app_widget_small" >
             <intent-filter>
@@ -176,7 +179,7 @@
         </receiver>
         <!-- 4x2  App Widget -->
         <receiver
-            android:name="com.cyanogenmod.eleven.appwidgets.AppWidgetLarge"
+            android:name="org.lineageos.eleven.appwidgets.AppWidgetLarge"
             android:exported="false"
             android:label="@string/app_widget_large" >
             <intent-filter>
@@ -189,7 +192,7 @@
         </receiver>
         <!-- 4x2 alternate App Widget -->
         <receiver
-            android:name="com.cyanogenmod.eleven.appwidgets.AppWidgetLargeAlternate"
+            android:name="org.lineageos.eleven.appwidgets.AppWidgetLargeAlternate"
             android:exported="false"
             android:label="@string/app_widget_large_alt" >
             <intent-filter>
@@ -201,7 +204,7 @@
                 android:resource="@xml/app_widget_large_alternate" />
         </receiver>
         <!-- Media button receiver -->
-        <receiver android:name="com.cyanogenmod.eleven.MediaButtonIntentReceiver" >
+        <receiver android:name="org.lineageos.eleven.MediaButtonIntentReceiver" >
             <intent-filter>
                 <action android:name="android.intent.action.MEDIA_BUTTON" />
                 <action android:name="android.media.AUDIO_BECOMING_NOISY" />
@@ -215,7 +218,7 @@
         </receiver>
         <!-- Music service -->
         <service
-            android:name="com.cyanogenmod.eleven.MusicPlaybackService"
+            android:name="org.lineageos.eleven.MusicPlaybackService"
             android:label="@string/app_name"
             android:process=":main" />
     </application>
diff --git a/README.md b/README.md
index 64e34de..55836c7 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,8 @@ Eleven music player (CyanogenMod/LineageOS) - compatible with Android version >1
 
 Copied from https://github.com/LineageOS/android_packages_apps_Eleven/archive/cm-14.1.zip (03.08.2017)
 
-Merged with upstream project on 28.12.2017
+Moved to lineage-15.1 branch.
+Merged with upstream project on 10.03.2018
 
 Made compatibility changes for android version >14 using as much material design as possible
 
diff --git a/build.gradle b/build.gradle
index d6d6a92..7024309 100644
--- a/build.gradle
+++ b/build.gradle
@@ -20,7 +20,7 @@ android {
     buildToolsVersion "27.0.3"
 
     defaultConfig {
-        applicationId "com.cyanogenmod.eleven"
+        applicationId "org.lineageos.eleven"
         targetSdkVersion 27
         renderscriptTargetApi 27
         renderscriptSupportModeEnabled true
@@ -84,14 +84,14 @@ android {
     }
 
     dependencies {
-        implementation "com.android.support:appcompat-v7:27.0.2"
-        implementation "com.android.support:palette-v7:27.0.2"
-        implementation "com.android.support:recyclerview-v7:27.0.2"
-        implementation "com.android.support:support-v4:27.0.2"
-        implementation "com.android.support:cardview-v7:27.0.2"
-        implementation "com.android.support:preference-v7:27.0.2"
-        implementation "com.android.support:gridlayout-v7:27.0.2"
-        implementation "com.android.support:support-vector-drawable:27.0.2"
+        implementation "com.android.support:appcompat-v7:27.1.0"
+        implementation "com.android.support:palette-v7:27.1.0"
+        implementation "com.android.support:recyclerview-v7:27.1.0"
+        implementation "com.android.support:support-v4:27.1.0"
+        implementation "com.android.support:cardview-v7:27.1.0"
+        implementation "com.android.support:preference-v7:27.1.0"
+        implementation "com.android.support:gridlayout-v7:27.1.0"
+        implementation "com.android.support:support-vector-drawable:27.1.0"
         implementation "com.google.guava:guava:20.0"
         implementation fileTree(include: ['*.jar'], dir: 'libs')
     }
diff --git a/project.properties b/project.properties
index 570b81d..3946ad0 100644
--- a/project.properties
+++ b/project.properties
@@ -17,9 +17,9 @@ renderscript.target=27
 renderscript.support.mode=true
 sdk.buildtools=27.0.3
 
-android.library.reference.1=../android-support-v7-appcompat-27.0.2
-android.library.reference.2=../android-support-v7-palette-27.0.2
-android.library.reference.3=../android-support-v7-recyclerview-27.0.2
-android.library.reference.4=../android-support-v4-27.0.2
-android.library.reference.5=../android-support-v7-cardview-27.0.2
-android.library.reference.6=../android-support-v7-preference-27.0.2
+android.library.reference.1=../android-support-v7-appcompat-27.1.0
+android.library.reference.2=../android-support-v7-palette-27.1.0
+android.library.reference.3=../android-support-v7-recyclerview-27.1.0
+android.library.reference.4=../android-support-v4-27.1.0
+android.library.reference.5=../android-support-v7-cardview-27.1.0
+android.library.reference.6=../android-support-v7-preference-27.1.0
diff --git a/res/layout-v21/activity_base.xml b/res/layout-v21/activity_base.xml
index 697b1d9..8d2fbad 100644
--- a/res/layout-v21/activity_base.xml
+++ b/res/layout-v21/activity_base.xml
@@ -14,7 +14,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<com.cyanogenmod.eleven.slidinguppanel.SlidingUpPanelLayout
+<org.lineageos.eleven.slidinguppanel.SlidingUpPanelLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:sothree="http://schemas.android.com/apk/res-auto"
     android:id="@+id/sliding_layout"
@@ -47,7 +47,7 @@
 
     </FrameLayout>
 
-    <com.cyanogenmod.eleven.slidinguppanel.SlidingUpPanelLayout
+    <org.lineageos.eleven.slidinguppanel.SlidingUpPanelLayout
         android:id="@+id/sliding_layout2"
         android:background="@color/activity_base_background_color"
         android:layout_width="match_parent"
@@ -78,7 +78,7 @@
 
                 <fragment
                     android:id="@+id/audioPlayerFragment"
-                    class="com.cyanogenmod.eleven.ui.fragments.AudioPlayerFragment"
+                    class="org.lineageos.eleven.ui.fragments.AudioPlayerFragment"
                     android:layout_width="match_parent"
                     android:layout_height="0dip"
                     android:layout_weight="1" />
@@ -110,10 +110,10 @@
 
             <fragment
                 android:id="@+id/queueFragment"
-                class="com.cyanogenmod.eleven.ui.fragments.QueueFragment"
+                class="org.lineageos.eleven.ui.fragments.QueueFragment"
                 android:layout_width="match_parent"
                 android:layout_height="0dip"
                 android:layout_weight="1" />
         </LinearLayout>
-    </com.cyanogenmod.eleven.slidinguppanel.SlidingUpPanelLayout>
-</com.cyanogenmod.eleven.slidinguppanel.SlidingUpPanelLayout>
+    </org.lineageos.eleven.slidinguppanel.SlidingUpPanelLayout>
+</org.lineageos.eleven.slidinguppanel.SlidingUpPanelLayout>
diff --git a/res/layout-v21/artist_detail_album.xml b/res/layout-v21/artist_detail_album.xml
index 16726a1..a72a0f1 100644
--- a/res/layout-v21/artist_detail_album.xml
+++ b/res/layout-v21/artist_detail_album.xml
@@ -39,7 +39,7 @@
             android:layout_alignParentLeft="true"
             android:scaleType="centerCrop" />
 
-        <com.cyanogenmod.eleven.widgets.PopupMenuButton
+        <org.lineageos.eleven.widgets.PopupMenuButton
             android:id="@+id/overflow"
             android:layout_width="@dimen/overflow_width"
             android:layout_height="match_parent"
diff --git a/res/layout-v21/bottom_action_bar.xml b/res/layout-v21/bottom_action_bar.xml
index 65ae624..55917f5 100644
--- a/res/layout-v21/bottom_action_bar.xml
+++ b/res/layout-v21/bottom_action_bar.xml
@@ -28,7 +28,7 @@
     android:background="@android:color/transparent"
     tools:ignore="ContentDescription" >
 
-    <com.cyanogenmod.eleven.widgets.SquareImageView
+    <org.lineageos.eleven.widgets.SquareImageView
         android:id="@+id/bottom_action_bar_album_art"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/res/layout-v21/fragment_music_browser_phone.xml b/res/layout-v21/fragment_music_browser_phone.xml
index ccb1b99..9f69b23 100644
--- a/res/layout-v21/fragment_music_browser_phone.xml
+++ b/res/layout-v21/fragment_music_browser_phone.xml
@@ -24,7 +24,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent" >
 
-        <com.cyanogenmod.eleven.widgets.ViewPagerTabs
+        <org.lineageos.eleven.widgets.ViewPagerTabs
             android:id="@+id/fragment_home_phone_pager_titles"
             android:layout_width="match_parent"
             android:layout_height="@dimen/tpi_height"
diff --git a/res/layout-v21/grid_items_normal.xml b/res/layout-v21/grid_items_normal.xml
index e57d45e..24b980c 100644
--- a/res/layout-v21/grid_items_normal.xml
+++ b/res/layout-v21/grid_items_normal.xml
@@ -61,7 +61,7 @@
 
             </LinearLayout>
 
-            <com.cyanogenmod.eleven.widgets.PopupMenuButton
+            <org.lineageos.eleven.widgets.PopupMenuButton
                 android:id="@+id/popup_menu_button"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
diff --git a/res/layout-v21/header_bar.xml b/res/layout-v21/header_bar.xml
index 0cb8281..94838a7 100644
--- a/res/layout-v21/header_bar.xml
+++ b/res/layout-v21/header_bar.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 
-<com.cyanogenmod.eleven.ui.HeaderBar 
+<org.lineageos.eleven.ui.HeaderBar 
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:sothree="http://schemas.android.com/apk/res-auto"
     android:layout_width="fill_parent"
@@ -69,4 +69,4 @@
         android:background="@drawable/selectable_background"
         sothree:srcCompat="@drawable/menu_button_light"/>
 
-</com.cyanogenmod.eleven.ui.HeaderBar>
+</org.lineageos.eleven.ui.HeaderBar>
diff --git a/res/layout/activity_base.xml b/res/layout/activity_base.xml
index 697b1d9..8d2fbad 100644
--- a/res/layout/activity_base.xml
+++ b/res/layout/activity_base.xml
@@ -14,7 +14,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<com.cyanogenmod.eleven.slidinguppanel.SlidingUpPanelLayout
+<org.lineageos.eleven.slidinguppanel.SlidingUpPanelLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:sothree="http://schemas.android.com/apk/res-auto"
     android:id="@+id/sliding_layout"
@@ -47,7 +47,7 @@
 
     </FrameLayout>
 
-    <com.cyanogenmod.eleven.slidinguppanel.SlidingUpPanelLayout
+    <org.lineageos.eleven.slidinguppanel.SlidingUpPanelLayout
         android:id="@+id/sliding_layout2"
         android:background="@color/activity_base_background_color"
         android:layout_width="match_parent"
@@ -78,7 +78,7 @@
 
                 <fragment
                     android:id="@+id/audioPlayerFragment"
-                    class="com.cyanogenmod.eleven.ui.fragments.AudioPlayerFragment"
+                    class="org.lineageos.eleven.ui.fragments.AudioPlayerFragment"
                     android:layout_width="match_parent"
                     android:layout_height="0dip"
                     android:layout_weight="1" />
@@ -110,10 +110,10 @@
 
             <fragment
                 android:id="@+id/queueFragment"
-                class="com.cyanogenmod.eleven.ui.fragments.QueueFragment"
+                class="org.lineageos.eleven.ui.fragments.QueueFragment"
                 android:layout_width="match_parent"
                 android:layout_height="0dip"
                 android:layout_weight="1" />
         </LinearLayout>
-    </com.cyanogenmod.eleven.slidinguppanel.SlidingUpPanelLayout>
-</com.cyanogenmod.eleven.slidinguppanel.SlidingUpPanelLayout>
+    </org.lineageos.eleven.slidinguppanel.SlidingUpPanelLayout>
+</org.lineageos.eleven.slidinguppanel.SlidingUpPanelLayout>
diff --git a/res/layout/album_art_fragment.xml b/res/layout/album_art_fragment.xml
index 423c62c..b8e44f8 100644
--- a/res/layout/album_art_fragment.xml
+++ b/res/layout/album_art_fragment.xml
@@ -18,7 +18,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent" >
 
-    <com.cyanogenmod.eleven.widgets.SquareImageView
+    <org.lineageos.eleven.widgets.SquareImageView
         android:id="@+id/audio_player_album_art"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/res/layout/album_detail_song.xml b/res/layout/album_detail_song.xml
index 0db36d8..8b61683 100644
--- a/res/layout/album_detail_song.xml
+++ b/res/layout/album_detail_song.xml
@@ -20,7 +20,7 @@
             sothree:srcCompat="@drawable/now_playing_icon"
             android:visibility="gone" />
 
-        <com.cyanogenmod.eleven.widgets.PopupMenuButton
+        <org.lineageos.eleven.widgets.PopupMenuButton
             android:id="@+id/overflow"
             android:layout_width="@dimen/overflow_width"
             android:layout_height="@dimen/overflow_height"
diff --git a/res/layout/artist_detail_album.xml b/res/layout/artist_detail_album.xml
index 16726a1..a72a0f1 100644
--- a/res/layout/artist_detail_album.xml
+++ b/res/layout/artist_detail_album.xml
@@ -39,7 +39,7 @@
             android:layout_alignParentLeft="true"
             android:scaleType="centerCrop" />
 
-        <com.cyanogenmod.eleven.widgets.PopupMenuButton
+        <org.lineageos.eleven.widgets.PopupMenuButton
             android:id="@+id/overflow"
             android:layout_width="@dimen/overflow_width"
             android:layout_height="match_parent"
diff --git a/res/layout/artist_detail_song.xml b/res/layout/artist_detail_song.xml
index af77475..85040a8 100644
--- a/res/layout/artist_detail_song.xml
+++ b/res/layout/artist_detail_song.xml
@@ -31,7 +31,7 @@
             sothree:srcCompat="@drawable/now_playing_icon"
             android:visibility="gone" />
 
-        <com.cyanogenmod.eleven.widgets.PopupMenuButton
+        <org.lineageos.eleven.widgets.PopupMenuButton
             android:id="@+id/overflow"
             android:layout_width="@dimen/overflow_width"
             android:layout_height="@dimen/overflow_height"
diff --git a/res/layout/blur_scrim_image.xml b/res/layout/blur_scrim_image.xml
index 14ff186..0afbd7e 100644
--- a/res/layout/blur_scrim_image.xml
+++ b/res/layout/blur_scrim_image.xml
@@ -14,7 +14,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.cyanogenmod.eleven.widgets.BlurScrimImage
+<org.lineageos.eleven.widgets.BlurScrimImage
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/blurScrimImage"
     android:layout_width="match_parent"
@@ -31,4 +31,4 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical"/>
-</com.cyanogenmod.eleven.widgets.BlurScrimImage>
+</org.lineageos.eleven.widgets.BlurScrimImage>
diff --git a/res/layout/bottom_action_bar.xml b/res/layout/bottom_action_bar.xml
index 65ae624..55917f5 100644
--- a/res/layout/bottom_action_bar.xml
+++ b/res/layout/bottom_action_bar.xml
@@ -28,7 +28,7 @@
     android:background="@android:color/transparent"
     tools:ignore="ContentDescription" >
 
-    <com.cyanogenmod.eleven.widgets.SquareImageView
+    <org.lineageos.eleven.widgets.SquareImageView
         android:id="@+id/bottom_action_bar_album_art"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/res/layout/fragment_music_browser_phone.xml b/res/layout/fragment_music_browser_phone.xml
index ccb1b99..9f69b23 100644
--- a/res/layout/fragment_music_browser_phone.xml
+++ b/res/layout/fragment_music_browser_phone.xml
@@ -24,7 +24,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent" >
 
-        <com.cyanogenmod.eleven.widgets.ViewPagerTabs
+        <org.lineageos.eleven.widgets.ViewPagerTabs
             android:id="@+id/fragment_home_phone_pager_titles"
             android:layout_width="match_parent"
             android:layout_height="@dimen/tpi_height"
diff --git a/res/layout/grid_items_normal.xml b/res/layout/grid_items_normal.xml
index e57d45e..24b980c 100644
--- a/res/layout/grid_items_normal.xml
+++ b/res/layout/grid_items_normal.xml
@@ -61,7 +61,7 @@
 
             </LinearLayout>
 
-            <com.cyanogenmod.eleven.widgets.PopupMenuButton
+            <org.lineageos.eleven.widgets.PopupMenuButton
                 android:id="@+id/popup_menu_button"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
diff --git a/res/layout/header_bar.xml b/res/layout/header_bar.xml
index 12b7a1a..46a0a0b 100644
--- a/res/layout/header_bar.xml
+++ b/res/layout/header_bar.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 
-<com.cyanogenmod.eleven.ui.HeaderBar 
+<org.lineageos.eleven.ui.HeaderBar 
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:sothree="http://schemas.android.com/apk/res-auto"
     android:layout_width="fill_parent"
@@ -70,4 +70,4 @@
         android:background="@drawable/selectable_background"
         sothree:srcCompat="@drawable/menu_button_light"/>
 
-</com.cyanogenmod.eleven.ui.HeaderBar>
+</org.lineageos.eleven.ui.HeaderBar>
diff --git a/res/layout/list_base.xml b/res/layout/list_base.xml
index 42b85a4..6737ecc 100644
--- a/res/layout/list_base.xml
+++ b/res/layout/list_base.xml
@@ -23,7 +23,7 @@
     <include
         layout="@layout/loading_empty_container" />
 
-    <com.cyanogenmod.eleven.dragdrop.DragSortListView
+    <org.lineageos.eleven.dragdrop.DragSortListView
         android:id="@+id/list_base"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/res/layout/list_base_padding.xml b/res/layout/list_base_padding.xml
index a2e36ab..f0e6c08 100644
--- a/res/layout/list_base_padding.xml
+++ b/res/layout/list_base_padding.xml
@@ -24,7 +24,7 @@
     <include
         layout="@layout/loading_empty_container" />
 
-    <com.cyanogenmod.eleven.dragdrop.DragSortListView
+    <org.lineageos.eleven.dragdrop.DragSortListView
         android:id="@+id/list_base"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/res/layout/list_item_common.xml b/res/layout/list_item_common.xml
index d8b7535..cc2984a 100644
--- a/res/layout/list_item_common.xml
+++ b/res/layout/list_item_common.xml
@@ -54,7 +54,7 @@
             sothree:srcCompat="@drawable/now_playing_icon"
             android:visibility="gone" />
 
-        <com.cyanogenmod.eleven.widgets.PopupMenuButton
+        <org.lineageos.eleven.widgets.PopupMenuButton
             android:id="@+id/popup_menu_button"
             android:layout_width="@dimen/overflow_width"
             android:layout_height="@dimen/overflow_height"
diff --git a/res/layout/list_item_queue.xml b/res/layout/list_item_queue.xml
index eb9ac9c..9886c81 100644
--- a/res/layout/list_item_queue.xml
+++ b/res/layout/list_item_queue.xml
@@ -68,7 +68,7 @@
             layout="@layout/play_pause_progress_button"/>
     </FrameLayout>
 
-    <com.cyanogenmod.eleven.widgets.PopupMenuButton
+    <org.lineageos.eleven.widgets.PopupMenuButton
         android:id="@id/popup_menu_button"
         android:layout_width="@dimen/overflow_width"
         android:layout_height="@dimen/overflow_height"
diff --git a/res/layout/list_item_search_history.xml b/res/layout/list_item_search_history.xml
index 67ebf48..3f12c8b 100644
--- a/res/layout/list_item_search_history.xml
+++ b/res/layout/list_item_search_history.xml
@@ -31,7 +31,7 @@
         android:paddingLeft="@dimen/list_preferred_item_padding"
         android:paddingRight="@dimen/list_preferred_item_padding">
 
-        <com.cyanogenmod.eleven.widgets.SquareImageView
+        <org.lineageos.eleven.widgets.SquareImageView
             android:id="@+id/image"
             android:layout_width="@dimen/list_item_image_width"
             android:layout_height="@dimen/list_item_image_height"
diff --git a/res/layout/list_item_simple.xml b/res/layout/list_item_simple.xml
index dd3c00e..82171f2 100644
--- a/res/layout/list_item_simple.xml
+++ b/res/layout/list_item_simple.xml
@@ -61,7 +61,7 @@
             android:layout_toLeftOf="@+id/popup_menu_button"
             android:layout_centerVertical="true" />
 
-        <com.cyanogenmod.eleven.widgets.PopupMenuButton
+        <org.lineageos.eleven.widgets.PopupMenuButton
             android:id="@id/popup_menu_button"
             android:layout_width="@dimen/overflow_width"
             android:layout_height="@dimen/overflow_height"
diff --git a/res/layout/list_item_top_tracks.xml b/res/layout/list_item_top_tracks.xml
index fa127c8..c459cb9 100644
--- a/res/layout/list_item_top_tracks.xml
+++ b/res/layout/list_item_top_tracks.xml
@@ -93,7 +93,7 @@
                 sothree:srcCompat="@drawable/now_playing_icon"
                 android:visibility="gone" />
 
-            <com.cyanogenmod.eleven.widgets.PopupMenuButton
+            <org.lineageos.eleven.widgets.PopupMenuButton
                 android:id="@+id/popup_menu_button"
                 android:layout_width="@dimen/overflow_width"
                 android:layout_height="@dimen/overflow_height"
diff --git a/res/layout/loading_empty_container.xml b/res/layout/loading_empty_container.xml
index a2d5355..146793b 100644
--- a/res/layout/loading_empty_container.xml
+++ b/res/layout/loading_empty_container.xml
@@ -15,7 +15,7 @@
      limitations under the License.
 -->
 
-<com.cyanogenmod.eleven.widgets.LoadingEmptyContainer
+<org.lineageos.eleven.widgets.LoadingEmptyContainer
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/loading_empty_container"
     android:gravity="center"
@@ -32,4 +32,4 @@
 
     <include
         layout="@layout/no_results_message" />
-</com.cyanogenmod.eleven.widgets.LoadingEmptyContainer>
+</org.lineageos.eleven.widgets.LoadingEmptyContainer>
diff --git a/res/layout/main_album_flow.xml b/res/layout/main_album_flow.xml
index d2e7cde..1807540 100644
--- a/res/layout/main_album_flow.xml
+++ b/res/layout/main_album_flow.xml
@@ -15,17 +15,17 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<com.cyanogenmod.eleven.widgets.SquareFrame
+<org.lineageos.eleven.widgets.SquareFrame
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
-    <com.cyanogenmod.eleven.widgets.SquareViewPager
+    <org.lineageos.eleven.widgets.SquareViewPager
         android:id="@+id/audio_player_album_art_viewpager"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
     <include layout="@layout/loading_empty_container" />
 
-    <com.cyanogenmod.eleven.widgets.VisualizerView
+    <org.lineageos.eleven.widgets.VisualizerView
         android:id="@+id/visualizerView"
         android:gravity="bottom"
         android:layout_gravity="bottom"
@@ -48,4 +48,4 @@
         android:textColor="@color/audio_player_lyrics_text_color"
         android:textSize="@dimen/text_size_small"
         android:alpha="0.0"/>
-</com.cyanogenmod.eleven.widgets.SquareFrame>
\ No newline at end of file
+</org.lineageos.eleven.widgets.SquareFrame>
\ No newline at end of file
diff --git a/res/layout/main_playback_controls.xml b/res/layout/main_playback_controls.xml
index b8d7000..2674972 100644
--- a/res/layout/main_playback_controls.xml
+++ b/res/layout/main_playback_controls.xml
@@ -58,7 +58,7 @@
                 android:textSize="@dimen/audio_player_time_text_size"
                 android:textStyle="bold"/>
 
-            <com.cyanogenmod.eleven.widgets.RepeatingImageButton
+            <org.lineageos.eleven.widgets.RepeatingImageButton
                 android:id="@+id/action_button_previous"
                 android:layout_width="@dimen/audio_player_controls_end_button_width"
                 android:layout_height="@dimen/audio_player_controls_end_button_height"
@@ -77,7 +77,7 @@
                 android:layout_below="@id/audio_player_current_time"
                 android:background="@color/now_playing_divider" />
 
-            <com.cyanogenmod.eleven.widgets.ShuffleButton
+            <org.lineageos.eleven.widgets.ShuffleButton
                 android:id="@+id/action_button_shuffle"
                 android:layout_width="@dimen/audio_player_controls_end_button_width"
                 android:layout_height="@dimen/audio_player_controls_end_button_height"
@@ -108,7 +108,7 @@
                 android:textSize="@dimen/audio_player_time_text_size"
                 android:textStyle="bold"/>
 
-            <com.cyanogenmod.eleven.widgets.RepeatingImageButton
+            <org.lineageos.eleven.widgets.RepeatingImageButton
                 android:id="@+id/action_button_next"
                 android:layout_width="@dimen/audio_player_controls_end_button_width"
                 android:layout_height="@dimen/audio_player_controls_end_button_height"
@@ -126,7 +126,7 @@
                 android:layout_alignParentLeft="true"
                 android:layout_below="@id/audio_player_total_time" />
 
-            <com.cyanogenmod.eleven.widgets.RepeatButton
+            <org.lineageos.eleven.widgets.RepeatButton
                 android:id="@+id/action_button_repeat"
                 android:layout_width="@dimen/audio_player_controls_end_button_width"
                 android:layout_height="@dimen/audio_player_controls_end_button_height"
diff --git a/res/layout/no_results_message.xml b/res/layout/no_results_message.xml
index efa0b5c..e3ed613 100644
--- a/res/layout/no_results_message.xml
+++ b/res/layout/no_results_message.xml
@@ -15,7 +15,7 @@
      limitations under the License.
 -->
 
-<com.cyanogenmod.eleven.widgets.NoResultsContainer
+<org.lineageos.eleven.widgets.NoResultsContainer
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:sothree="http://schemas.android.com/apk/res-auto"
     android:id="@+id/no_results_container"
@@ -76,4 +76,4 @@
         android:textColor="@color/no_results"
         android:textSize="@dimen/no_results_text_secondary"
         android:text="@string/empty_generic_secondary" />
-</com.cyanogenmod.eleven.widgets.NoResultsContainer>
+</org.lineageos.eleven.widgets.NoResultsContainer>
diff --git a/res/layout/play_pause_progress_button.xml b/res/layout/play_pause_progress_button.xml
index 9dde18d..4e1754f 100644
--- a/res/layout/play_pause_progress_button.xml
+++ b/res/layout/play_pause_progress_button.xml
@@ -14,7 +14,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.cyanogenmod.eleven.widgets.PlayPauseProgressButton
+<org.lineageos.eleven.widgets.PlayPauseProgressButton
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:sothree="http://schemas.android.com/apk/res-auto"
     android:id="@+id/playPauseProgressButton"
@@ -23,7 +23,7 @@
     android:visibility="gone">
 
     <!-- TODO: Figure out why scaleType: centerInside isn't properly scaling up -->
-    <com.cyanogenmod.eleven.widgets.PlayPauseButton
+    <org.lineageos.eleven.widgets.PlayPauseButton
         android:id="@+id/action_button_play"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
@@ -55,4 +55,4 @@
         android:max="1000"
         android:progressDrawable="@drawable/circular_drawable" />
 
-</com.cyanogenmod.eleven.widgets.PlayPauseProgressButton>
+</org.lineageos.eleven.widgets.PlayPauseProgressButton>
diff --git a/res/layout/playlist_detail_header.xml b/res/layout/playlist_detail_header.xml
index 1bfab83..1255f08 100644
--- a/res/layout/playlist_detail_header.xml
+++ b/res/layout/playlist_detail_header.xml
@@ -19,7 +19,7 @@
     android:layout_width="match_parent"
     android:layout_height="@dimen/playlist_detail_header_height">
 
-    <com.cyanogenmod.eleven.widgets.LayoutSuppressingImageView
+    <org.lineageos.eleven.widgets.LayoutSuppressingImageView
         android:id="@+id/image"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/res/layout/square_image_view.xml b/res/layout/square_image_view.xml
index a8e09b2..0627f33 100644
--- a/res/layout/square_image_view.xml
+++ b/res/layout/square_image_view.xml
@@ -15,15 +15,15 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<com.cyanogenmod.eleven.widgets.SquareView xmlns:android="http://schemas.android.com/apk/res/android"
+<org.lineageos.eleven.widgets.SquareView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/square_view"
     android:layout_width="match_parent"
     android:layout_height="match_parent" >
 
-    <com.cyanogenmod.eleven.widgets.SquareImageView
+    <org.lineageos.eleven.widgets.SquareImageView
         android:id="@+id/image"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:scaleType="centerCrop" />
 
-</com.cyanogenmod.eleven.widgets.SquareView>
\ No newline at end of file
+</org.lineageos.eleven.widgets.SquareView>
\ No newline at end of file
diff --git a/res/mipmap-anydpi-v26/ic_launcher.xml b/res/mipmap-anydpi-v26/ic_launcher.xml
new file mode 100644
index 0000000..d8649ba
--- /dev/null
+++ b/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) 2018 The LineageOS Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@mipmap/ic_background"/>
+    <foreground android:drawable="@mipmap/ic_foreground"/>
+</adaptive-icon>
+
diff --git a/res/mipmap-hdpi-v26/ic_background.png b/res/mipmap-hdpi-v26/ic_background.png
new file mode 100644
index 0000000..6d8a41a
Binary files /dev/null and b/res/mipmap-hdpi-v26/ic_background.png differ
diff --git a/res/mipmap-hdpi-v26/ic_foreground.png b/res/mipmap-hdpi-v26/ic_foreground.png
new file mode 100644
index 0000000..a4b00df
Binary files /dev/null and b/res/mipmap-hdpi-v26/ic_foreground.png differ
diff --git a/res/mipmap-hdpi/ic_launcher_eleven.png b/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from res/mipmap-hdpi/ic_launcher_eleven.png
rename to res/mipmap-hdpi/ic_launcher.png
diff --git a/res/mipmap-mdpi-v26/ic_background.png b/res/mipmap-mdpi-v26/ic_background.png
new file mode 100644
index 0000000..290a606
Binary files /dev/null and b/res/mipmap-mdpi-v26/ic_background.png differ
diff --git a/res/mipmap-mdpi-v26/ic_foreground.png b/res/mipmap-mdpi-v26/ic_foreground.png
new file mode 100644
index 0000000..e83005b
Binary files /dev/null and b/res/mipmap-mdpi-v26/ic_foreground.png differ
diff --git a/res/mipmap-mdpi/ic_launcher_eleven.png b/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from res/mipmap-mdpi/ic_launcher_eleven.png
rename to res/mipmap-mdpi/ic_launcher.png
diff --git a/res/mipmap-xhdpi-v26/ic_background.png b/res/mipmap-xhdpi-v26/ic_background.png
new file mode 100644
index 0000000..2fb57c0
Binary files /dev/null and b/res/mipmap-xhdpi-v26/ic_background.png differ
diff --git a/res/mipmap-xhdpi-v26/ic_foreground.png b/res/mipmap-xhdpi-v26/ic_foreground.png
new file mode 100644
index 0000000..31e3bbf
Binary files /dev/null and b/res/mipmap-xhdpi-v26/ic_foreground.png differ
diff --git a/res/mipmap-xhdpi/ic_launcher_eleven.png b/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from res/mipmap-xhdpi/ic_launcher_eleven.png
rename to res/mipmap-xhdpi/ic_launcher.png
diff --git a/res/mipmap-xxhdpi-v26/ic_background.png b/res/mipmap-xxhdpi-v26/ic_background.png
new file mode 100644
index 0000000..299086b
Binary files /dev/null and b/res/mipmap-xxhdpi-v26/ic_background.png differ
diff --git a/res/mipmap-xxhdpi-v26/ic_foreground.png b/res/mipmap-xxhdpi-v26/ic_foreground.png
new file mode 100644
index 0000000..18fc65b
Binary files /dev/null and b/res/mipmap-xxhdpi-v26/ic_foreground.png differ
diff --git a/res/mipmap-xxhdpi/ic_launcher_eleven.png b/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from res/mipmap-xxhdpi/ic_launcher_eleven.png
rename to res/mipmap-xxhdpi/ic_launcher.png
diff --git a/res/mipmap-xxxhdpi-v26/ic_background.png b/res/mipmap-xxxhdpi-v26/ic_background.png
new file mode 100644
index 0000000..4acede8
Binary files /dev/null and b/res/mipmap-xxxhdpi-v26/ic_background.png differ
diff --git a/res/mipmap-xxxhdpi-v26/ic_foreground.png b/res/mipmap-xxxhdpi-v26/ic_foreground.png
new file mode 100644
index 0000000..c37e98f
Binary files /dev/null and b/res/mipmap-xxxhdpi-v26/ic_foreground.png differ
diff --git a/res/mipmap-xxxhdpi/ic_launcher_eleven.png b/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from res/mipmap-xxxhdpi/ic_launcher_eleven.png
rename to res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/res/values-az-rAZ/plurals.xml b/res/values-az/plurals.xml
similarity index 100%
rename from res/values-az-rAZ/plurals.xml
rename to res/values-az/plurals.xml
diff --git a/res/values-az-rAZ/strings.xml b/res/values-az/strings.xml
similarity index 100%
rename from res/values-az-rAZ/strings.xml
rename to res/values-az/strings.xml
diff --git a/res/values-bn-rBD/plurals.xml b/res/values-b+sr+Latn/plurals.xml
similarity index 100%
rename from res/values-bn-rBD/plurals.xml
rename to res/values-b+sr+Latn/plurals.xml
diff --git a/res/values-bn-rBD/strings.xml b/res/values-b+sr+Latn/strings.xml
similarity index 100%
rename from res/values-bn-rBD/strings.xml
rename to res/values-b+sr+Latn/strings.xml
diff --git a/res/values-be-rBY/plurals.xml b/res/values-be-rBY/plurals.xml
deleted file mode 100644
index ff50b0f..0000000
--- a/res/values-be-rBY/plurals.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2013 Andrew Neal
-     Copyright (C) 2012-2014 The CyanogenMod Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Used to indicate the number of artists -->
-  <plurals name="Nartists">
-    <item quantity="one"><xliff:g id="count">%d</xliff:g> выканаўца</item>
-    <item quantity="few"><xliff:g id="count">%d</xliff:g> выканаўцы</item>
-    <item quantity="other"><xliff:g id="count">%d</xliff:g> выканаўцаў</item>
-  </plurals>
-  <!-- Used to indicate the number of albums for an artist -->
-  <plurals name="Nalbums">
-    <item quantity="one"><xliff:g id="count">%d</xliff:g> альбом</item>
-    <item quantity="few"><xliff:g id="count">%d</xliff:g> альбомы</item>
-    <item quantity="other"><xliff:g id="count">%d</xliff:g> альбомаў</item>
-  </plurals>
-  <!-- Used to indicate the number of songs for an album -->
-  <plurals name="Nsongs">
-    <item quantity="one"><xliff:g id="count">%d</xliff:g> трэк</item>
-    <item quantity="few"><xliff:g id="count">%d</xliff:g> трэкі</item>
-    <item quantity="other"><xliff:g id="count">%d</xliff:g> трэкаў</item>
-  </plurals>
-  <!-- Used to indicate the number of genres -->
-  <plurals name="Ngenres">
-    <item quantity="one"><xliff:g id="count">%d</xliff:g> жанр</item>
-    <item quantity="few"><xliff:g id="count">%d</xliff:g> жанры</item>
-    <item quantity="other"><xliff:g id="count">%d</xliff:g> жанраў</item>
-  </plurals>
-  <!-- Used to show a shortened version of hours-->
-  <plurals name="Nhours">
-    <item quantity="one"><xliff:g id="hours">%d</xliff:g>г</item>
-    <item quantity="few"><xliff:g id="hours">%d</xliff:g>г</item>
-    <item quantity="other"><xliff:g id="hours">%d</xliff:g>г</item>
-  </plurals>
-  <!-- Used to show a shortened version of minutes -->
-  <plurals name="Nminutes">
-    <item quantity="one"><xliff:g id="minutes">%d</xliff:g>х</item>
-    <item quantity="few"><xliff:g id="minutes">%d</xliff:g>х</item>
-    <item quantity="other"><xliff:g id="minutes">%d</xliff:g>х</item>
-  </plurals>
-  <!-- Toasts after adding song(s) to playlists -->
-  <plurals name="NNNtrackstoplaylist">
-    <item quantity="one"><xliff:g id="number" example="1">%d</xliff:g> трэк дададзены ў плэйліст.</item>
-    <item quantity="few"><xliff:g id="number" example="3">%d</xliff:g> трэкі дададзены ў плэйліст.</item>
-    <item quantity="other"><xliff:g id="number" example="27">%d</xliff:g> трэкаў дададзены ў плэйліст.</item>
-  </plurals>
-  <!-- Toasts after removing song(s) from playlists -->
-  <plurals name="NNNtracksfromplaylist">
-    <item quantity="one"><xliff:g id="number" example="1">%d</xliff:g> трэк выдалены з плэйліста.</item>
-    <item quantity="few"><xliff:g id="number" example="3">%d</xliff:g> трэкі выдалены з плэйліста.</item>
-    <item quantity="other"><xliff:g id="number" example="27">%d</xliff:g> трэкаў выдалены з плэйліста.</item>
-  </plurals>
-  <!-- Toasts after adding song(s) to queue -->
-  <plurals name="NNNtrackstoqueue">
-    <item quantity="one"><xliff:g id="number" example="1">%d</xliff:g> трэк дададзены ў чаргу.</item>
-    <item quantity="few"><xliff:g id="number" example="3">%d</xliff:g> трэкі дададзены ў чаргу.</item>
-    <item quantity="other"><xliff:g id="number" example="27">%d</xliff:g> трэкаў дададзены ў чаргу.</item>
-  </plurals>
-  <!-- Toasts after adding song(s) to the favorites list -->
-  <plurals name="NNNtrackstofavorites">
-    <item quantity="one"><xliff:g id="number" example="1">%d</xliff:g> трэк дададзены ў абранае.</item>
-    <item quantity="few"><xliff:g id="number" example="3">%d</xliff:g> трэкі дададзены ў абранае.</item>
-    <item quantity="other"><xliff:g id="number" example="27">%d</xliff:g> трэкаў дададзены ў абранае.</item>
-  </plurals>
-  <!-- Toast confirming that song(s) was/were deleted. -->
-  <plurals name="NNNtracksdeleted">
-    <item quantity="one"><xliff:g id="songs_to_delete" example="1">%d</xliff:g> трэк выдалены.</item>
-    <item quantity="few"><xliff:g id="songs_to_delete" example="3">%d</xliff:g> трэкі выдалены.</item>
-    <item quantity="other"><xliff:g id="songs_to_delete" example="27">%d</xliff:g> трэкаў выдалены.</item>
-  </plurals>
-</resources>
diff --git a/res/values-bs-rBA/plurals.xml b/res/values-be/plurals.xml
similarity index 100%
rename from res/values-bs-rBA/plurals.xml
rename to res/values-be/plurals.xml
diff --git a/res/values-be-rBY/strings.xml b/res/values-be/strings.xml
similarity index 100%
rename from res/values-be-rBY/strings.xml
rename to res/values-be/strings.xml
diff --git a/res/values-csb-rPL/plurals.xml b/res/values-bn/plurals.xml
similarity index 100%
rename from res/values-csb-rPL/plurals.xml
rename to res/values-bn/plurals.xml
diff --git a/res/values-bs-rBA/strings.xml b/res/values-bn/strings.xml
similarity index 100%
rename from res/values-bs-rBA/strings.xml
rename to res/values-bn/strings.xml
diff --git a/res/values-fil-rPH/plurals.xml b/res/values-bs/plurals.xml
similarity index 100%
rename from res/values-fil-rPH/plurals.xml
rename to res/values-bs/plurals.xml
diff --git a/res/values-csb-rPL/strings.xml b/res/values-bs/strings.xml
similarity index 100%
rename from res/values-csb-rPL/strings.xml
rename to res/values-bs/strings.xml
diff --git a/res/values-cs/plurals.xml b/res/values-cs/plurals.xml
index f1213ef..9827780 100644
--- a/res/values-cs/plurals.xml
+++ b/res/values-cs/plurals.xml
@@ -18,69 +18,14 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Used to indicate the number of artists -->
-  <plurals name="Nartists">
-    <item quantity="one"><xliff:g id="count">%d</xliff:g> umělec</item>
-    <item quantity="few"><xliff:g id="count">%d</xliff:g> umělci</item>
-    <item quantity="other"><xliff:g id="count">%d</xliff:g> umělců</item>
-  </plurals>
   <!-- Used to indicate the number of albums for an artist -->
-  <plurals name="Nalbums">
-    <item quantity="one"><xliff:g id="count">%d</xliff:g> album</item>
-    <item quantity="few"><xliff:g id="count">%d</xliff:g> alba</item>
-    <item quantity="other"><xliff:g id="count">%d</xliff:g> alb</item>
-  </plurals>
   <!-- Used to indicate the number of songs for an album -->
-  <plurals name="Nsongs">
-    <item quantity="one"><xliff:g id="count">%d</xliff:g> skladba</item>
-    <item quantity="few"><xliff:g id="count">%d</xliff:g> skladby</item>
-    <item quantity="other"><xliff:g id="count">%d</xliff:g> skladeb</item>
-  </plurals>
   <!-- Used to indicate the number of genres -->
-  <plurals name="Ngenres">
-    <item quantity="one"><xliff:g id="count">%d</xliff:g> žánr</item>
-    <item quantity="few"><xliff:g id="count">%d</xliff:g> žánry</item>
-    <item quantity="other"><xliff:g id="count">%d</xliff:g> žánrů</item>
-  </plurals>
   <!-- Used to show a shortened version of hours-->
-  <plurals name="Nhours">
-    <item quantity="one"><xliff:g id="hours">%d</xliff:g>h</item>
-    <item quantity="few"><xliff:g id="hours">%d</xliff:g>h</item>
-    <item quantity="other"><xliff:g id="hours">%d</xliff:g>h</item>
-  </plurals>
   <!-- Used to show a shortened version of minutes -->
-  <plurals name="Nminutes">
-    <item quantity="one"><xliff:g id="minutes">%d</xliff:g>m</item>
-    <item quantity="few"><xliff:g id="minutes">%d</xliff:g>m</item>
-    <item quantity="other"><xliff:g id="minutes">%d</xliff:g>m</item>
-  </plurals>
   <!-- Toasts after adding song(s) to playlists -->
-  <plurals name="NNNtrackstoplaylist">
-    <item quantity="one">Do seznamu skladeb přidána <xliff:g id="number" example="1">%d</xliff:g> skladba.</item>
-    <item quantity="few">Do seznamu skladeb přidány <xliff:g id="number" example="1">%d</xliff:g> skladby.</item>
-    <item quantity="other">Do seznamu skladeb přidáno <xliff:g id="number" example="1">%d</xliff:g> skladeb.</item>
-  </plurals>
   <!-- Toasts after removing song(s) from playlists -->
-  <plurals name="NNNtracksfromplaylist">
-    <item quantity="one">Ze seznamu skladeb odebrána <xliff:g id="number" example="1">%d</xliff:g> skladba.</item>
-    <item quantity="few">Ze seznamu skladeb odebrány <xliff:g id="number" example="1">%d</xliff:g> skladby.</item>
-    <item quantity="other">Ze seznamu skladeb odebráno <xliff:g id="number" example="1">%d</xliff:g> skladeb.</item>
-  </plurals>
   <!-- Toasts after adding song(s) to queue -->
-  <plurals name="NNNtrackstoqueue">
-    <item quantity="one">Do fronty přidána <xliff:g id="number" example="1">%d</xliff:g> skladba.</item>
-    <item quantity="few">Do fronty přidány <xliff:g id="number" example="1">%d</xliff:g> skladby.</item>
-    <item quantity="other">Do fronty přidáno <xliff:g id="number" example="1">%d</xliff:g> skladeb.</item>
-  </plurals>
   <!-- Toasts after adding song(s) to the favorites list -->
-  <plurals name="NNNtrackstofavorites">
-    <item quantity="one">Do oblíbených byla přidána <xliff:g id="number" example="1">%d</xliff:g> skladba.</item>
-    <item quantity="few">Do oblíbených byly přidány <xliff:g id="number" example="2">%d</xliff:g> skladby.</item>
-    <item quantity="other">Do oblíbených bylo přidáno <xliff:g id="number" example="5">%d</xliff:g> skladeb.</item>
-  </plurals>
   <!-- Toast confirming that song(s) was/were deleted. -->
-  <plurals name="NNNtracksdeleted">
-    <item quantity="one">Odstraněna <xliff:g id="songs_to_delete" example="1">%d</xliff:g> skladba.</item>
-    <item quantity="few">Odstraněny <xliff:g id="songs_to_delete" example="1">%d</xliff:g> skladby.</item>
-    <item quantity="other">Odstraněno <xliff:g id="songs_to_delete" example="1">%d</xliff:g> skladeb.</item>
-  </plurals>
 </resources>
diff --git a/res/values-frp-rIT/plurals.xml b/res/values-csb/plurals.xml
similarity index 100%
rename from res/values-frp-rIT/plurals.xml
rename to res/values-csb/plurals.xml
diff --git a/res/values-fil-rPH/strings.xml b/res/values-csb/strings.xml
similarity index 100%
rename from res/values-fil-rPH/strings.xml
rename to res/values-csb/strings.xml
diff --git a/res/values-cy/strings.xml b/res/values-cy/strings.xml
index ac715c0..a27447f 100644
--- a/res/values-cy/strings.xml
+++ b/res/values-cy/strings.xml
@@ -31,4 +31,7 @@
   <!-- App widget -->
   <!-- Empty list / error messages -->
   <!-- Section Headers -->
+  <string name="header_1_to_2_minutes">1 - 2 munud</string>
+  <string name="header_10_to_30_minutes">10 - 30 munud</string>
+  <string name="header_1_song">1 cân</string>
 </resources>
diff --git a/res/values-gd-rGB/plurals.xml b/res/values-en-rCA/plurals.xml
similarity index 100%
rename from res/values-gd-rGB/plurals.xml
rename to res/values-en-rCA/plurals.xml
diff --git a/res/values-frp-rIT/strings.xml b/res/values-en-rCA/strings.xml
similarity index 100%
rename from res/values-frp-rIT/strings.xml
rename to res/values-en-rCA/strings.xml
diff --git a/res/values-et-rEE/plurals.xml b/res/values-et/plurals.xml
similarity index 100%
rename from res/values-et-rEE/plurals.xml
rename to res/values-et/plurals.xml
diff --git a/res/values-et-rEE/strings.xml b/res/values-et/strings.xml
similarity index 100%
rename from res/values-et-rEE/strings.xml
rename to res/values-et/strings.xml
diff --git a/res/values-eu-rES/plurals.xml b/res/values-eu/plurals.xml
similarity index 100%
rename from res/values-eu-rES/plurals.xml
rename to res/values-eu/plurals.xml
diff --git a/res/values-eu-rES/strings.xml b/res/values-eu/strings.xml
similarity index 100%
rename from res/values-eu-rES/strings.xml
rename to res/values-eu/strings.xml
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 904854d..3c29af6 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -138,7 +138,7 @@
   <string name="app_widget_small">Musiikki: 4 \u00d7 1</string>
   <string name="app_widget_large">Musiikki: 4 \u00d7 2</string>
   <string name="app_widget_large_alt">Musiikki: 4 \u00d7 2 (vaihtoehtoinen)</string>
-  <string name="app_widget_recent">Apollo: äskettäin kuunneltu</string>
+  <string name="app_widget_recent">Musiikki: äskettäin kuunneltu</string>
   <!-- Empty list / error messages -->
   <string name="no_effects_for_you">Taajuuskorjainta ei voitu avata.</string>
   <string name="empty_music">Kopioi musiikkia tietokoneelta laitteeseen käyttämällä USB-kaapelia.</string>
diff --git a/res/values-hy-rAM/plurals.xml b/res/values-fil/plurals.xml
similarity index 100%
rename from res/values-hy-rAM/plurals.xml
rename to res/values-fil/plurals.xml
diff --git a/res/values-gd-rGB/strings.xml b/res/values-fil/strings.xml
similarity index 100%
rename from res/values-gd-rGB/strings.xml
rename to res/values-fil/strings.xml
diff --git a/res/values-is-rIS/plurals.xml b/res/values-frp/plurals.xml
similarity index 100%
rename from res/values-is-rIS/plurals.xml
rename to res/values-frp/plurals.xml
diff --git a/res/values-hy-rAM/strings.xml b/res/values-frp/strings.xml
similarity index 100%
rename from res/values-hy-rAM/strings.xml
rename to res/values-frp/strings.xml
diff --git a/res/values-ka-rGE/plurals.xml b/res/values-gd/plurals.xml
similarity index 100%
rename from res/values-ka-rGE/plurals.xml
rename to res/values-gd/plurals.xml
diff --git a/res/values-is-rIS/strings.xml b/res/values-gd/strings.xml
similarity index 100%
rename from res/values-is-rIS/strings.xml
rename to res/values-gd/strings.xml
diff --git a/res/values-gl-rES/plurals.xml b/res/values-gl/plurals.xml
similarity index 100%
rename from res/values-gl-rES/plurals.xml
rename to res/values-gl/plurals.xml
diff --git a/res/values-gl-rES/strings.xml b/res/values-gl/strings.xml
similarity index 100%
rename from res/values-gl-rES/strings.xml
rename to res/values-gl/strings.xml
diff --git a/res/values-gu-rIN/plurals.xml b/res/values-gu/plurals.xml
similarity index 100%
rename from res/values-gu-rIN/plurals.xml
rename to res/values-gu/plurals.xml
diff --git a/res/values-gu-rIN/strings.xml b/res/values-gu/strings.xml
similarity index 100%
rename from res/values-gu-rIN/strings.xml
rename to res/values-gu/strings.xml
diff --git a/res/values-kk-rKZ/plurals.xml b/res/values-hy/plurals.xml
similarity index 100%
rename from res/values-kk-rKZ/plurals.xml
rename to res/values-hy/plurals.xml
diff --git a/res/values-ka-rGE/strings.xml b/res/values-hy/strings.xml
similarity index 100%
rename from res/values-ka-rGE/strings.xml
rename to res/values-hy/strings.xml
diff --git a/res/values-km-rKH/plurals.xml b/res/values-is/plurals.xml
similarity index 100%
rename from res/values-km-rKH/plurals.xml
rename to res/values-is/plurals.xml
diff --git a/res/values-kk-rKZ/strings.xml b/res/values-is/strings.xml
similarity index 100%
rename from res/values-kk-rKZ/strings.xml
rename to res/values-is/strings.xml
diff --git a/res/values-ky-rKG/plurals.xml b/res/values-ka/plurals.xml
similarity index 100%
rename from res/values-ky-rKG/plurals.xml
rename to res/values-ka/plurals.xml
diff --git a/res/values-km-rKH/strings.xml b/res/values-ka/strings.xml
similarity index 100%
rename from res/values-km-rKH/strings.xml
rename to res/values-ka/strings.xml
diff --git a/res/values-lo-rLA/plurals.xml b/res/values-kk/plurals.xml
similarity index 100%
rename from res/values-lo-rLA/plurals.xml
rename to res/values-kk/plurals.xml
diff --git a/res/values-ky-rKG/strings.xml b/res/values-kk/strings.xml
similarity index 100%
rename from res/values-ky-rKG/strings.xml
rename to res/values-kk/strings.xml
diff --git a/res/values-mk-rMK/plurals.xml b/res/values-km/plurals.xml
similarity index 100%
rename from res/values-mk-rMK/plurals.xml
rename to res/values-km/plurals.xml
diff --git a/res/values-lo-rLA/strings.xml b/res/values-km/strings.xml
similarity index 100%
rename from res/values-lo-rLA/strings.xml
rename to res/values-km/strings.xml
diff --git a/res/values-kn-rIN/plurals.xml b/res/values-kn/plurals.xml
similarity index 100%
rename from res/values-kn-rIN/plurals.xml
rename to res/values-kn/plurals.xml
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn/strings.xml
similarity index 100%
rename from res/values-kn-rIN/strings.xml
rename to res/values-kn/strings.xml
diff --git a/res/values-ku/strings.xml b/res/values-ku/strings.xml
index 913d1ee..1b7f5b3 100644
--- a/res/values-ku/strings.xml
+++ b/res/values-ku/strings.xml
@@ -119,7 +119,6 @@
   <string name="settings_download_missing_artwork_title">دابه‌زاندنی ئه‌لبومه‌ هونه‌رییه‌ ونبوه‌کان</string>
   <string name="settings_download_artist_images_title">دابه‌زاندنی وێنه‌ هونه‌رمه‌نده‌ ونبوه‌کان</string>
   <!-- App widget -->
-  <string name="app_widget_large_alt">Apollo: 4×2 (alternate)</string>
   <string name="app_widget_recent">ئه‌پۆڵۆ:تازه‌ترین که‌ گوێلێگیراون</string>
   <!-- Empty list / error messages -->
   <string name="no_effects_for_you">یه‌کسانکه‌ری ده‌نگ ناکرێته‌وه‌.</string>
diff --git a/res/values-mn-rMN/plurals.xml b/res/values-ky/plurals.xml
similarity index 100%
rename from res/values-mn-rMN/plurals.xml
rename to res/values-ky/plurals.xml
diff --git a/res/values-mk-rMK/strings.xml b/res/values-ky/strings.xml
similarity index 100%
rename from res/values-mk-rMK/strings.xml
rename to res/values-ky/strings.xml
diff --git a/res/values-ms-rMY/plurals.xml b/res/values-lo/plurals.xml
similarity index 100%
rename from res/values-ms-rMY/plurals.xml
rename to res/values-lo/plurals.xml
diff --git a/res/values-mn-rMN/strings.xml b/res/values-lo/strings.xml
similarity index 100%
rename from res/values-mn-rMN/strings.xml
rename to res/values-lo/strings.xml
diff --git a/res/values-lt/plurals.xml b/res/values-lt/plurals.xml
index 0ae8b1c..9827780 100644
--- a/res/values-lt/plurals.xml
+++ b/res/values-lt/plurals.xml
@@ -18,69 +18,14 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Used to indicate the number of artists -->
-  <plurals name="Nartists">
-    <item quantity="one"><xliff:g id="count">%d</xliff:g> atlikėjas</item>
-    <item quantity="few"><xliff:g id="count">%d</xliff:g> atlikėjai</item>
-    <item quantity="other"><xliff:g id="count">%d</xliff:g> atlikėjų</item>
-  </plurals>
   <!-- Used to indicate the number of albums for an artist -->
-  <plurals name="Nalbums">
-    <item quantity="one"><xliff:g id="count">%d</xliff:g> albumas</item>
-    <item quantity="few"><xliff:g id="count">%d</xliff:g> albumai</item>
-    <item quantity="other"><xliff:g id="count">%d</xliff:g> albumų</item>
-  </plurals>
   <!-- Used to indicate the number of songs for an album -->
-  <plurals name="Nsongs">
-    <item quantity="one"><xliff:g id="count">%d</xliff:g> daina</item>
-    <item quantity="few"><xliff:g id="count">%d</xliff:g> dainos</item>
-    <item quantity="other"><xliff:g id="count">%d</xliff:g> dainų</item>
-  </plurals>
   <!-- Used to indicate the number of genres -->
-  <plurals name="Ngenres">
-    <item quantity="one"><xliff:g id="count">%d</xliff:g> žanras</item>
-    <item quantity="few"><xliff:g id="count">%d</xliff:g> žanrai</item>
-    <item quantity="other"><xliff:g id="count">%d</xliff:g> žanrų</item>
-  </plurals>
   <!-- Used to show a shortened version of hours-->
-  <plurals name="Nhours">
-    <item quantity="one"><xliff:g id="hours">%d</xliff:g>val.</item>
-    <item quantity="few"><xliff:g id="hours">%d</xliff:g>val.</item>
-    <item quantity="other"><xliff:g id="hours">%d</xliff:g>val.</item>
-  </plurals>
   <!-- Used to show a shortened version of minutes -->
-  <plurals name="Nminutes">
-    <item quantity="one"><xliff:g id="minutes">%d</xliff:g>min.</item>
-    <item quantity="few"><xliff:g id="minutes">%d</xliff:g>min.</item>
-    <item quantity="other"><xliff:g id="minutes">%d</xliff:g>min.</item>
-  </plurals>
   <!-- Toasts after adding song(s) to playlists -->
-  <plurals name="NNNtrackstoplaylist">
-    <item quantity="one"><xliff:g id="number" example="1">%d</xliff:g> daina pridėta į grojaraštį.</item>
-    <item quantity="few"><xliff:g id="number" example="1">%d</xliff:g> dainos pridėtos į grojaraštį.</item>
-    <item quantity="other"><xliff:g id="number" example="1">%d</xliff:g> dainų pridėta į grojaraštį.</item>
-  </plurals>
   <!-- Toasts after removing song(s) from playlists -->
-  <plurals name="NNNtracksfromplaylist">
-    <item quantity="one"><xliff:g id="number" example="1">%d</xliff:g> daina pašalinta iš grojaraščio.</item>
-    <item quantity="few"><xliff:g id="number" example="1">%d</xliff:g> dainos pašalintos iš grojaraščio.</item>
-    <item quantity="other"><xliff:g id="number" example="1">%d</xliff:g> dainų pašalinta iš grojaraščio.</item>
-  </plurals>
   <!-- Toasts after adding song(s) to queue -->
-  <plurals name="NNNtrackstoqueue">
-    <item quantity="one"><xliff:g id="number" example="1">%d</xliff:g> daina pridėta į eilę.</item>
-    <item quantity="few"><xliff:g id="number" example="1">%d</xliff:g> dainos pridėtos į eilę.</item>
-    <item quantity="other"><xliff:g id="number" example="1">%d</xliff:g> dainų pridėta į eilę.</item>
-  </plurals>
   <!-- Toasts after adding song(s) to the favorites list -->
-  <plurals name="NNNtrackstofavorites">
-    <item quantity="one"><xliff:g id="number" example="1">%d</xliff:g> daina pridėta į mėgstamus.</item>
-    <item quantity="few"><xliff:g id="number" example="1">%d</xliff:g> dainos pridėtos į mėgstamus.</item>
-    <item quantity="other"><xliff:g id="number" example="1">%d</xliff:g> dainų pridėta į mėgstamus.</item>
-  </plurals>
   <!-- Toast confirming that song(s) was/were deleted. -->
-  <plurals name="NNNtracksdeleted">
-    <item quantity="one"><xliff:g id="songs_to_delete" example="1">%d</xliff:g> daina buvo ištrinta.</item>
-    <item quantity="few"><xliff:g id="songs_to_delete" example="1">%d</xliff:g> dainos buvo ištrintos.</item>
-    <item quantity="other"><xliff:g id="songs_to_delete" example="1">%d</xliff:g> dainų buvo ištrinta.</item>
-  </plurals>
 </resources>
diff --git a/res/values-my-rMM/plurals.xml b/res/values-mk/plurals.xml
similarity index 100%
rename from res/values-my-rMM/plurals.xml
rename to res/values-mk/plurals.xml
diff --git a/res/values-ms-rMY/strings.xml b/res/values-mk/strings.xml
similarity index 100%
rename from res/values-ms-rMY/strings.xml
rename to res/values-mk/strings.xml
diff --git a/res/values-ml-rIN/plurals.xml b/res/values-ml/plurals.xml
similarity index 100%
rename from res/values-ml-rIN/plurals.xml
rename to res/values-ml/plurals.xml
diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml/strings.xml
similarity index 100%
rename from res/values-ml-rIN/strings.xml
rename to res/values-ml/strings.xml
diff --git a/res/values-ne-rNP/plurals.xml b/res/values-mn/plurals.xml
similarity index 100%
rename from res/values-ne-rNP/plurals.xml
rename to res/values-mn/plurals.xml
diff --git a/res/values-my-rMM/strings.xml b/res/values-mn/strings.xml
similarity index 100%
rename from res/values-my-rMM/strings.xml
rename to res/values-mn/strings.xml
diff --git a/res/values-mr-rIN/plurals.xml b/res/values-mr/plurals.xml
similarity index 100%
rename from res/values-mr-rIN/plurals.xml
rename to res/values-mr/plurals.xml
diff --git a/res/values-mr-rIN/strings.xml b/res/values-mr/strings.xml
similarity index 100%
rename from res/values-mr-rIN/strings.xml
rename to res/values-mr/strings.xml
diff --git a/res/values-oc-rFR/plurals.xml b/res/values-ms/plurals.xml
similarity index 100%
rename from res/values-oc-rFR/plurals.xml
rename to res/values-ms/plurals.xml
diff --git a/res/values-ne-rNP/strings.xml b/res/values-ms/strings.xml
similarity index 100%
rename from res/values-ne-rNP/strings.xml
rename to res/values-ms/strings.xml
diff --git a/res/values-pa-rIN/plurals.xml b/res/values-my/plurals.xml
similarity index 100%
rename from res/values-pa-rIN/plurals.xml
rename to res/values-my/plurals.xml
diff --git a/res/values-oc-rFR/strings.xml b/res/values-my/strings.xml
similarity index 100%
rename from res/values-oc-rFR/strings.xml
rename to res/values-my/strings.xml
diff --git a/res/values-si-rLK/plurals.xml b/res/values-ne/plurals.xml
similarity index 100%
rename from res/values-si-rLK/plurals.xml
rename to res/values-ne/plurals.xml
diff --git a/res/values-pa-rIN/strings.xml b/res/values-ne/strings.xml
similarity index 100%
rename from res/values-pa-rIN/strings.xml
rename to res/values-ne/strings.xml
diff --git a/res/values-sr-rCS/plurals.xml b/res/values-oc/plurals.xml
similarity index 100%
rename from res/values-sr-rCS/plurals.xml
rename to res/values-oc/plurals.xml
diff --git a/res/values-si-rLK/strings.xml b/res/values-oc/strings.xml
similarity index 100%
rename from res/values-si-rLK/strings.xml
rename to res/values-oc/strings.xml
diff --git a/res/values-ur-rPK/plurals.xml b/res/values-pa/plurals.xml
similarity index 100%
rename from res/values-ur-rPK/plurals.xml
rename to res/values-pa/plurals.xml
diff --git a/res/values-sr-rCS/strings.xml b/res/values-pa/strings.xml
similarity index 100%
rename from res/values-sr-rCS/strings.xml
rename to res/values-pa/strings.xml
diff --git a/res/values-pl/plurals.xml b/res/values-pl/plurals.xml
index 918bdd7..9827780 100644
--- a/res/values-pl/plurals.xml
+++ b/res/values-pl/plurals.xml
@@ -18,69 +18,14 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Used to indicate the number of artists -->
-  <plurals name="Nartists">
-    <item quantity="one"><xliff:g id="count">%d</xliff:g> wykonawca</item>
-    <item quantity="few"><xliff:g id="count">%d</xliff:g> wykonawców</item>
-    <item quantity="other"><xliff:g id="count">%d</xliff:g> wykonawców</item>
-  </plurals>
   <!-- Used to indicate the number of albums for an artist -->
-  <plurals name="Nalbums">
-    <item quantity="one"><xliff:g id="count">%d</xliff:g> album</item>
-    <item quantity="few"><xliff:g id="count">%d</xliff:g> albumy</item>
-    <item quantity="other"><xliff:g id="count">%d</xliff:g> albumów</item>
-  </plurals>
   <!-- Used to indicate the number of songs for an album -->
-  <plurals name="Nsongs">
-    <item quantity="one"><xliff:g id="count">%d</xliff:g> utwór</item>
-    <item quantity="few"><xliff:g id="count">%d</xliff:g> utwory</item>
-    <item quantity="other"><xliff:g id="count">%d</xliff:g> utworów</item>
-  </plurals>
   <!-- Used to indicate the number of genres -->
-  <plurals name="Ngenres">
-    <item quantity="one"><xliff:g id="count">%d</xliff:g> gatunek</item>
-    <item quantity="few"><xliff:g id="count">%d</xliff:g> gatunki</item>
-    <item quantity="other"><xliff:g id="count">%d</xliff:g> gatunków</item>
-  </plurals>
   <!-- Used to show a shortened version of hours-->
-  <plurals name="Nhours">
-    <item quantity="one"><xliff:g id="hours">%d</xliff:g>h</item>
-    <item quantity="few"><xliff:g id="hours">%d</xliff:g>h</item>
-    <item quantity="other"><xliff:g id="hours">%d</xliff:g>h</item>
-  </plurals>
   <!-- Used to show a shortened version of minutes -->
-  <plurals name="Nminutes">
-    <item quantity="one"><xliff:g id="minutes">%d</xliff:g>min</item>
-    <item quantity="few"><xliff:g id="minutes">%d</xliff:g>min</item>
-    <item quantity="other"><xliff:g id="minutes">%d</xliff:g>min</item>
-  </plurals>
   <!-- Toasts after adding song(s) to playlists -->
-  <plurals name="NNNtrackstoplaylist">
-    <item quantity="one"><xliff:g id="number" example="1">%d</xliff:g> utwór dodany do listy odtwarzania.</item>
-    <item quantity="few"><xliff:g id="number" example="1">%d</xliff:g> utwory dodane do listy odtwarzania.</item>
-    <item quantity="other"><xliff:g id="number" example="1">%d</xliff:g> utworów dodanych do listy odtwarzania.</item>
-  </plurals>
   <!-- Toasts after removing song(s) from playlists -->
-  <plurals name="NNNtracksfromplaylist">
-    <item quantity="one"><xliff:g id="number" example="1">%d</xliff:g> utwór usunięty z listy odtwarzania.</item>
-    <item quantity="few"><xliff:g id="number" example="1">%d</xliff:g> utwory usunięte z listy odtwarzania.</item>
-    <item quantity="other"><xliff:g id="number" example="1">%d</xliff:g> utworów usunięto z listy odtwarzania.</item>
-  </plurals>
   <!-- Toasts after adding song(s) to queue -->
-  <plurals name="NNNtrackstoqueue">
-    <item quantity="one"><xliff:g id="number" example="1">%d</xliff:g> utwór dodany do kolejki.</item>
-    <item quantity="few"><xliff:g id="number" example="1">%d</xliff:g> utwory dodane do kolejki.</item>
-    <item quantity="other"><xliff:g id="number" example="1">%d</xliff:g> utworów dodanych do kolejki.</item>
-  </plurals>
   <!-- Toasts after adding song(s) to the favorites list -->
-  <plurals name="NNNtrackstofavorites">
-    <item quantity="one"><xliff:g id="number" example="1">%d</xliff:g> utwór dodany do ulubionych.</item>
-    <item quantity="few"><xliff:g id="number" example="1">%d</xliff:g> utwory dodane do ulubionych.</item>
-    <item quantity="other"><xliff:g id="number" example="1">%d</xliff:g> utworów dodano do ulubionych.</item>
-  </plurals>
   <!-- Toast confirming that song(s) was/were deleted. -->
-  <plurals name="NNNtracksdeleted">
-    <item quantity="one"><xliff:g id="songs_to_delete" example="1">%d</xliff:g> utwór został usunięty.</item>
-    <item quantity="few"><xliff:g id="songs_to_delete" example="1">%d</xliff:g> utwory zostały usunięte.</item>
-    <item quantity="other"><xliff:g id="songs_to_delete" example="1">%d</xliff:g> utworów zostało usunięte.</item>
-  </plurals>
 </resources>
diff --git a/res/values-ru/plurals.xml b/res/values-ru/plurals.xml
index 6d271c8..9827780 100644
--- a/res/values-ru/plurals.xml
+++ b/res/values-ru/plurals.xml
@@ -18,69 +18,14 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Used to indicate the number of artists -->
-  <plurals name="Nartists">
-    <item quantity="one"><xliff:g id="count">%d</xliff:g> исполнитель</item>
-    <item quantity="few"><xliff:g id="count">%d</xliff:g> исполнителя</item>
-    <item quantity="other"><xliff:g id="count">%d</xliff:g> исполнителей</item>
-  </plurals>
   <!-- Used to indicate the number of albums for an artist -->
-  <plurals name="Nalbums">
-    <item quantity="one"><xliff:g id="count">%d</xliff:g> альбом</item>
-    <item quantity="few"><xliff:g id="count">%d</xliff:g> альбома</item>
-    <item quantity="other"><xliff:g id="count">%d</xliff:g> альбомов</item>
-  </plurals>
   <!-- Used to indicate the number of songs for an album -->
-  <plurals name="Nsongs">
-    <item quantity="one"><xliff:g id="count">%d</xliff:g> трек</item>
-    <item quantity="few"><xliff:g id="count">%d</xliff:g> трека</item>
-    <item quantity="other"><xliff:g id="count">%d</xliff:g> треков</item>
-  </plurals>
   <!-- Used to indicate the number of genres -->
-  <plurals name="Ngenres">
-    <item quantity="one"><xliff:g id="count">%d</xliff:g> жанр</item>
-    <item quantity="few"><xliff:g id="count">%d</xliff:g> жанра</item>
-    <item quantity="other"><xliff:g id="count">%d</xliff:g> жанров</item>
-  </plurals>
   <!-- Used to show a shortened version of hours-->
-  <plurals name="Nhours">
-    <item quantity="one"><xliff:g id="hours">%d</xliff:g> ч.</item>
-    <item quantity="few"><xliff:g id="hours">%d</xliff:g> ч.</item>
-    <item quantity="other"><xliff:g id="hours">%d</xliff:g> ч.</item>
-  </plurals>
   <!-- Used to show a shortened version of minutes -->
-  <plurals name="Nminutes">
-    <item quantity="one"><xliff:g id="minutes">%d</xliff:g> мин.</item>
-    <item quantity="few"><xliff:g id="minutes">%d</xliff:g> мин.</item>
-    <item quantity="other"><xliff:g id="minutes">%d</xliff:g> мин.</item>
-  </plurals>
   <!-- Toasts after adding song(s) to playlists -->
-  <plurals name="NNNtrackstoplaylist">
-    <item quantity="one"><xliff:g id="number" example="1">%d</xliff:g> трек добавлен в плейлист.</item>
-    <item quantity="few"><xliff:g id="number" example="27">%d</xliff:g> трека добавлены в плейлист.</item>
-    <item quantity="other"><xliff:g id="number" example="27">%d</xliff:g> треков добавлены в плейлист.</item>
-  </plurals>
   <!-- Toasts after removing song(s) from playlists -->
-  <plurals name="NNNtracksfromplaylist">
-    <item quantity="one"><xliff:g id="number" example="1">%d</xliff:g> трек удалён из плейлиста.</item>
-    <item quantity="few"><xliff:g id="number" example="1">%d</xliff:g> трека удалены из плейлиста.</item>
-    <item quantity="other"><xliff:g id="number" example="1">%d</xliff:g> треков удалены из плейлиста.</item>
-  </plurals>
   <!-- Toasts after adding song(s) to queue -->
-  <plurals name="NNNtrackstoqueue">
-    <item quantity="one"><xliff:g id="number" example="1">%d</xliff:g> трек добавлен в очередь.</item>
-    <item quantity="few"><xliff:g id="number" example="27">%d</xliff:g> трека добавлены в очередь.</item>
-    <item quantity="other"><xliff:g id="number" example="27">%d</xliff:g> треков добавлены в очередь.</item>
-  </plurals>
   <!-- Toasts after adding song(s) to the favorites list -->
-  <plurals name="NNNtrackstofavorites">
-    <item quantity="one"><xliff:g id="number" example="1">%d</xliff:g> трек добавлен в избранное.</item>
-    <item quantity="few"><xliff:g id="number" example="27">%d</xliff:g> трека добавлены в избранное.</item>
-    <item quantity="other"><xliff:g id="number" example="27">%d</xliff:g> треков добавлены в избранное.</item>
-  </plurals>
   <!-- Toast confirming that song(s) was/were deleted. -->
-  <plurals name="NNNtracksdeleted">
-    <item quantity="one"><xliff:g id="songs_to_delete" example="1">%d</xliff:g> трек удален.</item>
-    <item quantity="few"><xliff:g id="songs_to_delete">%d</xliff:g> трека удалены.</item>
-    <item quantity="other"><xliff:g id="songs_to_delete">%d</xliff:g> треков удалены.</item>
-  </plurals>
 </resources>
diff --git a/res/values-uz-rUZ/plurals.xml b/res/values-si/plurals.xml
similarity index 100%
rename from res/values-uz-rUZ/plurals.xml
rename to res/values-si/plurals.xml
diff --git a/res/values-ur-rPK/strings.xml b/res/values-si/strings.xml
similarity index 100%
rename from res/values-ur-rPK/strings.xml
rename to res/values-si/strings.xml
diff --git a/res/values-sk/plurals.xml b/res/values-sk/plurals.xml
index 217a6d4..3244758 100644
--- a/res/values-sk/plurals.xml
+++ b/res/values-sk/plurals.xml
@@ -21,66 +21,77 @@
   <plurals name="Nartists">
     <item quantity="one"><xliff:g id="count">%d</xliff:g> interpret</item>
     <item quantity="few"><xliff:g id="count">%d</xliff:g> interpreti</item>
+    <item quantity="many"><xliff:g id="count">%d</xliff:g> interpretov</item>
     <item quantity="other"><xliff:g id="count">%d</xliff:g> interpretov</item>
   </plurals>
   <!-- Used to indicate the number of albums for an artist -->
   <plurals name="Nalbums">
     <item quantity="one"><xliff:g id="count">%d</xliff:g> album</item>
     <item quantity="few"><xliff:g id="count">%d</xliff:g> albumy</item>
+    <item quantity="many"><xliff:g id="count">%d</xliff:g> albumov</item>
     <item quantity="other"><xliff:g id="count">%d</xliff:g> albumov</item>
   </plurals>
   <!-- Used to indicate the number of songs for an album -->
   <plurals name="Nsongs">
     <item quantity="one"><xliff:g id="count">%d</xliff:g> skladba</item>
     <item quantity="few"><xliff:g id="count">%d</xliff:g> skladby</item>
+    <item quantity="many"><xliff:g id="count">%d</xliff:g> skladieb</item>
     <item quantity="other"><xliff:g id="count">%d</xliff:g> skladieb</item>
   </plurals>
   <!-- Used to indicate the number of genres -->
   <plurals name="Ngenres">
     <item quantity="one"><xliff:g id="count">%d</xliff:g> žáner</item>
     <item quantity="few"><xliff:g id="count">%d</xliff:g> žánry</item>
+    <item quantity="many"><xliff:g id="count">%d</xliff:g> žánrov</item>
     <item quantity="other"><xliff:g id="count">%d</xliff:g> žánrov</item>
   </plurals>
   <!-- Used to show a shortened version of hours-->
   <plurals name="Nhours">
     <item quantity="one"><xliff:g id="hours">%d</xliff:g>h</item>
     <item quantity="few"><xliff:g id="hours">%d</xliff:g>h</item>
+    <item quantity="many"><xliff:g id="hours">%d</xliff:g>h</item>
     <item quantity="other"><xliff:g id="hours">%d</xliff:g>h</item>
   </plurals>
   <!-- Used to show a shortened version of minutes -->
   <plurals name="Nminutes">
     <item quantity="one"><xliff:g id="minutes">%d</xliff:g>m</item>
     <item quantity="few"><xliff:g id="minutes">%d</xliff:g>m</item>
+    <item quantity="many"><xliff:g id="minutes">%d</xliff:g>m</item>
     <item quantity="other"><xliff:g id="minutes">%d</xliff:g>m</item>
   </plurals>
   <!-- Toasts after adding song(s) to playlists -->
   <plurals name="NNNtrackstoplaylist">
     <item quantity="one"><xliff:g id="number" example="1">%d</xliff:g> skladba bola pridaná do zoznamu skladieb.</item>
     <item quantity="few"><xliff:g id="number" example="1">%d</xliff:g> skladby boli pridané do zoznamu skladieb.</item>
+    <item quantity="many"><xliff:g id="number" example="1">%d</xliff:g> skladieb bolo pridaných do zoznamu skladieb.</item>
     <item quantity="other"><xliff:g id="number" example="1">%d</xliff:g> skladieb bolo pridaných do zoznamu skladieb.</item>
   </plurals>
   <!-- Toasts after removing song(s) from playlists -->
   <plurals name="NNNtracksfromplaylist">
     <item quantity="one"><xliff:g id="number" example="1">%d</xliff:g> skladba bola odstránená zo zoznamu skladieb.</item>
     <item quantity="few"><xliff:g id="number" example="1">%d</xliff:g> skladby boli odstránené zo zoznamu skladieb.</item>
+    <item quantity="many"><xliff:g id="number" example="1">%d</xliff:g> skladieb bolo odstránených zo zoznamu skladieb.</item>
     <item quantity="other"><xliff:g id="number" example="1">%d</xliff:g> skladieb bolo odstránených zo zoznamu skladieb.</item>
   </plurals>
   <!-- Toasts after adding song(s) to queue -->
   <plurals name="NNNtrackstoqueue">
     <item quantity="one"><xliff:g id="number" example="1">%d</xliff:g> skladba bola pridaná do poradia.</item>
     <item quantity="few"><xliff:g id="number" example="1">%d</xliff:g> skladby boli pridané do poradia.</item>
+    <item quantity="many"><xliff:g id="number" example="1">%d</xliff:g> skladieb bolo pridaných do poradia.</item>
     <item quantity="other"><xliff:g id="number" example="1">%d</xliff:g> skladieb bolo pridaných do poradia.</item>
   </plurals>
   <!-- Toasts after adding song(s) to the favorites list -->
   <plurals name="NNNtrackstofavorites">
     <item quantity="one"><xliff:g id="number" example="1">%d</xliff:g> skladba bola pridaná do obľúbených.</item>
     <item quantity="few"><xliff:g id="number" example="1">%d</xliff:g> skladby boli pridané do obľúbených.</item>
+    <item quantity="many"><xliff:g id="number" example="1">%d</xliff:g> skladieb bolo pridaných do obľúbených.</item>
     <item quantity="other"><xliff:g id="number" example="1">%d</xliff:g> skladieb bolo pridaných do obľúbených.</item>
   </plurals>
   <!-- Toast confirming that song(s) was/were deleted. -->
   <plurals name="NNNtracksdeleted">
     <item quantity="one"><xliff:g id="songs_to_delete" example="1">%d</xliff:g> skladba bola vymazaná.</item>
     <item quantity="few"><xliff:g id="songs_to_delete" example="1">%d</xliff:g> skladby boli vymazané.</item>
+    <item quantity="many"><xliff:g id="songs_to_delete" example="1">%d</xliff:g> skladieb boo vymazaných.</item>
     <item quantity="other"><xliff:g id="songs_to_delete" example="1">%d</xliff:g> skladieb boo vymazaných.</item>
   </plurals>
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 29fd291..a0cfc2f 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -148,7 +148,7 @@
   <string name="empty_recent_main">Ni nedavnih skladb</string>
   <string name="empty_recent">Skladbe, ki ste jih nedavno poslušali, bodo prikazane tukaj.</string>
   <string name="empty_playlist_main">Na seznamu predvajanja ni skladb</string>
-  <string name="empty_playlist_secondary">Za dodajanje skladb na ta seznam predvajanja tapnite meni možnosti na skladbi, albumu ali izvajalcu in izberite \"Dodaj na seznam predvajanja\".</string>
+  <string name="empty_playlist_secondary">Za dodajanje skladb na ta seznam predvajanja tapnite meni možnosti na skladbi, albumu ali izvajalcu in izberite »Dodaj na seznam predvajanja«.</string>
   <string name="empty_top_tracks_main">Ni največkrat predvajanih</string>
   <string name="empty_top_tracks_secondary">Skladbe, ki ste jih največkrat poslušali, bodo dodane na ta seznam.</string>
   <string name="empty_last_added_main">Ni nedavno dodanih skladb</string>
@@ -156,7 +156,7 @@
   <string name="empty_generic_main">Glasbe ni bilo najdene</string>
   <string name="empty_generic_secondary">Za kopiranje glasbe iz vašega računalnika na vašo napravo uporabite kabel USB.</string>
   <string name="empty_queue_main">Ni skladb v čakalni vrsti predvajanja</string>
-  <string name="empty_queue_secondary">Za dodajanje skladb v čakalno vrsto predvajanja tapnite meni možnosti na skladbi, albumu ali izvajalcu in izberite \"Dodaj v čakalno vrsto\".</string>
+  <string name="empty_queue_secondary">Za dodajanje skladb v čakalno vrsto predvajanja tapnite meni možnosti na skladbi, albumu ali izvajalcu in izberite »Dodaj v čakalno vrsto«.</string>
   <string name="error_playing_track">Skladbe %1$s ni mogoče predvajati</string>
   <!-- Section Headers -->
   <string name="header_unknown_year">Neznano leto</string>
diff --git a/res/values-sq-rAL/plurals.xml b/res/values-sq/plurals.xml
similarity index 100%
rename from res/values-sq-rAL/plurals.xml
rename to res/values-sq/plurals.xml
diff --git a/res/values-sq-rAL/strings.xml b/res/values-sq/strings.xml
similarity index 100%
rename from res/values-sq-rAL/strings.xml
rename to res/values-sq/strings.xml
diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta-rIN/strings.xml
deleted file mode 100644
index 9bd2bbc..0000000
--- a/res/values-ta-rIN/strings.xml
+++ /dev/null
@@ -1,189 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2013 Andrew Neal
-     Copyright (C) 2012-2014 The CyanogenMod Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="app_name">இசை</string>
-  <!-- Page titles -->
-  <string name="page_recent">சமீபத்தியவை</string>
-  <string name="page_artists">கலைஞர்கள்</string>
-  <string name="page_albums">ஆல்பங்கள்</string>
-  <string name="page_songs">பாடல்கள்</string>
-  <string name="page_playlists">இசைப்பட்டியல்கள்</string>
-  <string name="page_genres">வகைகள்</string>
-  <string name="page_now_playing">இப்போது இயங்குகிறது</string>
-  <string name="page_play_queue">இயக்க சாரை</string>
-  <!-- Section Headers -->
-  <string name="header_albums">ஆல்பங்கள்</string>
-  <string name="header_top_songs">முதன்மையான பாடல்கள்</string>
-  <string name="header_all_songs">அனைத்து பாடல்கள்</string>
-  <!-- Option menu items -->
-  <string name="menu_settings">அமைப்புகள்</string>
-  <string name="menu_search">தேடு</string>
-  <string name="menu_shuffle_item">குலை</string>
-  <string name="menu_shuffle_all">அனைத்தையும் குலை</string>
-  <string name="menu_shuffle_playlist">குலை இசைப்பட்டியல்</string>
-  <string name="menu_shuffle_album">குலை ஆல்பம்</string>
-  <string name="menu_shuffle_artist">குலை கலைஞர்கள்</string>
-  <string name="menu_shuffle_top_tracks">குலை முதன்மையான தடங்கள்</string>
-  <string name="menu_shuffle_recent">குலை சமீபத்திய்ல் இயக்கியதை</string>
-  <string name="menu_shuffle_last_added">குலை கடைசியாக சேர்த்ததை</string>
-  <string name="menu_play_all">அனைத்தையும் இயக்கு</string>
-  <string name="menu_sort_by">இதன்படி வரிசைப்படுத்து</string>
-  <string name="menu_clear_list">பட்டியலை அழி</string>
-  <string name="menu_clear_recents">சமீபத்தியதை அழி</string>
-  <string name="menu_clear_queue">சாரை அழி</string>
-  <string name="menu_save_queue">சாரை இசைப்பட்டியலில் சேமி</string>
-  <string name="menu_equalizer">ஈக்வலைசர்</string>
-  <!-- Playlist items -->
-  <string name="add_to_playlist">இசைப்பட்டியலுக்குச் சேர்</string>
-  <string name="add_to_queue">சாரையுடன் சேர்</string>
-  <string name="remove_from_recent">சமீபத்தியதில் இருந்து நீக்கு</string>
-  <string name="remove_from_queue">சாரையில் இருந்து நீக்கு</string>
-  <!-- Sort orders -->
-  <string name="sort_order_entry_az">A-Z</string>
-  <string name="sort_order_entry_za">Z-A</string>
-  <string name="sort_order_entry_artist">கலைஞர்</string>
-  <string name="sort_order_entry_album">ஆல்பம்</string>
-  <string name="sort_order_entry_year">ஆண்டு</string>
-  <string name="sort_order_entry_duration">கால அளவு</string>
-  <string name="sort_order_entry_date_added">சேர்க்கப்பட்ட தேதி</string>
-  <string name="sort_order_entry_track_list">தட பட்டியல்</string>
-  <string name="sort_order_entry_number_of_songs">பாடல்களின் எண்ணிக்கை</string>
-  <string name="sort_order_entry_number_of_albums">ஆல்பங்களின் எண்ணிக்கை</string>
-  <string name="sort_order_entry_filename">கோப்புப்பெயர்</string>
-  <!-- Default playlist names -->
-  <string name="playlist_last_added">கடைசியாக சேர்க்கப்பட்டது</string>
-  <string name="playlist_recently_played">சமீபத்தில் இயக்கப்பட்டது</string>
-  <string name="playlist_top_tracks">என் முதன்மையான தடங்கள்</string>
-  <!-- AlertDialog items -->
-  <string name="new_playlist">புதிய இசைப்பட்டியல்</string>
-  <string name="save">சேமி</string>
-  <string name="cancel">ரத்துசெய்</string>
-  <string name="overwrite">மேலெழுது</string>
-  <string name="clear">அழி</string>
-  <string name="new_playlist_name_template">இசைப்பட்டியல் <xliff:g id="number">%d</xliff:g></string>
-  <string name="create_playlist_prompt">இசைப்பட்டியல் பெயர்</string>
-  <string name="delete_dialog_title">நீக்கு <xliff:g id="item" example="album">%s</xliff:g>?</string>
-  <string name="clear_top_tracks_title">முதன்மையான தடங்களை அழிக்கவா?</string>
-  <string name="clear_recent_title">சமீபத்தில் இயக்கியவற்றை அழிக்கவா?</string>
-  <string name="clear_last_added">கடைசியாக சேர்த்தவற்றை அழிக்கவா?</string>
-  <string name="cannot_be_undone">இதை செயல்நீக்க முடியாது</string>
-  <string name="delete_warning">இது நிரந்தரமாக தேக்கிய பட உள்ளீடுகளை நீக்கிவிடும்</string>
-  <string name="new_photo">கேலரியிலிருந்து படத்தைத் தேர்வுசெய்க</string>
-  <string name="google_search">Google தேடல்</string>
-  <string name="use_default">இயல்புநிலை புகைப்படத்தை பயன்படுத்தவும்</string>
-  <string name="old_photo">பழைய புகைப்படத்தை பயன்படுத்தவும்</string>
-  <!-- Context menu items -->
-  <string name="context_menu_play_selection">இயக்கு</string>
-  <string name="context_menu_play_next">அடுத்ததை இயக்கு</string>
-  <string name="context_menu_play_album">ஆல்பத்தை இயக்கு</string>
-  <string name="context_menu_more_by_artist">கலைஞரினால் மேலும்</string>
-  <string name="context_menu_rename_playlist">மறுபெயரிடு</string>
-  <string name="context_menu_delete">நீக்கு</string>
-  <string name="context_menu_fetch_album_art">ஆல்பம் கலையை எடு</string>
-  <string name="context_menu_fetch_artist_image">கலைஞர் படத்தை எடு</string>
-  <string name="context_menu_remove_from_recent">சமீபத்தியதில் இருந்து நீக்கு</string>
-  <string name="context_menu_use_as_ringtone">வளையமாகப் பயன்படுத்து</string>
-  <string name="context_menu_remove_from_playlist">இசைப்பட்டியலிலிருந்து அகற்று</string>
-  <string name="context_menu_change_image">படத்தை மாற்று</string>
-  <!-- Content descriptions -->
-  <string name="accessibility_play">இயக்கு</string>
-  <string name="accessibility_pause">இடைநிறுத்து</string>
-  <string name="accessibility_next">அடுத்து</string>
-  <string name="accessibility_prev">முந்தையது</string>
-  <string name="accessibility_shuffle">குலை</string>
-  <string name="accessibility_shuffle_all">அனைத்தையும் குலை</string>
-  <string name="accessibility_repeat">மீண்டும்</string>
-  <string name="accessibility_repeat_all">அனைத்தையும் மீண்டும் இயக்கு</string>
-  <string name="accessibility_repeat_one">ஒன்றை மீண்டும் இயக்கு</string>
-  <string name="accessibility_queue">சாரையை திற</string>
-  <string name="accessibility_browse">இசையை உலாவு</string>
-  <!-- Toast messages -->
-  <string name="set_as_ringtone">\'<xliff:g id="name" example="Alarm Bell">%s</xliff:g>\' ஐ ரிங்டோனாக அமை</string>
-  <string name="playlist_renamed">இசைப்பட்டியல் மறுபெயரிடப்பட்டது</string>
-  <!-- Settings -->
-  <string name="settings_ui_category">இடைமுகம்</string>
-  <string name="settings_storage_category">சேமிப்பிடம்</string>
-  <string name="settings_data_category">தரவு</string>
-  <string name="settings_delete_cache_title">தேக்கத்தை நீக்கு</string>
-  <string name="settings_delete_cache_summary">தேக்கப்பட்ட படங்கள் அனைத்தையும் நீக்கு</string>
-  <string name="settings_download_only_on_wifi_title">Wi-fi வழியாக மட்டுமே பதிவிறக்கு</string>
-  <string name="settings_download_only_on_wifi_summary">கேரியர் கட்டணங்களை குறைக்க, மொபைல் பிணையங்களில் பதிவிறக்காதே</string>
-  <string name="settings_download_missing_artwork_title">பதிவிறக்கத்தில் ஆல்பம் கலையை காணவில்லை</string>
-  <string name="settings_download_artist_images_title">பதிவிறக்கத்தில் ஆல்பம் கலைஞர் படங்களைக் காணவில்லை</string>
-  <string name="settings_general_category">பொது</string>
-  <string name="settings_show_music_visualization_title">இசை காட்சிப்படுத்தலை காண்பி</string>
-  <string name="settings_show_lyrics_title">பாடல் வரிகளைக் காண்பி</string>
-  <string name="settings_show_lyrics_summary">srt கோப்பு உடைய பாடல்களுக்கு</string>
-  <string name="settings_shake_to_play">இயக்க அசை</string>
-  <string name="settings_shake_to_play_summary">அடுத்த பாடலை இயக்குவதற்கு உங்கள் சாதனத்தை அசைக்கவும்</string>
-  <string name="settings_lockscreen_album_art">பூட்டுத் திரை ஆல்பம் கலை</string>
-  <string name="settings_lockscreen_album_art_summary">பூட்டுத்திரை பின்னணியை ஆல்பம் கலையால் மாற்றிடவும்</string>
-  <!-- App widget -->
-  <string name="app_widget_small">இசை: 4 \u00d7 1</string>
-  <string name="app_widget_large">இசை: 4 \u00d7 2</string>
-  <string name="app_widget_large_alt">இசை: 4 \u00d7 2 (மாற்று)</string>
-  <string name="app_widget_recent">இசை:சமீபத்தில் கேட்டது</string>
-  <!-- Empty list / error messages -->
-  <string name="no_effects_for_you">சமமாக்கியை திறக்க முடியவில்லை.</string>
-  <string name="empty_music">உங்கள் கணினியில் இருந்து உங்கள் கருவிக்கு இசையை நகலெடுக்க, ஒரு USB கம்பி இழையை பயன்படுத்தவும்</string>
-  <string name="empty_search">தேடல் முடிவுகள் எதுவும் கண்டுபிடிக்கப்படவில்லை</string>
-  <string name="empty_search_check">உங்களிடம் சரியான எழுத்துக்கூட்டுரு இருகிறதா என தயவுசெய்து சரிபார்க்கவும் அல்லது வேறு திறவுச்சொல்லைப் பயன்படுத்தவும்.</string>
-  <string name="empty_favorite">நீங்கள் விருப்பமானது என்று குறிப்பிடும் பாடல்கள் இங்கே காட்டப்படும்.</string>
-  <string name="empty_recent_main">சமீபத்திய பாடல்கள் இல்லை</string>
-  <string name="empty_recent">நீங்கள் சமீபத்தில் கேட்ட பாடல்கள் இங்கே காட்டப்படும்.</string>
-  <string name="empty_playlist_main">இசைப்பட்டியலில் பாடல்கள் இல்லை.</string>
-  <string name="empty_playlist_secondary">இந்த இசைப்பட்டியலில் பாடல்களை சேர்க்க, ஒரு பாடல், ஆல்பம் அல்லது கலைஞரில் உள்ள விருப்பங்கள் மெனுவை தட்டி \&quot;இசைப்பட்டியலில் சேர்\&quot;ஐ தேர்வுசெய்</string>
-  <string name="empty_top_tracks_main">முதன்மையான தடங்கள் இல்லை</string>
-  <string name="empty_top_tracks_secondary">நீங்கள் அதிகமாக கேட்கும் பாடல்கள் இந்த பட்டியலில் சேர்க்கப்படும்.</string>
-  <string name="empty_last_added_main">சமீபத்தில் பாடல்கள் எதுவும் சேர்க்கப்படவில்லை.</string>
-  <string name="empty_last_added">சென்ற மாதம் நீங்கள் சேர்த்த பாடல்கள் இங்கே காட்டபப்டும்.</string>
-  <string name="empty_generic_main">இசை எதுவும் கண்டுபிடிக்கப்படவில்லை</string>
-  <string name="empty_generic_secondary">உங்கள் கணினியில் இருந்து உங்கள் கருவிக்கு இசையை நகலெடுக்க, ஒரு USB கம்பி இழையை பயன்படுத்தவும்</string>
-  <string name="empty_queue_main">இயக்க சாரத்தில் பாடல்கள் எதுவும் இல்லை.</string>
-  <string name="empty_queue_secondary">இந்த சாரையில் பாடல்களை சேர்க்க, ஒரு பாடல், ஆல்பம் அல்லது கலைஞரில் உள்ள விருப்பங்கள் மெனுவை தட்டி \&quot;வரிசையில் சேர்\&quot;ஐ தேர்வுசெய்.</string>
-  <string name="error_playing_track">%1$s தடத்தை இயக்க முடியவில்லை</string>
-  <!-- Section Headers -->
-  <string name="header_unknown_year">அறியப்படாத ஆண்டு</string>
-  <string name="header_less_than_30s">30 வினாடிகளுக்கும் குறைவாக</string>
-  <string name="header_30_to_60_seconds">30-60 வினாடிகள்</string>
-  <string name="header_1_to_2_minutes">1 - 2 நிமிடங்கள்</string>
-  <string name="header_2_to_3_minutes">2 - 3 நிமிடங்கள்</string>
-  <string name="header_3_to_4_minutes">3 - 4 நிமிடங்கள்</string>
-  <string name="header_4_to_5_minutes">4 - 5 நிமிடங்கள்</string>
-  <string name="header_5_to_10_minutes">5 - 10 நிமிடங்கள்</string>
-  <string name="header_10_to_30_minutes">10 - 30 நிமிடங்கள்</string>
-  <string name="header_30_to_60_minutes">30 - 60 நிமிடங்கள்</string>
-  <string name="header_greater_than_60_minutes">60 நிமிடங்களுக்கு மேல்</string>
-  <string name="header_1_song">1 பாடல்</string>
-  <string name="header_2_to_4_songs">2 - 4 பாடல்கள்</string>
-  <string name="header_5_to_9_songs">5 - 9 பாடல்கள்</string>
-  <string name="header_10_plus_songs">10+ பாடல்கள்</string>
-  <string name="header_5_plus_albums">5+ ஆல்பம்கள்</string>
-  <string name="header_other">"&quot;மற்றவை&quot;"</string>
-  <string name="footer_search_artists">அனைத்து கலைஞர்களையும் காண்பி</string>
-  <string name="footer_search_albums">அனைத்து ஆல்பங்களையும் காண்பி</string>
-  <string name="footer_search_songs">அனைத்து பாடல்களையும் காண்பி</string>
-  <string name="footer_search_playlists">அனைத்து இசைப்பட்டியல்களையும் காண்பி</string>
-  <string name="searchHint">இசையை தேடு</string>
-  <string name="search_title_artists">அனைத்து \”%s\&quot; கலைஞர்கள்</string>
-  <string name="search_title_albums">அனைத்து \”%s\&quot;  ஆல்பங்கள்</string>
-  <string name="search_title_songs">அனைத்து \”%s\&quot; பாடல்கள்</string>
-  <string name="search_title_playlists">அனைத்து \”%s\&quot; இசைப்பட்டியல்கள்</string>
-  <string name="duration_format"><xliff:g id="hours">%1$s</xliff:g> <xliff:g id="minutes">%2$s</xliff:g></string>
-</resources>
diff --git a/res/values-ta-rIN/plurals.xml b/res/values-ta/plurals.xml
similarity index 100%
rename from res/values-ta-rIN/plurals.xml
rename to res/values-ta/plurals.xml
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 712ff2c..9bd2bbc 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
+<!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2013 Andrew Neal
      Copyright (C) 2012-2014 The CyanogenMod Project
@@ -17,5 +17,173 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="old_photo">பழைய புகைப்படம் பயன்படுத்தவும்</string>
+  <string name="app_name">இசை</string>
+  <!-- Page titles -->
+  <string name="page_recent">சமீபத்தியவை</string>
+  <string name="page_artists">கலைஞர்கள்</string>
+  <string name="page_albums">ஆல்பங்கள்</string>
+  <string name="page_songs">பாடல்கள்</string>
+  <string name="page_playlists">இசைப்பட்டியல்கள்</string>
+  <string name="page_genres">வகைகள்</string>
+  <string name="page_now_playing">இப்போது இயங்குகிறது</string>
+  <string name="page_play_queue">இயக்க சாரை</string>
+  <!-- Section Headers -->
+  <string name="header_albums">ஆல்பங்கள்</string>
+  <string name="header_top_songs">முதன்மையான பாடல்கள்</string>
+  <string name="header_all_songs">அனைத்து பாடல்கள்</string>
+  <!-- Option menu items -->
+  <string name="menu_settings">அமைப்புகள்</string>
+  <string name="menu_search">தேடு</string>
+  <string name="menu_shuffle_item">குலை</string>
+  <string name="menu_shuffle_all">அனைத்தையும் குலை</string>
+  <string name="menu_shuffle_playlist">குலை இசைப்பட்டியல்</string>
+  <string name="menu_shuffle_album">குலை ஆல்பம்</string>
+  <string name="menu_shuffle_artist">குலை கலைஞர்கள்</string>
+  <string name="menu_shuffle_top_tracks">குலை முதன்மையான தடங்கள்</string>
+  <string name="menu_shuffle_recent">குலை சமீபத்திய்ல் இயக்கியதை</string>
+  <string name="menu_shuffle_last_added">குலை கடைசியாக சேர்த்ததை</string>
+  <string name="menu_play_all">அனைத்தையும் இயக்கு</string>
+  <string name="menu_sort_by">இதன்படி வரிசைப்படுத்து</string>
+  <string name="menu_clear_list">பட்டியலை அழி</string>
+  <string name="menu_clear_recents">சமீபத்தியதை அழி</string>
+  <string name="menu_clear_queue">சாரை அழி</string>
+  <string name="menu_save_queue">சாரை இசைப்பட்டியலில் சேமி</string>
+  <string name="menu_equalizer">ஈக்வலைசர்</string>
+  <!-- Playlist items -->
+  <string name="add_to_playlist">இசைப்பட்டியலுக்குச் சேர்</string>
+  <string name="add_to_queue">சாரையுடன் சேர்</string>
+  <string name="remove_from_recent">சமீபத்தியதில் இருந்து நீக்கு</string>
+  <string name="remove_from_queue">சாரையில் இருந்து நீக்கு</string>
+  <!-- Sort orders -->
+  <string name="sort_order_entry_az">A-Z</string>
+  <string name="sort_order_entry_za">Z-A</string>
+  <string name="sort_order_entry_artist">கலைஞர்</string>
+  <string name="sort_order_entry_album">ஆல்பம்</string>
+  <string name="sort_order_entry_year">ஆண்டு</string>
+  <string name="sort_order_entry_duration">கால அளவு</string>
+  <string name="sort_order_entry_date_added">சேர்க்கப்பட்ட தேதி</string>
+  <string name="sort_order_entry_track_list">தட பட்டியல்</string>
+  <string name="sort_order_entry_number_of_songs">பாடல்களின் எண்ணிக்கை</string>
+  <string name="sort_order_entry_number_of_albums">ஆல்பங்களின் எண்ணிக்கை</string>
+  <string name="sort_order_entry_filename">கோப்புப்பெயர்</string>
+  <!-- Default playlist names -->
+  <string name="playlist_last_added">கடைசியாக சேர்க்கப்பட்டது</string>
+  <string name="playlist_recently_played">சமீபத்தில் இயக்கப்பட்டது</string>
+  <string name="playlist_top_tracks">என் முதன்மையான தடங்கள்</string>
+  <!-- AlertDialog items -->
+  <string name="new_playlist">புதிய இசைப்பட்டியல்</string>
+  <string name="save">சேமி</string>
+  <string name="cancel">ரத்துசெய்</string>
+  <string name="overwrite">மேலெழுது</string>
+  <string name="clear">அழி</string>
+  <string name="new_playlist_name_template">இசைப்பட்டியல் <xliff:g id="number">%d</xliff:g></string>
+  <string name="create_playlist_prompt">இசைப்பட்டியல் பெயர்</string>
+  <string name="delete_dialog_title">நீக்கு <xliff:g id="item" example="album">%s</xliff:g>?</string>
+  <string name="clear_top_tracks_title">முதன்மையான தடங்களை அழிக்கவா?</string>
+  <string name="clear_recent_title">சமீபத்தில் இயக்கியவற்றை அழிக்கவா?</string>
+  <string name="clear_last_added">கடைசியாக சேர்த்தவற்றை அழிக்கவா?</string>
+  <string name="cannot_be_undone">இதை செயல்நீக்க முடியாது</string>
+  <string name="delete_warning">இது நிரந்தரமாக தேக்கிய பட உள்ளீடுகளை நீக்கிவிடும்</string>
+  <string name="new_photo">கேலரியிலிருந்து படத்தைத் தேர்வுசெய்க</string>
+  <string name="google_search">Google தேடல்</string>
+  <string name="use_default">இயல்புநிலை புகைப்படத்தை பயன்படுத்தவும்</string>
+  <string name="old_photo">பழைய புகைப்படத்தை பயன்படுத்தவும்</string>
+  <!-- Context menu items -->
+  <string name="context_menu_play_selection">இயக்கு</string>
+  <string name="context_menu_play_next">அடுத்ததை இயக்கு</string>
+  <string name="context_menu_play_album">ஆல்பத்தை இயக்கு</string>
+  <string name="context_menu_more_by_artist">கலைஞரினால் மேலும்</string>
+  <string name="context_menu_rename_playlist">மறுபெயரிடு</string>
+  <string name="context_menu_delete">நீக்கு</string>
+  <string name="context_menu_fetch_album_art">ஆல்பம் கலையை எடு</string>
+  <string name="context_menu_fetch_artist_image">கலைஞர் படத்தை எடு</string>
+  <string name="context_menu_remove_from_recent">சமீபத்தியதில் இருந்து நீக்கு</string>
+  <string name="context_menu_use_as_ringtone">வளையமாகப் பயன்படுத்து</string>
+  <string name="context_menu_remove_from_playlist">இசைப்பட்டியலிலிருந்து அகற்று</string>
+  <string name="context_menu_change_image">படத்தை மாற்று</string>
+  <!-- Content descriptions -->
+  <string name="accessibility_play">இயக்கு</string>
+  <string name="accessibility_pause">இடைநிறுத்து</string>
+  <string name="accessibility_next">அடுத்து</string>
+  <string name="accessibility_prev">முந்தையது</string>
+  <string name="accessibility_shuffle">குலை</string>
+  <string name="accessibility_shuffle_all">அனைத்தையும் குலை</string>
+  <string name="accessibility_repeat">மீண்டும்</string>
+  <string name="accessibility_repeat_all">அனைத்தையும் மீண்டும் இயக்கு</string>
+  <string name="accessibility_repeat_one">ஒன்றை மீண்டும் இயக்கு</string>
+  <string name="accessibility_queue">சாரையை திற</string>
+  <string name="accessibility_browse">இசையை உலாவு</string>
+  <!-- Toast messages -->
+  <string name="set_as_ringtone">\'<xliff:g id="name" example="Alarm Bell">%s</xliff:g>\' ஐ ரிங்டோனாக அமை</string>
+  <string name="playlist_renamed">இசைப்பட்டியல் மறுபெயரிடப்பட்டது</string>
+  <!-- Settings -->
+  <string name="settings_ui_category">இடைமுகம்</string>
+  <string name="settings_storage_category">சேமிப்பிடம்</string>
+  <string name="settings_data_category">தரவு</string>
+  <string name="settings_delete_cache_title">தேக்கத்தை நீக்கு</string>
+  <string name="settings_delete_cache_summary">தேக்கப்பட்ட படங்கள் அனைத்தையும் நீக்கு</string>
+  <string name="settings_download_only_on_wifi_title">Wi-fi வழியாக மட்டுமே பதிவிறக்கு</string>
+  <string name="settings_download_only_on_wifi_summary">கேரியர் கட்டணங்களை குறைக்க, மொபைல் பிணையங்களில் பதிவிறக்காதே</string>
+  <string name="settings_download_missing_artwork_title">பதிவிறக்கத்தில் ஆல்பம் கலையை காணவில்லை</string>
+  <string name="settings_download_artist_images_title">பதிவிறக்கத்தில் ஆல்பம் கலைஞர் படங்களைக் காணவில்லை</string>
+  <string name="settings_general_category">பொது</string>
+  <string name="settings_show_music_visualization_title">இசை காட்சிப்படுத்தலை காண்பி</string>
+  <string name="settings_show_lyrics_title">பாடல் வரிகளைக் காண்பி</string>
+  <string name="settings_show_lyrics_summary">srt கோப்பு உடைய பாடல்களுக்கு</string>
+  <string name="settings_shake_to_play">இயக்க அசை</string>
+  <string name="settings_shake_to_play_summary">அடுத்த பாடலை இயக்குவதற்கு உங்கள் சாதனத்தை அசைக்கவும்</string>
+  <string name="settings_lockscreen_album_art">பூட்டுத் திரை ஆல்பம் கலை</string>
+  <string name="settings_lockscreen_album_art_summary">பூட்டுத்திரை பின்னணியை ஆல்பம் கலையால் மாற்றிடவும்</string>
+  <!-- App widget -->
+  <string name="app_widget_small">இசை: 4 \u00d7 1</string>
+  <string name="app_widget_large">இசை: 4 \u00d7 2</string>
+  <string name="app_widget_large_alt">இசை: 4 \u00d7 2 (மாற்று)</string>
+  <string name="app_widget_recent">இசை:சமீபத்தில் கேட்டது</string>
+  <!-- Empty list / error messages -->
+  <string name="no_effects_for_you">சமமாக்கியை திறக்க முடியவில்லை.</string>
+  <string name="empty_music">உங்கள் கணினியில் இருந்து உங்கள் கருவிக்கு இசையை நகலெடுக்க, ஒரு USB கம்பி இழையை பயன்படுத்தவும்</string>
+  <string name="empty_search">தேடல் முடிவுகள் எதுவும் கண்டுபிடிக்கப்படவில்லை</string>
+  <string name="empty_search_check">உங்களிடம் சரியான எழுத்துக்கூட்டுரு இருகிறதா என தயவுசெய்து சரிபார்க்கவும் அல்லது வேறு திறவுச்சொல்லைப் பயன்படுத்தவும்.</string>
+  <string name="empty_favorite">நீங்கள் விருப்பமானது என்று குறிப்பிடும் பாடல்கள் இங்கே காட்டப்படும்.</string>
+  <string name="empty_recent_main">சமீபத்திய பாடல்கள் இல்லை</string>
+  <string name="empty_recent">நீங்கள் சமீபத்தில் கேட்ட பாடல்கள் இங்கே காட்டப்படும்.</string>
+  <string name="empty_playlist_main">இசைப்பட்டியலில் பாடல்கள் இல்லை.</string>
+  <string name="empty_playlist_secondary">இந்த இசைப்பட்டியலில் பாடல்களை சேர்க்க, ஒரு பாடல், ஆல்பம் அல்லது கலைஞரில் உள்ள விருப்பங்கள் மெனுவை தட்டி \&quot;இசைப்பட்டியலில் சேர்\&quot;ஐ தேர்வுசெய்</string>
+  <string name="empty_top_tracks_main">முதன்மையான தடங்கள் இல்லை</string>
+  <string name="empty_top_tracks_secondary">நீங்கள் அதிகமாக கேட்கும் பாடல்கள் இந்த பட்டியலில் சேர்க்கப்படும்.</string>
+  <string name="empty_last_added_main">சமீபத்தில் பாடல்கள் எதுவும் சேர்க்கப்படவில்லை.</string>
+  <string name="empty_last_added">சென்ற மாதம் நீங்கள் சேர்த்த பாடல்கள் இங்கே காட்டபப்டும்.</string>
+  <string name="empty_generic_main">இசை எதுவும் கண்டுபிடிக்கப்படவில்லை</string>
+  <string name="empty_generic_secondary">உங்கள் கணினியில் இருந்து உங்கள் கருவிக்கு இசையை நகலெடுக்க, ஒரு USB கம்பி இழையை பயன்படுத்தவும்</string>
+  <string name="empty_queue_main">இயக்க சாரத்தில் பாடல்கள் எதுவும் இல்லை.</string>
+  <string name="empty_queue_secondary">இந்த சாரையில் பாடல்களை சேர்க்க, ஒரு பாடல், ஆல்பம் அல்லது கலைஞரில் உள்ள விருப்பங்கள் மெனுவை தட்டி \&quot;வரிசையில் சேர்\&quot;ஐ தேர்வுசெய்.</string>
+  <string name="error_playing_track">%1$s தடத்தை இயக்க முடியவில்லை</string>
+  <!-- Section Headers -->
+  <string name="header_unknown_year">அறியப்படாத ஆண்டு</string>
+  <string name="header_less_than_30s">30 வினாடிகளுக்கும் குறைவாக</string>
+  <string name="header_30_to_60_seconds">30-60 வினாடிகள்</string>
+  <string name="header_1_to_2_minutes">1 - 2 நிமிடங்கள்</string>
+  <string name="header_2_to_3_minutes">2 - 3 நிமிடங்கள்</string>
+  <string name="header_3_to_4_minutes">3 - 4 நிமிடங்கள்</string>
+  <string name="header_4_to_5_minutes">4 - 5 நிமிடங்கள்</string>
+  <string name="header_5_to_10_minutes">5 - 10 நிமிடங்கள்</string>
+  <string name="header_10_to_30_minutes">10 - 30 நிமிடங்கள்</string>
+  <string name="header_30_to_60_minutes">30 - 60 நிமிடங்கள்</string>
+  <string name="header_greater_than_60_minutes">60 நிமிடங்களுக்கு மேல்</string>
+  <string name="header_1_song">1 பாடல்</string>
+  <string name="header_2_to_4_songs">2 - 4 பாடல்கள்</string>
+  <string name="header_5_to_9_songs">5 - 9 பாடல்கள்</string>
+  <string name="header_10_plus_songs">10+ பாடல்கள்</string>
+  <string name="header_5_plus_albums">5+ ஆல்பம்கள்</string>
+  <string name="header_other">"&quot;மற்றவை&quot;"</string>
+  <string name="footer_search_artists">அனைத்து கலைஞர்களையும் காண்பி</string>
+  <string name="footer_search_albums">அனைத்து ஆல்பங்களையும் காண்பி</string>
+  <string name="footer_search_songs">அனைத்து பாடல்களையும் காண்பி</string>
+  <string name="footer_search_playlists">அனைத்து இசைப்பட்டியல்களையும் காண்பி</string>
+  <string name="searchHint">இசையை தேடு</string>
+  <string name="search_title_artists">அனைத்து \”%s\&quot; கலைஞர்கள்</string>
+  <string name="search_title_albums">அனைத்து \”%s\&quot;  ஆல்பங்கள்</string>
+  <string name="search_title_songs">அனைத்து \”%s\&quot; பாடல்கள்</string>
+  <string name="search_title_playlists">அனைத்து \”%s\&quot; இசைப்பட்டியல்கள்</string>
+  <string name="duration_format"><xliff:g id="hours">%1$s</xliff:g> <xliff:g id="minutes">%2$s</xliff:g></string>
 </resources>
diff --git a/res/values-te-rIN/plurals.xml b/res/values-te/plurals.xml
similarity index 100%
rename from res/values-te-rIN/plurals.xml
rename to res/values-te/plurals.xml
diff --git a/res/values-te-rIN/strings.xml b/res/values-te/strings.xml
similarity index 100%
rename from res/values-te-rIN/strings.xml
rename to res/values-te/strings.xml
diff --git a/res/values-vec-rIT/plurals.xml b/res/values-tl/plurals.xml
similarity index 100%
rename from res/values-vec-rIT/plurals.xml
rename to res/values-tl/plurals.xml
diff --git a/res/values-uz-rUZ/strings.xml b/res/values-tl/strings.xml
similarity index 100%
rename from res/values-uz-rUZ/strings.xml
rename to res/values-tl/strings.xml
diff --git a/res/values-ug/plurals.xml b/res/values-ug/plurals.xml
index 42fea7b..9827780 100644
--- a/res/values-ug/plurals.xml
+++ b/res/values-ug/plurals.xml
@@ -18,47 +18,14 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Used to indicate the number of artists -->
-  <plurals name="Nartists">
-    <item quantity="other"><xliff:g id="count">%d</xliff:g> سەنئەتكار</item>
-  </plurals>
   <!-- Used to indicate the number of albums for an artist -->
-  <plurals name="Nalbums">
-    <item quantity="other"><xliff:g id="count">%d</xliff:g> ناخشا توپلىمى</item>
-  </plurals>
   <!-- Used to indicate the number of songs for an album -->
-  <plurals name="Nsongs">
-    <item quantity="other"><xliff:g id="count">%d</xliff:g> ناخشا</item>
-  </plurals>
   <!-- Used to indicate the number of genres -->
-  <plurals name="Ngenres">
-    <item quantity="other"><xliff:g id="count">%d</xliff:g> تىپ</item>
-  </plurals>
   <!-- Used to show a shortened version of hours-->
-  <plurals name="Nhours">
-    <item quantity="other"><xliff:g id="hours">%d</xliff:g> سائەت</item>
-  </plurals>
   <!-- Used to show a shortened version of minutes -->
-  <plurals name="Nminutes">
-    <item quantity="other"><xliff:g id="minutes">%d</xliff:g> مىنۇت</item>
-  </plurals>
   <!-- Toasts after adding song(s) to playlists -->
-  <plurals name="NNNtrackstoplaylist">
-    <item quantity="other">چالىدىغان تىزىمغا <xliff:g id="number" example="27">%d</xliff:g> ناخشا قوشۇلدى.</item>
-  </plurals>
   <!-- Toasts after removing song(s) from playlists -->
-  <plurals name="NNNtracksfromplaylist">
-    <item quantity="other">چالىدىغان تىزىمدىن <xliff:g id="number" example="27">%d</xliff:g> ناخشا چىقىرىۋېتىلدى.</item>
-  </plurals>
   <!-- Toasts after adding song(s) to queue -->
-  <plurals name="NNNtrackstoqueue">
-    <item quantity="other">ئۆچىرەتكە <xliff:g id="number" example="27">%d</xliff:g> ناخشا قوشۇلدى.</item>
-  </plurals>
   <!-- Toasts after adding song(s) to the favorites list -->
-  <plurals name="NNNtrackstofavorites">
-    <item quantity="other">يىغقۇچقا <xliff:g id="number" example="27">%d</xliff:g> ناخشا قوشۇلدى.</item>
-  </plurals>
   <!-- Toast confirming that song(s) was/were deleted. -->
-  <plurals name="NNNtracksdeleted">
-    <item quantity="other">ناخشىدىن <xliff:g id="songs_to_delete">%d</xliff:g> ئۆچۈرۈلدى.</item>
-  </plurals>
 </resources>
diff --git a/res/values-uk/plurals.xml b/res/values-uk/plurals.xml
index 17dbd1e..9827780 100644
--- a/res/values-uk/plurals.xml
+++ b/res/values-uk/plurals.xml
@@ -18,69 +18,14 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Used to indicate the number of artists -->
-  <plurals name="Nartists">
-    <item quantity="one"><xliff:g id="count">%d</xliff:g> виконавець</item>
-    <item quantity="few"><xliff:g id="count">%d</xliff:g> виконавці</item>
-    <item quantity="other"><xliff:g id="count">%d</xliff:g> виконавців</item>
-  </plurals>
   <!-- Used to indicate the number of albums for an artist -->
-  <plurals name="Nalbums">
-    <item quantity="one"><xliff:g id="count">%d</xliff:g> альбом</item>
-    <item quantity="few"><xliff:g id="count">%d</xliff:g> альбоми</item>
-    <item quantity="other"><xliff:g id="count">%d</xliff:g> альбомів</item>
-  </plurals>
   <!-- Used to indicate the number of songs for an album -->
-  <plurals name="Nsongs">
-    <item quantity="one"><xliff:g id="count">%d</xliff:g> пісня</item>
-    <item quantity="few"><xliff:g id="count">%d</xliff:g> пісні</item>
-    <item quantity="other"><xliff:g id="count">%d</xliff:g> пісень</item>
-  </plurals>
   <!-- Used to indicate the number of genres -->
-  <plurals name="Ngenres">
-    <item quantity="one"><xliff:g id="count">%d</xliff:g> жанр</item>
-    <item quantity="few"><xliff:g id="count"> %d </xliff:g> жанри</item>
-    <item quantity="other"><xliff:g id="count"> %d </xliff:g> жанрів</item>
-  </plurals>
   <!-- Used to show a shortened version of hours-->
-  <plurals name="Nhours">
-    <item quantity="one"><xliff:g id="hours">%d</xliff:g>г</item>
-    <item quantity="few"><xliff:g id="hours">%d</xliff:g>г</item>
-    <item quantity="other"><xliff:g id="hours">%d</xliff:g>г</item>
-  </plurals>
   <!-- Used to show a shortened version of minutes -->
-  <plurals name="Nminutes">
-    <item quantity="one"><xliff:g id="minutes">%d</xliff:g>х</item>
-    <item quantity="few"><xliff:g id="minutes">%d</xliff:g>х</item>
-    <item quantity="other"><xliff:g id="minutes">%d</xliff:g>х</item>
-  </plurals>
   <!-- Toasts after adding song(s) to playlists -->
-  <plurals name="NNNtrackstoplaylist">
-    <item quantity="one"><xliff:g id="number" example="1">%d</xliff:g> композиція додана в список.</item>
-    <item quantity="few"><xliff:g id="number" example="27">%d</xliff:g> композиції додано в список.</item>
-    <item quantity="other"><xliff:g id="number" example="27">%d</xliff:g> композицій додано в список.</item>
-  </plurals>
   <!-- Toasts after removing song(s) from playlists -->
-  <plurals name="NNNtracksfromplaylist">
-    <item quantity="one"><xliff:g id="number" example="1">%d</xliff:g> композиція вилучена зі списку відтворення.</item>
-    <item quantity="few"><xliff:g id="number" example="27">%d</xliff:g> композиції вилучено зі списку відтворення.</item>
-    <item quantity="other"><xliff:g id="number" example="27">%d</xliff:g> композицій вилучено зі списку відтворення.</item>
-  </plurals>
   <!-- Toasts after adding song(s) to queue -->
-  <plurals name="NNNtrackstoqueue">
-    <item quantity="one"><xliff:g id="number" example="1">%d</xliff:g> композиція додана в чергу.</item>
-    <item quantity="few"><xliff:g id="number" example="27">%d</xliff:g> композиції додано в чергу.</item>
-    <item quantity="other"><xliff:g id="number" example="27">%d</xliff:g> композицій додано в чергу.</item>
-  </plurals>
   <!-- Toasts after adding song(s) to the favorites list -->
-  <plurals name="NNNtrackstofavorites">
-    <item quantity="one"><xliff:g id="number" example="1">%d</xliff:g> композиція додана в Улюблене.</item>
-    <item quantity="few"><xliff:g id="number" example="27">%d</xliff:g> композиції додано в Улюблене.</item>
-    <item quantity="other"><xliff:g id="number" example="27">%d</xliff:g> композицій додано в Улюблене.</item>
-  </plurals>
   <!-- Toast confirming that song(s) was/were deleted. -->
-  <plurals name="NNNtracksdeleted">
-    <item quantity="one"><xliff:g id="songs_to_delete" example="1">%d</xliff:g> композиція видалена.</item>
-    <item quantity="few"><xliff:g id="number" example="27">%d</xliff:g> композиції видалено.</item>
-    <item quantity="other"><xliff:g id="songs_to_delete">%d</xliff:g> пісні були видалені.</item>
-  </plurals>
 </resources>
diff --git a/res/values-ur/plurals.xml b/res/values-ur/plurals.xml
new file mode 100644
index 0000000..9827780
--- /dev/null
+++ b/res/values-ur/plurals.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2013 Andrew Neal
+     Copyright (C) 2012-2014 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Used to indicate the number of artists -->
+  <!-- Used to indicate the number of albums for an artist -->
+  <!-- Used to indicate the number of songs for an album -->
+  <!-- Used to indicate the number of genres -->
+  <!-- Used to show a shortened version of hours-->
+  <!-- Used to show a shortened version of minutes -->
+  <!-- Toasts after adding song(s) to playlists -->
+  <!-- Toasts after removing song(s) from playlists -->
+  <!-- Toasts after adding song(s) to queue -->
+  <!-- Toasts after adding song(s) to the favorites list -->
+  <!-- Toast confirming that song(s) was/were deleted. -->
+</resources>
diff --git a/res/values-vec-rIT/strings.xml b/res/values-ur/strings.xml
similarity index 100%
rename from res/values-vec-rIT/strings.xml
rename to res/values-ur/strings.xml
diff --git a/res/values-uz/plurals.xml b/res/values-uz/plurals.xml
new file mode 100644
index 0000000..9827780
--- /dev/null
+++ b/res/values-uz/plurals.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2013 Andrew Neal
+     Copyright (C) 2012-2014 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Used to indicate the number of artists -->
+  <!-- Used to indicate the number of albums for an artist -->
+  <!-- Used to indicate the number of songs for an album -->
+  <!-- Used to indicate the number of genres -->
+  <!-- Used to show a shortened version of hours-->
+  <!-- Used to show a shortened version of minutes -->
+  <!-- Toasts after adding song(s) to playlists -->
+  <!-- Toasts after removing song(s) from playlists -->
+  <!-- Toasts after adding song(s) to queue -->
+  <!-- Toasts after adding song(s) to the favorites list -->
+  <!-- Toast confirming that song(s) was/were deleted. -->
+</resources>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
new file mode 100644
index 0000000..ac715c0
--- /dev/null
+++ b/res/values-uz/strings.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2013 Andrew Neal
+     Copyright (C) 2012-2014 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Page titles -->
+  <!-- Section Headers -->
+  <!-- Option menu items -->
+  <!-- Playlist items -->
+  <!-- Sort orders -->
+  <!-- Default playlist names -->
+  <!-- AlertDialog items -->
+  <!-- Context menu items -->
+  <!-- Content descriptions -->
+  <!-- Toast messages -->
+  <!-- Settings -->
+  <!-- App widget -->
+  <!-- Empty list / error messages -->
+  <!-- Section Headers -->
+</resources>
diff --git a/res/values-vec/plurals.xml b/res/values-vec/plurals.xml
new file mode 100644
index 0000000..9827780
--- /dev/null
+++ b/res/values-vec/plurals.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2013 Andrew Neal
+     Copyright (C) 2012-2014 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Used to indicate the number of artists -->
+  <!-- Used to indicate the number of albums for an artist -->
+  <!-- Used to indicate the number of songs for an album -->
+  <!-- Used to indicate the number of genres -->
+  <!-- Used to show a shortened version of hours-->
+  <!-- Used to show a shortened version of minutes -->
+  <!-- Toasts after adding song(s) to playlists -->
+  <!-- Toasts after removing song(s) from playlists -->
+  <!-- Toasts after adding song(s) to queue -->
+  <!-- Toasts after adding song(s) to the favorites list -->
+  <!-- Toast confirming that song(s) was/were deleted. -->
+</resources>
diff --git a/res/values-vec/strings.xml b/res/values-vec/strings.xml
new file mode 100644
index 0000000..ac715c0
--- /dev/null
+++ b/res/values-vec/strings.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2013 Andrew Neal
+     Copyright (C) 2012-2014 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Page titles -->
+  <!-- Section Headers -->
+  <!-- Option menu items -->
+  <!-- Playlist items -->
+  <!-- Sort orders -->
+  <!-- Default playlist names -->
+  <!-- AlertDialog items -->
+  <!-- Context menu items -->
+  <!-- Content descriptions -->
+  <!-- Toast messages -->
+  <!-- Settings -->
+  <!-- App widget -->
+  <!-- Empty list / error messages -->
+  <!-- Section Headers -->
+</resources>
diff --git a/src/main/aidl/com/cyanogenmod/eleven/service/MusicPlaybackTrack.aidl b/src/main/aidl/com/cyanogenmod/eleven/service/MusicPlaybackTrack.aidl
deleted file mode 100644
index efdd951..0000000
--- a/src/main/aidl/com/cyanogenmod/eleven/service/MusicPlaybackTrack.aidl
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.cyanogenmod.eleven.service;
-
-import com.cyanogenmod.eleven.service.MusicPlaybackTrack;
-
-parcelable MusicPlaybackTrack;
\ No newline at end of file
diff --git a/src/main/aidl/com/cyanogenmod/eleven/IElevenService.aidl b/src/main/aidl/org/lineageos/eleven/IElevenService.aidl
similarity index 94%
rename from src/main/aidl/com/cyanogenmod/eleven/IElevenService.aidl
rename to src/main/aidl/org/lineageos/eleven/IElevenService.aidl
index e3b0acf..b53a874 100644
--- a/src/main/aidl/com/cyanogenmod/eleven/IElevenService.aidl
+++ b/src/main/aidl/org/lineageos/eleven/IElevenService.aidl
@@ -1,6 +1,6 @@
-package com.cyanogenmod.eleven;
+package org.lineageos.eleven;
 
-import com.cyanogenmod.eleven.service.MusicPlaybackTrack;
+import org.lineageos.eleven.service.MusicPlaybackTrack;
 
 interface IElevenService
 {
diff --git a/src/main/aidl/org/lineageos/eleven/service/MusicPlaybackTrack.aidl b/src/main/aidl/org/lineageos/eleven/service/MusicPlaybackTrack.aidl
new file mode 100644
index 0000000..b5d0f13
--- /dev/null
+++ b/src/main/aidl/org/lineageos/eleven/service/MusicPlaybackTrack.aidl
@@ -0,0 +1,5 @@
+package org.lineageos.eleven.service;
+
+import org.lineageos.eleven.service.MusicPlaybackTrack;
+
+parcelable MusicPlaybackTrack;
\ No newline at end of file
diff --git a/src/main/java/com/cyanogenmod/eleven/Config.java b/src/main/java/org/lineageos/eleven/Config.java
similarity index 99%
rename from src/main/java/com/cyanogenmod/eleven/Config.java
rename to src/main/java/org/lineageos/eleven/Config.java
index 3ebdac8..3a3096f 100644
--- a/src/main/java/com/cyanogenmod/eleven/Config.java
+++ b/src/main/java/org/lineageos/eleven/Config.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven;
+package org.lineageos.eleven;
 
 /**
  * App-wide constants.
diff --git a/src/main/java/com/cyanogenmod/eleven/ElevenApplication.java b/src/main/java/org/lineageos/eleven/ElevenApplication.java
similarity index 96%
rename from src/main/java/com/cyanogenmod/eleven/ElevenApplication.java
rename to src/main/java/org/lineageos/eleven/ElevenApplication.java
index e01406b..e61c6d7 100644
--- a/src/main/java/com/cyanogenmod/eleven/ElevenApplication.java
+++ b/src/main/java/org/lineageos/eleven/ElevenApplication.java
@@ -11,12 +11,12 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven;
+package org.lineageos.eleven;
 
 import android.app.Application;
 import android.os.StrictMode;
 
-import com.cyanogenmod.eleven.cache.ImageCache;
+import org.lineageos.eleven.cache.ImageCache;
 
 import java.util.logging.Level;
 import java.util.logging.Logger;
diff --git a/src/main/java/com/cyanogenmod/eleven/MediaButtonIntentReceiver.java b/src/main/java/org/lineageos/eleven/MediaButtonIntentReceiver.java
similarity index 99%
rename from src/main/java/com/cyanogenmod/eleven/MediaButtonIntentReceiver.java
rename to src/main/java/org/lineageos/eleven/MediaButtonIntentReceiver.java
index 4f9e9af..2c6a607 100644
--- a/src/main/java/com/cyanogenmod/eleven/MediaButtonIntentReceiver.java
+++ b/src/main/java/org/lineageos/eleven/MediaButtonIntentReceiver.java
@@ -9,7 +9,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven;
+package org.lineageos.eleven;
 
 import android.content.Context;
 import android.content.Intent;
diff --git a/src/main/java/com/cyanogenmod/eleven/MusicPlaybackService.java b/src/main/java/org/lineageos/eleven/MusicPlaybackService.java
similarity index 97%
rename from src/main/java/com/cyanogenmod/eleven/MusicPlaybackService.java
rename to src/main/java/org/lineageos/eleven/MusicPlaybackService.java
index 2688de0..04092c4 100644
--- a/src/main/java/com/cyanogenmod/eleven/MusicPlaybackService.java
+++ b/src/main/java/org/lineageos/eleven/MusicPlaybackService.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven;
+package org.lineageos.eleven;
 
 import android.Manifest.permission;
 import android.annotation.SuppressLint;
@@ -20,6 +20,7 @@
 import android.support.v4.app.NotificationCompat;
 import android.support.v4.media.app.NotificationCompat.MediaStyle;
 import android.app.NotificationManager;
+import android.app.NotificationChannel;
 import android.app.PendingIntent;
 import android.app.Service;
 import android.appwidget.AppWidgetManager;
@@ -64,21 +65,21 @@
 import android.util.LongSparseArray;
 import android.view.KeyEvent;
 
-import com.cyanogenmod.eleven.Config.IdType;
-import com.cyanogenmod.eleven.appwidgets.AppWidgetLarge;
-import com.cyanogenmod.eleven.appwidgets.AppWidgetLargeAlternate;
-import com.cyanogenmod.eleven.appwidgets.AppWidgetSmall;
-import com.cyanogenmod.eleven.cache.ImageCache;
-import com.cyanogenmod.eleven.cache.ImageFetcher;
-import com.cyanogenmod.eleven.provider.MusicPlaybackState;
-import com.cyanogenmod.eleven.provider.RecentStore;
-import com.cyanogenmod.eleven.provider.SongPlayCount;
-import com.cyanogenmod.eleven.service.MusicPlaybackTrack;
-import com.cyanogenmod.eleven.utils.BitmapWithColors;
-import com.cyanogenmod.eleven.utils.Lists;
-import com.cyanogenmod.eleven.utils.PreferenceUtils;
-import com.cyanogenmod.eleven.utils.ShakeDetector;
-import com.cyanogenmod.eleven.utils.SrtManager;
+import org.lineageos.eleven.Config.IdType;
+import org.lineageos.eleven.appwidgets.AppWidgetLarge;
+import org.lineageos.eleven.appwidgets.AppWidgetLargeAlternate;
+import org.lineageos.eleven.appwidgets.AppWidgetSmall;
+import org.lineageos.eleven.cache.ImageCache;
+import org.lineageos.eleven.cache.ImageFetcher;
+import org.lineageos.eleven.provider.MusicPlaybackState;
+import org.lineageos.eleven.provider.RecentStore;
+import org.lineageos.eleven.provider.SongPlayCount;
+import org.lineageos.eleven.service.MusicPlaybackTrack;
+import org.lineageos.eleven.utils.BitmapWithColors;
+import org.lineageos.eleven.utils.Lists;
+import org.lineageos.eleven.utils.PreferenceUtils;
+import org.lineageos.eleven.utils.ShakeDetector;
+import org.lineageos.eleven.utils.SrtManager;
 
 import java.io.File;
 import java.io.IOException;
@@ -93,106 +94,107 @@
 
 /**
  * A backbround {@link Service} used to keep music playing between activities
- * and when the user moves Apollo into the background.
+ * and when the user moves Eleven into the background.
  */
 @SuppressLint("NewApi")
 public class MusicPlaybackService extends Service {
     private static final String TAG = "MusicPlaybackService";
     private static final boolean D = false;
+    public static final String CHANNEL_ID = "eleven_channel_01";
 
     /**
      * Indicates that the music has paused or resumed
      */
-    public static final String PLAYSTATE_CHANGED = "com.cyanogenmod.eleven.playstatechanged";
+    public static final String PLAYSTATE_CHANGED = "org.lineageos.eleven.playstatechanged";
 
     /**
      * Indicates that music playback position within
      * a title was changed
      */
-    public static final String POSITION_CHANGED = "com.cyanogenmod.eleven.positionchanged";
+    public static final String POSITION_CHANGED = "org.lineageos.eleven.positionchanged";
 
     /**
      * Indicates the meta data has changed in some way, like a track change
      */
-    public static final String META_CHANGED = "com.cyanogenmod.eleven.metachanged";
+    public static final String META_CHANGED = "org.lineageos.eleven.metachanged";
 
     /**
      * Indicates the queue has been updated
      */
-    public static final String QUEUE_CHANGED = "com.cyanogenmod.eleven.queuechanged";
+    public static final String QUEUE_CHANGED = "org.lineageos.eleven.queuechanged";
 
     /**
      * Indicates the queue has been updated
      */
-    public static final String PLAYLIST_CHANGED = "com.cyanogenmod.eleven.playlistchanged";
+    public static final String PLAYLIST_CHANGED = "org.lineageos.eleven.playlistchanged";
 
     /**
      * Indicates the repeat mode changed
      */
-    public static final String REPEATMODE_CHANGED = "com.cyanogenmod.eleven.repeatmodechanged";
+    public static final String REPEATMODE_CHANGED = "org.lineageos.eleven.repeatmodechanged";
 
     /**
      * Indicates the shuffle mode changed
      */
-    public static final String SHUFFLEMODE_CHANGED = "com.cyanogenmod.eleven.shufflemodechanged";
+    public static final String SHUFFLEMODE_CHANGED = "org.lineageos.eleven.shufflemodechanged";
 
     /**
      * Indicates the track fails to play
      */
-    public static final String TRACK_ERROR = "com.cyanogenmod.eleven.trackerror";
+    public static final String TRACK_ERROR = "org.lineageos.eleven.trackerror";
 
     /**
      * For backwards compatibility reasons, also provide sticky
      * broadcasts under the music package
      */
-    public static final String ELEVEN_PACKAGE_NAME = "com.cyanogenmod.eleven";
+    public static final String ELEVEN_PACKAGE_NAME = "org.lineageos.eleven";
     public static final String MUSIC_PACKAGE_NAME = "com.android.music";
 
     /**
      * Called to indicate a general service commmand. Used in
      * {@link MediaButtonIntentReceiver}
      */
-    public static final String SERVICECMD = "com.cyanogenmod.eleven.musicservicecommand";
+    public static final String SERVICECMD = "org.lineageos.eleven.musicservicecommand";
 
     /**
      * Called to go toggle between pausing and playing the music
      */
-    public static final String TOGGLEPAUSE_ACTION = "com.cyanogenmod.eleven.togglepause";
+    public static final String TOGGLEPAUSE_ACTION = "org.lineageos.eleven.togglepause";
 
     /**
      * Called to go to pause the playback
      */
-    public static final String PAUSE_ACTION = "com.cyanogenmod.eleven.pause";
+    public static final String PAUSE_ACTION = "org.lineageos.eleven.pause";
 
     /**
      * Called to go to stop the playback
      */
-    public static final String STOP_ACTION = "com.cyanogenmod.eleven.stop";
+    public static final String STOP_ACTION = "org.lineageos.eleven.stop";
 
     /**
      * Called to go to the previous track or the beginning of the track if partway through the track
      */
-    public static final String PREVIOUS_ACTION = "com.cyanogenmod.eleven.previous";
+    public static final String PREVIOUS_ACTION = "org.lineageos.eleven.previous";
 
     /**
      * Called to go to the previous track regardless of how far in the current track the playback is
      */
-    public static final String PREVIOUS_FORCE_ACTION = "com.cyanogenmod.eleven.previous.force";
+    public static final String PREVIOUS_FORCE_ACTION = "org.lineageos.eleven.previous.force";
 
     /**
      * Called to go to the next track
      */
-    public static final String NEXT_ACTION = "com.cyanogenmod.eleven.next";
+    public static final String NEXT_ACTION = "org.lineageos.eleven.next";
 
     /**
      * Called to change the repeat mode
      */
-    public static final String REPEAT_ACTION = "com.cyanogenmod.eleven.repeat";
+    public static final String REPEAT_ACTION = "org.lineageos.eleven.repeat";
 
     /**
      * Called to change the shuffle mode
      */
-    public static final String SHUFFLE_ACTION = "com.cyanogenmod.eleven.shuffle";
+    public static final String SHUFFLE_ACTION = "org.lineageos.eleven.shuffle";
 
     public static final String FROM_MEDIA_BUTTON = "frommediabutton";
 
@@ -202,22 +204,22 @@ public class MusicPlaybackService extends Service {
      * Used to easily notify a list that it should refresh. i.e. A playlist
      * changes
      */
-    public static final String REFRESH = "com.cyanogenmod.eleven.refresh";
+    public static final String REFRESH = "org.lineageos.eleven.refresh";
 
     /**
      * Used by the alarm intent to shutdown the service after being idle
      */
-    private static final String SHUTDOWN = "com.cyanogenmod.eleven.shutdown";
+    private static final String SHUTDOWN = "org.lineageos.eleven.shutdown";
 
     /**
      * Called to notify of a timed text
      */
-    public static final String NEW_LYRICS = "com.cyanogenmod.eleven.lyrics";
+    public static final String NEW_LYRICS = "org.lineageos.eleven.lyrics";
 
     /**
      * Called to update the remote control client
      */
-    public static final String UPDATE_LOCKSCREEN = "com.cyanogenmod.eleven.updatelockscreen";
+    public static final String UPDATE_LOCKSCREEN = "org.lineageos.eleven.updatelockscreen";
 
     public static final String CMDNAME = "command";
 
@@ -337,8 +339,6 @@ public class MusicPlaybackService extends Service {
     /**
      * The max size allowed for the track history
      * TODO: Comeback and rewrite/fix all the whole queue code bugs after demo
-     * https://cyanogen.atlassian.net/browse/MUSIC-175
-     * https://cyanogen.atlassian.net/browse/MUSIC-44
      */
     public static final int MAX_HISTORY_SIZE = 1000;
 
@@ -628,6 +628,13 @@ public void onCreate() {
 
         mNotificationManager = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
 
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            CharSequence channelName = "Eleven";
+            // Create channel to show notifications.
+            mNotificationManager.createNotificationChannel(new NotificationChannel(CHANNEL_ID,
+                    channelName, NotificationManager.IMPORTANCE_LOW));
+        }
+
         // Initialize the favorites and recents databases
         mRecentsCache = RecentStore.getInstance(this);
 
@@ -666,7 +673,7 @@ public void onCreate() {
 
         mShowAlbumArtOnLockscreen = mPreferences.getBoolean(
                 PreferenceUtils.SHOW_ALBUM_ART_ON_LOCKSCREEN, true);
-         setShakeToPlayEnabled(mPreferences.getBoolean(PreferenceUtils.SHAKE_TO_PLAY, false));
+        setShakeToPlayEnabled(mPreferences.getBoolean(PreferenceUtils.SHAKE_TO_PLAY, false));
 
         mRepeatMode = mPreferences.getInt("repeatmode", REPEAT_NONE);
         mShuffleMode = mPreferences.getInt("shufflemode", SHUFFLE_NONE);
@@ -1101,9 +1108,7 @@ private int removeTracksInternal(int first, int last) {
                 // remove the items from the history
                 // this is not ideal as the history shouldn't be impacted by this
                 // but since we are removing items from the array, it will throw
-                // an exception if we keep it around.  Idealistically with the queue
-                // rewrite this should be all be fixed
-                // https://cyanogen.atlassian.net/browse/MUSIC-44
+                // an exception if we keep it around.
                 ListIterator<Integer> positionIterator = mHistory.listIterator();
                 while (positionIterator.hasNext()) {
                     int pos = positionIterator.next();
@@ -1544,8 +1549,6 @@ private void notifyChange(final String what) {
                 // if we are in shuffle mode and our next track is still valid,
                 // try to re-use the track
                 // We need to reimplement the queue to prevent hacky solutions like this
-                // https://cyanogen.atlassian.net/browse/MUSIC-175
-                // https://cyanogen.atlassian.net/browse/MUSIC-44
                 if (mNextPlayPos >= 0 && mNextPlayPos < mPlaylist.size()
                         && getShuffleMode() != SHUFFLE_NONE) {
                     setNextTrack(mNextPlayPos);
@@ -1647,7 +1650,7 @@ private Notification buildNotification() {
                 .setMediaSession(mSession.getSessionToken())
                 .setShowActionsInCompactView(0, 1, 2);
 
-        Intent nowPlayingIntent = new Intent("com.cyanogenmod.eleven.AUDIO_PLAYER")
+        Intent nowPlayingIntent = new Intent("org.lineageos.eleven.AUDIO_PLAYER")
                 .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         PendingIntent clickIntent = PendingIntent.getActivity(this, 0, nowPlayingIntent, 0);
         BitmapWithColors artwork = getAlbumArt(false);
@@ -1656,7 +1659,7 @@ private Notification buildNotification() {
             mNotificationPostTime = System.currentTimeMillis();
         }
 
-        android.support.v4.app.NotificationCompat.Builder builder = new NotificationCompat.Builder(this)
+        android.support.v4.app.NotificationCompat.Builder builder = new NotificationCompat.Builder(this, CHANNEL_ID)
                     .setSmallIcon(R.drawable.ic_notification)
                     .setLargeIcon(artwork.getBitmap())
                     .setContentIntent(clickIntent)
@@ -1715,7 +1718,7 @@ private void saveQueue(final boolean full) {
 
     /**
      * Reloads the queue as the user left it the last time they stopped using
-     * Apollo
+     * Eleven
      */
     private void reloadQueue() {
         int id = mCardId;
@@ -3960,7 +3963,7 @@ protected List<MediaSessionCompat.QueueItem> doInBackground(Void... params) {
 
                 List<MediaSessionCompat.QueueItem> items = new ArrayList<>();
                 for (int i = 0; i < mQueue.length; i++) {
-                	MediaDescriptionCompat desc = descsById.get(mQueue[i]);
+                    MediaDescriptionCompat desc = descsById.get(mQueue[i]);
                     if (desc == null) {
                         // shouldn't happen except in corner cases like
                         // music being deleted while we were processing
diff --git a/src/main/java/com/cyanogenmod/eleven/MusicStateListener.java b/src/main/java/org/lineageos/eleven/MusicStateListener.java
similarity index 97%
rename from src/main/java/com/cyanogenmod/eleven/MusicStateListener.java
rename to src/main/java/org/lineageos/eleven/MusicStateListener.java
index 84bd99d..0ffa975 100644
--- a/src/main/java/com/cyanogenmod/eleven/MusicStateListener.java
+++ b/src/main/java/org/lineageos/eleven/MusicStateListener.java
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven;
+package org.lineageos.eleven;
 
 /**
  * Listens for playback changes to send the the fragments bound to this activity
diff --git a/src/main/java/com/cyanogenmod/eleven/adapters/AlbumAdapter.java b/src/main/java/org/lineageos/eleven/adapters/AlbumAdapter.java
similarity index 93%
rename from src/main/java/com/cyanogenmod/eleven/adapters/AlbumAdapter.java
rename to src/main/java/org/lineageos/eleven/adapters/AlbumAdapter.java
index 928f549..010f57c 100644
--- a/src/main/java/com/cyanogenmod/eleven/adapters/AlbumAdapter.java
+++ b/src/main/java/org/lineageos/eleven/adapters/AlbumAdapter.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.adapters;
+package org.lineageos.eleven.adapters;
 
 import android.app.Activity;
 import android.content.Context;
@@ -21,13 +21,13 @@
 import android.widget.ArrayAdapter;
 import android.widget.BaseAdapter;
 
-import com.cyanogenmod.eleven.R;
-import com.cyanogenmod.eleven.cache.ImageFetcher;
-import com.cyanogenmod.eleven.model.Album;
-import com.cyanogenmod.eleven.ui.MusicHolder;
-import com.cyanogenmod.eleven.ui.MusicHolder.DataHolder;
-import com.cyanogenmod.eleven.utils.ApolloUtils;
-import com.cyanogenmod.eleven.widgets.IPopupMenuCallback;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.cache.ImageFetcher;
+import org.lineageos.eleven.model.Album;
+import org.lineageos.eleven.ui.MusicHolder;
+import org.lineageos.eleven.ui.MusicHolder.DataHolder;
+import org.lineageos.eleven.utils.ElevenUtils;
+import org.lineageos.eleven.widgets.IPopupMenuCallback;
 
 import java.util.Collections;
 import java.util.List;
@@ -80,7 +80,7 @@ public AlbumAdapter(final Activity context, final int layoutId) {
         // Get the layout Id
         mLayoutId = layoutId;
         // Initialize the cache & image fetcher
-        mImageFetcher = ApolloUtils.getImageFetcher(context);
+        mImageFetcher = ElevenUtils.getImageFetcher(context);
         mPadding = context.getResources().getDimensionPixelSize(R.dimen.list_item_general_margin);
     }
 
diff --git a/src/main/java/com/cyanogenmod/eleven/adapters/AlbumArtPagerAdapter.java b/src/main/java/org/lineageos/eleven/adapters/AlbumArtPagerAdapter.java
similarity index 93%
rename from src/main/java/com/cyanogenmod/eleven/adapters/AlbumArtPagerAdapter.java
rename to src/main/java/org/lineageos/eleven/adapters/AlbumArtPagerAdapter.java
index 111350d..83e6840 100644
--- a/src/main/java/com/cyanogenmod/eleven/adapters/AlbumArtPagerAdapter.java
+++ b/src/main/java/org/lineageos/eleven/adapters/AlbumArtPagerAdapter.java
@@ -14,7 +14,7 @@
 * limitations under the License.
 */
 
-package com.cyanogenmod.eleven.adapters;
+package org.lineageos.eleven.adapters;
 
 import android.content.Context;
 import android.os.AsyncTask;
@@ -27,14 +27,14 @@
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.cyanogenmod.eleven.MusicPlaybackService;
-import com.cyanogenmod.eleven.R;
-import com.cyanogenmod.eleven.cache.ICacheListener;
-import com.cyanogenmod.eleven.cache.ImageCache;
-import com.cyanogenmod.eleven.model.AlbumArtistDetails;
-import com.cyanogenmod.eleven.utils.ApolloUtils;
-import com.cyanogenmod.eleven.utils.MusicUtils;
-import com.cyanogenmod.eleven.widgets.SquareImageView;
+import org.lineageos.eleven.MusicPlaybackService;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.cache.ICacheListener;
+import org.lineageos.eleven.cache.ImageCache;
+import org.lineageos.eleven.model.AlbumArtistDetails;
+import org.lineageos.eleven.utils.ElevenUtils;
+import org.lineageos.eleven.utils.MusicUtils;
+import org.lineageos.eleven.widgets.SquareImageView;
 
 import java.util.Iterator;
 import java.util.LinkedList;
@@ -152,7 +152,7 @@ private long getTrackId(int position) {
      * and handles loading the album art for a given audio id
      */
     public static class AlbumArtFragment extends Fragment implements ICacheListener {
-        private static final String ID = "com.cyanogenmod.eleven.adapters.AlbumArtPagerAdapter.AlbumArtFragment.ID";
+        private static final String ID = "org.lineageos.eleven.adapters.AlbumArtPagerAdapter.AlbumArtFragment.ID";
 
         private View mRootView;
         private AlbumArtistLoader mTask;
@@ -227,7 +227,7 @@ private void loadImageAsync() {
                 }
 
                 mTask = new AlbumArtistLoader(this, getActivity());
-                ApolloUtils.execute(false, mTask, mAudioId);
+                ElevenUtils.execute(false, mTask, mAudioId);
             }
 
         }
@@ -238,7 +238,7 @@ private void loadImageAsync() {
          */
         private void loadImageAsync(AlbumArtistDetails details) {
             // load the actual image
-            ApolloUtils.getImageFetcher(getActivity()).loadAlbumImage(
+            ElevenUtils.getImageFetcher(getActivity()).loadAlbumImage(
                     details.mArtistName,
                     details.mAlbumName,
                     details.mAlbumId,
diff --git a/src/main/java/com/cyanogenmod/eleven/adapters/AlbumDetailSongAdapter.java b/src/main/java/org/lineageos/eleven/adapters/AlbumDetailSongAdapter.java
similarity index 86%
rename from src/main/java/com/cyanogenmod/eleven/adapters/AlbumDetailSongAdapter.java
rename to src/main/java/org/lineageos/eleven/adapters/AlbumDetailSongAdapter.java
index 063b468..8f6fc34 100644
--- a/src/main/java/com/cyanogenmod/eleven/adapters/AlbumDetailSongAdapter.java
+++ b/src/main/java/org/lineageos/eleven/adapters/AlbumDetailSongAdapter.java
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.adapters;
+package org.lineageos.eleven.adapters;
 
 import android.app.Activity;
 import android.content.Context;
@@ -22,13 +22,13 @@
 import android.view.View;
 import android.widget.TextView;
 
-import com.cyanogenmod.eleven.Config;
-import com.cyanogenmod.eleven.R;
-import com.cyanogenmod.eleven.cache.ImageFetcher;
-import com.cyanogenmod.eleven.loaders.AlbumSongLoader;
-import com.cyanogenmod.eleven.model.Song;
-import com.cyanogenmod.eleven.ui.fragments.AlbumDetailFragment;
-import com.cyanogenmod.eleven.utils.MusicUtils;
+import org.lineageos.eleven.Config;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.cache.ImageFetcher;
+import org.lineageos.eleven.loaders.AlbumSongLoader;
+import org.lineageos.eleven.model.Song;
+import org.lineageos.eleven.ui.fragments.AlbumDetailFragment;
+import org.lineageos.eleven.utils.MusicUtils;
 
 import java.util.List;
 
diff --git a/src/main/java/com/cyanogenmod/eleven/adapters/ArtistAdapter.java b/src/main/java/org/lineageos/eleven/adapters/ArtistAdapter.java
similarity index 91%
rename from src/main/java/com/cyanogenmod/eleven/adapters/ArtistAdapter.java
rename to src/main/java/org/lineageos/eleven/adapters/ArtistAdapter.java
index 275f746..59e07b7 100644
--- a/src/main/java/com/cyanogenmod/eleven/adapters/ArtistAdapter.java
+++ b/src/main/java/org/lineageos/eleven/adapters/ArtistAdapter.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.adapters;
+package org.lineageos.eleven.adapters;
 
 import android.app.Activity;
 import android.content.Context;
@@ -21,20 +21,20 @@
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 
-import com.cyanogenmod.eleven.R;
-import com.cyanogenmod.eleven.cache.ImageFetcher;
-import com.cyanogenmod.eleven.model.Artist;
-import com.cyanogenmod.eleven.sectionadapter.SectionAdapter.BasicAdapter;
-import com.cyanogenmod.eleven.ui.MusicHolder;
-import com.cyanogenmod.eleven.ui.MusicHolder.DataHolder;
-import com.cyanogenmod.eleven.utils.ApolloUtils;
-import com.cyanogenmod.eleven.utils.MusicUtils;
-import com.cyanogenmod.eleven.widgets.IPopupMenuCallback;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.cache.ImageFetcher;
+import org.lineageos.eleven.model.Artist;
+import org.lineageos.eleven.sectionadapter.SectionAdapter.BasicAdapter;
+import org.lineageos.eleven.ui.MusicHolder;
+import org.lineageos.eleven.ui.MusicHolder.DataHolder;
+import org.lineageos.eleven.utils.ElevenUtils;
+import org.lineageos.eleven.utils.MusicUtils;
+import org.lineageos.eleven.widgets.IPopupMenuCallback;
 
 /**
  * This {@link ArrayAdapter} is used to display all of the artists on a user's
  * device for {@link ArtistFragment}.
- * 
+ *
  * @author Andrew Neal (andrewdneal@gmail.com)
  */
 /**
@@ -74,7 +74,7 @@ public class ArtistAdapter extends ArrayAdapter<Artist> implements BasicAdapter,
 
     /**
      * Constructor of <code>ArtistAdapter</code>
-     * 
+     *
      * @param context The {@link Context} to use.
      * @param layoutId The resource Id of the view to inflate.
      */
@@ -83,7 +83,7 @@ public ArtistAdapter(final Activity context, final int layoutId) {
         // Get the layout Id
         mLayoutId = layoutId;
         // Initialize the cache & image fetcher
-        mImageFetcher = ApolloUtils.getImageFetcher(context);
+        mImageFetcher = ElevenUtils.getImageFetcher(context);
         // Cache the transparent overlay
         mOverlay = ContextCompat.getColor(context, R.color.list_item_background);
     }
diff --git a/src/main/java/com/cyanogenmod/eleven/adapters/ArtistDetailAlbumAdapter.java b/src/main/java/org/lineageos/eleven/adapters/ArtistDetailAlbumAdapter.java
similarity index 90%
rename from src/main/java/com/cyanogenmod/eleven/adapters/ArtistDetailAlbumAdapter.java
rename to src/main/java/org/lineageos/eleven/adapters/ArtistDetailAlbumAdapter.java
index 4670e0d..66fec09 100644
--- a/src/main/java/com/cyanogenmod/eleven/adapters/ArtistDetailAlbumAdapter.java
+++ b/src/main/java/org/lineageos/eleven/adapters/ArtistDetailAlbumAdapter.java
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.adapters;
+package org.lineageos.eleven.adapters;
 
 import android.app.Activity;
 import android.os.Bundle;
@@ -26,15 +26,15 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.cyanogenmod.eleven.Config;
-import com.cyanogenmod.eleven.R;
-import com.cyanogenmod.eleven.cache.ImageFetcher;
-import com.cyanogenmod.eleven.loaders.AlbumLoader;
-import com.cyanogenmod.eleven.model.Album;
-import com.cyanogenmod.eleven.utils.ApolloUtils;
-import com.cyanogenmod.eleven.utils.NavUtils;
-import com.cyanogenmod.eleven.widgets.IPopupMenuCallback;
-import com.cyanogenmod.eleven.widgets.PopupMenuButton;
+import org.lineageos.eleven.Config;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.cache.ImageFetcher;
+import org.lineageos.eleven.loaders.AlbumLoader;
+import org.lineageos.eleven.model.Album;
+import org.lineageos.eleven.utils.ElevenUtils;
+import org.lineageos.eleven.utils.NavUtils;
+import org.lineageos.eleven.widgets.IPopupMenuCallback;
+import org.lineageos.eleven.widgets.PopupMenuButton;
 
 import java.util.Collections;
 import java.util.List;
@@ -55,7 +55,7 @@ public class ArtistDetailAlbumAdapter
 
     public ArtistDetailAlbumAdapter(final Activity activity) {
         mActivity = activity;
-        mImageFetcher = ApolloUtils.getImageFetcher(activity);
+        mImageFetcher = ElevenUtils.getImageFetcher(activity);
         mInflater = LayoutInflater.from(activity);
         mListMargin = activity.getResources().
             getDimensionPixelSize(R.dimen.list_item_general_margin);
diff --git a/src/main/java/com/cyanogenmod/eleven/adapters/ArtistDetailSongAdapter.java b/src/main/java/org/lineageos/eleven/adapters/ArtistDetailSongAdapter.java
similarity index 89%
rename from src/main/java/com/cyanogenmod/eleven/adapters/ArtistDetailSongAdapter.java
rename to src/main/java/org/lineageos/eleven/adapters/ArtistDetailSongAdapter.java
index 1da8464..c55025b 100644
--- a/src/main/java/com/cyanogenmod/eleven/adapters/ArtistDetailSongAdapter.java
+++ b/src/main/java/org/lineageos/eleven/adapters/ArtistDetailSongAdapter.java
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.adapters;
+package org.lineageos.eleven.adapters;
 
 import android.app.Activity;
 import android.os.Bundle;
@@ -23,11 +23,11 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.cyanogenmod.eleven.Config;
-import com.cyanogenmod.eleven.R;
-import com.cyanogenmod.eleven.cache.ImageFetcher;
-import com.cyanogenmod.eleven.loaders.SongLoader;
-import com.cyanogenmod.eleven.model.Song;
+import org.lineageos.eleven.Config;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.cache.ImageFetcher;
+import org.lineageos.eleven.loaders.SongLoader;
+import org.lineageos.eleven.model.Song;
 
 import java.util.List;
 
diff --git a/src/main/java/com/cyanogenmod/eleven/adapters/DetailSongAdapter.java b/src/main/java/org/lineageos/eleven/adapters/DetailSongAdapter.java
similarity index 90%
rename from src/main/java/com/cyanogenmod/eleven/adapters/DetailSongAdapter.java
rename to src/main/java/org/lineageos/eleven/adapters/DetailSongAdapter.java
index 49157af..697a9dd 100644
--- a/src/main/java/com/cyanogenmod/eleven/adapters/DetailSongAdapter.java
+++ b/src/main/java/org/lineageos/eleven/adapters/DetailSongAdapter.java
@@ -1,4 +1,4 @@
-package com.cyanogenmod.eleven.adapters;
+package org.lineageos.eleven.adapters;
 
 import android.app.Activity;
 import android.support.v4.app.LoaderManager.LoaderCallbacks;
@@ -12,15 +12,15 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.cyanogenmod.eleven.Config;
-import com.cyanogenmod.eleven.R;
-import com.cyanogenmod.eleven.cache.ImageFetcher;
-import com.cyanogenmod.eleven.model.Song;
-import com.cyanogenmod.eleven.service.MusicPlaybackTrack;
-import com.cyanogenmod.eleven.utils.ApolloUtils;
-import com.cyanogenmod.eleven.utils.MusicUtils;
-import com.cyanogenmod.eleven.widgets.IPopupMenuCallback;
-import com.cyanogenmod.eleven.widgets.PopupMenuButton;
+import org.lineageos.eleven.Config;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.cache.ImageFetcher;
+import org.lineageos.eleven.model.Song;
+import org.lineageos.eleven.service.MusicPlaybackTrack;
+import org.lineageos.eleven.utils.ElevenUtils;
+import org.lineageos.eleven.utils.MusicUtils;
+import org.lineageos.eleven.widgets.IPopupMenuCallback;
+import org.lineageos.eleven.widgets.PopupMenuButton;
 
 import java.util.Collections;
 import java.util.List;
@@ -37,7 +37,7 @@ public abstract class DetailSongAdapter extends BaseAdapter
 
     public DetailSongAdapter(final Activity activity) {
         mActivity = activity;
-        mImageFetcher = ApolloUtils.getImageFetcher(activity);
+        mImageFetcher = ElevenUtils.getImageFetcher(activity);
         mInflater = LayoutInflater.from(activity);
     }
 
diff --git a/src/main/java/com/cyanogenmod/eleven/adapters/PagerAdapter.java b/src/main/java/org/lineageos/eleven/adapters/PagerAdapter.java
similarity index 94%
rename from src/main/java/com/cyanogenmod/eleven/adapters/PagerAdapter.java
rename to src/main/java/org/lineageos/eleven/adapters/PagerAdapter.java
index d0d107f..b7eea13 100644
--- a/src/main/java/com/cyanogenmod/eleven/adapters/PagerAdapter.java
+++ b/src/main/java/org/lineageos/eleven/adapters/PagerAdapter.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.adapters;
+package org.lineageos.eleven.adapters;
 
 import android.content.Context;
 import android.os.Bundle;
@@ -21,12 +21,12 @@
 import android.util.SparseArray;
 import android.view.ViewGroup;
 
-import com.cyanogenmod.eleven.R;
-import com.cyanogenmod.eleven.ui.fragments.AlbumFragment;
-import com.cyanogenmod.eleven.ui.fragments.ArtistFragment;
-import com.cyanogenmod.eleven.ui.fragments.PlaylistFragment;
-import com.cyanogenmod.eleven.ui.fragments.SongFragment;
-import com.cyanogenmod.eleven.utils.Lists;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.ui.fragments.AlbumFragment;
+import org.lineageos.eleven.ui.fragments.ArtistFragment;
+import org.lineageos.eleven.ui.fragments.PlaylistFragment;
+import org.lineageos.eleven.ui.fragments.SongFragment;
+import org.lineageos.eleven.utils.Lists;
 
 import java.lang.ref.WeakReference;
 import java.util.List;
diff --git a/src/main/java/com/cyanogenmod/eleven/adapters/PlaylistAdapter.java b/src/main/java/org/lineageos/eleven/adapters/PlaylistAdapter.java
similarity index 91%
rename from src/main/java/com/cyanogenmod/eleven/adapters/PlaylistAdapter.java
rename to src/main/java/org/lineageos/eleven/adapters/PlaylistAdapter.java
index 023f9f6..364c3e7 100644
--- a/src/main/java/com/cyanogenmod/eleven/adapters/PlaylistAdapter.java
+++ b/src/main/java/org/lineageos/eleven/adapters/PlaylistAdapter.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.adapters;
+package org.lineageos.eleven.adapters;
 
 import android.content.Context;
 import android.view.LayoutInflater;
@@ -19,15 +19,15 @@
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 
-import com.cyanogenmod.eleven.Config.SmartPlaylistType;
-import com.cyanogenmod.eleven.R;
-import com.cyanogenmod.eleven.cache.ImageFetcher;
-import com.cyanogenmod.eleven.model.Playlist;
-import com.cyanogenmod.eleven.ui.MusicHolder;
-import com.cyanogenmod.eleven.ui.MusicHolder.DataHolder;
-import com.cyanogenmod.eleven.ui.fragments.PlaylistFragment;
-import com.cyanogenmod.eleven.utils.MusicUtils;
-import com.cyanogenmod.eleven.widgets.IPopupMenuCallback;
+import org.lineageos.eleven.Config.SmartPlaylistType;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.cache.ImageFetcher;
+import org.lineageos.eleven.model.Playlist;
+import org.lineageos.eleven.ui.MusicHolder;
+import org.lineageos.eleven.ui.MusicHolder.DataHolder;
+import org.lineageos.eleven.ui.fragments.PlaylistFragment;
+import org.lineageos.eleven.utils.MusicUtils;
+import org.lineageos.eleven.widgets.IPopupMenuCallback;
 
 /**
  * This {@link ArrayAdapter} is used to display all of the playlists on a user's
diff --git a/src/main/java/com/cyanogenmod/eleven/adapters/ProfileSongAdapter.java b/src/main/java/org/lineageos/eleven/adapters/ProfileSongAdapter.java
similarity index 95%
rename from src/main/java/com/cyanogenmod/eleven/adapters/ProfileSongAdapter.java
rename to src/main/java/org/lineageos/eleven/adapters/ProfileSongAdapter.java
index 2dcf932..086b664 100644
--- a/src/main/java/com/cyanogenmod/eleven/adapters/ProfileSongAdapter.java
+++ b/src/main/java/org/lineageos/eleven/adapters/ProfileSongAdapter.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.adapters;
+package org.lineageos.eleven.adapters;
 
 import android.app.Activity;
 import android.view.LayoutInflater;
@@ -19,14 +19,14 @@
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 
-import com.cyanogenmod.eleven.Config;
-import com.cyanogenmod.eleven.model.Song;
+import org.lineageos.eleven.Config;
+import org.lineageos.eleven.model.Song;
 
 import java.util.Collection;
 
 /**
  * This {@link ArrayAdapter} is used to display the songs for a particular playlist
- * {@link com.cyanogenmod.eleven.ui.fragments.PlaylistDetailFragment}
+ * {@link org.lineageos.eleven.ui.fragments.PlaylistDetailFragment}
  *
  * @author Andrew Neal (andrewdneal@gmail.com)
  */
diff --git a/src/main/java/com/cyanogenmod/eleven/adapters/SongAdapter.java b/src/main/java/org/lineageos/eleven/adapters/SongAdapter.java
similarity index 91%
rename from src/main/java/com/cyanogenmod/eleven/adapters/SongAdapter.java
rename to src/main/java/org/lineageos/eleven/adapters/SongAdapter.java
index 21b4e6b..f4d308e 100644
--- a/src/main/java/com/cyanogenmod/eleven/adapters/SongAdapter.java
+++ b/src/main/java/org/lineageos/eleven/adapters/SongAdapter.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.adapters;
+package org.lineageos.eleven.adapters;
 
 import android.app.Activity;
 import android.content.Context;
@@ -20,20 +20,20 @@
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 
-import com.cyanogenmod.eleven.Config;
-import com.cyanogenmod.eleven.cache.ImageFetcher;
-import com.cyanogenmod.eleven.model.Artist;
-import com.cyanogenmod.eleven.model.Song;
-import com.cyanogenmod.eleven.sectionadapter.SectionAdapter;
-import com.cyanogenmod.eleven.service.MusicPlaybackTrack;
-import com.cyanogenmod.eleven.ui.MusicHolder;
-import com.cyanogenmod.eleven.ui.MusicHolder.DataHolder;
-import com.cyanogenmod.eleven.ui.fragments.QueueFragment;
-import com.cyanogenmod.eleven.ui.fragments.SongFragment;
-import com.cyanogenmod.eleven.utils.ApolloUtils;
-import com.cyanogenmod.eleven.utils.MusicUtils;
-import com.cyanogenmod.eleven.widgets.IPopupMenuCallback;
-import com.cyanogenmod.eleven.widgets.PlayPauseProgressButton;
+import org.lineageos.eleven.Config;
+import org.lineageos.eleven.cache.ImageFetcher;
+import org.lineageos.eleven.model.Artist;
+import org.lineageos.eleven.model.Song;
+import org.lineageos.eleven.sectionadapter.SectionAdapter;
+import org.lineageos.eleven.service.MusicPlaybackTrack;
+import org.lineageos.eleven.ui.MusicHolder;
+import org.lineageos.eleven.ui.MusicHolder.DataHolder;
+import org.lineageos.eleven.ui.fragments.QueueFragment;
+import org.lineageos.eleven.ui.fragments.SongFragment;
+import org.lineageos.eleven.utils.ElevenUtils;
+import org.lineageos.eleven.utils.MusicUtils;
+import org.lineageos.eleven.widgets.IPopupMenuCallback;
+import org.lineageos.eleven.widgets.PlayPauseProgressButton;
 
 /**
  * This {@link ArrayAdapter} is used to display all of the songs on a user's
@@ -102,7 +102,7 @@ public SongAdapter(final Activity context, final int layoutId, final long source
         // Get the layout Id
         mLayoutId = layoutId;
         // Initialize the cache & image fetcher
-        mImageFetcher = ApolloUtils.getImageFetcher(context);
+        mImageFetcher = ElevenUtils.getImageFetcher(context);
         // set the source id and type
         mSourceId = sourceId;
         mSourceType = sourceType;
diff --git a/src/main/java/com/cyanogenmod/eleven/adapters/SummarySearchAdapter.java b/src/main/java/org/lineageos/eleven/adapters/SummarySearchAdapter.java
similarity index 92%
rename from src/main/java/com/cyanogenmod/eleven/adapters/SummarySearchAdapter.java
rename to src/main/java/org/lineageos/eleven/adapters/SummarySearchAdapter.java
index b1297a8..3df8e64 100644
--- a/src/main/java/com/cyanogenmod/eleven/adapters/SummarySearchAdapter.java
+++ b/src/main/java/org/lineageos/eleven/adapters/SummarySearchAdapter.java
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.adapters;
+package org.lineageos.eleven.adapters;
 
 import android.app.Activity;
 import android.text.TextUtils;
@@ -23,15 +23,15 @@
 import android.widget.ArrayAdapter;
 import android.widget.TextView;
 
-import com.cyanogenmod.eleven.R;
-import com.cyanogenmod.eleven.cache.ImageFetcher;
-import com.cyanogenmod.eleven.format.PrefixHighlighter;
-import com.cyanogenmod.eleven.model.SearchResult;
-import com.cyanogenmod.eleven.sectionadapter.SectionAdapter;
-import com.cyanogenmod.eleven.ui.MusicHolder;
-import com.cyanogenmod.eleven.utils.ApolloUtils;
-import com.cyanogenmod.eleven.utils.MusicUtils;
-import com.cyanogenmod.eleven.widgets.IPopupMenuCallback;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.cache.ImageFetcher;
+import org.lineageos.eleven.format.PrefixHighlighter;
+import org.lineageos.eleven.model.SearchResult;
+import org.lineageos.eleven.sectionadapter.SectionAdapter;
+import org.lineageos.eleven.ui.MusicHolder;
+import org.lineageos.eleven.utils.ElevenUtils;
+import org.lineageos.eleven.utils.MusicUtils;
+import org.lineageos.eleven.widgets.IPopupMenuCallback;
 
 import java.util.Locale;
 
@@ -69,7 +69,7 @@ public final class SummarySearchAdapter extends ArrayAdapter<SearchResult>
     public SummarySearchAdapter(final Activity context) {
         super(context, 0);
         // Initialize the cache & image fetcher
-        mImageFetcher = ApolloUtils.getImageFetcher(context);
+        mImageFetcher = ElevenUtils.getImageFetcher(context);
         // Create the prefix highlighter
         mHighlighter = new PrefixHighlighter(context);
     }
diff --git a/src/main/java/com/cyanogenmod/eleven/appwidgets/AppWidgetBase.java b/src/main/java/org/lineageos/eleven/appwidgets/AppWidgetBase.java
similarity index 92%
rename from src/main/java/com/cyanogenmod/eleven/appwidgets/AppWidgetBase.java
rename to src/main/java/org/lineageos/eleven/appwidgets/AppWidgetBase.java
index 24e5cfd..6f07f38 100644
--- a/src/main/java/com/cyanogenmod/eleven/appwidgets/AppWidgetBase.java
+++ b/src/main/java/org/lineageos/eleven/appwidgets/AppWidgetBase.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.appwidgets;
+package org.lineageos.eleven.appwidgets;
 
 import android.app.PendingIntent;
 import android.appwidget.AppWidgetProvider;
@@ -19,7 +19,7 @@
 import android.content.Context;
 import android.content.Intent;
 
-import com.cyanogenmod.eleven.MusicPlaybackService;
+import org.lineageos.eleven.MusicPlaybackService;
 
 public abstract class AppWidgetBase extends AppWidgetProvider {
 
diff --git a/src/main/java/com/cyanogenmod/eleven/appwidgets/AppWidgetLarge.java b/src/main/java/org/lineageos/eleven/appwidgets/AppWidgetLarge.java
similarity index 92%
rename from src/main/java/com/cyanogenmod/eleven/appwidgets/AppWidgetLarge.java
rename to src/main/java/org/lineageos/eleven/appwidgets/AppWidgetLarge.java
index 531d237..c7dbdd2 100644
--- a/src/main/java/com/cyanogenmod/eleven/appwidgets/AppWidgetLarge.java
+++ b/src/main/java/org/lineageos/eleven/appwidgets/AppWidgetLarge.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.appwidgets;
+package org.lineageos.eleven.appwidgets;
 
 import android.annotation.SuppressLint;
 import android.app.PendingIntent;
@@ -23,9 +23,10 @@
 import android.os.Build;
 import android.widget.RemoteViews;
 
-import com.cyanogenmod.eleven.MusicPlaybackService;
-import com.cyanogenmod.eleven.R;
-import com.cyanogenmod.eleven.ui.activities.HomeActivity;
+import org.lineageos.eleven.MusicPlaybackService;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.ui.activities.HomeActivity;
+import org.lineageos.eleven.utils.ElevenUtils;
 
 /**
  * 4x2 App-Widget
@@ -110,7 +111,7 @@ public void notifyChange(final MusicPlaybackService service, final String what)
     public void performUpdate(final MusicPlaybackService service, final int[] appWidgetIds) {
         int playButtonResId = (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) ? R.drawable.btn_playback_play : R.drawable.btn_playback_play_compat;
         int pauseButtonResId = (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) ? R.drawable.btn_playback_pause : R.drawable.btn_playback_pause_compat;
-    	final RemoteViews appWidgetView = new RemoteViews(service.getPackageName(),
+        final RemoteViews appWidgetView = new RemoteViews(service.getPackageName(),
                 R.layout.app_widget_large);
 
         final CharSequence trackName = service.getTrackName();
@@ -127,13 +128,13 @@ public void performUpdate(final MusicPlaybackService service, final int[] appWid
         // Set correct drawable for pause state
         final boolean isPlaying = service.isPlaying();
         if (isPlaying) {
-        	appWidgetView.setImageViewResource(R.id.app_widget_large_play,
-        			pauseButtonResId);
+            appWidgetView.setImageViewResource(R.id.app_widget_large_play,
+                    pauseButtonResId);
             appWidgetView.setContentDescription(R.id.app_widget_large_play,
                     service.getString(R.string.accessibility_pause));
         } else {
-        	appWidgetView.setImageViewResource(R.id.app_widget_large_play,
-        			playButtonResId);
+            appWidgetView.setImageViewResource(R.id.app_widget_large_play,
+                    playButtonResId);
             appWidgetView.setContentDescription(R.id.app_widget_large_play,
                     service.getString(R.string.accessibility_play));
         }
diff --git a/src/main/java/com/cyanogenmod/eleven/appwidgets/AppWidgetLargeAlternate.java b/src/main/java/org/lineageos/eleven/appwidgets/AppWidgetLargeAlternate.java
similarity index 92%
rename from src/main/java/com/cyanogenmod/eleven/appwidgets/AppWidgetLargeAlternate.java
rename to src/main/java/org/lineageos/eleven/appwidgets/AppWidgetLargeAlternate.java
index fca2dae..a1ef39c 100644
--- a/src/main/java/com/cyanogenmod/eleven/appwidgets/AppWidgetLargeAlternate.java
+++ b/src/main/java/org/lineageos/eleven/appwidgets/AppWidgetLargeAlternate.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.appwidgets;
+package org.lineageos.eleven.appwidgets;
 
 import android.annotation.SuppressLint;
 import android.app.PendingIntent;
@@ -23,11 +23,12 @@
 import android.os.Build;
 import android.widget.RemoteViews;
 
-import com.cyanogenmod.eleven.MusicPlaybackService;
-import com.cyanogenmod.eleven.R;
-import com.cyanogenmod.eleven.ui.activities.HomeActivity;
-import com.cyanogenmod.eleven.widgets.RepeatButton;
-import com.cyanogenmod.eleven.widgets.ShuffleButton;
+import org.lineageos.eleven.MusicPlaybackService;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.ui.activities.HomeActivity;
+import org.lineageos.eleven.utils.ElevenUtils;
+import org.lineageos.eleven.widgets.RepeatButton;
+import org.lineageos.eleven.widgets.ShuffleButton;
 
 /**
  * 4x2 App-Widget
@@ -135,13 +136,13 @@ public void performUpdate(final MusicPlaybackService service, final int[] appWid
         // Set correct drawable for pause state
         final boolean isPlaying = service.isPlaying();
         if (isPlaying) {
-        	appWidgetView.setImageViewResource(R.id.app_widget_large_alternate_play,
-        			pauseButtonResId);
+            appWidgetView.setImageViewResource(R.id.app_widget_large_alternate_play,
+                    pauseButtonResId);
             appWidgetView.setContentDescription(R.id.app_widget_large_alternate_play,
                     service.getString(R.string.accessibility_pause));
         } else {
-        	appWidgetView.setImageViewResource(R.id.app_widget_large_alternate_play,
-        			playButtonResId);
+            appWidgetView.setImageViewResource(R.id.app_widget_large_alternate_play,
+                    playButtonResId);
             appWidgetView.setContentDescription(R.id.app_widget_large_alternate_play,
                     service.getString(R.string.accessibility_play));
         }
@@ -150,19 +151,19 @@ public void performUpdate(final MusicPlaybackService service, final int[] appWid
         switch (service.getRepeatMode()) {
             case MusicPlaybackService.REPEAT_ALL:
                 appWidgetView.setImageViewResource(R.id.app_widget_large_alternate_repeat,
-                		repeatAllButtonResId);
+                        repeatAllButtonResId);
                 appWidgetView.setInt(R.id.app_widget_large_alternate_repeat, "setAlpha",
                         (int)(RepeatButton.ACTIVE_ALPHA * 255));
                 break;
             case MusicPlaybackService.REPEAT_CURRENT:
                 appWidgetView.setImageViewResource(R.id.app_widget_large_alternate_repeat,
-                		repeatOneButtonResId);
+                        repeatOneButtonResId);
                 appWidgetView.setInt(R.id.app_widget_large_alternate_repeat, "setAlpha",
                         (int)(RepeatButton.ACTIVE_ALPHA * 255));
                 break;
             default:
                 appWidgetView.setImageViewResource(R.id.app_widget_large_alternate_repeat,
-                		repeatAllButtonResId);
+                        repeatAllButtonResId);
                 appWidgetView.setInt(R.id.app_widget_large_alternate_repeat, "setAlpha",
                         (int)(RepeatButton.INACTIVE_ALPHA * 255));
                 break;
@@ -172,7 +173,7 @@ public void performUpdate(final MusicPlaybackService service, final int[] appWid
         switch (service.getShuffleMode()) {
             case MusicPlaybackService.SHUFFLE_NONE:
                 appWidgetView.setImageViewResource(R.id.app_widget_large_alternate_shuffle,
-                		shuffleAllButtonResId);
+                        shuffleAllButtonResId);
                 appWidgetView.setInt(R.id.app_widget_large_alternate_shuffle, "setAlpha",
                         (int)(ShuffleButton.INACTIVE_ALPHA * 255));
                 break;
@@ -180,7 +181,7 @@ public void performUpdate(final MusicPlaybackService service, final int[] appWid
             case MusicPlaybackService.SHUFFLE_NORMAL:
             default:
                 appWidgetView.setImageViewResource(R.id.app_widget_large_alternate_shuffle,
-                		shuffleAllButtonResId);
+                        shuffleAllButtonResId);
                 appWidgetView.setInt(R.id.app_widget_large_alternate_shuffle, "setAlpha",
                         (int)(ShuffleButton.ACTIVE_ALPHA * 255));
                 break;
diff --git a/src/main/java/com/cyanogenmod/eleven/appwidgets/AppWidgetSmall.java b/src/main/java/org/lineageos/eleven/appwidgets/AppWidgetSmall.java
similarity index 93%
rename from src/main/java/com/cyanogenmod/eleven/appwidgets/AppWidgetSmall.java
rename to src/main/java/org/lineageos/eleven/appwidgets/AppWidgetSmall.java
index 4171891..cf8b335 100644
--- a/src/main/java/com/cyanogenmod/eleven/appwidgets/AppWidgetSmall.java
+++ b/src/main/java/org/lineageos/eleven/appwidgets/AppWidgetSmall.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.appwidgets;
+package org.lineageos.eleven.appwidgets;
 
 import android.annotation.SuppressLint;
 import android.app.PendingIntent;
@@ -25,9 +25,10 @@
 import android.view.View;
 import android.widget.RemoteViews;
 
-import com.cyanogenmod.eleven.MusicPlaybackService;
-import com.cyanogenmod.eleven.R;
-import com.cyanogenmod.eleven.ui.activities.HomeActivity;
+import org.lineageos.eleven.MusicPlaybackService;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.ui.activities.HomeActivity;
+import org.lineageos.eleven.utils.ElevenUtils;
 
 /**
  * 4x1 App-Widget
@@ -114,8 +115,8 @@ public void notifyChange(final MusicPlaybackService service, final String what)
     public void performUpdate(final MusicPlaybackService service, final int[] appWidgetIds) {
         int playButtonResId = (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) ? R.drawable.btn_playback_play : R.drawable.btn_playback_play_compat;
         int pauseButtonResId = (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) ? R.drawable.btn_playback_pause : R.drawable.btn_playback_pause_compat; 
-        
-    	final RemoteViews appWidgetView = new RemoteViews(service.getPackageName(),
+
+        final RemoteViews appWidgetView = new RemoteViews(service.getPackageName(),
                 R.layout.app_widget_small);
 
         final CharSequence trackName = service.getTrackName();
@@ -131,17 +132,17 @@ public void performUpdate(final MusicPlaybackService service, final int[] appWid
             appWidgetView.setTextViewText(R.id.app_widget_small_line_two, artistName);
         }
         appWidgetView.setImageViewBitmap(R.id.app_widget_small_image, bitmap);
-        
+
         // Set correct drawable for pause state
         final boolean isPlaying = service.isPlaying();
         if (isPlaying) {
-        	appWidgetView.setImageViewResource(R.id.app_widget_small_play,
-        			pauseButtonResId);
+            appWidgetView.setImageViewResource(R.id.app_widget_small_play,
+                    pauseButtonResId);
             appWidgetView.setContentDescription(R.id.app_widget_small_play,
                     service.getString(R.string.accessibility_pause));
         } else {
-        	appWidgetView.setImageViewResource(R.id.app_widget_small_play,
-        			playButtonResId);
+            appWidgetView.setImageViewResource(R.id.app_widget_small_play,
+                    playButtonResId);
             appWidgetView.setContentDescription(R.id.app_widget_small_play,
                     service.getString(R.string.accessibility_play));
         }
diff --git a/src/main/java/com/cyanogenmod/eleven/cache/BitmapWorkerTask.java b/src/main/java/org/lineageos/eleven/cache/BitmapWorkerTask.java
similarity index 98%
rename from src/main/java/com/cyanogenmod/eleven/cache/BitmapWorkerTask.java
rename to src/main/java/org/lineageos/eleven/cache/BitmapWorkerTask.java
index c7ab842..177e772 100644
--- a/src/main/java/com/cyanogenmod/eleven/cache/BitmapWorkerTask.java
+++ b/src/main/java/org/lineageos/eleven/cache/BitmapWorkerTask.java
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.cache;
+package org.lineageos.eleven.cache;
 
 import android.content.Context;
 import android.content.res.Resources;
@@ -23,7 +23,7 @@
 import android.os.AsyncTask;
 import android.widget.ImageView;
 
-import com.cyanogenmod.eleven.cache.ImageWorker.ImageType;
+import org.lineageos.eleven.cache.ImageWorker.ImageType;
 
 import java.lang.ref.WeakReference;
 
diff --git a/src/main/java/com/cyanogenmod/eleven/cache/BlurBitmapWorkerTask.java b/src/main/java/org/lineageos/eleven/cache/BlurBitmapWorkerTask.java
similarity index 96%
rename from src/main/java/com/cyanogenmod/eleven/cache/BlurBitmapWorkerTask.java
rename to src/main/java/org/lineageos/eleven/cache/BlurBitmapWorkerTask.java
index 74515f1..ecae723 100644
--- a/src/main/java/com/cyanogenmod/eleven/cache/BlurBitmapWorkerTask.java
+++ b/src/main/java/org/lineageos/eleven/cache/BlurBitmapWorkerTask.java
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.cache;
+package org.lineageos.eleven.cache;
 
 import android.content.Context;
 import android.graphics.Bitmap;
@@ -25,8 +25,8 @@
 import android.support.v8.renderscript.ScriptIntrinsicBlur;
 import android.widget.ImageView;
 
-import com.cyanogenmod.eleven.cache.ImageWorker.ImageType;
-import com.cyanogenmod.eleven.widgets.BlurScrimImage;
+import org.lineageos.eleven.cache.ImageWorker.ImageType;
+import org.lineageos.eleven.widgets.BlurScrimImage;
 
 import java.lang.ref.WeakReference;
 
@@ -50,7 +50,7 @@ public static class ResultContainer {
     }
 
     /**
-     * The {@link com.cyanogenmod.eleven.widgets.BlurScrimImage} used to set the result
+     * The {@link org.lineageos.eleven.widgets.BlurScrimImage} used to set the result
      */
     private final WeakReference<BlurScrimImage> mBlurScrimImage;
 
diff --git a/src/main/java/com/cyanogenmod/eleven/cache/DiskLruCache.java b/src/main/java/org/lineageos/eleven/cache/DiskLruCache.java
similarity index 99%
rename from src/main/java/com/cyanogenmod/eleven/cache/DiskLruCache.java
rename to src/main/java/org/lineageos/eleven/cache/DiskLruCache.java
index 0e33afb..7c904ac 100644
--- a/src/main/java/com/cyanogenmod/eleven/cache/DiskLruCache.java
+++ b/src/main/java/org/lineageos/eleven/cache/DiskLruCache.java
@@ -9,7 +9,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.cache;
+package org.lineageos.eleven.cache;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedWriter;
diff --git a/src/main/java/com/cyanogenmod/eleven/cache/ICacheListener.java b/src/main/java/org/lineageos/eleven/cache/ICacheListener.java
similarity index 94%
rename from src/main/java/com/cyanogenmod/eleven/cache/ICacheListener.java
rename to src/main/java/org/lineageos/eleven/cache/ICacheListener.java
index 89b88ac..fcc9de6 100644
--- a/src/main/java/com/cyanogenmod/eleven/cache/ICacheListener.java
+++ b/src/main/java/org/lineageos/eleven/cache/ICacheListener.java
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.cache;
+package org.lineageos.eleven.cache;
 
 public interface ICacheListener {
     void onCacheUnpaused();
diff --git a/src/main/java/com/cyanogenmod/eleven/cache/ImageCache.java b/src/main/java/org/lineageos/eleven/cache/ImageCache.java
similarity index 98%
rename from src/main/java/com/cyanogenmod/eleven/cache/ImageCache.java
rename to src/main/java/org/lineageos/eleven/cache/ImageCache.java
index 7bee4a8..7b837b6 100644
--- a/src/main/java/com/cyanogenmod/eleven/cache/ImageCache.java
+++ b/src/main/java/org/lineageos/eleven/cache/ImageCache.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.cache;
+package org.lineageos.eleven.cache;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
@@ -33,7 +33,7 @@
 import android.os.ParcelFileDescriptor;
 import android.util.Log;
 
-import com.cyanogenmod.eleven.utils.ApolloUtils;
+import org.lineageos.eleven.utils.ElevenUtils;
 
 import java.io.File;
 import java.io.FileDescriptor;
@@ -138,7 +138,7 @@ public final static ImageCache getInstance(final Context context) {
      * @param cacheParams The cache parameters to initialize the cache
      */
     private void init(final Context context) {
-        ApolloUtils.execute(false, new AsyncTask<Void, Void, Void>() {
+        ElevenUtils.execute(false, new AsyncTask<Void, Void, Void>() {
 
             @Override
             protected Void doInBackground(final Void... unused) {
@@ -512,7 +512,7 @@ public final Bitmap getArtworkFromFile(final Context context, final long albumId
      * cache first
      */
     public void flush() {
-        ApolloUtils.execute(false, new AsyncTask<Void, Void, Void>() {
+        ElevenUtils.execute(false, new AsyncTask<Void, Void, Void>() {
 
             @Override
             protected Void doInBackground(final Void... unused) {
@@ -534,7 +534,7 @@ protected Void doInBackground(final Void... unused) {
      * Clears the disk and memory caches
      */
     public void clearCaches() {
-        ApolloUtils.execute(false, new AsyncTask<Void, Void, Void>() {
+        ElevenUtils.execute(false, new AsyncTask<Void, Void, Void>() {
 
             @Override
             protected Void doInBackground(final Void... unused) {
@@ -560,7 +560,7 @@ protected Void doInBackground(final Void... unused) {
      * thread.
      */
     public void close() {
-        ApolloUtils.execute(false, new AsyncTask<Void, Void, Void>() {
+        ElevenUtils.execute(false, new AsyncTask<Void, Void, Void>() {
 
             @Override
             protected Void doInBackground(final Void... unused) {
diff --git a/src/main/java/com/cyanogenmod/eleven/cache/ImageFetcher.java b/src/main/java/org/lineageos/eleven/cache/ImageFetcher.java
similarity index 96%
rename from src/main/java/com/cyanogenmod/eleven/cache/ImageFetcher.java
rename to src/main/java/org/lineageos/eleven/cache/ImageFetcher.java
index 42480f4..a689ae2 100644
--- a/src/main/java/com/cyanogenmod/eleven/cache/ImageFetcher.java
+++ b/src/main/java/org/lineageos/eleven/cache/ImageFetcher.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.cache;
+package org.lineageos.eleven.cache;
 
 import android.content.ContentResolver;
 import android.content.Context;
@@ -19,13 +19,13 @@
 import android.graphics.BitmapFactory;
 import android.net.Uri;
 import android.widget.ImageView;
-import com.cyanogenmod.eleven.Config;
-import com.cyanogenmod.eleven.MusicPlaybackService;
-import com.cyanogenmod.eleven.cache.PlaylistWorkerTask.PlaylistWorkerType;
-import com.cyanogenmod.eleven.utils.BitmapWithColors;
-import com.cyanogenmod.eleven.utils.MusicUtils;
-import com.cyanogenmod.eleven.widgets.BlurScrimImage;
-import com.cyanogenmod.eleven.widgets.LetterTileDrawable;
+import org.lineageos.eleven.Config;
+import org.lineageos.eleven.MusicPlaybackService;
+import org.lineageos.eleven.cache.PlaylistWorkerTask.PlaylistWorkerType;
+import org.lineageos.eleven.utils.BitmapWithColors;
+import org.lineageos.eleven.utils.MusicUtils;
+import org.lineageos.eleven.widgets.BlurScrimImage;
+import org.lineageos.eleven.widgets.LetterTileDrawable;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
diff --git a/src/main/java/com/cyanogenmod/eleven/cache/ImageWorker.java b/src/main/java/org/lineageos/eleven/cache/ImageWorker.java
similarity index 97%
rename from src/main/java/com/cyanogenmod/eleven/cache/ImageWorker.java
rename to src/main/java/org/lineageos/eleven/cache/ImageWorker.java
index e8ea9d8..980fd82 100644
--- a/src/main/java/com/cyanogenmod/eleven/cache/ImageWorker.java
+++ b/src/main/java/org/lineageos/eleven/cache/ImageWorker.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.cache;
+package org.lineageos.eleven.cache;
 
 import android.content.Context;
 import android.content.res.Resources;
@@ -26,13 +26,13 @@
 import android.view.View;
 import android.widget.ImageView;
 
-import com.cyanogenmod.eleven.R;
-import com.cyanogenmod.eleven.provider.PlaylistArtworkStore;
-import com.cyanogenmod.eleven.utils.ApolloUtils;
-import com.cyanogenmod.eleven.utils.ImageUtils;
-import com.cyanogenmod.eleven.widgets.BlurScrimImage;
-import com.cyanogenmod.eleven.cache.PlaylistWorkerTask.PlaylistWorkerType;
-import com.cyanogenmod.eleven.widgets.LetterTileDrawable;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.provider.PlaylistArtworkStore;
+import org.lineageos.eleven.utils.ElevenUtils;
+import org.lineageos.eleven.utils.ImageUtils;
+import org.lineageos.eleven.widgets.BlurScrimImage;
+import org.lineageos.eleven.cache.PlaylistWorkerTask.PlaylistWorkerType;
+import org.lineageos.eleven.widgets.LetterTileDrawable;
 
 import java.lang.ref.WeakReference;
 import java.util.Collections;
@@ -177,7 +177,7 @@ public static Bitmap getBitmapInBackground(final Context context, final ImageCac
         }
 
         // Third, by now we need to download the image
-        if (bitmap == null && ApolloUtils.isOnline(context) && !sKeys.contains(key)) {
+        if (bitmap == null && ElevenUtils.isOnline(context) && !sKeys.contains(key)) {
             // Now define what the artist name, album name, and url are.
             String url = ImageUtils.processImageUrl(context, artistName, albumName, imageType);
             if (url != null) {
@@ -477,7 +477,7 @@ protected void loadImage(final String key, final String artistName, final String
                 final AsyncTaskContainer asyncTaskContainer = new AsyncTaskContainer(bitmapWorkerTask);
                 imageView.setTag(asyncTaskContainer);
                 try {
-                    ApolloUtils.execute(false, bitmapWorkerTask,
+                    ElevenUtils.execute(false, bitmapWorkerTask,
                             artistName, albumName, String.valueOf(albumId));
                 } catch (RejectedExecutionException e) {
                     // Executor has exhausted queue space
@@ -537,7 +537,7 @@ public void loadPlaylistImage(final long playlistId, final PlaylistWorkerType ty
             final AsyncTaskContainer asyncTaskContainer = new AsyncTaskContainer(bitmapWorkerTask);
             imageView.setTag(asyncTaskContainer);
             try {
-                ApolloUtils.execute(false, bitmapWorkerTask);
+                ElevenUtils.execute(false, bitmapWorkerTask);
             } catch (RejectedExecutionException e) {
                 // Executor has exhausted queue space
             }
@@ -569,7 +569,7 @@ protected void loadBlurImage(final String key, final String artistName, final St
             blurScrimImage.setTag(asyncTaskContainer);
 
             try {
-                ApolloUtils.execute(false, blurWorkerTask, artistName, albumName, String.valueOf(albumId));
+                ElevenUtils.execute(false, blurWorkerTask, artistName, albumName, String.valueOf(albumId));
             } catch (RejectedExecutionException e) {
                 // Executor has exhausted queue space, show default artwork
                 blurScrimImage.transitionToDefaultState();
diff --git a/src/main/java/com/cyanogenmod/eleven/cache/LruCache.java b/src/main/java/org/lineageos/eleven/cache/LruCache.java
similarity index 99%
rename from src/main/java/com/cyanogenmod/eleven/cache/LruCache.java
rename to src/main/java/org/lineageos/eleven/cache/LruCache.java
index 8d40b1a..62f9385 100644
--- a/src/main/java/com/cyanogenmod/eleven/cache/LruCache.java
+++ b/src/main/java/org/lineageos/eleven/cache/LruCache.java
@@ -9,7 +9,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.cache;
+package org.lineageos.eleven.cache;
 
 // NOTE: upstream of this class is android.util.LruCache, changes below
 // expose trimToSize() to be called externally.
diff --git a/src/main/java/com/cyanogenmod/eleven/cache/PlaylistWorkerTask.java b/src/main/java/org/lineageos/eleven/cache/PlaylistWorkerTask.java
similarity index 97%
rename from src/main/java/com/cyanogenmod/eleven/cache/PlaylistWorkerTask.java
rename to src/main/java/org/lineageos/eleven/cache/PlaylistWorkerTask.java
index 65b2819..b44bdbd 100644
--- a/src/main/java/com/cyanogenmod/eleven/cache/PlaylistWorkerTask.java
+++ b/src/main/java/org/lineageos/eleven/cache/PlaylistWorkerTask.java
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.cache;
+package org.lineageos.eleven.cache;
 
 import android.content.Context;
 import android.database.Cursor;
@@ -25,12 +25,12 @@
 import android.provider.MediaStore;
 import android.widget.ImageView;
 
-import com.cyanogenmod.eleven.R;
-import com.cyanogenmod.eleven.cache.ImageWorker.ImageType;
-import com.cyanogenmod.eleven.loaders.PlaylistSongLoader;
-import com.cyanogenmod.eleven.loaders.SortedCursor;
-import com.cyanogenmod.eleven.provider.PlaylistArtworkStore;
-import com.cyanogenmod.eleven.provider.SongPlayCount;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.cache.ImageWorker.ImageType;
+import org.lineageos.eleven.loaders.PlaylistSongLoader;
+import org.lineageos.eleven.loaders.SortedCursor;
+import org.lineageos.eleven.provider.PlaylistArtworkStore;
+import org.lineageos.eleven.provider.SongPlayCount;
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;
diff --git a/src/main/java/com/cyanogenmod/eleven/cache/SimpleBitmapWorkerTask.java b/src/main/java/org/lineageos/eleven/cache/SimpleBitmapWorkerTask.java
similarity index 95%
rename from src/main/java/com/cyanogenmod/eleven/cache/SimpleBitmapWorkerTask.java
rename to src/main/java/org/lineageos/eleven/cache/SimpleBitmapWorkerTask.java
index 027eb7f..9481ab1 100644
--- a/src/main/java/com/cyanogenmod/eleven/cache/SimpleBitmapWorkerTask.java
+++ b/src/main/java/org/lineageos/eleven/cache/SimpleBitmapWorkerTask.java
@@ -13,15 +13,15 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.cache;
+package org.lineageos.eleven.cache;
 
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.TransitionDrawable;
 import android.widget.ImageView;
-import com.cyanogenmod.eleven.cache.ImageWorker.ImageType;
-import com.cyanogenmod.eleven.utils.ImageUtils;
+import org.lineageos.eleven.cache.ImageWorker.ImageType;
+import org.lineageos.eleven.utils.ImageUtils;
 
 /**
  * The actual {@link android.os.AsyncTask} that will process the image.
diff --git a/src/main/java/com/cyanogenmod/eleven/dragdrop/DragSortController.java b/src/main/java/org/lineageos/eleven/dragdrop/DragSortController.java
similarity index 99%
rename from src/main/java/com/cyanogenmod/eleven/dragdrop/DragSortController.java
rename to src/main/java/org/lineageos/eleven/dragdrop/DragSortController.java
index e433ec0..b4aebd1 100644
--- a/src/main/java/com/cyanogenmod/eleven/dragdrop/DragSortController.java
+++ b/src/main/java/org/lineageos/eleven/dragdrop/DragSortController.java
@@ -1,5 +1,5 @@
 
-package com.cyanogenmod.eleven.dragdrop;
+package org.lineageos.eleven.dragdrop;
 
 import android.graphics.Point;
 import android.view.GestureDetector;
diff --git a/src/main/java/com/cyanogenmod/eleven/dragdrop/DragSortListView.java b/src/main/java/org/lineageos/eleven/dragdrop/DragSortListView.java
similarity index 99%
rename from src/main/java/com/cyanogenmod/eleven/dragdrop/DragSortListView.java
rename to src/main/java/org/lineageos/eleven/dragdrop/DragSortListView.java
index b0580a7..5839006 100644
--- a/src/main/java/com/cyanogenmod/eleven/dragdrop/DragSortListView.java
+++ b/src/main/java/org/lineageos/eleven/dragdrop/DragSortListView.java
@@ -10,7 +10,7 @@
  * language governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.dragdrop;
+package org.lineageos.eleven.dragdrop;
 
 import android.content.Context;
 import android.database.DataSetObserver;
@@ -31,7 +31,7 @@
 import android.widget.ListView;
 import android.widget.RelativeLayout;
 
-import com.cyanogenmod.eleven.R;
+import org.lineageos.eleven.R;
 
 import java.io.File;
 import java.io.FileWriter;
diff --git a/src/main/java/com/cyanogenmod/eleven/dragdrop/SimpleFloatViewManager.java b/src/main/java/org/lineageos/eleven/dragdrop/SimpleFloatViewManager.java
similarity index 97%
rename from src/main/java/com/cyanogenmod/eleven/dragdrop/SimpleFloatViewManager.java
rename to src/main/java/org/lineageos/eleven/dragdrop/SimpleFloatViewManager.java
index f7be4f2..ce5cb60 100644
--- a/src/main/java/com/cyanogenmod/eleven/dragdrop/SimpleFloatViewManager.java
+++ b/src/main/java/org/lineageos/eleven/dragdrop/SimpleFloatViewManager.java
@@ -1,5 +1,5 @@
 
-package com.cyanogenmod.eleven.dragdrop;
+package org.lineageos.eleven.dragdrop;
 
 import android.graphics.Bitmap;
 import android.graphics.Color;
diff --git a/src/main/java/com/cyanogenmod/eleven/format/Capitalize.java b/src/main/java/org/lineageos/eleven/format/Capitalize.java
similarity index 97%
rename from src/main/java/com/cyanogenmod/eleven/format/Capitalize.java
rename to src/main/java/org/lineageos/eleven/format/Capitalize.java
index d23683c..36ba269 100644
--- a/src/main/java/com/cyanogenmod/eleven/format/Capitalize.java
+++ b/src/main/java/org/lineageos/eleven/format/Capitalize.java
@@ -1,5 +1,5 @@
 
-package com.cyanogenmod.eleven.format;
+package org.lineageos.eleven.format;
 
 import android.text.TextUtils;
 
diff --git a/src/main/java/com/cyanogenmod/eleven/format/PrefixHighlighter.java b/src/main/java/org/lineageos/eleven/format/PrefixHighlighter.java
similarity index 97%
rename from src/main/java/com/cyanogenmod/eleven/format/PrefixHighlighter.java
rename to src/main/java/org/lineageos/eleven/format/PrefixHighlighter.java
index 83f69a7..6761898 100644
--- a/src/main/java/com/cyanogenmod/eleven/format/PrefixHighlighter.java
+++ b/src/main/java/org/lineageos/eleven/format/PrefixHighlighter.java
@@ -9,7 +9,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.format;
+package org.lineageos.eleven.format;
 
 import android.content.Context;
 import android.text.SpannableString;
@@ -17,7 +17,7 @@
 import android.text.style.ForegroundColorSpan;
 import android.widget.TextView;
 
-import com.cyanogenmod.eleven.utils.PreferenceUtils;
+import org.lineageos.eleven.utils.PreferenceUtils;
 
 /**
  * Highlights the text in a text field.
diff --git a/src/main/java/com/cyanogenmod/eleven/lastfm/Album.java b/src/main/java/org/lineageos/eleven/lastfm/Album.java
similarity index 98%
rename from src/main/java/com/cyanogenmod/eleven/lastfm/Album.java
rename to src/main/java/org/lineageos/eleven/lastfm/Album.java
index b5ff603..6adbdd3 100644
--- a/src/main/java/com/cyanogenmod/eleven/lastfm/Album.java
+++ b/src/main/java/org/lineageos/eleven/lastfm/Album.java
@@ -19,11 +19,11 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.cyanogenmod.eleven.lastfm;
+package org.lineageos.eleven.lastfm;
 
 import android.content.Context;
 
-import com.cyanogenmod.eleven.Config;
+import org.lineageos.eleven.Config;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/src/main/java/com/cyanogenmod/eleven/lastfm/Artist.java b/src/main/java/org/lineageos/eleven/lastfm/Artist.java
similarity index 98%
rename from src/main/java/com/cyanogenmod/eleven/lastfm/Artist.java
rename to src/main/java/org/lineageos/eleven/lastfm/Artist.java
index 5401a74..25ea60c 100644
--- a/src/main/java/com/cyanogenmod/eleven/lastfm/Artist.java
+++ b/src/main/java/org/lineageos/eleven/lastfm/Artist.java
@@ -19,11 +19,11 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.cyanogenmod.eleven.lastfm;
+package org.lineageos.eleven.lastfm;
 
 import android.content.Context;
 
-import com.cyanogenmod.eleven.Config;
+import org.lineageos.eleven.Config;
 
 import java.util.Locale;
 import java.util.Map;
diff --git a/src/main/java/com/cyanogenmod/eleven/lastfm/Caller.java b/src/main/java/org/lineageos/eleven/lastfm/Caller.java
similarity index 97%
rename from src/main/java/com/cyanogenmod/eleven/lastfm/Caller.java
rename to src/main/java/org/lineageos/eleven/lastfm/Caller.java
index 1449ca2..c312f88 100644
--- a/src/main/java/com/cyanogenmod/eleven/lastfm/Caller.java
+++ b/src/main/java/org/lineageos/eleven/lastfm/Caller.java
@@ -19,15 +19,15 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.cyanogenmod.eleven.lastfm;
+package org.lineageos.eleven.lastfm;
 
-import static com.cyanogenmod.eleven.lastfm.StringUtilities.encode;
-import static com.cyanogenmod.eleven.lastfm.StringUtilities.map;
+import static org.lineageos.eleven.lastfm.StringUtilities.encode;
+import static org.lineageos.eleven.lastfm.StringUtilities.map;
 
 import android.content.Context;
 import android.util.Log;
 
-import com.cyanogenmod.eleven.lastfm.Result.Status;
+import org.lineageos.eleven.lastfm.Result.Status;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
diff --git a/src/main/java/com/cyanogenmod/eleven/lastfm/DomElement.java b/src/main/java/org/lineageos/eleven/lastfm/DomElement.java
similarity index 99%
rename from src/main/java/com/cyanogenmod/eleven/lastfm/DomElement.java
rename to src/main/java/org/lineageos/eleven/lastfm/DomElement.java
index 9802444..ee908d6 100644
--- a/src/main/java/com/cyanogenmod/eleven/lastfm/DomElement.java
+++ b/src/main/java/org/lineageos/eleven/lastfm/DomElement.java
@@ -19,7 +19,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.cyanogenmod.eleven.lastfm;
+package org.lineageos.eleven.lastfm;
 
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
diff --git a/src/main/java/com/cyanogenmod/eleven/lastfm/Image.java b/src/main/java/org/lineageos/eleven/lastfm/Image.java
similarity index 98%
rename from src/main/java/com/cyanogenmod/eleven/lastfm/Image.java
rename to src/main/java/org/lineageos/eleven/lastfm/Image.java
index f79f178..1c9032c 100644
--- a/src/main/java/com/cyanogenmod/eleven/lastfm/Image.java
+++ b/src/main/java/org/lineageos/eleven/lastfm/Image.java
@@ -19,7 +19,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.cyanogenmod.eleven.lastfm;
+package org.lineageos.eleven.lastfm;
 
 /**
  * An <code>Image</code> contains metadata and URLs for an artist's image.
diff --git a/src/main/java/com/cyanogenmod/eleven/lastfm/ImageHolder.java b/src/main/java/org/lineageos/eleven/lastfm/ImageHolder.java
similarity index 98%
rename from src/main/java/com/cyanogenmod/eleven/lastfm/ImageHolder.java
rename to src/main/java/org/lineageos/eleven/lastfm/ImageHolder.java
index 10e042d..25fabac 100644
--- a/src/main/java/com/cyanogenmod/eleven/lastfm/ImageHolder.java
+++ b/src/main/java/org/lineageos/eleven/lastfm/ImageHolder.java
@@ -19,7 +19,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.cyanogenmod.eleven.lastfm;
+package org.lineageos.eleven.lastfm;
 
 import java.util.Collection;
 import java.util.HashMap;
diff --git a/src/main/java/com/cyanogenmod/eleven/lastfm/ImageSize.java b/src/main/java/org/lineageos/eleven/lastfm/ImageSize.java
similarity index 97%
rename from src/main/java/com/cyanogenmod/eleven/lastfm/ImageSize.java
rename to src/main/java/org/lineageos/eleven/lastfm/ImageSize.java
index ec2f6ac..615ef96 100644
--- a/src/main/java/com/cyanogenmod/eleven/lastfm/ImageSize.java
+++ b/src/main/java/org/lineageos/eleven/lastfm/ImageSize.java
@@ -19,7 +19,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.cyanogenmod.eleven.lastfm;
+package org.lineageos.eleven.lastfm;
 
 /**
  * @author Janni Kovacs
diff --git a/src/main/java/com/cyanogenmod/eleven/lastfm/ItemFactory.java b/src/main/java/org/lineageos/eleven/lastfm/ItemFactory.java
similarity index 95%
rename from src/main/java/com/cyanogenmod/eleven/lastfm/ItemFactory.java
rename to src/main/java/org/lineageos/eleven/lastfm/ItemFactory.java
index f440fa4..ad8c2df 100644
--- a/src/main/java/com/cyanogenmod/eleven/lastfm/ItemFactory.java
+++ b/src/main/java/org/lineageos/eleven/lastfm/ItemFactory.java
@@ -19,7 +19,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.cyanogenmod.eleven.lastfm;
+package org.lineageos.eleven.lastfm;
 
 /**
  * An <code>ItemFactory</code> can be used to instantiate a value object - such
@@ -27,7 +27,7 @@
  * {@link ItemFactoryBuilder} to obtain item factories for a specific type.
  *
  * @author Janni Kovacs
- * @see com.cyanogenmod.eleven.lastfm.api.ItemFactoryBuilder
+ * @see org.lineageos.eleven.lastfm.api.ItemFactoryBuilder
  * @see ResponseBuilder
  */
 interface ItemFactory<T> {
diff --git a/src/main/java/com/cyanogenmod/eleven/lastfm/ItemFactoryBuilder.java b/src/main/java/org/lineageos/eleven/lastfm/ItemFactoryBuilder.java
similarity index 98%
rename from src/main/java/com/cyanogenmod/eleven/lastfm/ItemFactoryBuilder.java
rename to src/main/java/org/lineageos/eleven/lastfm/ItemFactoryBuilder.java
index 9691028..d496d80 100644
--- a/src/main/java/com/cyanogenmod/eleven/lastfm/ItemFactoryBuilder.java
+++ b/src/main/java/org/lineageos/eleven/lastfm/ItemFactoryBuilder.java
@@ -19,7 +19,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.cyanogenmod.eleven.lastfm;
+package org.lineageos.eleven.lastfm;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/src/main/java/com/cyanogenmod/eleven/lastfm/MapUtilities.java b/src/main/java/org/lineageos/eleven/lastfm/MapUtilities.java
similarity index 98%
rename from src/main/java/com/cyanogenmod/eleven/lastfm/MapUtilities.java
rename to src/main/java/org/lineageos/eleven/lastfm/MapUtilities.java
index a8d61e2..9ba4dd3 100644
--- a/src/main/java/com/cyanogenmod/eleven/lastfm/MapUtilities.java
+++ b/src/main/java/org/lineageos/eleven/lastfm/MapUtilities.java
@@ -19,7 +19,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.cyanogenmod.eleven.lastfm;
+package org.lineageos.eleven.lastfm;
 
 import java.util.Map;
 
diff --git a/src/main/java/com/cyanogenmod/eleven/lastfm/MusicEntry.java b/src/main/java/org/lineageos/eleven/lastfm/MusicEntry.java
similarity index 98%
rename from src/main/java/com/cyanogenmod/eleven/lastfm/MusicEntry.java
rename to src/main/java/org/lineageos/eleven/lastfm/MusicEntry.java
index eaba7e6..bbb9499 100644
--- a/src/main/java/com/cyanogenmod/eleven/lastfm/MusicEntry.java
+++ b/src/main/java/org/lineageos/eleven/lastfm/MusicEntry.java
@@ -19,7 +19,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.cyanogenmod.eleven.lastfm;
+package org.lineageos.eleven.lastfm;
 
 /**
  * <code>MusicEntry</code> is the abstract superclass for {@link Track},
diff --git a/src/main/java/com/cyanogenmod/eleven/lastfm/PaginatedResult.java b/src/main/java/org/lineageos/eleven/lastfm/PaginatedResult.java
similarity index 98%
rename from src/main/java/com/cyanogenmod/eleven/lastfm/PaginatedResult.java
rename to src/main/java/org/lineageos/eleven/lastfm/PaginatedResult.java
index 34b81e5..5a3a27e 100644
--- a/src/main/java/com/cyanogenmod/eleven/lastfm/PaginatedResult.java
+++ b/src/main/java/org/lineageos/eleven/lastfm/PaginatedResult.java
@@ -19,7 +19,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.cyanogenmod.eleven.lastfm;
+package org.lineageos.eleven.lastfm;
 
 import java.util.Collection;
 import java.util.Iterator;
diff --git a/src/main/java/com/cyanogenmod/eleven/lastfm/ResponseBuilder.java b/src/main/java/org/lineageos/eleven/lastfm/ResponseBuilder.java
similarity index 99%
rename from src/main/java/com/cyanogenmod/eleven/lastfm/ResponseBuilder.java
rename to src/main/java/org/lineageos/eleven/lastfm/ResponseBuilder.java
index 26394c9..f9a9808 100644
--- a/src/main/java/com/cyanogenmod/eleven/lastfm/ResponseBuilder.java
+++ b/src/main/java/org/lineageos/eleven/lastfm/ResponseBuilder.java
@@ -19,7 +19,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.cyanogenmod.eleven.lastfm;
+package org.lineageos.eleven.lastfm;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/src/main/java/com/cyanogenmod/eleven/lastfm/Result.java b/src/main/java/org/lineageos/eleven/lastfm/Result.java
similarity index 99%
rename from src/main/java/com/cyanogenmod/eleven/lastfm/Result.java
rename to src/main/java/org/lineageos/eleven/lastfm/Result.java
index a40a401..afa4213 100644
--- a/src/main/java/com/cyanogenmod/eleven/lastfm/Result.java
+++ b/src/main/java/org/lineageos/eleven/lastfm/Result.java
@@ -19,7 +19,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.cyanogenmod.eleven.lastfm;
+package org.lineageos.eleven.lastfm;
 
 import org.w3c.dom.Document;
 
diff --git a/src/main/java/com/cyanogenmod/eleven/lastfm/StringUtilities.java b/src/main/java/org/lineageos/eleven/lastfm/StringUtilities.java
similarity index 99%
rename from src/main/java/com/cyanogenmod/eleven/lastfm/StringUtilities.java
rename to src/main/java/org/lineageos/eleven/lastfm/StringUtilities.java
index 623e449..d35217b 100644
--- a/src/main/java/com/cyanogenmod/eleven/lastfm/StringUtilities.java
+++ b/src/main/java/org/lineageos/eleven/lastfm/StringUtilities.java
@@ -19,7 +19,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.cyanogenmod.eleven.lastfm;
+package org.lineageos.eleven.lastfm;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
diff --git a/src/main/java/com/cyanogenmod/eleven/loaders/AlbumLoader.java b/src/main/java/org/lineageos/eleven/loaders/AlbumLoader.java
similarity index 92%
rename from src/main/java/com/cyanogenmod/eleven/loaders/AlbumLoader.java
rename to src/main/java/org/lineageos/eleven/loaders/AlbumLoader.java
index cc4f611..181d347 100644
--- a/src/main/java/com/cyanogenmod/eleven/loaders/AlbumLoader.java
+++ b/src/main/java/org/lineageos/eleven/loaders/AlbumLoader.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.loaders;
+package org.lineageos.eleven.loaders;
 
 import android.content.Context;
 import android.database.Cursor;
@@ -20,14 +20,14 @@
 import android.provider.MediaStore;
 import android.provider.MediaStore.Audio.AlbumColumns;
 
-import com.cyanogenmod.eleven.model.Album;
-import com.cyanogenmod.eleven.provider.LocalizedStore;
-import com.cyanogenmod.eleven.provider.LocalizedStore.SortParameter;
-import com.cyanogenmod.eleven.sectionadapter.SectionCreator;
-import com.cyanogenmod.eleven.utils.Lists;
-import com.cyanogenmod.eleven.utils.MusicUtils;
-import com.cyanogenmod.eleven.utils.PreferenceUtils;
-import com.cyanogenmod.eleven.utils.SortOrder;
+import org.lineageos.eleven.model.Album;
+import org.lineageos.eleven.provider.LocalizedStore;
+import org.lineageos.eleven.provider.LocalizedStore.SortParameter;
+import org.lineageos.eleven.sectionadapter.SectionCreator;
+import org.lineageos.eleven.utils.Lists;
+import org.lineageos.eleven.utils.MusicUtils;
+import org.lineageos.eleven.utils.PreferenceUtils;
+import org.lineageos.eleven.utils.SortOrder;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/com/cyanogenmod/eleven/loaders/AlbumSongLoader.java b/src/main/java/org/lineageos/eleven/loaders/AlbumSongLoader.java
similarity index 95%
rename from src/main/java/com/cyanogenmod/eleven/loaders/AlbumSongLoader.java
rename to src/main/java/org/lineageos/eleven/loaders/AlbumSongLoader.java
index 726bde5..81596e0 100644
--- a/src/main/java/com/cyanogenmod/eleven/loaders/AlbumSongLoader.java
+++ b/src/main/java/org/lineageos/eleven/loaders/AlbumSongLoader.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.loaders;
+package org.lineageos.eleven.loaders;
 
 import android.content.Context;
 import android.database.Cursor;
@@ -19,9 +19,9 @@
 import android.provider.MediaStore;
 import android.provider.MediaStore.Audio.AudioColumns;
 
-import com.cyanogenmod.eleven.model.Song;
-import com.cyanogenmod.eleven.utils.Lists;
-import com.cyanogenmod.eleven.utils.PreferenceUtils;
+import org.lineageos.eleven.model.Song;
+import org.lineageos.eleven.utils.Lists;
+import org.lineageos.eleven.utils.PreferenceUtils;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/com/cyanogenmod/eleven/loaders/ArtistLoader.java b/src/main/java/org/lineageos/eleven/loaders/ArtistLoader.java
similarity index 91%
rename from src/main/java/com/cyanogenmod/eleven/loaders/ArtistLoader.java
rename to src/main/java/org/lineageos/eleven/loaders/ArtistLoader.java
index 4b04030..9a22ca1 100644
--- a/src/main/java/com/cyanogenmod/eleven/loaders/ArtistLoader.java
+++ b/src/main/java/org/lineageos/eleven/loaders/ArtistLoader.java
@@ -11,21 +11,21 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.loaders;
+package org.lineageos.eleven.loaders;
 
 import android.content.Context;
 import android.database.Cursor;
 import android.provider.MediaStore;
 import android.provider.MediaStore.Audio.Artists;
 
-import com.cyanogenmod.eleven.model.Artist;
-import com.cyanogenmod.eleven.provider.LocalizedStore;
-import com.cyanogenmod.eleven.provider.LocalizedStore.SortParameter;
-import com.cyanogenmod.eleven.sectionadapter.SectionCreator;
-import com.cyanogenmod.eleven.utils.Lists;
-import com.cyanogenmod.eleven.utils.MusicUtils;
-import com.cyanogenmod.eleven.utils.PreferenceUtils;
-import com.cyanogenmod.eleven.utils.SortOrder;
+import org.lineageos.eleven.model.Artist;
+import org.lineageos.eleven.provider.LocalizedStore;
+import org.lineageos.eleven.provider.LocalizedStore.SortParameter;
+import org.lineageos.eleven.sectionadapter.SectionCreator;
+import org.lineageos.eleven.utils.Lists;
+import org.lineageos.eleven.utils.MusicUtils;
+import org.lineageos.eleven.utils.PreferenceUtils;
+import org.lineageos.eleven.utils.SortOrder;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/com/cyanogenmod/eleven/loaders/AsyncHandler.java b/src/main/java/org/lineageos/eleven/loaders/AsyncHandler.java
similarity index 96%
rename from src/main/java/com/cyanogenmod/eleven/loaders/AsyncHandler.java
rename to src/main/java/org/lineageos/eleven/loaders/AsyncHandler.java
index 1710abb..94126c5 100644
--- a/src/main/java/com/cyanogenmod/eleven/loaders/AsyncHandler.java
+++ b/src/main/java/org/lineageos/eleven/loaders/AsyncHandler.java
@@ -9,7 +9,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.loaders;
+package org.lineageos.eleven.loaders;
 
 import android.os.Handler;
 import android.os.HandlerThread;
diff --git a/src/main/java/com/cyanogenmod/eleven/loaders/LastAddedLoader.java b/src/main/java/org/lineageos/eleven/loaders/LastAddedLoader.java
similarity index 94%
rename from src/main/java/com/cyanogenmod/eleven/loaders/LastAddedLoader.java
rename to src/main/java/org/lineageos/eleven/loaders/LastAddedLoader.java
index cbc02c2..4e1fe77 100644
--- a/src/main/java/com/cyanogenmod/eleven/loaders/LastAddedLoader.java
+++ b/src/main/java/org/lineageos/eleven/loaders/LastAddedLoader.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.loaders;
+package org.lineageos.eleven.loaders;
 
 import android.content.Context;
 import android.database.Cursor;
@@ -19,10 +19,10 @@
 import android.provider.MediaStore;
 import android.provider.MediaStore.Audio.AudioColumns;
 
-import com.cyanogenmod.eleven.model.Song;
-import com.cyanogenmod.eleven.sectionadapter.SectionCreator;
-import com.cyanogenmod.eleven.utils.Lists;
-import com.cyanogenmod.eleven.utils.PreferenceUtils;
+import org.lineageos.eleven.model.Song;
+import org.lineageos.eleven.sectionadapter.SectionCreator;
+import org.lineageos.eleven.utils.Lists;
+import org.lineageos.eleven.utils.PreferenceUtils;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/com/cyanogenmod/eleven/loaders/NowPlayingCursor.java b/src/main/java/org/lineageos/eleven/loaders/NowPlayingCursor.java
similarity index 97%
rename from src/main/java/com/cyanogenmod/eleven/loaders/NowPlayingCursor.java
rename to src/main/java/org/lineageos/eleven/loaders/NowPlayingCursor.java
index 8d524bc..5061d28 100644
--- a/src/main/java/com/cyanogenmod/eleven/loaders/NowPlayingCursor.java
+++ b/src/main/java/org/lineageos/eleven/loaders/NowPlayingCursor.java
@@ -1,7 +1,7 @@
 
-package com.cyanogenmod.eleven.loaders;
+package org.lineageos.eleven.loaders;
 
-import static com.cyanogenmod.eleven.utils.MusicUtils.mService;
+import static org.lineageos.eleven.utils.MusicUtils.mService;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
@@ -12,7 +12,7 @@
 import android.provider.MediaStore;
 import android.provider.MediaStore.Audio.AudioColumns;
 
-import com.cyanogenmod.eleven.utils.MusicUtils;
+import org.lineageos.eleven.utils.MusicUtils;
 
 import java.util.Arrays;
 
diff --git a/src/main/java/com/cyanogenmod/eleven/loaders/PlaylistLoader.java b/src/main/java/org/lineageos/eleven/loaders/PlaylistLoader.java
similarity index 94%
rename from src/main/java/com/cyanogenmod/eleven/loaders/PlaylistLoader.java
rename to src/main/java/org/lineageos/eleven/loaders/PlaylistLoader.java
index 68a1b12..dfcdae8 100644
--- a/src/main/java/com/cyanogenmod/eleven/loaders/PlaylistLoader.java
+++ b/src/main/java/org/lineageos/eleven/loaders/PlaylistLoader.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.loaders;
+package org.lineageos.eleven.loaders;
 
 import android.content.Context;
 import android.content.res.Resources;
@@ -20,10 +20,10 @@
 import android.provider.MediaStore;
 import android.provider.MediaStore.Audio.PlaylistsColumns;
 
-import com.cyanogenmod.eleven.Config.SmartPlaylistType;
-import com.cyanogenmod.eleven.model.Playlist;
-import com.cyanogenmod.eleven.utils.Lists;
-import com.cyanogenmod.eleven.utils.MusicUtils;
+import org.lineageos.eleven.Config.SmartPlaylistType;
+import org.lineageos.eleven.model.Playlist;
+import org.lineageos.eleven.utils.Lists;
+import org.lineageos.eleven.utils.MusicUtils;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/com/cyanogenmod/eleven/loaders/PlaylistSongLoader.java b/src/main/java/org/lineageos/eleven/loaders/PlaylistSongLoader.java
similarity index 98%
rename from src/main/java/com/cyanogenmod/eleven/loaders/PlaylistSongLoader.java
rename to src/main/java/org/lineageos/eleven/loaders/PlaylistSongLoader.java
index e06890f..0297434 100644
--- a/src/main/java/com/cyanogenmod/eleven/loaders/PlaylistSongLoader.java
+++ b/src/main/java/org/lineageos/eleven/loaders/PlaylistSongLoader.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.loaders;
+package org.lineageos.eleven.loaders;
 
 import android.content.ContentProviderOperation;
 import android.content.Context;
@@ -24,8 +24,8 @@
 import android.provider.MediaStore.Audio.Playlists;
 import android.util.Log;
 
-import com.cyanogenmod.eleven.model.Song;
-import com.cyanogenmod.eleven.utils.Lists;
+import org.lineageos.eleven.model.Song;
+import org.lineageos.eleven.utils.Lists;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/com/cyanogenmod/eleven/loaders/QueueLoader.java b/src/main/java/org/lineageos/eleven/loaders/QueueLoader.java
similarity index 96%
rename from src/main/java/com/cyanogenmod/eleven/loaders/QueueLoader.java
rename to src/main/java/org/lineageos/eleven/loaders/QueueLoader.java
index f409b56..ccf8f6d 100644
--- a/src/main/java/com/cyanogenmod/eleven/loaders/QueueLoader.java
+++ b/src/main/java/org/lineageos/eleven/loaders/QueueLoader.java
@@ -11,13 +11,13 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.loaders;
+package org.lineageos.eleven.loaders;
 
 import android.content.Context;
 import android.database.Cursor;
 
-import com.cyanogenmod.eleven.model.Song;
-import com.cyanogenmod.eleven.utils.Lists;
+import org.lineageos.eleven.model.Song;
+import org.lineageos.eleven.utils.Lists;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/com/cyanogenmod/eleven/loaders/SearchLoader.java b/src/main/java/org/lineageos/eleven/loaders/SearchLoader.java
similarity index 97%
rename from src/main/java/com/cyanogenmod/eleven/loaders/SearchLoader.java
rename to src/main/java/org/lineageos/eleven/loaders/SearchLoader.java
index a77ff15..09ef519 100644
--- a/src/main/java/com/cyanogenmod/eleven/loaders/SearchLoader.java
+++ b/src/main/java/org/lineageos/eleven/loaders/SearchLoader.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.loaders;
+package org.lineageos.eleven.loaders;
 
 import android.content.Context;
 import android.database.Cursor;
@@ -20,8 +20,8 @@
 import android.provider.MediaStore;
 import android.text.TextUtils;
 
-import com.cyanogenmod.eleven.model.Song;
-import com.cyanogenmod.eleven.utils.Lists;
+import org.lineageos.eleven.model.Song;
+import org.lineageos.eleven.utils.Lists;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/com/cyanogenmod/eleven/loaders/SongLoader.java b/src/main/java/org/lineageos/eleven/loaders/SongLoader.java
similarity index 93%
rename from src/main/java/com/cyanogenmod/eleven/loaders/SongLoader.java
rename to src/main/java/org/lineageos/eleven/loaders/SongLoader.java
index 9171f3a..c0a16f9 100644
--- a/src/main/java/com/cyanogenmod/eleven/loaders/SongLoader.java
+++ b/src/main/java/org/lineageos/eleven/loaders/SongLoader.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.loaders;
+package org.lineageos.eleven.loaders;
 
 import android.content.Context;
 import android.database.Cursor;
@@ -19,14 +19,14 @@
 import android.provider.MediaStore.Audio;
 import android.text.TextUtils;
 
-import com.cyanogenmod.eleven.model.Song;
-import com.cyanogenmod.eleven.provider.LocalizedStore;
-import com.cyanogenmod.eleven.provider.LocalizedStore.SortParameter;
-import com.cyanogenmod.eleven.sectionadapter.SectionCreator;
-import com.cyanogenmod.eleven.utils.Lists;
-import com.cyanogenmod.eleven.utils.MusicUtils;
-import com.cyanogenmod.eleven.utils.PreferenceUtils;
-import com.cyanogenmod.eleven.utils.SortOrder;
+import org.lineageos.eleven.model.Song;
+import org.lineageos.eleven.provider.LocalizedStore;
+import org.lineageos.eleven.provider.LocalizedStore.SortParameter;
+import org.lineageos.eleven.sectionadapter.SectionCreator;
+import org.lineageos.eleven.utils.Lists;
+import org.lineageos.eleven.utils.MusicUtils;
+import org.lineageos.eleven.utils.PreferenceUtils;
+import org.lineageos.eleven.utils.SortOrder;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/com/cyanogenmod/eleven/loaders/SortedCursor.java b/src/main/java/org/lineageos/eleven/loaders/SortedCursor.java
similarity index 99%
rename from src/main/java/com/cyanogenmod/eleven/loaders/SortedCursor.java
rename to src/main/java/org/lineageos/eleven/loaders/SortedCursor.java
index 2f8a3c9..78285af 100644
--- a/src/main/java/com/cyanogenmod/eleven/loaders/SortedCursor.java
+++ b/src/main/java/org/lineageos/eleven/loaders/SortedCursor.java
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.loaders;
+package org.lineageos.eleven.loaders;
 
 import android.database.AbstractCursor;
 import android.database.Cursor;
diff --git a/src/main/java/com/cyanogenmod/eleven/loaders/TopTracksLoader.java b/src/main/java/org/lineageos/eleven/loaders/TopTracksLoader.java
similarity index 96%
rename from src/main/java/com/cyanogenmod/eleven/loaders/TopTracksLoader.java
rename to src/main/java/org/lineageos/eleven/loaders/TopTracksLoader.java
index f1ea033..7daf622 100644
--- a/src/main/java/com/cyanogenmod/eleven/loaders/TopTracksLoader.java
+++ b/src/main/java/org/lineageos/eleven/loaders/TopTracksLoader.java
@@ -14,15 +14,15 @@
 * limitations under the License.
 */
 
-package com.cyanogenmod.eleven.loaders;
+package org.lineageos.eleven.loaders;
 
 import android.content.Context;
 import android.database.Cursor;
 import android.provider.BaseColumns;
 
-import com.cyanogenmod.eleven.provider.RecentStore;
-import com.cyanogenmod.eleven.provider.SongPlayCount;
-import com.cyanogenmod.eleven.provider.SongPlayCount.SongPlayCountColumns;
+import org.lineageos.eleven.provider.RecentStore;
+import org.lineageos.eleven.provider.SongPlayCount;
+import org.lineageos.eleven.provider.SongPlayCount.SongPlayCountColumns;
 
 import java.util.ArrayList;
 
diff --git a/src/main/java/com/cyanogenmod/eleven/loaders/WrappedAsyncTaskLoader.java b/src/main/java/org/lineageos/eleven/loaders/WrappedAsyncTaskLoader.java
similarity index 97%
rename from src/main/java/com/cyanogenmod/eleven/loaders/WrappedAsyncTaskLoader.java
rename to src/main/java/org/lineageos/eleven/loaders/WrappedAsyncTaskLoader.java
index 9b6caba..de4271e 100644
--- a/src/main/java/com/cyanogenmod/eleven/loaders/WrappedAsyncTaskLoader.java
+++ b/src/main/java/org/lineageos/eleven/loaders/WrappedAsyncTaskLoader.java
@@ -1,5 +1,5 @@
 
-package com.cyanogenmod.eleven.loaders;
+package org.lineageos.eleven.loaders;
 
 import android.content.Context;
 import android.support.v4.content.AsyncTaskLoader;
diff --git a/src/main/java/com/cyanogenmod/eleven/locale/AlphabeticIndexCompat.java b/src/main/java/org/lineageos/eleven/locale/AlphabeticIndexCompat.java
similarity index 99%
rename from src/main/java/com/cyanogenmod/eleven/locale/AlphabeticIndexCompat.java
rename to src/main/java/org/lineageos/eleven/locale/AlphabeticIndexCompat.java
index 3e3f956..4797c0f 100644
--- a/src/main/java/com/cyanogenmod/eleven/locale/AlphabeticIndexCompat.java
+++ b/src/main/java/org/lineageos/eleven/locale/AlphabeticIndexCompat.java
@@ -1,4 +1,4 @@
-package com.cyanogenmod.eleven.locale;
+package org.lineageos.eleven.locale;
 
 import android.os.Build;
 import android.util.Log;
diff --git a/src/main/java/com/cyanogenmod/eleven/locale/HanziToPinyin.java b/src/main/java/org/lineageos/eleven/locale/HanziToPinyin.java
similarity index 99%
rename from src/main/java/com/cyanogenmod/eleven/locale/HanziToPinyin.java
rename to src/main/java/org/lineageos/eleven/locale/HanziToPinyin.java
index a1c1457..fb7d61f 100644
--- a/src/main/java/com/cyanogenmod/eleven/locale/HanziToPinyin.java
+++ b/src/main/java/org/lineageos/eleven/locale/HanziToPinyin.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.eleven.locale;
+package org.lineageos.eleven.locale;
 
 import android.os.Build;
 import android.text.TextUtils;
diff --git a/src/main/java/com/cyanogenmod/eleven/locale/LocaleChangeReceiver.java b/src/main/java/org/lineageos/eleven/locale/LocaleChangeReceiver.java
similarity index 91%
rename from src/main/java/com/cyanogenmod/eleven/locale/LocaleChangeReceiver.java
rename to src/main/java/org/lineageos/eleven/locale/LocaleChangeReceiver.java
index 3d2f99f..7d30523 100644
--- a/src/main/java/com/cyanogenmod/eleven/locale/LocaleChangeReceiver.java
+++ b/src/main/java/org/lineageos/eleven/locale/LocaleChangeReceiver.java
@@ -14,13 +14,13 @@
  * limitations under the License
  */
 
-package com.cyanogenmod.eleven.locale;
+package org.lineageos.eleven.locale;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 
-import com.cyanogenmod.eleven.provider.LocalizedStore;
+import org.lineageos.eleven.provider.LocalizedStore;
 
 /**
  * Locale change intent receiver that invokes {@link LocalizedStore} to update
diff --git a/src/main/java/com/cyanogenmod/eleven/locale/LocaleSet.java b/src/main/java/org/lineageos/eleven/locale/LocaleSet.java
similarity index 99%
rename from src/main/java/com/cyanogenmod/eleven/locale/LocaleSet.java
rename to src/main/java/org/lineageos/eleven/locale/LocaleSet.java
index ec906c3..95fccc4 100644
--- a/src/main/java/com/cyanogenmod/eleven/locale/LocaleSet.java
+++ b/src/main/java/org/lineageos/eleven/locale/LocaleSet.java
@@ -14,7 +14,7 @@
  * limitations under the License
  */
 
-package com.cyanogenmod.eleven.locale;
+package org.lineageos.eleven.locale;
 
 import android.os.Build;
 import android.text.TextUtils;
diff --git a/src/main/java/com/cyanogenmod/eleven/locale/LocaleSetManager.java b/src/main/java/org/lineageos/eleven/locale/LocaleSetManager.java
similarity index 97%
rename from src/main/java/com/cyanogenmod/eleven/locale/LocaleSetManager.java
rename to src/main/java/org/lineageos/eleven/locale/LocaleSetManager.java
index 48caf69..304dfa0 100644
--- a/src/main/java/com/cyanogenmod/eleven/locale/LocaleSetManager.java
+++ b/src/main/java/org/lineageos/eleven/locale/LocaleSetManager.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License
  */
-package com.cyanogenmod.eleven.locale;
+package org.lineageos.eleven.locale;
 
 import android.content.Context;
 import android.text.TextUtils;
 import android.util.Log;
 
-import com.cyanogenmod.eleven.provider.PropertiesStore;
+import org.lineageos.eleven.provider.PropertiesStore;
 import com.google.common.annotations.VisibleForTesting;
 
 import java.lang.reflect.Method;
diff --git a/src/main/java/com/cyanogenmod/eleven/locale/LocaleUtility.java b/src/main/java/org/lineageos/eleven/locale/LocaleUtility.java
similarity index 99%
rename from src/main/java/com/cyanogenmod/eleven/locale/LocaleUtility.java
rename to src/main/java/org/lineageos/eleven/locale/LocaleUtility.java
index d151eb9..bde90b1 100644
--- a/src/main/java/com/cyanogenmod/eleven/locale/LocaleUtility.java
+++ b/src/main/java/org/lineageos/eleven/locale/LocaleUtility.java
@@ -1,4 +1,4 @@
-package com.cyanogenmod.eleven.locale;
+package org.lineageos.eleven.locale;
 
 import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableMap;
diff --git a/src/main/java/com/cyanogenmod/eleven/locale/LocaleUtils.java b/src/main/java/org/lineageos/eleven/locale/LocaleUtils.java
similarity index 98%
rename from src/main/java/com/cyanogenmod/eleven/locale/LocaleUtils.java
rename to src/main/java/org/lineageos/eleven/locale/LocaleUtils.java
index c550c26..af18bef 100644
--- a/src/main/java/com/cyanogenmod/eleven/locale/LocaleUtils.java
+++ b/src/main/java/org/lineageos/eleven/locale/LocaleUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License
  */
 
-package com.cyanogenmod.eleven.locale;
+package org.lineageos.eleven.locale;
 
 import android.os.Build;
 import android.provider.ContactsContract.FullNameStyle;
@@ -22,7 +22,7 @@
 import android.text.TextUtils;
 import android.util.Log;
 
-import com.cyanogenmod.eleven.locale.HanziToPinyin.Token;
+import org.lineageos.eleven.locale.HanziToPinyin.Token;
 
 import com.google.common.annotations.VisibleForTesting;
 
@@ -67,7 +67,7 @@ public class LocaleUtils {
     public static final Locale LOCALE_SERBIAN = new Locale("sr");
     public static final Locale LOCALE_UKRAINIAN = new Locale("uk");
     public static final Locale LOCALE_THAI = new Locale("th");
-   
+
     /**
      * This class is the default implementation and should be the base class
      * for other locales.
@@ -85,7 +85,7 @@ private static class LocaleUtilsBase {
         private final int mAlphabeticIndexBucketCount;
         private final int mNumberBucketIndex;
         private final boolean mEnableSecondaryLocalePinyin;
-        
+
         public LocaleUtilsBase(LocaleSet locales) {
             // AlphabeticIndex.getBucketLabel() uses a binary search across
             // the entire label set so care should be taken about growing this
@@ -100,8 +100,8 @@ public LocaleUtilsBase(LocaleSet locales) {
             // Cyrillic because their alphabets are complementary supersets
             // of Russian.
             mEnableSecondaryLocalePinyin = locales.isSecondaryLocaleSimplifiedChinese();
-        	mAlphabeticIndex = new AlphabeticIndexCompat(locales);
-        	mAlphabeticIndexBucketCount = mAlphabeticIndex.getBucketCount();
+            mAlphabeticIndex = new AlphabeticIndexCompat(locales);
+            mAlphabeticIndexBucketCount = mAlphabeticIndex.getBucketCount();
             mNumberBucketIndex = mAlphabeticIndexBucketCount - 1;
         }
 
@@ -122,7 +122,7 @@ public int getBucketIndex(String name) {
             if (name == null) {
                 return -1;
             }
-        	boolean prefixIsNumeric = false;
+            boolean prefixIsNumeric = false;
             final int length = name.length();
             int offset = 0;
             while (offset < length) {
@@ -160,7 +160,7 @@ public int getBucketIndex(String name) {
                 return bucket + 1;
             }
             return bucket;
-        } 
+        }
 
         /**
          * Returns the number of buckets in use (one more than AlphabeticIndex
@@ -348,7 +348,7 @@ public static Iterator<String> getRomajiNameLookupKeys(String name) {
                 return null;
             }
             String romajiName = null;
-            
+
             try {
                 Class<?> clazz = t.getClass();
                 Method m = clazz.getMethod("transliterate", new Class[] { String.class } );
@@ -356,7 +356,7 @@ public static Iterator<String> getRomajiNameLookupKeys(String name) {
             } catch (Exception ex) {
                 throw new RuntimeException(ex);
             }
-          
+
             if (TextUtils.isEmpty(romajiName) ||
                     TextUtils.equals(name, romajiName)) {
                 return null;
diff --git a/src/main/java/com/cyanogenmod/eleven/menu/BasePlaylistDialog.java b/src/main/java/org/lineageos/eleven/menu/BasePlaylistDialog.java
similarity index 97%
rename from src/main/java/com/cyanogenmod/eleven/menu/BasePlaylistDialog.java
rename to src/main/java/org/lineageos/eleven/menu/BasePlaylistDialog.java
index 8f4b7cf..1c63ebf 100644
--- a/src/main/java/com/cyanogenmod/eleven/menu/BasePlaylistDialog.java
+++ b/src/main/java/org/lineageos/eleven/menu/BasePlaylistDialog.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.menu;
+package org.lineageos.eleven.menu;
 
 import android.support.v7.app.AlertDialog;
 import android.app.Dialog;
@@ -27,8 +27,8 @@
 import android.widget.Button;
 import android.widget.EditText;
 
-import com.cyanogenmod.eleven.R;
-import com.cyanogenmod.eleven.utils.MusicUtils;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.utils.MusicUtils;
 
 /**
  * A simple base class for the playlist dialogs.
diff --git a/src/main/java/com/cyanogenmod/eleven/menu/ConfirmDialog.java b/src/main/java/org/lineageos/eleven/menu/ConfirmDialog.java
similarity index 97%
rename from src/main/java/com/cyanogenmod/eleven/menu/ConfirmDialog.java
rename to src/main/java/org/lineageos/eleven/menu/ConfirmDialog.java
index dfe0858..3f05081 100644
--- a/src/main/java/com/cyanogenmod/eleven/menu/ConfirmDialog.java
+++ b/src/main/java/org/lineageos/eleven/menu/ConfirmDialog.java
@@ -14,7 +14,7 @@
 * limitations under the License.
 */
 
-package com.cyanogenmod.eleven.menu;
+package org.lineageos.eleven.menu;
 
 import android.support.v7.app.AlertDialog;
 import android.app.Dialog;
@@ -25,7 +25,7 @@
 import android.view.ViewGroup;
 import android.support.v4.app.Fragment;
 
-import com.cyanogenmod.eleven.R;
+import org.lineageos.eleven.R;
 
 /** Dialog to confirm a non-reversible action */
 public class ConfirmDialog extends AppCompatDialogFragment {
diff --git a/src/main/java/com/cyanogenmod/eleven/menu/CreateNewPlaylist.java b/src/main/java/org/lineageos/eleven/menu/CreateNewPlaylist.java
similarity index 96%
rename from src/main/java/com/cyanogenmod/eleven/menu/CreateNewPlaylist.java
rename to src/main/java/org/lineageos/eleven/menu/CreateNewPlaylist.java
index 84a72c4..3eaced5 100644
--- a/src/main/java/com/cyanogenmod/eleven/menu/CreateNewPlaylist.java
+++ b/src/main/java/org/lineageos/eleven/menu/CreateNewPlaylist.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.menu;
+package org.lineageos.eleven.menu;
 
 import android.app.Dialog;
 import android.content.ContentResolver;
@@ -19,9 +19,9 @@
 import android.os.Bundle;
 import android.provider.MediaStore;
 
-import com.cyanogenmod.eleven.R;
-import com.cyanogenmod.eleven.format.Capitalize;
-import com.cyanogenmod.eleven.utils.MusicUtils;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.format.Capitalize;
+import org.lineageos.eleven.utils.MusicUtils;
 
 /**
  * @author Andrew Neal (andrewdneal@gmail.com) TODO - The playlist names are
diff --git a/src/main/java/com/cyanogenmod/eleven/menu/DeleteDialog.java b/src/main/java/org/lineageos/eleven/menu/DeleteDialog.java
similarity index 92%
rename from src/main/java/com/cyanogenmod/eleven/menu/DeleteDialog.java
rename to src/main/java/org/lineageos/eleven/menu/DeleteDialog.java
index 5dc7f09..f8b3a9b 100644
--- a/src/main/java/com/cyanogenmod/eleven/menu/DeleteDialog.java
+++ b/src/main/java/org/lineageos/eleven/menu/DeleteDialog.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.menu;
+package org.lineageos.eleven.menu;
 
 import android.support.v7.app.AlertDialog;
 import android.support.v7.app.AppCompatDialogFragment;
@@ -21,11 +21,11 @@
 import android.content.DialogInterface.OnClickListener;
 import android.os.Bundle;
 
-import com.cyanogenmod.eleven.Config;
-import com.cyanogenmod.eleven.R;
-import com.cyanogenmod.eleven.cache.ImageFetcher;
-import com.cyanogenmod.eleven.utils.ApolloUtils;
-import com.cyanogenmod.eleven.utils.MusicUtils;
+import org.lineageos.eleven.Config;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.cache.ImageFetcher;
+import org.lineageos.eleven.utils.ElevenUtils;
+import org.lineageos.eleven.utils.MusicUtils;
 
 /**
  * Alert dialog used to delete tracks.
@@ -87,7 +87,7 @@ public Dialog onCreateDialog(final Bundle savedInstanceState) {
         final String title = arguments.getString(Config.NAME);
         final String dialogTitle = getString(R.string.delete_dialog_title, title);
         // Initialize the image cache
-        mFetcher = ApolloUtils.getImageFetcher(getActivity());
+        mFetcher = ElevenUtils.getImageFetcher(getActivity());
         // Build the dialog
         Dialog dialog = new AlertDialog.Builder(getActivity(), R.style.AppCompatAlertDialogStyle).setTitle(dialogTitle)
                 .setMessage(R.string.cannot_be_undone)
diff --git a/src/main/java/com/cyanogenmod/eleven/menu/FragmentMenuItems.java b/src/main/java/org/lineageos/eleven/menu/FragmentMenuItems.java
similarity index 95%
rename from src/main/java/com/cyanogenmod/eleven/menu/FragmentMenuItems.java
rename to src/main/java/org/lineageos/eleven/menu/FragmentMenuItems.java
index df34ef4..7dca614 100644
--- a/src/main/java/com/cyanogenmod/eleven/menu/FragmentMenuItems.java
+++ b/src/main/java/org/lineageos/eleven/menu/FragmentMenuItems.java
@@ -11,10 +11,10 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.menu;
+package org.lineageos.eleven.menu;
 
 /**
- * Several of the context menu items used in Apollo are reused. This class helps
+ * Several of the context menu items used in Eleven are reused. This class helps
  * keep things tidy. The integer values of the items are used both as the menu IDs
  * _and_ to determine the sort order of the items.
  */
diff --git a/src/main/java/com/cyanogenmod/eleven/menu/PhotoSelectionDialog.java b/src/main/java/org/lineageos/eleven/menu/PhotoSelectionDialog.java
similarity index 94%
rename from src/main/java/com/cyanogenmod/eleven/menu/PhotoSelectionDialog.java
rename to src/main/java/org/lineageos/eleven/menu/PhotoSelectionDialog.java
index 18a5442..616c132 100644
--- a/src/main/java/com/cyanogenmod/eleven/menu/PhotoSelectionDialog.java
+++ b/src/main/java/org/lineageos/eleven/menu/PhotoSelectionDialog.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.menu;
+package org.lineageos.eleven.menu;
 
 import android.support.v7.app.AlertDialog;
 import android.support.v7.app.AppCompatDialogFragment;
@@ -22,11 +22,12 @@
 import android.widget.ArrayAdapter;
 import android.widget.ListAdapter;
 
-import com.cyanogenmod.eleven.Config;
-import com.cyanogenmod.eleven.R;
-import com.cyanogenmod.eleven.ui.activities.HomeActivity;
-import com.cyanogenmod.eleven.utils.Lists;
-import com.cyanogenmod.eleven.utils.MusicUtils;
+import org.lineageos.eleven.Config;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.ui.activities.HomeActivity;
+import org.lineageos.eleven.utils.ElevenUtils;
+import org.lineageos.eleven.utils.Lists;
+import org.lineageos.eleven.utils.MusicUtils;
 
 import java.util.ArrayList;
 
diff --git a/src/main/java/com/cyanogenmod/eleven/menu/RenamePlaylist.java b/src/main/java/org/lineageos/eleven/menu/RenamePlaylist.java
similarity index 96%
rename from src/main/java/com/cyanogenmod/eleven/menu/RenamePlaylist.java
rename to src/main/java/org/lineageos/eleven/menu/RenamePlaylist.java
index 993c1e2..8803607 100644
--- a/src/main/java/com/cyanogenmod/eleven/menu/RenamePlaylist.java
+++ b/src/main/java/org/lineageos/eleven/menu/RenamePlaylist.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.menu;
+package org.lineageos.eleven.menu;
 
 import android.app.Dialog;
 import android.content.ContentResolver;
@@ -21,9 +21,9 @@
 import android.provider.MediaStore;
 import android.provider.MediaStore.Audio;
 
-import com.cyanogenmod.eleven.R;
-import com.cyanogenmod.eleven.format.Capitalize;
-import com.cyanogenmod.eleven.utils.MusicUtils;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.format.Capitalize;
+import org.lineageos.eleven.utils.MusicUtils;
 
 /**
  * Alert dialog used to rename playlits.
diff --git a/src/main/java/com/cyanogenmod/eleven/model/Album.java b/src/main/java/org/lineageos/eleven/model/Album.java
similarity index 98%
rename from src/main/java/com/cyanogenmod/eleven/model/Album.java
rename to src/main/java/org/lineageos/eleven/model/Album.java
index 8745a8f..055df9f 100644
--- a/src/main/java/com/cyanogenmod/eleven/model/Album.java
+++ b/src/main/java/org/lineageos/eleven/model/Album.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.model;
+package org.lineageos.eleven.model;
 
 import android.text.TextUtils;
 
diff --git a/src/main/java/com/cyanogenmod/eleven/model/AlbumArtistDetails.java b/src/main/java/org/lineageos/eleven/model/AlbumArtistDetails.java
similarity index 95%
rename from src/main/java/com/cyanogenmod/eleven/model/AlbumArtistDetails.java
rename to src/main/java/org/lineageos/eleven/model/AlbumArtistDetails.java
index 28dfe0c..59c39b7 100644
--- a/src/main/java/com/cyanogenmod/eleven/model/AlbumArtistDetails.java
+++ b/src/main/java/org/lineageos/eleven/model/AlbumArtistDetails.java
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.model;
+package org.lineageos.eleven.model;
 
 /**
  * Simple containing class to query for album art
diff --git a/src/main/java/com/cyanogenmod/eleven/model/Artist.java b/src/main/java/org/lineageos/eleven/model/Artist.java
similarity index 98%
rename from src/main/java/com/cyanogenmod/eleven/model/Artist.java
rename to src/main/java/org/lineageos/eleven/model/Artist.java
index 5ae101a..ca6a040 100644
--- a/src/main/java/com/cyanogenmod/eleven/model/Artist.java
+++ b/src/main/java/org/lineageos/eleven/model/Artist.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.model;
+package org.lineageos.eleven.model;
 
 import android.text.TextUtils;
 
diff --git a/src/main/java/com/cyanogenmod/eleven/model/Genre.java b/src/main/java/org/lineageos/eleven/model/Genre.java
similarity index 98%
rename from src/main/java/com/cyanogenmod/eleven/model/Genre.java
rename to src/main/java/org/lineageos/eleven/model/Genre.java
index 90c5210..7842e02 100644
--- a/src/main/java/com/cyanogenmod/eleven/model/Genre.java
+++ b/src/main/java/org/lineageos/eleven/model/Genre.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.model;
+package org.lineageos.eleven.model;
 
 import android.text.TextUtils;
 
diff --git a/src/main/java/com/cyanogenmod/eleven/model/Playlist.java b/src/main/java/org/lineageos/eleven/model/Playlist.java
similarity index 98%
rename from src/main/java/com/cyanogenmod/eleven/model/Playlist.java
rename to src/main/java/org/lineageos/eleven/model/Playlist.java
index 57e0825..91d11df 100644
--- a/src/main/java/com/cyanogenmod/eleven/model/Playlist.java
+++ b/src/main/java/org/lineageos/eleven/model/Playlist.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.model;
+package org.lineageos.eleven.model;
 
 import android.text.TextUtils;
 
diff --git a/src/main/java/com/cyanogenmod/eleven/model/SearchResult.java b/src/main/java/org/lineageos/eleven/model/SearchResult.java
similarity index 98%
rename from src/main/java/com/cyanogenmod/eleven/model/SearchResult.java
rename to src/main/java/org/lineageos/eleven/model/SearchResult.java
index cc4c468..5a8814b 100644
--- a/src/main/java/com/cyanogenmod/eleven/model/SearchResult.java
+++ b/src/main/java/org/lineageos/eleven/model/SearchResult.java
@@ -13,13 +13,13 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.model;
+package org.lineageos.eleven.model;
 
 import android.database.Cursor;
 import android.provider.MediaStore;
 import android.util.Log;
 
-import com.cyanogenmod.eleven.Config;
+import org.lineageos.eleven.Config;
 
 import java.util.Comparator;
 
diff --git a/src/main/java/com/cyanogenmod/eleven/model/Song.java b/src/main/java/org/lineageos/eleven/model/Song.java
similarity index 99%
rename from src/main/java/com/cyanogenmod/eleven/model/Song.java
rename to src/main/java/org/lineageos/eleven/model/Song.java
index 785e21e..785c387 100644
--- a/src/main/java/com/cyanogenmod/eleven/model/Song.java
+++ b/src/main/java/org/lineageos/eleven/model/Song.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.model;
+package org.lineageos.eleven.model;
 
 import android.text.TextUtils;
 
diff --git a/src/main/java/com/cyanogenmod/eleven/provider/LocalizedStore.java b/src/main/java/org/lineageos/eleven/provider/LocalizedStore.java
similarity index 98%
rename from src/main/java/com/cyanogenmod/eleven/provider/LocalizedStore.java
rename to src/main/java/org/lineageos/eleven/provider/LocalizedStore.java
index 0890ae0..f7652a8 100644
--- a/src/main/java/com/cyanogenmod/eleven/provider/LocalizedStore.java
+++ b/src/main/java/org/lineageos/eleven/provider/LocalizedStore.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License
  */
-package com.cyanogenmod.eleven.provider;
+package org.lineageos.eleven.provider;
 
 import android.content.ContentValues;
 import android.content.Context;
@@ -28,11 +28,11 @@
 import android.text.TextUtils;
 import android.util.Log;
 
-import com.cyanogenmod.eleven.loaders.SortedCursor;
-import com.cyanogenmod.eleven.locale.LocaleSet;
-import com.cyanogenmod.eleven.locale.LocaleSetManager;
-import com.cyanogenmod.eleven.locale.LocaleUtils;
-import com.cyanogenmod.eleven.utils.MusicUtils;
+import org.lineageos.eleven.loaders.SortedCursor;
+import org.lineageos.eleven.locale.LocaleSet;
+import org.lineageos.eleven.locale.LocaleSetManager;
+import org.lineageos.eleven.locale.LocaleUtils;
+import org.lineageos.eleven.utils.MusicUtils;
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;
diff --git a/src/main/java/com/cyanogenmod/eleven/provider/MusicDB.java b/src/main/java/org/lineageos/eleven/provider/MusicDB.java
similarity index 99%
rename from src/main/java/com/cyanogenmod/eleven/provider/MusicDB.java
rename to src/main/java/org/lineageos/eleven/provider/MusicDB.java
index 84c64a0..a1d7575 100644
--- a/src/main/java/com/cyanogenmod/eleven/provider/MusicDB.java
+++ b/src/main/java/org/lineageos/eleven/provider/MusicDB.java
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.provider;
+package org.lineageos.eleven.provider;
 
 import android.content.Context;
 import android.database.sqlite.SQLiteDatabase;
diff --git a/src/main/java/com/cyanogenmod/eleven/provider/MusicPlaybackState.java b/src/main/java/org/lineageos/eleven/provider/MusicPlaybackState.java
similarity index 97%
rename from src/main/java/com/cyanogenmod/eleven/provider/MusicPlaybackState.java
rename to src/main/java/org/lineageos/eleven/provider/MusicPlaybackState.java
index fbfca28..e0bb66c 100644
--- a/src/main/java/com/cyanogenmod/eleven/provider/MusicPlaybackState.java
+++ b/src/main/java/org/lineageos/eleven/provider/MusicPlaybackState.java
@@ -13,16 +13,16 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.provider;
+package org.lineageos.eleven.provider;
 
 import android.content.ContentValues;
 import android.content.Context;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 
-import com.cyanogenmod.eleven.Config;
-import com.cyanogenmod.eleven.service.MusicPlaybackTrack;
-import com.cyanogenmod.eleven.utils.Lists;
+import org.lineageos.eleven.Config;
+import org.lineageos.eleven.service.MusicPlaybackTrack;
+import org.lineageos.eleven.utils.Lists;
 
 import java.util.ArrayList;
 import java.util.Iterator;
diff --git a/src/main/java/com/cyanogenmod/eleven/provider/PlaylistArtworkStore.java b/src/main/java/org/lineageos/eleven/provider/PlaylistArtworkStore.java
similarity index 99%
rename from src/main/java/com/cyanogenmod/eleven/provider/PlaylistArtworkStore.java
rename to src/main/java/org/lineageos/eleven/provider/PlaylistArtworkStore.java
index 48a792e..3fa886c 100644
--- a/src/main/java/com/cyanogenmod/eleven/provider/PlaylistArtworkStore.java
+++ b/src/main/java/org/lineageos/eleven/provider/PlaylistArtworkStore.java
@@ -13,14 +13,14 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.provider;
+package org.lineageos.eleven.provider;
 
 import android.content.ContentValues;
 import android.content.Context;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 
-import com.cyanogenmod.eleven.utils.MusicUtils;
+import org.lineageos.eleven.utils.MusicUtils;
 
 /**
  * This db stores the details to generate the playlist artwork including when it was
diff --git a/src/main/java/com/cyanogenmod/eleven/provider/PropertiesStore.java b/src/main/java/org/lineageos/eleven/provider/PropertiesStore.java
similarity index 98%
rename from src/main/java/com/cyanogenmod/eleven/provider/PropertiesStore.java
rename to src/main/java/org/lineageos/eleven/provider/PropertiesStore.java
index b22de68..9d84c75 100644
--- a/src/main/java/com/cyanogenmod/eleven/provider/PropertiesStore.java
+++ b/src/main/java/org/lineageos/eleven/provider/PropertiesStore.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License
  */
-package com.cyanogenmod.eleven.provider;
+package org.lineageos.eleven.provider;
 
 import android.content.ContentValues;
 import android.content.Context;
diff --git a/src/main/java/com/cyanogenmod/eleven/provider/RecentStore.java b/src/main/java/org/lineageos/eleven/provider/RecentStore.java
similarity index 99%
rename from src/main/java/com/cyanogenmod/eleven/provider/RecentStore.java
rename to src/main/java/org/lineageos/eleven/provider/RecentStore.java
index 0a913db..e03f52b 100644
--- a/src/main/java/com/cyanogenmod/eleven/provider/RecentStore.java
+++ b/src/main/java/org/lineageos/eleven/provider/RecentStore.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.provider;
+package org.lineageos.eleven.provider;
 
 import android.content.ContentValues;
 import android.content.Context;
diff --git a/src/main/java/com/cyanogenmod/eleven/provider/SearchHistory.java b/src/main/java/org/lineageos/eleven/provider/SearchHistory.java
similarity index 99%
rename from src/main/java/com/cyanogenmod/eleven/provider/SearchHistory.java
rename to src/main/java/org/lineageos/eleven/provider/SearchHistory.java
index 4ca1b40..18d25cb 100644
--- a/src/main/java/com/cyanogenmod/eleven/provider/SearchHistory.java
+++ b/src/main/java/org/lineageos/eleven/provider/SearchHistory.java
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.provider;
+package org.lineageos.eleven.provider;
 
 import android.content.ContentValues;
 import android.content.Context;
diff --git a/src/main/java/com/cyanogenmod/eleven/provider/SongPlayCount.java b/src/main/java/org/lineageos/eleven/provider/SongPlayCount.java
similarity index 99%
rename from src/main/java/com/cyanogenmod/eleven/provider/SongPlayCount.java
rename to src/main/java/org/lineageos/eleven/provider/SongPlayCount.java
index 082dfc2..5fcd83f 100644
--- a/src/main/java/com/cyanogenmod/eleven/provider/SongPlayCount.java
+++ b/src/main/java/org/lineageos/eleven/provider/SongPlayCount.java
@@ -14,7 +14,7 @@
 * limitations under the License.
 */
 
-package com.cyanogenmod.eleven.provider;
+package org.lineageos.eleven.provider;
 
 import android.content.ContentValues;
 import android.content.Context;
diff --git a/src/main/java/com/cyanogenmod/eleven/recycler/RecycleHolder.java b/src/main/java/org/lineageos/eleven/recycler/RecycleHolder.java
similarity index 93%
rename from src/main/java/com/cyanogenmod/eleven/recycler/RecycleHolder.java
rename to src/main/java/org/lineageos/eleven/recycler/RecycleHolder.java
index ec16a4e..c3d9d08 100644
--- a/src/main/java/com/cyanogenmod/eleven/recycler/RecycleHolder.java
+++ b/src/main/java/org/lineageos/eleven/recycler/RecycleHolder.java
@@ -11,13 +11,13 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.recycler;
+package org.lineageos.eleven.recycler;
 
 import android.view.View;
 import android.widget.AbsListView.RecyclerListener;
 
-import com.cyanogenmod.eleven.cache.ImageWorker;
-import com.cyanogenmod.eleven.ui.MusicHolder;
+import org.lineageos.eleven.cache.ImageWorker;
+import org.lineageos.eleven.ui.MusicHolder;
 
 /**
  * A @ {@link RecyclerListener} for {@link MusicHolder}'s views.
diff --git a/src/main/java/com/cyanogenmod/eleven/sectionadapter/SectionAdapter.java b/src/main/java/org/lineageos/eleven/sectionadapter/SectionAdapter.java
similarity index 97%
rename from src/main/java/com/cyanogenmod/eleven/sectionadapter/SectionAdapter.java
rename to src/main/java/org/lineageos/eleven/sectionadapter/SectionAdapter.java
index 870382a..f052a6a 100644
--- a/src/main/java/com/cyanogenmod/eleven/sectionadapter/SectionAdapter.java
+++ b/src/main/java/org/lineageos/eleven/sectionadapter/SectionAdapter.java
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.sectionadapter;
+package org.lineageos.eleven.sectionadapter;
 
 import android.app.Activity;
 import android.content.Context;
@@ -24,11 +24,11 @@
 import android.widget.BaseAdapter;
 import android.widget.TextView;
 
-import com.cyanogenmod.eleven.R;
-import com.cyanogenmod.eleven.ui.MusicHolder;
-import com.cyanogenmod.eleven.utils.SectionCreatorUtils.Section;
-import com.cyanogenmod.eleven.utils.SectionCreatorUtils.SectionType;
-import com.cyanogenmod.eleven.widgets.IPopupMenuCallback;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.ui.MusicHolder;
+import org.lineageos.eleven.utils.SectionCreatorUtils.Section;
+import org.lineageos.eleven.utils.SectionCreatorUtils.SectionType;
+import org.lineageos.eleven.widgets.IPopupMenuCallback;
 
 import java.util.TreeMap;
 
diff --git a/src/main/java/com/cyanogenmod/eleven/sectionadapter/SectionCreator.java b/src/main/java/org/lineageos/eleven/sectionadapter/SectionCreator.java
similarity index 93%
rename from src/main/java/com/cyanogenmod/eleven/sectionadapter/SectionCreator.java
rename to src/main/java/org/lineageos/eleven/sectionadapter/SectionCreator.java
index 16e7e09..b731973 100644
--- a/src/main/java/com/cyanogenmod/eleven/sectionadapter/SectionCreator.java
+++ b/src/main/java/org/lineageos/eleven/sectionadapter/SectionCreator.java
@@ -13,12 +13,12 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.sectionadapter;
+package org.lineageos.eleven.sectionadapter;
 
 import android.content.Context;
 
-import com.cyanogenmod.eleven.loaders.WrappedAsyncTaskLoader;
-import com.cyanogenmod.eleven.utils.SectionCreatorUtils;
+import org.lineageos.eleven.loaders.WrappedAsyncTaskLoader;
+import org.lineageos.eleven.utils.SectionCreatorUtils;
 
 import java.util.List;
 import java.util.TreeMap;
diff --git a/src/main/java/com/cyanogenmod/eleven/sectionadapter/SectionListContainer.java b/src/main/java/org/lineageos/eleven/sectionadapter/SectionListContainer.java
similarity index 91%
rename from src/main/java/com/cyanogenmod/eleven/sectionadapter/SectionListContainer.java
rename to src/main/java/org/lineageos/eleven/sectionadapter/SectionListContainer.java
index 486bf84..93bcf7d 100644
--- a/src/main/java/com/cyanogenmod/eleven/sectionadapter/SectionListContainer.java
+++ b/src/main/java/org/lineageos/eleven/sectionadapter/SectionListContainer.java
@@ -13,9 +13,9 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.sectionadapter;
+package org.lineageos.eleven.sectionadapter;
 
-import com.cyanogenmod.eleven.utils.SectionCreatorUtils;
+import org.lineageos.eleven.utils.SectionCreatorUtils;
 
 import java.util.List;
 import java.util.TreeMap;
diff --git a/src/main/java/com/cyanogenmod/eleven/service/MusicPlaybackTrack.java b/src/main/java/org/lineageos/eleven/service/MusicPlaybackTrack.java
similarity index 97%
rename from src/main/java/com/cyanogenmod/eleven/service/MusicPlaybackTrack.java
rename to src/main/java/org/lineageos/eleven/service/MusicPlaybackTrack.java
index 2c9832a..5939cac 100644
--- a/src/main/java/com/cyanogenmod/eleven/service/MusicPlaybackTrack.java
+++ b/src/main/java/org/lineageos/eleven/service/MusicPlaybackTrack.java
@@ -13,12 +13,12 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.service;
+package org.lineageos.eleven.service;
 
 import android.os.Parcel;
 import android.os.Parcelable;
 
-import com.cyanogenmod.eleven.Config;
+import org.lineageos.eleven.Config;
 
 /**
  * This is used by the music playback service to track the music tracks it is playing
diff --git a/src/main/java/com/cyanogenmod/eleven/slidinguppanel/SlidingUpPanelLayout.java b/src/main/java/org/lineageos/eleven/slidinguppanel/SlidingUpPanelLayout.java
similarity index 99%
rename from src/main/java/com/cyanogenmod/eleven/slidinguppanel/SlidingUpPanelLayout.java
rename to src/main/java/org/lineageos/eleven/slidinguppanel/SlidingUpPanelLayout.java
index f7fdf5d..afd4027 100644
--- a/src/main/java/com/cyanogenmod/eleven/slidinguppanel/SlidingUpPanelLayout.java
+++ b/src/main/java/org/lineageos/eleven/slidinguppanel/SlidingUpPanelLayout.java
@@ -1,4 +1,4 @@
-package com.cyanogenmod.eleven.slidinguppanel;
+package org.lineageos.eleven.slidinguppanel;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
@@ -19,7 +19,7 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.accessibility.AccessibilityEvent;
-import com.cyanogenmod.eleven.R;
+import org.lineageos.eleven.R;
 
 public class SlidingUpPanelLayout extends ViewGroup {
 
diff --git a/src/main/java/com/cyanogenmod/eleven/slidinguppanel/ViewDragHelper.java b/src/main/java/org/lineageos/eleven/slidinguppanel/ViewDragHelper.java
similarity index 99%
rename from src/main/java/com/cyanogenmod/eleven/slidinguppanel/ViewDragHelper.java
rename to src/main/java/org/lineageos/eleven/slidinguppanel/ViewDragHelper.java
index dffee27..5627151 100644
--- a/src/main/java/com/cyanogenmod/eleven/slidinguppanel/ViewDragHelper.java
+++ b/src/main/java/org/lineageos/eleven/slidinguppanel/ViewDragHelper.java
@@ -15,7 +15,7 @@
  */
 
 
-package com.cyanogenmod.eleven.slidinguppanel;
+package org.lineageos.eleven.slidinguppanel;
 
 import java.util.Arrays;
 
diff --git a/src/main/java/com/cyanogenmod/eleven/ui/HeaderBar.java b/src/main/java/org/lineageos/eleven/ui/HeaderBar.java
similarity index 89%
rename from src/main/java/com/cyanogenmod/eleven/ui/HeaderBar.java
rename to src/main/java/org/lineageos/eleven/ui/HeaderBar.java
index cb56338..7dbf192 100644
--- a/src/main/java/com/cyanogenmod/eleven/ui/HeaderBar.java
+++ b/src/main/java/org/lineageos/eleven/ui/HeaderBar.java
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.ui;
+package org.lineageos.eleven.ui;
 
 import android.content.Context;
 import android.support.v4.app.Fragment;
@@ -27,12 +27,12 @@
 import android.widget.PopupMenu;
 import android.widget.TextView;
 
-import com.cyanogenmod.eleven.R;
-import com.cyanogenmod.eleven.loaders.NowPlayingCursor;
-import com.cyanogenmod.eleven.loaders.QueueLoader;
-import com.cyanogenmod.eleven.menu.CreateNewPlaylist;
-import com.cyanogenmod.eleven.utils.MusicUtils;
-import com.cyanogenmod.eleven.utils.NavUtils;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.loaders.NowPlayingCursor;
+import org.lineageos.eleven.loaders.QueueLoader;
+import org.lineageos.eleven.menu.CreateNewPlaylist;
+import org.lineageos.eleven.utils.MusicUtils;
+import org.lineageos.eleven.utils.NavUtils;
 
 /**
  * Simple Header bar wrapper class that also has its own menu bar button.
@@ -144,26 +144,26 @@ public boolean onMenuItemClick(MenuItem item) {
     }
 
     public boolean onPopupMenuItemClick(final MenuItem item) {
-    	int id = item.getItemId();
-    	if (id == R.id.menu_shuffle_all){
+        int id = item.getItemId();
+        if (id == R.id.menu_shuffle_all){
             // Shuffle all the songs
             MusicUtils.shuffleAll(mFragment.getActivity());
             return true;	
-    	} else if (id == R.id.menu_settings){
+        } else if (id == R.id.menu_settings){
             // Settings
             NavUtils.openSettings(mFragment.getActivity());
             return true;
-    	} else if (id == R.id.menu_save_queue){
+        } else if (id == R.id.menu_save_queue){
             NowPlayingCursor queue = (NowPlayingCursor) QueueLoader
                     .makeQueueCursor(mFragment.getActivity());
             CreateNewPlaylist.getInstance(MusicUtils.getSongListForCursor(queue)).show(
                     mFragment.getFragmentManager(), "CreatePlaylist");
             queue.close();
             return true;
-    	} else if (id == R.id.menu_clear_queue){
+        } else if (id == R.id.menu_clear_queue){
             MusicUtils.clearQueue();
             return true;
-    	}
+        }
         return false;
     }
 }
diff --git a/src/main/java/com/cyanogenmod/eleven/ui/MusicHolder.java b/src/main/java/org/lineageos/eleven/ui/MusicHolder.java
similarity index 96%
rename from src/main/java/com/cyanogenmod/eleven/ui/MusicHolder.java
rename to src/main/java/org/lineageos/eleven/ui/MusicHolder.java
index d65e8e7..3313ea2 100644
--- a/src/main/java/com/cyanogenmod/eleven/ui/MusicHolder.java
+++ b/src/main/java/org/lineageos/eleven/ui/MusicHolder.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.ui;
+package org.lineageos.eleven.ui;
 
 import android.content.Context;
 import android.view.View;
@@ -19,9 +19,9 @@
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-import com.cyanogenmod.eleven.R;
-import com.cyanogenmod.eleven.widgets.PlayPauseProgressButton;
-import com.cyanogenmod.eleven.widgets.PopupMenuButton;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.widgets.PlayPauseProgressButton;
+import org.lineageos.eleven.widgets.PopupMenuButton;
 
 import java.lang.ref.WeakReference;
 
diff --git a/src/main/java/com/cyanogenmod/eleven/ui/activities/BaseActivity.java b/src/main/java/org/lineageos/eleven/ui/activities/BaseActivity.java
similarity index 92%
rename from src/main/java/com/cyanogenmod/eleven/ui/activities/BaseActivity.java
rename to src/main/java/org/lineageos/eleven/ui/activities/BaseActivity.java
index a29170a..4aae7d3 100644
--- a/src/main/java/com/cyanogenmod/eleven/ui/activities/BaseActivity.java
+++ b/src/main/java/org/lineageos/eleven/ui/activities/BaseActivity.java
@@ -11,9 +11,9 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.ui.activities;
+package org.lineageos.eleven.ui.activities;
 
-import static com.cyanogenmod.eleven.utils.MusicUtils.mService;
+import static org.lineageos.eleven.utils.MusicUtils.mService;
 
 import android.support.v4.content.ContextCompat;
 import android.support.v7.app.ActionBar;
@@ -40,25 +40,25 @@
 import android.widget.Toast;
 import android.support.v7.widget.Toolbar;
 
-import com.cyanogenmod.eleven.IElevenService;
-import com.cyanogenmod.eleven.MusicPlaybackService;
-import com.cyanogenmod.eleven.MusicStateListener;
-import com.cyanogenmod.eleven.R;
-import com.cyanogenmod.eleven.cache.ICacheListener;
-import com.cyanogenmod.eleven.cache.ImageFetcher;
-import com.cyanogenmod.eleven.utils.ApolloUtils;
-import com.cyanogenmod.eleven.utils.Lists;
-import com.cyanogenmod.eleven.utils.MusicUtils;
-import com.cyanogenmod.eleven.utils.MusicUtils.ServiceToken;
-import com.cyanogenmod.eleven.utils.NavUtils;
-import com.cyanogenmod.eleven.widgets.PlayPauseProgressButton;
+import org.lineageos.eleven.IElevenService;
+import org.lineageos.eleven.MusicPlaybackService;
+import org.lineageos.eleven.MusicStateListener;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.cache.ICacheListener;
+import org.lineageos.eleven.cache.ImageFetcher;
+import org.lineageos.eleven.utils.ElevenUtils;
+import org.lineageos.eleven.utils.Lists;
+import org.lineageos.eleven.utils.MusicUtils;
+import org.lineageos.eleven.utils.MusicUtils.ServiceToken;
+import org.lineageos.eleven.utils.NavUtils;
+import org.lineageos.eleven.widgets.PlayPauseProgressButton;
 
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 
 /**
  * A base {@link AppCompatActivity} used to update the bottom bar and
- * bind to Apollo's service.
+ * bind to Eleven's service.
  * <p>
  * {@link SlidingPanelActivity} extends from this skeleton.
  *
@@ -121,7 +121,7 @@ protected void onCreate(final Bundle savedInstanceState) {
         // Control the media volume
         setVolumeControlStream(AudioManager.STREAM_MUSIC);
 
-        // Bind Apollo's service
+        // Bind Eleven's service
         mToken = MusicUtils.bindToService(this, this);
 
         // Initialize the broadcast receiver
@@ -145,7 +145,7 @@ protected void onCreate(final Bundle savedInstanceState) {
 
         // set the background on the root view
         getWindow().getDecorView().getRootView().setBackgroundColor(
-        		ContextCompat.getColor(this, R.color.background_color));
+                ContextCompat.getColor(this, R.color.background_color));
         // Initialze the bottom action bar
         initBottomActionBar();
 
@@ -193,15 +193,15 @@ public boolean onCreateOptionsMenu(final Menu menu) {
      */
     @Override
     public boolean onOptionsItemSelected(final MenuItem item) {
-    	int id = item.getItemId();
-    	if (id == R.id.menu_settings){
+        int id = item.getItemId();
+        if (id == R.id.menu_settings){
             // Settings
             NavUtils.openSettings(this);
             return true;
-    	} else if (id == R.id.menu_search){
+        } else if (id == R.id.menu_search){
             NavUtils.openSearch(BaseActivity.this, "");
             return true;
-    	}
+        }
         return super.onOptionsItemSelected(item);
     }
 
@@ -280,7 +280,7 @@ public void setupActionBar(int resId) {
     }
 
     @SuppressWarnings("deprecation")
-	public void setupActionBar(String title) {
+    public void setupActionBar(String title) {
         setActionBarTitle(title);
 
         if (mActionBarBackground == null) {
@@ -289,7 +289,7 @@ public void setupActionBar(String title) {
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
             	mToolBar.setBackground(mActionBarBackground);
             } else {
-            	mToolBar.setBackgroundDrawable(mActionBarBackground);
+                mToolBar.setBackgroundDrawable(mActionBarBackground);
             }
         }
     }
@@ -346,7 +346,7 @@ private void updateBottomActionBarInfo() {
         // Set the artist name
         mArtistName.setText(MusicUtils.getArtistName());
         // Set the album art
-        ApolloUtils.getImageFetcher(this).loadCurrentArtwork(mAlbumArt);
+        ElevenUtils.getImageFetcher(this).loadCurrentArtwork(mAlbumArt);
     }
 
     /**
@@ -474,7 +474,7 @@ public void removeMusicStateListenerListener(final MusicStateListener status) {
     @Override
     public void onCacheUnpaused() {
         // Set the album art
-        ApolloUtils.getImageFetcher(this).loadCurrentArtwork(mAlbumArt);
+        ElevenUtils.getImageFetcher(this).loadCurrentArtwork(mAlbumArt);
     }
 
     /**
diff --git a/src/main/java/com/cyanogenmod/eleven/ui/activities/HomeActivity.java b/src/main/java/org/lineageos/eleven/ui/activities/HomeActivity.java
similarity index 94%
rename from src/main/java/com/cyanogenmod/eleven/ui/activities/HomeActivity.java
rename to src/main/java/org/lineageos/eleven/ui/activities/HomeActivity.java
index ea87f58..a5881d1 100644
--- a/src/main/java/com/cyanogenmod/eleven/ui/activities/HomeActivity.java
+++ b/src/main/java/org/lineageos/eleven/ui/activities/HomeActivity.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.cyanogenmod.eleven.ui.activities;
+package org.lineageos.eleven.ui.activities;
 
 import android.Manifest;
 import android.animation.ArgbEvaluator;
@@ -38,26 +38,25 @@
 import android.view.MenuItem;
 import android.view.Window;
 
-import java.lang.reflect.Method;
-
-import com.cyanogenmod.eleven.Config;
-import com.cyanogenmod.eleven.R;
-import com.cyanogenmod.eleven.cache.ImageFetcher;
-import com.cyanogenmod.eleven.ui.fragments.AlbumDetailFragment;
-import com.cyanogenmod.eleven.ui.fragments.ArtistDetailFragment;
-import com.cyanogenmod.eleven.ui.fragments.AudioPlayerFragment;
-import com.cyanogenmod.eleven.ui.fragments.IChildFragment;
-import com.cyanogenmod.eleven.ui.fragments.ISetupActionBar;
-import com.cyanogenmod.eleven.ui.fragments.PlaylistDetailFragment;
-import com.cyanogenmod.eleven.ui.fragments.RecentFragment;
-import com.cyanogenmod.eleven.ui.fragments.phone.MusicBrowserPhoneFragment;
-import com.cyanogenmod.eleven.ui.fragments.profile.LastAddedFragment;
-import com.cyanogenmod.eleven.ui.fragments.profile.TopTracksFragment;
-import com.cyanogenmod.eleven.utils.ApolloUtils;
-import com.cyanogenmod.eleven.utils.BitmapWithColors;
-import com.cyanogenmod.eleven.utils.MusicUtils;
-import com.cyanogenmod.eleven.utils.NavUtils;
+import org.lineageos.eleven.Config;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.cache.ImageFetcher;
+import org.lineageos.eleven.ui.fragments.AlbumDetailFragment;
+import org.lineageos.eleven.ui.fragments.ArtistDetailFragment;
+import org.lineageos.eleven.ui.fragments.AudioPlayerFragment;
+import org.lineageos.eleven.ui.fragments.IChildFragment;
+import org.lineageos.eleven.ui.fragments.ISetupActionBar;
+import org.lineageos.eleven.ui.fragments.PlaylistDetailFragment;
+import org.lineageos.eleven.ui.fragments.RecentFragment;
+import org.lineageos.eleven.ui.fragments.phone.MusicBrowserPhoneFragment;
+import org.lineageos.eleven.ui.fragments.profile.LastAddedFragment;
+import org.lineageos.eleven.ui.fragments.profile.TopTracksFragment;
+import org.lineageos.eleven.utils.ElevenUtils;
+import org.lineageos.eleven.utils.BitmapWithColors;
+import org.lineageos.eleven.utils.MusicUtils;
+import org.lineageos.eleven.utils.NavUtils;
 
+import java.lang.reflect.Method;
 import java.util.ArrayList;
 
 public class HomeActivity extends SlidingPanelActivity implements
@@ -251,7 +250,7 @@ private void updateVisualizerColor(int color) {
     }
 
     private void updateStatusBarColor(int color) {
-    	if (color == Color.TRANSPARENT) {
+        if (color == Color.TRANSPARENT) {
             color = ContextCompat.getColor(this, R.color.primary_dark);
         }
         final Window window = getWindow();
@@ -350,7 +349,7 @@ public void run() {
                         Bitmap bitmap = ImageFetcher.decodeSampledBitmapFromUri(getContentResolver(),
                                 selectedImage);
 
-                        ImageFetcher imageFetcher = ApolloUtils.getImageFetcher(HomeActivity.this);
+                        ImageFetcher imageFetcher = ElevenUtils.getImageFetcher(HomeActivity.this);
                         imageFetcher.addBitmapToCache(mKey, bitmap);
 
                         MusicUtils.refresh();
diff --git a/src/main/java/com/cyanogenmod/eleven/ui/activities/SearchActivity.java b/src/main/java/org/lineageos/eleven/ui/activities/SearchActivity.java
similarity index 94%
rename from src/main/java/com/cyanogenmod/eleven/ui/activities/SearchActivity.java
rename to src/main/java/org/lineageos/eleven/ui/activities/SearchActivity.java
index 0bf58d2..06123a5 100644
--- a/src/main/java/com/cyanogenmod/eleven/ui/activities/SearchActivity.java
+++ b/src/main/java/org/lineageos/eleven/ui/activities/SearchActivity.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.ui.activities;
+package org.lineageos.eleven.ui.activities;
 
 import android.support.v7.app.ActionBar;
 import android.app.SearchManager;
@@ -50,31 +50,31 @@
 import android.support.v7.widget.SearchView;
 import android.support.v7.widget.SearchView.OnQueryTextListener;
 
-import com.cyanogenmod.eleven.Config;
-import com.cyanogenmod.eleven.IElevenService;
-import com.cyanogenmod.eleven.R;
-import com.cyanogenmod.eleven.adapters.SummarySearchAdapter;
-import com.cyanogenmod.eleven.loaders.WrappedAsyncTaskLoader;
-import com.cyanogenmod.eleven.menu.FragmentMenuItems;
-import com.cyanogenmod.eleven.model.AlbumArtistDetails;
-import com.cyanogenmod.eleven.model.SearchResult;
-import com.cyanogenmod.eleven.model.SearchResult.ResultType;
-import com.cyanogenmod.eleven.provider.SearchHistory;
-import com.cyanogenmod.eleven.recycler.RecycleHolder;
-import com.cyanogenmod.eleven.sectionadapter.SectionAdapter;
-import com.cyanogenmod.eleven.sectionadapter.SectionCreator;
-import com.cyanogenmod.eleven.sectionadapter.SectionCreator.SimpleListLoader;
-import com.cyanogenmod.eleven.sectionadapter.SectionListContainer;
-import com.cyanogenmod.eleven.utils.ApolloUtils;
-import com.cyanogenmod.eleven.utils.MusicUtils;
-import com.cyanogenmod.eleven.utils.MusicUtils.ServiceToken;
-import com.cyanogenmod.eleven.utils.NavUtils;
-import com.cyanogenmod.eleven.utils.PopupMenuHelper;
-import com.cyanogenmod.eleven.utils.SectionCreatorUtils;
-import com.cyanogenmod.eleven.utils.SectionCreatorUtils.IItemCompare;
-import com.cyanogenmod.eleven.widgets.IPopupMenuCallback;
-import com.cyanogenmod.eleven.widgets.LoadingEmptyContainer;
-import com.cyanogenmod.eleven.widgets.NoResultsContainer;
+import org.lineageos.eleven.Config;
+import org.lineageos.eleven.IElevenService;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.adapters.SummarySearchAdapter;
+import org.lineageos.eleven.loaders.WrappedAsyncTaskLoader;
+import org.lineageos.eleven.menu.FragmentMenuItems;
+import org.lineageos.eleven.model.AlbumArtistDetails;
+import org.lineageos.eleven.model.SearchResult;
+import org.lineageos.eleven.model.SearchResult.ResultType;
+import org.lineageos.eleven.provider.SearchHistory;
+import org.lineageos.eleven.recycler.RecycleHolder;
+import org.lineageos.eleven.sectionadapter.SectionAdapter;
+import org.lineageos.eleven.sectionadapter.SectionCreator;
+import org.lineageos.eleven.sectionadapter.SectionCreator.SimpleListLoader;
+import org.lineageos.eleven.sectionadapter.SectionListContainer;
+import org.lineageos.eleven.utils.ElevenUtils;
+import org.lineageos.eleven.utils.MusicUtils;
+import org.lineageos.eleven.utils.MusicUtils.ServiceToken;
+import org.lineageos.eleven.utils.NavUtils;
+import org.lineageos.eleven.utils.PopupMenuHelper;
+import org.lineageos.eleven.utils.SectionCreatorUtils;
+import org.lineageos.eleven.utils.SectionCreatorUtils.IItemCompare;
+import org.lineageos.eleven.widgets.IPopupMenuCallback;
+import org.lineageos.eleven.widgets.LoadingEmptyContainer;
+import org.lineageos.eleven.widgets.NoResultsContainer;
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;
@@ -83,11 +83,11 @@
 import java.util.TreeSet;
 
 import static android.view.View.OnTouchListener;
-import static com.cyanogenmod.eleven.utils.MusicUtils.mService;
+import static org.lineageos.eleven.utils.MusicUtils.mService;
 
 /**
- * Provides the search interface for Apollo.
- * 
+ * Provides the search interface for Eleven.
+ *
  * @author Andrew Neal (andrewdneal@gmail.com)
  */
 public class SearchActivity extends AppCompatActivity implements
@@ -108,7 +108,7 @@ public class SearchActivity extends AppCompatActivity implements
      * Identifier for the search history loader
      */
     private static int HISTORY_LOADER = 1;
-   
+
     /**
      * The service token
      */
@@ -198,7 +198,7 @@ enum VisibleState {
     private PopupMenuHelper mPopupMenuHelper;
 
     private boolean hasCallbacks;
-    
+
     /**
      * {@inheritDoc}
      */
@@ -266,7 +266,7 @@ protected String getArtistName() {
         // Control the media volume
         setVolumeControlStream(AudioManager.STREAM_MUSIC);
 
-        // Bind Apollo's service
+        // Bind Eleven's service
         mToken = MusicUtils.bindToService(this, this);
 
         // Set the layout
@@ -306,7 +306,7 @@ public void run() {
             }
         };
         hasCallbacks = false;
-        
+
         // Theme the action bar
         final ActionBar actionBar = getSupportActionBar();
         actionBar.setDisplayHomeAsUpEnabled(true);
@@ -445,7 +445,7 @@ public boolean onCreateOptionsMenu(final Menu menu) {
         // layout params to hide it
         mSearchView.setIconifiedByDefault(false);
         mSearchView.setIconified(false);
-        int searchButtonId = getResources().getIdentifier("search_mag_icon", "id", "com.cyanogenmod.eleven");
+        int searchButtonId = getResources().getIdentifier("search_mag_icon", "id", "org.lineageos.eleven");
         ImageView searchIcon = (ImageView)mSearchView.findViewById(searchButtonId);
         searchIcon.setLayoutParams(new LinearLayout.LayoutParams(0, 0));
 
@@ -574,7 +574,7 @@ public void hideInputManager() {
      * don't want to flash the loading icon very often since searches usually are pretty fast
      */
     public void setLoading() {
-        if (mCurrentState != VisibleState.Loading) {       	
+        if (mCurrentState != VisibleState.Loading) {
             //mHandler.hasCallbacks(mLoadingRunnable
         	if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
                 try {
@@ -601,7 +601,7 @@ public void setState(VisibleState state) {
         // in case the state doesn't change but we've created a loading runnable
         mHandler.removeCallbacks(mLoadingRunnable);
         hasCallbacks = false;
-        
+
         // if we are already looking at view already, just quit
         if (mCurrentState == state) {
             return;
@@ -800,7 +800,7 @@ protected List<SearchResult> runSearchForType() {
                 if (mSearchType == ResultType.Playlist) {
                     cursor = makePlaylistSearchCursor(getContext(), mQuery);
                 } else {
-                    cursor = ApolloUtils.createSearchQueryCursor(getContext(), mQuery);
+                    cursor = ElevenUtils.createSearchQueryCursor(getContext(), mQuery);
                 }
 
                 // pre-cache this index
@@ -876,7 +876,7 @@ public List<SearchResult> runGenericSearch() {
             }
 
             // do fancy audio search
-            Cursor cursor = ApolloUtils.createSearchQueryCursor(getContext(), mQuery);
+            Cursor cursor = ElevenUtils.createSearchQueryCursor(getContext(), mQuery);
 
             // pre-cache this index
             final int mimeTypeIndex = cursor.getColumnIndexOrThrow(MediaStore.Audio.Media.MIME_TYPE);
diff --git a/src/main/java/com/cyanogenmod/eleven/ui/activities/SettingsActivity.java b/src/main/java/org/lineageos/eleven/ui/activities/SettingsActivity.java
similarity index 91%
rename from src/main/java/com/cyanogenmod/eleven/ui/activities/SettingsActivity.java
rename to src/main/java/org/lineageos/eleven/ui/activities/SettingsActivity.java
index bdf689f..44c0983 100644
--- a/src/main/java/com/cyanogenmod/eleven/ui/activities/SettingsActivity.java
+++ b/src/main/java/org/lineageos/eleven/ui/activities/SettingsActivity.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.ui.activities;
+package org.lineageos.eleven.ui.activities;
 
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
@@ -25,10 +25,10 @@
 import android.support.v7.widget.Toolbar;
 import android.util.TypedValue;
 
-import com.cyanogenmod.eleven.R;
-import com.cyanogenmod.eleven.ui.fragments.PreferenceFragment;
-import com.cyanogenmod.eleven.utils.MusicUtils;
-import com.cyanogenmod.eleven.utils.PreferenceUtils;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.ui.fragments.PreferenceFragment;
+import org.lineageos.eleven.utils.MusicUtils;
+import org.lineageos.eleven.utils.PreferenceUtils;
 
 /**
  * Settings.
@@ -36,17 +36,17 @@
  * @author Andrew Neal (andrewdneal@gmail.com)
  */
 public class SettingsActivity extends AppCompatActivity implements OnSharedPreferenceChangeListener{
-	   
+
     /**
      * {@inheritDoc}
      */
     @SuppressWarnings("deprecation")
-	@Override
+    @Override
     protected void onCreate(final Bundle savedInstanceState) {
         getDelegate().installViewFactory();
         getDelegate().onCreate(savedInstanceState);
         super.onCreate(savedInstanceState);
-        
+
         // Fade it in
         overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out);
 
@@ -60,9 +60,9 @@ protected void onCreate(final Bundle savedInstanceState) {
         
         // Set the layout
         setContentView(R.layout.activity_settings);
-        
+
         findViewById(R.id.activity_pref_content).setPadding(0, height, 0, 0);
-        
+
         Toolbar mToolBar = (Toolbar) findViewById(R.id.prefToolbar);
         setSupportActionBar(mToolBar);
 
@@ -81,7 +81,7 @@ protected void onCreate(final Bundle savedInstanceState) {
         }
 
         PreferenceUtils.getInstance(this).setOnSharedPreferenceChangeListener(this);
-        
+
         // set the background on the root view
         getWindow().getDecorView().getRootView().setBackgroundColor(
         		ContextCompat.getColor(this, R.color.background_color));
@@ -92,7 +92,6 @@ protected void onCreate(final Bundle savedInstanceState) {
         }
     }
 
-    
     /**
      * {@inheritDoc}
      */
@@ -113,7 +112,7 @@ public boolean onOptionsItemSelected(final MenuItem item) {
     public void onSharedPreferenceChanged(SharedPreferences sharedPreferences,
             String key) {
         if (key.equals(PreferenceUtils.SHOW_VISUALIZER) &&
-               sharedPreferences.getBoolean(key, false) && !PreferenceUtils.canRecordAudio(this)) {
+                sharedPreferences.getBoolean(key, false) && !PreferenceUtils.canRecordAudio(this)) {
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
                 PreferenceUtils.requestRecordAudio(this);    		   
             }
diff --git a/src/main/java/com/cyanogenmod/eleven/ui/activities/SlidingPanelActivity.java b/src/main/java/org/lineageos/eleven/ui/activities/SlidingPanelActivity.java
similarity index 93%
rename from src/main/java/com/cyanogenmod/eleven/ui/activities/SlidingPanelActivity.java
rename to src/main/java/org/lineageos/eleven/ui/activities/SlidingPanelActivity.java
index 9af5460..c681974 100644
--- a/src/main/java/com/cyanogenmod/eleven/ui/activities/SlidingPanelActivity.java
+++ b/src/main/java/org/lineageos/eleven/ui/activities/SlidingPanelActivity.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.ui.activities;
+package org.lineageos.eleven.ui.activities;
 
 import android.graphics.Color;
 import android.os.Bundle;
@@ -20,15 +20,15 @@
 import android.view.View;
 import android.widget.LinearLayout;
 
-import com.cyanogenmod.eleven.R;
-import com.cyanogenmod.eleven.slidinguppanel.SlidingUpPanelLayout;
-import com.cyanogenmod.eleven.slidinguppanel.SlidingUpPanelLayout.SimplePanelSlideListener;
-import com.cyanogenmod.eleven.ui.HeaderBar;
-import com.cyanogenmod.eleven.ui.fragments.AudioPlayerFragment;
-import com.cyanogenmod.eleven.ui.fragments.QueueFragment;
-import com.cyanogenmod.eleven.utils.ApolloUtils;
-import com.cyanogenmod.eleven.utils.MusicUtils;
-import com.cyanogenmod.eleven.widgets.BlurScrimImage;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.slidinguppanel.SlidingUpPanelLayout;
+import org.lineageos.eleven.slidinguppanel.SlidingUpPanelLayout.SimplePanelSlideListener;
+import org.lineageos.eleven.ui.HeaderBar;
+import org.lineageos.eleven.ui.fragments.AudioPlayerFragment;
+import org.lineageos.eleven.ui.fragments.QueueFragment;
+import org.lineageos.eleven.utils.ElevenUtils;
+import org.lineageos.eleven.utils.MusicUtils;
+import org.lineageos.eleven.widgets.BlurScrimImage;
 
 /**
  * This class is used to display the {@link ViewPager} used to swipe between the
@@ -175,7 +175,7 @@ public void onPanelCollapsed(View panel) {
         // since the previous view's is hiding the slide offset, we need to subtract that
         // from action bat height
         int slideOffset = getResources().getDimensionPixelOffset(R.dimen.sliding_panel_indicator_height);
-        slideOffset -= ApolloUtils.getActionBarHeight(this);
+        slideOffset -= ElevenUtils.getActionBarHeight(this);
         mSecondPanel.setSlidePanelOffset(slideOffset);
     }
 
@@ -280,7 +280,7 @@ public void onMetaChanged() {
         super.onMetaChanged();
 
         // load the blurred image
-        mBlurScrimImage.loadBlurImage(ApolloUtils.getImageFetcher(this));
+        mBlurScrimImage.loadBlurImage(ElevenUtils.getImageFetcher(this));
     }
 
     @Override
@@ -288,7 +288,7 @@ public void onCacheUnpaused() {
         super.onCacheUnpaused();
 
         // load the blurred image
-        mBlurScrimImage.loadBlurImage(ApolloUtils.getImageFetcher(this));
+        mBlurScrimImage.loadBlurImage(ElevenUtils.getImageFetcher(this));
     }
 
     protected AudioPlayerFragment getAudioPlayerFragment() {
diff --git a/src/main/java/com/cyanogenmod/eleven/ui/activities/preview/AudioPreviewActivity.java b/src/main/java/org/lineageos/eleven/ui/activities/preview/AudioPreviewActivity.java
similarity index 99%
rename from src/main/java/com/cyanogenmod/eleven/ui/activities/preview/AudioPreviewActivity.java
rename to src/main/java/org/lineageos/eleven/ui/activities/preview/AudioPreviewActivity.java
index 7a7c7f2..aff4b8b 100644
--- a/src/main/java/com/cyanogenmod/eleven/ui/activities/preview/AudioPreviewActivity.java
+++ b/src/main/java/org/lineageos/eleven/ui/activities/preview/AudioPreviewActivity.java
@@ -14,7 +14,7 @@
 * limitations under the License.
 */
 
-package com.cyanogenmod.eleven.ui.activities.preview;
+package org.lineageos.eleven.ui.activities.preview;
 
 import android.app.Activity;
 import android.support.v7.app.AppCompatActivity;
@@ -48,8 +48,8 @@
 import android.widget.SeekBar.OnSeekBarChangeListener;
 import android.widget.TextView;
 import android.widget.Toast;
-import com.cyanogenmod.eleven.R;
-import com.cyanogenmod.eleven.ui.activities.preview.util.Logger;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.ui.activities.preview.util.Logger;
 
 import java.io.IOException;
 import java.lang.ref.WeakReference;
@@ -103,7 +103,7 @@ public class AudioPreviewActivity extends AppCompatActivity implements MediaPlay
             throw new RuntimeException(ex);
         }
     }
-    
+
     // Seeking flag
     private boolean mIsSeeking = false;
     private boolean mWasPlaying = false;
@@ -556,7 +556,7 @@ public void onClick(View v) {
                 startPlayback();
             } else {
                 pausePlayback();
-            }	
+            }
     	} else if (id==R.id.grp_transparent_wrapper){
             stopPlaybackAndTeardown();
             finish();
diff --git a/src/main/java/com/cyanogenmod/eleven/ui/activities/preview/PreviewSong.java b/src/main/java/org/lineageos/eleven/ui/activities/preview/PreviewSong.java
similarity index 94%
rename from src/main/java/com/cyanogenmod/eleven/ui/activities/preview/PreviewSong.java
rename to src/main/java/org/lineageos/eleven/ui/activities/preview/PreviewSong.java
index a4d7524..ba2b7af 100644
--- a/src/main/java/com/cyanogenmod/eleven/ui/activities/preview/PreviewSong.java
+++ b/src/main/java/org/lineageos/eleven/ui/activities/preview/PreviewSong.java
@@ -14,7 +14,7 @@
 * limitations under the License.
 */
 
-package com.cyanogenmod.eleven.ui.activities.preview;
+package org.lineageos.eleven.ui.activities.preview;
 
 import android.net.Uri;
 
diff --git a/src/main/java/com/cyanogenmod/eleven/ui/activities/preview/util/Logger.java b/src/main/java/org/lineageos/eleven/ui/activities/preview/util/Logger.java
similarity index 97%
rename from src/main/java/com/cyanogenmod/eleven/ui/activities/preview/util/Logger.java
rename to src/main/java/org/lineageos/eleven/ui/activities/preview/util/Logger.java
index ac25453..a2056de 100644
--- a/src/main/java/com/cyanogenmod/eleven/ui/activities/preview/util/Logger.java
+++ b/src/main/java/org/lineageos/eleven/ui/activities/preview/util/Logger.java
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package com.cyanogenmod.eleven.ui.activities.preview.util;
+package org.lineageos.eleven.ui.activities.preview.util;
 
 import android.text.TextUtils;
 import android.util.Log;
diff --git a/src/main/java/com/cyanogenmod/eleven/ui/fragments/AlbumDetailFragment.java b/src/main/java/org/lineageos/eleven/ui/fragments/AlbumDetailFragment.java
similarity index 89%
rename from src/main/java/com/cyanogenmod/eleven/ui/fragments/AlbumDetailFragment.java
rename to src/main/java/org/lineageos/eleven/ui/fragments/AlbumDetailFragment.java
index 5aeb70f..826fbf0 100644
--- a/src/main/java/com/cyanogenmod/eleven/ui/fragments/AlbumDetailFragment.java
+++ b/src/main/java/org/lineageos/eleven/ui/fragments/AlbumDetailFragment.java
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.ui.fragments;
+package org.lineageos.eleven.ui.fragments;
 
 import android.os.Bundle;
 import android.support.v4.app.LoaderManager;
@@ -21,21 +21,21 @@
 import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TextView;
-import com.cyanogenmod.eleven.Config;
-import com.cyanogenmod.eleven.R;
-import com.cyanogenmod.eleven.adapters.AlbumDetailSongAdapter;
-import com.cyanogenmod.eleven.adapters.DetailSongAdapter;
-import com.cyanogenmod.eleven.adapters.PagerAdapter;
-import com.cyanogenmod.eleven.cache.ImageFetcher;
-import com.cyanogenmod.eleven.model.Album;
-import com.cyanogenmod.eleven.model.Song;
-import com.cyanogenmod.eleven.utils.AlbumPopupMenuHelper;
-import com.cyanogenmod.eleven.utils.GenreFetcher;
-import com.cyanogenmod.eleven.utils.MusicUtils;
-import com.cyanogenmod.eleven.utils.PopupMenuHelper;
-import com.cyanogenmod.eleven.utils.SongPopupMenuHelper;
-import com.cyanogenmod.eleven.widgets.IPopupMenuCallback;
-import com.cyanogenmod.eleven.widgets.LoadingEmptyContainer;
+import org.lineageos.eleven.Config;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.adapters.AlbumDetailSongAdapter;
+import org.lineageos.eleven.adapters.DetailSongAdapter;
+import org.lineageos.eleven.adapters.PagerAdapter;
+import org.lineageos.eleven.cache.ImageFetcher;
+import org.lineageos.eleven.model.Album;
+import org.lineageos.eleven.model.Song;
+import org.lineageos.eleven.utils.AlbumPopupMenuHelper;
+import org.lineageos.eleven.utils.GenreFetcher;
+import org.lineageos.eleven.utils.MusicUtils;
+import org.lineageos.eleven.utils.PopupMenuHelper;
+import org.lineageos.eleven.utils.SongPopupMenuHelper;
+import org.lineageos.eleven.widgets.IPopupMenuCallback;
+import org.lineageos.eleven.widgets.LoadingEmptyContainer;
 
 import java.util.List;
 
diff --git a/src/main/java/com/cyanogenmod/eleven/ui/fragments/AlbumFragment.java b/src/main/java/org/lineageos/eleven/ui/fragments/AlbumFragment.java
similarity index 88%
rename from src/main/java/com/cyanogenmod/eleven/ui/fragments/AlbumFragment.java
rename to src/main/java/org/lineageos/eleven/ui/fragments/AlbumFragment.java
index f645ddd..b5942e4 100644
--- a/src/main/java/com/cyanogenmod/eleven/ui/fragments/AlbumFragment.java
+++ b/src/main/java/org/lineageos/eleven/ui/fragments/AlbumFragment.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.ui.fragments;
+package org.lineageos.eleven.ui.fragments;
 
 import android.os.Bundle;
 import android.os.SystemClock;
@@ -26,24 +26,24 @@
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.GridView;
 
-import com.cyanogenmod.eleven.MusicStateListener;
-import com.cyanogenmod.eleven.R;
-import com.cyanogenmod.eleven.adapters.AlbumAdapter;
-import com.cyanogenmod.eleven.adapters.PagerAdapter;
-import com.cyanogenmod.eleven.loaders.AlbumLoader;
-import com.cyanogenmod.eleven.model.Album;
-import com.cyanogenmod.eleven.recycler.RecycleHolder;
-import com.cyanogenmod.eleven.sectionadapter.SectionCreator;
-import com.cyanogenmod.eleven.sectionadapter.SectionListContainer;
-import com.cyanogenmod.eleven.ui.activities.BaseActivity;
-import com.cyanogenmod.eleven.ui.fragments.phone.MusicBrowserFragment;
-import com.cyanogenmod.eleven.utils.AlbumPopupMenuHelper;
-import com.cyanogenmod.eleven.utils.ApolloUtils;
-import com.cyanogenmod.eleven.utils.MusicUtils;
-import com.cyanogenmod.eleven.utils.NavUtils;
-import com.cyanogenmod.eleven.utils.PopupMenuHelper;
-import com.cyanogenmod.eleven.widgets.IPopupMenuCallback;
-import com.cyanogenmod.eleven.widgets.LoadingEmptyContainer;
+import org.lineageos.eleven.MusicStateListener;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.adapters.AlbumAdapter;
+import org.lineageos.eleven.adapters.PagerAdapter;
+import org.lineageos.eleven.loaders.AlbumLoader;
+import org.lineageos.eleven.model.Album;
+import org.lineageos.eleven.recycler.RecycleHolder;
+import org.lineageos.eleven.sectionadapter.SectionCreator;
+import org.lineageos.eleven.sectionadapter.SectionListContainer;
+import org.lineageos.eleven.ui.activities.BaseActivity;
+import org.lineageos.eleven.ui.fragments.phone.MusicBrowserFragment;
+import org.lineageos.eleven.utils.AlbumPopupMenuHelper;
+import org.lineageos.eleven.utils.ElevenUtils;
+import org.lineageos.eleven.utils.MusicUtils;
+import org.lineageos.eleven.utils.NavUtils;
+import org.lineageos.eleven.utils.PopupMenuHelper;
+import org.lineageos.eleven.widgets.IPopupMenuCallback;
+import org.lineageos.eleven.widgets.LoadingEmptyContainer;
 
 /**
  * This class is used to display all of the albums on a user's device.
@@ -306,7 +306,7 @@ private void initAbsListView(final AbsListView list) {
      * Sets up the grid view
      */
     private void initGridView() {
-        int columns = ApolloUtils.isLandscape(getActivity()) ? FOUR : TWO;
+        int columns = ElevenUtils.isLandscape(getActivity()) ? FOUR : TWO;
         mAdapter.setNumColumns(columns);
         // Initialize the grid
         mGridView = (GridView)mRootView.findViewById(R.id.grid_base);
diff --git a/src/main/java/com/cyanogenmod/eleven/ui/fragments/ArtistDetailFragment.java b/src/main/java/org/lineageos/eleven/ui/fragments/ArtistDetailFragment.java
similarity index 90%
rename from src/main/java/com/cyanogenmod/eleven/ui/fragments/ArtistDetailFragment.java
rename to src/main/java/org/lineageos/eleven/ui/fragments/ArtistDetailFragment.java
index 9ec66a9..373e50c 100644
--- a/src/main/java/com/cyanogenmod/eleven/ui/fragments/ArtistDetailFragment.java
+++ b/src/main/java/org/lineageos/eleven/ui/fragments/ArtistDetailFragment.java
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.ui.fragments;
+package org.lineageos.eleven.ui.fragments;
 
 import android.os.Build;
 import android.os.Bundle;
@@ -26,23 +26,23 @@
 import android.view.ViewTreeObserver;
 import android.widget.ImageView;
 import android.widget.ListView;
-import com.cyanogenmod.eleven.Config;
-import com.cyanogenmod.eleven.R;
-import com.cyanogenmod.eleven.adapters.ArtistDetailAlbumAdapter;
-import com.cyanogenmod.eleven.adapters.ArtistDetailSongAdapter;
-import com.cyanogenmod.eleven.adapters.PagerAdapter;
-import com.cyanogenmod.eleven.cache.ImageFetcher;
-import com.cyanogenmod.eleven.menu.FragmentMenuItems;
-import com.cyanogenmod.eleven.model.Album;
-import com.cyanogenmod.eleven.model.Artist;
-import com.cyanogenmod.eleven.model.Song;
-import com.cyanogenmod.eleven.utils.AlbumPopupMenuHelper;
-import com.cyanogenmod.eleven.utils.ArtistPopupMenuHelper;
-import com.cyanogenmod.eleven.utils.MusicUtils;
-import com.cyanogenmod.eleven.utils.PopupMenuHelper;
-import com.cyanogenmod.eleven.utils.SongPopupMenuHelper;
-import com.cyanogenmod.eleven.widgets.IPopupMenuCallback;
-import com.cyanogenmod.eleven.widgets.LoadingEmptyContainer;
+import org.lineageos.eleven.Config;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.adapters.ArtistDetailAlbumAdapter;
+import org.lineageos.eleven.adapters.ArtistDetailSongAdapter;
+import org.lineageos.eleven.adapters.PagerAdapter;
+import org.lineageos.eleven.cache.ImageFetcher;
+import org.lineageos.eleven.menu.FragmentMenuItems;
+import org.lineageos.eleven.model.Album;
+import org.lineageos.eleven.model.Artist;
+import org.lineageos.eleven.model.Song;
+import org.lineageos.eleven.utils.AlbumPopupMenuHelper;
+import org.lineageos.eleven.utils.ArtistPopupMenuHelper;
+import org.lineageos.eleven.utils.MusicUtils;
+import org.lineageos.eleven.utils.PopupMenuHelper;
+import org.lineageos.eleven.utils.SongPopupMenuHelper;
+import org.lineageos.eleven.widgets.IPopupMenuCallback;
+import org.lineageos.eleven.widgets.LoadingEmptyContainer;
 
 import java.util.TreeSet;
 
diff --git a/src/main/java/com/cyanogenmod/eleven/ui/fragments/ArtistFragment.java b/src/main/java/org/lineageos/eleven/ui/fragments/ArtistFragment.java
similarity index 88%
rename from src/main/java/com/cyanogenmod/eleven/ui/fragments/ArtistFragment.java
rename to src/main/java/org/lineageos/eleven/ui/fragments/ArtistFragment.java
index 100c55a..93671f4 100644
--- a/src/main/java/com/cyanogenmod/eleven/ui/fragments/ArtistFragment.java
+++ b/src/main/java/org/lineageos/eleven/ui/fragments/ArtistFragment.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.ui.fragments;
+package org.lineageos.eleven.ui.fragments;
 
 import android.content.Context;
 import android.os.Bundle;
@@ -28,26 +28,26 @@
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.ListView;
 
-import com.cyanogenmod.eleven.MusicStateListener;
-import com.cyanogenmod.eleven.R;
-import com.cyanogenmod.eleven.adapters.ArtistAdapter;
-import com.cyanogenmod.eleven.adapters.PagerAdapter;
-import com.cyanogenmod.eleven.loaders.ArtistLoader;
-import com.cyanogenmod.eleven.model.Artist;
-import com.cyanogenmod.eleven.recycler.RecycleHolder;
-import com.cyanogenmod.eleven.sectionadapter.SectionAdapter;
-import com.cyanogenmod.eleven.sectionadapter.SectionCreator;
-import com.cyanogenmod.eleven.sectionadapter.SectionListContainer;
-import com.cyanogenmod.eleven.ui.activities.BaseActivity;
-import com.cyanogenmod.eleven.ui.fragments.phone.MusicBrowserFragment;
-import com.cyanogenmod.eleven.utils.ArtistPopupMenuHelper;
-import com.cyanogenmod.eleven.utils.MusicUtils;
-import com.cyanogenmod.eleven.utils.NavUtils;
-import com.cyanogenmod.eleven.utils.PopupMenuHelper;
-import com.cyanogenmod.eleven.utils.SectionCreatorUtils;
-import com.cyanogenmod.eleven.utils.SectionCreatorUtils.IItemCompare;
-import com.cyanogenmod.eleven.widgets.IPopupMenuCallback;
-import com.cyanogenmod.eleven.widgets.LoadingEmptyContainer;
+import org.lineageos.eleven.MusicStateListener;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.adapters.ArtistAdapter;
+import org.lineageos.eleven.adapters.PagerAdapter;
+import org.lineageos.eleven.loaders.ArtistLoader;
+import org.lineageos.eleven.model.Artist;
+import org.lineageos.eleven.recycler.RecycleHolder;
+import org.lineageos.eleven.sectionadapter.SectionAdapter;
+import org.lineageos.eleven.sectionadapter.SectionCreator;
+import org.lineageos.eleven.sectionadapter.SectionListContainer;
+import org.lineageos.eleven.ui.activities.BaseActivity;
+import org.lineageos.eleven.ui.fragments.phone.MusicBrowserFragment;
+import org.lineageos.eleven.utils.ArtistPopupMenuHelper;
+import org.lineageos.eleven.utils.MusicUtils;
+import org.lineageos.eleven.utils.NavUtils;
+import org.lineageos.eleven.utils.PopupMenuHelper;
+import org.lineageos.eleven.utils.SectionCreatorUtils;
+import org.lineageos.eleven.utils.SectionCreatorUtils.IItemCompare;
+import org.lineageos.eleven.widgets.IPopupMenuCallback;
+import org.lineageos.eleven.widgets.LoadingEmptyContainer;
 
 /**
  * This class is used to display all of the artists on a user's device.
diff --git a/src/main/java/com/cyanogenmod/eleven/ui/fragments/AudioPlayerFragment.java b/src/main/java/org/lineageos/eleven/ui/fragments/AudioPlayerFragment.java
similarity index 95%
rename from src/main/java/com/cyanogenmod/eleven/ui/fragments/AudioPlayerFragment.java
rename to src/main/java/org/lineageos/eleven/ui/fragments/AudioPlayerFragment.java
index 28c5e5e..8d82a59 100644
--- a/src/main/java/com/cyanogenmod/eleven/ui/fragments/AudioPlayerFragment.java
+++ b/src/main/java/org/lineageos/eleven/ui/fragments/AudioPlayerFragment.java
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.ui.fragments;
+package org.lineageos.eleven.ui.fragments;
 
 import android.annotation.SuppressLint;
 import android.content.BroadcastReceiver;
@@ -48,34 +48,34 @@
 import android.widget.PopupMenu;
 import android.widget.TextView;
 
-import com.cyanogenmod.eleven.MusicPlaybackService;
-import com.cyanogenmod.eleven.R;
-import com.cyanogenmod.eleven.adapters.AlbumArtPagerAdapter;
-import com.cyanogenmod.eleven.cache.ImageFetcher;
-import com.cyanogenmod.eleven.loaders.NowPlayingCursor;
-import com.cyanogenmod.eleven.loaders.QueueLoader;
-import com.cyanogenmod.eleven.menu.CreateNewPlaylist;
-import com.cyanogenmod.eleven.menu.DeleteDialog;
-import com.cyanogenmod.eleven.menu.FragmentMenuItems;
-import com.cyanogenmod.eleven.ui.activities.HomeActivity;
-import com.cyanogenmod.eleven.utils.ApolloUtils;
-import com.cyanogenmod.eleven.utils.MusicUtils;
-import com.cyanogenmod.eleven.utils.NavUtils;
-import com.cyanogenmod.eleven.utils.PreferenceUtils;
-import com.cyanogenmod.eleven.widgets.BrowseButton;
-import com.cyanogenmod.eleven.widgets.LoadingEmptyContainer;
-import com.cyanogenmod.eleven.widgets.NoResultsContainer;
-import com.cyanogenmod.eleven.widgets.PlayPauseProgressButton;
-import com.cyanogenmod.eleven.widgets.QueueButton;
-import com.cyanogenmod.eleven.widgets.RepeatButton;
-import com.cyanogenmod.eleven.widgets.RepeatingImageButton;
-import com.cyanogenmod.eleven.widgets.ShuffleButton;
-import com.cyanogenmod.eleven.widgets.VisualizerView;
+import org.lineageos.eleven.MusicPlaybackService;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.adapters.AlbumArtPagerAdapter;
+import org.lineageos.eleven.cache.ImageFetcher;
+import org.lineageos.eleven.loaders.NowPlayingCursor;
+import org.lineageos.eleven.loaders.QueueLoader;
+import org.lineageos.eleven.menu.CreateNewPlaylist;
+import org.lineageos.eleven.menu.DeleteDialog;
+import org.lineageos.eleven.menu.FragmentMenuItems;
+import org.lineageos.eleven.ui.activities.HomeActivity;
+import org.lineageos.eleven.utils.ElevenUtils;
+import org.lineageos.eleven.utils.MusicUtils;
+import org.lineageos.eleven.utils.NavUtils;
+import org.lineageos.eleven.utils.PreferenceUtils;
+import org.lineageos.eleven.widgets.BrowseButton;
+import org.lineageos.eleven.widgets.LoadingEmptyContainer;
+import org.lineageos.eleven.widgets.NoResultsContainer;
+import org.lineageos.eleven.widgets.PlayPauseProgressButton;
+import org.lineageos.eleven.widgets.QueueButton;
+import org.lineageos.eleven.widgets.RepeatButton;
+import org.lineageos.eleven.widgets.RepeatingImageButton;
+import org.lineageos.eleven.widgets.ShuffleButton;
+import org.lineageos.eleven.widgets.VisualizerView;
 
 import java.lang.ref.WeakReference;
 import java.lang.reflect.Method;
 
-import static com.cyanogenmod.eleven.utils.MusicUtils.mService;
+import static org.lineageos.eleven.utils.MusicUtils.mService;
 
 public class AudioPlayerFragment extends Fragment implements ServiceConnection {
     private static final String TAG = AudioPlayerFragment.class.getSimpleName();
@@ -164,7 +164,7 @@ public void onActivityCreated(Bundle savedInstanceState) {
         mToken = MusicUtils.bindToService(getActivity(), this);
 
         // Initialize the image fetcher/cache
-        mImageFetcher = ApolloUtils.getImageFetcher(getActivity());
+        mImageFetcher = ElevenUtils.getImageFetcher(getActivity());
 
         // Initialize the handler used to update the current time
         mTimeHandler = new TimeHandler(this);
@@ -286,7 +286,7 @@ private void initHeaderBar() {
         View headerBar = mRootView.findViewById(R.id.audio_player_header);
         final int bottomActionBarHeight =
                 getResources().getDimensionPixelSize(R.dimen.bottom_action_bar_height);
-        
+
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             /*
             headerBar.setOutlineProvider(new MyViewOutlineProvider() {
@@ -300,7 +300,7 @@ public void getOutline(View view, Outline outline) {
             }
             });
             */
-        	
+
         	ViewOutlineProviderCompat myProvider = new ViewOutlineProviderCompat() {
                 @Override
                 public void getOutline(View view, Outline outline) {
diff --git a/src/main/java/com/cyanogenmod/eleven/ui/fragments/BaseFragment.java b/src/main/java/org/lineageos/eleven/ui/fragments/BaseFragment.java
similarity index 93%
rename from src/main/java/com/cyanogenmod/eleven/ui/fragments/BaseFragment.java
rename to src/main/java/org/lineageos/eleven/ui/fragments/BaseFragment.java
index 3ab1fe5..969541f 100644
--- a/src/main/java/com/cyanogenmod/eleven/ui/fragments/BaseFragment.java
+++ b/src/main/java/org/lineageos/eleven/ui/fragments/BaseFragment.java
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.ui.fragments;
+package org.lineageos.eleven.ui.fragments;
 
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
@@ -23,9 +23,9 @@
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.cyanogenmod.eleven.MusicStateListener;
-import com.cyanogenmod.eleven.R;
-import com.cyanogenmod.eleven.ui.activities.HomeActivity;
+import org.lineageos.eleven.MusicStateListener;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.ui.activities.HomeActivity;
 
 public abstract class BaseFragment extends Fragment implements MusicStateListener,
     ISetupActionBar {
diff --git a/src/main/java/com/cyanogenmod/eleven/ui/fragments/DetailFragment.java b/src/main/java/org/lineageos/eleven/ui/fragments/DetailFragment.java
similarity index 94%
rename from src/main/java/com/cyanogenmod/eleven/ui/fragments/DetailFragment.java
rename to src/main/java/org/lineageos/eleven/ui/fragments/DetailFragment.java
index 43e5274..208e8a7 100644
--- a/src/main/java/com/cyanogenmod/eleven/ui/fragments/DetailFragment.java
+++ b/src/main/java/org/lineageos/eleven/ui/fragments/DetailFragment.java
@@ -13,14 +13,14 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.ui.fragments;
+package org.lineageos.eleven.ui.fragments;
 
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 
-import com.cyanogenmod.eleven.R;
-import com.cyanogenmod.eleven.utils.PopupMenuHelper;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.utils.PopupMenuHelper;
 
 public abstract class DetailFragment extends BaseFragment {
     protected PopupMenuHelper mActionMenuHelper;
diff --git a/src/main/java/com/cyanogenmod/eleven/ui/fragments/FadingBarFragment.java b/src/main/java/org/lineageos/eleven/ui/fragments/FadingBarFragment.java
similarity index 95%
rename from src/main/java/com/cyanogenmod/eleven/ui/fragments/FadingBarFragment.java
rename to src/main/java/org/lineageos/eleven/ui/fragments/FadingBarFragment.java
index 81c4009..89d5d3c 100644
--- a/src/main/java/com/cyanogenmod/eleven/ui/fragments/FadingBarFragment.java
+++ b/src/main/java/org/lineageos/eleven/ui/fragments/FadingBarFragment.java
@@ -13,13 +13,13 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.ui.fragments;
+package org.lineageos.eleven.ui.fragments;
 
 import android.view.View;
 import android.widget.AbsListView;
 import android.widget.AbsListView.OnScrollListener;
 
-import com.cyanogenmod.eleven.ui.activities.HomeActivity;
+import org.lineageos.eleven.ui.activities.HomeActivity;
 
 public abstract class FadingBarFragment extends DetailFragment implements OnScrollListener {
     protected static final int ACTION_BAR_DEFAULT_OPACITY = 100;
diff --git a/src/main/java/com/cyanogenmod/eleven/ui/fragments/IChildFragment.java b/src/main/java/org/lineageos/eleven/ui/fragments/IChildFragment.java
similarity index 87%
rename from src/main/java/com/cyanogenmod/eleven/ui/fragments/IChildFragment.java
rename to src/main/java/org/lineageos/eleven/ui/fragments/IChildFragment.java
index f1b5fb7..aec7aa8 100644
--- a/src/main/java/com/cyanogenmod/eleven/ui/fragments/IChildFragment.java
+++ b/src/main/java/org/lineageos/eleven/ui/fragments/IChildFragment.java
@@ -13,9 +13,9 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.ui.fragments;
+package org.lineageos.eleven.ui.fragments;
 
-import com.cyanogenmod.eleven.adapters.PagerAdapter;
+import org.lineageos.eleven.adapters.PagerAdapter;
 
 public interface IChildFragment {
     PagerAdapter.MusicFragments getMusicFragmentParent();
diff --git a/src/main/java/com/cyanogenmod/eleven/ui/fragments/ISetupActionBar.java b/src/main/java/org/lineageos/eleven/ui/fragments/ISetupActionBar.java
similarity index 93%
rename from src/main/java/com/cyanogenmod/eleven/ui/fragments/ISetupActionBar.java
rename to src/main/java/org/lineageos/eleven/ui/fragments/ISetupActionBar.java
index 6ce191b..eb80656 100644
--- a/src/main/java/com/cyanogenmod/eleven/ui/fragments/ISetupActionBar.java
+++ b/src/main/java/org/lineageos/eleven/ui/fragments/ISetupActionBar.java
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.ui.fragments;
+package org.lineageos.eleven.ui.fragments;
 
 public interface ISetupActionBar {
     public void setupActionBar();
diff --git a/src/main/java/com/cyanogenmod/eleven/ui/fragments/PlaylistDetailFragment.java b/src/main/java/org/lineageos/eleven/ui/fragments/PlaylistDetailFragment.java
similarity index 91%
rename from src/main/java/com/cyanogenmod/eleven/ui/fragments/PlaylistDetailFragment.java
rename to src/main/java/org/lineageos/eleven/ui/fragments/PlaylistDetailFragment.java
index 4461b27..2043444 100644
--- a/src/main/java/com/cyanogenmod/eleven/ui/fragments/PlaylistDetailFragment.java
+++ b/src/main/java/org/lineageos/eleven/ui/fragments/PlaylistDetailFragment.java
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.ui.fragments;
+package org.lineageos.eleven.ui.fragments;
 
 import android.database.Cursor;
 import android.net.Uri;
@@ -28,28 +28,28 @@
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.ImageView;
 import android.widget.TextView;
-import com.cyanogenmod.eleven.Config;
-import com.cyanogenmod.eleven.R;
-import com.cyanogenmod.eleven.adapters.PagerAdapter;
-import com.cyanogenmod.eleven.adapters.ProfileSongAdapter;
-import com.cyanogenmod.eleven.cache.ImageFetcher;
-import com.cyanogenmod.eleven.dragdrop.DragSortListView;
-import com.cyanogenmod.eleven.dragdrop.DragSortListView.DragScrollProfile;
-import com.cyanogenmod.eleven.dragdrop.DragSortListView.DropListener;
-import com.cyanogenmod.eleven.dragdrop.DragSortListView.RemoveListener;
-import com.cyanogenmod.eleven.loaders.PlaylistSongLoader;
-import com.cyanogenmod.eleven.menu.FragmentMenuItems;
-import com.cyanogenmod.eleven.model.Playlist;
-import com.cyanogenmod.eleven.model.Song;
-import com.cyanogenmod.eleven.recycler.RecycleHolder;
-import com.cyanogenmod.eleven.utils.MusicUtils;
-import com.cyanogenmod.eleven.utils.PlaylistPopupMenuHelper;
-import com.cyanogenmod.eleven.utils.PopupMenuHelper;
-import com.cyanogenmod.eleven.utils.PopupMenuHelper.PopupMenuType;
-import com.cyanogenmod.eleven.utils.SongPopupMenuHelper;
-import com.cyanogenmod.eleven.widgets.IPopupMenuCallback;
-import com.cyanogenmod.eleven.widgets.LoadingEmptyContainer;
-import com.cyanogenmod.eleven.widgets.NoResultsContainer;
+import org.lineageos.eleven.Config;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.adapters.PagerAdapter;
+import org.lineageos.eleven.adapters.ProfileSongAdapter;
+import org.lineageos.eleven.cache.ImageFetcher;
+import org.lineageos.eleven.dragdrop.DragSortListView;
+import org.lineageos.eleven.dragdrop.DragSortListView.DragScrollProfile;
+import org.lineageos.eleven.dragdrop.DragSortListView.DropListener;
+import org.lineageos.eleven.dragdrop.DragSortListView.RemoveListener;
+import org.lineageos.eleven.loaders.PlaylistSongLoader;
+import org.lineageos.eleven.menu.FragmentMenuItems;
+import org.lineageos.eleven.model.Playlist;
+import org.lineageos.eleven.model.Song;
+import org.lineageos.eleven.recycler.RecycleHolder;
+import org.lineageos.eleven.utils.MusicUtils;
+import org.lineageos.eleven.utils.PlaylistPopupMenuHelper;
+import org.lineageos.eleven.utils.PopupMenuHelper;
+import org.lineageos.eleven.utils.PopupMenuHelper.PopupMenuType;
+import org.lineageos.eleven.utils.SongPopupMenuHelper;
+import org.lineageos.eleven.widgets.IPopupMenuCallback;
+import org.lineageos.eleven.widgets.LoadingEmptyContainer;
+import org.lineageos.eleven.widgets.NoResultsContainer;
 
 import java.util.List;
 import java.util.TreeSet;
diff --git a/src/main/java/com/cyanogenmod/eleven/ui/fragments/PlaylistFragment.java b/src/main/java/org/lineageos/eleven/ui/fragments/PlaylistFragment.java
similarity index 87%
rename from src/main/java/com/cyanogenmod/eleven/ui/fragments/PlaylistFragment.java
rename to src/main/java/org/lineageos/eleven/ui/fragments/PlaylistFragment.java
index aba8dbd..20fdf39 100644
--- a/src/main/java/com/cyanogenmod/eleven/ui/fragments/PlaylistFragment.java
+++ b/src/main/java/org/lineageos/eleven/ui/fragments/PlaylistFragment.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.ui.fragments;
+package org.lineageos.eleven.ui.fragments;
 
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
@@ -24,21 +24,21 @@
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.ListView;
 
-import com.cyanogenmod.eleven.Config.SmartPlaylistType;
-import com.cyanogenmod.eleven.MusicStateListener;
-import com.cyanogenmod.eleven.R;
-import com.cyanogenmod.eleven.adapters.PagerAdapter;
-import com.cyanogenmod.eleven.adapters.PlaylistAdapter;
-import com.cyanogenmod.eleven.loaders.PlaylistLoader;
-import com.cyanogenmod.eleven.model.Playlist;
-import com.cyanogenmod.eleven.recycler.RecycleHolder;
-import com.cyanogenmod.eleven.ui.activities.BaseActivity;
-import com.cyanogenmod.eleven.ui.fragments.phone.MusicBrowserFragment;
-import com.cyanogenmod.eleven.utils.NavUtils;
-import com.cyanogenmod.eleven.utils.PlaylistPopupMenuHelper;
-import com.cyanogenmod.eleven.utils.PopupMenuHelper;
-import com.cyanogenmod.eleven.widgets.IPopupMenuCallback;
-import com.cyanogenmod.eleven.widgets.LoadingEmptyContainer;
+import org.lineageos.eleven.Config.SmartPlaylistType;
+import org.lineageos.eleven.MusicStateListener;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.adapters.PagerAdapter;
+import org.lineageos.eleven.adapters.PlaylistAdapter;
+import org.lineageos.eleven.loaders.PlaylistLoader;
+import org.lineageos.eleven.model.Playlist;
+import org.lineageos.eleven.recycler.RecycleHolder;
+import org.lineageos.eleven.ui.activities.BaseActivity;
+import org.lineageos.eleven.ui.fragments.phone.MusicBrowserFragment;
+import org.lineageos.eleven.utils.NavUtils;
+import org.lineageos.eleven.utils.PlaylistPopupMenuHelper;
+import org.lineageos.eleven.utils.PopupMenuHelper;
+import org.lineageos.eleven.widgets.IPopupMenuCallback;
+import org.lineageos.eleven.widgets.LoadingEmptyContainer;
 
 import java.util.List;
 
diff --git a/src/main/java/com/cyanogenmod/eleven/ui/fragments/PreferenceFragment.java b/src/main/java/org/lineageos/eleven/ui/fragments/PreferenceFragment.java
similarity index 91%
rename from src/main/java/com/cyanogenmod/eleven/ui/fragments/PreferenceFragment.java
rename to src/main/java/org/lineageos/eleven/ui/fragments/PreferenceFragment.java
index 8851c92..dfb07af 100644
--- a/src/main/java/com/cyanogenmod/eleven/ui/fragments/PreferenceFragment.java
+++ b/src/main/java/org/lineageos/eleven/ui/fragments/PreferenceFragment.java
@@ -1,8 +1,9 @@
-package com.cyanogenmod.eleven.ui.fragments;
+package org.lineageos.eleven.ui.fragments;
 
-import com.cyanogenmod.eleven.R;
-import com.cyanogenmod.eleven.cache.ImageFetcher;
-import com.cyanogenmod.eleven.ui.activities.SettingsActivity;
+import org.lineageos.eleven.cache.ImageFetcher;
+import org.lineageos.eleven.ui.activities.SettingsActivity;
+
+import org.lineageos.eleven.R;
 
 import android.content.DialogInterface;
 import android.os.Bundle;
diff --git a/src/main/java/com/cyanogenmod/eleven/ui/fragments/QueueFragment.java b/src/main/java/org/lineageos/eleven/ui/fragments/QueueFragment.java
similarity index 91%
rename from src/main/java/com/cyanogenmod/eleven/ui/fragments/QueueFragment.java
rename to src/main/java/org/lineageos/eleven/ui/fragments/QueueFragment.java
index aaf7925..f497b33 100644
--- a/src/main/java/com/cyanogenmod/eleven/ui/fragments/QueueFragment.java
+++ b/src/main/java/org/lineageos/eleven/ui/fragments/QueueFragment.java
@@ -11,9 +11,9 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.ui.fragments;
+package org.lineageos.eleven.ui.fragments;
 
-import static com.cyanogenmod.eleven.utils.MusicUtils.mService;
+import static org.lineageos.eleven.utils.MusicUtils.mService;
 
 import android.content.BroadcastReceiver;
 import android.content.ComponentName;
@@ -34,28 +34,28 @@
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
 
-import com.cyanogenmod.eleven.Config;
-import com.cyanogenmod.eleven.MusicPlaybackService;
-import com.cyanogenmod.eleven.R;
-import com.cyanogenmod.eleven.adapters.SongAdapter;
-import com.cyanogenmod.eleven.dragdrop.DragSortListView;
-import com.cyanogenmod.eleven.dragdrop.DragSortListView.DragScrollProfile;
-import com.cyanogenmod.eleven.dragdrop.DragSortListView.DropListener;
-import com.cyanogenmod.eleven.dragdrop.DragSortListView.RemoveListener;
-import com.cyanogenmod.eleven.loaders.NowPlayingCursor;
-import com.cyanogenmod.eleven.loaders.QueueLoader;
-import com.cyanogenmod.eleven.menu.DeleteDialog;
-import com.cyanogenmod.eleven.menu.FragmentMenuItems;
-import com.cyanogenmod.eleven.model.Song;
-import com.cyanogenmod.eleven.recycler.RecycleHolder;
-import com.cyanogenmod.eleven.service.MusicPlaybackTrack;
-import com.cyanogenmod.eleven.ui.activities.SlidingPanelActivity;
-import com.cyanogenmod.eleven.utils.MusicUtils;
-import com.cyanogenmod.eleven.utils.PopupMenuHelper;
-import com.cyanogenmod.eleven.widgets.IPopupMenuCallback;
-import com.cyanogenmod.eleven.widgets.LoadingEmptyContainer;
-import com.cyanogenmod.eleven.widgets.NoResultsContainer;
-import com.cyanogenmod.eleven.widgets.PlayPauseProgressButton;
+import org.lineageos.eleven.Config;
+import org.lineageos.eleven.MusicPlaybackService;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.adapters.SongAdapter;
+import org.lineageos.eleven.dragdrop.DragSortListView;
+import org.lineageos.eleven.dragdrop.DragSortListView.DragScrollProfile;
+import org.lineageos.eleven.dragdrop.DragSortListView.DropListener;
+import org.lineageos.eleven.dragdrop.DragSortListView.RemoveListener;
+import org.lineageos.eleven.loaders.NowPlayingCursor;
+import org.lineageos.eleven.loaders.QueueLoader;
+import org.lineageos.eleven.menu.DeleteDialog;
+import org.lineageos.eleven.menu.FragmentMenuItems;
+import org.lineageos.eleven.model.Song;
+import org.lineageos.eleven.recycler.RecycleHolder;
+import org.lineageos.eleven.service.MusicPlaybackTrack;
+import org.lineageos.eleven.ui.activities.SlidingPanelActivity;
+import org.lineageos.eleven.utils.MusicUtils;
+import org.lineageos.eleven.utils.PopupMenuHelper;
+import org.lineageos.eleven.widgets.IPopupMenuCallback;
+import org.lineageos.eleven.widgets.LoadingEmptyContainer;
+import org.lineageos.eleven.widgets.NoResultsContainer;
+import org.lineageos.eleven.widgets.PlayPauseProgressButton;
 
 import java.lang.ref.WeakReference;
 import java.util.List;
diff --git a/src/main/java/com/cyanogenmod/eleven/ui/fragments/RecentFragment.java b/src/main/java/org/lineageos/eleven/ui/fragments/RecentFragment.java
similarity index 83%
rename from src/main/java/com/cyanogenmod/eleven/ui/fragments/RecentFragment.java
rename to src/main/java/org/lineageos/eleven/ui/fragments/RecentFragment.java
index 971f8aa..3e7c751 100644
--- a/src/main/java/com/cyanogenmod/eleven/ui/fragments/RecentFragment.java
+++ b/src/main/java/org/lineageos/eleven/ui/fragments/RecentFragment.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.ui.fragments;
+package org.lineageos.eleven.ui.fragments;
 
 import android.app.Activity;
 import android.os.Bundle;
@@ -20,19 +20,19 @@
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.cyanogenmod.eleven.Config;
-import com.cyanogenmod.eleven.Config.SmartPlaylistType;
-import com.cyanogenmod.eleven.R;
-import com.cyanogenmod.eleven.adapters.SongAdapter;
-import com.cyanogenmod.eleven.loaders.TopTracksLoader;
-import com.cyanogenmod.eleven.menu.FragmentMenuItems;
-import com.cyanogenmod.eleven.model.Song;
-import com.cyanogenmod.eleven.sectionadapter.SectionCreator;
-import com.cyanogenmod.eleven.sectionadapter.SectionListContainer;
-import com.cyanogenmod.eleven.ui.activities.BaseActivity;
-import com.cyanogenmod.eleven.ui.fragments.profile.SmartPlaylistFragment;
-import com.cyanogenmod.eleven.utils.MusicUtils;
-import com.cyanogenmod.eleven.widgets.NoResultsContainer;
+import org.lineageos.eleven.Config;
+import org.lineageos.eleven.Config.SmartPlaylistType;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.adapters.SongAdapter;
+import org.lineageos.eleven.loaders.TopTracksLoader;
+import org.lineageos.eleven.menu.FragmentMenuItems;
+import org.lineageos.eleven.model.Song;
+import org.lineageos.eleven.sectionadapter.SectionCreator;
+import org.lineageos.eleven.sectionadapter.SectionListContainer;
+import org.lineageos.eleven.ui.activities.BaseActivity;
+import org.lineageos.eleven.ui.fragments.profile.SmartPlaylistFragment;
+import org.lineageos.eleven.utils.MusicUtils;
+import org.lineageos.eleven.widgets.NoResultsContainer;
 
 import java.util.TreeSet;
 
diff --git a/src/main/java/com/cyanogenmod/eleven/ui/fragments/SongFragment.java b/src/main/java/org/lineageos/eleven/ui/fragments/SongFragment.java
similarity index 85%
rename from src/main/java/com/cyanogenmod/eleven/ui/fragments/SongFragment.java
rename to src/main/java/org/lineageos/eleven/ui/fragments/SongFragment.java
index 1e57580..ccf8ead 100644
--- a/src/main/java/com/cyanogenmod/eleven/ui/fragments/SongFragment.java
+++ b/src/main/java/org/lineageos/eleven/ui/fragments/SongFragment.java
@@ -11,22 +11,22 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.ui.fragments;
+package org.lineageos.eleven.ui.fragments;
 
 import android.content.Context;
 import android.os.Bundle;
 import android.support.v4.app.LoaderManager;
 import android.support.v4.content.Loader;
 
-import com.cyanogenmod.eleven.Config;
-import com.cyanogenmod.eleven.adapters.PagerAdapter;
-import com.cyanogenmod.eleven.loaders.SongLoader;
-import com.cyanogenmod.eleven.model.Song;
-import com.cyanogenmod.eleven.sectionadapter.SectionCreator;
-import com.cyanogenmod.eleven.sectionadapter.SectionListContainer;
-import com.cyanogenmod.eleven.ui.fragments.profile.BasicSongFragment;
-import com.cyanogenmod.eleven.utils.MusicUtils;
-import com.cyanogenmod.eleven.utils.SectionCreatorUtils;
+import org.lineageos.eleven.Config;
+import org.lineageos.eleven.adapters.PagerAdapter;
+import org.lineageos.eleven.loaders.SongLoader;
+import org.lineageos.eleven.model.Song;
+import org.lineageos.eleven.sectionadapter.SectionCreator;
+import org.lineageos.eleven.sectionadapter.SectionListContainer;
+import org.lineageos.eleven.ui.fragments.profile.BasicSongFragment;
+import org.lineageos.eleven.utils.MusicUtils;
+import org.lineageos.eleven.utils.SectionCreatorUtils;
 
 /**
  * This class is used to display all of the songs on a user's device.
diff --git a/src/main/java/com/cyanogenmod/eleven/ui/fragments/ViewOutlineProviderCompat.java b/src/main/java/org/lineageos/eleven/ui/fragments/ViewOutlineProviderCompat.java
similarity index 99%
rename from src/main/java/com/cyanogenmod/eleven/ui/fragments/ViewOutlineProviderCompat.java
rename to src/main/java/org/lineageos/eleven/ui/fragments/ViewOutlineProviderCompat.java
index ed68e6b..0d02e0f 100644
--- a/src/main/java/com/cyanogenmod/eleven/ui/fragments/ViewOutlineProviderCompat.java
+++ b/src/main/java/org/lineageos/eleven/ui/fragments/ViewOutlineProviderCompat.java
@@ -1,4 +1,4 @@
-package com.cyanogenmod.eleven.ui.fragments;
+package org.lineageos.eleven.ui.fragments;
 
 /*
  * Copyright (C) 2014 The Android Open Source Project
diff --git a/src/main/java/com/cyanogenmod/eleven/ui/fragments/phone/MusicBrowserFragment.java b/src/main/java/org/lineageos/eleven/ui/fragments/phone/MusicBrowserFragment.java
similarity index 97%
rename from src/main/java/com/cyanogenmod/eleven/ui/fragments/phone/MusicBrowserFragment.java
rename to src/main/java/org/lineageos/eleven/ui/fragments/phone/MusicBrowserFragment.java
index 0d01e5f..caa2fc5 100644
--- a/src/main/java/com/cyanogenmod/eleven/ui/fragments/phone/MusicBrowserFragment.java
+++ b/src/main/java/org/lineageos/eleven/ui/fragments/phone/MusicBrowserFragment.java
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.ui.fragments.phone;
+package org.lineageos.eleven.ui.fragments.phone;
 
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
diff --git a/src/main/java/com/cyanogenmod/eleven/ui/fragments/phone/MusicBrowserPhoneFragment.java b/src/main/java/org/lineageos/eleven/ui/fragments/phone/MusicBrowserPhoneFragment.java
similarity index 92%
rename from src/main/java/com/cyanogenmod/eleven/ui/fragments/phone/MusicBrowserPhoneFragment.java
rename to src/main/java/org/lineageos/eleven/ui/fragments/phone/MusicBrowserPhoneFragment.java
index 6eba07d..d5a92bb 100644
--- a/src/main/java/com/cyanogenmod/eleven/ui/fragments/phone/MusicBrowserPhoneFragment.java
+++ b/src/main/java/org/lineageos/eleven/ui/fragments/phone/MusicBrowserPhoneFragment.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.ui.fragments.phone;
+package org.lineageos.eleven.ui.fragments.phone;
 
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
@@ -20,18 +20,18 @@
 import android.view.MenuInflater;
 import android.view.MenuItem;
 
-import com.cyanogenmod.eleven.R;
-import com.cyanogenmod.eleven.adapters.PagerAdapter;
-import com.cyanogenmod.eleven.adapters.PagerAdapter.MusicFragments;
-import com.cyanogenmod.eleven.menu.CreateNewPlaylist;
-import com.cyanogenmod.eleven.ui.fragments.AlbumFragment;
-import com.cyanogenmod.eleven.ui.fragments.ArtistFragment;
-import com.cyanogenmod.eleven.ui.fragments.BaseFragment;
-import com.cyanogenmod.eleven.ui.fragments.SongFragment;
-import com.cyanogenmod.eleven.utils.MusicUtils;
-import com.cyanogenmod.eleven.utils.PreferenceUtils;
-import com.cyanogenmod.eleven.utils.SortOrder;
-import com.cyanogenmod.eleven.widgets.ViewPagerTabs;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.adapters.PagerAdapter;
+import org.lineageos.eleven.adapters.PagerAdapter.MusicFragments;
+import org.lineageos.eleven.menu.CreateNewPlaylist;
+import org.lineageos.eleven.ui.fragments.AlbumFragment;
+import org.lineageos.eleven.ui.fragments.ArtistFragment;
+import org.lineageos.eleven.ui.fragments.BaseFragment;
+import org.lineageos.eleven.ui.fragments.SongFragment;
+import org.lineageos.eleven.utils.MusicUtils;
+import org.lineageos.eleven.utils.PreferenceUtils;
+import org.lineageos.eleven.utils.SortOrder;
+import org.lineageos.eleven.widgets.ViewPagerTabs;
 
 /**
  * This class is used to hold the {@link ViewPager} used for swiping between the
@@ -40,9 +40,7 @@
  * 
  * @NOTE: The reason the sort orders are taken care of in this fragment rather
  *        than the individual fragments is to keep from showing all of the menu
- *        items on tablet interfaces. That being said, I have a tablet interface
- *        worked out, but I'm going to keep it in the Play Store version of
- *        Apollo for a couple of weeks or so before merging it with CM.
+ *        items on tablet interfaces.
  * @author Andrew Neal (andrewdneal@gmail.com)
  */
 public class MusicBrowserPhoneFragment extends BaseFragment {
diff --git a/src/main/java/com/cyanogenmod/eleven/ui/fragments/profile/BasicSongFragment.java b/src/main/java/org/lineageos/eleven/ui/fragments/profile/BasicSongFragment.java
similarity index 91%
rename from src/main/java/com/cyanogenmod/eleven/ui/fragments/profile/BasicSongFragment.java
rename to src/main/java/org/lineageos/eleven/ui/fragments/profile/BasicSongFragment.java
index 075a5ac..c9b4734 100644
--- a/src/main/java/com/cyanogenmod/eleven/ui/fragments/profile/BasicSongFragment.java
+++ b/src/main/java/org/lineageos/eleven/ui/fragments/profile/BasicSongFragment.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.ui.fragments.profile;
+package org.lineageos.eleven.ui.fragments.profile;
 
 import android.os.Bundle;
 import android.os.SystemClock;
@@ -28,22 +28,22 @@
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.ListView;
 
-import com.cyanogenmod.eleven.Config;
-import com.cyanogenmod.eleven.MusicStateListener;
-import com.cyanogenmod.eleven.R;
-import com.cyanogenmod.eleven.adapters.SongAdapter;
-import com.cyanogenmod.eleven.model.Song;
-import com.cyanogenmod.eleven.recycler.RecycleHolder;
-import com.cyanogenmod.eleven.sectionadapter.SectionAdapter;
-import com.cyanogenmod.eleven.sectionadapter.SectionListContainer;
-import com.cyanogenmod.eleven.service.MusicPlaybackTrack;
-import com.cyanogenmod.eleven.ui.activities.BaseActivity;
-import com.cyanogenmod.eleven.utils.MusicUtils;
-import com.cyanogenmod.eleven.utils.PopupMenuHelper;
-import com.cyanogenmod.eleven.utils.SongPopupMenuHelper;
-import com.cyanogenmod.eleven.widgets.IPopupMenuCallback;
-import com.cyanogenmod.eleven.widgets.LoadingEmptyContainer;
-import com.cyanogenmod.eleven.widgets.NoResultsContainer;
+import org.lineageos.eleven.Config;
+import org.lineageos.eleven.MusicStateListener;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.adapters.SongAdapter;
+import org.lineageos.eleven.model.Song;
+import org.lineageos.eleven.recycler.RecycleHolder;
+import org.lineageos.eleven.sectionadapter.SectionAdapter;
+import org.lineageos.eleven.sectionadapter.SectionListContainer;
+import org.lineageos.eleven.service.MusicPlaybackTrack;
+import org.lineageos.eleven.ui.activities.BaseActivity;
+import org.lineageos.eleven.utils.MusicUtils;
+import org.lineageos.eleven.utils.PopupMenuHelper;
+import org.lineageos.eleven.utils.SongPopupMenuHelper;
+import org.lineageos.eleven.widgets.IPopupMenuCallback;
+import org.lineageos.eleven.widgets.LoadingEmptyContainer;
+import org.lineageos.eleven.widgets.NoResultsContainer;
 
 import java.util.TreeSet;
 
diff --git a/src/main/java/com/cyanogenmod/eleven/ui/fragments/profile/LastAddedFragment.java b/src/main/java/org/lineageos/eleven/ui/fragments/profile/LastAddedFragment.java
similarity index 80%
rename from src/main/java/com/cyanogenmod/eleven/ui/fragments/profile/LastAddedFragment.java
rename to src/main/java/org/lineageos/eleven/ui/fragments/profile/LastAddedFragment.java
index 87300d9..8e96489 100644
--- a/src/main/java/com/cyanogenmod/eleven/ui/fragments/profile/LastAddedFragment.java
+++ b/src/main/java/org/lineageos/eleven/ui/fragments/profile/LastAddedFragment.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.ui.fragments.profile;
+package org.lineageos.eleven.ui.fragments.profile;
 
 import android.os.Bundle;
 import android.support.v4.content.Loader;
@@ -19,17 +19,17 @@
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.cyanogenmod.eleven.Config;
-import com.cyanogenmod.eleven.Config.SmartPlaylistType;
-import com.cyanogenmod.eleven.R;
-import com.cyanogenmod.eleven.loaders.LastAddedLoader;
-import com.cyanogenmod.eleven.model.Song;
-import com.cyanogenmod.eleven.sectionadapter.SectionCreator;
-import com.cyanogenmod.eleven.sectionadapter.SectionListContainer;
-import com.cyanogenmod.eleven.ui.activities.BaseActivity;
-import com.cyanogenmod.eleven.ui.fragments.ISetupActionBar;
-import com.cyanogenmod.eleven.utils.MusicUtils;
-import com.cyanogenmod.eleven.widgets.NoResultsContainer;
+import org.lineageos.eleven.Config;
+import org.lineageos.eleven.Config.SmartPlaylistType;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.loaders.LastAddedLoader;
+import org.lineageos.eleven.model.Song;
+import org.lineageos.eleven.sectionadapter.SectionCreator;
+import org.lineageos.eleven.sectionadapter.SectionListContainer;
+import org.lineageos.eleven.ui.activities.BaseActivity;
+import org.lineageos.eleven.ui.fragments.ISetupActionBar;
+import org.lineageos.eleven.utils.MusicUtils;
+import org.lineageos.eleven.widgets.NoResultsContainer;
 
 /**
  * This class is used to display all of the songs the user put on their device
diff --git a/src/main/java/com/cyanogenmod/eleven/ui/fragments/profile/SmartPlaylistFragment.java b/src/main/java/org/lineageos/eleven/ui/fragments/profile/SmartPlaylistFragment.java
similarity index 88%
rename from src/main/java/com/cyanogenmod/eleven/ui/fragments/profile/SmartPlaylistFragment.java
rename to src/main/java/org/lineageos/eleven/ui/fragments/profile/SmartPlaylistFragment.java
index d837b3a..92962dc 100644
--- a/src/main/java/com/cyanogenmod/eleven/ui/fragments/profile/SmartPlaylistFragment.java
+++ b/src/main/java/org/lineageos/eleven/ui/fragments/profile/SmartPlaylistFragment.java
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.ui.fragments.profile;
+package org.lineageos.eleven.ui.fragments.profile;
 
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -23,17 +23,17 @@
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.cyanogenmod.eleven.Config.SmartPlaylistType;
-import com.cyanogenmod.eleven.Config;
-import com.cyanogenmod.eleven.R;
-import com.cyanogenmod.eleven.adapters.PagerAdapter;
-import com.cyanogenmod.eleven.menu.ConfirmDialog;
-import com.cyanogenmod.eleven.model.Playlist;
-import com.cyanogenmod.eleven.ui.fragments.IChildFragment;
-import com.cyanogenmod.eleven.utils.MusicUtils;
-import com.cyanogenmod.eleven.utils.PlaylistPopupMenuHelper;
-import com.cyanogenmod.eleven.utils.PopupMenuHelper;
-import com.cyanogenmod.eleven.utils.PopupMenuHelper.PopupMenuType;
+import org.lineageos.eleven.Config.SmartPlaylistType;
+import org.lineageos.eleven.Config;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.adapters.PagerAdapter;
+import org.lineageos.eleven.menu.ConfirmDialog;
+import org.lineageos.eleven.model.Playlist;
+import org.lineageos.eleven.ui.fragments.IChildFragment;
+import org.lineageos.eleven.utils.MusicUtils;
+import org.lineageos.eleven.utils.PlaylistPopupMenuHelper;
+import org.lineageos.eleven.utils.PopupMenuHelper;
+import org.lineageos.eleven.utils.PopupMenuHelper.PopupMenuType;
 
 public abstract class SmartPlaylistFragment extends BasicSongFragment
         implements ConfirmDialog.ConfirmCallback, IChildFragment {
diff --git a/src/main/java/com/cyanogenmod/eleven/ui/fragments/profile/TopTracksFragment.java b/src/main/java/org/lineageos/eleven/ui/fragments/profile/TopTracksFragment.java
similarity index 83%
rename from src/main/java/com/cyanogenmod/eleven/ui/fragments/profile/TopTracksFragment.java
rename to src/main/java/org/lineageos/eleven/ui/fragments/profile/TopTracksFragment.java
index 1d71316..f6adc10 100644
--- a/src/main/java/com/cyanogenmod/eleven/ui/fragments/profile/TopTracksFragment.java
+++ b/src/main/java/org/lineageos/eleven/ui/fragments/profile/TopTracksFragment.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.ui.fragments.profile;
+package org.lineageos.eleven.ui.fragments.profile;
 
 import android.app.Activity;
 import android.os.Bundle;
@@ -21,18 +21,18 @@
 import android.view.ViewGroup;
 import android.widget.TextView;
 
-import com.cyanogenmod.eleven.Config;
-import com.cyanogenmod.eleven.Config.SmartPlaylistType;
-import com.cyanogenmod.eleven.R;
-import com.cyanogenmod.eleven.adapters.SongAdapter;
-import com.cyanogenmod.eleven.loaders.TopTracksLoader;
-import com.cyanogenmod.eleven.model.Song;
-import com.cyanogenmod.eleven.sectionadapter.SectionCreator;
-import com.cyanogenmod.eleven.sectionadapter.SectionListContainer;
-import com.cyanogenmod.eleven.ui.activities.BaseActivity;
-import com.cyanogenmod.eleven.ui.fragments.ISetupActionBar;
-import com.cyanogenmod.eleven.utils.MusicUtils;
-import com.cyanogenmod.eleven.widgets.NoResultsContainer;
+import org.lineageos.eleven.Config;
+import org.lineageos.eleven.Config.SmartPlaylistType;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.adapters.SongAdapter;
+import org.lineageos.eleven.loaders.TopTracksLoader;
+import org.lineageos.eleven.model.Song;
+import org.lineageos.eleven.sectionadapter.SectionCreator;
+import org.lineageos.eleven.sectionadapter.SectionListContainer;
+import org.lineageos.eleven.ui.activities.BaseActivity;
+import org.lineageos.eleven.ui.fragments.ISetupActionBar;
+import org.lineageos.eleven.utils.MusicUtils;
+import org.lineageos.eleven.widgets.NoResultsContainer;
 
 /**
  * This class is used to display all of the songs the user put on their device
diff --git a/src/main/java/com/cyanogenmod/eleven/utils/AlbumPopupMenuHelper.java b/src/main/java/org/lineageos/eleven/utils/AlbumPopupMenuHelper.java
similarity index 90%
rename from src/main/java/com/cyanogenmod/eleven/utils/AlbumPopupMenuHelper.java
rename to src/main/java/org/lineageos/eleven/utils/AlbumPopupMenuHelper.java
index 5d47393..d565b50 100644
--- a/src/main/java/com/cyanogenmod/eleven/utils/AlbumPopupMenuHelper.java
+++ b/src/main/java/org/lineageos/eleven/utils/AlbumPopupMenuHelper.java
@@ -13,19 +13,19 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.utils;
+package org.lineageos.eleven.utils;
 
 import android.app.Activity;
 import android.provider.MediaStore;
 import android.support.v4.app.FragmentManager;
 
 import android.view.MenuItem;
-import com.cyanogenmod.eleven.Config;
-import com.cyanogenmod.eleven.cache.ImageFetcher;
-import com.cyanogenmod.eleven.menu.DeleteDialog;
-import com.cyanogenmod.eleven.menu.FragmentMenuItems;
-import com.cyanogenmod.eleven.menu.PhotoSelectionDialog;
-import com.cyanogenmod.eleven.model.Album;
+import org.lineageos.eleven.Config;
+import org.lineageos.eleven.cache.ImageFetcher;
+import org.lineageos.eleven.menu.DeleteDialog;
+import org.lineageos.eleven.menu.FragmentMenuItems;
+import org.lineageos.eleven.menu.PhotoSelectionDialog;
+import org.lineageos.eleven.model.Album;
 
 import java.util.TreeSet;
 
diff --git a/src/main/java/com/cyanogenmod/eleven/utils/ArtistPopupMenuHelper.java b/src/main/java/org/lineageos/eleven/utils/ArtistPopupMenuHelper.java
similarity index 89%
rename from src/main/java/com/cyanogenmod/eleven/utils/ArtistPopupMenuHelper.java
rename to src/main/java/org/lineageos/eleven/utils/ArtistPopupMenuHelper.java
index 7e88662..301acff 100644
--- a/src/main/java/com/cyanogenmod/eleven/utils/ArtistPopupMenuHelper.java
+++ b/src/main/java/org/lineageos/eleven/utils/ArtistPopupMenuHelper.java
@@ -13,17 +13,17 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.utils;
+package org.lineageos.eleven.utils;
 
 import android.app.Activity;
 import android.support.v4.app.FragmentManager;
 
 import android.view.MenuItem;
-import com.cyanogenmod.eleven.Config;
-import com.cyanogenmod.eleven.menu.DeleteDialog;
-import com.cyanogenmod.eleven.menu.FragmentMenuItems;
-import com.cyanogenmod.eleven.menu.PhotoSelectionDialog;
-import com.cyanogenmod.eleven.model.Artist;
+import org.lineageos.eleven.Config;
+import org.lineageos.eleven.menu.DeleteDialog;
+import org.lineageos.eleven.menu.FragmentMenuItems;
+import org.lineageos.eleven.menu.PhotoSelectionDialog;
+import org.lineageos.eleven.model.Artist;
 
 public abstract class ArtistPopupMenuHelper extends PopupMenuHelper {
     private Artist mArtist;
diff --git a/src/main/java/com/cyanogenmod/eleven/utils/BitmapUtils.java b/src/main/java/org/lineageos/eleven/utils/BitmapUtils.java
similarity index 99%
rename from src/main/java/com/cyanogenmod/eleven/utils/BitmapUtils.java
rename to src/main/java/org/lineageos/eleven/utils/BitmapUtils.java
index 4f590b5..12cd4aa 100644
--- a/src/main/java/com/cyanogenmod/eleven/utils/BitmapUtils.java
+++ b/src/main/java/org/lineageos/eleven/utils/BitmapUtils.java
@@ -11,9 +11,8 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.utils;
+package org.lineageos.eleven.utils;
 
-import java.lang.reflect.Method;
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
@@ -25,6 +24,8 @@
 import android.support.v7.view.menu.MenuPresenter;
 import android.support.v7.widget.AppCompatDrawableManager;
 
+import java.lang.reflect.Method;
+
 /**
  * {@link Bitmap} specific helpers.
  *
diff --git a/src/main/java/com/cyanogenmod/eleven/utils/BitmapWithColors.java b/src/main/java/org/lineageos/eleven/utils/BitmapWithColors.java
similarity index 99%
rename from src/main/java/com/cyanogenmod/eleven/utils/BitmapWithColors.java
rename to src/main/java/org/lineageos/eleven/utils/BitmapWithColors.java
index b3a9962..c493f3c 100644
--- a/src/main/java/com/cyanogenmod/eleven/utils/BitmapWithColors.java
+++ b/src/main/java/org/lineageos/eleven/utils/BitmapWithColors.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License
  */
-package com.cyanogenmod.eleven.utils;
+package org.lineageos.eleven.utils;
 
 import android.graphics.Bitmap;
 import android.graphics.Color;
diff --git a/src/main/java/com/cyanogenmod/eleven/utils/ContextMenuBuilder.java b/src/main/java/org/lineageos/eleven/utils/ContextMenuBuilder.java
similarity index 99%
rename from src/main/java/com/cyanogenmod/eleven/utils/ContextMenuBuilder.java
rename to src/main/java/org/lineageos/eleven/utils/ContextMenuBuilder.java
index 990a3f4..3315fb3 100644
--- a/src/main/java/com/cyanogenmod/eleven/utils/ContextMenuBuilder.java
+++ b/src/main/java/org/lineageos/eleven/utils/ContextMenuBuilder.java
@@ -1,4 +1,4 @@
-package com.cyanogenmod.eleven.utils;
+package org.lineageos.eleven.utils;
 
 /*
  * Copyright (C) 2006 The Android Open Source Project
diff --git a/src/main/java/com/cyanogenmod/eleven/utils/CustomTypefaceSpan.java b/src/main/java/org/lineageos/eleven/utils/CustomTypefaceSpan.java
similarity index 96%
rename from src/main/java/com/cyanogenmod/eleven/utils/CustomTypefaceSpan.java
rename to src/main/java/org/lineageos/eleven/utils/CustomTypefaceSpan.java
index b794646..01cb73e 100644
--- a/src/main/java/com/cyanogenmod/eleven/utils/CustomTypefaceSpan.java
+++ b/src/main/java/org/lineageos/eleven/utils/CustomTypefaceSpan.java
@@ -1,4 +1,4 @@
-package com.cyanogenmod.eleven.utils;
+package org.lineageos.eleven.utils;
 
 import android.graphics.Paint;
 import android.graphics.Typeface;
diff --git a/src/main/java/com/cyanogenmod/eleven/utils/ApolloUtils.java b/src/main/java/org/lineageos/eleven/utils/ElevenUtils.java
similarity index 97%
rename from src/main/java/com/cyanogenmod/eleven/utils/ApolloUtils.java
rename to src/main/java/org/lineageos/eleven/utils/ElevenUtils.java
index d2e8c5e..f964c2d 100644
--- a/src/main/java/com/cyanogenmod/eleven/utils/ApolloUtils.java
+++ b/src/main/java/org/lineageos/eleven/utils/ElevenUtils.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.utils;
+package org.lineageos.eleven.utils;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
@@ -34,8 +34,8 @@
 import android.view.ViewTreeObserver.OnGlobalLayoutListener;
 import android.widget.Toast;
 
-import com.cyanogenmod.eleven.cache.ImageCache;
-import com.cyanogenmod.eleven.cache.ImageFetcher;
+import org.lineageos.eleven.cache.ImageCache;
+import org.lineageos.eleven.cache.ImageFetcher;
 
 import java.util.concurrent.RejectedExecutionHandler;
 import java.util.concurrent.ThreadPoolExecutor;
@@ -45,7 +45,7 @@
  *
  * @author Andrew Neal (andrewdneal@gmail.com)
  */
-public final class ApolloUtils {
+public final class ElevenUtils {
 
     /**
      * The threshold used calculate if a color is light or dark
@@ -69,13 +69,13 @@ public void rejectedExecution(Runnable r, ThreadPoolExecutor e) {
     };
 
     static {
-		((ThreadPoolExecutor)AsyncTask.THREAD_POOL_EXECUTOR).setRejectedExecutionHandler(
+        ((ThreadPoolExecutor)AsyncTask.THREAD_POOL_EXECUTOR).setRejectedExecutionHandler(
                 new PurgePolicy()
         );
     }
 
     /* This class is never initiated */
-    public ApolloUtils() {
+    public ElevenUtils() {
     }
 
     /**
diff --git a/src/main/java/com/cyanogenmod/eleven/utils/GenreFetcher.java b/src/main/java/org/lineageos/eleven/utils/GenreFetcher.java
similarity index 98%
rename from src/main/java/com/cyanogenmod/eleven/utils/GenreFetcher.java
rename to src/main/java/org/lineageos/eleven/utils/GenreFetcher.java
index bef40fb..6d8e5df 100644
--- a/src/main/java/com/cyanogenmod/eleven/utils/GenreFetcher.java
+++ b/src/main/java/org/lineageos/eleven/utils/GenreFetcher.java
@@ -1,4 +1,4 @@
-package com.cyanogenmod.eleven.utils;
+package org.lineageos.eleven.utils;
 
 import android.content.Context;
 import android.database.Cursor;
diff --git a/src/main/java/com/cyanogenmod/eleven/utils/ImageUtils.java b/src/main/java/org/lineageos/eleven/utils/ImageUtils.java
similarity index 98%
rename from src/main/java/com/cyanogenmod/eleven/utils/ImageUtils.java
rename to src/main/java/org/lineageos/eleven/utils/ImageUtils.java
index 69e0c0b..5c031e9 100644
--- a/src/main/java/com/cyanogenmod/eleven/utils/ImageUtils.java
+++ b/src/main/java/org/lineageos/eleven/utils/ImageUtils.java
@@ -13,17 +13,17 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.utils;
+package org.lineageos.eleven.utils;
 
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.widget.ImageView;
 
-import com.cyanogenmod.eleven.cache.ImageCache;
-import com.cyanogenmod.eleven.cache.ImageWorker;
-import com.cyanogenmod.eleven.lastfm.ImageSize;
-import com.cyanogenmod.eleven.lastfm.MusicEntry;
+import org.lineageos.eleven.cache.ImageCache;
+import org.lineageos.eleven.cache.ImageWorker;
+import org.lineageos.eleven.lastfm.ImageSize;
+import org.lineageos.eleven.lastfm.MusicEntry;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
diff --git a/src/main/java/com/cyanogenmod/eleven/utils/ListMenuPresenterHelper.java b/src/main/java/org/lineageos/eleven/utils/ListMenuPresenterHelper.java
similarity index 98%
rename from src/main/java/com/cyanogenmod/eleven/utils/ListMenuPresenterHelper.java
rename to src/main/java/org/lineageos/eleven/utils/ListMenuPresenterHelper.java
index 7fbd5c8..a42fad7 100644
--- a/src/main/java/com/cyanogenmod/eleven/utils/ListMenuPresenterHelper.java
+++ b/src/main/java/org/lineageos/eleven/utils/ListMenuPresenterHelper.java
@@ -1,4 +1,4 @@
-package com.cyanogenmod.eleven.utils;
+package org.lineageos.eleven.utils;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
diff --git a/src/main/java/com/cyanogenmod/eleven/utils/Lists.java b/src/main/java/org/lineageos/eleven/utils/Lists.java
similarity index 97%
rename from src/main/java/com/cyanogenmod/eleven/utils/Lists.java
rename to src/main/java/org/lineageos/eleven/utils/Lists.java
index 46bc773..ceca2a6 100644
--- a/src/main/java/com/cyanogenmod/eleven/utils/Lists.java
+++ b/src/main/java/org/lineageos/eleven/utils/Lists.java
@@ -9,7 +9,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.utils;
+package org.lineageos.eleven.utils;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/src/main/java/com/cyanogenmod/eleven/utils/MenuBuilderHelper.java b/src/main/java/org/lineageos/eleven/utils/MenuBuilderHelper.java
similarity index 99%
rename from src/main/java/com/cyanogenmod/eleven/utils/MenuBuilderHelper.java
rename to src/main/java/org/lineageos/eleven/utils/MenuBuilderHelper.java
index 209d0c1..e597aa5 100644
--- a/src/main/java/com/cyanogenmod/eleven/utils/MenuBuilderHelper.java
+++ b/src/main/java/org/lineageos/eleven/utils/MenuBuilderHelper.java
@@ -1,4 +1,4 @@
-package com.cyanogenmod.eleven.utils;
+package org.lineageos.eleven.utils;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
diff --git a/src/main/java/com/cyanogenmod/eleven/utils/MenuDialogHelper.java b/src/main/java/org/lineageos/eleven/utils/MenuDialogHelper.java
similarity index 98%
rename from src/main/java/com/cyanogenmod/eleven/utils/MenuDialogHelper.java
rename to src/main/java/org/lineageos/eleven/utils/MenuDialogHelper.java
index 8be7e8f..5a876d7 100644
--- a/src/main/java/com/cyanogenmod/eleven/utils/MenuDialogHelper.java
+++ b/src/main/java/org/lineageos/eleven/utils/MenuDialogHelper.java
@@ -1,4 +1,4 @@
-package com.cyanogenmod.eleven.utils;
+package org.lineageos.eleven.utils;
 
 /*
  * Copyright (C) 2013 The Android Open Source Project
@@ -29,7 +29,7 @@
 import android.view.Window;
 import android.view.WindowManager;
 
-import com.cyanogenmod.eleven.R;
+import org.lineageos.eleven.R;
 
 /**
  * Helper for menus that appear as Dialogs (context and submenus).
diff --git a/src/main/java/com/cyanogenmod/eleven/utils/MusicUtils.java b/src/main/java/org/lineageos/eleven/utils/MusicUtils.java
similarity index 96%
rename from src/main/java/com/cyanogenmod/eleven/utils/MusicUtils.java
rename to src/main/java/org/lineageos/eleven/utils/MusicUtils.java
index 8ab4c73..3cc52e1 100644
--- a/src/main/java/com/cyanogenmod/eleven/utils/MusicUtils.java
+++ b/src/main/java/org/lineageos/eleven/utils/MusicUtils.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.utils;
+package org.lineageos.eleven.utils;
 
 import android.app.Activity;
 import android.content.ComponentName;
@@ -25,6 +25,7 @@
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.AsyncTask;
+import android.os.Build;
 import android.os.IBinder;
 import android.os.RemoteException;
 import android.os.SystemClock;
@@ -41,26 +42,26 @@
 import android.view.Menu;
 import android.widget.Toast;
 
-import com.cyanogenmod.eleven.Config.IdType;
-import com.cyanogenmod.eleven.Config.SmartPlaylistType;
-import com.cyanogenmod.eleven.IElevenService;
-import com.cyanogenmod.eleven.MusicPlaybackService;
-import com.cyanogenmod.eleven.R;
-import com.cyanogenmod.eleven.cache.ImageFetcher;
-import com.cyanogenmod.eleven.loaders.LastAddedLoader;
-import com.cyanogenmod.eleven.loaders.PlaylistLoader;
-import com.cyanogenmod.eleven.loaders.PlaylistSongLoader;
-import com.cyanogenmod.eleven.loaders.SongLoader;
-import com.cyanogenmod.eleven.loaders.TopTracksLoader;
-import com.cyanogenmod.eleven.locale.LocaleUtils;
-import com.cyanogenmod.eleven.menu.FragmentMenuItems;
-import com.cyanogenmod.eleven.model.Album;
-import com.cyanogenmod.eleven.model.AlbumArtistDetails;
-import com.cyanogenmod.eleven.model.Artist;
-import com.cyanogenmod.eleven.model.Song;
-import com.cyanogenmod.eleven.provider.RecentStore;
-import com.cyanogenmod.eleven.provider.SongPlayCount;
-import com.cyanogenmod.eleven.service.MusicPlaybackTrack;
+import org.lineageos.eleven.Config.IdType;
+import org.lineageos.eleven.Config.SmartPlaylistType;
+import org.lineageos.eleven.IElevenService;
+import org.lineageos.eleven.MusicPlaybackService;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.cache.ImageFetcher;
+import org.lineageos.eleven.loaders.LastAddedLoader;
+import org.lineageos.eleven.loaders.PlaylistLoader;
+import org.lineageos.eleven.loaders.PlaylistSongLoader;
+import org.lineageos.eleven.loaders.SongLoader;
+import org.lineageos.eleven.loaders.TopTracksLoader;
+import org.lineageos.eleven.locale.LocaleUtils;
+import org.lineageos.eleven.menu.FragmentMenuItems;
+import org.lineageos.eleven.model.Album;
+import org.lineageos.eleven.model.AlbumArtistDetails;
+import org.lineageos.eleven.model.Artist;
+import org.lineageos.eleven.model.Song;
+import org.lineageos.eleven.provider.RecentStore;
+import org.lineageos.eleven.provider.SongPlayCount;
+import org.lineageos.eleven.service.MusicPlaybackTrack;
 
 import java.io.File;
 import java.util.Arrays;
@@ -69,7 +70,7 @@
 import java.util.WeakHashMap;
 
 /**
- * A collection of helpers directly related to music or Apollo's service.
+ * A collection of helpers directly related to music or Eleven's service.
  *
  * @author Andrew Neal (andrewdneal@gmail.com)
  */
@@ -1199,10 +1200,22 @@ public static void setRingtone(final Context context, final long id) {
         try {
             if (cursor != null && cursor.getCount() == 1) {
                 cursor.moveToFirst();
-                Settings.System.putString(resolver, Settings.System.RINGTONE, uri.toString());
-                final String message = context.getString(R.string.set_as_ringtone,
-                        cursor.getString(2));
-                Toast.makeText((Activity)context, message, Toast.LENGTH_SHORT).show();
+                // Check since M whether has the write settings permission or not.
+                boolean settingsCanWrite = true; 
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M){
+                    settingsCanWrite = Settings.System.canWrite(context);
+                    if (!settingsCanWrite) {
+                        // If do not have write settings permission then open the Can modify system settings panel.
+                        Intent intent = new Intent(Settings.ACTION_MANAGE_WRITE_SETTINGS);
+                        context.startActivity(intent);
+                    }
+                }
+                if ( settingsCanWrite ) {
+                    Settings.System.putString(resolver, Settings.System.RINGTONE, uri.toString());
+                    final String message = context.getString(R.string.set_as_ringtone,
+                            cursor.getString(2));
+                    Toast.makeText((Activity)context, message, Toast.LENGTH_SHORT).show();
+                }
             }
         } finally {
             if (cursor != null) {
@@ -1499,8 +1512,7 @@ public static void seekRelative(final long deltaInMs) {
             } catch (final IllegalStateException ignored) {
                 // Illegal State Exception message is empty so logging will actually throw an
                 // exception.  We should come back and figure out why we get an exception in the
-                // first place and make sure we understand it completely.  I will use
-                // https://cyanogen.atlassian.net/browse/MUSIC-125 to track investigating this more
+                // first place and make sure we understand it completely.
             }
         }
     }
@@ -1516,8 +1528,7 @@ public static final long position() {
             } catch (final IllegalStateException ex) {
                 // Illegal State Exception message is empty so logging will actually throw an
                 // exception.  We should come back and figure out why we get an exception in the
-                // first place and make sure we understand it completely.  I will use
-                // https://cyanogen.atlassian.net/browse/MUSIC-125 to track investigating this more
+                // first place and make sure we understand it completely.
             }
         }
         return 0;
@@ -1534,8 +1545,7 @@ public static final long duration() {
             } catch (final IllegalStateException ignored) {
                 // Illegal State Exception message is empty so logging will actually throw an
                 // exception.  We should come back and figure out why we get an exception in the
-                // first place and make sure we understand it completely.  I will use
-                // https://cyanogen.atlassian.net/browse/MUSIC-125 to track investigating this more
+                // first place and make sure we understand it completely.
             }
         }
         return 0;
@@ -1711,7 +1721,7 @@ public static boolean isBlank(String s) {
      * Removes the header image from the cache.
      */
     public static void removeFromCache(Activity activity, String key) {
-        ImageFetcher imageFetcher = ApolloUtils.getImageFetcher(activity);
+        ImageFetcher imageFetcher = ElevenUtils.getImageFetcher(activity);
         imageFetcher.removeFromCache(key);
         // Give the disk cache a little time before requesting a new image.
         SystemClock.sleep(80);
diff --git a/src/main/java/com/cyanogenmod/eleven/utils/NavUtils.java b/src/main/java/org/lineageos/eleven/utils/NavUtils.java
similarity index 93%
rename from src/main/java/com/cyanogenmod/eleven/utils/NavUtils.java
rename to src/main/java/org/lineageos/eleven/utils/NavUtils.java
index 31fa5b9..45db610 100644
--- a/src/main/java/com/cyanogenmod/eleven/utils/NavUtils.java
+++ b/src/main/java/org/lineageos/eleven/utils/NavUtils.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.utils;
+package org.lineageos.eleven.utils;
 
 import android.app.Activity;
 import android.app.SearchManager;
@@ -25,11 +25,11 @@
 import android.util.Log;
 import android.widget.Toast;
 
-import com.cyanogenmod.eleven.Config;
-import com.cyanogenmod.eleven.R;
-import com.cyanogenmod.eleven.ui.activities.HomeActivity;
-import com.cyanogenmod.eleven.ui.activities.SearchActivity;
-import com.cyanogenmod.eleven.ui.activities.SettingsActivity;
+import org.lineageos.eleven.Config;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.ui.activities.HomeActivity;
+import org.lineageos.eleven.ui.activities.SearchActivity;
+import org.lineageos.eleven.ui.activities.SettingsActivity;
 
 import java.util.List;
 
@@ -126,7 +126,7 @@ private static Intent createEffectsIntent() {
     }
 
     /**
-     * Opens the sound effects panel or DSP manager in CM
+     * Opens the sound effects panel AudioFX in LineageOS
      *
      * @param context The {@link Activity} to use.
      * @param requestCode The request code passed into startActivityForResult
@@ -161,7 +161,7 @@ public static void openSettings(final Activity activity) {
     }
 
     /**
-     * Opens to {@link com.cyanogenmod.eleven.ui.activities.SearchActivity}.
+     * Opens to {@link org.lineageos.eleven.ui.activities.SearchActivity}.
      *
      * @param activity The {@link Activity} to use.
      * @param query The search query.
@@ -175,7 +175,7 @@ public static void openSearch(final Activity activity, final String query) {
     }
 
     /**
-     * Opens to {@link com.cyanogenmod.eleven.ui.activities.HomeActivity}.
+     * Opens to {@link org.lineageos.eleven.ui.activities.HomeActivity}.
      *
      * @param activity The {@link Activity} to use.
      */
diff --git a/src/main/java/com/cyanogenmod/eleven/utils/PlaylistPopupMenuHelper.java b/src/main/java/org/lineageos/eleven/utils/PlaylistPopupMenuHelper.java
similarity index 95%
rename from src/main/java/com/cyanogenmod/eleven/utils/PlaylistPopupMenuHelper.java
rename to src/main/java/org/lineageos/eleven/utils/PlaylistPopupMenuHelper.java
index 376810f..6526c53 100644
--- a/src/main/java/com/cyanogenmod/eleven/utils/PlaylistPopupMenuHelper.java
+++ b/src/main/java/org/lineageos/eleven/utils/PlaylistPopupMenuHelper.java
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.utils;
+package org.lineageos.eleven.utils;
 
 import android.app.Activity;
 import android.support.v7.app.AlertDialog;
@@ -25,10 +25,10 @@
 import android.provider.MediaStore;
 import android.support.v4.app.FragmentManager;
 
-import com.cyanogenmod.eleven.Config;
-import com.cyanogenmod.eleven.Config.SmartPlaylistType;
-import com.cyanogenmod.eleven.R;
-import com.cyanogenmod.eleven.model.Playlist;
+import org.lineageos.eleven.Config;
+import org.lineageos.eleven.Config.SmartPlaylistType;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.model.Playlist;
 
 public abstract class PlaylistPopupMenuHelper extends PopupMenuHelper {
     private Playlist mPlaylist;
diff --git a/src/main/java/com/cyanogenmod/eleven/utils/PopupMenuHelper.java b/src/main/java/org/lineageos/eleven/utils/PopupMenuHelper.java
similarity index 97%
rename from src/main/java/com/cyanogenmod/eleven/utils/PopupMenuHelper.java
rename to src/main/java/org/lineageos/eleven/utils/PopupMenuHelper.java
index 50de019..bc28971 100644
--- a/src/main/java/com/cyanogenmod/eleven/utils/PopupMenuHelper.java
+++ b/src/main/java/org/lineageos/eleven/utils/PopupMenuHelper.java
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.utils;
+package org.lineageos.eleven.utils;
 
 import android.app.Activity;
 import android.graphics.Typeface;
@@ -27,13 +27,13 @@
 import android.text.Spannable;
 import android.text.SpannableString;
 
-import com.cyanogenmod.eleven.Config;
-import com.cyanogenmod.eleven.R;
-import com.cyanogenmod.eleven.menu.CreateNewPlaylist;
-import com.cyanogenmod.eleven.menu.FragmentMenuItems;
-import com.cyanogenmod.eleven.menu.RenamePlaylist;
-import com.cyanogenmod.eleven.provider.RecentStore;
-import com.cyanogenmod.eleven.widgets.Roboto;
+import org.lineageos.eleven.Config;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.menu.CreateNewPlaylist;
+import org.lineageos.eleven.menu.FragmentMenuItems;
+import org.lineageos.eleven.menu.RenamePlaylist;
+import org.lineageos.eleven.provider.RecentStore;
+import org.lineageos.eleven.widgets.Roboto;
 
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
@@ -84,7 +84,7 @@ public void showPopupMenu(final View view, final int position) {
         if (mType != null) {
             // inflate the menu
             createPopupMenu(menu);
-            
+
             if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN){
                 Menu m = popupMenu.getMenu();
                 for (int i = 0; i < m.size(); i++) {
@@ -95,7 +95,7 @@ public void showPopupMenu(final View view, final int position) {
                     mi.setTitle(mNewTitle);            
                 }
             }
-            
+
             // show it
             popupMenu.show();
         }
@@ -357,7 +357,7 @@ public boolean onMenuItemClick(MenuItem item) {
                     ContextMenuBuilder builder = new ContextMenuBuilder(mActivity);
                     MusicUtils.makePlaylistMenu(mActivity, getGroupId(), builder);
                     builder.setHeaderTitle(R.string.add_to_playlist);
-                    
+
                     builder.setCallback((MenuBuilder.Callback) Proxy.newProxyInstance(
                     		MenuBuilder.Callback.class.getClassLoader(),
                                 new Class[] { MenuBuilder.Callback.class },
diff --git a/src/main/java/com/cyanogenmod/eleven/utils/PreferenceUtils.java b/src/main/java/org/lineageos/eleven/utils/PreferenceUtils.java
similarity index 93%
rename from src/main/java/com/cyanogenmod/eleven/utils/PreferenceUtils.java
rename to src/main/java/org/lineageos/eleven/utils/PreferenceUtils.java
index 5b1a294..30689e1 100644
--- a/src/main/java/com/cyanogenmod/eleven/utils/PreferenceUtils.java
+++ b/src/main/java/org/lineageos/eleven/utils/PreferenceUtils.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.utils;
+package org.lineageos.eleven.utils;
 
 import android.Manifest.permission;
 import android.app.Activity;
@@ -25,15 +25,15 @@
 import android.support.v4.app.ActivityCompat;
 import android.support.v4.content.ContextCompat;
 
-import com.cyanogenmod.eleven.R;
-import com.cyanogenmod.eleven.ui.fragments.AlbumFragment;
-import com.cyanogenmod.eleven.ui.fragments.ArtistFragment;
-import com.cyanogenmod.eleven.ui.fragments.SongFragment;
-import com.cyanogenmod.eleven.ui.fragments.phone.MusicBrowserPhoneFragment;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.ui.fragments.AlbumFragment;
+import org.lineageos.eleven.ui.fragments.ArtistFragment;
+import org.lineageos.eleven.ui.fragments.SongFragment;
+import org.lineageos.eleven.ui.fragments.phone.MusicBrowserPhoneFragment;
 
 /**
  * A collection of helpers designed to get and set various preferences across
- * Apollo.
+ * Eleven.
  *
  * @author Andrew Neal (andrewdneal@gmail.com)
  */
@@ -123,7 +123,7 @@ public static final PreferenceUtils getInstance(final Context context) {
      *            in {@link MusicBrowserPhoneFragment}.
      */
     public void setStartPage(final int value) {
-        ApolloUtils.execute(false, new AsyncTask<Void, Void, Void>() {
+        ElevenUtils.execute(false, new AsyncTask<Void, Void, Void>() {
             @Override
             protected Void doInBackground(final Void... unused) {
                 final SharedPreferences.Editor editor = mPreferences.edit();
@@ -158,7 +158,7 @@ public final int getStartPage() {
      * @param value The new theme color to use.
      */
     public void setDefaultThemeColor(final int value) {
-        ApolloUtils.execute(false, new AsyncTask<Void, Void, Void>() {
+        ElevenUtils.execute(false, new AsyncTask<Void, Void, Void>() {
             @Override
             protected Void doInBackground(final Void... unused) {
                 final SharedPreferences.Editor editor = mPreferences.edit();
@@ -178,7 +178,7 @@ protected Void doInBackground(final Void... unused) {
      */
     public final int getDefaultThemeColor(final Context context) {
         return mPreferences.getInt(DEFAULT_THEME_COLOR,
-        		ContextCompat.getColor(context, R.color.blue));
+                ContextCompat.getColor(context, R.color.blue));
     }
 
     /**
@@ -212,7 +212,7 @@ public final boolean downloadMissingArtistImages() {
      * @param value The new sort order
      */
     private void setSortOrder(final String key, final String value) {
-        ApolloUtils.execute(false, new AsyncTask<Void, Void, Void>() {
+        ElevenUtils.execute(false, new AsyncTask<Void, Void, Void>() {
             @Override
             protected Void doInBackground(final Void... unused) {
                 final SharedPreferences.Editor editor = mPreferences.edit();
@@ -269,7 +269,7 @@ public void setArtistAlbumSortOrder(final String value) {
 
     /**
      * @return The sort order used for the artist album list in
-     *         {@link com.cyanogenmod.eleven.ui.fragments.ArtistDetailFragment}
+     *         {@link org.lineageos.eleven.ui.fragments.ArtistDetailFragment}
      */
     public final String getArtistAlbumSortOrder() {
         return mPreferences.getString(ARTIST_ALBUM_SORT_ORDER,
@@ -343,12 +343,12 @@ public final boolean getShowLyrics() {
     }
 
     public static boolean canRecordAudio(Activity activity) {
-    	return (ContextCompat.checkSelfPermission(activity,permission.RECORD_AUDIO) ==
+        return (ContextCompat.checkSelfPermission(activity,permission.RECORD_AUDIO) ==
                 PackageManager.PERMISSION_GRANTED);
     }
 
     public static void requestRecordAudio(Activity activity) {
-    	ActivityCompat.requestPermissions(activity,
+        ActivityCompat.requestPermissions(activity,
                 new String[] {permission.RECORD_AUDIO},
                 PERMISSION_REQUEST_RECORD_AUDIO);
     }
diff --git a/src/main/java/com/cyanogenmod/eleven/utils/SectionCreatorUtils.java b/src/main/java/org/lineageos/eleven/utils/SectionCreatorUtils.java
similarity index 98%
rename from src/main/java/com/cyanogenmod/eleven/utils/SectionCreatorUtils.java
rename to src/main/java/org/lineageos/eleven/utils/SectionCreatorUtils.java
index b0a380c..7c43d01 100644
--- a/src/main/java/com/cyanogenmod/eleven/utils/SectionCreatorUtils.java
+++ b/src/main/java/org/lineageos/eleven/utils/SectionCreatorUtils.java
@@ -13,17 +13,17 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.utils;
+package org.lineageos.eleven.utils;
 
 import android.content.Context;
 import android.text.TextUtils;
 
-import com.cyanogenmod.eleven.Config;
-import com.cyanogenmod.eleven.R;
-import com.cyanogenmod.eleven.model.Album;
-import com.cyanogenmod.eleven.model.Artist;
-import com.cyanogenmod.eleven.model.SearchResult;
-import com.cyanogenmod.eleven.model.Song;
+import org.lineageos.eleven.Config;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.model.Album;
+import org.lineageos.eleven.model.Artist;
+import org.lineageos.eleven.model.SearchResult;
+import org.lineageos.eleven.model.Song;
 
 import java.util.List;
 import java.util.TreeMap;
diff --git a/src/main/java/com/cyanogenmod/eleven/utils/ShakeDetector.java b/src/main/java/org/lineageos/eleven/utils/ShakeDetector.java
similarity index 99%
rename from src/main/java/com/cyanogenmod/eleven/utils/ShakeDetector.java
rename to src/main/java/org/lineageos/eleven/utils/ShakeDetector.java
index d0be70d..3a971f4 100644
--- a/src/main/java/com/cyanogenmod/eleven/utils/ShakeDetector.java
+++ b/src/main/java/org/lineageos/eleven/utils/ShakeDetector.java
@@ -1,5 +1,5 @@
 
-package com.cyanogenmod.eleven.utils;
+package org.lineageos.eleven.utils;
 
 /*
  * Copyright 2012 Square, Inc.
diff --git a/src/main/java/com/cyanogenmod/eleven/utils/SongPopupMenuHelper.java b/src/main/java/org/lineageos/eleven/utils/SongPopupMenuHelper.java
similarity index 91%
rename from src/main/java/com/cyanogenmod/eleven/utils/SongPopupMenuHelper.java
rename to src/main/java/org/lineageos/eleven/utils/SongPopupMenuHelper.java
index 17fc4d5..54f1e5a 100644
--- a/src/main/java/com/cyanogenmod/eleven/utils/SongPopupMenuHelper.java
+++ b/src/main/java/org/lineageos/eleven/utils/SongPopupMenuHelper.java
@@ -13,16 +13,16 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.utils;
+package org.lineageos.eleven.utils;
 
 
 import android.app.Activity;
 import android.provider.MediaStore;
 import android.support.v4.app.FragmentManager;
 
-import com.cyanogenmod.eleven.menu.DeleteDialog;
-import com.cyanogenmod.eleven.menu.FragmentMenuItems;
-import com.cyanogenmod.eleven.model.Song;
+import org.lineageos.eleven.menu.DeleteDialog;
+import org.lineageos.eleven.menu.FragmentMenuItems;
+import org.lineageos.eleven.model.Song;
 
 import java.util.TreeSet;
 
diff --git a/src/main/java/com/cyanogenmod/eleven/utils/SortOrder.java b/src/main/java/org/lineageos/eleven/utils/SortOrder.java
similarity index 99%
rename from src/main/java/com/cyanogenmod/eleven/utils/SortOrder.java
rename to src/main/java/org/lineageos/eleven/utils/SortOrder.java
index 6352a43..6ffe57f 100644
--- a/src/main/java/com/cyanogenmod/eleven/utils/SortOrder.java
+++ b/src/main/java/org/lineageos/eleven/utils/SortOrder.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.utils;
+package org.lineageos.eleven.utils;
 
 import android.provider.MediaStore;
 
diff --git a/src/main/java/com/cyanogenmod/eleven/utils/SrtManager.java b/src/main/java/org/lineageos/eleven/utils/SrtManager.java
similarity index 99%
rename from src/main/java/com/cyanogenmod/eleven/utils/SrtManager.java
rename to src/main/java/org/lineageos/eleven/utils/SrtManager.java
index ffa33dd..b9aec40 100644
--- a/src/main/java/com/cyanogenmod/eleven/utils/SrtManager.java
+++ b/src/main/java/org/lineageos/eleven/utils/SrtManager.java
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.utils;
+package org.lineageos.eleven.utils;
 
 import android.media.MediaPlayer;
 import android.os.Handler;
diff --git a/src/main/java/com/cyanogenmod/eleven/utils/SrtParser.java b/src/main/java/org/lineageos/eleven/utils/SrtParser.java
similarity index 99%
rename from src/main/java/com/cyanogenmod/eleven/utils/SrtParser.java
rename to src/main/java/org/lineageos/eleven/utils/SrtParser.java
index bace32a..351c7d0 100644
--- a/src/main/java/com/cyanogenmod/eleven/utils/SrtParser.java
+++ b/src/main/java/org/lineageos/eleven/utils/SrtParser.java
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.utils;
+package org.lineageos.eleven.utils;
 
 import android.text.TextUtils;
 import android.util.Log;
diff --git a/src/main/java/com/cyanogenmod/eleven/widgets/AlphaPatternDrawable.java b/src/main/java/org/lineageos/eleven/widgets/AlphaPatternDrawable.java
similarity index 99%
rename from src/main/java/com/cyanogenmod/eleven/widgets/AlphaPatternDrawable.java
rename to src/main/java/org/lineageos/eleven/widgets/AlphaPatternDrawable.java
index 9a410e1..24e50f6 100644
--- a/src/main/java/com/cyanogenmod/eleven/widgets/AlphaPatternDrawable.java
+++ b/src/main/java/org/lineageos/eleven/widgets/AlphaPatternDrawable.java
@@ -9,7 +9,7 @@
  * language governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.widgets;
+package org.lineageos.eleven.widgets;
 
 import android.graphics.Bitmap;
 import android.graphics.Bitmap.Config;
diff --git a/src/main/java/com/cyanogenmod/eleven/widgets/AlphaTouchInterceptorOverlay.java b/src/main/java/org/lineageos/eleven/widgets/AlphaTouchInterceptorOverlay.java
similarity index 98%
rename from src/main/java/com/cyanogenmod/eleven/widgets/AlphaTouchInterceptorOverlay.java
rename to src/main/java/org/lineageos/eleven/widgets/AlphaTouchInterceptorOverlay.java
index 1ea1d73..18f5118 100644
--- a/src/main/java/com/cyanogenmod/eleven/widgets/AlphaTouchInterceptorOverlay.java
+++ b/src/main/java/org/lineageos/eleven/widgets/AlphaTouchInterceptorOverlay.java
@@ -9,7 +9,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.widgets;
+package org.lineageos.eleven.widgets;
 
 import android.content.Context;
 import android.view.View;
diff --git a/src/main/java/com/cyanogenmod/eleven/widgets/AudioActivityButton.java b/src/main/java/org/lineageos/eleven/widgets/AudioActivityButton.java
similarity index 90%
rename from src/main/java/com/cyanogenmod/eleven/widgets/AudioActivityButton.java
rename to src/main/java/org/lineageos/eleven/widgets/AudioActivityButton.java
index bbc3345..483dbe8 100644
--- a/src/main/java/com/cyanogenmod/eleven/widgets/AudioActivityButton.java
+++ b/src/main/java/org/lineageos/eleven/widgets/AudioActivityButton.java
@@ -13,12 +13,12 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.widgets;
+package org.lineageos.eleven.widgets;
 import android.content.Context;
 import android.support.v4.app.FragmentActivity;
 import android.util.AttributeSet;
 
-import com.cyanogenmod.eleven.ui.activities.SlidingPanelActivity;
+import org.lineageos.eleven.ui.activities.SlidingPanelActivity;
 
 public abstract class AudioActivityButton extends AudioButton {
     protected SlidingPanelActivity mActivity;
diff --git a/src/main/java/com/cyanogenmod/eleven/widgets/AudioButton.java b/src/main/java/org/lineageos/eleven/widgets/AudioButton.java
similarity index 88%
rename from src/main/java/com/cyanogenmod/eleven/widgets/AudioButton.java
rename to src/main/java/org/lineageos/eleven/widgets/AudioButton.java
index a4e4491..2f75e6c 100644
--- a/src/main/java/com/cyanogenmod/eleven/widgets/AudioButton.java
+++ b/src/main/java/org/lineageos/eleven/widgets/AudioButton.java
@@ -1,4 +1,4 @@
-package com.cyanogenmod.eleven.widgets;
+package org.lineageos.eleven.widgets;
 
 import android.content.Context;
 import android.support.v4.content.ContextCompat;
@@ -10,8 +10,8 @@
 import android.view.View.OnLongClickListener;
 import android.support.v7.widget.AppCompatImageButton;
 
-import com.cyanogenmod.eleven.R;
-import com.cyanogenmod.eleven.utils.ApolloUtils;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.utils.ElevenUtils;
 
 public abstract class AudioButton extends AppCompatImageButton implements OnClickListener, OnLongClickListener {
     public static float ACTIVE_ALPHA = 1.0f;
@@ -37,7 +37,7 @@ public boolean onLongClick(final View view) {
         if (TextUtils.isEmpty(view.getContentDescription())) {
             return false;
         } else {
-            ApolloUtils.showCheatSheet(view);
+            ElevenUtils.showCheatSheet(view);
             return true;
         }
     }
diff --git a/src/main/java/com/cyanogenmod/eleven/widgets/BlurScrimImage.java b/src/main/java/org/lineageos/eleven/widgets/BlurScrimImage.java
similarity index 95%
rename from src/main/java/com/cyanogenmod/eleven/widgets/BlurScrimImage.java
rename to src/main/java/org/lineageos/eleven/widgets/BlurScrimImage.java
index 0914208..dfa32a3 100644
--- a/src/main/java/com/cyanogenmod/eleven/widgets/BlurScrimImage.java
+++ b/src/main/java/org/lineageos/eleven/widgets/BlurScrimImage.java
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.widgets;
+package org.lineageos.eleven.widgets;
 
 import android.content.Context;
 import android.graphics.Bitmap;
@@ -27,9 +27,9 @@
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 
-import com.cyanogenmod.eleven.R;
-import com.cyanogenmod.eleven.cache.ImageFetcher;
-import com.cyanogenmod.eleven.cache.ImageWorker;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.cache.ImageFetcher;
+import org.lineageos.eleven.cache.ImageWorker;
 
 public class BlurScrimImage extends FrameLayout {
     private ImageView mImageView;
diff --git a/src/main/java/com/cyanogenmod/eleven/widgets/BrowseButton.java b/src/main/java/org/lineageos/eleven/widgets/BrowseButton.java
similarity index 90%
rename from src/main/java/com/cyanogenmod/eleven/widgets/BrowseButton.java
rename to src/main/java/org/lineageos/eleven/widgets/BrowseButton.java
index 1bd74d8..1d7dece 100644
--- a/src/main/java/com/cyanogenmod/eleven/widgets/BrowseButton.java
+++ b/src/main/java/org/lineageos/eleven/widgets/BrowseButton.java
@@ -13,13 +13,13 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.widgets;
+package org.lineageos.eleven.widgets;
 
 import android.content.Context;
 import android.util.AttributeSet;
 import android.view.View;
 
-import com.cyanogenmod.eleven.ui.activities.SlidingPanelActivity;
+import org.lineageos.eleven.ui.activities.SlidingPanelActivity;
 
 public class BrowseButton extends AudioActivityButton {
 
diff --git a/src/main/java/com/cyanogenmod/eleven/widgets/ColorPanelView.java b/src/main/java/org/lineageos/eleven/widgets/ColorPanelView.java
similarity index 99%
rename from src/main/java/com/cyanogenmod/eleven/widgets/ColorPanelView.java
rename to src/main/java/org/lineageos/eleven/widgets/ColorPanelView.java
index 332d187..8e77bb0 100644
--- a/src/main/java/com/cyanogenmod/eleven/widgets/ColorPanelView.java
+++ b/src/main/java/org/lineageos/eleven/widgets/ColorPanelView.java
@@ -9,7 +9,7 @@
  * language governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.widgets;
+package org.lineageos.eleven.widgets;
 
 import android.content.Context;
 import android.graphics.Canvas;
diff --git a/src/main/java/com/cyanogenmod/eleven/widgets/ColorPickerView.java b/src/main/java/org/lineageos/eleven/widgets/ColorPickerView.java
similarity index 99%
rename from src/main/java/com/cyanogenmod/eleven/widgets/ColorPickerView.java
rename to src/main/java/org/lineageos/eleven/widgets/ColorPickerView.java
index dc034eb..1894e63 100644
--- a/src/main/java/com/cyanogenmod/eleven/widgets/ColorPickerView.java
+++ b/src/main/java/org/lineageos/eleven/widgets/ColorPickerView.java
@@ -9,7 +9,7 @@
  * language governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.widgets;
+package org.lineageos.eleven.widgets;
 
 import android.content.Context;
 import android.graphics.Canvas;
diff --git a/src/main/java/com/cyanogenmod/eleven/widgets/FrameLayoutWithOverlay.java b/src/main/java/org/lineageos/eleven/widgets/FrameLayoutWithOverlay.java
similarity index 98%
rename from src/main/java/com/cyanogenmod/eleven/widgets/FrameLayoutWithOverlay.java
rename to src/main/java/org/lineageos/eleven/widgets/FrameLayoutWithOverlay.java
index 071bdee..3a311f5 100644
--- a/src/main/java/com/cyanogenmod/eleven/widgets/FrameLayoutWithOverlay.java
+++ b/src/main/java/org/lineageos/eleven/widgets/FrameLayoutWithOverlay.java
@@ -9,7 +9,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.widgets;
+package org.lineageos.eleven.widgets;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/src/main/java/com/cyanogenmod/eleven/widgets/IPopupMenuCallback.java b/src/main/java/org/lineageos/eleven/widgets/IPopupMenuCallback.java
similarity index 95%
rename from src/main/java/com/cyanogenmod/eleven/widgets/IPopupMenuCallback.java
rename to src/main/java/org/lineageos/eleven/widgets/IPopupMenuCallback.java
index 2cad85d..a797175 100644
--- a/src/main/java/com/cyanogenmod/eleven/widgets/IPopupMenuCallback.java
+++ b/src/main/java/org/lineageos/eleven/widgets/IPopupMenuCallback.java
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.widgets;
+package org.lineageos.eleven.widgets;
 
 import android.view.View;
 
diff --git a/src/main/java/com/cyanogenmod/eleven/widgets/LayoutSuppressingImageView.java b/src/main/java/org/lineageos/eleven/widgets/LayoutSuppressingImageView.java
similarity index 97%
rename from src/main/java/com/cyanogenmod/eleven/widgets/LayoutSuppressingImageView.java
rename to src/main/java/org/lineageos/eleven/widgets/LayoutSuppressingImageView.java
index b7e9ccc..511aefb 100644
--- a/src/main/java/com/cyanogenmod/eleven/widgets/LayoutSuppressingImageView.java
+++ b/src/main/java/org/lineageos/eleven/widgets/LayoutSuppressingImageView.java
@@ -9,7 +9,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.widgets;
+package org.lineageos.eleven.widgets;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/src/main/java/com/cyanogenmod/eleven/widgets/LetterTileDrawable.java b/src/main/java/org/lineageos/eleven/widgets/LetterTileDrawable.java
similarity index 98%
rename from src/main/java/com/cyanogenmod/eleven/widgets/LetterTileDrawable.java
rename to src/main/java/org/lineageos/eleven/widgets/LetterTileDrawable.java
index 7f0cbd0..9f39a05 100644
--- a/src/main/java/com/cyanogenmod/eleven/widgets/LetterTileDrawable.java
+++ b/src/main/java/org/lineageos/eleven/widgets/LetterTileDrawable.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.eleven.widgets;
+package org.lineageos.eleven.widgets;
 
 import android.content.Context;
 import android.content.res.Resources;
@@ -33,10 +33,10 @@
 
 import junit.framework.Assert;
 
-import com.cyanogenmod.eleven.R;
-import com.cyanogenmod.eleven.cache.ImageWorker.ImageType;
-import com.cyanogenmod.eleven.utils.BitmapWithColors;
-import com.cyanogenmod.eleven.utils.MusicUtils;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.cache.ImageWorker.ImageType;
+import org.lineageos.eleven.utils.BitmapWithColors;
+import org.lineageos.eleven.utils.MusicUtils;
 
 /**
  * A drawable that encapsulates all the functionality needed to display a letter tile to
@@ -77,7 +77,7 @@ public class LetterTileDrawable extends Drawable {
 
     private static synchronized void initializeStaticVariables(final Context context) {
         Resources res = context.getResources();
-    	if (sColors == null) {
+        if (sColors == null) {
             sColors = res.obtainTypedArray(R.array.letter_tile_colors);
             sVibrantDarkColors = res.obtainTypedArray(R.array.letter_tile_vibrant_dark_colors);
             sDefaultColor = ContextCompat.getColor(context, R.color.letter_tile_default_color);
@@ -338,7 +338,7 @@ private static void drawBitmap(final Bitmap bitmap, final int width, final int h
     public static BitmapWithColors createDefaultBitmap(Context context, String identifier,
             ImageType type, boolean isCircle, boolean smallArtwork) {
         initializeStaticVariables(context);
-        
+
         identifier = MusicUtils.getTrimmedName(identifier);
 
         // get the default bitmap to determine what to draw to
diff --git a/src/main/java/com/cyanogenmod/eleven/widgets/LoadingEmptyContainer.java b/src/main/java/org/lineageos/eleven/widgets/LoadingEmptyContainer.java
similarity index 97%
rename from src/main/java/com/cyanogenmod/eleven/widgets/LoadingEmptyContainer.java
rename to src/main/java/org/lineageos/eleven/widgets/LoadingEmptyContainer.java
index 1e8d4c4..68970f4 100644
--- a/src/main/java/com/cyanogenmod/eleven/widgets/LoadingEmptyContainer.java
+++ b/src/main/java/org/lineageos/eleven/widgets/LoadingEmptyContainer.java
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.widgets;
+package org.lineageos.eleven.widgets;
 
 import android.content.Context;
 import android.os.Build;
@@ -24,7 +24,7 @@
 
 import java.lang.reflect.Method;
 
-import com.cyanogenmod.eleven.R;
+import org.lineageos.eleven.R;
 
 /**
  * This class is the default empty state view for most listviews/fragments
@@ -38,7 +38,7 @@ public class LoadingEmptyContainer extends FrameLayout {
     private Handler mHandler;
     private Runnable mShowLoadingRunnable;
 	private boolean hasCallbacks;
-	
+
     public LoadingEmptyContainer(Context context, AttributeSet attrs) {
         super(context, attrs);
 
diff --git a/src/main/java/com/cyanogenmod/eleven/widgets/NoResultsContainer.java b/src/main/java/org/lineageos/eleven/widgets/NoResultsContainer.java
similarity index 96%
rename from src/main/java/com/cyanogenmod/eleven/widgets/NoResultsContainer.java
rename to src/main/java/org/lineageos/eleven/widgets/NoResultsContainer.java
index 8da0d29..26b569b 100644
--- a/src/main/java/com/cyanogenmod/eleven/widgets/NoResultsContainer.java
+++ b/src/main/java/org/lineageos/eleven/widgets/NoResultsContainer.java
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.widgets;
+package org.lineageos.eleven.widgets;
 
 import android.content.Context;
 import android.util.AttributeSet;
@@ -21,7 +21,7 @@
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.cyanogenmod.eleven.R;
+import org.lineageos.eleven.R;
 
 /**
  * This class is the default empty state view for most listviews/fragments
diff --git a/src/main/java/com/cyanogenmod/eleven/widgets/PlayPauseButton.java b/src/main/java/org/lineageos/eleven/widgets/PlayPauseButton.java
similarity index 94%
rename from src/main/java/com/cyanogenmod/eleven/widgets/PlayPauseButton.java
rename to src/main/java/org/lineageos/eleven/widgets/PlayPauseButton.java
index 97dc94d..6b1b43e 100644
--- a/src/main/java/com/cyanogenmod/eleven/widgets/PlayPauseButton.java
+++ b/src/main/java/org/lineageos/eleven/widgets/PlayPauseButton.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.widgets;
+package org.lineageos.eleven.widgets;
 
 import android.animation.Animator;
 import android.content.Context;
@@ -25,9 +25,9 @@
 import android.view.View.OnLongClickListener;
 import android.support.v7.widget.AppCompatImageButton;
 
-import com.cyanogenmod.eleven.R;
-import com.cyanogenmod.eleven.utils.ApolloUtils;
-import com.cyanogenmod.eleven.utils.MusicUtils;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.utils.ElevenUtils;
+import org.lineageos.eleven.utils.MusicUtils;
 
 /**
  * A custom {@link AppCompatImageButton} that represents the "play and pause" button.
@@ -93,7 +93,7 @@ public boolean onLongClick(final View view) {
         if (TextUtils.isEmpty(view.getContentDescription())) {
             return false;
         } else {
-            ApolloUtils.showCheatSheet(view);
+            ElevenUtils.showCheatSheet(view);
             return true;
         }
     }
diff --git a/src/main/java/com/cyanogenmod/eleven/widgets/PlayPauseProgressButton.java b/src/main/java/org/lineageos/eleven/widgets/PlayPauseProgressButton.java
similarity index 98%
rename from src/main/java/com/cyanogenmod/eleven/widgets/PlayPauseProgressButton.java
rename to src/main/java/org/lineageos/eleven/widgets/PlayPauseProgressButton.java
index 8b8788f..9f4eb26 100644
--- a/src/main/java/com/cyanogenmod/eleven/widgets/PlayPauseProgressButton.java
+++ b/src/main/java/org/lineageos/eleven/widgets/PlayPauseProgressButton.java
@@ -14,7 +14,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.widgets;
+package org.lineageos.eleven.widgets;
 
 import android.content.Context;
 import android.util.AttributeSet;
@@ -24,8 +24,8 @@
 import android.widget.FrameLayout;
 import android.widget.ProgressBar;
 
-import com.cyanogenmod.eleven.R;
-import com.cyanogenmod.eleven.utils.MusicUtils;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.utils.MusicUtils;
 
 /**
  * This class handles the playpause button as well as the circular progress bar
diff --git a/src/main/java/com/cyanogenmod/eleven/widgets/PopupMenuButton.java b/src/main/java/org/lineageos/eleven/widgets/PopupMenuButton.java
similarity index 96%
rename from src/main/java/com/cyanogenmod/eleven/widgets/PopupMenuButton.java
rename to src/main/java/org/lineageos/eleven/widgets/PopupMenuButton.java
index 1074247..2b63d76 100644
--- a/src/main/java/com/cyanogenmod/eleven/widgets/PopupMenuButton.java
+++ b/src/main/java/org/lineageos/eleven/widgets/PopupMenuButton.java
@@ -14,7 +14,7 @@
 * limitations under the License.
 */
 
-package com.cyanogenmod.eleven.widgets;
+package org.lineageos.eleven.widgets;
 
 import android.content.Context;
 import android.os.Build;
@@ -23,7 +23,7 @@
 import android.view.View;
 import android.support.v7.widget.AppCompatImageView;
 
-import com.cyanogenmod.eleven.R;
+import org.lineageos.eleven.R;
 
 public class PopupMenuButton extends AppCompatImageView implements IPopupMenuCallback,
         View.OnClickListener {
diff --git a/src/main/java/com/cyanogenmod/eleven/widgets/QueueButton.java b/src/main/java/org/lineageos/eleven/widgets/QueueButton.java
similarity index 90%
rename from src/main/java/com/cyanogenmod/eleven/widgets/QueueButton.java
rename to src/main/java/org/lineageos/eleven/widgets/QueueButton.java
index a8a1f50..f4aab93 100644
--- a/src/main/java/com/cyanogenmod/eleven/widgets/QueueButton.java
+++ b/src/main/java/org/lineageos/eleven/widgets/QueueButton.java
@@ -13,13 +13,13 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.widgets;
+package org.lineageos.eleven.widgets;
 
 import android.content.Context;
 import android.util.AttributeSet;
 import android.view.View;
 
-import com.cyanogenmod.eleven.ui.activities.SlidingPanelActivity;
+import org.lineageos.eleven.ui.activities.SlidingPanelActivity;
 
 public class QueueButton extends AudioActivityButton {
 
diff --git a/src/main/java/com/cyanogenmod/eleven/widgets/RepeatButton.java b/src/main/java/org/lineageos/eleven/widgets/RepeatButton.java
similarity index 93%
rename from src/main/java/com/cyanogenmod/eleven/widgets/RepeatButton.java
rename to src/main/java/org/lineageos/eleven/widgets/RepeatButton.java
index 2743718..82c1252 100644
--- a/src/main/java/com/cyanogenmod/eleven/widgets/RepeatButton.java
+++ b/src/main/java/org/lineageos/eleven/widgets/RepeatButton.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.widgets;
+package org.lineageos.eleven.widgets;
 
 import android.content.Context;
 import android.support.v4.content.ContextCompat;
@@ -19,9 +19,9 @@
 import android.view.View;
 import android.widget.ImageButton;
 
-import com.cyanogenmod.eleven.MusicPlaybackService;
-import com.cyanogenmod.eleven.R;
-import com.cyanogenmod.eleven.utils.MusicUtils;
+import org.lineageos.eleven.MusicPlaybackService;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.utils.MusicUtils;
 
 /**
  * A custom {@link ImageButton} that represents the "repeat" button.
diff --git a/src/main/java/com/cyanogenmod/eleven/widgets/RepeatingImageButton.java b/src/main/java/org/lineageos/eleven/widgets/RepeatingImageButton.java
similarity index 96%
rename from src/main/java/com/cyanogenmod/eleven/widgets/RepeatingImageButton.java
rename to src/main/java/org/lineageos/eleven/widgets/RepeatingImageButton.java
index cb24500..90eae97 100644
--- a/src/main/java/com/cyanogenmod/eleven/widgets/RepeatingImageButton.java
+++ b/src/main/java/org/lineageos/eleven/widgets/RepeatingImageButton.java
@@ -9,7 +9,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.widgets;
+package org.lineageos.eleven.widgets;
 
 import android.content.Context;
 import android.os.Build;
@@ -22,9 +22,9 @@
 import android.view.View.OnClickListener;
 import android.support.v7.widget.AppCompatImageButton;
 
-import com.cyanogenmod.eleven.R;
-import com.cyanogenmod.eleven.utils.ApolloUtils;
-import com.cyanogenmod.eleven.utils.MusicUtils;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.utils.ElevenUtils;
+import org.lineageos.eleven.utils.MusicUtils;
 
 /**
  * A {@link AppCompatImageButton} that will repeatedly call a 'listener' method as long
@@ -90,7 +90,7 @@ public void setRepeatListener(final RepeatListener l) {
     @Override
     public boolean performLongClick() {
         if (mListener == null) {
-            ApolloUtils.showCheatSheet(this);
+            ElevenUtils.showCheatSheet(this);
         }
         mStartTime = SystemClock.elapsedRealtime();
         mRepeatCount = 0;
diff --git a/src/main/java/com/cyanogenmod/eleven/widgets/Roboto.java b/src/main/java/org/lineageos/eleven/widgets/Roboto.java
similarity index 97%
rename from src/main/java/com/cyanogenmod/eleven/widgets/Roboto.java
rename to src/main/java/org/lineageos/eleven/widgets/Roboto.java
index 690e3e1..aee6b7a 100644
--- a/src/main/java/com/cyanogenmod/eleven/widgets/Roboto.java
+++ b/src/main/java/org/lineageos/eleven/widgets/Roboto.java
@@ -1,4 +1,4 @@
-package com.cyanogenmod.eleven.widgets;
+package org.lineageos.eleven.widgets;
 
 import java.util.Hashtable;
 
diff --git a/src/main/java/com/cyanogenmod/eleven/widgets/RobotoTextView.java b/src/main/java/org/lineageos/eleven/widgets/RobotoTextView.java
similarity index 95%
rename from src/main/java/com/cyanogenmod/eleven/widgets/RobotoTextView.java
rename to src/main/java/org/lineageos/eleven/widgets/RobotoTextView.java
index 6c12d18..d24fb10 100644
--- a/src/main/java/com/cyanogenmod/eleven/widgets/RobotoTextView.java
+++ b/src/main/java/org/lineageos/eleven/widgets/RobotoTextView.java
@@ -1,11 +1,11 @@
-package com.cyanogenmod.eleven.widgets;
+package org.lineageos.eleven.widgets;
 
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.util.AttributeSet;
 import android.support.v7.widget.AppCompatTextView;
 
-import com.cyanogenmod.eleven.R;
+import org.lineageos.eleven.R;
 
 public class RobotoTextView extends AppCompatTextView {
 
diff --git a/src/main/java/com/cyanogenmod/eleven/widgets/SeparatedListAdapter.java b/src/main/java/org/lineageos/eleven/widgets/SeparatedListAdapter.java
similarity index 98%
rename from src/main/java/com/cyanogenmod/eleven/widgets/SeparatedListAdapter.java
rename to src/main/java/org/lineageos/eleven/widgets/SeparatedListAdapter.java
index 70f01b3..7af881a 100644
--- a/src/main/java/com/cyanogenmod/eleven/widgets/SeparatedListAdapter.java
+++ b/src/main/java/org/lineageos/eleven/widgets/SeparatedListAdapter.java
@@ -1,5 +1,5 @@
 
-package com.cyanogenmod.eleven.widgets;
+package org.lineageos.eleven.widgets;
 
 import android.content.Context;
 import android.view.View;
@@ -8,7 +8,7 @@
 import android.widget.ArrayAdapter;
 import android.widget.BaseAdapter;
 
-import com.cyanogenmod.eleven.R;
+import org.lineageos.eleven.R;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
diff --git a/src/main/java/com/cyanogenmod/eleven/widgets/ShowHideMasterLayout.java b/src/main/java/org/lineageos/eleven/widgets/ShowHideMasterLayout.java
similarity index 99%
rename from src/main/java/com/cyanogenmod/eleven/widgets/ShowHideMasterLayout.java
rename to src/main/java/org/lineageos/eleven/widgets/ShowHideMasterLayout.java
index d12956f..8c8eb36 100644
--- a/src/main/java/com/cyanogenmod/eleven/widgets/ShowHideMasterLayout.java
+++ b/src/main/java/org/lineageos/eleven/widgets/ShowHideMasterLayout.java
@@ -9,7 +9,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.widgets;
+package org.lineageos.eleven.widgets;
 
 import android.animation.Animator;
 import android.animation.AnimatorSet;
diff --git a/src/main/java/com/cyanogenmod/eleven/widgets/ShuffleButton.java b/src/main/java/org/lineageos/eleven/widgets/ShuffleButton.java
similarity index 91%
rename from src/main/java/com/cyanogenmod/eleven/widgets/ShuffleButton.java
rename to src/main/java/org/lineageos/eleven/widgets/ShuffleButton.java
index 838c2e7..432e392 100644
--- a/src/main/java/com/cyanogenmod/eleven/widgets/ShuffleButton.java
+++ b/src/main/java/org/lineageos/eleven/widgets/ShuffleButton.java
@@ -11,15 +11,15 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.widgets;
+package org.lineageos.eleven.widgets;
 
 import android.content.Context;
 import android.util.AttributeSet;
 import android.view.View;
 
-import com.cyanogenmod.eleven.MusicPlaybackService;
-import com.cyanogenmod.eleven.R;
-import com.cyanogenmod.eleven.utils.MusicUtils;
+import org.lineageos.eleven.MusicPlaybackService;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.utils.MusicUtils;
 
 /**
  * @author Andrew Neal (andrewdneal@gmail.com)
diff --git a/src/main/java/com/cyanogenmod/eleven/widgets/SquareFrame.java b/src/main/java/org/lineageos/eleven/widgets/SquareFrame.java
similarity index 92%
rename from src/main/java/com/cyanogenmod/eleven/widgets/SquareFrame.java
rename to src/main/java/org/lineageos/eleven/widgets/SquareFrame.java
index 85b0acc..09048e3 100644
--- a/src/main/java/com/cyanogenmod/eleven/widgets/SquareFrame.java
+++ b/src/main/java/org/lineageos/eleven/widgets/SquareFrame.java
@@ -1,4 +1,4 @@
-package com.cyanogenmod.eleven.widgets;
+package org.lineageos.eleven.widgets;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/src/main/java/com/cyanogenmod/eleven/widgets/SquareImageView.java b/src/main/java/org/lineageos/eleven/widgets/SquareImageView.java
similarity index 97%
rename from src/main/java/com/cyanogenmod/eleven/widgets/SquareImageView.java
rename to src/main/java/org/lineageos/eleven/widgets/SquareImageView.java
index 3e40c7b..83f6bb7 100644
--- a/src/main/java/com/cyanogenmod/eleven/widgets/SquareImageView.java
+++ b/src/main/java/org/lineageos/eleven/widgets/SquareImageView.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.widgets;
+package org.lineageos.eleven.widgets;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/src/main/java/com/cyanogenmod/eleven/widgets/SquareView.java b/src/main/java/org/lineageos/eleven/widgets/SquareView.java
similarity index 98%
rename from src/main/java/com/cyanogenmod/eleven/widgets/SquareView.java
rename to src/main/java/org/lineageos/eleven/widgets/SquareView.java
index 521b983..ed4a06e 100644
--- a/src/main/java/com/cyanogenmod/eleven/widgets/SquareView.java
+++ b/src/main/java/org/lineageos/eleven/widgets/SquareView.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.widgets;
+package org.lineageos.eleven.widgets;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/src/main/java/com/cyanogenmod/eleven/widgets/SquareViewPager.java b/src/main/java/org/lineageos/eleven/widgets/SquareViewPager.java
similarity index 97%
rename from src/main/java/com/cyanogenmod/eleven/widgets/SquareViewPager.java
rename to src/main/java/org/lineageos/eleven/widgets/SquareViewPager.java
index e24c1e9..a9900f6 100644
--- a/src/main/java/com/cyanogenmod/eleven/widgets/SquareViewPager.java
+++ b/src/main/java/org/lineageos/eleven/widgets/SquareViewPager.java
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.widgets;
+package org.lineageos.eleven.widgets;
 
 import android.content.Context;
 import android.support.v4.view.ViewPager;
diff --git a/src/main/java/com/cyanogenmod/eleven/widgets/ViewPagerTabStrip.java b/src/main/java/org/lineageos/eleven/widgets/ViewPagerTabStrip.java
similarity index 98%
rename from src/main/java/com/cyanogenmod/eleven/widgets/ViewPagerTabStrip.java
rename to src/main/java/org/lineageos/eleven/widgets/ViewPagerTabStrip.java
index 1e7c383..887dcf7 100644
--- a/src/main/java/com/cyanogenmod/eleven/widgets/ViewPagerTabStrip.java
+++ b/src/main/java/org/lineageos/eleven/widgets/ViewPagerTabStrip.java
@@ -14,7 +14,7 @@
  * limitations under the License
  */
 
-package com.cyanogenmod.eleven.widgets;
+package org.lineageos.eleven.widgets;
 
 import android.content.Context;
 import android.content.res.Resources;
@@ -26,7 +26,7 @@
 import android.view.View;
 import android.widget.LinearLayout;
 
-import com.cyanogenmod.eleven.R;
+import org.lineageos.eleven.R;
 
 public class ViewPagerTabStrip extends LinearLayout {
     private int mSelectedUnderlineThickness;
diff --git a/src/main/java/com/cyanogenmod/eleven/widgets/ViewPagerTabs.java b/src/main/java/org/lineageos/eleven/widgets/ViewPagerTabs.java
similarity index 98%
rename from src/main/java/com/cyanogenmod/eleven/widgets/ViewPagerTabs.java
rename to src/main/java/org/lineageos/eleven/widgets/ViewPagerTabs.java
index b3bbd72..c761840 100644
--- a/src/main/java/com/cyanogenmod/eleven/widgets/ViewPagerTabs.java
+++ b/src/main/java/org/lineageos/eleven/widgets/ViewPagerTabs.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.cyanogenmod.eleven.widgets;
+package org.lineageos.eleven.widgets;
 
 import android.content.Context;
 import android.content.res.ColorStateList;
@@ -33,10 +33,10 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
-import java.lang.reflect.Method;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.ui.fragments.ViewOutlineProviderCompat;
 
-import com.cyanogenmod.eleven.R;
-import com.cyanogenmod.eleven.ui.fragments.ViewOutlineProviderCompat;
+import java.lang.reflect.Method;
 
 /**
  * Lightweight implementation of ViewPager tabs. This looks similar to traditional actionBar tabs,
@@ -80,7 +80,7 @@ public void getOutline(View view, Outline outline) {
             VIEW_BOUNDS_OUTLINE_PROVIDER = null;
         }
     }
-    
+
     private static final int TAB_SIDE_PADDING_IN_DPS = 10;
 
     // TODO: This should use <declare-styleable> in the future
@@ -186,7 +186,7 @@ private void addTab(CharSequence tabTitle, final int position) {
         else{
         	textView = (RobotoTextView) new RobotoTextView(getContext(),Roboto.ROBOTO_MEDIUM);
         }
-        
+
         textView.setText(tabTitle);
         textView.setBackgroundResource(R.drawable.view_pager_tab_background);
         textView.setGravity(Gravity.CENTER);
diff --git a/src/main/java/com/cyanogenmod/eleven/widgets/VisualizerView.java b/src/main/java/org/lineageos/eleven/widgets/VisualizerView.java
similarity index 98%
rename from src/main/java/com/cyanogenmod/eleven/widgets/VisualizerView.java
rename to src/main/java/org/lineageos/eleven/widgets/VisualizerView.java
index 7c91f29..94dec51 100644
--- a/src/main/java/com/cyanogenmod/eleven/widgets/VisualizerView.java
+++ b/src/main/java/org/lineageos/eleven/widgets/VisualizerView.java
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.widgets;
+package org.lineageos.eleven.widgets;
 
 import android.animation.ArgbEvaluator;
 import android.animation.ObjectAnimator;
@@ -29,8 +29,7 @@
 import android.util.AttributeSet;
 import android.view.View;
 
-import com.cyanogenmod.eleven.R;
-import com.cyanogenmod.eleven.utils.MusicUtils;
+import org.lineageos.eleven.R;
 
 public class VisualizerView extends View {
     private Paint mPaint;
@@ -38,14 +37,13 @@ public class VisualizerView extends View {
     private ObjectAnimator mVisualizerColorAnimator;
 
     private ValueAnimator[] mValueAnimators = new ValueAnimator[32];
-    
     private float[] mFFTPoints = new float[128];
 
     private boolean mVisible = false;
     private boolean mPlaying = false;
     private boolean mPowerSaveMode = false;
     private int mColor;
-    
+
     private Visualizer.OnDataCaptureListener mVisualizerListener =
             new Visualizer.OnDataCaptureListener() {
         byte rfk, ifk;
@@ -167,9 +165,9 @@ public void onAnimationUpdate(ValueAnimator animation) {
             public void onAnimationUpdate(ValueAnimator animation) {
                 postInvalidate();
             }
-        });	
+        });
     }
-    
+
     public void setVisible(boolean visible) {
         if (mVisible != visible) {
             mVisible = visible;