diff --git a/app/src/main/java/com/hippo/ehviewer/ui/HostsActivity.java b/app/src/main/java/com/hippo/ehviewer/ui/HostsActivity.java
index 0da88e2eb..69cc43291 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/HostsActivity.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/HostsActivity.java
@@ -82,7 +82,7 @@ public class HostsActivity extends ToolbarActivity
     recyclerView.setLayoutManager(new LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false));
     LinearDividerItemDecoration decoration = new LinearDividerItemDecoration(
         LinearDividerItemDecoration.VERTICAL,
-        AttrResources.getAttrColor(this, R.attr.colorDivider),
+        AttrResources.getAttrColor(this, R.attr.dividerColor),
         LayoutUtils.dp2pix(this, 1));
     decoration.setShowLastDivider(true);
     recyclerView.addItemDecoration(decoration);
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.java
index dc0ac5460..fa78801f9 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.java
@@ -274,7 +274,7 @@ public class FavoritesScene extends BaseScene implements
 
         refreshLayout.setHeaderTranslationY(paddingTopSB);
 
-        mLeftDrawable = new DrawerArrowDrawable(context, AttrResources.getAttrColor(context, R.attr.colorDrawablePrimary));
+        mLeftDrawable = new DrawerArrowDrawable(context, AttrResources.getAttrColor(context, R.attr.drawableColorPrimary));
         mSearchBar.setLeftDrawable(mLeftDrawable);
         mSearchBar.setRightDrawable(DrawableManager.getDrawable(context, R.drawable.v_magnify_x24));
         mSearchBar.setHelper(this);
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryCommentsScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryCommentsScene.java
index cd57309a1..0d42ada34 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryCommentsScene.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryCommentsScene.java
@@ -203,7 +203,7 @@ public final class GalleryCommentsScene extends ToolbarScene
         mRecyclerView.setLayoutManager(new LinearLayoutManager(context,
                 LinearLayoutManager.VERTICAL, false));
         LinearDividerItemDecoration decoration = new LinearDividerItemDecoration(
-                LinearDividerItemDecoration.VERTICAL, AttrResources.getAttrColor(context, R.attr.colorDivider),
+                LinearDividerItemDecoration.VERTICAL, AttrResources.getAttrColor(context, R.attr.dividerColor),
                 LayoutUtils.dp2pix(context, 1));
         decoration.setShowLastDivider(true);
         mRecyclerView.addItemDecoration(decoration);
@@ -336,7 +336,7 @@ public final class GalleryCommentsScene extends ToolbarScene
         });
         rv.setLayoutManager(new LinearLayoutManager(context));
         LinearDividerItemDecoration decoration = new LinearDividerItemDecoration(
-                LinearDividerItemDecoration.VERTICAL, AttrResources.getAttrColor(context, R.attr.colorDivider),
+                LinearDividerItemDecoration.VERTICAL, AttrResources.getAttrColor(context, R.attr.dividerColor),
                 LayoutUtils.dp2pix(context, 1));
         decoration.setPadding(ResourcesUtils.getAttrDimensionPixelOffset(context, R.attr.dialogPreferredPadding));
         rv.addItemDecoration(decoration);
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryInfoScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryInfoScene.java
index 16926da97..16f8ce2e8 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryInfoScene.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryInfoScene.java
@@ -165,7 +165,7 @@ public final class GalleryInfoScene extends ToolbarScene implements EasyRecycler
         mRecyclerView.setLayoutManager(new LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false));
         LinearDividerItemDecoration decoration = new LinearDividerItemDecoration(
                 LinearDividerItemDecoration.VERTICAL,
-                AttrResources.getAttrColor(context, R.attr.colorDivider),
+                AttrResources.getAttrColor(context, R.attr.dividerColor),
                 LayoutUtils.dp2pix(context, 1));
         decoration.setPadding(context.getResources().getDimensionPixelOffset(R.dimen.keyline_margin));
         mRecyclerView.addItemDecoration(decoration);
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java
index 2f79baeb3..86895d699 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java
@@ -425,8 +425,8 @@ public final class GalleryListScene extends BaseScene
 
         refreshLayout.setHeaderTranslationY(paddingTopSB);
 
