diff --git a/app/src/main/java/com/kabouzeid/gramophone/helper/MenuItemClickHelper.java b/app/src/main/java/com/kabouzeid/gramophone/helper/MenuItemClickHelper.java
index 681dc5be..b1b75e78 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/helper/MenuItemClickHelper.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/helper/MenuItemClickHelper.java
@@ -15,11 +15,11 @@ import com.kabouzeid.gramophone.dialogs.SongDetailDialog;
 import com.kabouzeid.gramophone.interfaces.PaletteColorHolder;
 import com.kabouzeid.gramophone.loader.PlaylistSongLoader;
 import com.kabouzeid.gramophone.loader.SongFilePathLoader;
-import com.kabouzeid.gramophone.misc.AppKeys;
 import com.kabouzeid.gramophone.model.Playlist;
 import com.kabouzeid.gramophone.model.Song;
 import com.kabouzeid.gramophone.model.smartplaylist.SmartPlaylist;
 import com.kabouzeid.gramophone.ui.activities.base.AbsFabActivity;
+import com.kabouzeid.gramophone.ui.activities.tageditor.AbsTagEditorActivity;
 import com.kabouzeid.gramophone.ui.activities.tageditor.SongTagEditorActivity;
 import com.kabouzeid.gramophone.util.MusicUtil;
 import com.kabouzeid.gramophone.util.NavigationUtil;
