diff --git a/app/src/main/res/drawable-v31/ic_emoji_activities_lxx_dark.xml b/app/src/main/res/drawable-v31/ic_emoji_activities_lxx_dark.xml
new file mode 100644
index 000000000..e4931c08b
--- /dev/null
+++ b/app/src/main/res/drawable-v31/ic_emoji_activities_lxx_dark.xml
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_focused="true">
+        <bitmap android:src="@drawable/ic_emoji_activities_normal_lxx_dark" android:tint="@color/button_system_accent_lxx_dark" />
+    </item>
+    <item android:state_pressed="true">
+        <bitmap android:src="@drawable/ic_emoji_activities_normal_lxx_dark" android:tint="@color/button_system_accent_lxx_dark" />
+    </item>
+    <item android:state_selected="true">
+        <bitmap android:src="@drawable/ic_emoji_activities_normal_lxx_dark" android:tint="@color/button_system_accent_lxx_dark" />
+    </item>
+    <item android:drawable="@drawable/ic_emoji_activities_normal_lxx_dark" />
+</selector>
diff --git a/app/src/main/res/drawable-v31/ic_emoji_animals_nature_lxx_dark.xml b/app/src/main/res/drawable-v31/ic_emoji_animals_nature_lxx_dark.xml
new file mode 100644
index 000000000..9b74c8753
--- /dev/null
+++ b/app/src/main/res/drawable-v31/ic_emoji_animals_nature_lxx_dark.xml
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:state_focused="true">
+    <bitmap android:src="@drawable/ic_emoji_animals_nature_normal_lxx_dark" android:tint="@color/button_system_accent_lxx_dark" />
+  </item>
+  <item android:state_pressed="true">
+    <bitmap android:src="@drawable/ic_emoji_animals_nature_normal_lxx_dark" android:tint="@color/button_system_accent_lxx_dark" />
+  </item>
+  <item android:state_selected="true">
+    <bitmap android:src="@drawable/ic_emoji_animals_nature_normal_lxx_dark" android:tint="@color/button_system_accent_lxx_dark" />
+  </item>
+  <item android:drawable="@drawable/ic_emoji_animals_nature_normal_lxx_dark" />
+</selector>
diff --git a/app/src/main/res/drawable-v31/ic_emoji_emoticons_lxx_dark.xml b/app/src/main/res/drawable-v31/ic_emoji_emoticons_lxx_dark.xml
new file mode 100644
index 000000000..51d2af3c8
--- /dev/null
+++ b/app/src/main/res/drawable-v31/ic_emoji_emoticons_lxx_dark.xml
@@ -0,0 +1,32 @@
+<?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.
+*/
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_focused="true">
+        <bitmap android:src="@drawable/ic_emoji_emoticons_normal_lxx_dark" android:tint="@color/button_system_accent_lxx_dark" />
+    </item>
+    <item android:state_pressed="true">
+        <bitmap android:src="@drawable/ic_emoji_emoticons_normal_lxx_dark" android:tint="@color/button_system_accent_lxx_dark" />
+    </item>
+    <item android:state_selected="true">
+        <bitmap android:src="@drawable/ic_emoji_emoticons_normal_lxx_dark" android:tint="@color/button_system_accent_lxx_dark" />
+    </item>
+    <item android:drawable="@drawable/ic_emoji_emoticons_normal_lxx_dark" />
+</selector>
diff --git a/app/src/main/res/drawable-v31/ic_emoji_flags_lxx_dark.xml b/app/src/main/res/drawable-v31/ic_emoji_flags_lxx_dark.xml
new file mode 100644
index 000000000..7f32f3d50
--- /dev/null
+++ b/app/src/main/res/drawable-v31/ic_emoji_flags_lxx_dark.xml
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_focused="true">
+        <bitmap android:src="@drawable/ic_emoji_flags_normal_lxx_dark" android:tint="@color/button_system_accent_lxx_dark" />
+    </item>
+    <item android:state_pressed="true">
+        <bitmap android:src="@drawable/ic_emoji_flags_normal_lxx_dark" android:tint="@color/button_system_accent_lxx_dark" />
+    </item>
+    <item android:state_selected="true">
+        <bitmap android:src="@drawable/ic_emoji_flags_normal_lxx_dark" android:tint="@color/button_system_accent_lxx_dark" />
+    </item>
+    <item android:drawable="@drawable/ic_emoji_flags_normal_lxx_dark" />
+</selector>
diff --git a/app/src/main/res/drawable-v31/ic_emoji_food_drink_lxx_dark.xml b/app/src/main/res/drawable-v31/ic_emoji_food_drink_lxx_dark.xml
new file mode 100644
index 000000000..06e75b200
--- /dev/null
+++ b/app/src/main/res/drawable-v31/ic_emoji_food_drink_lxx_dark.xml
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:state_focused="true">
+    <bitmap android:src="@drawable/ic_emoji_food_drink_normal_lxx_dark" android:tint="@color/button_system_accent_lxx_dark" />
+  </item>
+  <item android:state_pressed="true">
+    <bitmap android:src="@drawable/ic_emoji_food_drink_normal_lxx_dark" android:tint="@color/button_system_accent_lxx_dark" />
+  </item>
+  <item android:state_selected="true">
+    <bitmap android:src="@drawable/ic_emoji_food_drink_normal_lxx_dark" android:tint="@color/button_system_accent_lxx_dark" />
+  </item>
+  <item android:drawable="@drawable/ic_emoji_food_drink_normal_lxx_dark" />
+</selector>
diff --git a/app/src/main/res/drawable-v31/ic_emoji_objects_lxx_dark.xml b/app/src/main/res/drawable-v31/ic_emoji_objects_lxx_dark.xml
new file mode 100644
index 000000000..a39e0e217
--- /dev/null
+++ b/app/src/main/res/drawable-v31/ic_emoji_objects_lxx_dark.xml
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:state_focused="true">
+    <bitmap android:src="@drawable/ic_emoji_objects_normal_lxx_dark" android:tint="@color/button_system_accent_lxx_dark" />
+  </item>
+  <item android:state_pressed="true">
+    <bitmap android:src="@drawable/ic_emoji_objects_normal_lxx_dark" android:tint="@color/button_system_accent_lxx_dark" />
+  </item>
+  <item android:state_selected="true">
+    <bitmap android:src="@drawable/ic_emoji_objects_normal_lxx_dark" android:tint="@color/button_system_accent_lxx_dark" />
+  </item>
+  <item android:drawable="@drawable/ic_emoji_objects_normal_lxx_dark" />
+</selector>
diff --git a/app/src/main/res/drawable-v31/ic_emoji_people_body_lxx_dark.xml b/app/src/main/res/drawable-v31/ic_emoji_people_body_lxx_dark.xml
new file mode 100644
index 000000000..0a45814d6
--- /dev/null
+++ b/app/src/main/res/drawable-v31/ic_emoji_people_body_lxx_dark.xml
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:state_focused="true">
+    <bitmap android:src="@drawable/ic_emoji_people_body_normal_lxx_dark" android:tint="@color/button_system_accent_lxx_dark" />
+  </item>
+  <item android:state_pressed="true">
+    <bitmap android:src="@drawable/ic_emoji_people_body_normal_lxx_dark" android:tint="@color/button_system_accent_lxx_dark" />
+  </item>
+  <item android:state_selected="true">
+    <bitmap android:src="@drawable/ic_emoji_people_body_normal_lxx_dark" android:tint="@color/button_system_accent_lxx_dark" />
+  </item>
+  <item android:drawable="@drawable/ic_emoji_people_body_normal_lxx_dark" />
+</selector>
diff --git a/app/src/main/res/drawable-v31/ic_emoji_recents_lxx_dark.xml b/app/src/main/res/drawable-v31/ic_emoji_recents_lxx_dark.xml
new file mode 100644
index 000000000..8221cc65b
--- /dev/null
+++ b/app/src/main/res/drawable-v31/ic_emoji_recents_lxx_dark.xml
@@ -0,0 +1,31 @@
+<?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.
+*/
+-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_focused="true">
+        <bitmap android:src="@drawable/ic_emoji_recents_normal_lxx_dark" android:tint="@color/button_system_accent_lxx_dark" />
+    </item>
+    <item android:state_pressed="true">
+        <bitmap android:src="@drawable/ic_emoji_recents_normal_lxx_dark" android:tint="@color/button_system_accent_lxx_dark" />
+    </item>
+    <item android:state_selected="true">
+        <bitmap android:src="@drawable/ic_emoji_recents_normal_lxx_dark" android:tint="@color/button_system_accent_lxx_dark" />
+    </item>
+    <item android:drawable="@drawable/ic_emoji_recents_normal_lxx_dark" />
+</selector>
diff --git a/app/src/main/res/drawable-v31/ic_emoji_smileys_emotion_lxx_dark.xml b/app/src/main/res/drawable-v31/ic_emoji_smileys_emotion_lxx_dark.xml
new file mode 100644
index 000000000..e1b118dd3
--- /dev/null
+++ b/app/src/main/res/drawable-v31/ic_emoji_smileys_emotion_lxx_dark.xml
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:state_focused="true">
+    <bitmap android:src="@drawable/ic_emoji_smileys_emotion_normal_lxx_dark" android:tint="@color/button_system_accent_lxx_dark" />
+  </item>
+  <item android:state_pressed="true">
+    <bitmap android:src="@drawable/ic_emoji_smileys_emotion_normal_lxx_dark" android:tint="@color/button_system_accent_lxx_dark" />
+  </item>
+  <item android:state_selected="true">
+    <bitmap android:src="@drawable/ic_emoji_smileys_emotion_normal_lxx_dark" android:tint="@color/button_system_accent_lxx_dark" />
+  </item>
+  <item android:drawable="@drawable/ic_emoji_smileys_emotion_normal_lxx_dark" />
+</selector>
diff --git a/app/src/main/res/drawable-v31/ic_emoji_symbols_lxx_dark.xml b/app/src/main/res/drawable-v31/ic_emoji_symbols_lxx_dark.xml
new file mode 100644
index 000000000..d3e0c11a0
--- /dev/null
+++ b/app/src/main/res/drawable-v31/ic_emoji_symbols_lxx_dark.xml
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:state_focused="true">
+    <bitmap android:src="@drawable/ic_emoji_symbols_normal_lxx_dark" android:tint="@color/button_system_accent_lxx_dark" />
+  </item>
+  <item android:state_pressed="true">
+    <bitmap android:src="@drawable/ic_emoji_symbols_normal_lxx_dark" android:tint="@color/button_system_accent_lxx_dark" />
+  </item>
+  <item android:state_selected="true">
+    <bitmap android:src="@drawable/ic_emoji_symbols_normal_lxx_dark" android:tint="@color/button_system_accent_lxx_dark" />
+  </item>
+  <item android:drawable="@drawable/ic_emoji_symbols_normal_lxx_dark" />
+</selector>
diff --git a/app/src/main/res/drawable-v31/ic_emoji_travel_places_lxx_dark.xml b/app/src/main/res/drawable-v31/ic_emoji_travel_places_lxx_dark.xml
new file mode 100644
index 000000000..991a477b3
--- /dev/null
+++ b/app/src/main/res/drawable-v31/ic_emoji_travel_places_lxx_dark.xml
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:state_focused="true">
+    <bitmap android:src="@drawable/ic_emoji_travel_places_normal_lxx_dark" android:tint="@color/button_system_accent_lxx_dark" />
+  </item>
+  <item android:state_pressed="true">
+    <bitmap android:src="@drawable/ic_emoji_travel_places_normal_lxx_dark" android:tint="@color/button_system_accent_lxx_dark" />
+  </item>
+  <item android:state_selected="true">
+    <bitmap android:src="@drawable/ic_emoji_travel_places_normal_lxx_dark" android:tint="@color/button_system_accent_lxx_dark" />
+  </item>
+  <item android:drawable="@drawable/ic_emoji_travel_places_normal_lxx_dark" />
+</selector>
diff --git a/app/src/main/res/drawable-v31/sym_keyboard_shift_locked_lxx_dark_system_accent.xml b/app/src/main/res/drawable-v31/sym_keyboard_shift_locked_lxx_dark_system_accent.xml
new file mode 100644
index 000000000..e66834bf1
--- /dev/null
+++ b/app/src/main/res/drawable-v31/sym_keyboard_shift_locked_lxx_dark_system_accent.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/sym_keyboard_shift_lxx_dark" android:tint="@color/button_system_accent_lxx_dark" />
diff --git a/app/src/main/res/values-v31/colors.xml b/app/src/main/res/values-v31/colors.xml
new file mode 100644
index 000000000..2ffb00a8d
--- /dev/null
+++ b/app/src/main/res/values-v31/colors.xml
@@ -0,0 +1,28 @@
+<?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.
+*/
+-->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+    <color name="highlight_color_lxx_dark">@android:color/system_accent1_200</color>
+    <color name="gesture_trail_color_lxx_dark">@android:color/system_accent1_200</color>
+    <color name="sliding_key_input_preview_color_lxx_dark">@android:color/system_accent1_900</color>
+    <color name="action_key_background_lxx_dark">@android:color/system_accent1_500</color>
+    <color name="action_key_background_pressed_lxx_dark">@android:color/system_accent1_200</color>
+    <color name="button_system_accent_lxx_dark">@android:color/system_accent1_200</color>
+</resources>
diff --git a/app/src/main/res/values-v31/keyboard-icons-lxx-dark.xml b/app/src/main/res/values-v31/keyboard-icons-lxx-dark.xml
new file mode 100644
index 000000000..2c15a98bc
--- /dev/null
+++ b/app/src/main/res/values-v31/keyboard-icons-lxx-dark.xml
@@ -0,0 +1,47 @@
+<?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>
+    <style name="KeyboardIcons.LXX_Dark">
+        <!-- Keyboard icons -->
+        <item name="iconShiftKey">@drawable/sym_keyboard_shift_lxx_dark</item>
+        <item name="iconShiftKeyShifted">@drawable/sym_keyboard_shift_locked_lxx_dark_system_accent</item>
+        <item name="iconDeleteKey">@drawable/sym_keyboard_delete_lxx_dark</item>
+        <item name="iconTabKey">@drawable/sym_keyboard_tab_lxx_dark</item>
+        <item name="iconSettingsKey">@drawable/sym_keyboard_settings_lxx_dark</item>
+        <item name="iconSpaceKey">@null</item>
+        <item name="iconEnterKey">@drawable/sym_keyboard_return_lxx_dark</item>
+        <item name="iconGoKey">@drawable/sym_keyboard_go_lxx_dark</item>
+        <item name="iconSearchKey">@drawable/sym_keyboard_search_lxx_dark</item>
+        <item name="iconSendKey">@drawable/sym_keyboard_send_lxx_dark</item>
+        <item name="iconNextKey">@drawable/sym_keyboard_next_lxx_dark</item>
+        <item name="iconDoneKey">@drawable/sym_keyboard_done_lxx_dark</item>
+        <item name="iconPreviousKey">@drawable/sym_keyboard_previous_lxx_dark</item>
+        <item name="iconShortcutKey">@drawable/sym_keyboard_voice_lxx_dark</item>
+        <item name="iconShortcutKeyDisabled">@drawable/sym_keyboard_voice_off_lxx_dark</item>
+        <item name="iconIncognitoKey">@drawable/sym_keyboard_incognito_lxx_dark</item>
+        <item name="iconSpaceKeyForNumberLayout">@drawable/sym_keyboard_space_lxx_dark</item>
+        <item name="iconLanguageSwitchKey">@drawable/sym_keyboard_language_switch_lxx_dark</item>
+        <item name="iconZwnjKey">@drawable/sym_keyboard_zwnj_lxx_dark</item>
+        <item name="iconZwjKey">@drawable/sym_keyboard_zwj_lxx_dark</item>
+        <item name="iconEmojiActionKey">@drawable/sym_keyboard_smiley_lxx_dark</item>
+        <item name="iconEmojiNormalKey">@drawable/sym_keyboard_smiley_lxx_dark</item>
+    </style>
+</resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index f1a388b2f..3baab95ca 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -48,16 +48,16 @@
     <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">@android:color/system_accent1_600</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">@android:color/system_accent1_600</color>