-        mLeftDrawable = new DrawerArrowDrawable(context, AttrResources.getAttrColor(context, R.attr.colorDrawablePrimary));
-        mRightDrawable = new AddDeleteDrawable(context, AttrResources.getAttrColor(context, R.attr.colorDrawablePrimary));
+        mLeftDrawable = new DrawerArrowDrawable(context, AttrResources.getAttrColor(context, R.attr.drawableColorPrimary));
+        mRightDrawable = new AddDeleteDrawable(context, AttrResources.getAttrColor(context, R.attr.drawableColorPrimary));
         mSearchBar.setLeftDrawable(mLeftDrawable);
         mSearchBar.setRightDrawable(mRightDrawable);
         mSearchBar.setHelper(this);
diff --git a/app/src/main/java/com/hippo/widget/DirExplorer.java b/app/src/main/java/com/hippo/widget/DirExplorer.java
index fb9515e86..aedb40dba 100644
--- a/app/src/main/java/com/hippo/widget/DirExplorer.java
+++ b/app/src/main/java/com/hippo/widget/DirExplorer.java
@@ -72,7 +72,7 @@ public class DirExplorer extends EasyRecyclerView implements EasyRecyclerView.On
         setAdapter(mAdapter);
         setLayoutManager(new LinearLayoutManager(context));
         LinearDividerItemDecoration decoration = new LinearDividerItemDecoration(
-                LinearDividerItemDecoration.VERTICAL, AttrResources.getAttrColor(context, R.attr.colorDivider),
+                LinearDividerItemDecoration.VERTICAL, AttrResources.getAttrColor(context, R.attr.dividerColor),
                 LayoutUtils.dp2pix(context, 1));
         decoration.setShowLastDivider(true);
         addItemDecoration(decoration);
diff --git a/app/src/main/res/drawable/divider_gallery_detail.xml b/app/src/main/res/drawable/divider_gallery_detail.xml
index d397661f0..38b2b0521 100644
--- a/app/src/main/res/drawable/divider_gallery_detail.xml
+++ b/app/src/main/res/drawable/divider_gallery_detail.xml
@@ -19,7 +19,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android">
 
     <solid
-        android:color="?attr/colorDivider"/>
+        android:color="?attr/dividerColor"/>
 
     <size
         android:height="1dp"/>
diff --git a/app/src/main/res/drawable/v_adb_primary_x24.xml b/app/src/main/res/drawable/v_adb_primary_x24.xml
index ffeba8553..e3ae9b090 100644
--- a/app/src/main/res/drawable/v_adb_primary_x24.xml
+++ b/app/src/main/res/drawable/v_adb_primary_x24.xml
@@ -23,7 +23,7 @@
     android:viewportHeight="24">
 
     <path
-        android:fillColor="?attr/colorDrawableThemePrimary"
+        android:fillColor="?attr/drawableColorThemePrimary"
         android:pathData="@string/pd_adb"/>
 
 </vector>
diff --git a/app/src/main/res/drawable/v_archive_primary_x48.xml b/app/src/main/res/drawable/v_archive_primary_x48.xml
index dc411f08e..6801b4cfe 100644
--- a/app/src/main/res/drawable/v_archive_primary_x48.xml
+++ b/app/src/main/res/drawable/v_archive_primary_x48.xml
@@ -23,7 +23,7 @@
     android:viewportHeight="24.0">
 
     <path
-        android:fillColor="?attr/colorDrawableThemePrimary"
+        android:fillColor="?attr/drawableColorThemePrimary"
         android:pathData="@string/pd_archive"/>
 
 </vector>
diff --git a/app/src/main/res/drawable/v_book_open_primary_x24.xml b/app/src/main/res/drawable/v_book_open_primary_x24.xml
index 2f3527730..c0d0069d1 100644
--- a/app/src/main/res/drawable/v_book_open_primary_x24.xml
+++ b/app/src/main/res/drawable/v_book_open_primary_x24.xml
@@ -23,7 +23,7 @@
     android:viewportHeight="24">
 
     <path
-        android:fillColor="?attr/colorDrawableThemePrimary"
+        android:fillColor="?attr/drawableColorThemePrimary"
         android:pathData="@string/pd_book_open"/>
 
 </vector>
