diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 20e19e3a..4ddad03f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -61,7 +61,7 @@
             android:name=".ui.activities.bugreport.BugReportActivity"
             android:label="@string/report_an_issue" />
         <activity
-            android:name=".appshortcuts.AppShortcutLauncherActivity"
+            android:name=".shortcuts.AppShortcutLauncherActivity"
             android:launchMode="singleInstance"
             android:theme="@android:style/Theme.Translucent.NoTitleBar" />
         <activity android:name=".ui.activities.PurchaseActivity" />
@@ -90,14 +90,14 @@
             android:value="GlideModule" />
 
         <!-- Widgets -->
-        <receiver android:name=".appwidgets.BootReceiver">
+        <receiver android:name=".widgets.BootReceiver">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
                 <action android:name="android.intent.action.QUICKBOOT_POWERON" />
             </intent-filter>
         </receiver>
         <receiver
-            android:name=".appwidgets.AppWidgetBig"
+            android:name=".widgets.AppWidgetBig"
             android:exported="false"
             android:label="@string/app_widget_big_name">
             <intent-filter>
@@ -109,7 +109,7 @@
                 android:resource="@xml/app_widget_big_info" />
         </receiver>
         <receiver
-            android:name=".appwidgets.AppWidgetClassic"
+            android:name=".widgets.AppWidgetClassic"
             android:exported="false"
             android:label="@string/app_widget_classic_name">
             <intent-filter>
@@ -121,7 +121,7 @@
                 android:resource="@xml/app_widget_classic_info" />
         </receiver>
         <receiver
-            android:name=".appwidgets.AppWidgetSmall"
+            android:name=".widgets.AppWidgetSmall"
             android:exported="false"
             android:label="@string/app_widget_small_name">
             <intent-filter>
@@ -133,7 +133,7 @@
                 android:resource="@xml/app_widget_small_info" />
         </receiver>
         <receiver
-            android:name=".appwidgets.AppWidgetCard"
+            android:name=".widgets.AppWidgetCard"
             android:exported="false"
             android:label="@string/app_widget_card_name">
             <intent-filter>
diff --git a/app/src/main/java/com/kabouzeid/gramophone/App.java b/app/src/main/java/com/kabouzeid/gramophone/App.java
index 6fed7206..8c69ea85 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/App.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/App.java
@@ -9,7 +9,7 @@ import androidx.annotation.NonNull;
 import com.anjlab.android.iab.v3.BillingProcessor;
 import com.anjlab.android.iab.v3.TransactionDetails;
 import com.kabouzeid.appthemehelper.ThemeStore;
-import com.kabouzeid.gramophone.appshortcuts.DynamicShortcutManager;
+import com.kabouzeid.gramophone.shortcuts.DynamicShortcutManager;
 
 import org.jellyfin.apiclient.interaction.AndroidConnectionManager;
 import org.jellyfin.apiclient.interaction.AndroidDevice;
diff --git a/app/src/main/java/com/kabouzeid/gramophone/misc/NonProAllowedColors.java b/app/src/main/java/com/kabouzeid/gramophone/misc/NonProAllowedColors.java
deleted file mode 100644
index c760a21c..00000000
--- a/app/src/main/java/com/kabouzeid/gramophone/misc/NonProAllowedColors.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package com.kabouzeid.gramophone.misc;
-
-import android.graphics.Color;
-
-/**
- * @author Karim Abou Zeid (kabouzeid)
- */
-
-public interface NonProAllowedColors {
-
-    int[] PRIMARY_COLORS =
-            new int[]{
-                    // Red
-                    Color.parseColor("#FFEBEE"),
-                    Color.parseColor("#FFCDD2"),
-                    Color.parseColor("#EF9A9A"),
-                    Color.parseColor("#E57373"),
-                    Color.parseColor("#EF5350"),
-                    Color.parseColor("#F44336"),
-                    Color.parseColor("#E53935"),
-                    Color.parseColor("#D32F2F"),
-                    Color.parseColor("#C62828"),
-                    Color.parseColor("#B71C1C"),
-                    // Pink
-                    Color.parseColor("#FCE4EC"),
-                    Color.parseColor("#F8BBD0"),
-                    Color.parseColor("#F48FB1"),
-                    Color.parseColor("#F06292"),
-                    Color.parseColor("#EC407A"),
-                    Color.parseColor("#E91E63"),
-                    Color.parseColor("#D81B60"),
-                    Color.parseColor("#C2185B"),
-                    Color.parseColor("#AD1457"),
-                    Color.parseColor("#880E4F"),
-                    // Purple
-                    Color.parseColor("#F3E5F5"),
-                    Color.parseColor("#E1BEE7"),
-                    Color.parseColor("#CE93D8"),
-                    Color.parseColor("#BA68C8"),
-                    Color.parseColor("#AB47BC"),
-                    Color.parseColor("#9C27B0"),
-                    Color.parseColor("#8E24AA"),
-                    Color.parseColor("#7B1FA2"),
-                    Color.parseColor("#6A1B9A"),
-                    Color.parseColor("#4A148C"),
-                    // Deep Purple
-                    Color.parseColor("#EDE7F6"),
-                    Color.parseColor("#D1C4E9"),
-                    Color.parseColor("#B39DDB"),
-                    Color.parseColor("#9575CD"),
-                    Color.parseColor("#7E57C2"),
-                    Color.parseColor("#673AB7"),
-                    Color.parseColor("#5E35B1"),
-                    Color.parseColor("#512DA8"),
-                    Color.parseColor("#4527A0"),
-                    Color.parseColor("#311B92"),
-                    // Indigo
-                    Color.parseColor("#E8EAF6"),
-                    Color.parseColor("#C5CAE9"),
-                    Color.parseColor("#9FA8DA"),
-                    Color.parseColor("#7986CB"),
-                    Color.parseColor("#5C6BC0"),
-                    Color.parseColor("#3F51B5"),
-                    Color.parseColor("#3949AB"),
-                    Color.parseColor("#303F9F"),
-                    Color.parseColor("#283593"),
-                    Color.parseColor("#1A237E")
-            };
-
-    int[] ACCENT_COLORS =
-            new int[]{
-                    // Red
-                    Color.parseColor("#FF8A80"),
-                    Color.parseColor("#FF5252"),
-                    Color.parseColor("#FF1744"),
-                    Color.parseColor("#D50000"),
-                    // Pink
-                    Color.parseColor("#FF80AB"),
-                    Color.parseColor("#FF4081"),
-                    Color.parseColor("#F50057"),
-                    Color.parseColor("#C51162"),
-                    // Purple
-                    Color.parseColor("#EA80FC"),
-                    Color.parseColor("#E040FB"),
-                    Color.parseColor("#D500F9"),
-                    Color.parseColor("#AA00FF"),
-                    // Deep Purple
-                    Color.parseColor("#B388FF"),
-                    Color.parseColor("#7C4DFF"),
-                    Color.parseColor("#651FFF"),
-                    Color.parseColor("#6200EA"),
-                    // Indigo
-                    Color.parseColor("#8C9EFF"),
-                    Color.parseColor("#536DFE"),
-                    Color.parseColor("#3D5AFE"),
-                    Color.parseColor("#304FFE")
-            };
-}
diff --git a/app/src/main/java/com/kabouzeid/gramophone/provider/MusicPlaybackQueueStore.java b/app/src/main/java/com/kabouzeid/gramophone/provider/QueueStore.java
similarity index 94%
rename from app/src/main/java/com/kabouzeid/gramophone/provider/MusicPlaybackQueueStore.java
rename to app/src/main/java/com/kabouzeid/gramophone/provider/QueueStore.java
index fb9d1d65..4c7d7227 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/provider/MusicPlaybackQueueStore.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/provider/QueueStore.java
@@ -28,7 +28,6 @@ import androidx.annotation.Nullable;
 import com.kabouzeid.gramophone.loader.SongLoader;
 import com.kabouzeid.gramophone.model.Song;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -36,9 +35,9 @@ import java.util.List;
  *         <p/>
  *         This keeps track of the music playback and history state of the playback service
  */
