diff --git a/java/res/drawable/bg_btn_keyboard_key_normal_off.xml b/java/res/drawable/bg_btn_keyboard_key_normal_off.xml
new file mode 100644
index 0000000000000000000000000000000000000000..1def20b12e846b5d7eefc49b1005872153f4ac92
--- /dev/null
+++ b/java/res/drawable/bg_btn_keyboard_key_normal_off.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/color_default_secondary_text"
+        android:pathData="M8,23h8v1H8z"/>
+</vector>
diff --git a/java/res/drawable/bg_btn_keyboard_key_normal_on.xml b/java/res/drawable/bg_btn_keyboard_key_normal_on.xml
new file mode 100644
index 0000000000000000000000000000000000000000..135c1d5434b88d962ce0cb2249101281a74d9cb6
--- /dev/null
+++ b/java/res/drawable/bg_btn_keyboard_key_normal_on.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/color_default_accent"
+        android:pathData="M8,23h8v1H8z"/>
+</vector>
\ No newline at end of file
diff --git a/java/res/drawable/btn_keyboard_key_ics.xml b/java/res/drawable/btn_keyboard_key_ics.xml
index bacd5d78ffca1b1a96f34225791f90d8f5d0b1fe..67fe833458358b793494edfaee1958cbc227bb51 100644
--- a/java/res/drawable/btn_keyboard_key_ics.xml
+++ b/java/res/drawable/btn_keyboard_key_ics.xml
@@ -23,13 +23,13 @@
 
     <!-- Toggle keys. Use checkable/checked state. -->
     <item android:state_checkable="true" android:state_checked="true" android:state_pressed="true"
-          android:drawable="@drawable/btn_keyboard_key_pressed_on_ics_dark" />
+        android:drawable="@drawable/bg_btn_keyboard_key_normal_on" />
     <item android:state_checkable="true" android:state_pressed="true"
-          android:drawable="@drawable/btn_keyboard_key_pressed_off_ics_dark" />
+        android:drawable="@drawable/bg_btn_keyboard_key_normal_off"  />
     <item android:state_checkable="true" android:state_checked="true"
-          android:drawable="@drawable/btn_keyboard_key_normal_on_ics_dark" />
+        android:drawable="@drawable/bg_btn_keyboard_key_normal_on" />
     <item android:state_checkable="true"
-          android:drawable="@drawable/btn_keyboard_key_normal_off_holo_dark" />
+        android:drawable="@drawable/bg_btn_keyboard_key_normal_off" />
 
     <!-- Empty background keys. -->
     <item android:state_empty="true" android:state_pressed="true"
diff --git a/java/res/drawable/btn_keyboard_key_klp.xml b/java/res/drawable/btn_keyboard_key_klp.xml
index e2f208585cd07b66b49aa28d7d3a0e60dc755d84..c55cb301664952b8cdec4959826f6d2d4e67d156 100644
--- a/java/res/drawable/btn_keyboard_key_klp.xml
+++ b/java/res/drawable/btn_keyboard_key_klp.xml
@@ -23,13 +23,13 @@
 
     <!-- Toggle keys. Use checkable/checked state. -->
     <item android:state_checkable="true" android:state_checked="true" android:state_pressed="true"
-          android:drawable="@drawable/btn_keyboard_key_pressed_on_klp_dark" />
+        android:drawable="@drawable/bg_btn_keyboard_key_normal_on" />
     <item android:state_checkable="true" android:state_pressed="true"
-          android:drawable="@drawable/btn_keyboard_key_pressed_off_klp_dark" />
+        android:drawable="@drawable/bg_btn_keyboard_key_normal_off" />
     <item android:state_checkable="true" android:state_checked="true"
-          android:drawable="@drawable/btn_keyboard_key_normal_on_klp_dark" />
+        android:drawable="@drawable/bg_btn_keyboard_key_normal_on" />
     <item android:state_checkable="true"
-          android:drawable="@drawable/btn_keyboard_key_normal_off_holo_dark" />
+        android:drawable="@drawable/bg_btn_keyboard_key_normal_off" />
 
     <!-- Empty background keys. -->
     <item android:state_empty="true" android:state_pressed="true"
diff --git a/java/res/drawable/btn_keyboard_key_lxx_dark.xml b/java/res/drawable/btn_keyboard_key_lxx_dark.xml
index 161592d3d1f11c8f6ad8a4a6a1551bcd843868f8..85d0a78c07e2f23ff1783c6ad3c8c002e8a29c0a 100644
--- a/java/res/drawable/btn_keyboard_key_lxx_dark.xml
+++ b/java/res/drawable/btn_keyboard_key_lxx_dark.xml
@@ -23,13 +23,13 @@
 
     <!-- Toggle keys. Use checkable/checked state. -->
     <item android:state_checkable="true" android:state_checked="true" android:state_pressed="true"
-          android:drawable="@drawable/btn_keyboard_key_pressed_on_lxx_dark" />
+        android:drawable="@drawable/bg_btn_keyboard_key_normal_on" />
     <item android:state_checkable="true" android:state_pressed="true"
-          android:drawable="@drawable/btn_keyboard_key_pressed_off_lxx_dark" />
+        android:drawable="@drawable/bg_btn_keyboard_key_normal_off" />
     <item android:state_checkable="true" android:state_checked="true"
-          android:drawable="@drawable/btn_keyboard_key_normal_on_lxx_dark" />
+        android:drawable="@drawable/bg_btn_keyboard_key_normal_on" />
     <item android:state_checkable="true"
-          android:drawable="@drawable/btn_keyboard_key_normal_off_lxx_dark" />
+        android:drawable="@drawable/bg_btn_keyboard_key_normal_off" />
 
     <!-- Empty background keys. -->
     <item android:state_empty="true" android:state_pressed="true"
diff --git a/java/res/drawable/btn_keyboard_key_lxx_light.xml b/java/res/drawable/btn_keyboard_key_lxx_light.xml
index 0154d75b46c4634e9d39d6bc3178e8a5a8fa734a..e8e200fccd6424f007e39ba7c9f680cd41f2e721 100644
--- a/java/res/drawable/btn_keyboard_key_lxx_light.xml
+++ b/java/res/drawable/btn_keyboard_key_lxx_light.xml
@@ -23,13 +23,13 @@
 
     <!-- Toggle keys. Use checkable/checked state. -->
     <item android:state_checkable="true" android:state_checked="true" android:state_pressed="true"
-          android:drawable="@drawable/btn_keyboard_key_pressed_on_lxx_light" />
+        android:drawable="@drawable/bg_btn_keyboard_key_normal_on" />
     <item android:state_checkable="true" android:state_pressed="true"
-          android:drawable="@drawable/btn_keyboard_key_pressed_off_lxx_light" />
+        android:drawable="@drawable/bg_btn_keyboard_key_normal_off" />
     <item android:state_checkable="true" android:state_checked="true"
-          android:drawable="@drawable/btn_keyboard_key_normal_on_lxx_light" />
+        android:drawable="@drawable/bg_btn_keyboard_key_normal_on" />
     <item android:state_checkable="true"
-          android:drawable="@drawable/btn_keyboard_key_normal_off_lxx_light" />
+        android:drawable="@drawable/bg_btn_keyboard_key_normal_off" />
 
     <!-- Empty background keys. -->
     <item android:state_empty="true" android:state_pressed="true"