diff --git a/app/src/main/res/drawable/v_download_primary_x24.xml b/app/src/main/res/drawable/v_download_primary_x24.xml
index a71341619..792e20b28 100644
--- a/app/src/main/res/drawable/v_download_primary_x24.xml
+++ b/app/src/main/res/drawable/v_download_primary_x24.xml
@@ -23,7 +23,7 @@
     android:viewportHeight="24">
 
     <path
-        android:fillColor="?attr/colorDrawableThemePrimary"
+        android:fillColor="?attr/drawableColorThemePrimary"
         android:pathData="@string/pd_download"/>
 
 </vector>
diff --git a/app/src/main/res/drawable/v_file_find_primary_x48.xml b/app/src/main/res/drawable/v_file_find_primary_x48.xml
index 60b2ee72f..4c75cfc39 100644
--- a/app/src/main/res/drawable/v_file_find_primary_x48.xml
+++ b/app/src/main/res/drawable/v_file_find_primary_x48.xml
@@ -23,7 +23,7 @@
     android:viewportHeight="24">
 
     <path
-        android:fillColor="?attr/colorDrawableThemePrimary"
+        android:fillColor="?attr/drawableColorThemePrimary"
         android:pathData="@string/pd_file_find"/>
 
 </vector>
diff --git a/app/src/main/res/drawable/v_heart_outline_primary_x48.xml b/app/src/main/res/drawable/v_heart_outline_primary_x48.xml
index 07aa4070c..42d85326f 100644
--- a/app/src/main/res/drawable/v_heart_outline_primary_x48.xml
+++ b/app/src/main/res/drawable/v_heart_outline_primary_x48.xml
@@ -23,7 +23,7 @@
     android:viewportHeight="24">
 
     <path
-        android:fillColor="?attr/colorDrawableThemePrimary"
+        android:fillColor="?attr/drawableColorThemePrimary"
         android:pathData="@string/pd_heart_outline"/>
 
 </vector>
diff --git a/app/src/main/res/drawable/v_heart_primary_x48.xml b/app/src/main/res/drawable/v_heart_primary_x48.xml
index 52d59a968..c3e473ebe 100644
--- a/app/src/main/res/drawable/v_heart_primary_x48.xml
+++ b/app/src/main/res/drawable/v_heart_primary_x48.xml
@@ -23,7 +23,7 @@
     android:viewportHeight="24">
 
     <path
-        android:fillColor="?attr/colorDrawableThemePrimary"
+        android:fillColor="?attr/drawableColorThemePrimary"
         android:pathData="@string/pd_heart"/>
 
 </vector>
diff --git a/app/src/main/res/drawable/v_info_primary_x24.xml b/app/src/main/res/drawable/v_info_primary_x24.xml
index 20b8f83d3..360564fb5 100644
--- a/app/src/main/res/drawable/v_info_primary_x24.xml
+++ b/app/src/main/res/drawable/v_info_primary_x24.xml
@@ -23,7 +23,7 @@
     android:viewportHeight="24">
 
     <path
-        android:fillColor="?attr/colorDrawableThemePrimary"
+        android:fillColor="?attr/drawableColorThemePrimary"
         android:pathData="@string/pd_info"/>
 
 </vector>
diff --git a/app/src/main/res/drawable/v_sad_panda_primary_x24.xml b/app/src/main/res/drawable/v_sad_panda_primary_x24.xml
index 7401b70e0..6508d0591 100644
--- a/app/src/main/res/drawable/v_sad_panda_primary_x24.xml
+++ b/app/src/main/res/drawable/v_sad_panda_primary_x24.xml
@@ -23,7 +23,7 @@
     android:viewportHeight="24">
 
     <path
-        android:fillColor="?attr/colorDrawableThemePrimary"
+        android:fillColor="?attr/drawableColorThemePrimary"
         android:pathData="@string/pd_sad_panda"/>
 
 </vector>
diff --git a/app/src/main/res/drawable/v_sec_primary_x24.xml b/app/src/main/res/drawable/v_sec_primary_x24.xml
index 76a054fd7..0614fccf5 100644
--- a/app/src/main/res/drawable/v_sec_primary_x24.xml
+++ b/app/src/main/res/drawable/v_sec_primary_x24.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="?attr/colorDrawableThemePrimary"
+        android:fillColor="?attr/drawableColorThemePrimary"
         android:pathData="M12,1L3,5v6c0,5.55 3.84,10.74 9,12 5.16,-1.26 9,-6.45 9,-12L21,5l-9,-4zM12,11.99h7c-0.53,4.12 -3.28,7.79 -7,8.94L12,12L5,12L5,6.3l7,-3.11v8.8z"/>
 </vector>
