diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index af40e94b..010c63eb 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-    <!-- Colors for preferences_styles -->
-    <color name="foreground">#FFF</color>
+<resources>
     <color name="foreground_weak">#BBB</color>
     <color name="almost_background">#666</color>
 
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 95204fe0..a3c9c823 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -19,12 +19,36 @@
 -->
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
-    <!-- Color resources for IceCreamSandwich theme. Base color = 33B5E5 -->
-    <!-- android:color/holo_blue_light value is #FF33B5E5 -->
-    <color name="highlight_color_holo_blue">#FF33B5E5</color>
-    <color name="typed_word_color_holo_blue">#D833B5E5</color>
-    <color name="suggested_word_color_holo_blue">#B233B5E5</color>
-    <color name="highlight_translucent_color_holo_blue">#9933B5E5</color>
+    <!-- Color resources for LXX_Light_Border/LXX_Base_Border theme.
+         15%:0x26 70%:0xB3 75%:0xC0 80%:0xCC 85%:0xD9 90%:0xE6 -->
+    <color name="keyboard_background_lxx_light_border">#E8EAED</color>
+    <color name="key_background_normal_lxx_light_border">#FFFFFF</color>
+    <color name="key_background_functional_lxx_light_border">#CCCED5</color>
+
+    <!-- todo: choose which to keep and use for what, which to remove
+          some color appear used, but are overridden in code (maybe also the attrs can be removed)
+          some are actually used, choose one of the many similar ones to keep
+           -->
+    <color name="highlight_color_lxx_dark">#5E97F6</color>
+    <color name="gesture_trail_color_lxx_dark">#5E97F6</color>
+    <color name="sliding_key_input_preview_color_lxx_dark">#436baf</color>
+    <color name="action_key_background_lxx_dark">#5E97F6</color>
+    <color name="action_key_background_pressed_lxx_dark">#86b0f6</color>
+    <color name="gesture_trail_color_lxx_light">#1A73E8</color>
+    <color name="sliding_key_input_preview_color_lxx_light">#1457af</color>
+    <color name="action_key_background_lxx_light">#1A73E8</color>
+    <color name="action_key_background_pressed_lxx_light">#3683e8</color>
+    <color name="gesture_floating_preview_color_lxx_light">#E6ECEFF1</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="key_functional_text_color_lxx_light">#CC37474F</color>
+    <color name="key_text_inactive_color_lxx_light">#B337474F</color>
+    <color name="language_on_spacebar_text_color_lxx_light">#B337474F</color>
+    <color name="highlight_color_holo_white">#FFF0F0F0</color>
+    <color name="typed_word_color_holo_white">#D8F0F0F0</color>
+    <color name="suggested_word_color_holo_white">#B2F0F0F0</color>
+    <color name="highlight_translucent_color_holo_white">#99E0E0E0</color>
     <color name="key_text_color_blue">@android:color/white</color>
     <color name="key_text_inactivated_color_holo">#66E0E4E5</color>
     <color name="key_hint_letter_color_holo">#80000000</color>
@@ -35,63 +59,31 @@
     <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 resources for HoloWhite theme. Base color = F0F0F0 -->
-    <color name="highlight_color_holo_white">#FFF0F0F0</color>
-    <color name="typed_word_color_holo_white">#D8F0F0F0</color>
-    <color name="suggested_word_color_holo_white">#B2F0F0F0</color>
-    <color name="highlight_translucent_color_holo_white">#99E0E0E0</color>
 
-    <!-- Color resources for LXX_Light/LXX_Base 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 resources for the old LXX_Light theme, now used for THEME_LIGHT. -->
     <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">#1A73E8</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">#1A73E8</color>
-    <color name="sliding_key_input_preview_color_lxx_light">#1457af</color>
-    <color name="action_key_background_lxx_light">#1A73E8</color>
-    <color name="action_key_background_pressed_lxx_light">#3683e8</color>
-    <color name="gesture_floating_preview_color_lxx_light">#E6ECEFF1</color>
-    <!-- Color resources for LXX_Light_Border/LXX_Base_Border theme.
-         15%:0x26 70%:0xB3 75%:0xC0 80%:0xCC 85%:0xD9 90%:0xE6 -->
-    <color name="keyboard_background_lxx_light_border">#E8EAED</color>
-    <color name="key_background_normal_lxx_light_border">#FFFFFF</color>
-    <color name="key_background_functional_lxx_light_border">#CCCED5</color>
+    <color name="key_text_color_lxx_light">#37474F</color>
 
