diff --git a/app/src/androidTest/java/org/isoron/uhabits/BaseAndroidTest.java b/app/src/androidTest/java/org/isoron/uhabits/BaseAndroidTest.java
index aca8bc5ba..f8a4045a2 100644
--- a/app/src/androidTest/java/org/isoron/uhabits/BaseAndroidTest.java
+++ b/app/src/androidTest/java/org/isoron/uhabits/BaseAndroidTest.java
@@ -26,6 +26,7 @@ import android.support.annotation.*;
 import android.support.test.*;
 
 import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.preferences.*;
 import org.isoron.uhabits.tasks.*;
 import org.isoron.uhabits.utils.*;
 import org.junit.*;
diff --git a/app/src/main/java/org/isoron/uhabits/AppComponent.java b/app/src/main/java/org/isoron/uhabits/AppComponent.java
index f1950434c..38b12530c 100644
--- a/app/src/main/java/org/isoron/uhabits/AppComponent.java
+++ b/app/src/main/java/org/isoron/uhabits/AppComponent.java
@@ -25,6 +25,7 @@ import org.isoron.uhabits.intents.*;
 import org.isoron.uhabits.io.*;
 import org.isoron.uhabits.models.*;
 import org.isoron.uhabits.models.sqlite.*;
+import org.isoron.uhabits.preferences.*;
 import org.isoron.uhabits.receivers.*;
 import org.isoron.uhabits.tasks.*;
 import org.isoron.uhabits.utils.*;
diff --git a/app/src/main/java/org/isoron/uhabits/activities/ThemeSwitcher.java b/app/src/main/java/org/isoron/uhabits/activities/ThemeSwitcher.java
index d0744108d..c09fccd66 100644
--- a/app/src/main/java/org/isoron/uhabits/activities/ThemeSwitcher.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/ThemeSwitcher.java
@@ -22,7 +22,7 @@ package org.isoron.uhabits.activities;
 import android.support.annotation.*;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.utils.*;
+import org.isoron.uhabits.preferences.*;
 
 import javax.inject.*;
 
diff --git a/app/src/main/java/org/isoron/uhabits/activities/habits/edit/BaseDialog.java b/app/src/main/java/org/isoron/uhabits/activities/habits/edit/BaseDialog.java
index 7f7ab4855..06936ff78 100644
--- a/app/src/main/java/org/isoron/uhabits/activities/habits/edit/BaseDialog.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/habits/edit/BaseDialog.java
@@ -32,7 +32,7 @@ import org.isoron.uhabits.activities.*;
 import org.isoron.uhabits.activities.common.dialogs.*;
 import org.isoron.uhabits.commands.*;
 import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.utils.*;
+import org.isoron.uhabits.preferences.*;
 
 import java.util.*;
 
diff --git a/app/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsController.java b/app/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsController.java
index 0b1d78d32..3fe40711f 100644
--- a/app/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsController.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsController.java
@@ -28,6 +28,7 @@ import org.isoron.uhabits.activities.habits.list.controllers.*;
 import org.isoron.uhabits.activities.habits.list.model.*;
 import org.isoron.uhabits.commands.*;
 import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.preferences.*;
 import org.isoron.uhabits.tasks.*;
 import org.isoron.uhabits.utils.*;
 import org.isoron.uhabits.widgets.*;
diff --git a/app/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsMenu.java b/app/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsMenu.java
index 66832e5bc..13651cbf5 100644
--- a/app/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsMenu.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsMenu.java
@@ -26,7 +26,7 @@ import org.isoron.uhabits.*;
 import org.isoron.uhabits.models.*;
 import org.isoron.uhabits.activities.*;
 import org.isoron.uhabits.activities.habits.list.model.*;
-import org.isoron.uhabits.utils.*;
+import org.isoron.uhabits.preferences.*;
 
 import javax.inject.*;
 
diff --git a/app/src/main/java/org/isoron/uhabits/activities/habits/list/controllers/CheckmarkButtonController.java b/app/src/main/java/org/isoron/uhabits/activities/habits/list/controllers/CheckmarkButtonController.java
index 3f59c809d..382e12cda 100644
--- a/app/src/main/java/org/isoron/uhabits/activities/habits/list/controllers/CheckmarkButtonController.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/habits/list/controllers/CheckmarkButtonController.java
@@ -25,7 +25,7 @@ import com.google.auto.factory.*;
 
 import org.isoron.uhabits.activities.habits.list.views.*;
 import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.utils.*;
+import org.isoron.uhabits.preferences.*;
 
 @AutoFactory
 public class CheckmarkButtonController
diff --git a/app/src/main/java/org/isoron/uhabits/activities/habits/list/model/HintList.java b/app/src/main/java/org/isoron/uhabits/activities/habits/list/model/HintList.java
index 9b943f554..8fa0d6274 100644
--- a/app/src/main/java/org/isoron/uhabits/activities/habits/list/model/HintList.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/habits/list/model/HintList.java
@@ -23,6 +23,7 @@ import android.support.annotation.*;
 
 import com.google.auto.factory.*;
 
