diff --git a/app/src/main/kotlin/com/simplemobiletools/applauncher/adapters/RecyclerAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/applauncher/adapters/RecyclerAdapter.kt
index e5f10cd..b2099bc 100644
--- a/app/src/main/kotlin/com/simplemobiletools/applauncher/adapters/RecyclerAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/applauncher/adapters/RecyclerAdapter.kt
@@ -29,7 +29,7 @@ class RecyclerAdapter(val act: Activity, val launchers: List<AppLauncher>, val i
         var actMode: ActionMode? = null
     }
 
-    val multiSelectorMode = object : ModalMultiSelectorCallback(multiSelector) {
+    private val multiSelectorMode = object : ModalMultiSelectorCallback(multiSelector) {
         override fun onActionItemClicked(mode: ActionMode?, item: MenuItem): Boolean {
             return when (item.itemId) {
                 R.id.cab_edit -> {
diff --git a/app/src/main/res/layout/app_launcher_item.xml b/app/src/main/res/layout/app_launcher_item.xml
index e5423b1..23bc222 100644
--- a/app/src/main/res/layout/app_launcher_item.xml
+++ b/app/src/main/res/layout/app_launcher_item.xml
@@ -5,10 +5,10 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:background="?attr/selectableItemBackground"
-    android:paddingBottom="@dimen/launcher_padding_small"
-    android:paddingLeft="@dimen/launcher_padding_small"
-    android:paddingRight="@dimen/launcher_padding_small"
-    android:paddingTop="@dimen/launcher_padding_large">
+    android:paddingBottom="@dimen/small_margin"
+    android:paddingLeft="@dimen/small_margin"
+    android:paddingRight="@dimen/small_margin"
+    android:paddingTop="@dimen/medium_margin">
 
     <ImageView
         android:id="@+id/launcher_icon"
@@ -21,9 +21,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@+id/launcher_icon"
-        android:layout_marginTop="@dimen/launcher_padding_smallest"
+        android:layout_marginTop="@dimen/tiny_margin"
         android:gravity="center_horizontal|top"
-        android:textSize="@dimen/font_size_smaller"/>
+        android:textSize="@dimen/smaller_text_size"/>
 
     <ImageView
         android:id="@+id/launcher_check"
diff --git a/app/src/main/res/layout/launcher_picker.xml b/app/src/main/res/layout/launcher_picker.xml
index d912c2b..ce51f86 100644
--- a/app/src/main/res/layout/launcher_picker.xml
+++ b/app/src/main/res/layout/launcher_picker.xml
@@ -6,6 +6,6 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:clipToPadding="false"
-    android:padding="@dimen/launcher_padding_large"
+    android:padding="@dimen/medium_margin"
     app:layoutManager="android.support.v7.widget.GridLayoutManager"
     app:spanCount="@integer/columns"/>
diff --git a/app/src/main/res/values-sw600dp/dimens.xml b/app/src/main/res/values-sw600dp/dimens.xml
deleted file mode 100644
index b2c98e3..0000000
--- a/app/src/main/res/values-sw600dp/dimens.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<resources>
-    <dimen name="social_padding">12dp</dimen>
-    <dimen name="social_logo">50dp</dimen>
-</resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index ca8ad63..d781ec5 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorPrimary">#fff68630</color>
-    <color name="colorPrimaryDark">#ffe27725</color>
-    <color name="colorAccent">@color/colorPrimary</color>
+
 </resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 373d18b..ed88bb3 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -1,14 +1,3 @@
 <resources>
-    <dimen name="activity_margin">16dp</dimen>
-    <dimen name="social_padding">8dp</dimen>
-    <dimen name="social_logo">40dp</dimen>
-    <dimen name="settings_padding">8dp</dimen>
-    <dimen name="launcher_padding_smallest">2dp</dimen>
-    <dimen name="launcher_padding_small">4dp</dimen>
-    <dimen name="launcher_padding_large">8dp</dimen>
-    <dimen name="icon_size">60dp</dimen>
     <dimen name="icon_size_smaller">50dp</dimen>
-
-    <dimen name="normal_text_size">14sp</dimen>
-    <dimen name="font_size_smaller">11sp</dimen>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 9f768c1..0be5041 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,18 +1,5 @@
 <resources>
 
-    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
-        <item name="android:textSize">@dimen/normal_text_size</item>
-    </style>
-
-    <style name="AppTheme.Dark" parent="Theme.AppCompat">
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
-        <item name="android:textSize">@dimen/normal_text_size</item>
-        <item name="android:windowBackground">@android:color/black</item>
-    </style>
+    <style name="AppTheme" parent="AppTheme.Base"/>
 
 </resources>