diff --git a/app/src/main/res/drawable/v_share_primary_x48.xml b/app/src/main/res/drawable/v_share_primary_x48.xml
index 845fd5c19..f781df8dc 100644
--- a/app/src/main/res/drawable/v_share_primary_x48.xml
+++ b/app/src/main/res/drawable/v_share_primary_x48.xml
@@ -23,7 +23,7 @@
     android:viewportHeight="24">
 
     <path
-        android:fillColor="?attr/colorDrawableThemePrimary"
+        android:fillColor="?attr/drawableColorThemePrimary"
         android:pathData="@string/pd_share"/>
 
 </vector>
diff --git a/app/src/main/res/drawable/v_similar_primary_x48.xml b/app/src/main/res/drawable/v_similar_primary_x48.xml
index de6c8ae5c..111737cfd 100644
--- a/app/src/main/res/drawable/v_similar_primary_x48.xml
+++ b/app/src/main/res/drawable/v_similar_primary_x48.xml
@@ -23,7 +23,7 @@
     android:viewportHeight="24">
 
     <path
-        android:fillColor="?attr/colorDrawableThemePrimary"
+        android:fillColor="?attr/drawableColorThemePrimary"
         android:pathData="@string/pd_similar"/>
 
 </vector>
diff --git a/app/src/main/res/drawable/v_thumb_up_primary_x48.xml b/app/src/main/res/drawable/v_thumb_up_primary_x48.xml
index c567aab25..ec5694230 100644
--- a/app/src/main/res/drawable/v_thumb_up_primary_x48.xml
+++ b/app/src/main/res/drawable/v_thumb_up_primary_x48.xml
@@ -23,7 +23,7 @@
     android:viewportHeight="24">
 
     <path
-        android:fillColor="?attr/colorDrawableThemePrimary"
+        android:fillColor="?attr/drawableColorThemePrimary"
         android:pathData="@string/pd_thumb_up"/>
 
 </vector>
diff --git a/app/src/main/res/drawable/v_utorrent_primary_x48.xml b/app/src/main/res/drawable/v_utorrent_primary_x48.xml
index 8ff8455f7..1a9fb3719 100644
--- a/app/src/main/res/drawable/v_utorrent_primary_x48.xml
+++ b/app/src/main/res/drawable/v_utorrent_primary_x48.xml
@@ -23,7 +23,7 @@
     android:viewportHeight="24">
 
     <path
-        android:fillColor="?attr/colorDrawableThemePrimary"
+        android:fillColor="?attr/drawableColorThemePrimary"
         android:pathData="@string/pd_utorrent"/>
 
 </vector>
diff --git a/app/src/main/res/layout-v21/drawer_list.xml b/app/src/main/res/layout-v21/drawer_list.xml
index e439d5cba..f1aa2f9fe 100644
--- a/app/src/main/res/layout-v21/drawer_list.xml
+++ b/app/src/main/res/layout-v21/drawer_list.xml
@@ -26,7 +26,7 @@
         android:id="@+id/toolbar"
         android:layout_height="?attr/actionBarSize"
         android:layout_width="match_parent"
-        android:background="?attr/colorToolbar"
+        android:background="?attr/toolbarColor"
         android:elevation="8dp"
         android:saveEnabled="false"
         android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
diff --git a/app/src/main/res/layout-v21/drawer_list_rv.xml b/app/src/main/res/layout-v21/drawer_list_rv.xml
index 90afca1cf..b71edb241 100644
--- a/app/src/main/res/layout-v21/drawer_list_rv.xml
+++ b/app/src/main/res/layout-v21/drawer_list_rv.xml
@@ -26,7 +26,7 @@
         android:id="@+id/toolbar"
         android:layout_height="?attr/actionBarSize"
         android:layout_width="match_parent"
-        android:background="?attr/colorToolbar"
+        android:background="?attr/toolbarColor"
         android:elevation="8dp"
         android:saveEnabled="false"
         android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