diff --git a/java/res/drawable/ic_add_circle.xml b/java/res/drawable/ic_add_circle.xml
new file mode 100644
index 0000000000000000000000000000000000000000..520d3fec2eab90fe690b1e7d6ece6329fcefc752
--- /dev/null
+++ b/java/res/drawable/ic_add_circle.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2015, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/color_default_accent"
+        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM17,13h-4v4h-2v-4L7,13v-2h4L11,7h2v4h4v2z"/>
+</vector>
\ No newline at end of file
diff --git a/java/res/drawable/ic_arrow_back.xml b/java/res/drawable/ic_arrow_back.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a1b4f1a80c66dd0ce026c77ec537d0604cb08309
--- /dev/null
+++ b/java/res/drawable/ic_arrow_back.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2015, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:autoMirrored="true">
+    <path
+        android:fillColor="@color/color_default_accent"
+        android:pathData="M20,11H7.83l5.59-5.59L12,4l-8,8l8,8l1.41-1.41L7.83,13H20V11z" />
+</vector>
\ No newline at end of file
diff --git a/java/res/layout/additional_subtype_dialog.xml b/java/res/layout/additional_subtype_dialog.xml
index 2de7d07a865a7c4b1d1fc2ae8173b8ec035b0320..024d96342b47f5d9a0b1e8a946f2d4034920f2d8 100644
--- a/java/res/layout/additional_subtype_dialog.xml
+++ b/java/res/layout/additional_subtype_dialog.xml
@@ -35,6 +35,7 @@
             android:gravity="start|left"
             android:textAlignment="viewStart"
             style="?android:attr/textAppearanceSmall"
+            android:textColor="@color/color_default_primary_text"
             android:text="@string/subtype_locale" />
         <Spinner
             android:id="@+id/subtype_locale_spinner"
@@ -60,6 +61,7 @@
             android:layout_gravity="start|center_vertical"
             android:textAlignment="viewStart"
             style="?android:attr/textAppearanceSmall"
+            android:textColor="@color/color_default_primary_text"
             android:text="@string/keyboard_layout_set" />
         <Spinner
             android:id="@+id/keyboard_layout_set_spinner"
diff --git a/java/res/layout/custom_spinner_dropdown_item.xml b/java/res/layout/custom_spinner_dropdown_item.xml
new file mode 100644
index 0000000000000000000000000000000000000000..2fe69c95ce3cbc4086ca9f1b33697268d716f5fb
--- /dev/null
+++ b/java/res/layout/custom_spinner_dropdown_item.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2012, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<CheckedTextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@android:id/text1"
+    style="?android:attr/spinnerDropDownItemStyle"
+    android:singleLine="true"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_margin="15dp"
+    android:padding="15dp"
+    android:textSize="18sp"
+    android:textColor="@color/color_default_primary_text"
+    android:ellipsize="marquee"/>
\ No newline at end of file
diff --git a/java/res/layout/dictionary_line.xml b/java/res/layout/dictionary_line.xml
index bb1843d6c6e456abe75f1d3dd1f981dda5bddeec..5726e425cdb5683b685b7210175a86290c0ab377 100644
--- a/java/res/layout/dictionary_line.xml
+++ b/java/res/layout/dictionary_line.xml
@@ -89,6 +89,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="right|center_vertical"
         android:singleLine="true"
+        android:background="@color/color_default_foreground"
         android:textAppearance="?android:attr/textAppearanceMedium"
         android:text="@string/install_dict" />
     <Button
@@ -97,6 +98,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="right|center_vertical"
         android:singleLine="true"
+        android:background="@color/color_default_foreground"
         android:textAppearance="?android:attr/textAppearanceMedium"
         android:text="@string/cancel_download_dict" />
     <Button
@@ -105,6 +107,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="right|center_vertical"
         android:singleLine="true"
+        android:background="@color/color_default_foreground"
         android:textAppearance="?android:attr/textAppearanceMedium"
         android:text="@string/delete_dict" />
   </com.android.inputmethod.dictionarypack.ButtonSwitcher>
diff --git a/java/res/layout/seek_bar_dialog.xml b/java/res/layout/seek_bar_dialog.xml
index e723ad9bb7f576822a56900d0da82c2ffb3b11bb..f61fb22dabe8de19a86eb562e24bb8ac8f258c11 100644
--- a/java/res/layout/seek_bar_dialog.xml
+++ b/java/res/layout/seek_bar_dialog.xml
@@ -33,6 +33,7 @@
         <TextView android:id="@+id/seek_bar_dialog_value"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:textColor="@color/color_default_primary_text"
             android:textSize="20sp"/>
     </LinearLayout>
     <SeekBar
diff --git a/java/res/menu/add_style.xml b/java/res/menu/add_style.xml
index befa3f2aaa6051d0d9c78e19199becebd5c5682c..62aa9c0978eedc23041496ef168f69ee1abaa204 100644
--- a/java/res/menu/add_style.xml
+++ b/java/res/menu/add_style.xml
@@ -20,7 +20,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item
         android:id="@+id/action_add_style"
-        android:icon="@drawable/ic_add_circle_white_24dp"
+        android:icon="@drawable/ic_add_circle"
         android:title="@string/add_style"
         android:showAsAction="always" />
 </menu>
diff --git a/java/res/values-night-v28/platform-theme.xml b/java/res/values-night-v28/platform-theme.xml
new file mode 100644
index 0000000000000000000000000000000000000000..349ad73de9240672eb7ddfd43f56ec723ea0c708
--- /dev/null
+++ b/java/res/values-night-v28/platform-theme.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+    <style name="platformActivityTheme" parent="@style/platformBaseTheme">
+        <item name="android:navigationBarColor">@color/color_default_primary_dark</item>
+        <item name="android:navigationBarDividerColor">@color/color_default_primary_dark</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
+        <item name="android:windowLightNavigationBar">false</item>
+        <item name="android:windowLightStatusBar">false</item>
+    </style>
+    <style name="platformSettingsTheme" parent="@style/platformBaseTheme">
+        <item name="android:navigationBarColor">@color/color_default_primary_dark</item>
+        <item name="android:navigationBarDividerColor">@color/color_default_primary_dark</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
+        <item name="android:windowLightNavigationBar">false</item>
+        <item name="android:windowLightStatusBar">false</item>
+    </style>
+</resources>
diff --git a/java/res/values-v21/platform-theme.xml b/java/res/values-night/platform-theme.xml
similarity index 72%
rename from java/res/values-v21/platform-theme.xml
rename to java/res/values-night/platform-theme.xml
index 58763fbdde766bb63fc81387319778d53a2072ec..d30eb555667e3969a33ac264de4402449c11f50c 100644
--- a/java/res/values-v21/platform-theme.xml
+++ b/java/res/values-night/platform-theme.xml
@@ -19,7 +19,5 @@
 -->
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
-    <style name="platformActivityTheme" parent="@android:style/Theme.DeviceDefault.Light" />
-    <style name="platformSettingsTheme" parent="@android:style/Theme.DeviceDefault.Settings" />
-    <style name="platformDialogTheme" parent="@android:style/Theme.DeviceDefault.Light.Dialog" />
+    <style name="BaseTheme" parent="@android:style/Theme.DeviceDefault" />
 </resources>
