diff --git a/res/layout/gallery_main.xml b/res/layout/gallery_main.xml
index 4b4edbd6b96656c0b953d7f260d44411e4675112..b668381d3630c40f706e830b9bb195b250aafdef 100644
--- a/res/layout/gallery_main.xml
+++ b/res/layout/gallery_main.xml
@@ -43,6 +43,7 @@
         <RelativeLayout
             android:id="@+id/gallery_root"
             android:layout_width="match_parent"
+            android:background="@color/default_background"
             android:layout_height="match_parent"
             android:layout_above="@+id/bottom_navigation">
 
diff --git a/res/layout/gl_root_group.xml b/res/layout/gl_root_group.xml
index 6302171535f153a4c050aec07cc7cee9b10ab600..6aba51e41d6dfaad67b904c0700cf18b80281615 100644
--- a/res/layout/gl_root_group.xml
+++ b/res/layout/gl_root_group.xml
@@ -22,6 +22,7 @@
         android:layout_height="match_parent">
         <com.android.gallery3d.ui.GLRootView
             android:id="@+id/gl_root_view"
+            android:background="@color/default_background"
             android:layout_width="match_parent"
             android:layout_height="match_parent"/>
     </RelativeLayout>
diff --git a/res/layout/main.xml b/res/layout/main.xml
index e26e0fc6b4884b4d64ed6c84ab2282a63b0d8a3d..a97caceabb32aa5b5badd1ac4d1c8dbd8e16c673 100644
--- a/res/layout/main.xml
+++ b/res/layout/main.xml
@@ -2,6 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/gallery_root"
         android:orientation="vertical"
+        android:background="@color/default_background"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
     <include layout="@layout/gl_root_group"/>
diff --git a/res/values/cm_colors.xml b/res/values/cm_colors.xml
index 4eb65aeadf27e93051c83fd91a8081257ed9f656..27ecb2482ee6e40a7c9d7bbd6017f63989505e2b 100644
--- a/res/values/cm_colors.xml
+++ b/res/values/cm_colors.xml
@@ -15,8 +15,8 @@
 -->
 <resources>
 
-    <color name="primary">#333333</color>
-    <color name="primaryDark">#000000</color>
+    <color name="primary">@lineageos.platform:color/color_default_primary_text</color>
+    <color name="primaryDark">@lineageos.platform:color/color_default_primary_text</color>
     <color name="accent">#33b5e5</color>
 
     <color name="white">#fafafa</color>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 9388e989848d5965fc9a163e94474fcd7ac6e96d..b00001acec96e68133bca0730f6cc4ee5dd7af2c 100755
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -15,21 +15,21 @@
 -->
 <resources>
 
-    <color name="default_background">@color/white</color>
+    <color name="default_background">@lineageos.platform:color/color_default_primary_text</color>
 
     <!-- configuration for album set page -->
-    <color name="albumset_background">@color/white</color>
-    <color name="albumset_placeholder">@color/black_transparent_3</color>
+    <color name="albumset_background">@color/default_background</color>
+    <color name="albumset_placeholder">@color/default_background</color>
     <color name="albumset_label_background">@color/black_transparent_4</color>
     <color name="albumset_label_title">@color/white</color>
     <color name="albumset_label_count">@color/white</color>
-    <color name="albumlist_label_title">@color/black_transparent_4</color>
+    <color name="albumlist_label_title">@color/white</color>
 
     <color name="darker_transparent">@color/black_transparent_5</color>
 
     <!-- configuration for album page -->
-    <color name="album_background">@color/white</color>
-    <color name="album_placeholder">@color/white</color>
+    <color name="album_background">@color/default_background</color>
+    <color name="album_placeholder">@color/default_background</color>
 
     <!-- configuration for photo page -->
     <color name="photo_background">@color/black</color>
@@ -85,10 +85,10 @@
     <color name="edit_background">@color/black</color>
     <color name="edit_actionbar_background">@color/black</color>
     <color name="dialog_button_color">#009688</color>
