diff --git a/app/src/main/java/in/dragons/galaxy/PreferenceActivity.java b/app/src/main/java/in/dragons/galaxy/PreferenceActivity.java
index cec3c076e..dc2c5944f 100644
--- a/app/src/main/java/in/dragons/galaxy/PreferenceActivity.java
+++ b/app/src/main/java/in/dragons/galaxy/PreferenceActivity.java
@@ -1,12 +1,18 @@
 package in.dragons.galaxy;
 
 import android.content.Context;
+import android.graphics.Color;
 import android.os.Bundle;
 import android.preference.CheckBoxPreference;
 import android.preference.EditTextPreference;
 import android.preference.ListPreference;
 import android.preference.PreferenceManager;
 import android.util.Log;
+import android.view.Window;
+import android.view.WindowManager;
+
+import com.afollestad.aesthetic.Aesthetic;
+import com.percolate.caffeine.ViewUtils;
 
 import in.dragons.galaxy.fragment.preference.Blacklist;
 import in.dragons.galaxy.fragment.preference.CheckUpdates;
@@ -38,7 +44,10 @@ public class PreferenceActivity extends android.preference.PreferenceActivity {
     public static final String INSTALLATION_METHOD_PRIVILEGED = "privileged";
 
     public static final String LIST_BLACK = "black";
-    
+
+    private android.support.v7.widget.Toolbar mToolbar;
+    private Boolean isBlack = false;
+
     static public boolean getBoolean(Context context, String key) {
         return PreferenceManager.getDefaultSharedPreferences(context).getBoolean(key, false);
     }
@@ -65,11 +74,32 @@ public class PreferenceActivity extends android.preference.PreferenceActivity {
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
+        Aesthetic.get()
+                .isDark()
+                .take(1)
+                .subscribe(isDark -> {
+                    if (isDark)
+                        setTheme(R.style.AppTheme_Dark);
+                });
+
+        Aesthetic.get()
+                .colorWindowBackground()
+                .take(1)
+                .subscribe(colorWindowBackground -> {
+                    if (colorWindowBackground == Color.BLACK)
+                        isBlack = true;
+                });
+
+        if (isBlack)
+            setTheme(R.style.AppTheme_Black);
+
         super.onCreate(savedInstanceState);
         addPreferencesFromResource(R.xml.settings);
 
         setContentView(R.layout.preference_activity_layout);
 
+        initPaint();
+
         drawBlackList();
         drawLanguages();
         drawUpdatesCheck();
@@ -78,6 +108,15 @@ public class PreferenceActivity extends android.preference.PreferenceActivity {
         new DownloadDirectory(this).setPreference((EditTextPreference) findPreference(PREFERENCE_DOWNLOAD_DIRECTORY)).draw();
     }
 
+    private void initPaint() {
+        Window window = getWindow();
+        window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
+        mToolbar = ViewUtils.findViewById(this, R.id.toolbar);
+        mToolbar.setTitleTextColor(Color.WHITE);
+        Aesthetic.get().colorStatusBar().take(1).subscribe(window::setStatusBarColor);
+        Aesthetic.get().colorPrimary().take(1).subscribe(mToolbar::setBackgroundColor);
+    }
+
     @Override
     public void onRequestPermissionsResult(int requestCode, String permissions[], int[] grantResults) {
         if (!GalaxyPermissionManager.isGranted(requestCode, permissions, grantResults)) {
diff --git a/app/src/main/res/layout/app_acc_inc.xml b/app/src/main/res/layout/app_acc_inc.xml
index 582d0a302..ee781d88c 100644
--- a/app/src/main/res/layout/app_acc_inc.xml
+++ b/app/src/main/res/layout/app_acc_inc.xml
@@ -59,8 +59,6 @@
                         app:srcCompat="@drawable/ic_logout"
                         app:useCompatPadding="true" />
                 </LinearLayout>
-
-
             </LinearLayout>
 
             <LinearLayout
diff --git a/app/src/main/res/layout/app_device_inc.xml b/app/src/main/res/layout/app_device_inc.xml
index 44ceed59d..eab8d155e 100644
--- a/app/src/main/res/layout/app_device_inc.xml
+++ b/app/src/main/res/layout/app_device_inc.xml
@@ -10,8 +10,8 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:weightSum="2"
-        android:orientation="vertical">
+        android:orientation="vertical"
+        android:weightSum="2">
 
         <android.support.v7.widget.CardView
             android:layout_width="match_parent"
@@ -111,23 +111,5 @@
             </LinearLayout>
 
         </android.support.v7.widget.CardView>
-
-        <android.support.v7.widget.CardView
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1"
-            app:cardUseCompatPadding="true">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:padding="5dp"
-                android:weightSum="8">
-
-
-            </LinearLayout>
-        </android.support.v7.widget.CardView>
-
     </LinearLayout>
 </android.support.v4.widget.NestedScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/preference_activity_layout.xml b/app/src/main/res/layout/preference_activity_layout.xml
index 61b433e63..42b092fba 100644
--- a/app/src/main/res/layout/preference_activity_layout.xml
+++ b/app/src/main/res/layout/preference_activity_layout.xml
@@ -11,7 +11,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="?colorPrimary"
-        app:title="@string/action_settings" />
+        app:title="@string/action_settings"/>
 
     <android.support.v7.widget.CardView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/values/style.xml b/app/src/main/res/values/style.xml
index e0a4b7865..5c7795d2d 100644
--- a/app/src/main/res/values/style.xml
+++ b/app/src/main/res/values/style.xml
@@ -10,6 +10,10 @@
         <item name="android:windowDisablePreview">true</item>
     </style>
 
+    <style name="AppTheme.Black" parent="Theme.AppCompat.NoActionBar">
+        <item name="android:colorBackground">@color/colorBackgroundBlack</item>
+    </style>
+
     <style name="MyToolbarStyle" parent="ThemeOverlay.AppCompat.Dark">
         <item name="android:colorBackground">?colorPrimary</item>
     </style>