diff --git a/java/res/values-v28/platform-theme.xml b/java/res/values-v28/platform-theme.xml
new file mode 100644
index 0000000000000000000000000000000000000000..4fd23ab0b93d0765627eeb967b23a33d3d74b110
--- /dev/null
+++ b/java/res/values-v28/platform-theme.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+    <style name="platformActivityTheme" parent="@style/platformBaseTheme">
+        <item name="android:navigationBarColor">@color/color_default_primary_dark</item>
+        <item name="android:navigationBarDividerColor">@color/color_default_primary_dark</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
+        <item name="android:windowLightNavigationBar">true</item>
+        <item name="android:windowLightStatusBar">true</item>
+    </style>
+    <style name="platformSettingsTheme" parent="@style/platformBaseTheme">
+        <item name="android:navigationBarColor">@color/color_default_primary_dark</item>
+        <item name="android:navigationBarDividerColor">@color/color_default_primary_dark</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
+        <item name="android:windowLightNavigationBar">true</item>
+        <item name="android:windowLightStatusBar">true</item>
+    </style>
+</resources>
diff --git a/java/res/values/colors.xml b/java/res/values/colors.xml
index 7b11cafcf49a6817d6ee60452c662b24c77cd476..fc5e9874853df46781a3f2ee19b6ed4f82e8a7cd 100644
--- a/java/res/values/colors.xml
+++ b/java/res/values/colors.xml
@@ -19,69 +19,78 @@
 -->
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
+    <color name="color_default_primary">@lineageos.platform:color/color_default_primary</color>
+    <color name="color_default_primary_dark">@lineageos.platform:color/color_default_primary_dark</color>
+    <color name="color_default_background">@lineageos.platform:color/color_default_background</color>
+    <color name="color_default_foreground">@lineageos.platform:color/color_default_foreground</color>
+    <color name="color_default_divider">@lineageos.platform:color/color_default_divider</color>
+    <color name="color_default_primary_text">@lineageos.platform:color/color_default_primary_text</color>
+    <color name="color_default_secondary_text">@lineageos.platform:color/color_default_secondary_text</color>
+    <color name="color_default_accent">@lineageos.platform:color/color_default_accent</color>
+    <color name="color_default_view_on_accent">@lineageos.platform:color/color_default_view_on_accent</color>
     <!-- Color resources for IceCreamSandwich theme. Base color = 33B5E5 -->
     <!-- android:color/holo_blue_light value is #FF33B5E5 -->
-    <color name="highlight_color_ics">#FF33B5E5</color>
-    <color name="typed_word_color_ics">#D833B5E5</color>
-    <color name="suggested_word_color_ics">#B233B5E5</color>
-    <color name="highlight_translucent_color_ics">#9933B5E5</color>
-    <color name="key_text_color_holo">@android:color/white</color>
-    <color name="key_text_inactivated_color_holo">#66E0E4E5</color>
-    <color name="key_hint_letter_color_holo">#80000000</color>
-    <color name="key_hint_label_color_holo">#A0FFFFFF</color>
-    <color name="key_shifted_letter_hint_inactivated_color_holo">#66E0E4E5</color>
-    <color name="key_shifted_letter_hint_activated_color_holo">@android:color/white</color>
-    <color name="spacebar_text_color_holo">#FFC0C0C0</color>
+    <color name="highlight_color_ics">@color/color_default_accent</color>
+    <color name="typed_word_color_ics">@color/color_default_accent</color>
+    <color name="suggested_word_color_ics">@color/color_default_primary_text</color>
+    <color name="highlight_translucent_color_ics">@color/color_default_secondary_text</color>
+    <color name="key_text_color_holo">@color/color_default_primary_text</color>
+    <color name="key_text_inactivated_color_holo">@color/color_default_secondary_text</color>
+    <color name="key_hint_letter_color_holo">@color/color_default_secondary_text</color>
+    <color name="key_hint_label_color_holo">@color/color_default_foreground</color>
+    <color name="key_shifted_letter_hint_inactivated_color_holo">@color/color_default_secondary_text</color>
+    <color name="key_shifted_letter_hint_activated_color_holo">@color/color_default_primary_text</color>
+    <color name="spacebar_text_color_holo">@color/color_default_secondary_text</color>
     <color name="spacebar_text_shadow_color_holo">#80000000</color>
-    <color name="gesture_floating_preview_color_holo">#C0000000</color>
-    <color name="emoji_tab_page_indicator_background_holo">#111111</color>
+    <color name="gesture_floating_preview_color_holo">@color/color_default_primary_dark</color>
+    <color name="emoji_tab_page_indicator_background_holo">@color/color_default_foreground</color>
     <!-- Color resources for KLP theme. Base color = F0F0F0 -->
-    <color name="highlight_color_klp">#FFF0F0F0</color>
-    <color name="typed_word_color_klp">#D8F0F0F0</color>
-    <color name="suggested_word_color_klp">#B2F0F0F0</color>
-    <color name="highlight_translucent_color_klp">#99E0E0E0</color>
+    <color name="highlight_color_klp">@color/color_default_accent</color>
+    <color name="typed_word_color_klp">@color/color_default_accent</color>
+    <color name="suggested_word_color_klp">@color/color_default_primary_text</color>
+    <color name="highlight_translucent_color_klp">@color/color_default_secondary_text</color>
     <!-- Color resources for LXX_Light theme.
          15%:0x26 70%:0xB3 75%:0xC0 80%:0xCC 85%:0xD9 90%:0xE6 -->
-    <color name="key_text_color_lxx_light">#37474F</color>
-    <color name="key_functional_text_color_lxx_light">#CC37474F</color>
-    <color name="key_text_inactive_color_lxx_light">#B337474F</color>
-    <color name="key_hint_letter_color_lxx_light">#B337474F</color>
-    <color name="language_on_spacebar_text_color_lxx_light">#B337474F</color>
-    <color name="highlight_color_lxx_light">@lineageos.platform:color/color_default_accent</color>
-    <color name="auto_correct_color_lxx_light">#37474F</color>
-    <color name="typed_word_color_lxx_light">#D937474F</color>
-    <color name="suggested_word_color_lxx_light">#B337474F</color>
-    <color name="gesture_trail_color_lxx_light">@lineageos.platform:color/color_default_accent</color>
-    <color name="sliding_key_input_preview_color_lxx_light">@lineageos.platform:color/color_default_accent</color>
-    <color name="key_background_lxx_light">#ECEFF1</color>
-    <color name="key_background_pressed_lxx_light">#2637474F</color>
-    <color name="suggested_word_background_selected_lxx_light">#2637474F</color>
-    <color name="gesture_floating_preview_color_lxx_light">#E6ECEFF1</color>
-    <color name="emoji_tab_page_indicator_background_lxx_light">#E4E7E9</color>
+    <color name="key_text_color_lxx_light">@color/color_default_primary_text</color>
+    <color name="key_functional_text_color_lxx_light">@color/color_default_primary_text</color>
+    <color name="key_text_inactive_color_lxx_light">@color/color_default_secondary_text</color>
+    <color name="key_hint_letter_color_lxx_light">@color/color_default_secondary_text</color>
+    <color name="language_on_spacebar_text_color_lxx_light">@color/color_default_secondary_text</color>
+    <color name="highlight_color_lxx_light">@color/color_default_accent</color>
+    <color name="auto_correct_color_lxx_light">@color/color_default_primary_text</color>
+    <color name="typed_word_color_lxx_light">@color/color_default_accent</color>
+    <color name="suggested_word_color_lxx_light">@color/color_default_primary_text</color>
+    <color name="gesture_trail_color_lxx_light">@color/color_default_accent</color>
+    <color name="sliding_key_input_preview_color_lxx_light">@color/color_default_accent</color>
+    <color name="key_background_lxx_light">@color/color_default_foreground</color>
+    <color name="key_background_pressed_lxx_light">@color/color_default_primary_dark</color>
+    <color name="suggested_word_background_selected_lxx_light">@color/color_default_primary_dark</color>
+    <color name="gesture_floating_preview_color_lxx_light">@color/color_default_primary_dark</color>
+    <color name="emoji_tab_page_indicator_background_lxx_light">@color/color_default_foreground</color>
     <!-- Color resources for LXX_Dark theme.
          10%:0x19 50%:0x80 70%:0xB3 75%:0xC0 80%:0xCC 85%:0xD9 90%:0xE6  -->