-public class MusicPlaybackQueueStore extends SQLiteOpenHelper {
+public class QueueStore extends SQLiteOpenHelper {
     @Nullable
-    private static MusicPlaybackQueueStore sInstance = null;
+    private static QueueStore sInstance = null;
     public static final String DATABASE_NAME = "music_playback_state.db";
     public static final String PLAYING_QUEUE_TABLE_NAME = "playing_queue";
     public static final String ORIGINAL_PLAYING_QUEUE_TABLE_NAME = "original_playing_queue";
@@ -49,7 +48,7 @@ public class MusicPlaybackQueueStore extends SQLiteOpenHelper {
      *
      * @param context The {@link Context} to use
      */
-    public MusicPlaybackQueueStore(final Context context) {
+    public QueueStore(final Context context) {
         super(context, DATABASE_NAME, null, VERSION);
     }
 
@@ -123,9 +122,9 @@ public class MusicPlaybackQueueStore extends SQLiteOpenHelper {
      * @return A new instance of this class.
      */
     @NonNull
-    public static synchronized MusicPlaybackQueueStore getInstance(@NonNull final Context context) {
+    public static synchronized QueueStore getInstance(@NonNull final Context context) {
         if (sInstance == null) {
-            sInstance = new MusicPlaybackQueueStore(context.getApplicationContext());
+            sInstance = new QueueStore(context.getApplicationContext());
         }
         return sInstance;
     }
diff --git a/app/src/main/java/com/kabouzeid/gramophone/service/MusicService.java b/app/src/main/java/com/kabouzeid/gramophone/service/MusicService.java
index 03feda61..f26a0f7a 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/service/MusicService.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/service/MusicService.java
@@ -40,10 +40,10 @@ import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.animation.GlideAnimation;
 import com.bumptech.glide.request.target.SimpleTarget;
 import com.kabouzeid.gramophone.R;
-import com.kabouzeid.gramophone.appwidgets.AppWidgetBig;
-import com.kabouzeid.gramophone.appwidgets.AppWidgetCard;
-import com.kabouzeid.gramophone.appwidgets.AppWidgetClassic;
-import com.kabouzeid.gramophone.appwidgets.AppWidgetSmall;
+import com.kabouzeid.gramophone.widgets.AppWidgetBig;
+import com.kabouzeid.gramophone.widgets.AppWidgetCard;
+import com.kabouzeid.gramophone.widgets.AppWidgetClassic;
+import com.kabouzeid.gramophone.widgets.AppWidgetSmall;
 import com.kabouzeid.gramophone.glide.BlurTransformation;
 import com.kabouzeid.gramophone.glide.SongGlideRequest;
 import com.kabouzeid.gramophone.helper.ShuffleHelper;
@@ -53,7 +53,7 @@ import com.kabouzeid.gramophone.model.AbsCustomPlaylist;
 import com.kabouzeid.gramophone.model.Playlist;
 import com.kabouzeid.gramophone.model.Song;
 import com.kabouzeid.gramophone.provider.HistoryStore;
-import com.kabouzeid.gramophone.provider.MusicPlaybackQueueStore;
+import com.kabouzeid.gramophone.provider.QueueStore;
 import com.kabouzeid.gramophone.provider.SongPlayCountStore;
 import com.kabouzeid.gramophone.service.notification.PlayingNotification;
 import com.kabouzeid.gramophone.service.notification.PlayingNotificationImpl;
@@ -395,7 +395,7 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
     }
 
     private void saveQueuesImpl() {
-        MusicPlaybackQueueStore.getInstance(this).saveQueues(playingQueue, originalPlayingQueue);
+        QueueStore.getInstance(this).saveQueues(playingQueue, originalPlayingQueue);
     }
 
     private void savePosition() {
@@ -429,8 +429,8 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
 
     private synchronized void restoreQueuesAndPositionIfNecessary() {
         if (!queuesRestored && playingQueue.isEmpty()) {
-            List<Song> restoredQueue = MusicPlaybackQueueStore.getInstance(this).getSavedPlayingQueue();
-            List<Song> restoredOriginalQueue = MusicPlaybackQueueStore.getInstance(this).getSavedOriginalPlayingQueue();
+            List<Song> restoredQueue = QueueStore.getInstance(this).getSavedPlayingQueue();
+            List<Song> restoredOriginalQueue = QueueStore.getInstance(this).getSavedOriginalPlayingQueue();
             int restoredPosition = PreferenceManager.getDefaultSharedPreferences(this).getInt(SAVED_POSITION, -1);
             int restoredPositionInTrack = PreferenceManager.getDefaultSharedPreferences(this).getInt(SAVED_POSITION_IN_TRACK, -1);
 
diff --git a/app/src/main/java/com/kabouzeid/gramophone/appshortcuts/AppShortcutIconGenerator.java b/app/src/main/java/com/kabouzeid/gramophone/shortcuts/AppShortcutIconGenerator.java
similarity index 98%
rename from app/src/main/java/com/kabouzeid/gramophone/appshortcuts/AppShortcutIconGenerator.java
rename to app/src/main/java/com/kabouzeid/gramophone/shortcuts/AppShortcutIconGenerator.java
index 6eda73c5..297806bb 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/appshortcuts/AppShortcutIconGenerator.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/shortcuts/AppShortcutIconGenerator.java
@@ -1,4 +1,4 @@
-package com.kabouzeid.gramophone.appshortcuts;
+package com.kabouzeid.gramophone.shortcuts;
 
 import android.content.Context;
 import android.graphics.drawable.AdaptiveIconDrawable;
diff --git a/app/src/main/java/com/kabouzeid/gramophone/appshortcuts/AppShortcutLauncherActivity.java b/app/src/main/java/com/kabouzeid/gramophone/shortcuts/AppShortcutLauncherActivity.java
similarity index 89%
rename from app/src/main/java/com/kabouzeid/gramophone/appshortcuts/AppShortcutLauncherActivity.java
rename to app/src/main/java/com/kabouzeid/gramophone/shortcuts/AppShortcutLauncherActivity.java
index fbd64b15..5161a0f3 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/appshortcuts/AppShortcutLauncherActivity.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/shortcuts/AppShortcutLauncherActivity.java
@@ -1,12 +1,12 @@
-package com.kabouzeid.gramophone.appshortcuts;
+package com.kabouzeid.gramophone.shortcuts;
 
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
 
-import com.kabouzeid.gramophone.appshortcuts.shortcuttype.LatestShortcutType;
-import com.kabouzeid.gramophone.appshortcuts.shortcuttype.ShuffleShortcutType;
-import com.kabouzeid.gramophone.appshortcuts.shortcuttype.FrequentShortcutType;
+import com.kabouzeid.gramophone.shortcuts.shortcuttype.LatestShortcutType;
+import com.kabouzeid.gramophone.shortcuts.shortcuttype.ShuffleShortcutType;
+import com.kabouzeid.gramophone.shortcuts.shortcuttype.FrequentShortcutType;
 import com.kabouzeid.gramophone.model.Playlist;
 import com.kabouzeid.gramophone.model.smartplaylist.LatestPlaylist;
 import com.kabouzeid.gramophone.model.smartplaylist.FrequentPlaylist;
@@ -18,7 +18,7 @@ import com.kabouzeid.gramophone.service.MusicService;
  */
 
 public class AppShortcutLauncherActivity extends Activity {
-    public static final String KEY_SHORTCUT_TYPE = "com.kabouzeid.gramophone.appshortcuts.ShortcutType";
+    public static final String KEY_SHORTCUT_TYPE = "com.kabouzeid.gramophone.shortcuts.ShortcutType";
 
     public static final int SHORTCUT_TYPE_SHUFFLE = 0;
     public static final int SHORTCUT_TYPE_FREQUENT = 1;
diff --git a/app/src/main/java/com/kabouzeid/gramophone/appshortcuts/DynamicShortcutManager.java b/app/src/main/java/com/kabouzeid/gramophone/shortcuts/DynamicShortcutManager.java
similarity index 86%
rename from app/src/main/java/com/kabouzeid/gramophone/appshortcuts/DynamicShortcutManager.java
rename to app/src/main/java/com/kabouzeid/gramophone/shortcuts/DynamicShortcutManager.java
index 907da219..44a598b3 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/appshortcuts/DynamicShortcutManager.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/shortcuts/DynamicShortcutManager.java
@@ -1,4 +1,4 @@
-package com.kabouzeid.gramophone.appshortcuts;
+package com.kabouzeid.gramophone.shortcuts;
 
 import android.annotation.TargetApi;
 import android.content.Context;
@@ -8,9 +8,9 @@ import android.content.pm.ShortcutManager;
 import android.graphics.drawable.Icon;
 import android.os.Build;
 
-import com.kabouzeid.gramophone.appshortcuts.shortcuttype.LatestShortcutType;
-import com.kabouzeid.gramophone.appshortcuts.shortcuttype.ShuffleShortcutType;
-import com.kabouzeid.gramophone.appshortcuts.shortcuttype.FrequentShortcutType;
+import com.kabouzeid.gramophone.shortcuts.shortcuttype.LatestShortcutType;
+import com.kabouzeid.gramophone.shortcuts.shortcuttype.ShuffleShortcutType;
+import com.kabouzeid.gramophone.shortcuts.shortcuttype.FrequentShortcutType;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/app/src/main/java/com/kabouzeid/gramophone/appshortcuts/shortcuttype/BaseShortcutType.java b/app/src/main/java/com/kabouzeid/gramophone/shortcuts/shortcuttype/BaseShortcutType.java
similarity index 84%
rename from app/src/main/java/com/kabouzeid/gramophone/appshortcuts/shortcuttype/BaseShortcutType.java
rename to app/src/main/java/com/kabouzeid/gramophone/shortcuts/shortcuttype/BaseShortcutType.java
index c260261f..85b0c995 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/appshortcuts/shortcuttype/BaseShortcutType.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/shortcuts/shortcuttype/BaseShortcutType.java
@@ -1,4 +1,4 @@
-package com.kabouzeid.gramophone.appshortcuts.shortcuttype;
+package com.kabouzeid.gramophone.shortcuts.shortcuttype;
 
 import android.annotation.TargetApi;
 import android.content.Context;
@@ -7,7 +7,7 @@ import android.content.pm.ShortcutInfo;
 import android.os.Build;
 import android.os.Bundle;
 
-import com.kabouzeid.gramophone.appshortcuts.AppShortcutLauncherActivity;
+import com.kabouzeid.gramophone.shortcuts.AppShortcutLauncherActivity;
 
 /**
  * @author Adrian Campos
@@ -15,7 +15,7 @@ import com.kabouzeid.gramophone.appshortcuts.AppShortcutLauncherActivity;
 @TargetApi(Build.VERSION_CODES.N_MR1)
 public abstract class BaseShortcutType {
 
-    static final String ID_PREFIX = "com.kabouzeid.gramophone.appshortcuts.id.";
+    static final String ID_PREFIX = "com.kabouzeid.gramophone.shortcuts.id.";
 
     Context context;
 
diff --git a/app/src/main/java/com/kabouzeid/gramophone/appshortcuts/shortcuttype/FrequentShortcutType.java b/app/src/main/java/com/kabouzeid/gramophone/shortcuts/shortcuttype/FrequentShortcutType.java
similarity index 82%
rename from app/src/main/java/com/kabouzeid/gramophone/appshortcuts/shortcuttype/FrequentShortcutType.java
rename to app/src/main/java/com/kabouzeid/gramophone/shortcuts/shortcuttype/FrequentShortcutType.java
index e576754c..a4dc4e29 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/appshortcuts/shortcuttype/FrequentShortcutType.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/shortcuts/shortcuttype/FrequentShortcutType.java
@@ -1,4 +1,4 @@
-package com.kabouzeid.gramophone.appshortcuts.shortcuttype;
+package com.kabouzeid.gramophone.shortcuts.shortcuttype;
 
 import android.annotation.TargetApi;
 import android.content.Context;
@@ -6,8 +6,8 @@ import android.content.pm.ShortcutInfo;
 import android.os.Build;
 
 import com.kabouzeid.gramophone.R;
-import com.kabouzeid.gramophone.appshortcuts.AppShortcutIconGenerator;
-import com.kabouzeid.gramophone.appshortcuts.AppShortcutLauncherActivity;
+import com.kabouzeid.gramophone.shortcuts.AppShortcutIconGenerator;
+import com.kabouzeid.gramophone.shortcuts.AppShortcutLauncherActivity;
 
 /**
  * @author Adrian Campos
diff --git a/app/src/main/java/com/kabouzeid/gramophone/appshortcuts/shortcuttype/LatestShortcutType.java b/app/src/main/java/com/kabouzeid/gramophone/shortcuts/shortcuttype/LatestShortcutType.java
similarity index 82%
rename from app/src/main/java/com/kabouzeid/gramophone/appshortcuts/shortcuttype/LatestShortcutType.java
rename to app/src/main/java/com/kabouzeid/gramophone/shortcuts/shortcuttype/LatestShortcutType.java
index b4555210..3b6602e8 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/appshortcuts/shortcuttype/LatestShortcutType.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/shortcuts/shortcuttype/LatestShortcutType.java
@@ -1,4 +1,4 @@
-package com.kabouzeid.gramophone.appshortcuts.shortcuttype;
+package com.kabouzeid.gramophone.shortcuts.shortcuttype;
 
 import android.annotation.TargetApi;
 import android.content.Context;
@@ -6,8 +6,8 @@ import android.content.pm.ShortcutInfo;
 import android.os.Build;
 
 import com.kabouzeid.gramophone.R;
-import com.kabouzeid.gramophone.appshortcuts.AppShortcutIconGenerator;
-import com.kabouzeid.gramophone.appshortcuts.AppShortcutLauncherActivity;
+import com.kabouzeid.gramophone.shortcuts.AppShortcutIconGenerator;
+import com.kabouzeid.gramophone.shortcuts.AppShortcutLauncherActivity;
 
 /**
  * @author Adrian Campos
diff --git a/app/src/main/java/com/kabouzeid/gramophone/appshortcuts/shortcuttype/ShuffleShortcutType.java b/app/src/main/java/com/kabouzeid/gramophone/shortcuts/shortcuttype/ShuffleShortcutType.java
similarity index 82%
rename from app/src/main/java/com/kabouzeid/gramophone/appshortcuts/shortcuttype/ShuffleShortcutType.java
rename to app/src/main/java/com/kabouzeid/gramophone/shortcuts/shortcuttype/ShuffleShortcutType.java
index 3c8a241e..bbce8c20 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/appshortcuts/shortcuttype/ShuffleShortcutType.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/shortcuts/shortcuttype/ShuffleShortcutType.java
@@ -1,4 +1,4 @@
-package com.kabouzeid.gramophone.appshortcuts.shortcuttype;
+package com.kabouzeid.gramophone.shortcuts.shortcuttype;
 
 import android.annotation.TargetApi;
 import android.content.Context;
@@ -6,8 +6,8 @@ import android.content.pm.ShortcutInfo;
 import android.os.Build;
 
 import com.kabouzeid.gramophone.R;
-import com.kabouzeid.gramophone.appshortcuts.AppShortcutIconGenerator;
-import com.kabouzeid.gramophone.appshortcuts.AppShortcutLauncherActivity;
+import com.kabouzeid.gramophone.shortcuts.AppShortcutIconGenerator;
+import com.kabouzeid.gramophone.shortcuts.AppShortcutLauncherActivity;
 
 /**
  * @author Adrian Campos
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/SettingsActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/SettingsActivity.java
index c046332c..ffacd755 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/SettingsActivity.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/SettingsActivity.java
@@ -24,8 +24,7 @@ import com.kabouzeid.appthemehelper.common.prefs.supportv7.ATEPreferenceFragment
 import com.kabouzeid.appthemehelper.util.ColorUtil;
 import com.kabouzeid.gramophone.App;
 import com.kabouzeid.gramophone.R;
-import com.kabouzeid.gramophone.appshortcuts.DynamicShortcutManager;
-import com.kabouzeid.gramophone.misc.NonProAllowedColors;
+import com.kabouzeid.gramophone.shortcuts.DynamicShortcutManager;
 import com.kabouzeid.gramophone.preferences.LibraryPreference;
 import com.kabouzeid.gramophone.preferences.LibraryPreferenceDialog;
 import com.kabouzeid.gramophone.preferences.NowPlayingScreenPreference;
@@ -71,32 +70,10 @@ public class SettingsActivity extends AbsBaseActivity implements ColorChooserDia
     public void onColorSelection(@NonNull ColorChooserDialog dialog, @ColorInt int selectedColor) {
         switch (dialog.getTitle()) {
             case R.string.primary_color:
-                if (!App.isProVersion()) {
-                    Arrays.sort(NonProAllowedColors.PRIMARY_COLORS);
-                    if (Arrays.binarySearch(NonProAllowedColors.PRIMARY_COLORS, selectedColor) < 0) {
-                        // color wasn't found
-                        Toast.makeText(this, R.string.only_the_first_5_colors_available, Toast.LENGTH_LONG).show();
-                        startActivity(new Intent(this, PurchaseActivity.class));
-                        return;
-                    }
-                }
-                ThemeStore.editTheme(this)
-                        .primaryColor(selectedColor)
-                        .commit();
+                ThemeStore.editTheme(this).primaryColor(selectedColor).commit();
                 break;
             case R.string.accent_color:
-                if (!App.isProVersion()) {
-                    Arrays.sort(NonProAllowedColors.ACCENT_COLORS);
-                    if (Arrays.binarySearch(NonProAllowedColors.ACCENT_COLORS, selectedColor) < 0) {
-                        // color wasn't found
-                        Toast.makeText(this, R.string.only_the_first_5_colors_available, Toast.LENGTH_LONG).show();
-                        startActivity(new Intent(this, PurchaseActivity.class));
-                        return;
-                    }
-                }
-                ThemeStore.editTheme(this)
-                        .accentColor(selectedColor)
-                        .commit();
+                ThemeStore.editTheme(this).accentColor(selectedColor).commit();
                 break;
         }
 
diff --git a/app/src/main/java/com/kabouzeid/gramophone/appwidgets/AppWidgetBig.java b/app/src/main/java/com/kabouzeid/gramophone/widgets/AppWidgetBig.java
similarity index 98%
rename from app/src/main/java/com/kabouzeid/gramophone/appwidgets/AppWidgetBig.java
rename to app/src/main/java/com/kabouzeid/gramophone/widgets/AppWidgetBig.java
index f1390904..d0f4ef69 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/appwidgets/AppWidgetBig.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/widgets/AppWidgetBig.java
@@ -1,4 +1,4 @@
-package com.kabouzeid.gramophone.appwidgets;
+package com.kabouzeid.gramophone.widgets;
 
 import android.app.PendingIntent;
 import android.content.ComponentName;
@@ -18,7 +18,7 @@ import com.bumptech.glide.request.target.SimpleTarget;
 import com.bumptech.glide.request.target.Target;
 import com.kabouzeid.appthemehelper.util.MaterialValueHelper;
 import com.kabouzeid.gramophone.R;
-import com.kabouzeid.gramophone.appwidgets.base.BaseAppWidget;
+import com.kabouzeid.gramophone.widgets.base.BaseAppWidget;
 import com.kabouzeid.gramophone.glide.SongGlideRequest;
 import com.kabouzeid.gramophone.model.Song;
 import com.kabouzeid.gramophone.service.MusicService;
diff --git a/app/src/main/java/com/kabouzeid/gramophone/appwidgets/AppWidgetCard.java b/app/src/main/java/com/kabouzeid/gramophone/widgets/AppWidgetCard.java
similarity index 98%
rename from app/src/main/java/com/kabouzeid/gramophone/appwidgets/AppWidgetCard.java
rename to app/src/main/java/com/kabouzeid/gramophone/widgets/AppWidgetCard.java
index 2deba464..9af1c793 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/appwidgets/AppWidgetCard.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/widgets/AppWidgetCard.java
@@ -1,4 +1,4 @@
-package com.kabouzeid.gramophone.appwidgets;
+package com.kabouzeid.gramophone.widgets;
 
 import android.app.PendingIntent;
 import android.content.ComponentName;
@@ -18,7 +18,7 @@ import com.bumptech.glide.request.target.SimpleTarget;
 import com.bumptech.glide.request.target.Target;
 import com.kabouzeid.appthemehelper.util.MaterialValueHelper;
 import com.kabouzeid.gramophone.R;
-import com.kabouzeid.gramophone.appwidgets.base.BaseAppWidget;
+import com.kabouzeid.gramophone.widgets.base.BaseAppWidget;
 import com.kabouzeid.gramophone.glide.SongGlideRequest;
 import com.kabouzeid.gramophone.glide.palette.BitmapPaletteWrapper;
 import com.kabouzeid.gramophone.model.Song;
diff --git a/app/src/main/java/com/kabouzeid/gramophone/appwidgets/AppWidgetClassic.java b/app/src/main/java/com/kabouzeid/gramophone/widgets/AppWidgetClassic.java
similarity index 98%
rename from app/src/main/java/com/kabouzeid/gramophone/appwidgets/AppWidgetClassic.java
rename to app/src/main/java/com/kabouzeid/gramophone/widgets/AppWidgetClassic.java
index e99e517a..039edce5 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/appwidgets/AppWidgetClassic.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/widgets/AppWidgetClassic.java
@@ -1,4 +1,4 @@
-package com.kabouzeid.gramophone.appwidgets;
+package com.kabouzeid.gramophone.widgets;
 
 import android.app.PendingIntent;
 import android.content.ComponentName;
@@ -18,7 +18,7 @@ import com.bumptech.glide.request.target.SimpleTarget;
 import com.bumptech.glide.request.target.Target;
 import com.kabouzeid.appthemehelper.util.MaterialValueHelper;
 import com.kabouzeid.gramophone.R;
-import com.kabouzeid.gramophone.appwidgets.base.BaseAppWidget;
+import com.kabouzeid.gramophone.widgets.base.BaseAppWidget;
 import com.kabouzeid.gramophone.glide.SongGlideRequest;
 import com.kabouzeid.gramophone.glide.palette.BitmapPaletteWrapper;
 import com.kabouzeid.gramophone.model.Song;
diff --git a/app/src/main/java/com/kabouzeid/gramophone/appwidgets/AppWidgetSmall.java b/app/src/main/java/com/kabouzeid/gramophone/widgets/AppWidgetSmall.java
similarity index 98%
rename from app/src/main/java/com/kabouzeid/gramophone/appwidgets/AppWidgetSmall.java
rename to app/src/main/java/com/kabouzeid/gramophone/widgets/AppWidgetSmall.java
index e5d2011f..306c4c56 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/appwidgets/AppWidgetSmall.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/widgets/AppWidgetSmall.java
@@ -1,4 +1,4 @@
-package com.kabouzeid.gramophone.appwidgets;
+package com.kabouzeid.gramophone.widgets;
 
 import android.app.PendingIntent;
 import android.content.ComponentName;
@@ -18,7 +18,7 @@ import com.bumptech.glide.request.target.SimpleTarget;
 import com.bumptech.glide.request.target.Target;
 import com.kabouzeid.appthemehelper.util.MaterialValueHelper;
 import com.kabouzeid.gramophone.R;
-import com.kabouzeid.gramophone.appwidgets.base.BaseAppWidget;
+import com.kabouzeid.gramophone.widgets.base.BaseAppWidget;
 import com.kabouzeid.gramophone.glide.SongGlideRequest;
 import com.kabouzeid.gramophone.glide.palette.BitmapPaletteWrapper;
 import com.kabouzeid.gramophone.model.Song;
diff --git a/app/src/main/java/com/kabouzeid/gramophone/appwidgets/BootReceiver.java b/app/src/main/java/com/kabouzeid/gramophone/widgets/BootReceiver.java
similarity index 96%
rename from app/src/main/java/com/kabouzeid/gramophone/appwidgets/BootReceiver.java
rename to app/src/main/java/com/kabouzeid/gramophone/widgets/BootReceiver.java
index 4863d874..671a38c6 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/appwidgets/BootReceiver.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/widgets/BootReceiver.java
@@ -1,4 +1,4 @@
-package com.kabouzeid.gramophone.appwidgets;
+package com.kabouzeid.gramophone.widgets;
 
 import android.appwidget.AppWidgetManager;
 import android.content.BroadcastReceiver;
diff --git a/app/src/main/java/com/kabouzeid/gramophone/appwidgets/base/BaseAppWidget.java b/app/src/main/java/com/kabouzeid/gramophone/widgets/base/BaseAppWidget.java
similarity index 99%
rename from app/src/main/java/com/kabouzeid/gramophone/appwidgets/base/BaseAppWidget.java
rename to app/src/main/java/com/kabouzeid/gramophone/widgets/base/BaseAppWidget.java
index e54b7352..85fa0bd0 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/appwidgets/base/BaseAppWidget.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/widgets/base/BaseAppWidget.java
@@ -1,4 +1,4 @@
-package com.kabouzeid.gramophone.appwidgets.base;
+package com.kabouzeid.gramophone.widgets.base;
 
 import android.app.PendingIntent;
 import android.appwidget.AppWidgetManager;
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 28d00697..1ad80fb1 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -233,7 +233,6 @@
     <string name="playlist_is_empty">قائمة التشغيل فارغة</string>
     <string name="playing_notification_description">إشعار التشغيل يوفر أزرار تحكم للتشغيل/الإيقاف المؤقت إلخ.</string>
     <string name="playing_notification_name">إشعار التشغيل</string>
-    <string name="only_the_first_5_colors_available">فقط أول 5 ألوان هي المتوفرة في النسخة المجانية.</string>
     <string name="black_theme_is_a_pro_feature">التنسيق الأسود هي ميزة في Phonograph Pro.</string>
     <string name="sleep_timer_is_a_pro_feature">مؤقت النوم هي ميزة في Phonograph Pro</string>
     <string name="restoring_purchase">جار استعادة عملية الشراء...</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 16e4f9e7..89229c12 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -233,7 +233,6 @@
     <string name="playlist_is_empty">Playlist je prázdný</string>
     <string name="playing_notification_description">Oznámení o přehrávání obsahuje akce pro přehrávání/pauzu atd.</string>
     <string name="playing_notification_name">Oznámení o přehrávání</string>
-    <string name="only_the_first_5_colors_available">Ve verzi zdarma je dostupných pouze prvních 5 barev.</string>
     <string name="black_theme_is_a_pro_feature">Černý motiv je funkce Phonograph Pro.</string>
     <string name="sleep_timer_is_a_pro_feature">Časovač vypnutí je funkce Phonograph Pro.</string>
     <string name="restoring_purchase">Obnovení nákupu...</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 259d3ca8..b10ce4c9 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -237,7 +237,6 @@
     <string name="playlist_is_empty">Die Wiedergabeliste ist leer</string>
     <string name="playing_notification_description">Die Benachrichtigung zur Steuerung von Play/Pause etc.</string>
     <string name="playing_notification_name">Wiedergabe-Benachrichtigung</string>
-    <string name="only_the_first_5_colors_available">Nur die ersten 5 Farben sind in der kostenlosen Version verfügbar.</string>
     <string name="black_theme_is_a_pro_feature">Das schwarze Theme ist ein Phonograph Pro-Feature</string>
     <string name="sleep_timer_is_a_pro_feature">Der Einschlaf-Timer ist ein Phonograph Pro-Feature</string>
     <string name="restoring_purchase">Stelle Kauf wieder her...</string>
diff --git a/app/src/main/res/values-en-rCA/strings.xml b/app/src/main/res/values-en-rCA/strings.xml
index 18e5827d..65791e98 100644
--- a/app/src/main/res/values-en-rCA/strings.xml
+++ b/app/src/main/res/values-en-rCA/strings.xml
@@ -224,7 +224,6 @@
     <string name="playlist_is_empty">Playlist is empty</string>
     <string name="playing_notification_description">The playing notification provides actions for play/pause etc.</string>
     <string name="playing_notification_name">Playing notification</string>
-    <string name="only_the_first_5_colors_available">Only the first 5 colors are available in the free version.</string>
     <string name="black_theme_is_a_pro_feature">The black theme is Phonograph Pro feature.</string>
     <string name="sleep_timer_is_a_pro_feature">Sleep timer is a Phonograph Pro feature</string>
     <string name="restoring_purchase">Restoring purchase…</string>
diff --git a/app/src/main/res/values-en-rGB/strings.xml b/app/src/main/res/values-en-rGB/strings.xml
index 5f2a47ee..45ce7e8d 100644
--- a/app/src/main/res/values-en-rGB/strings.xml
+++ b/app/src/main/res/values-en-rGB/strings.xml
@@ -230,7 +230,6 @@
     <string name="playlist_is_empty">Playlist is empty</string>
     <string name="playing_notification_description">The playing notification provides actions for play/pause etc.</string>
     <string name="playing_notification_name">Playing notification</string>
-    <string name="only_the_first_5_colors_available">Only the first 5 colours are available in the free version.</string>
     <string name="black_theme_is_a_pro_feature">The black theme is Phonograph Pro feature.</string>
     <string name="sleep_timer_is_a_pro_feature">Sleep timer is a Phonograph Pro feature</string>
     <string name="restoring_purchase">Restoring purchase…</string>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index 767ba71e..fafb51a6 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -237,7 +237,6 @@
     <string name="playlist_is_empty">Lista de reproducción vacía</string>
     <string name="playing_notification_description">La notificación de reproducción muestra acciones para reproducir/pausar etc.</string>
     <string name="playing_notification_name">Notificación de reproducción</string>
-    <string name="only_the_first_5_colors_available">Sólo los primeros 5 colores están disponibles en la versión gratuita.</string>
     <string name="black_theme_is_a_pro_feature">El tema negro es una característica de Phonograph Pro.</string>
     <string name="sleep_timer_is_a_pro_feature">El temporizador de sueño es una característica de Phonograph Pro.</string>
     <string name="restoring_purchase">Restableciendo la compra...</string>
diff --git a/app/src/main/res/values-es-rUS/strings.xml b/app/src/main/res/values-es-rUS/strings.xml
index d7168e30..66a4f0e9 100644
--- a/app/src/main/res/values-es-rUS/strings.xml
+++ b/app/src/main/res/values-es-rUS/strings.xml
@@ -232,7 +232,6 @@
     <string name="playlist_is_empty">La lista de reproducción está vacía</string>
     <string name="playing_notification_description">La notificación de reproducción proporciona acciones para reproducir/pausar, etc.</string>
     <string name="playing_notification_name">Notificación de reproducción</string>
-    <string name="only_the_first_5_colors_available">Solo los primeros 5 colores están disponibles en la versión gratuita.</string>
     <string name="black_theme_is_a_pro_feature">El tema negro es una función de Phonograph Pro.</string>
     <string name="sleep_timer_is_a_pro_feature">El temporizador de apagado es una función de Phonograph Pro</string>
     <string name="restoring_purchase">Restaurando compra...</string>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index f18efe38..b64f4248 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -237,7 +237,6 @@
     <string name="playlist_is_empty">Soittolista on tyhjä</string>
     <string name="playing_notification_description">Toistoilmoitus sisältää nappeja musiikin toistolle/pysäyttämiselle jne.</string>
     <string name="playing_notification_name">Toistoilmoitus</string>
-    <string name="only_the_first_5_colors_available">Sovelluksen ilmaisversio on rajoitettu 5 ensimmäiseen värivaihtoehtoon.</string>
     <string name="black_theme_is_a_pro_feature">Musta teema on Phonograph Pro:n ominaisuus.</string>
     <string name="sleep_timer_is_a_pro_feature">Herätyskello on Phonograph Pro:n ominaisuus.</string>
     <string name="restoring_purchase">Palautetaan ostoa...</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index fb59005d..229c7979 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -232,7 +232,6 @@
     <string name="playlist_is_empty">La liste de lecture est vide</string>
     <string name="playing_notification_description">La notification de lecture fournit des actions pour la lecture/pause etc.</string>
     <string name="playing_notification_name">Notification de lecture</string>
-    <string name="only_the_first_5_colors_available">Seules les 5 premières couleurs sont disponibles dans la version gratuite.</string>
     <string name="black_theme_is_a_pro_feature">Le thème noir est une fonctionnalité Phonograph Pro</string>
     <string name="sleep_timer_is_a_pro_feature">Le minuteur de sommeil est une fonctionnalité Phonograph Pro</string>
     <string name="restoring_purchase">Restauration des achats...</string>
diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index 1ce3e20c..db1e5b68 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -233,7 +233,6 @@
     <string name="playlist_is_empty">רשימת ההשמעה ריקה</string>
     <string name="playing_notification_description">התראת הניגון מספקת פעולות הפעלה/השהייה וכו\'.</string>
     <string name="playing_notification_name">התראת ניגון</string>
-    <string name="only_the_first_5_colors_available">רק 5 הצבעים הראשונים זמינים בגרסה החינמית.</string>
     <string name="black_theme_is_a_pro_feature">ערכת הנושא השחורה היא אפשרות הזמינה ב-Phonograph Pro בלבד.</string>
     <string name="sleep_timer_is_a_pro_feature">טיימר לשינה הוא אפשרות הזמינה ב-Phonograph Pro בלבד.</string>
     <string name="restoring_purchase">משחזר רכישה...</string>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 22b7a84a..36081969 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -233,7 +233,6 @@
     <string name="playlist_is_empty">Popis naslova je prazan</string>
     <string name="playing_notification_description">Obavijest reprodukcije pruža radnje za reprodukciju/pauzu itd.</string>
     <string name="playing_notification_name">Obavijest reprodukcije</string>
-    <string name="only_the_first_5_colors_available">Samo je prvih 5 boja dostupno u besplatnoj verziji.</string>
     <string name="black_theme_is_a_pro_feature">Crna tema je Phonograph Pro značajka.</string>
     <string name="sleep_timer_is_a_pro_feature">Tajmer za spavanje je Phonograph Pro značajka.</string>
     <string name="restoring_purchase">Vraćanje kupnje...</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 39abac07..e1b4844c 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -233,7 +233,6 @@
     <string name="playlist_is_empty">A lejátszási lista üres</string>
     <string name="playing_notification_description">A lejátszási értesítés lejátszási / szüneteltetési intézkedéseket tartalmaz.</string>
     <string name="playing_notification_name">Értesítés lejátszása</string>
-    <string name="only_the_first_5_colors_available">Csak az első 5 szín áll rendelkezésre az ingyenes verzióban.</string>
     <string name="black_theme_is_a_pro_feature">A fekete téma a Phonograph Pro funkcióban van.</string>
     <string name="sleep_timer_is_a_pro_feature">Az elalvásidőzitő a Phonograph Pro funkcióban van.</string>
     <string name="restoring_purchase">A vásárlás visszaállítása...</string>
diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml
index 8af50544..967afba1 100644
--- a/app/src/main/res/values-id/strings.xml
+++ b/app/src/main/res/values-id/strings.xml
@@ -237,7 +237,6 @@
     <string name="playlist_is_empty">Daftar putar kosong</string>
     <string name="playing_notification_description">Notifikasi bermain memberi tindakan untuk putar/jeda, dll.</string>
     <string name="playing_notification_name">Notifikasi bermain</string>
-    <string name="only_the_first_5_colors_available">Hanya 5 warna pertama yang tersedia untuk versi gratis.</string>
     <string name="black_theme_is_a_pro_feature">Tema gelap adalah fitur Phonograph Pro.</string>
     <string name="sleep_timer_is_a_pro_feature">Pengatur waktu tidur adalah fitur Phonograph Pro</string>
     <string name="restoring_purchase">Memulihkan pembelian...</string>
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index 8af50544..967afba1 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -237,7 +237,6 @@
     <string name="playlist_is_empty">Daftar putar kosong</string>
     <string name="playing_notification_description">Notifikasi bermain memberi tindakan untuk putar/jeda, dll.</string>
     <string name="playing_notification_name">Notifikasi bermain</string>
-    <string name="only_the_first_5_colors_available">Hanya 5 warna pertama yang tersedia untuk versi gratis.</string>
     <string name="black_theme_is_a_pro_feature">Tema gelap adalah fitur Phonograph Pro.</string>
     <string name="sleep_timer_is_a_pro_feature">Pengatur waktu tidur adalah fitur Phonograph Pro</string>
     <string name="restoring_purchase">Memulihkan pembelian...</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 78ba603e..475a119d 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -238,7 +238,6 @@
     <string name="playlist_is_empty">La playlist è vuota</string>
     <string name="playing_notification_description">La notifica di riproduzione offre azioni per play/pausa ecc.</string>
     <string name="playing_notification_name">Notifica di riproduzione</string>
-    <string name="only_the_first_5_colors_available">Solo i primi cinque colori sono disponibili nella versione gratuita.</string>
     <string name="black_theme_is_a_pro_feature">Il tema scuro è una funzionalità di Phonograph Pro.</string>
     <string name="sleep_timer_is_a_pro_feature">Il timer di spegnimento è una funzionalità di Phonograph Pro.</string>
     <string name="restoring_purchase">Ripristinando l\'acquisto...</string>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index 1ce3e20c..db1e5b68 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -233,7 +233,6 @@
     <string name="playlist_is_empty">רשימת ההשמעה ריקה</string>
     <string name="playing_notification_description">התראת הניגון מספקת פעולות הפעלה/השהייה וכו\'.</string>
     <string name="playing_notification_name">התראת ניגון</string>
-    <string name="only_the_first_5_colors_available">רק 5 הצבעים הראשונים זמינים בגרסה החינמית.</string>
     <string name="black_theme_is_a_pro_feature">ערכת הנושא השחורה היא אפשרות הזמינה ב-Phonograph Pro בלבד.</string>
     <string name="sleep_timer_is_a_pro_feature">טיימר לשינה הוא אפשרות הזמינה ב-Phonograph Pro בלבד.</string>
     <string name="restoring_purchase">משחזר רכישה...</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 3cc2543a..83190f8d 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -233,7 +233,6 @@
     <string name="playlist_is_empty">プレイリストは空です</string>
     <string name="playing_notification_description">再生の通知は再生/一時停止などを提供します。</string>
     <string name="playing_notification_name">再生中の通知</string>
-    <string name="only_the_first_5_colors_available">無料版では5色のみ利用可能です。</string>
     <string name="black_theme_is_a_pro_feature">黒テーマはPhonograph Proの機能です。</string>
     <string name="sleep_timer_is_a_pro_feature">スリープ タイマーはPhonograph Proの機能です。</string>
     <string name="restoring_purchase">購入を復元中…</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 9512bced..69b31e05 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -235,7 +235,6 @@
     <string name="playlist_is_empty">재생 목록이 비어 있습니다.</string>
     <string name="playing_notification_description">재생 알림을 통해 재생/일시 정지 등을 제어할 수 있습니다.</string>
     <string name="playing_notification_name">재생 알림</string>
-    <string name="only_the_first_5_colors_available">무료 버전에서는 첫 5개의 색상만 선택 가능합니다.</string>
     <string name="black_theme_is_a_pro_feature">검정 테마는 프로 기능입니다.</string>
     <string name="sleep_timer_is_a_pro_feature">수면 타이머는 프로 기능입니다.</string>
     <string name="restoring_purchase">구매 내역을 복원하는 중…</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index b423daab..39e5a313 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -233,7 +233,6 @@
     <string name="playlist_is_empty">Afspeellijst is leeg</string>
     <string name="playing_notification_description">De afspeelmelding biedt acties voor afspelen/pauzeren etc.</string>
     <string name="playing_notification_name">Afspeelmelding</string>
-    <string name="only_the_first_5_colors_available">Alleen de eerste 5 kleuren zijn beschikbaar in de gratis versie.</string>
     <string name="black_theme_is_a_pro_feature">Het zwarte thema is een Phonograph Pro functie.</string>
     <string name="sleep_timer_is_a_pro_feature">Slaaptimer is een Phonograph Pro functie.</string>
     <string name="restoring_purchase">Aankoop herstellen…</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 037a39d6..ab6e4378 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -233,7 +233,6 @@
     <string name="playlist_is_empty">Lista odtwarzania jest pusta</string>
     <string name="playing_notification_description">Powiadomienie odtwarzania pozwala na zatrzymywanie/wznawianie itd.</string>
     <string name="playing_notification_name">Powiadomienie o odtwarzaniu</string>
-    <string name="only_the_first_5_colors_available">Tylko 5 pierwszych kolorów jest dostępnych w darmowej wersji.</string>
     <string name="black_theme_is_a_pro_feature">Czarny motyw jest funkcją Phonograph Pro.</string>
     <string name="sleep_timer_is_a_pro_feature">Wyłączenie czasowe jest funkcją Phonograph Pro.</string>
     <string name="restoring_purchase">Przywracanie zakupu...</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 93f4e127..c3eb3b08 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -237,7 +237,6 @@
     <string name="playlist_is_empty">A playlist está vazia</string>
     <string name="playing_notification_description">A notificação de reprodução fornece opções de pausar/continuar etc.</string>
     <string name="playing_notification_name">Notificação de reprodução</string>
-    <string name="only_the_first_5_colors_available">Apenas as primeiras 5 cores estão disponíveis na versão grátis.</string>
     <string name="black_theme_is_a_pro_feature">O tema escuro é um recurso da versão Pro do Phonograph.</string>
     <string name="sleep_timer_is_a_pro_feature">Temporizador de soneca é um recurso da versão Pro do Phonograph</string>
     <string name="restoring_purchase">Restituindo compra...</string>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 3a27303b..f8e609af 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -233,7 +233,6 @@
     <string name="playlist_is_empty">Listă de redare goală</string>
     <string name="playing_notification_description">Notificarea de redare oferă acțiuni de redare/pauză etc.</string>
     <string name="playing_notification_name">Notificare de redare</string>
-    <string name="only_the_first_5_colors_available">Numai primele 5 culori sunt disponibile în versiunea gratuită.</string>
     <string name="black_theme_is_a_pro_feature">Tema întunecată este disponibilă doar în versiunea Phonograph Pro.</string>
     <string name="sleep_timer_is_a_pro_feature">Temporizatorul este disponibil doar în versiunea Phonograph Pro</string>
     <string name="restoring_purchase">Se restabilește achiziția...</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 23ce23b1..6fcc8217 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -237,7 +237,6 @@
     <string name="playlist_is_empty">Плейлист пуст</string>
     <string name="playing_notification_description">С помощью уведомления о воспроизведении можно воспроизводить/ставить на паузу и т.д.</string>
     <string name="playing_notification_name">Уведомление о воспроизведении</string>
-    <string name="only_the_first_5_colors_available">Только первые 5 цветов доступны в бесплатной версии.</string>
     <string name="black_theme_is_a_pro_feature">Чёрная тема это функция Phonograph Pro.</string>
     <string name="sleep_timer_is_a_pro_feature">Таймер сна это функция Phonograph Pro.</string>
     <string name="restoring_purchase">Восстановление покупки...</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 13cbc822..781a0b82 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -233,7 +233,6 @@
     <string name="playlist_is_empty">Çalma listesi boş</string>
     <string name="playing_notification_description">Çalma bildirimi, başlat/duraklat vb. işlemleri sağlar</string>
     <string name="playing_notification_name">Çalma bildirimi</string>
-    <string name="only_the_first_5_colors_available">Ücretsiz sürümde sadece ilk 5 renk mevcuttur.</string>
     <string name="black_theme_is_a_pro_feature">Siyah tema, Phonograph Pro özelliğidir.</string>
     <string name="sleep_timer_is_a_pro_feature">Uyku zamanlayıcı bir Phonograph Pro özelliğidir.</string>
     <string name="restoring_purchase">Satın alma geri yükleniyor...</string>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index b2294e3e..3f0d8331 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -223,7 +223,6 @@
     <string name="playlist_is_empty">Danh sách nhạc trống</string>
     <string name="playing_notification_description">Thông báo đang phát cung cấp các hành động để phát / tạm dừng vv.</string>
     <string name="playing_notification_name">Thông báo đang phát</string>
-    <string name="only_the_first_5_colors_available">Chỉ 5 màu đầu tiên có trong phiên bản miễn phí.</string>
     <string name="black_theme_is_a_pro_feature">Chủ đề màu đen là tính năng của Phonograph Pro.</string>
     <string name="sleep_timer_is_a_pro_feature">Hẹn giờ ngủ là một tính năng của Phonograph Pro</string>
     <string name="restoring_purchase">Đang khôi phục mua hàng...</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index af9db232..c2b0dbc0 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -235,7 +235,6 @@
     <string name="playlist_is_empty">播放列表为空</string>
     <string name="playing_notification_description">正在播放通知提供了播放/暂停等便捷操作。</string>
     <string name="playing_notification_name">正在播放通知</string>
-    <string name="only_the_first_5_colors_available">免费版仅能使用前 5 个主题色。</string>
     <string name="black_theme_is_a_pro_feature">黑色主题仅适用于 Phonograph Pro。</string>
     <string name="sleep_timer_is_a_pro_feature">睡眠计时器仅适用于 Phonograph Pro。</string>
     <string name="restoring_purchase">正在恢复购买状态...</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 95edfd1a..5a91d11d 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -238,7 +238,6 @@
     <string name="playlist_is_empty">播放清單是空的</string>
     <string name="playing_notification_description">播放中通知提供了播放/暫停等操作</string>
     <string name="playing_notification_name">播放中通知</string>
-    <string name="only_the_first_5_colors_available">免費版僅能使用前 5 個顏色</string>
     <string name="black_theme_is_a_pro_feature">黑色主題僅供 Phonograph Pro 使用</string>
     <string name="sleep_timer_is_a_pro_feature">睡眠定時器僅供 Phonograph Pro 使用</string>
     <string name="restoring_purchase">恢復購買中...</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d602ade8..38c4d9f6 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -249,7 +249,6 @@
     <string name="playlist_is_empty">Playlist is empty</string>
     <string name="playing_notification_description">The playing notification provides actions for play/pause etc.</string>
     <string name="playing_notification_name">Playing notification</string>
-    <string name="only_the_first_5_colors_available">Only the first 5 colors are available in the free version.</string>
     <string name="black_theme_is_a_pro_feature">The black theme is Phonograph Pro feature.</string>
     <string name="sleep_timer_is_a_pro_feature">Sleep timer is a Phonograph Pro feature</string>
     <string name="restoring_purchase">Restoring purchase…</string>