+import org.isoron.uhabits.preferences.*;
 import org.isoron.uhabits.utils.*;
 
 /**
diff --git a/app/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkPanelView.java b/app/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkPanelView.java
index b58e71f52..6ab6fd3c9 100644
--- a/app/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkPanelView.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkPanelView.java
@@ -28,6 +28,7 @@ import org.isoron.uhabits.*;
 import org.isoron.uhabits.activities.habits.list.*;
 import org.isoron.uhabits.activities.habits.list.controllers.*;
 import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.preferences.*;
 import org.isoron.uhabits.utils.*;
 
 public class CheckmarkPanelView extends LinearLayout
diff --git a/app/src/main/java/org/isoron/uhabits/activities/habits/list/views/HeaderView.java b/app/src/main/java/org/isoron/uhabits/activities/habits/list/views/HeaderView.java
index c1396e037..05fdfd0d2 100644
--- a/app/src/main/java/org/isoron/uhabits/activities/habits/list/views/HeaderView.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/habits/list/views/HeaderView.java
@@ -26,6 +26,7 @@ import android.view.*;
 import android.widget.*;
 
 import org.isoron.uhabits.*;
+import org.isoron.uhabits.preferences.*;
 import org.isoron.uhabits.utils.*;
 
 import java.util.*;
diff --git a/app/src/main/java/org/isoron/uhabits/activities/habits/show/views/ScoreCard.java b/app/src/main/java/org/isoron/uhabits/activities/habits/show/views/ScoreCard.java
index 53dbcc967..dca9b1657 100644
--- a/app/src/main/java/org/isoron/uhabits/activities/habits/show/views/ScoreCard.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/habits/show/views/ScoreCard.java
@@ -27,6 +27,7 @@ import android.widget.*;
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.activities.common.views.*;
 import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.preferences.*;
 import org.isoron.uhabits.tasks.*;
 import org.isoron.uhabits.utils.*;
 
diff --git a/app/src/main/java/org/isoron/uhabits/utils/Preferences.java b/app/src/main/java/org/isoron/uhabits/preferences/Preferences.java
similarity index 95%
rename from app/src/main/java/org/isoron/uhabits/utils/Preferences.java
rename to app/src/main/java/org/isoron/uhabits/preferences/Preferences.java
index 653141e32..e20539934 100644
--- a/app/src/main/java/org/isoron/uhabits/utils/Preferences.java
+++ b/app/src/main/java/org/isoron/uhabits/preferences/Preferences.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.utils;
+package org.isoron.uhabits.preferences;
 
 import android.content.*;
 import android.preference.*;
@@ -59,24 +59,6 @@ public class Preferences
         return defaultScoreInterval;
     }
 
-    public int getTheme()
-    {
-        return prefs.getInt("pref_theme", ThemeSwitcher.THEME_LIGHT);
-    }
-
-    public boolean isPureBlackEnabled()
-    {
-        return prefs.getBoolean("pref_pure_black", false);
-    }
-
-    @Override
-    public void onSharedPreferenceChanged(SharedPreferences sharedPreferences,
-                                          String key)
-    {
-        if(key.equals("pref_checkmark_reverse_order"))
-            shouldReverseCheckmarks = null;
-    }
-
     public void setDefaultScoreSpinnerPosition(int position)
     {
         prefs.edit().putInt("pref_score_view_interval", position).apply();
@@ -122,6 +104,16 @@ public class Preferences
         prefs.edit().putBoolean("pref_show_completed", showCompleted).apply();
     }
 
+    public int getTheme()
+    {
+        return prefs.getInt("pref_theme", ThemeSwitcher.THEME_LIGHT);
+    }
+
+    public void setTheme(int theme)
+    {
+        prefs.edit().putInt("pref_theme", theme).apply();
+    }
+
     public void incrementLaunchCount()
     {
         int count = prefs.getInt("launch_count", 0);
@@ -143,14 +135,22 @@ public class Preferences
         prefs.edit().putBoolean("pref_first_run", isFirstRun).apply();
     }
 
+    public boolean isPureBlackEnabled()
+    {
+        return prefs.getBoolean("pref_pure_black", false);
+    }
+
     public boolean isShortToggleEnabled()
     {
         return prefs.getBoolean("pref_short_toggle", false);
     }
 
-    public void setShortToggleEnabled(boolean enabled)
+    @Override
+    public void onSharedPreferenceChanged(SharedPreferences sharedPreferences,
+                                          String key)
     {
-        prefs.edit().putBoolean("pref_short_toggle", enabled).apply();
+        if (key.equals("pref_checkmark_reverse_order"))
+            shouldReverseCheckmarks = null;
     }
 
     public void setDefaultHabitColor(int color)
@@ -167,11 +167,6 @@ public class Preferences
             .apply();
     }
 
-    public void setTheme(int theme)
-    {
-        prefs.edit().putInt("pref_theme", theme).apply();
-    }
-
     public boolean shouldReverseCheckmarks()
     {
         if (shouldReverseCheckmarks == null) shouldReverseCheckmarks =
diff --git a/app/src/main/java/org/isoron/uhabits/utils/WidgetPreferences.java b/app/src/main/java/org/isoron/uhabits/preferences/WidgetPreferences.java
similarity index 97%
rename from app/src/main/java/org/isoron/uhabits/utils/WidgetPreferences.java
rename to app/src/main/java/org/isoron/uhabits/preferences/WidgetPreferences.java
index e302329f7..4f4b0a0bb 100644
--- a/app/src/main/java/org/isoron/uhabits/utils/WidgetPreferences.java
+++ b/app/src/main/java/org/isoron/uhabits/preferences/WidgetPreferences.java
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.utils;
+package org.isoron.uhabits.preferences;
 
 import android.content.*;
 import android.preference.*;
diff --git a/app/src/main/java/org/isoron/uhabits/widgets/BaseWidget.java b/app/src/main/java/org/isoron/uhabits/widgets/BaseWidget.java
index 27ec75afe..2a90ec53c 100644
--- a/app/src/main/java/org/isoron/uhabits/widgets/BaseWidget.java
+++ b/app/src/main/java/org/isoron/uhabits/widgets/BaseWidget.java
@@ -28,7 +28,7 @@ import android.widget.*;
 
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.intents.*;
-import org.isoron.uhabits.utils.*;
+import org.isoron.uhabits.preferences.*;
 
 import static android.os.Build.VERSION.*;
 import static android.os.Build.VERSION_CODES.*;
diff --git a/app/src/main/java/org/isoron/uhabits/widgets/BaseWidgetProvider.java b/app/src/main/java/org/isoron/uhabits/widgets/BaseWidgetProvider.java
index 1315630c8..2256c338c 100644
--- a/app/src/main/java/org/isoron/uhabits/widgets/BaseWidgetProvider.java
+++ b/app/src/main/java/org/isoron/uhabits/widgets/BaseWidgetProvider.java
@@ -27,7 +27,7 @@ import android.widget.*;
 
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.utils.*;
+import org.isoron.uhabits.preferences.*;
 
 import static android.os.Build.VERSION.*;
 import static android.os.Build.VERSION_CODES.*;
diff --git a/app/src/main/java/org/isoron/uhabits/widgets/HabitPickerDialog.java b/app/src/main/java/org/isoron/uhabits/widgets/HabitPickerDialog.java
index 5f3157a0f..e648db7e6 100644
--- a/app/src/main/java/org/isoron/uhabits/widgets/HabitPickerDialog.java
+++ b/app/src/main/java/org/isoron/uhabits/widgets/HabitPickerDialog.java
@@ -27,7 +27,7 @@ import android.widget.*;
 
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.utils.*;
+import org.isoron.uhabits.preferences.*;
 
 import java.util.*;
 
diff --git a/app/src/main/java/org/isoron/uhabits/widgets/ScoreWidget.java b/app/src/main/java/org/isoron/uhabits/widgets/ScoreWidget.java
index 0473677e6..e515be2af 100644
--- a/app/src/main/java/org/isoron/uhabits/widgets/ScoreWidget.java
+++ b/app/src/main/java/org/isoron/uhabits/widgets/ScoreWidget.java
@@ -28,6 +28,7 @@ import org.isoron.uhabits.*;
 import org.isoron.uhabits.activities.common.views.*;
 import org.isoron.uhabits.activities.habits.show.views.*;
 import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.preferences.*;
 import org.isoron.uhabits.utils.*;
 import org.isoron.uhabits.widgets.views.*;
 
diff --git a/app/src/test/java/org/isoron/uhabits/activities/habits/list/controllers/CheckmarkButtonControllerTest.java b/app/src/test/java/org/isoron/uhabits/activities/habits/list/controllers/CheckmarkButtonControllerTest.java
index 7f2dd1e63..e9e6375c5 100644
--- a/app/src/test/java/org/isoron/uhabits/activities/habits/list/controllers/CheckmarkButtonControllerTest.java
+++ b/app/src/test/java/org/isoron/uhabits/activities/habits/list/controllers/CheckmarkButtonControllerTest.java
@@ -22,7 +22,7 @@ package org.isoron.uhabits.activities.habits.list.controllers;
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.activities.habits.list.views.*;
 import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.utils.*;
+import org.isoron.uhabits.preferences.*;
 import org.junit.*;
 
 import static org.mockito.Mockito.*;