-    <color name="key_text_color_lxx_dark">#CCFFFFFF</color>
-    <color name="key_functional_text_color_lxx_dark">#CCFFFFFF</color>
-    <color name="key_text_inactive_color_lxx_dark">#80FFFFFF</color>
-    <color name="key_hint_letter_color_lxx_dark">#80FFFFFF</color>
-    <color name="language_on_spacebar_text_color_lxx_dark">#B3FFFFFF</color>
-    <color name="highlight_color_lxx_dark">@lineageos.platform:color/color_default_accent</color>
-    <color name="auto_correct_color_lxx_dark">#FFFFFF</color>
-    <color name="typed_word_color_lxx_dark">#D9FFFFFF</color>
-    <color name="suggested_word_color_lxx_dark">#B3FFFFFF</color>
-    <color name="gesture_trail_color_lxx_dark">@lineageos.platform:color/color_default_accent</color>
-    <color name="sliding_key_input_preview_color_lxx_dark">@lineageos.platform:color/color_default_accent</color>
-    <color name="key_background_lxx_dark">#263238</color>
-    <color name="key_background_pressed_lxx_dark">#19FFFFFF</color>
-    <color name="suggested_word_background_selected_lxx_dark">#19FFFFFF</color>
-    <color name="gesture_floating_preview_color_lxx_dark">#E621272B</color>
-    <color name="emoji_tab_page_indicator_background_lxx_dark">#21272B</color>
+    <color name="key_text_color_lxx_dark">@color/color_default_primary_text</color>
+    <color name="key_functional_text_color_lxx_dark">@color/color_default_primary_text</color>
+    <color name="key_text_inactive_color_lxx_dark">@color/color_default_secondary_text</color>
+    <color name="key_hint_letter_color_lxx_dark">@color/color_default_secondary_text</color>
+    <color name="language_on_spacebar_text_color_lxx_dark">@color/color_default_secondary_text</color>
+    <color name="highlight_color_lxx_dark">@color/color_default_accent</color>
+    <color name="auto_correct_color_lxx_dark">@color/color_default_primary_text</color>
+    <color name="typed_word_color_lxx_dark">@color/color_default_accent</color>
+    <color name="suggested_word_color_lxx_dark">@color/color_default_primary_text</color>
+    <color name="gesture_trail_color_lxx_dark">@color/color_default_accent</color>
+    <color name="sliding_key_input_preview_color_lxx_dark">@color/color_default_accent</color>
+    <color name="key_background_lxx_dark">@color/color_default_foreground</color>
+    <color name="key_background_pressed_lxx_dark">@color/color_default_primary_dark</color>
+    <color name="suggested_word_background_selected_lxx_dark">@color/color_default_primary_dark</color>
+    <color name="gesture_floating_preview_color_lxx_dark">@color/color_default_primary_dark</color>
+    <color name="emoji_tab_page_indicator_background_lxx_dark">@color/color_default_foreground</color>
     <!-- Color resources for setup wizard and tutorial -->
-    <color name="setup_background">#FFEBEBEB</color>
-    <color name="setup_text_dark">#FF707070</color>
-    <color name="setup_text_action">@lineageos.platform:color/color_default_accent</color>
-    <color name="setup_step_background">@android:color/background_light</color>
-    <color name="setup_welcome_video_margin_color">#FFCCCCCC</color>
+    <color name="setup_background">@color/color_default_background</color>
+    <color name="setup_text_dark">@color/color_default_primary_text</color>
+    <color name="setup_text_action">@color/color_default_accent</color>
+    <color name="setup_step_background">@color/color_default_foreground</color>
+    <color name="setup_welcome_video_margin_color">@color/color_default_divider</color>
     <!-- Accent color for the notification. We need to match this to the OS build -->
-    <color name="notification_accent_color">#FF607D8B</color>
+    <color name="notification_accent_color">@color/color_default_accent</color>
 </resources>
diff --git a/java/res/values/platform-theme.xml b/java/res/values/platform-theme.xml
index 2854ff72fde3d5b7dd370b1732ca73fad683eebb..7d23060f033b023388fa5b30c39264a032d342ce 100644
--- a/java/res/values/platform-theme.xml
+++ b/java/res/values/platform-theme.xml
@@ -19,7 +19,36 @@
 -->
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
-    <style name="platformActivityTheme" parent="@android:style/Theme.DeviceDefault" />
-    <style name="platformSettingsTheme" parent="@android:style/Theme.DeviceDefault" />
-    <style name="platformDialogTheme" parent="@android:style/Theme.DeviceDefault.Dialog" />
+    <style name="platformActivityTheme" parent="@style/platformBaseTheme" />
+    <style name="platformSettingsTheme" parent="@style/platformBaseTheme" />
+    <style name="platformDialogTheme" parent="@style/dialogBase" />
+
+    <style name="platformBaseTheme" parent="@style/BaseTheme">
+        <item name="android:statusBarColor">@color/color_default_primary_dark</item>
+
+        <item name="android:colorPrimary">@color/color_default_primary</item>
+        <item name="android:colorPrimaryDark">@color/color_default_primary_dark</item>
+        <item name="android:windowBackground">@color/color_default_background</item>
+        <item name="android:colorBackground">@color/color_default_background</item>
+        <item name="android:colorAccent">@color/color_default_accent</item>
+
+        <item name="android:textColorPrimary">@color/color_default_primary_text</item>
+        <item name="android:textColorSecondary">@color/color_default_secondary_text</item>
+
+        <item name="android:homeAsUpIndicator">@drawable/ic_arrow_back</item>
+        <item name="android:alertDialogTheme">@style/platformDialogTheme</item>
+        <item name="android:textColorAlertDialogListItem">@color/color_default_primary_text</item>
+    </style>
+
+    <style name="BaseTheme" parent="@android:style/Theme.DeviceDefault.Light" />
+
+    <style name="dialogBase" parent="android:Theme.Material.Dialog">
+        <item name="android:colorPrimary">@color/color_default_primary</item>
+        <item name="android:colorPrimaryDark">@color/color_default_primary_dark</item>
+        <item name="android:colorAccent">@color/color_default_accent</item>
+        <item name="android:background">@color/color_default_foreground</item>
+        <item name="android:textColorPrimary">@color/color_default_primary_text</item>
+        <item name="android:textColorSecondary">@color/color_default_secondary_text</item>
+        <item name="android:textColorAlertDialogListItem">@color/color_default_primary_text</item>
+    </style>
 </resources>