diff --git a/app/src/main/res/layout-v21/scene_toolbar.xml b/app/src/main/res/layout-v21/scene_toolbar.xml
index 341cfc664..aed00dba5 100644
--- a/app/src/main/res/layout-v21/scene_toolbar.xml
+++ b/app/src/main/res/layout-v21/scene_toolbar.xml
@@ -26,7 +26,7 @@
         android:id="@+id/toolbar"
         android:layout_height="?attr/actionBarSize"
         android:layout_width="match_parent"
-        android:background="?attr/colorToolbar"
+        android:background="?attr/toolbarColor"
         android:elevation="8dp"
         android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
         app:popupTheme="?attr/toolbarPopupTheme"/>
diff --git a/app/src/main/res/layout/drawer_list.xml b/app/src/main/res/layout/drawer_list.xml
index ec349025f..4a4a41c40 100644
--- a/app/src/main/res/layout/drawer_list.xml
+++ b/app/src/main/res/layout/drawer_list.xml
@@ -26,7 +26,7 @@
         android:id="@+id/toolbar"
         android:layout_height="?attr/actionBarSize"
         android:layout_width="match_parent"
-        android:background="?attr/colorToolbar"
+        android:background="?attr/toolbarColor"
         android:saveEnabled="false"
         android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
         app:popupTheme="?attr/toolbarPopupTheme"/>
diff --git a/app/src/main/res/layout/drawer_list_rv.xml b/app/src/main/res/layout/drawer_list_rv.xml
index 813247936..d25529cc3 100644
--- a/app/src/main/res/layout/drawer_list_rv.xml
+++ b/app/src/main/res/layout/drawer_list_rv.xml
@@ -26,7 +26,7 @@
         android:id="@+id/toolbar"
         android:layout_height="?attr/actionBarSize"
         android:layout_width="match_parent"
-        android:background="?attr/colorToolbar"
+        android:background="?attr/toolbarColor"
         android:saveEnabled="false"
         android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
         app:popupTheme="?attr/toolbarPopupTheme"/>
diff --git a/app/src/main/res/layout/gallery_detail_comments.xml b/app/src/main/res/layout/gallery_detail_comments.xml
index a78a8be80..958799e38 100644
--- a/app/src/main/res/layout/gallery_detail_comments.xml
+++ b/app/src/main/res/layout/gallery_detail_comments.xml
@@ -29,6 +29,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
-        android:textColor="?attr/colorTextThemeAccent"/>
+        android:textColor="?attr/textColorThemeAccent"/>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/gallery_detail_header.xml b/app/src/main/res/layout/gallery_detail_header.xml
index fccfc07f9..7064e1a89 100644
--- a/app/src/main/res/layout/gallery_detail_header.xml
+++ b/app/src/main/res/layout/gallery_detail_header.xml
@@ -144,7 +144,7 @@
                 <View
                     android:layout_width="1dp"
                     android:layout_height="match_parent"
-                    android:background="?attr/colorDivider"
+                    android:background="?attr/dividerColor"
                     android:layout_marginTop="8dp"
                     android:layout_marginBottom="8dp"/>
 
@@ -154,7 +154,7 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:textColor="?attr/colorTextThemeAccent"
+                    android:textColor="?attr/textColorThemeAccent"
                     android:text="@string/read"/>
 
             </LinearLayout>
diff --git a/app/src/main/res/layout/gallery_detail_info.xml b/app/src/main/res/layout/gallery_detail_info.xml
index c10456d2f..9b77faa45 100644
--- a/app/src/main/res/layout/gallery_detail_info.xml
+++ b/app/src/main/res/layout/gallery_detail_info.xml
@@ -88,6 +88,6 @@
         android:layout_gravity="center_horizontal"
         android:layout_marginTop="16dp"
         android:text="@string/more_information"
