diff --git a/java/res/values/colors.xml b/java/res/values/colors.xml
index ae4730c..783105d 100644
--- a/java/res/values/colors.xml
+++ b/java/res/values/colors.xml
@@ -41,38 +41,44 @@
     <color name="suggested_word_color_klp">#B2F0F0F0</color>
     <color name="highlight_translucent_color_klp">#99E0E0E0</color>
     <!-- Color resources for LXX_Light theme.
-         15%:0x26 60%:0x99 70%:0xB3 75%:0xC0 80%:0xCC 85%:0xD9 -->
+         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">#4DB6AC</color>
-    <color name="typed_word_color_lxx_light">#D94DB6AC</color>
-    <color name="suggested_word_color_lxx_light">#B34DB6AC</color>
-    <color name="highlight_translucent_color_lxx_light">#994DB6AC</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">#4DB6AC</color>
+    <color name="sliding_key_input_preview_color_lxx_light">#B34DB6AC</color>
     <color name="keyboard_background_lxx_light">#ECEFF1</color>
     <color name="key_background_lxx_light">#ECEFF1</color>
     <color name="key_background_pressed_lxx_light">#2637474F</color>
     <color name="suggestions_strip_background_lxx_light">#E4E7E9</color>
     <color name="suggested_word_background_selected_lxx_light">#2637474F</color>
-    <color name="gesture_floating_preview_color_lxx_light">#C0000000</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 60%:0x99 70%:0xB3 75%:0xC0 80%:0xCC 85%:0xD9  -->
+         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">#80CBC4</color>
-    <color name="typed_word_color_lxx_dark">#D980CBC4</color>
-    <color name="suggested_word_color_lxx_dark">#B380CBC4</color>
-    <color name="highlight_translucent_color_lxx_dark">#9980CBC4</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">#80CBC4</color>
+    <color name="sliding_key_input_preview_color_lxx_dark">#B380CBC4</color>
     <color name="keyboard_background_lxx_dark">#263238</color>
     <color name="key_background_lxx_dark">#263238</color>
     <color name="key_background_pressed_lxx_dark">#19FFFFFF</color>
     <color name="suggestions_strip_background_lxx_dark">#21272B</color>
     <color name="suggested_word_background_selected_lxx_dark">#19FFFFFF</color>
-    <color name="gesture_floating_preview_color_lxx_dark">#C0000000</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">#FFEBEBEB</color>
diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml
index d58d4d5..6df69ed 100644
--- a/java/res/values/strings.xml
+++ b/java/res/values/strings.xml
@@ -293,14 +293,14 @@
 
     <!-- Title of the preference settings for switching keyboard theme [CHAR LIMIT=35] -->
     <string name="keyboard_theme">Keyboard theme</string>
-    <!-- The keyboard theme name, Holo White [CHAR LIMIT=25] -->
-    <string name="keyboard_theme_holo_white">Holo White</string>
-    <!-- The keyboard theme name, Holo Blue [CHAR LIMIT=25] -->
-    <string name="keyboard_theme_holo_blue">Holo Blue</string>
-    <!-- The keyboard theme name, Material Dark [CHAR LIMIT=25] -->
-    <string name="keyboard_theme_material_dark">Material Dark</string>
-    <!-- The keyboard theme name, Material Light [CHAR LIMIT=25] -->
-    <string name="keyboard_theme_material_light">Material Light</string>
+    <!-- The keyboard theme name, Holo White. This is marked as translatable="false" because this is a proper name of system-wide UI Theme. -->
+    <string name="keyboard_theme_holo_white" translatable="false">Holo White</string>
+    <!-- The keyboard theme name, Holo Blue. This is marked as translatable="false" because this is a proper name of system-wide UI Theme.  -->
+    <string name="keyboard_theme_holo_blue" translatable="false">Holo Blue</string>
+    <!-- The keyboard theme name, Material Dark. This is marked as translatable="false" because this is a proper name of system-wide UI Theme.  -->
+    <string name="keyboard_theme_material_dark" translatable="false">Material Dark</string>
+    <!-- The keyboard theme name, Material Light. This is marked as translatable="false" because this is a proper name of system-wide UI Theme.  -->
+    <string name="keyboard_theme_material_light" translatable="false">Material Light</string>
 
     <!-- Title of the preference settings for custom input styles (language and keyboard layout pairs) [CHAR LIMIT=35]-->
     <string name="custom_input_styles_title">Custom input styles</string>
