diff --git a/java/res/drawable/bg_btn_keyboard_key_normal_off.xml b/java/res/drawable/bg_btn_keyboard_key_normal_off.xml
deleted file mode 100644
index 1def20b12e846b5d7eefc49b1005872153f4ac92..0000000000000000000000000000000000000000
--- a/java/res/drawable/bg_btn_keyboard_key_normal_off.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?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
deleted file mode 100644
index 135c1d5434b88d962ce0cb2249101281a74d9cb6..0000000000000000000000000000000000000000
--- a/java/res/drawable/bg_btn_keyboard_key_normal_on.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?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 67fe833458358b793494edfaee1958cbc227bb51..bacd5d78ffca1b1a96f34225791f90d8f5d0b1fe 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/bg_btn_keyboard_key_normal_on" />
+          android:drawable="@drawable/btn_keyboard_key_pressed_on_ics_dark" />
     <item android:state_checkable="true" android:state_pressed="true"
-        android:drawable="@drawable/bg_btn_keyboard_key_normal_off"  />
+          android:drawable="@drawable/btn_keyboard_key_pressed_off_ics_dark" />
     <item android:state_checkable="true" android:state_checked="true"
-        android:drawable="@drawable/bg_btn_keyboard_key_normal_on" />
+          android:drawable="@drawable/btn_keyboard_key_normal_on_ics_dark" />
     <item android:state_checkable="true"
-        android:drawable="@drawable/bg_btn_keyboard_key_normal_off" />
+          android:drawable="@drawable/btn_keyboard_key_normal_off_holo_dark" />
 
     <!-- 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 c55cb301664952b8cdec4959826f6d2d4e67d156..e2f208585cd07b66b49aa28d7d3a0e60dc755d84 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/bg_btn_keyboard_key_normal_on" />
+          android:drawable="@drawable/btn_keyboard_key_pressed_on_klp_dark" />
     <item android:state_checkable="true" android:state_pressed="true"
-        android:drawable="@drawable/bg_btn_keyboard_key_normal_off" />
+          android:drawable="@drawable/btn_keyboard_key_pressed_off_klp_dark" />
     <item android:state_checkable="true" android:state_checked="true"
-        android:drawable="@drawable/bg_btn_keyboard_key_normal_on" />
+          android:drawable="@drawable/btn_keyboard_key_normal_on_klp_dark" />
     <item android:state_checkable="true"
-        android:drawable="@drawable/bg_btn_keyboard_key_normal_off" />
+          android:drawable="@drawable/btn_keyboard_key_normal_off_holo_dark" />
 
     <!-- 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 85d0a78c07e2f23ff1783c6ad3c8c002e8a29c0a..161592d3d1f11c8f6ad8a4a6a1551bcd843868f8 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/bg_btn_keyboard_key_normal_on" />
+          android:drawable="@drawable/btn_keyboard_key_pressed_on_lxx_dark" />
     <item android:state_checkable="true" android:state_pressed="true"
-        android:drawable="@drawable/bg_btn_keyboard_key_normal_off" />
+          android:drawable="@drawable/btn_keyboard_key_pressed_off_lxx_dark" />
     <item android:state_checkable="true" android:state_checked="true"
-        android:drawable="@drawable/bg_btn_keyboard_key_normal_on" />
+          android:drawable="@drawable/btn_keyboard_key_normal_on_lxx_dark" />
     <item android:state_checkable="true"
-        android:drawable="@drawable/bg_btn_keyboard_key_normal_off" />
+          android:drawable="@drawable/btn_keyboard_key_normal_off_lxx_dark" />
 
     <!-- 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 e8e200fccd6424f007e39ba7c9f680cd41f2e721..0154d75b46c4634e9d39d6bc3178e8a5a8fa734a 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/bg_btn_keyboard_key_normal_on" />
+          android:drawable="@drawable/btn_keyboard_key_pressed_on_lxx_light" />
     <item android:state_checkable="true" android:state_pressed="true"