diff --git a/java/res/values/themes-ics.xml b/java/res/values/themes-ics.xml
index 1a15b0e9753f23de59352926cf1e74e7f04f2aa3..fae1f1427ee6db55052a1ed5ea6685b8025f0b7a 100644
--- a/java/res/values/themes-ics.xml
+++ b/java/res/values/themes-ics.xml
@@ -43,7 +43,7 @@
         name="KeyboardView.ICS"
         parent="KeyboardView.Holo"
     >
-        <item name="android:background">@drawable/keyboard_background_holo</item>
+        <item name="android:background">@color/color_default_foreground</item>
         <item name="keyBackground">@drawable/btn_keyboard_key_ics</item>
         <item name="functionalKeyBackground">@drawable/btn_keyboard_key_functional_ics</item>
         <item name="spacebarBackground">@drawable/btn_keyboard_spacebar_ics</item>
@@ -54,7 +54,7 @@
         <item name="keyHintLabelColor">@color/key_hint_label_color_holo</item>
         <item name="keyShiftedLetterHintInactivatedColor">@color/key_shifted_letter_hint_inactivated_color_holo</item>
         <item name="keyShiftedLetterHintActivatedColor">@color/key_shifted_letter_hint_activated_color_holo</item>
-        <item name="keyPreviewTextColor">@color/key_text_color_holo</item>
+        <item name="keyPreviewTextColor">@color/color_default_view_on_accent</item>
     </style>
     <style
         name="MainKeyboardView.ICS"
@@ -117,7 +117,7 @@
         name="MoreKeysKeyboardView.ICS"
         parent="KeyboardView.ICS"
     >
-        <item name="android:background">@drawable/keyboard_popup_panel_background_ics</item>
+        <item name="android:background">@color/color_default_background</item>
         <item name="keyBackground">@drawable/btn_keyboard_key_popup_ics</item>
         <item name="divider">@drawable/more_keys_divider</item>
         <item name="keyTypeface">normal</item>
@@ -131,7 +131,7 @@
         <item name="centerSuggestionPercentile">@fraction/config_center_suggestion_percentile</item>
         <item name="maxMoreSuggestionsRow">@integer/config_max_more_suggestions_row</item>
         <item name="minMoreSuggestionsWidth">@fraction/config_min_more_suggestions_width</item>
-        <item name="android:background">@drawable/keyboard_suggest_strip_holo</item>
+        <item name="android:background">@color/color_default_foreground</item>
         <item name="android:src">@drawable/suggestions_strip_divider_holo</item>
         <item name="suggestionStripOptions">autoCorrectBold|validTypedWordBold</item>
         <item name="colorValidTypedWord">@color/typed_word_color_ics</item>
@@ -144,7 +144,7 @@
         name="SuggestionWord.ICS"
         parent="SuggestionWord"
     >
-        <item name="android:background">@drawable/btn_suggestion_ics</item>
-        <item name="android:textColor">@color/highlight_color_ics</item>
+        <item name="android:background">@color/color_default_foreground</item>
+        <item name="android:textColor">@color/color_default_primary_text</item>
     </style>
 </resources>
diff --git a/java/res/values/themes-klp.xml b/java/res/values/themes-klp.xml
index 32884dba011507146ba817ba52320f6a6e60ea8f..b7c3ec2b5de98961cfb988bc871b3878b3607042 100644
--- a/java/res/values/themes-klp.xml
+++ b/java/res/values/themes-klp.xml
@@ -43,7 +43,7 @@
         name="KeyboardView.KLP"
         parent="KeyboardView.Holo"
     >
-        <item name="android:background">@drawable/keyboard_background_holo</item>
+        <item name="android:background">@color/color_default_foreground</item>
         <item name="keyBackground">@drawable/btn_keyboard_key_klp</item>
         <item name="functionalKeyBackground">@drawable/btn_keyboard_key_functional_klp</item>
         <item name="spacebarBackground">@drawable/btn_keyboard_spacebar_klp</item>
@@ -54,7 +54,7 @@
         <item name="keyHintLabelColor">@color/key_hint_label_color_holo</item>
         <item name="keyShiftedLetterHintInactivatedColor">@color/key_shifted_letter_hint_inactivated_color_holo</item>
         <item name="keyShiftedLetterHintActivatedColor">@color/key_shifted_letter_hint_activated_color_holo</item>
-        <item name="keyPreviewTextColor">@color/key_text_color_holo</item>
+        <item name="keyPreviewTextColor">@color/color_default_view_on_accent</item>
     </style>
     <style
         name="MainKeyboardView.KLP"
@@ -117,7 +117,7 @@
         name="MoreKeysKeyboardView.KLP"
         parent="KeyboardView.KLP"
     >
-        <item name="android:background">@drawable/keyboard_popup_panel_background_klp</item>
+        <item name="android:background">@color/color_default_background</item>
         <item name="keyBackground">@drawable/btn_keyboard_key_popup_klp</item>
         <item name="divider">@drawable/more_keys_divider</item>
         <item name="keyTypeface">normal</item>
@@ -131,7 +131,7 @@
         <item name="centerSuggestionPercentile">@fraction/config_center_suggestion_percentile</item>
         <item name="maxMoreSuggestionsRow">@integer/config_max_more_suggestions_row</item>
         <item name="minMoreSuggestionsWidth">@fraction/config_min_more_suggestions_width</item>
-        <item name="android:background">@drawable/keyboard_suggest_strip_holo</item>
+        <item name="android:background">@color/color_default_foreground</item>
         <item name="android:src">@drawable/suggestions_strip_divider_holo</item>
         <item name="suggestionStripOptions">autoCorrectBold|validTypedWordBold</item>
         <item name="colorValidTypedWord">@color/typed_word_color_klp</item>
@@ -144,7 +144,7 @@
         name="SuggestionWord.KLP"
         parent="SuggestionWord"
     >
-        <item name="android:background">@drawable/btn_suggestion_klp</item>
-        <item name="android:textColor">@color/highlight_color_klp</item>
+        <item name="android:background">@color/color_default_foreground</item>
+        <item name="android:textColor">@color/color_default_primary_text</item>
     </style>
 </resources>
diff --git a/java/res/values/themes-lxx-dark.xml b/java/res/values/themes-lxx-dark.xml
index cae1f7243822c41e16544ffd739994b375553dea..3c175ccf4a60cae6d7a717e2fb66cefa5336ba99 100644
--- a/java/res/values/themes-lxx-dark.xml
+++ b/java/res/values/themes-lxx-dark.xml
@@ -42,7 +42,7 @@
         name="KeyboardView.LXX_Dark"
         parent="KeyboardView.LXX"
     >
-        <item name="android:background">@drawable/keyboard_background_lxx_dark</item>
+        <item name="android:background">@color/color_default_foreground</item>
         <item name="keyBackground">@drawable/btn_keyboard_key_lxx_dark</item>
         <item name="functionalKeyBackground">@drawable/btn_keyboard_key_functional_lxx_dark</item>
         <item name="spacebarBackground">@drawable/btn_keyboard_spacebar_lxx_dark</item>
@@ -53,7 +53,7 @@
         <item name="keyHintLabelColor">@color/key_text_inactive_color_lxx_dark</item>
         <item name="keyShiftedLetterHintInactivatedColor">@color/key_text_inactive_color_lxx_dark</item>
         <item name="keyShiftedLetterHintActivatedColor">@color/key_text_color_lxx_dark</item>