diff --git a/java/res/values/themes-lxx-dark.xml b/java/res/values/themes-lxx-dark.xml
index 2385151..f563010 100644
--- a/java/res/values/themes-lxx-dark.xml
+++ b/java/res/values/themes-lxx-dark.xml
@@ -68,10 +68,10 @@
     >
         <item name="keyPreviewBackground">@drawable/keyboard_key_feedback_lxx_dark</item>
         <item name="keyPreviewOffset">@dimen/config_key_preview_offset_holo</item>
-        <item name="gestureFloatingPreviewTextColor">@color/highlight_color_lxx_dark</item>
+        <item name="gestureFloatingPreviewTextColor">@color/auto_correct_color_lxx_dark</item>
         <item name="gestureFloatingPreviewColor">@color/gesture_floating_preview_color_lxx_dark</item>
-        <item name="gestureTrailColor">@color/highlight_color_lxx_dark</item>
-        <item name="slidingKeyInputPreviewColor">@color/highlight_translucent_color_lxx_dark</item>
+        <item name="gestureTrailColor">@color/gesture_trail_color_lxx_dark</item>
+        <item name="slidingKeyInputPreviewColor">@color/sliding_key_input_preview_color_lxx_dark</item>
         <item name="languageOnSpacebarTextColor">@color/key_text_inactive_color_lxx_dark</item>
         <!-- A negative value to disable text shadow layer. -->
         <item name="languageOnSpacebarTextShadowRadius">-1.0</item>
@@ -124,7 +124,7 @@
         <item name="suggestionStripOptions">autoCorrectBold|validTypedWordBold</item>
         <item name="colorValidTypedWord">@color/typed_word_color_lxx_dark</item>
         <item name="colorTypedWord">@color/typed_word_color_lxx_dark</item>
-        <item name="colorAutoCorrect">@color/highlight_color_lxx_dark</item>
+        <item name="colorAutoCorrect">@color/auto_correct_color_lxx_dark</item>
         <item name="colorSuggested">@color/suggested_word_color_lxx_dark</item>
         <item name="alphaObsoleted">70%</item>
     </style>
diff --git a/java/res/values/themes-lxx-light.xml b/java/res/values/themes-lxx-light.xml
index 8f694d4..48bd313 100644
--- a/java/res/values/themes-lxx-light.xml
+++ b/java/res/values/themes-lxx-light.xml
@@ -68,11 +68,11 @@
     >
         <item name="keyPreviewBackground">@drawable/keyboard_key_feedback_lxx_light</item>
         <item name="keyPreviewOffset">@dimen/config_key_preview_offset_holo</item>
-        <item name="gestureFloatingPreviewTextColor">@color/highlight_color_lxx_light</item>
+        <item name="gestureFloatingPreviewTextColor">@color/auto_correct_color_lxx_light</item>
         <item name="gestureFloatingPreviewColor">@color/gesture_floating_preview_color_lxx_light</item>
-        <item name="gestureTrailColor">@color/highlight_color_lxx_light</item>
-        <item name="slidingKeyInputPreviewColor">@color/highlight_translucent_color_lxx_light</item>
-        <item name="languageOnSpacebarTextColor">@color/key_text_inactive_color_lxx_light</item>
+        <item name="gestureTrailColor">@color/gesture_trail_color_lxx_light</item>
+        <item name="slidingKeyInputPreviewColor">@color/sliding_key_input_preview_color_lxx_light</item>
+        <item name="languageOnSpacebarTextColor">@color/language_on_spacebar_text_color_lxx_light</item>
         <!-- A negative value to disable text shadow layer. -->
         <item name="languageOnSpacebarTextShadowRadius">-1.0</item>
     </style>
@@ -125,7 +125,7 @@
         <item name="suggestionStripOptions">autoCorrectBold|validTypedWordBold</item>
         <item name="colorValidTypedWord">@color/typed_word_color_lxx_light</item>
         <item name="colorTypedWord">@color/typed_word_color_lxx_light</item>
-        <item name="colorAutoCorrect">@color/highlight_color_lxx_light</item>
+        <item name="colorAutoCorrect">@color/auto_correct_color_lxx_light</item>
         <item name="colorSuggested">@color/suggested_word_color_lxx_light</item>
         <item name="alphaObsoleted">70%</item>
     </style>