-    <color name="timeline_title_text_color">@color/black_transparent_4</color>
-    <color name="timeline_title_number_text_color">@color/black_transparent_3</color>
-    <color name="timeline_title_background_color">@color/white</color>
+    <color name="timeline_title_text_color">@color/white</color>
+    <color name="timeline_title_number_text_color">@color/white</color>
+    <color name="timeline_title_background_color">@color/default_background</color>
 
-    <color name="navigation_accent_disabled">#747474</color>
-    <color name="navigation_accent_enabled">@color/white</color>
+    <color name="navigation_accent_disabled">@lineageos.platform:color/color_default_gray2</color>
+    <color name="navigation_accent_enabled">@lineageos.platform:color/color_default_primary</color>
 </resources>
diff --git a/src/com/android/gallery3d/app/AlbumPage.java b/src/com/android/gallery3d/app/AlbumPage.java
index 4f3f34814ddbb3bee4751d27a93f4d49532f960a..57a663c4834bf190836fb9dc89edaf42cf010ad1 100644
--- a/src/com/android/gallery3d/app/AlbumPage.java
+++ b/src/com/android/gallery3d/app/AlbumPage.java
@@ -974,7 +974,7 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster
         if (tvEmptyAlbum == null) {
             tvEmptyAlbum = new TextView(mActivity);
             tvEmptyAlbum.setText(R.string.tvEmptyVideos);
-            tvEmptyAlbum.setTextColor(Color.parseColor("#8A000000"));
+            tvEmptyAlbum.setTextColor(galleryRoot.getResources().getColor(R.color.white, null));
             tvEmptyAlbum.setGravity(Gravity.CENTER);
             tvEmptyAlbum.setTextSize(TypedValue.COMPLEX_UNIT_SP, 20);
             RelativeLayout.LayoutParams lp = new RelativeLayout.LayoutParams(
diff --git a/src/com/android/gallery3d/app/AlbumSetPage.java b/src/com/android/gallery3d/app/AlbumSetPage.java
index 7eaa2bc6a427224c1b06e37775f99e2dc06c107f..ffa5d95d042f1cb57a8e562cdb9b9afff7e37098 100755
--- a/src/com/android/gallery3d/app/AlbumSetPage.java
+++ b/src/com/android/gallery3d/app/AlbumSetPage.java
@@ -258,7 +258,7 @@ public class AlbumSetPage extends ActivityState implements
         if (tvEmptyAlbum == null) {
             tvEmptyAlbum = new TextView(mActivity);
             tvEmptyAlbum.setText(R.string.tvEmptyAlbum);
-            tvEmptyAlbum.setTextColor(Color.parseColor("#8A000000"));
+            tvEmptyAlbum.setTextColor(galleryRoot.getResources().getColor(R.color.white, null));
             tvEmptyAlbum.setGravity(Gravity.CENTER);
             tvEmptyAlbum.setTextSize(TypedValue.COMPLEX_UNIT_SP, 20);
             tvEmptyAlbum.setId(R.id.empty_album);
diff --git a/src/com/android/gallery3d/app/TimeLinePage.java b/src/com/android/gallery3d/app/TimeLinePage.java
index 2849de5e9c38d4bc68288302924793a9505a2d7b..2c71b8b1e69260f09ff0b2cb071de26a562294d2 100755
--- a/src/com/android/gallery3d/app/TimeLinePage.java
+++ b/src/com/android/gallery3d/app/TimeLinePage.java
@@ -883,7 +883,7 @@ public class TimeLinePage extends ActivityState implements
         if (tvEmptyAlbum == null) {
             tvEmptyAlbum = new TextView(mActivity);
             tvEmptyAlbum.setText(R.string.tvEmptyAlbum);
-            tvEmptyAlbum.setTextColor(Color.parseColor("#8A000000"));
+            tvEmptyAlbum.setTextColor(galleryRoot.getResources().getColor(R.color.white, null));
             tvEmptyAlbum.setGravity(Gravity.CENTER);
             tvEmptyAlbum.setTextSize(TypedValue.COMPLEX_UNIT_SP, 20);
             RelativeLayout.LayoutParams lp = new RelativeLayout.LayoutParams(