-        android:textColor="?attr/colorTextThemeAccent"/>
+        android:textColor="?attr/textColorThemeAccent"/>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/gallery_detail_previews.xml b/app/src/main/res/layout/gallery_detail_previews.xml
index 849ae2280..1f01daac2 100644
--- a/app/src/main/res/layout/gallery_detail_previews.xml
+++ b/app/src/main/res/layout/gallery_detail_previews.xml
@@ -38,6 +38,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
-        android:textColor="?attr/colorTextThemeAccent"/>
+        android:textColor="?attr/textColorThemeAccent"/>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/gallery_detail_tags.xml b/app/src/main/res/layout/gallery_detail_tags.xml
index ddab8858c..dae995ef6 100644
--- a/app/src/main/res/layout/gallery_detail_tags.xml
+++ b/app/src/main/res/layout/gallery_detail_tags.xml
@@ -28,7 +28,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
-        android:textColor="?attr/colorTextThemeAccent"
+        android:textColor="?attr/textColorThemeAccent"
         android:text="@string/no_tags"/>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/item_download.xml b/app/src/main/res/layout/item_download.xml
index b83f2f6af..c66f2466a 100644
--- a/app/src/main/res/layout/item_download.xml
+++ b/app/src/main/res/layout/item_download.xml
@@ -106,7 +106,7 @@
           android:layout_marginBottom="4dp"
           android:layout_alignParentRight="true"
           android:paddingRight="16dp"
-          android:textColor="?attr/colorTextThemeAccent"/>
+          android:textColor="?attr/textColorThemeAccent"/>
 
         <ProgressBar
           android:id="@+id/progress_bar"
diff --git a/app/src/main/res/layout/item_filter.xml b/app/src/main/res/layout/item_filter.xml
index cfac8ad92..2c46466ce 100644
--- a/app/src/main/res/layout/item_filter.xml
+++ b/app/src/main/res/layout/item_filter.xml
@@ -56,7 +56,7 @@
         <View
             android:layout_width="wrap_content"
             android:layout_height="1dp"
-            android:background="?attr/colorDivider"/>
+            android:background="?attr/dividerColor"/>
 
     </com.hippo.widget.ShadowLinearLayout>
 </FrameLayout>
diff --git a/app/src/main/res/layout/item_label_list.xml b/app/src/main/res/layout/item_label_list.xml
index 0724a1c0b..80712d8c8 100644
--- a/app/src/main/res/layout/item_label_list.xml
+++ b/app/src/main/res/layout/item_label_list.xml
@@ -86,7 +86,7 @@
         <View
             android:layout_width="wrap_content"
             android:layout_height="1dp"
-            android:background="?attr/colorDivider"/>
+            android:background="?attr/dividerColor"/>
 
     </com.hippo.widget.ShadowLinearLayout>
 </FrameLayout>
diff --git a/app/src/main/res/layout/scene_excluded_languages.xml b/app/src/main/res/layout/scene_excluded_languages.xml
index e2d87a81b..5e9ce4471 100644
--- a/app/src/main/res/layout/scene_excluded_languages.xml
+++ b/app/src/main/res/layout/scene_excluded_languages.xml
@@ -43,7 +43,7 @@
             android:layout_height="match_parent"
             android:layout_marginTop="8dp"
             android:layout_marginBottom="8dp"
-            android:background="?attr/colorDivider"/>
+            android:background="?attr/dividerColor"/>
 
         <TextView
             android:id="@+id/ok"
@@ -78,7 +78,7 @@
             android:layout_height="match_parent"
             android:layout_marginTop="8dp"
             android:layout_marginBottom="8dp"
-            android:background="?attr/colorDivider"/>
+            android:background="?attr/dividerColor"/>
 
         <TextView
             android:id="@+id/deselect_all"
@@ -94,7 +94,7 @@
             android:layout_height="match_parent"
             android:layout_marginTop="8dp"
             android:layout_marginBottom="8dp"
-            android:background="?attr/colorDivider"/>
+            android:background="?attr/dividerColor"/>
 
         <TextView
             android:id="@+id/invert_selection"
@@ -148,7 +148,7 @@
         android:layout_height="1dp"
         android:layout_marginLeft="@dimen/keyline_margin"
         android:layout_marginRight="@dimen/keyline_margin"
-        android:background="?attr/colorDivider"/>
+        android:background="?attr/dividerColor"/>
 
     <com.hippo.easyrecyclerview.EasyRecyclerView
         android:id="@+id/recycler_view"
