diff --git a/SettingsUI/build.gradle b/SettingsUI/build.gradle
index bbd51f1..01b4bc0 100644
--- a/SettingsUI/build.gradle
+++ b/SettingsUI/build.gradle
@@ -21,7 +21,7 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     testCompile 'junit:junit:4.12'
-    compile 'com.android.support:appcompat-v7:23.1.1'
-    compile 'com.android.support:preference-v7:23.1.1'
-    compile 'com.android.support:preference-v14:23.1.1'
+    compile 'com.android.support:appcompat-v7:23.2.0'
+    compile 'com.android.support:preference-v7:23.2.0'
+    compile 'com.android.support:preference-v14:23.2.0'
 }
diff --git a/SettingsUI/src/main/java/me/qixingchen/settings/PreferenceFragment.java b/SettingsUI/src/main/java/me/qixingchen/settings/PreferenceFragment.java
index 5bff929..20318ae 100644
--- a/SettingsUI/src/main/java/me/qixingchen/settings/PreferenceFragment.java
+++ b/SettingsUI/src/main/java/me/qixingchen/settings/PreferenceFragment.java
@@ -10,20 +10,26 @@
  * Created by Rikka on 2016/2/19.
  */
 public abstract class PreferenceFragment extends android.support.v14.preference.PreferenceFragment {
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        View view = super.onCreateView(inflater, container, savedInstanceState);
+    public void addDefaultListDivider() {
+
+        // hide Google's divider added in 23.2.0
+        setDivider(null);
 
         RecyclerView listView = getListView();
-        listView.addItemDecoration(new BaseRecyclerViewItemDecoration(container.getContext()) {
+        listView.addItemDecoration(new BaseRecyclerViewItemDecoration(getActivity()) {
             @Override
             public boolean canDraw(RecyclerView parent, View child, int childCount, int position) {
-                return ((position < childCount - 1)
+                return (position < childCount - 1
                         && parent.getChildAt(position + 1).findViewById(android.R.id.summary) != null
                         && child.findViewById(android.R.id.summary) != null);
             }
         });
+    }
 
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        View view = super.onCreateView(inflater, container, savedInstanceState);
+        addDefaultListDivider();
         return view;
     }
 }
diff --git a/app/build.gradle b/app/build.gradle
index 23c5d6e..6552168 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -21,7 +21,7 @@ android {
     }
 
     productFlavors {
-        def String name = "1.4.4"
+        def String name = "1.4.5"
 
         COOLAPK {
             applicationId "rikka.searchbyimage"
@@ -51,11 +51,13 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     testCompile 'junit:junit:4.12'
-    compile 'com.android.support:appcompat-v7:23.1.1'
-    compile "com.android.support:customtabs:23.1.1"
-    compile 'com.android.support:design:23.1.1'
-    compile 'com.android.support:support-v4:23.1.1'
+    compile 'com.android.support:appcompat-v7:23.2.0'
+    compile "com.android.support:customtabs:23.2.0"
+    compile 'com.android.support:design:23.2.0'
+    compile 'com.android.support:support-v4:23.2.0'
     compile 'com.github.bumptech.glide:glide:3.6.1'
     compile 'com.squareup.okhttp3:okhttp:3.0.1'
+    compile 'com.github.RikkaW:DayNight-Theme:v1.0.4'
+
     compile project(':SettingsUI')
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 672dad4..62a2587 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -52,6 +52,7 @@
             </intent-filter>
         </activity>
         <activity android:name=".ui.EditSitesActivity"
+                  android:theme="@style/AppTheme.NoActionBar"
             android:label="@string/edit_sites"/>
         <activity android:name=".ui.EditSiteInfoActivity"
             android:windowSoftInputMode="adjustResize"
diff --git a/app/src/main/java/rikka/searchbyimage/SearchByImageApplication.java b/app/src/main/java/rikka/searchbyimage/SearchByImageApplication.java
index 7e85fa9..af870e6 100644
--- a/app/src/main/java/rikka/searchbyimage/SearchByImageApplication.java
+++ b/app/src/main/java/rikka/searchbyimage/SearchByImageApplication.java
@@ -4,6 +4,7 @@
 
 import java.io.InputStream;
 
+import moe.xing.daynightmode.DayNightMode;
 import rikka.searchbyimage.support.CrashHandler;
 
 /**
@@ -25,6 +26,8 @@ public void setImageInputStream(InputStream imageInputStream) {
     public void onCreate() {
         super.onCreate();
 
+        DayNightMode.setDefaultNightMode(this, DayNightMode.MODE_NIGHT_AUTO);
+
         if (!BuildConfig.hideOtherEngine && !BuildConfig.DEBUG) {
             CrashHandler.init(getApplicationContext());
             CrashHandler.register();
diff --git a/app/src/main/java/rikka/searchbyimage/ui/BaseActivity.java b/app/src/main/java/rikka/searchbyimage/ui/BaseActivity.java
new file mode 100644
index 0000000..1bb3187
--- /dev/null
+++ b/app/src/main/java/rikka/searchbyimage/ui/BaseActivity.java
@@ -0,0 +1,9 @@
+package rikka.searchbyimage.ui;
+
+import moe.xing.daynightmode.BaseDayNightModeActivity;
+
+/**
+ * Created by Rikka on 2016/3/3.
+ */
+public class BaseActivity extends BaseDayNightModeActivity {
+}
diff --git a/app/src/main/java/rikka/searchbyimage/ui/ChromeCustomTabsActivity.java b/app/src/main/java/rikka/searchbyimage/ui/ChromeCustomTabsActivity.java
index d3d1aa0..acd57df 100644
--- a/app/src/main/java/rikka/searchbyimage/ui/ChromeCustomTabsActivity.java
+++ b/app/src/main/java/rikka/searchbyimage/ui/ChromeCustomTabsActivity.java
@@ -10,7 +10,7 @@
 import rikka.searchbyimage.staticdata.CustomEngine;
 import rikka.searchbyimage.utils.URLUtils;
 
-public class ChromeCustomTabsActivity extends AppCompatActivity {
+public class ChromeCustomTabsActivity extends BaseActivity {
     public static final String EXTRA_URL =
             "rikka.searchbyimage.ui.ChromeCustomTabsActivity.EXTRA_URL";
 
diff --git a/app/src/main/java/rikka/searchbyimage/ui/EditSiteInfoActivity.java b/app/src/main/java/rikka/searchbyimage/ui/EditSiteInfoActivity.java
index a9b8256..57e7c93 100644
--- a/app/src/main/java/rikka/searchbyimage/ui/EditSiteInfoActivity.java
+++ b/app/src/main/java/rikka/searchbyimage/ui/EditSiteInfoActivity.java
@@ -38,7 +38,7 @@
 import rikka.searchbyimage.utils.ParcelableUtils;
 import rikka.searchbyimage.utils.URLUtils;
 
-public class EditSiteInfoActivity extends AppCompatActivity {
+public class EditSiteInfoActivity extends BaseActivity {
     public static final String EXTRA_EDIT_LOCATION =
             "rikka.searchbyimage.ui.EditSiteInfoActivity.EXTRA_EDIT_LOCATION";
 
diff --git a/app/src/main/java/rikka/searchbyimage/ui/EditSitesActivity.java b/app/src/main/java/rikka/searchbyimage/ui/EditSitesActivity.java
index a3901a0..c997974 100644
--- a/app/src/main/java/rikka/searchbyimage/ui/EditSitesActivity.java
+++ b/app/src/main/java/rikka/searchbyimage/ui/EditSitesActivity.java
@@ -27,7 +27,7 @@
 import rikka.searchbyimage.staticdata.CustomEngine;
 import rikka.searchbyimage.ui.apdater.SearchEngineAdapter;
 
-public class EditSitesActivity extends AppCompatActivity {
+public class EditSitesActivity extends BaseActivity {
     Activity mActivity;
 
     DatabaseHelper mDbHelper;
diff --git a/app/src/main/java/rikka/searchbyimage/ui/MainActivity.java b/app/src/main/java/rikka/searchbyimage/ui/MainActivity.java
index 0fefac2..fecb78d 100644
--- a/app/src/main/java/rikka/searchbyimage/ui/MainActivity.java
+++ b/app/src/main/java/rikka/searchbyimage/ui/MainActivity.java
@@ -8,7 +8,7 @@
 import rikka.searchbyimage.ui.fragment.SettingsFragment;
 
 
-public class MainActivity extends AppCompatActivity {
+public class MainActivity extends BaseActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
diff --git a/app/src/main/java/rikka/searchbyimage/ui/PopupSettingsActivity.java b/app/src/main/java/rikka/searchbyimage/ui/PopupSettingsActivity.java
index fa27241..02e2314 100644
--- a/app/src/main/java/rikka/searchbyimage/ui/PopupSettingsActivity.java
+++ b/app/src/main/java/rikka/searchbyimage/ui/PopupSettingsActivity.java
@@ -11,7 +11,7 @@
 import rikka.searchbyimage.R;
 import rikka.searchbyimage.ui.fragment.SettingsFragment;
 
-public class PopupSettingsActivity extends AppCompatActivity {
+public class PopupSettingsActivity extends BaseActivity {
     public static final String EXTRA_URI =
             "rikka.searchbyimage.ui.ResultActivity.EXTRA_URI";
 
diff --git a/app/src/main/java/rikka/searchbyimage/ui/ResultActivity.java b/app/src/main/java/rikka/searchbyimage/ui/ResultActivity.java
index 640a81b..9612b98 100644
--- a/app/src/main/java/rikka/searchbyimage/ui/ResultActivity.java
+++ b/app/src/main/java/rikka/searchbyimage/ui/ResultActivity.java
@@ -28,7 +28,7 @@
 import rikka.searchbyimage.utils.URLUtils;
 import me.qixingchen.settings.BaseRecyclerViewItemDecoration;
 
-public class ResultActivity extends AppCompatActivity {
+public class ResultActivity extends BaseActivity {
 
     public static final String EXTRA_FILE =
             "rikka.searchbyimage.ui.ResultActivity.EXTRA_FILE";
diff --git a/app/src/main/java/rikka/searchbyimage/ui/UploadActivity.java b/app/src/main/java/rikka/searchbyimage/ui/UploadActivity.java
index 1589255..6f1ac3e 100644
--- a/app/src/main/java/rikka/searchbyimage/ui/UploadActivity.java
+++ b/app/src/main/java/rikka/searchbyimage/ui/UploadActivity.java
@@ -37,7 +37,7 @@
 import rikka.searchbyimage.utils.ResponseUtils;
 import rikka.searchbyimage.utils.Utils;
 
-public class UploadActivity extends AppCompatActivity {
+public class UploadActivity extends BaseActivity {
     public final static int SITE_GOOGLE = 0;
     public final static int SITE_BAIDU = 1;
     public final static int SITE_IQDB = 2;
@@ -325,7 +325,7 @@ private ProgressDialog showDialog() {
         ProgressDialog progressDialog;
 
         if (Build.VERSION.SDK_INT == Build.VERSION_CODES.LOLLIPOP || Build.VERSION.SDK_INT == Build.VERSION_CODES.LOLLIPOP_MR1)
-            progressDialog = new ProgressDialog(this, R.style.DialogStyle);
+            progressDialog = new ProgressDialog(this, R.style.ProgressDialog);
         else
             progressDialog = new ProgressDialog(this);
 
diff --git a/app/src/main/java/rikka/searchbyimage/ui/WebViewActivity.java b/app/src/main/java/rikka/searchbyimage/ui/WebViewActivity.java
index c817ec2..719725e 100644
--- a/app/src/main/java/rikka/searchbyimage/ui/WebViewActivity.java
+++ b/app/src/main/java/rikka/searchbyimage/ui/WebViewActivity.java
@@ -54,7 +54,7 @@
 import rikka.searchbyimage.view.WebViewToolBar;
 import rikka.searchbyimage.widget.InfoBar;
 
-public class WebViewActivity extends AppCompatActivity {
+public class WebViewActivity extends BaseActivity {
     public static final String EXTRA_URL =
             "rikka.searchbyimage.ui.WebViewActivity.EXTRA_URL";
 
diff --git a/app/src/main/res/layout/activity_add_engine.xml b/app/src/main/res/layout/activity_add_engine.xml
index 4cec90c..4822c11 100644
--- a/app/src/main/res/layout/activity_add_engine.xml
+++ b/app/src/main/res/layout/activity_add_engine.xml
@@ -28,7 +28,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:id="@+id/scrollView"
-        android:background="#FAFAFA"
+        android:background="@color/backgourd"
         android:theme="@style/EditInfoEditText"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
diff --git a/app/src/main/res/layout/activity_edit_sites.xml b/app/src/main/res/layout/activity_edit_sites.xml
index e575145..ae1cf43 100644
--- a/app/src/main/res/layout/activity_edit_sites.xml
+++ b/app/src/main/res/layout/activity_edit_sites.xml
@@ -24,8 +24,8 @@
 
     <android.support.v7.widget.RecyclerView
         android:id="@+id/recyclerView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
         app:layout_behavior="@string/appbar_scrolling_view_behavior"
         tools:context=".ui.EditSitesActivity"
         tools:showIn="@layout/activity_edit_sites">
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 66503d5..7d3b205 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -24,8 +24,8 @@
 
     <FrameLayout
         android:id="@+id/settings_container"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
         app:layout_behavior="@string/appbar_scrolling_view_behavior"
         tools:context=".ui.MainActivity"
         tools:showIn="@layout/activity_main">
diff --git a/app/src/main/res/layout/list_item_edit_sites.xml b/app/src/main/res/layout/list_item_edit_sites.xml
index 3627763..5fa81ec 100644
--- a/app/src/main/res/layout/list_item_edit_sites.xml
+++ b/app/src/main/res/layout/list_item_edit_sites.xml
@@ -27,7 +27,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@android:color/white"
+            android:background="@color/list_item_background"
             android:elevation="2dp"
             android:orientation="vertical">
 
@@ -46,7 +46,6 @@
             <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="64dp"
-                android:background="@android:color/white"
                 android:clickable="true"
                 android:focusable="true"
                 android:foreground="?android:attr/selectableItemBackground"
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
index b6c1cb3..ab494bf 100644
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
index 9883330..1af5528 100644
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
index 7eadd7c..7cd1e1c 100644
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
index 2f7f257..4f166de 100644
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
index 5f7bb70..05bdf61 100644
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
new file mode 100644
index 0000000..34b735d
--- /dev/null
+++ b/app/src/main/res/values-night/colors.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="list_item_background">#212121</color>
+    <color name="backgourd">@color/material_grey_850</color>
+    <color name="dividerSearchEngineList">#20ffffff</color>
+    <color name="contextMenuTitle">#FFF</color>
+
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml
new file mode 100644
index 0000000..8035887
--- /dev/null
+++ b/app/src/main/res/values-night/styles.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat" />
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
new file mode 100644
index 0000000..14cbe20
--- /dev/null
+++ b/app/src/main/res/values-v21/styles.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="ProgressDialog" parent="Theme.AppCompat.DayNight.Dialog.Alert">
+        <item name="colorAccent">@color/colorAccent</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index beb0349..9d03538 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -17,4 +17,6 @@
 
     <color name="preference_fallback_accent_color">@color/colorAccent</color>
 
+    <color name="list_item_background">#FFF</color>
+    <color name="backgourd">@color/material_grey_50</color>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 8b75a64..2863d73 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,7 +1,7 @@
 <resources>
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
+    <style name="AppTheme" parent="Theme.AppCompat.DayNight.DarkActionBar">
         <item name="preferenceTheme">@style/PreferenceTheme.Material</item>
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
@@ -10,16 +10,19 @@
         <!--<item name="android:windowContentTransitions">true</item>-->
     </style>
 
-    <style name="AppTheme.UseColorControlActivated" parent="AppTheme">
+    <style name="AppTheme.UseColorControlActivated" parent="AppTheme.NoActionBar">
         <item name="colorControlActivated">@color/colorPrimary</item>
     </style>
 
     <style name="AppTheme.NoActionBar" parent="AppTheme">
         <!-- Customize your theme here. -->
         <item name="titleTextColor">#FFFFFF</item>
+
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
     </style>
 
-    <style name="PopupTheme" parent="Theme.AppCompat.Light.Dialog">
+    <style name="PopupTheme" parent="Theme.AppCompat.DayNight.Dialog">
         <item name="preferenceTheme">@style/PreferenceTheme.Material</item>
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
@@ -27,17 +30,11 @@
         <item name="windowNoTitle">true</item>
     </style>
 
-
-    <style name="DialogStyle" parent="Theme.AppCompat.Light.Dialog.Alert">
-        <item name="colorAccent">@color/colorAccent</item>
-    </style>
-
     <style name="Transparent" parent="AppTheme">
         <item name="windowNoTitle">true</item>
         <item name="android:windowBackground">@android:color/transparent</item>
         <item name="android:windowIsTranslucent">true</item>
         <item name="android:windowIsFloating">true</item>
-
     </style>
 
     <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
diff --git a/build.gradle b/build.gradle
index e0b366a..f83b67d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,6 +15,7 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
+        maven { url "https://jitpack.io" }
     }
 }