diff --git a/app/src/main/res/drawable/btn_keyboard_key_functional_lxx_dark_border.xml b/app/src/main/res/drawable/btn_keyboard_key_functional_lxx_dark_border.xml
index 580595904..a205ec0d4 100644
--- a/app/src/main/res/drawable/btn_keyboard_key_functional_lxx_dark_border.xml
+++ b/app/src/main/res/drawable/btn_keyboard_key_functional_lxx_dark_border.xml
@@ -1,22 +1,7 @@
 <?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.
--->
-
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- Functional keys. -->
     <item android:state_pressed="true"
           android:drawable="@drawable/btn_keyboard_key_pressed_lxx_dark_border" />
-    <item android:drawable="@drawable/btn_keyboard_key_function_lxx_dark_border" />
+    <item android:drawable="@drawable/btn_keyboard_key_functional_normal_lxx_dark_border" />
 </selector>
diff --git a/app/src/main/res/drawable/btn_keyboard_key_functional_lxx_light_border.xml b/app/src/main/res/drawable/btn_keyboard_key_functional_lxx_light_border.xml
index 6b3bbc8c1..be7bae474 100644
--- a/app/src/main/res/drawable/btn_keyboard_key_functional_lxx_light_border.xml
+++ b/app/src/main/res/drawable/btn_keyboard_key_functional_lxx_light_border.xml
@@ -18,5 +18,5 @@
     <!-- Functional keys. -->
     <item android:state_pressed="true"
           android:drawable="@drawable/btn_keyboard_key_pressed_lxx_light_border" />
-    <item android:drawable="@drawable/btn_keyboard_key_function_lxx_light_border" />
+    <item android:drawable="@drawable/btn_keyboard_key_functional_normal_lxx_light_border" />
 </selector>
diff --git a/app/src/main/res/drawable/btn_keyboard_key_functional_normal_lxx_dark_border.xml b/app/src/main/res/drawable/btn_keyboard_key_functional_normal_lxx_dark_border.xml
new file mode 100644
index 000000000..4c45f9206
--- /dev/null
+++ b/app/src/main/res/drawable/btn_keyboard_key_functional_normal_lxx_dark_border.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="@color/key_bottom_bevel_lxx_dark" />
+            <corners android:radius="5dp"/>
+        </shape>
+    </item>
+    <item android:bottom="1dp">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/key_background_functional_lxx_dark_border" />
+            <corners android:radius="5dp" />
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/btn_keyboard_key_functional_normal_lxx_light_border.xml b/app/src/main/res/drawable/btn_keyboard_key_functional_normal_lxx_light_border.xml
new file mode 100644
index 000000000..d9796f5d8
--- /dev/null
+++ b/app/src/main/res/drawable/btn_keyboard_key_functional_normal_lxx_light_border.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item >
+        <shape android:shape="rectangle">
+            <solid android:color="@color/key_bottom_bevel_lxx_light" />
+            <corners android:radius="5dp"/>
+        </shape>
+    </item>
+    <item android:bottom="1dp">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/key_background_functional_lxx_light_border" />
+            <corners android:radius="5dp" />
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/btn_keyboard_key_normal_lxx_dark_border.xml b/app/src/main/res/drawable/btn_keyboard_key_normal_lxx_dark_border.xml
index 07d47d811..4f9565810 100644
--- a/app/src/main/res/drawable/btn_keyboard_key_normal_lxx_dark_border.xml
+++ b/app/src/main/res/drawable/btn_keyboard_key_normal_lxx_dark_border.xml
@@ -2,13 +2,13 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item >
         <shape android:shape="rectangle">
-            <solid android:color="#1c1c1c" />
+            <solid android:color="@color/key_bottom_bevel_lxx_dark" />
             <corners android:radius="5dp"/>
         </shape>
     </item>
-    <item android:bottom="3px">
+    <item android:bottom="1dp">
         <shape android:shape="rectangle">