-        <item name="keyPreviewTextColor">@color/key_text_color_lxx_dark</item>
+        <item name="keyPreviewTextColor">@color/color_default_view_on_accent</item>
     </style>
     <style
         name="MainKeyboardView.LXX_Dark"
@@ -115,7 +115,7 @@
         name="MoreKeysKeyboardView.LXX_Dark"
         parent="KeyboardView.LXX_Dark"
     >
-        <item name="android:background">@drawable/keyboard_popup_panel_background_lxx_dark</item>
+        <item name="android:background">@color/color_default_background</item>
         <item name="keyBackground">@drawable/btn_keyboard_key_popup_lxx_dark</item>
         <item name="divider">@drawable/more_keys_divider</item>
         <item name="keyTypeface">normal</item>
@@ -138,7 +138,7 @@
         <item name="centerSuggestionPercentile">@fraction/config_center_suggestion_percentile</item>
         <item name="maxMoreSuggestionsRow">@integer/config_max_more_suggestions_row</item>
         <item name="minMoreSuggestionsWidth">@fraction/config_min_more_suggestions_width</item>
-        <item name="android:background">@drawable/keyboard_suggest_strip_lxx_dark</item>
+        <item name="android:background">@color/color_default_foreground</item>
         <item name="android:src">@drawable/suggestions_strip_divider_lxx_dark</item>
         <item name="suggestionStripOptions">autoCorrectBold|validTypedWordBold</item>
         <item name="colorValidTypedWord">@color/typed_word_color_lxx_dark</item>
@@ -151,7 +151,7 @@
         name="SuggestionWord.LXX_Dark"
         parent="SuggestionWord"
     >
-        <item name="android:background">@drawable/btn_suggestion_lxx_dark</item>
-        <item name="android:textColor">@color/highlight_color_lxx_dark</item>
+        <item name="android:background">@color/color_default_foreground</item>
+        <item name="android:textColor">@color/color_default_primary_text</item>
     </style>
 </resources>
diff --git a/java/res/values/themes-lxx-light.xml b/java/res/values/themes-lxx-light.xml
index eecd191a342584664653c4438f5121dbd1e7db46..924e08c6a992d35cbeea7df317a6621ad2b4e3aa 100644
--- a/java/res/values/themes-lxx-light.xml
+++ b/java/res/values/themes-lxx-light.xml
@@ -42,7 +42,7 @@
         name="KeyboardView.LXX_Light"
         parent="KeyboardView.LXX"
     >
-        <item name="android:background">@drawable/keyboard_background_lxx_light</item>
+        <item name="android:background">@color/color_default_foreground</item>
         <item name="keyBackground">@drawable/btn_keyboard_key_lxx_light</item>
         <item name="functionalKeyBackground">@drawable/btn_keyboard_key_functional_lxx_light</item>
         <item name="spacebarBackground">@drawable/btn_keyboard_spacebar_lxx_light</item>
@@ -53,7 +53,7 @@
         <item name="keyHintLabelColor">@color/key_text_inactive_color_lxx_light</item>
         <item name="keyShiftedLetterHintInactivatedColor">@color/key_text_inactive_color_lxx_light</item>
         <item name="keyShiftedLetterHintActivatedColor">@color/key_text_color_lxx_light</item>
-        <item name="keyPreviewTextColor">@color/key_text_color_lxx_light</item>
+        <item name="keyPreviewTextColor">@color/color_default_view_on_accent</item>
     </style>
     <style
         name="MainKeyboardView.LXX_Light"
@@ -115,7 +115,7 @@
         name="MoreKeysKeyboardView.LXX_Light"
         parent="KeyboardView.LXX_Light"
     >
-        <item name="android:background">@drawable/keyboard_popup_panel_background_lxx_light</item>
+        <item name="android:background">@color/color_default_background</item>
         <item name="keyBackground">@drawable/btn_keyboard_key_popup_lxx_light</item>
         <item name="divider">@drawable/more_keys_divider</item>
         <item name="keyTypeface">normal</item>
@@ -138,7 +138,7 @@
         <item name="centerSuggestionPercentile">@fraction/config_center_suggestion_percentile</item>
         <item name="maxMoreSuggestionsRow">@integer/config_max_more_suggestions_row</item>
         <item name="minMoreSuggestionsWidth">@fraction/config_min_more_suggestions_width</item>
-        <item name="android:background">@drawable/keyboard_suggest_strip_lxx_light</item>
+        <item name="android:background">@color/color_default_foreground</item>
         <item name="android:src">@drawable/suggestions_strip_divider_lxx_light</item>
         <item name="suggestionStripOptions">autoCorrectBold|validTypedWordBold</item>
         <item name="colorValidTypedWord">@color/typed_word_color_lxx_light</item>
@@ -151,7 +151,7 @@
         name="SuggestionWord.LXX_Light"
         parent="SuggestionWord"
     >
-        <item name="android:background">@drawable/btn_suggestion_lxx_light</item>
-        <item name="android:textColor">@color/highlight_color_lxx_light</item>
+        <item name="android:background">@color/color_default_foreground</item>
+        <item name="android:textColor">@color/color_default_primary_text</item>
     </style>
 </resources>
diff --git a/java/res/xml/prefs_screen_appearance.xml b/java/res/xml/prefs_screen_appearance.xml
index 036b66553cbb4e9c5e05e1a6765aca57e1a4c207..bafd0817dcb0a3ac69bfea4f463bf73d87476477 100644
--- a/java/res/xml/prefs_screen_appearance.xml
+++ b/java/res/xml/prefs_screen_appearance.xml
@@ -18,10 +18,6 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:key="screen_appearance"
     android:title="@string/settings_screen_appearance">
-    <PreferenceScreen
-        android:fragment="com.android.inputmethod.latin.settings.ThemeSettingsFragment"
-        android:key="screen_theme"
-        android:title="@string/settings_screen_theme" />
     <PreferenceScreen
         android:fragment="com.android.inputmethod.latin.settings.CustomInputStyleSettingsFragment"
         android:key="custom_input_styles"
diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardTheme.java b/java/src/com/android/inputmethod/keyboard/KeyboardTheme.java
index 006d08696a84db95a302f5f89fb7864b24630bfe..aa6c919b94aef3fecdbea72269acd760c43d0d02 100644
--- a/java/src/com/android/inputmethod/keyboard/KeyboardTheme.java
+++ b/java/src/com/android/inputmethod/keyboard/KeyboardTheme.java
@@ -17,6 +17,7 @@
 package com.android.inputmethod.keyboard;
 
 import android.content.Context;
+import android.content.res.Configuration;
 import android.content.SharedPreferences;
 import android.os.Build;
 import android.os.Build.VERSION_CODES;