-    <color name="sliding_key_input_preview_color_lxx_light">@android:color/system_accent1_800</color>
+    <color name="gesture_trail_color_lxx_light">#1A73E8</color>
+    <color name="sliding_key_input_preview_color_lxx_light">#1457af</color>
     <color name="key_background_lxx_light">#ECEFF1</color>
     <color name="key_background_pressed_lxx_light">#2637474F</color>
-    <color name="action_key_background_lxx_light">@android:color/system_accent1_500</color>
-    <color name="action_key_background_pressed_lxx_light">@android:color/system_accent1_400</color>
+    <color name="action_key_background_lxx_light">#1A73E8</color>
+    <color name="action_key_background_pressed_lxx_light">#3683e8</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>
@@ -77,16 +77,16 @@
     <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">@android:color/system_accent1_200</color>
+    <color name="highlight_color_lxx_dark">#5E97F6</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">@android:color/system_accent1_200</color>
-    <color name="sliding_key_input_preview_color_lxx_dark">@android:color/system_accent1_900</color>
+    <color name="gesture_trail_color_lxx_dark">#5E97F6</color>
+    <color name="sliding_key_input_preview_color_lxx_dark">#436baf</color>
     <color name="key_background_lxx_dark">#00000000</color>
     <color name="key_background_pressed_lxx_dark">#19FFFFFF</color>
-    <color name="action_key_background_lxx_dark">@android:color/system_accent1_500</color>
-    <color name="action_key_background_pressed_lxx_dark">@android:color/system_accent1_200</color>
+    <color name="action_key_background_lxx_dark">#5E97F6</color>
+    <color name="action_key_background_pressed_lxx_dark">#86b0f6</color>
     <color name="suggested_word_background_selected_lxx_dark">#1CFFFFFF</color>
     <color name="gesture_floating_preview_color_lxx_dark">#E621272B</color>
     <color name="emoji_tab_page_indicator_background_lxx_dark">#21272B</color>