diff --git a/java/res/values-night/themes-you-colors.xml b/java/res/values-night/themes-you-colors.xml
index 3c30f95..c549182 100644
--- a/java/res/values-night/themes-you-colors.xml
+++ b/java/res/values-night/themes-you-colors.xml
@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
-    <color name="keyboard_background_you">@android:color/system_neutral1_1000</color>
+    <color name="keyboard_background_you">@android:color/system_neutral1_900</color>
     <!-- Keys -->
     <color name="keyboard_key_normal_color_you">@android:color/system_neutral1_800</color>
     <color name="keyboard_key_pressed_color_you">@android:color/system_neutral1_900</color>
-    <color name="keyboard_key_text_color_you">@android:color/system_accent1_10</color>
-    <color name="keyboard_key_functional_normal_color_you">@android:color/system_neutral2_800</color>
-    <color name="keyboard_key_functional_pressed_color_you">@android:color/system_neutral2_900</color>
-    <color name="keyboard_key_functional_text_color_you">@color/keyboard_key_text_color_you</color>
-    <color name="keyboard_key_action_normal_color_you">@android:color/system_accent2_300</color>
-    <color name="keyboard_key_action_pressed_color_you">@android:color/system_accent2_600</color>
-    <color name="shift_normal_color_you">@android:color/system_neutral1_400</color>
-    <color name="shift_locked_color_you">@android:color/system_accent1_10</color>
-    <color name="icon_color_you">@android:color/system_accent3_100</color>
-    <color name="key_hint_letter_color_you">@color/key_hint_letter_color_lxx_dark</color>
+    <color name="keyboard_key_text_color_you">@android:color/system_neutral1_50</color>
+    <color name="keyboard_key_functional_normal_color_you">@android:color/system_neutral1_700</color>
+    <color name="keyboard_key_functional_pressed_color_you">@android:color/system_neutral2_300</color>
+    <color name="keyboard_key_functional_text_color_you">@android:color/system_neutral1_50</color>
+    <color name="keyboard_key_action_normal_color_you">@android:color/system_accent1_400</color>
+    <color name="keyboard_key_action_pressed_color_you">@android:color/system_accent1_600</color>
+    <color name="shift_normal_color_you">@android:color/system_neutral1_50</color>
+    <color name="shift_locked_color_you">@android:color/system_neutral1_50</color>
+    <color name="icon_color_you">@android:color/system_neutral1_50</color>
+    <color name="key_hint_letter_color_you">@android:color/system_neutral1_400</color>
     <!-- Suggestion bar -->
-    <color name="typed_word_color_you">@color/typed_word_color_lxx_dark</color>
-    <color name="auto_correct_color_you">@color/auto_correct_color_lxx_dark</color>
-    <color name="suggested_word_color_you">@color/suggested_word_color_lxx_dark</color>
+    <color name="typed_word_color_you">@android:color/system_neutral1_50</color>
+    <color name="auto_correct_color_you">@android:color/system_neutral1_50</color>
+    <color name="suggested_word_color_you">@android:color/system_neutral1_50</color>
     <!-- Gesture input -->
-    <color name="gesture_trail_color_you">@android:color/system_accent3_100</color>
-    <color name="gesture_floating_preview_text_color_you">@android:color/system_neutral1_0</color>
+    <color name="gesture_trail_color_you">@android:color/system_accent1_300</color>
+    <color name="gesture_floating_preview_text_color_you">@android:color/system_neutral1_50</color>
     <!-- Misc -->
-    <color name="highlight_color_you">@color/highlight_color_lxx_dark</color>
-    <color name="emoji_tab_page_indicator_background_you">@android:color/system_accent3_200</color>
+    <color name="highlight_color_you">@android:color/system_accent1_500</color>
+    <color name="emoji_tab_page_indicator_background_you">@android:color/system_neutral1_900</color>
 </resources>
diff --git a/java/res/values/config.xml b/java/res/values/config.xml
index 5714548..9c20b92 100644
--- a/java/res/values/config.xml
+++ b/java/res/values/config.xml
@@ -38,7 +38,7 @@
 
     <fraction name="config_keyboard_top_padding_holo">2.335%p</fraction>
     <fraction name="config_keyboard_bottom_padding_holo">4.669%p</fraction>
-    <fraction name="config_key_vertical_gap_you">3.5%p</fraction>
+    <fraction name="config_key_vertical_gap_you">4.5%p</fraction>
     <fraction name="config_key_vertical_gap_holo">6.127%p</fraction>
     <fraction name="config_key_horizontal_gap_holo">1.739%p</fraction>
     <!-- config_more_keys_keyboard_key_height x -0.5 -->