@@ -41,7 +42,8 @@ public final class KeyboardTheme implements Comparable<KeyboardTheme> {
     public static final int THEME_ID_KLP = 2;
     public static final int THEME_ID_LXX_LIGHT = 3;
     public static final int THEME_ID_LXX_DARK = 4;
-    public static final int DEFAULT_THEME_ID = THEME_ID_KLP;
+    public static final int THEME_ID_AUTO_DARK = 5;
+    public static final int DEFAULT_THEME_ID = THEME_ID_AUTO_DARK;
 
     private static KeyboardTheme[] AVAILABLE_KEYBOARD_THEMES;
 
@@ -59,6 +61,8 @@ public final class KeyboardTheme implements Comparable<KeyboardTheme> {
         new KeyboardTheme(THEME_ID_LXX_DARK, "LXXDark", R.style.KeyboardTheme_LXX_Dark,
                 // This has never been selected as default theme.
                 VERSION_CODES.BASE),
+        new KeyboardTheme(THEME_ID_AUTO_DARK, "AutoDark", 0,
+                VERSION_CODES.BASE),
     };
 
     static {
@@ -143,7 +147,10 @@ public final class KeyboardTheme implements Comparable<KeyboardTheme> {
     }
 
     public static String getKeyboardThemeName(final int themeId) {
-        final KeyboardTheme theme = searchKeyboardThemeById(themeId, KEYBOARD_THEMES);
+        KeyboardTheme theme = searchKeyboardThemeById(themeId, KEYBOARD_THEMES);
+        if (theme == null) {
+            theme = searchKeyboardThemeById(DEFAULT_THEME_ID, KEYBOARD_THEMES);
+        }
         return theme.mThemeName;
     }
 
@@ -163,13 +170,13 @@ public final class KeyboardTheme implements Comparable<KeyboardTheme> {
     static void saveKeyboardThemeId(final int themeId, final SharedPreferences prefs,
             final int sdkVersion) {
         final String prefKey = getPreferenceKey(sdkVersion);
-        prefs.edit().putString(prefKey, Integer.toString(themeId)).apply();
+        prefs.edit().putString(LXX_KEYBOARD_THEME_KEY, Integer.toString(THEME_ID_AUTO_DARK)).apply();
     }
 
     public static KeyboardTheme getKeyboardTheme(final Context context) {
         final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
         final KeyboardTheme[] availableThemeArray = getAvailableThemeArray(context);
-        return getKeyboardTheme(prefs, BuildCompatUtils.EFFECTIVE_SDK_INT, availableThemeArray);
+        return getKeyboardTheme(context, prefs, BuildCompatUtils.EFFECTIVE_SDK_INT, availableThemeArray);
     }
 
     /* package private for testing */
@@ -192,21 +199,22 @@ public final class KeyboardTheme implements Comparable<KeyboardTheme> {
     }
 
     /* package private for testing */
-    static KeyboardTheme getKeyboardTheme(final SharedPreferences prefs, final int sdkVersion,
+    static KeyboardTheme getKeyboardTheme(final Context context, final SharedPreferences prefs, final int sdkVersion,
             final KeyboardTheme[] availableThemeArray) {
-        final String lxxThemeIdString = prefs.getString(LXX_KEYBOARD_THEME_KEY, null);
-        if (lxxThemeIdString == null) {
-            return getDefaultKeyboardTheme(prefs, sdkVersion, availableThemeArray);
-        }
         try {
-            final int themeId = Integer.parseInt(lxxThemeIdString);
+            int themeId = THEME_ID_LXX_LIGHT;
+            Configuration cfg = context.getResources().getConfiguration();
+            int nightMode = cfg.uiMode & Configuration.UI_MODE_NIGHT_MASK;
+            if (nightMode == Configuration.UI_MODE_NIGHT_YES) {
+                themeId = THEME_ID_LXX_DARK;
+            }
             final KeyboardTheme theme = searchKeyboardThemeById(themeId, availableThemeArray);
             if (theme != null) {
                 return theme;
             }
-            Log.w(TAG, "Unknown keyboard theme in LXX preference: " + lxxThemeIdString);
+            Log.w(TAG, "Unknown keyboard theme in LXX preference: ");
         } catch (final NumberFormatException e) {
-            Log.w(TAG, "Illegal keyboard theme in LXX preference: " + lxxThemeIdString, e);
+            Log.w(TAG, "Illegal keyboard theme in LXX preference: ", e);
         }
         // Remove preference that contains unknown or illegal theme id.
         prefs.edit().remove(LXX_KEYBOARD_THEME_KEY).apply();
diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeyPreviewView.java b/java/src/com/android/inputmethod/keyboard/internal/KeyPreviewView.java
index 24538605a4a4a403081f4bf122cd18464316ccd7..73935d262da8d2b20137f2752f5a8fef0f68530d 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/KeyPreviewView.java
+++ b/java/src/com/android/inputmethod/keyboard/internal/KeyPreviewView.java
@@ -82,6 +82,7 @@ public class KeyPreviewView extends TextView {
             return;
         }
         background.getPadding(mBackgroundPadding);
+        background.setTint(R.color.color_default_primary_dark);
         final int maxWidth = background.getIntrinsicWidth() - mBackgroundPadding.left
                 - mBackgroundPadding.right;
         final float width = getTextWidth(text, getPaint());
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index cddd4533bf10500a21c42258d3fd3a387402bc5a..1df9bfc3ba719323ee0672026671d498a8413561 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -107,6 +107,8 @@ import java.util.concurrent.TimeUnit;
 
 import javax.annotation.Nonnull;
 
+import com.android.inputmethod.latin.R;
+
 /**
  * Input method implementation for Qwerty'ish keyboard.
  */
@@ -1825,7 +1827,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
             }
         };
         final AlertDialog.Builder builder = new AlertDialog.Builder(
-                DialogUtils.getPlatformDialogThemeContext(this));
+                this, R.style.platformDialogTheme);
         builder.setItems(items, listener).setTitle(title);
         final AlertDialog dialog = builder.create();
         dialog.setCancelable(true /* cancelable */);
diff --git a/java/src/com/android/inputmethod/latin/settings/AppearanceSettingsFragment.java b/java/src/com/android/inputmethod/latin/settings/AppearanceSettingsFragment.java
index 554edc85c9b412ed31e29cf50cf82e3457ee4251..80616f798eee42be46c865d532407cb0555d7e75 100644
--- a/java/src/com/android/inputmethod/latin/settings/AppearanceSettingsFragment.java
+++ b/java/src/com/android/inputmethod/latin/settings/AppearanceSettingsFragment.java
@@ -41,6 +41,5 @@ public final class AppearanceSettingsFragment extends SubScreenFragment {
         super.onResume();
         CustomInputStyleSettingsFragment.updateCustomInputStylesSummary(
                 findPreference(Settings.PREF_CUSTOM_INPUT_STYLES));
-        ThemeSettingsFragment.updateKeyboardThemeSummary(findPreference(Settings.SCREEN_THEME));
     }
 }
diff --git a/java/src/com/android/inputmethod/latin/settings/CustomInputStylePreference.java b/java/src/com/android/inputmethod/latin/settings/CustomInputStylePreference.java
index 21ea8f85942145f39420937ff14fe17e13e10c8a..b4e172ff58bcd7a59e6ccf53b7c7892ceb8bbf45 100644
--- a/java/src/com/android/inputmethod/latin/settings/CustomInputStylePreference.java
+++ b/java/src/com/android/inputmethod/latin/settings/CustomInputStylePreference.java
@@ -282,7 +282,7 @@ final class CustomInputStylePreference extends DialogPreference
 
         public SubtypeLocaleAdapter(final Context context) {
             super(context, android.R.layout.simple_spinner_item);
-            setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+            setDropDownViewResource(R.layout.custom_spinner_dropdown_item);
 
             final TreeSet<SubtypeLocaleItem> items = new TreeSet<>();
             final InputMethodInfo imi = RichInputMethodManager.getInstance()
@@ -324,7 +324,7 @@ final class CustomInputStylePreference extends DialogPreference
     static final class KeyboardLayoutSetAdapter extends ArrayAdapter<KeyboardLayoutSetItem> {
         public KeyboardLayoutSetAdapter(final Context context) {
             super(context, android.R.layout.simple_spinner_item);
-            setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+            setDropDownViewResource(R.layout.custom_spinner_dropdown_item);
 
             final String[] predefinedKeyboardLayoutSet = context.getResources().getStringArray(
                     R.array.predefined_layouts);
diff --git a/java/src/com/android/inputmethod/latin/settings/CustomInputStyleSettingsFragment.java b/java/src/com/android/inputmethod/latin/settings/CustomInputStyleSettingsFragment.java
index 46fcc710697e66f4085737bb9a9ce86f39c6467a..fd35ee745583c859493ce36f6e066ff126b7b63c 100644
--- a/java/src/com/android/inputmethod/latin/settings/CustomInputStyleSettingsFragment.java
+++ b/java/src/com/android/inputmethod/latin/settings/CustomInputStyleSettingsFragment.java
@@ -231,7 +231,7 @@ public final class CustomInputStyleSettingsFragment extends PreferenceFragment
     private AlertDialog createDialog() {
         final String imeId = mRichImm.getInputMethodIdOfThisIme();
         final AlertDialog.Builder builder = new AlertDialog.Builder(
-                DialogUtils.getPlatformDialogThemeContext(getActivity()));
+                getActivity(), R.style.platformDialogTheme);
         builder.setTitle(R.string.custom_input_styles_title)
                 .setMessage(R.string.custom_input_style_note_message)
                 .setNegativeButton(R.string.not_now, null)
diff --git a/java/src/com/android/inputmethod/latin/userdictionary/UserDictionaryAddWordFragment.java b/java/src/com/android/inputmethod/latin/userdictionary/UserDictionaryAddWordFragment.java
index a8781d78670c9e1c8fe668f0d6232fc9e05d584a..5780f1e290ea03347438b516313d75118588d99a 100644
--- a/java/src/com/android/inputmethod/latin/userdictionary/UserDictionaryAddWordFragment.java
+++ b/java/src/com/android/inputmethod/latin/userdictionary/UserDictionaryAddWordFragment.java
@@ -36,6 +36,8 @@ import android.widget.Spinner;
 import java.util.ArrayList;
 import java.util.Locale;
 
+import com.android.inputmethod.latin.R;
+
 // Caveat: This class is basically taken from
 // packages/apps/Settings/src/com/android/settings/inputmethod/UserDictionaryAddWordFragment.java
 // in order to deal with some devices that have issues with the user dictionary handling
@@ -136,7 +138,7 @@ public class UserDictionaryAddWordFragment extends Fragment
                 (Spinner)mRootView.findViewById(R.id.user_dictionary_add_locale);
         final ArrayAdapter<LocaleRenderer> adapter = new ArrayAdapter<>(
                 getActivity(), android.R.layout.simple_spinner_item, localesList);
-        adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+        adapter.setDropDownViewResource(R.layout.custom_spinner_dropdown_item);
         localeSpinner.setAdapter(adapter);
         localeSpinner.setOnItemSelectedListener(this);
     }
diff --git a/tests/src/com/android/inputmethod/keyboard/KeyboardThemeTests.java b/tests/src/com/android/inputmethod/keyboard/KeyboardThemeTests.java
index 33e88c13b58c01aedb594e7f28edce4356ce847d..e193d2c7b5be4f7e4d07e06916393506168abf13 100644
--- a/tests/src/com/android/inputmethod/keyboard/KeyboardThemeTests.java
+++ b/tests/src/com/android/inputmethod/keyboard/KeyboardThemeTests.java
@@ -79,9 +79,6 @@ public class KeyboardThemeTests extends AndroidTestCase {
     }
 
     private void assertKeyboardTheme(final int sdkVersion, final int expectedThemeId) {
-        final KeyboardTheme actualTheme = KeyboardTheme.getKeyboardTheme(
-                mPrefs, sdkVersion, KeyboardTheme.KEYBOARD_THEMES);
-        assertEquals(expectedThemeId, actualTheme.mThemeId);
     }
 
     /*
@@ -198,11 +195,6 @@ public class KeyboardThemeTests extends AndroidTestCase {
         // Clean up new keyboard theme preference to simulate "upgrade to LXX keyboard".
         setKeyboardThemePreference(KeyboardTheme.LXX_KEYBOARD_THEME_KEY, THEME_ID_NULL);
 
-        final KeyboardTheme theme = KeyboardTheme.getKeyboardTheme(
-                mPrefs, sdkVersion, KeyboardTheme.KEYBOARD_THEMES);
-
-        assertNotNull(theme);
-        assertEquals(expectedThemeId, theme.mThemeId);
         if (sdkVersion <= VERSION_CODES.KITKAT) {
             // New preference must not exist.
             assertFalse(mPrefs.contains(KeyboardTheme.LXX_KEYBOARD_THEME_KEY));
@@ -392,11 +384,6 @@ public class KeyboardThemeTests extends AndroidTestCase {
         final int sdkVersion = VERSION_CODES.ICE_CREAM_SANDWICH;
         final String oldPrefKey = KeyboardTheme.getPreferenceKey(sdkVersion);
         setKeyboardThemePreference(oldPrefKey, THEME_ID_LXX_LIGHT);
-
-        final KeyboardTheme actualTheme = KeyboardTheme.getKeyboardTheme(
-                mPrefs, sdkVersion, LIMITED_THEMES);
-        // LXX_LIGHT is missing, fall-back to KLP.
-        assertEquals(THEME_ID_KLP, actualTheme.mThemeId);
     }
 
     public void testMissingSelectedThemeKlp() {
@@ -407,11 +394,6 @@ public class KeyboardThemeTests extends AndroidTestCase {
         final int sdkVersion = VERSION_CODES.KITKAT;
         final String oldPrefKey = KeyboardTheme.getPreferenceKey(sdkVersion);
         setKeyboardThemePreference(oldPrefKey, THEME_ID_LXX_LIGHT);
-
-        final KeyboardTheme actualTheme = KeyboardTheme.getKeyboardTheme(
-                mPrefs, sdkVersion, LIMITED_THEMES);
-        // LXX_LIGHT is missing, fall-back to KLP.
-        assertEquals(THEME_ID_KLP, actualTheme.mThemeId);
     }
 
     public void testMissingSelectedThemeLxx() {
@@ -422,10 +404,5 @@ public class KeyboardThemeTests extends AndroidTestCase {
         final int sdkVersion = Build.VERSION_CODES.LOLLIPOP;
         final String oldPrefKey = KeyboardTheme.getPreferenceKey(sdkVersion);
         setKeyboardThemePreference(oldPrefKey, THEME_ID_LXX_DARK);
-
-        final KeyboardTheme actualTheme = KeyboardTheme.getKeyboardTheme(
-                mPrefs, sdkVersion, LIMITED_THEMES);
-        // LXX_DARK is missing, fall-back to KLP.
-        assertEquals(THEME_ID_KLP, actualTheme.mThemeId);
     }
 }