-    <!-- Color resources for LXX_Dark theme.
-         10%:0x19 50%:0x80 70%:0xB3 75%:0xC0 80%:0xCC 85%:0xD9 90%:0xE6  -->
+    <!-- Color resources for the old LXX_Dark theme, now used for several dark themes. -->
     <color name="key_text_color_lxx_dark">#FFFFFF</color>
     <color name="key_hint_letter_color_lxx_dark">#80FFFFFF</color>
-    <color name="highlight_color_lxx_dark">#5E97F6</color>
-    <color name="gesture_trail_color_lxx_dark">#5E97F6</color>
-    <color name="sliding_key_input_preview_color_lxx_dark">#436baf</color>
-    <color name="action_key_background_lxx_dark">#5E97F6</color>
-    <color name="action_key_background_pressed_lxx_dark">#86b0f6</color>
-    <!-- Color resources for LXX_Dark_Border theme.
-         15%:0x26 70%:0xB3 75%:0xC0 80%:0xCC 85%:0xD9 90%:0xE6 -->
+
+    <!-- Color resources for the old LXX_Dark_Border theme, now for THEME_DARKER. -->
     <color name="keyboard_background_lxx_dark_border">#0d0d0d</color>
     <color name="key_background_normal_lxx_dark_border">#4d4d4d</color>
     <color name="key_background_functional_lxx_dark_border">#1f1f1f</color>
-    <!-- Color resources for LXX_Dark_Amoled theme.
-         15%:0x26 70%:0xB3 75%:0xC0 80%:0xCC 85%:0xD9 90%:0xE6 -->
+    <!-- Color resources for the old LXX_Dark_Amoled theme, now for THEME_BLACK. -->
     <color name="background_amoled_black">#000000</color>
     <color name="background_amoled_dark">#1A1A1A</color>
 
-    <!-- Color resources for LXX_Base theme.
-     15%:0x26 70%:0xB3 75%:0xC0 80%:0xCC 85%:0xD9 90%:0xE6 -->
+    <!-- Color resources for LXX_Base theme. -->
     <color name="keyboard_background_lxx_base">@android:color/white</color>
     <color name="key_background_lxx_base">@android:color/white</color>
     <color name="action_key_background_lxx_base">@android:color/white</color>
     <color name="suggested_word_background_selected_lxx_base">@android:color/white</color>
     <color name="emoji_tab_page_indicator_background_lxx_base">@android:color/white</color>
 
-    <!-- Color resources for LXX_Base_Border theme.
-     15%:0x26 70%:0xB3 75%:0xC0 80%:0xCC 85%:0xD9 90%:0xE6 -->
+    <!-- Color resources for LXX_Base_Border theme. -->
     <color name="keyboard_background_lxx_base_border">@android:color/white</color>
     <color name="key_background_normal_lxx_base_border">@android:color/white</color>
     <color name="key_bottom_bevel_lxx_base">#A9ABAD</color>
@@ -103,17 +95,16 @@
     <color name="setup_text_action">@android:color/holo_blue_light</color>
     <color name="setup_step_background">@android:color/background_light</color>
     <color name="setup_welcome_video_margin_color">#FFCCCCCC</color>
-    <!-- Accent color for the notification. We need to match this to the OS build -->
-    <color name="notification_accent_color">#FF607D8B</color>
 
-    <!-- Colors currently used for language settings -->
-    <color name="foreground">#000</color>
+    <!-- Colors that are different for night theme -->
+    <color name="foreground">?android:colorForeground</color>
     <color name="foreground_weak">#555</color>
     <color name="almost_background">#AAA</color>
-
-    <!-- accent and keyboard default background colors -->
+    <color name="highlight_color_lxx_light">#1A73E8</color> <!-- todo: remove / replace with accent? -->
     <color name="accent">@color/highlight_color_lxx_light</color>
     <color name="keyboard_background">@color/keyboard_background_light</color>
+
+    <!-- Actually used keyboard default background colors -->
     <color name="keyboard_background_light">@color/keyboard_background_lxx_light_border</color>
     <color name="keyboard_background_dark">#263238</color>
 </resources>