-            <solid android:color="#4d4d4d" />
+            <solid android:color="@color/key_background_normal_lxx_dark_border" />
             <corners android:radius="5dp" />
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/btn_keyboard_key_normal_lxx_light_border.xml b/app/src/main/res/drawable/btn_keyboard_key_normal_lxx_light_border.xml
index c4ce92143..0ed3aad44 100644
--- a/app/src/main/res/drawable/btn_keyboard_key_normal_lxx_light_border.xml
+++ b/app/src/main/res/drawable/btn_keyboard_key_normal_lxx_light_border.xml
@@ -2,13 +2,13 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item >
         <shape android:shape="rectangle">
-            <solid android:color="#99888B8E" />
+            <solid android:color="@color/key_bottom_bevel_lxx_light" />
             <corners android:radius="5dp"/>
         </shape>
     </item>
-    <item android:bottom="3px">
+    <item android:bottom="1dp">
         <shape android:shape="rectangle">
-            <solid android:color="#FFFFFF" />
+            <solid android:color="@color/key_background_normal_lxx_light_border" />
             <corners android:radius="5dp" />
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/btn_keyboard_key_pressed_lxx_dark_border.xml b/app/src/main/res/drawable/btn_keyboard_key_pressed_lxx_dark_border.xml
index 4856809c0..fddf7a187 100644
--- a/app/src/main/res/drawable/btn_keyboard_key_pressed_lxx_dark_border.xml
+++ b/app/src/main/res/drawable/btn_keyboard_key_pressed_lxx_dark_border.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <solid android:color="#424242" />
+    <solid android:color="@color/key_background_pressed_lxx_dark_border" />
     <corners android:radius="5dp" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/btn_keyboard_key_pressed_lxx_light_border.xml b/app/src/main/res/drawable/btn_keyboard_key_pressed_lxx_light_border.xml
index f589f0e34..4764221ff 100644
--- a/app/src/main/res/drawable/btn_keyboard_key_pressed_lxx_light_border.xml
+++ b/app/src/main/res/drawable/btn_keyboard_key_pressed_lxx_light_border.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <solid android:color="#F3F5F6" />
+    <solid android:color="@color/key_background_pressed_lxx_light_border" />
     <corners android:radius="5dp" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/keyboard_background_lxx_dark_border.xml b/app/src/main/res/drawable/keyboard_background_lxx_dark_border.xml
new file mode 100644
index 000000000..b6b35d3bd
--- /dev/null
+++ b/app/src/main/res/drawable/keyboard_background_lxx_dark_border.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="rectangle">
+    <solid android:color="@color/keyboard_background_lxx_dark_border" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/keyboard_background_lxx_light_border.xml b/app/src/main/res/drawable/keyboard_background_lxx_light_border.xml
new file mode 100644
index 000000000..874555386
--- /dev/null
+++ b/app/src/main/res/drawable/keyboard_background_lxx_light_border.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="rectangle">
+    <solid android:color="@color/keyboard_background_lxx_light_border" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 6b949b30d..4b8193c2a 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -60,6 +60,15 @@
     <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_Light_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_pressed_lxx_light_border">#F3F5F6</color>
+    <color name="key_background_functional_lxx_light_border">#CCCED5</color>
+    <color name="key_bottom_bevel_lxx_light">#A9ABAD</color>
+    <color name="emoji_tab_page_indicator_background_lxx_light_border">#CCCED5</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">#CCFFFFFF</color>
@@ -80,6 +89,17 @@
     <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 LXX_Dark_Border theme.
+         15%:0x26 70%:0xB3 75%:0xC0 80%:0xCC 85%:0xD9 90%:0xE6 -->
+    <color name="keyboard_background_lxx_dark_border">#0d0d0d</color>
+    <color name="key_background_normal_lxx_dark_border">#4d4d4d</color>
+    <color name="key_background_pressed_lxx_dark_border">#424242</color>
+    <color name="key_background_functional_lxx_dark_border">#1f1f1f</color>
+    <color name="key_bottom_bevel_lxx_dark">#252525</color>
+    <color name="emoji_tab_page_indicator_background_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 name="background_amoled_black">#000000</color>
 
     <color name="popup_background_material_dark_theme">#ff3c474c</color>