diff --git a/app/src/main/res/layout/scene_login.xml b/app/src/main/res/layout/scene_login.xml
index 8b8eae8d3..abebff03c 100644
--- a/app/src/main/res/layout/scene_login.xml
+++ b/app/src/main/res/layout/scene_login.xml
@@ -152,7 +152,7 @@
                 android:layout_gravity="center_horizontal"
                 android:layout_marginBottom="8dp"
                 android:text="@string/sign_in_via_webview"
-                android:textColor="?attr/colorTextThemeAccent"/>
+                android:textColor="?attr/textColorThemeAccent"/>
 
             <TextView
                 android:id="@+id/sign_in_via_cookies"
@@ -161,7 +161,7 @@
                 android:layout_gravity="center_horizontal"
                 android:layout_marginBottom="8dp"
                 android:text="@string/sign_in_via_cookies"
-                android:textColor="?attr/colorTextThemeAccent"/>
+                android:textColor="?attr/textColorThemeAccent"/>
 
             <TextView
                 android:id="@+id/skip_signing_in"
@@ -169,7 +169,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
                 android:text="@string/skip_signing_in"
-                android:textColor="?attr/colorTextThemeAccent"/>
+                android:textColor="?attr/textColorThemeAccent"/>
 
         </LinearLayout>
     </ScrollView>
diff --git a/app/src/main/res/layout/scene_toolbar.xml b/app/src/main/res/layout/scene_toolbar.xml
index eea9096f4..912c8ff91 100644
--- a/app/src/main/res/layout/scene_toolbar.xml
+++ b/app/src/main/res/layout/scene_toolbar.xml
@@ -26,7 +26,7 @@
         android:id="@+id/toolbar"
         android:layout_height="?attr/actionBarSize"
         android:layout_width="match_parent"
-        android:background="?attr/colorToolbar"
+        android:background="?attr/toolbarColor"
         android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
         app:popupTheme="?attr/toolbarPopupTheme"/>
 
diff --git a/app/src/main/res/layout/widget_search_bar.xml b/app/src/main/res/layout/widget_search_bar.xml
index 6b7c8e851..afe05e879 100644
--- a/app/src/main/res/layout/widget_search_bar.xml
+++ b/app/src/main/res/layout/widget_search_bar.xml
@@ -80,13 +80,13 @@
                 android:id="@+id/list_header"
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
-                android:background="?attr/colorDivider"/>
+                android:background="?attr/dividerColor"/>
 
             <ListView
                 android:id="@+id/search_bar_list"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:divider="?attr/colorDivider"
+                android:divider="?attr/dividerColor"
                 android:dividerHeight="1dp"/>
 
         </LinearLayout>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 269f46e92..69f633734 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -18,17 +18,17 @@
 <resources>
 
     <declare-styleable name="Theme">
-        <attr name="colorDivider" format="color"/>
-        <attr name="colorToolbar" format="color"/>
+        <attr name="dividerColor" format="color"/>
+        <attr name="toolbarColor" format="color"/>
+        <attr name="textColorThemeAccent" format="color"/>
         <!-- For light theme, it's primary dark color -->
         <!-- For dark theme, it's primary light color -->
         <!-- For black theme, it's primary light color -->
-        <attr name="colorDrawablePrimary" format="color"/>
+        <attr name="drawableColorPrimary" format="color"/>
         <!-- For light theme, it's primary color -->
         <!-- For dark theme, it's primary light color -->
         <!-- For black theme, it's primary light color -->
-        <attr name="colorDrawableThemePrimary" format="color"/>
-        <attr name="colorTextThemeAccent" format="color"/>
+        <attr name="drawableColorThemePrimary" format="color"/>
         <attr name="toolbarPopupTheme" format="reference"/>
     </declare-styleable>
 
@@ -62,7 +62,7 @@
     <declare-styleable name="DividerView">
         <attr name="dividerWidth" format="dimension"/>
         <attr name="dividerHeight" format="dimension"/>
-        <attr name="dividerColor" format="color"/>
+        <attr name="dividerColor"/>
     </declare-styleable>
 
     <declare-styleable name="AutoWrapLayout">
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index bb2ec599a..a76f3a83d 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -18,11 +18,11 @@
 <resources>
 
     <style name="ActionBarStyle" parent="@style/Widget.AppCompat.Light.ActionBar.Solid">