@@ -53,7 +53,7 @@
     <fraction name="config_key_preview_text_ratio_you">70%</fraction>
     <fraction name="config_key_letter_ratio_holo">55%</fraction>
     <fraction name="config_key_letter_ratio_lxx">55%</fraction>
-    <fraction name="config_key_letter_ratio_you">52%</fraction>
+    <fraction name="config_key_letter_ratio_you">55%</fraction>
     <fraction name="config_key_large_letter_ratio_holo">65%</fraction>
     <fraction name="config_key_large_letter_ratio_lxx">90%</fraction>
     <fraction name="config_key_label_ratio_holo">34%</fraction>
diff --git a/java/res/values/themes-you-colors.xml b/java/res/values/themes-you-colors.xml
index 76c1d73..b6ed686 100644
--- a/java/res/values/themes-you-colors.xml
+++ b/java/res/values/themes-you-colors.xml
@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
-    <color name="keyboard_background_you">@android:color/system_accent3_10</color>
+    <color name="keyboard_background_you">@android:color/system_neutral1_50</color>
     <!-- Keys -->
-    <color name="keyboard_key_normal_color_you">@android:color/system_neutral1_100</color>
-    <color name="keyboard_key_pressed_color_you">@android:color/system_neutral1_200</color>
-    <color name="keyboard_key_text_color_you">@android:color/system_accent1_900</color>
-    <color name="keyboard_key_functional_normal_color_you">@android:color/system_neutral2_100</color>
+    <color name="keyboard_key_normal_color_you">@android:color/system_neutral1_0</color>
+    <color name="keyboard_key_pressed_color_you">@android:color/system_neutral1_100</color>
+    <color name="keyboard_key_text_color_you">@android:color/system_neutral1_900</color>
+    <color name="keyboard_key_functional_normal_color_you">@android:color/system_accent2_100</color>
     <color name="keyboard_key_functional_pressed_color_you">@android:color/system_neutral2_200</color>
-    <color name="keyboard_key_functional_text_color_you">@color/keyboard_key_text_color_you</color>
-    <color name="keyboard_key_action_normal_color_you">@android:color/system_accent2_300</color>
-    <color name="keyboard_key_action_pressed_color_you">@android:color/system_accent2_600</color>
-    <color name="shift_normal_color_you">@android:color/system_neutral1_800</color>
-    <color name="shift_locked_color_you">@android:color/system_accent1_1000</color>
-    <color name="icon_color_you">@android:color/system_accent3_800</color>
-    <color name="key_hint_letter_color_you">@color/key_hint_letter_color_lxx_light</color>
+    <color name="keyboard_key_functional_text_color_you">@android:color/system_neutral1_900</color>
+    <color name="keyboard_key_action_normal_color_you">@android:color/system_accent1_200</color>
+    <color name="keyboard_key_action_pressed_color_you">@android:color/system_accent1_400</color>
+    <color name="shift_normal_color_you">@android:color/system_neutral1_900</color>
+    <color name="shift_locked_color_you">@android:color/system_neutral1_900</color>
+    <color name="icon_color_you">@android:color/system_neutral1_900</color>
+    <color name="key_hint_letter_color_you">@android:color/system_neutral1_400</color>
     <!-- Suggestion bar -->
-    <color name="typed_word_color_you">@color/typed_word_color_lxx_light</color>
-    <color name="auto_correct_color_you">@color/auto_correct_color_lxx_light</color>
-    <color name="suggested_word_color_you">@color/suggested_word_color_lxx_light</color>
+    <color name="typed_word_color_you">@android:color/system_neutral1_900</color>
+    <color name="auto_correct_color_you">@android:color/system_neutral1_900</color>
+    <color name="suggested_word_color_you">@android:color/system_neutral1_900</color>
     <!-- Gesture input -->
-    <color name="gesture_trail_color_you">@android:color/system_accent3_800</color>
+    <color name="gesture_trail_color_you">@android:color/system_accent1_500</color>
     <color name="gesture_floating_preview_text_color_you">@android:color/system_neutral1_1000</color>
     <!-- Misc -->
-    <color name="highlight_color_you">@color/highlight_color_lxx_light</color>
-    <color name="emoji_tab_page_indicator_background_you">@android:color/system_accent3_200</color>
+    <color name="highlight_color_you">@android:color/system_accent1_500</color>
+    <color name="emoji_tab_page_indicator_background_you">@android:color/system_neutral1_50</color>
 </resources>