@@ -54,9 +54,9 @@ public class MenuItemClickHelper {
                 return true;
             case R.id.action_tag_editor:
                 Intent tagEditorIntent = new Intent(activity, SongTagEditorActivity.class);
-                tagEditorIntent.putExtra(AppKeys.E_ID, song.id);
+                tagEditorIntent.putExtra(AbsTagEditorActivity.EXTRA_ID, song.id);
                 if (activity instanceof PaletteColorHolder)
-                    tagEditorIntent.putExtra(AppKeys.E_PALETTE, ((PaletteColorHolder) activity).getPaletteColor());
+                    tagEditorIntent.putExtra(AbsTagEditorActivity.EXTRA_PALETTE, ((PaletteColorHolder) activity).getPaletteColor());
                 activity.startActivity(tagEditorIntent);
                 return true;
             case R.id.action_details:
diff --git a/app/src/main/java/com/kabouzeid/gramophone/misc/AppKeys.java b/app/src/main/java/com/kabouzeid/gramophone/misc/AppKeys.java
deleted file mode 100644
index 2c652966..00000000
--- a/app/src/main/java/com/kabouzeid/gramophone/misc/AppKeys.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.kabouzeid.gramophone.misc;
-
-/**
- * @author Karim Abou Zeid (kabouzeid)
- */
-public final class AppKeys {
-    public static final String SP_SHUFFLE_MODE = "com.kabouzeid.gramophone.SHUFFLE_MODE";
-    public static final String SP_REPEAT_MODE = "com.kabouzeid.gramophone.REPEAT_MODE";
-
-    public static final String E_ALBUM = "com.kabouzeid.gramophone.ALBUM";
-    public static final String E_ARTIST = "com.kabouzeid.gramophone.ARTIST";
-    public static final String E_ID = "com.kabouzeid.gramophone.ID";
-    public static final String E_PALETTE = "com.kabouzeid.gramophone.PALETTE";
-}
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 c14d58f5..c873426b 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/service/MusicService.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/service/MusicService.java
@@ -30,7 +30,6 @@ import com.kabouzeid.gramophone.R;
 import com.kabouzeid.gramophone.appwidget.MusicPlayerWidget;
 import com.kabouzeid.gramophone.helper.PlayingNotificationHelper;
 import com.kabouzeid.gramophone.helper.ShuffleHelper;
-import com.kabouzeid.gramophone.misc.AppKeys;
 import com.kabouzeid.gramophone.model.Song;
 import com.kabouzeid.gramophone.provider.MusicPlaybackQueueStore;
 import com.kabouzeid.gramophone.provider.RecentlyPlayedStore;
@@ -71,8 +70,10 @@ public class MusicService extends Service {
     public static final String SETTING_GAPLESS_PLAYBACK_CHANGED = "com.kabouzeid.gramophone.SETTING_GAPLESS_PLAYBACK_CHANGED";
     public static final String SETTING_GAPLESS_PLAYBACK_CHANGED_VALUE_EXTRA = "com.kabouzeid.gramophone.SETTING_GAPLESS_PLAYBACK_CHANGED_VALUE_EXTRA";
 
-    public static final String SAVED_POSITION = "SAVED_POSITION";
-    public static final String SAVED_POSITION_IN_TRACK = "SAVED_POSITION_IN_TRACK";
+    public static final String SAVED_POSITION = "POSITION";
+    public static final String SAVED_POSITION_IN_TRACK = "POSITION_IN_TRACK";
+    public static final String SAVED_SHUFFLE_MODE = "SHUFFLE_MODE";
+    public static final String SAVED_REPEAT_MODE = "REPEAT_MODE";
 
     private static final int FOCUS_CHANGE = 5;
     private static final int DUCK = 6;
@@ -154,8 +155,8 @@ public class MusicService extends Service {
         recentlyPlayedStore = RecentlyPlayedStore.getInstance(this);
         songPlayCountStore = SongPlayCountStore.getInstance(this);
 
-        shuffleMode = PreferenceManager.getDefaultSharedPreferences(this).getInt(AppKeys.SP_SHUFFLE_MODE, 0);
-        repeatMode = PreferenceManager.getDefaultSharedPreferences(this).getInt(AppKeys.SP_REPEAT_MODE, 0);
+        shuffleMode = PreferenceManager.getDefaultSharedPreferences(this).getInt(SAVED_SHUFFLE_MODE, 0);
+        repeatMode = PreferenceManager.getDefaultSharedPreferences(this).getInt(SAVED_REPEAT_MODE, 0);
 
         final PowerManager powerManager = (PowerManager) getSystemService(Context.POWER_SERVICE);
         wakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, getClass().getName());
@@ -505,7 +506,7 @@ public class MusicService extends Service {
             case REPEAT_MODE_THIS:
                 this.repeatMode = repeatMode;
                 PreferenceManager.getDefaultSharedPreferences(this).edit()
-                        .putInt(AppKeys.SP_REPEAT_MODE, repeatMode)
+                        .putInt(SAVED_REPEAT_MODE, repeatMode)
                         .apply();
                 prepareNext();
                 notifyChange(REPEAT_MODE_CHANGED);
@@ -755,7 +756,7 @@ public class MusicService extends Service {
 
     public void setShuffleMode(final int shuffleMode) {
         PreferenceManager.getDefaultSharedPreferences(this).edit()
-                .putInt(AppKeys.SP_SHUFFLE_MODE, shuffleMode)
+                .putInt(SAVED_SHUFFLE_MODE, shuffleMode)
                 .apply();
         switch (shuffleMode) {
             case SHUFFLE_MODE_SHUFFLE:
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java
index 1f12bd20..8986ba28 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java
@@ -33,7 +33,6 @@ import com.kabouzeid.gramophone.interfaces.CabHolder;
 import com.kabouzeid.gramophone.interfaces.PaletteColorHolder;
 import com.kabouzeid.gramophone.loader.AlbumLoader;
 import com.kabouzeid.gramophone.loader.AlbumSongLoader;
-import com.kabouzeid.gramophone.misc.AppKeys;
 import com.kabouzeid.gramophone.misc.SmallObservableScrollViewCallbacks;
 import com.kabouzeid.gramophone.misc.SmallTransitionListener;
 import com.kabouzeid.gramophone.model.Album;
@@ -41,6 +40,7 @@ import com.kabouzeid.gramophone.model.DataBaseChangedEvent;
 import com.kabouzeid.gramophone.model.Song;
 import com.kabouzeid.gramophone.model.UIPreferenceChangedEvent;
 import com.kabouzeid.gramophone.ui.activities.base.AbsFabActivity;
+import com.kabouzeid.gramophone.ui.activities.tageditor.AbsTagEditorActivity;
 import com.kabouzeid.gramophone.ui.activities.tageditor.AlbumTagEditorActivity;
 import com.kabouzeid.gramophone.util.MusicUtil;
 import com.kabouzeid.gramophone.util.NavigationUtil;
@@ -60,13 +60,16 @@ import butterknife.InjectView;
 
 /**
  * A lot of hackery is done in this activity. Changing things may will brake the whole activity.
- * <p>
+ * <p/>
  * Should be kinda stable ONLY AS IT IS!!!
  */
 public class AlbumDetailActivity extends AbsFabActivity implements PaletteColorHolder, CabHolder {
 
     public static final String TAG = AlbumDetailActivity.class.getSimpleName();
     private static final int TAG_EDITOR_REQUEST = 2001;
+
+    public static final String EXTRA_ALBUM_ID = "extra_album_id";
+
     private Album album;
 
     @InjectView(R.id.list)
@@ -111,7 +114,7 @@ public class AlbumDetailActivity extends AbsFabActivity implements PaletteColorH
         Bundle intentExtras = getIntent().getExtras();
         int albumId = -1;
         if (intentExtras != null) {
-            albumId = intentExtras.getInt(AppKeys.E_ALBUM);
+            albumId = intentExtras.getInt(EXTRA_ALBUM_ID);
         }
         album = AlbumLoader.getAlbum(this, albumId);
         if (album.id == -1) {
@@ -360,7 +363,7 @@ public class AlbumDetailActivity extends AbsFabActivity implements PaletteColorH
                 return true;
             case R.id.action_tag_editor:
                 Intent intent = new Intent(this, AlbumTagEditorActivity.class);
-                intent.putExtra(AppKeys.E_ID, album.id);
+                intent.putExtra(AbsTagEditorActivity.EXTRA_ID, album.id);
                 startActivityForResult(intent, TAG_EDITOR_REQUEST);
                 return true;
             case R.id.action_go_to_artist:
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java
index b148bd2c..b2d30c96 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java
@@ -42,7 +42,6 @@ import com.kabouzeid.gramophone.lastfm.artist.LastFMArtistImageUrlLoader;
 import com.kabouzeid.gramophone.loader.ArtistAlbumLoader;
 import com.kabouzeid.gramophone.loader.ArtistLoader;
 import com.kabouzeid.gramophone.loader.ArtistSongLoader;
-import com.kabouzeid.gramophone.misc.AppKeys;
 import com.kabouzeid.gramophone.misc.SmallObservableScrollViewCallbacks;
 import com.kabouzeid.gramophone.misc.SmallTransitionListener;
 import com.kabouzeid.gramophone.model.Album;
@@ -76,6 +75,8 @@ public class ArtistDetailActivity extends AbsFabActivity implements PaletteColor
 
     public static final String TAG = ArtistDetailActivity.class.getSimpleName();
 
+    public static final String EXTRA_ARTIST_ID = "extra_artist_id";
+
     @InjectView(R.id.artist_image_background)
     ImageView artistImageBackground;
     @InjectView(R.id.artist_image)
@@ -371,7 +372,7 @@ public class ArtistDetailActivity extends AbsFabActivity implements PaletteColor
 
     private void getIntentExtras() {
         Bundle intentExtras = getIntent().getExtras();
-        final int artistId = intentExtras.getInt(AppKeys.E_ARTIST);
+        final int artistId = intentExtras.getInt(EXTRA_ARTIST_ID);
         artist = ArtistLoader.getArtist(this, artistId);
         if (artist == null) {
             finish();
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MusicControllerActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MusicControllerActivity.java
index fa0c20b6..e01d44ed 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MusicControllerActivity.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MusicControllerActivity.java
@@ -41,11 +41,11 @@ import com.kabouzeid.gramophone.dialogs.SongShareDialog;
 import com.kabouzeid.gramophone.helper.MusicPlayerRemote;
 import com.kabouzeid.gramophone.helper.bitmapblur.StackBlurManager;
 import com.kabouzeid.gramophone.loader.SongFilePathLoader;
-import com.kabouzeid.gramophone.misc.AppKeys;
 import com.kabouzeid.gramophone.misc.SmallTransitionListener;
 import com.kabouzeid.gramophone.model.Song;
 import com.kabouzeid.gramophone.service.MusicService;
 import com.kabouzeid.gramophone.ui.activities.base.AbsFabActivity;
+import com.kabouzeid.gramophone.ui.activities.tageditor.AbsTagEditorActivity;
 import com.kabouzeid.gramophone.ui.activities.tageditor.SongTagEditorActivity;
 import com.kabouzeid.gramophone.util.MusicUtil;
 import com.kabouzeid.gramophone.util.NavigationUtil;
@@ -575,7 +575,7 @@ public class MusicControllerActivity extends AbsFabActivity {
                 return true;
             case R.id.action_tag_editor:
                 Intent intent = new Intent(this, SongTagEditorActivity.class);
-                intent.putExtra(AppKeys.E_ID, song.id);
+                intent.putExtra(AbsTagEditorActivity.EXTRA_ID, song.id);
                 startActivity(intent);
                 return true;
             case R.id.action_details:
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/AbsTagEditorActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/AbsTagEditorActivity.java
index 5b817ab6..df9b214e 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/AbsTagEditorActivity.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/AbsTagEditorActivity.java
@@ -25,7 +25,6 @@ import com.afollestad.materialdialogs.util.DialogUtils;
 import com.github.ksoichiro.android.observablescrollview.ObservableScrollView;
 import com.kabouzeid.gramophone.App;
 import com.kabouzeid.gramophone.R;
-import com.kabouzeid.gramophone.misc.AppKeys;
 import com.kabouzeid.gramophone.misc.SmallObservableScrollViewCallbacks;
 import com.kabouzeid.gramophone.model.DataBaseChangedEvent;
 import com.kabouzeid.gramophone.ui.activities.base.AbsBaseActivity;
@@ -61,8 +60,12 @@ import butterknife.Optional;
 public abstract class AbsTagEditorActivity extends AbsBaseActivity {
 
     private static final String TAG = AbsTagEditorActivity.class.getSimpleName();
+
     private static final int REQUEST_CODE_SELECT_IMAGE = 1337;
 
+    public static final String EXTRA_ID = "extra_id";
+    public static final String EXTRA_PALETTE = "extra_palette";
+
     private int id;
     private int headerVariableSpace;
     private int paletteColorPrimary;
@@ -211,7 +214,7 @@ public abstract class AbsTagEditorActivity extends AbsBaseActivity {
     private void getIntentExtras() {
         Bundle intentExtras = getIntent().getExtras();
         if (intentExtras != null) {
-            id = intentExtras.getInt(AppKeys.E_ID);
+            id = intentExtras.getInt(EXTRA_ID);
         }
     }
 
@@ -249,7 +252,7 @@ public abstract class AbsTagEditorActivity extends AbsBaseActivity {
         observableScrollView.setPadding(0, Util.getActionBarSize(this), 0, 0);
         observableScrollViewCallbacks.onScrollChanged(observableScrollView.getCurrentScrollY(), false, false);
 
-        paletteColorPrimary = getIntent().getIntExtra(AppKeys.E_PALETTE,
+        paletteColorPrimary = getIntent().getIntExtra(EXTRA_PALETTE,
                 PreferenceUtils.getInstance(this).getThemeColorPrimary());
         toolbar.setBackgroundColor(paletteColorPrimary);
         header.setBackgroundColor(paletteColorPrimary);
diff --git a/app/src/main/java/com/kabouzeid/gramophone/util/NavigationUtil.java b/app/src/main/java/com/kabouzeid/gramophone/util/NavigationUtil.java
index caa45b1f..ab009169 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/util/NavigationUtil.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/util/NavigationUtil.java
@@ -14,7 +14,6 @@ import com.kabouzeid.gramophone.R;
 import com.kabouzeid.gramophone.dialogs.PlayingQueueDialog;
 import com.kabouzeid.gramophone.helper.MusicPlayerRemote;
 import com.kabouzeid.gramophone.interfaces.KabViewsDisableAble;
-import com.kabouzeid.gramophone.misc.AppKeys;
 import com.kabouzeid.gramophone.model.Playlist;
 import com.kabouzeid.gramophone.ui.activities.AlbumDetailActivity;
 import com.kabouzeid.gramophone.ui.activities.ArtistDetailActivity;
@@ -33,7 +32,7 @@ public class NavigationUtil {
             if (activity instanceof KabViewsDisableAble)
                 ((KabViewsDisableAble) activity).disableViews();
             final Intent intent = new Intent(activity, ArtistDetailActivity.class);
-            intent.putExtra(AppKeys.E_ARTIST, artistId);
+            intent.putExtra(ArtistDetailActivity.EXTRA_ARTIST_ID, artistId);
             if (sharedViews != null) {
                 @SuppressWarnings("unchecked") ActivityOptionsCompat optionsCompat = ActivityOptionsCompat.makeSceneTransitionAnimation(activity,
                         sharedViews
@@ -52,7 +51,7 @@ public class NavigationUtil {
             if (activity instanceof KabViewsDisableAble)
                 ((KabViewsDisableAble) activity).disableViews();
             final Intent intent = new Intent(activity, AlbumDetailActivity.class);
-            intent.putExtra(AppKeys.E_ALBUM, albumId);
+            intent.putExtra(AlbumDetailActivity.EXTRA_ALBUM_ID, albumId);
             if (sharedViews != null) {
                 @SuppressWarnings("unchecked") ActivityOptionsCompat optionsCompat = ActivityOptionsCompat.makeSceneTransitionAnimation(activity,
                         sharedViews