-        <item name="background">?attr/colorToolbar</item>
+        <item name="background">?attr/toolbarColor</item>
     </style>
 
     <style name="ActionBarStyle.Dark" parent="@style/Widget.AppCompat.ActionBar.Solid">
-        <item name="background">?attr/colorToolbar</item>
+        <item name="background">?attr/toolbarColor</item>
     </style>
 
     <!-- TextAppearance -->
@@ -81,7 +81,7 @@
     </style>
 
     <style name="TextAppearance.CategoryTitle" parent="TextAppearance.AppCompat.Small">
-        <item name="android:textColor">?attr/colorTextThemeAccent</item>
+        <item name="android:textColor">?attr/textColorThemeAccent</item>
         <item name="android:textStyle">bold</item>
     </style>
 
@@ -103,7 +103,7 @@
     </style>
 
     <style name="ButtonInCard.Accent">
-        <item name="android:textColor">?attr/colorTextThemeAccent</item>
+        <item name="android:textColor">?attr/textColorThemeAccent</item>
     </style>
 
     <style name="Slider">
@@ -121,7 +121,7 @@
 
     <style name="Indicating">
         <item name="indicatorHeight">1dp</item>
-        <item name="indicatorColor">?attr/colorDivider</item>
+        <item name="indicatorColor">?attr/dividerColor</item>
     </style>
 
     <style name="Widget.Design.FloatingActionButton.Mini">
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 838dc9247..3d14f34bf 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -27,11 +27,11 @@
         <item name="actionBarStyle">@style/ActionBarStyle</item>
         <item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat.Light</item>
 
-        <item name="colorDivider">@color/divider_light</item>
-        <item name="colorToolbar">@color/colorPrimary</item>
-        <item name="colorTextThemeAccent">@color/colorAccent</item>
-        <item name="colorDrawablePrimary">@color/primary_drawable_light</item>
-        <item name="colorDrawableThemePrimary">@color/colorPrimary</item>
+        <item name="dividerColor">@color/divider_light</item>
+        <item name="toolbarColor">@color/colorPrimary</item>
+        <item name="textColorThemeAccent">@color/colorAccent</item>
+        <item name="drawableColorPrimary">@color/primary_drawable_light</item>
+        <item name="drawableColorThemePrimary">@color/colorPrimary</item>
     </style>
 
     <style name="AppTheme.NoActionBar">
@@ -51,11 +51,11 @@
         <item name="actionBarStyle">@style/ActionBarStyle.Dark</item>
         <item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
 
-        <item name="colorDivider">@color/divider_dark</item>
-        <item name="colorToolbar">?android:attr/colorBackground</item>
-        <item name="colorTextThemeAccent">?android:attr/textColorSecondary</item>
-        <item name="colorDrawablePrimary">@color/primary_drawable_dark</item>
-        <item name="colorDrawableThemePrimary">@color/primary_drawable_dark</item>
+        <item name="dividerColor">@color/divider_dark</item>
+        <item name="toolbarColor">?android:attr/colorBackground</item>
+        <item name="textColorThemeAccent">?android:attr/textColorSecondary</item>
+        <item name="drawableColorPrimary">@color/primary_drawable_dark</item>
+        <item name="drawableColorThemePrimary">@color/primary_drawable_dark</item>
     </style>
 
     <style name="AppTheme.Dark.NoActionBar">
@@ -78,11 +78,11 @@
         <item name="android:windowBackground">@android:color/black</item>
         <item name="android:colorBackground">@android:color/black</item>
 
-        <item name="colorDivider">@color/divider_dark</item>
-        <item name="colorToolbar">?android:attr/colorBackground</item>
-        <item name="colorTextThemeAccent">?android:attr/textColorSecondary</item>
-        <item name="colorDrawablePrimary">@color/primary_drawable_dark</item>
-        <item name="colorDrawableThemePrimary">@color/primary_drawable_dark</item>
+        <item name="dividerColor">@color/divider_dark</item>
+        <item name="toolbarColor">?android:attr/colorBackground</item>
+        <item name="textColorThemeAccent">?android:attr/textColorSecondary</item>
+        <item name="drawableColorPrimary">@color/primary_drawable_dark</item>
+        <item name="drawableColorThemePrimary">@color/primary_drawable_dark</item>
     </style>
 
     <style name="AppTheme.Black.NoActionBar">