-        android:drawable="@drawable/bg_btn_keyboard_key_normal_off" />
+          android:drawable="@drawable/btn_keyboard_key_pressed_off_lxx_light" />
     <item android:state_checkable="true" android:state_checked="true"
-        android:drawable="@drawable/bg_btn_keyboard_key_normal_on" />
+          android:drawable="@drawable/btn_keyboard_key_normal_on_lxx_light" />
     <item android:state_checkable="true"
-        android:drawable="@drawable/bg_btn_keyboard_key_normal_off" />
+          android:drawable="@drawable/btn_keyboard_key_normal_off_lxx_light" />
 
     <!-- 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
index 520d3fec2eab90fe690b1e7d6ece6329fcefc752..e21b10eb4767ae1dcdf2706a9833d564c81c3ad8 100644
--- a/java/res/drawable/ic_add_circle.xml
+++ b/java/res/drawable/ic_add_circle.xml
@@ -24,6 +24,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@color/color_default_accent"
+        android:fillColor="@color/color_default_primary_text"
         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/values-night-v28/platform-theme.xml b/java/res/values-night-v28/platform-theme.xml
deleted file mode 100644
index 349ad73de9240672eb7ddfd43f56ec723ea0c708..0000000000000000000000000000000000000000
--- a/java/res/values-night-v28/platform-theme.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?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/drawable/ic_arrow_back.xml b/java/res/values-night/bools.xml
similarity index 58%
rename from java/res/drawable/ic_arrow_back.xml
rename to java/res/values-night/bools.xml
index a1b4f1a80c66dd0ce026c77ec537d0604cb08309..bffe6ee0ed1110d0f8b868925a8f2f264fa8762a 100644
--- a/java/res/drawable/ic_arrow_back.xml
+++ b/java/res/values-night/bools.xml
@@ -2,7 +2,7 @@
 <!--
 /*
 **
-** Copyright 2015, The Android Open Source Project
+** Copyright 2008, 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.
@@ -17,14 +17,6 @@
 ** 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
+<resources>
+    <bool name="is_in_light_mode">false</bool>
+</resources>
diff --git a/java/res/values-v28/platform-theme.xml b/java/res/values-v28/platform-theme.xml
deleted file mode 100644
index 4fd23ab0b93d0765627eeb967b23a33d3d74b110..0000000000000000000000000000000000000000
--- a/java/res/values-v28/platform-theme.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?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/bools.xml b/java/res/values/bools.xml
index 10d217985abecb44fe5f0824723a58d56e234934..4689790515c2a0b2246055a51a15c9efe8087aa8 100644
--- a/java/res/values/bools.xml
+++ b/java/res/values/bools.xml
@@ -21,4 +21,6 @@
     <!-- Whether this input method should be used as the default for a locale. Override it
          for supported languages. -->
     <bool name="im_is_default">false</bool>
+
+    <bool name="is_in_light_mode">true</bool>
 </resources>
diff --git a/java/res/values/colors.xml b/java/res/values/colors.xml
index fc5e9874853df46781a3f2ee19b6ed4f82e8a7cd..352ecd7d3cf4e36fbd8f18c97019b922c212b4ea 100644
--- a/java/res/values/colors.xml
+++ b/java/res/values/colors.xml
@@ -30,61 +30,61 @@
     <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">@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="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="spacebar_text_shadow_color_holo">#80000000</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 name="gesture_floating_preview_color_holo">#C0000000</color>
+    <color name="emoji_tab_page_indicator_background_holo">#111111</color>
     <!-- Color resources for KLP theme. Base color = F0F0F0 -->
-    <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 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 resources for LXX_Light theme.
          15%:0x26 70%:0xB3 75%:0xC0 80%:0xCC 85%:0xD9 90%:0xE6 -->
-    <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 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 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">@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 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 resources for setup wizard and tutorial -->
     <color name="setup_background">@color/color_default_background</color>
     <color name="setup_text_dark">@color/color_default_primary_text</color>
diff --git a/java/res/values/platform-theme.xml b/java/res/values/platform-theme.xml
index 7d23060f033b023388fa5b30c39264a032d342ce..5fbde0b89998fbdcb62d13e252103388d8ad5498 100644
--- a/java/res/values/platform-theme.xml
+++ b/java/res/values/platform-theme.xml
@@ -35,9 +35,15 @@
         <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:homeAsUpIndicator">@lineageos.platform:drawable/ic_back</item>
         <item name="android:alertDialogTheme">@style/platformDialogTheme</item>
         <item name="android:textColorAlertDialogListItem">@color/color_default_primary_text</item>
+
+        <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">@bool/is_in_light_mode</item>
+        <item name="android:windowLightStatusBar">@bool/is_in_light_mode</item>
     </style>
 
     <style name="BaseTheme" parent="@android:style/Theme.DeviceDefault.Light" />
diff --git a/java/res/values/themes-ics.xml b/java/res/values/themes-ics.xml
index fae1f1427ee6db55052a1ed5ea6685b8025f0b7a..1a15b0e9753f23de59352926cf1e74e7f04f2aa3 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">@color/color_default_foreground</item>
+        <item name="android:background">@drawable/keyboard_background_holo</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/color_default_view_on_accent</item>
+        <item name="keyPreviewTextColor">@color/key_text_color_holo</item>
     </style>
     <style
         name="MainKeyboardView.ICS"
@@ -117,7 +117,7 @@
         name="MoreKeysKeyboardView.ICS"
         parent="KeyboardView.ICS"
     >
-        <item name="android:background">@color/color_default_background</item>
+        <item name="android:background">@drawable/keyboard_popup_panel_background_ics</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">@color/color_default_foreground</item>
+        <item name="android:background">@drawable/keyboard_suggest_strip_holo</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">@color/color_default_foreground</item>
-        <item name="android:textColor">@color/color_default_primary_text</item>
+        <item name="android:background">@drawable/btn_suggestion_ics</item>
+        <item name="android:textColor">@color/highlight_color_ics</item>
     </style>
 </resources>
diff --git a/java/res/values/themes-klp.xml b/java/res/values/themes-klp.xml
index b7c3ec2b5de98961cfb988bc871b3878b3607042..32884dba011507146ba817ba52320f6a6e60ea8f 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">@color/color_default_foreground</item>
+        <item name="android:background">@drawable/keyboard_background_holo</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/color_default_view_on_accent</item>
+        <item name="keyPreviewTextColor">@color/key_text_color_holo</item>
     </style>
     <style
         name="MainKeyboardView.KLP"
@@ -117,7 +117,7 @@
         name="MoreKeysKeyboardView.KLP"
         parent="KeyboardView.KLP"
     >
-        <item name="android:background">@color/color_default_background</item>
+        <item name="android:background">@drawable/keyboard_popup_panel_background_klp</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">@color/color_default_foreground</item>
+        <item name="android:background">@drawable/keyboard_suggest_strip_holo</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">@color/color_default_foreground</item>
-        <item name="android:textColor">@color/color_default_primary_text</item>
+        <item name="android:background">@drawable/btn_suggestion_klp</item>
+        <item name="android:textColor">@color/highlight_color_klp</item>
     </style>
 </resources>
diff --git a/java/res/values/themes-lxx-dark.xml b/java/res/values/themes-lxx-dark.xml
index 3c175ccf4a60cae6d7a717e2fb66cefa5336ba99..cae1f7243822c41e16544ffd739994b375553dea 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">@color/color_default_foreground</item>
+        <item name="android:background">@drawable/keyboard_background_lxx_dark</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/color_default_view_on_accent</item>
+        <item name="keyPreviewTextColor">@color/key_text_color_lxx_dark</item>
     </style>
     <style
         name="MainKeyboardView.LXX_Dark"
@@ -115,7 +115,7 @@
         name="MoreKeysKeyboardView.LXX_Dark"
         parent="KeyboardView.LXX_Dark"
     >
-        <item name="android:background">@color/color_default_background</item>
+        <item name="android:background">@drawable/keyboard_popup_panel_background_lxx_dark</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">@color/color_default_foreground</item>
+        <item name="android:background">@drawable/keyboard_suggest_strip_lxx_dark</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">@color/color_default_foreground</item>
-        <item name="android:textColor">@color/color_default_primary_text</item>
+        <item name="android:background">@drawable/btn_suggestion_lxx_dark</item>
+        <item name="android:textColor">@color/highlight_color_lxx_dark</item>
     </style>
 </resources>
diff --git a/java/res/values/themes-lxx-light.xml b/java/res/values/themes-lxx-light.xml
index 924e08c6a992d35cbeea7df317a6621ad2b4e3aa..eecd191a342584664653c4438f5121dbd1e7db46 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">@color/color_default_foreground</item>
+        <item name="android:background">@drawable/keyboard_background_lxx_light</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/color_default_view_on_accent</item>
+        <item name="keyPreviewTextColor">@color/key_text_color_lxx_light</item>
     </style>
     <style
         name="MainKeyboardView.LXX_Light"
@@ -115,7 +115,7 @@
         name="MoreKeysKeyboardView.LXX_Light"
         parent="KeyboardView.LXX_Light"
     >
-        <item name="android:background">@color/color_default_background</item>
+        <item name="android:background">@drawable/keyboard_popup_panel_background_lxx_light</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">@color/color_default_foreground</item>
+        <item name="android:background">@drawable/keyboard_suggest_strip_lxx_light</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">@color/color_default_foreground</item>
-        <item name="android:textColor">@color/color_default_primary_text</item>
+        <item name="android:background">@drawable/btn_suggestion_lxx_light</item>
+        <item name="android:textColor">@color/highlight_color_lxx_light</item>
     </style>
 </resources>
diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardTheme.java b/java/src/com/android/inputmethod/keyboard/KeyboardTheme.java
index aa6c919b94aef3fecdbea72269acd760c43d0d02..f92215db5fd0753392d07bea8a2d69443ac1eb95 100644
--- a/java/src/com/android/inputmethod/keyboard/KeyboardTheme.java
+++ b/java/src/com/android/inputmethod/keyboard/KeyboardTheme.java
@@ -30,6 +30,8 @@ import com.android.inputmethod.latin.R;
 import java.util.ArrayList;
 import java.util.Arrays;
 
+import android.content.res.Configuration;
+
 public final class KeyboardTheme implements Comparable<KeyboardTheme> {
     private static final String TAG = KeyboardTheme.class.getSimpleName();
 
@@ -212,9 +214,9 @@ public final class KeyboardTheme implements Comparable<KeyboardTheme> {
             if (theme != null) {
                 return theme;
             }
-            Log.w(TAG, "Unknown keyboard theme in LXX preference: ");
+            Log.w(TAG, "Unknown keyboard theme in LXX preference.");
         } catch (final NumberFormatException e) {
-            Log.w(TAG, "Illegal keyboard theme in LXX preference: ", 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 73935d262da8d2b20137f2752f5a8fef0f68530d..24538605a4a4a403081f4bf122cd18464316ccd7 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/KeyPreviewView.java
+++ b/java/src/com/android/inputmethod/keyboard/internal/KeyPreviewView.java
@@ -82,7 +82,6 @@ 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/userdictionary/UserDictionaryAddWordFragment.java b/java/src/com/android/inputmethod/latin/userdictionary/UserDictionaryAddWordFragment.java
index 5780f1e290ea03347438b516313d75118588d99a..aabf77adae953b27dff811327e1d3d9be4612c7a 100644
--- a/java/src/com/android/inputmethod/latin/userdictionary/UserDictionaryAddWordFragment.java
+++ b/java/src/com/android/inputmethod/latin/userdictionary/UserDictionaryAddWordFragment.java
@@ -36,8 +36,6 @@ 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