diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/keyboard/KeyboardTheme.java b/app/src/main/java/org/dslul/openboard/inputmethod/keyboard/KeyboardTheme.java
index 0724577ec..32cde0d2c 100644
--- a/app/src/main/java/org/dslul/openboard/inputmethod/keyboard/KeyboardTheme.java
+++ b/app/src/main/java/org/dslul/openboard/inputmethod/keyboard/KeyboardTheme.java
@@ -106,10 +106,10 @@ public final class KeyboardTheme implements Comparable<KeyboardTheme> {
         new KeyboardTheme(THEME_ID_LXX_AUTO_AMOLED, "LXXAutoAmoled", R.style.KeyboardTheme_LXX_Auto_Amoled,
                 // This has never been selected as default theme.
                 VERSION_CODES.LOLLIPOP),
-        new KeyboardTheme(THEME_ID_LXX_CUSTOM, "LXXCustom", R.style.KeyboardTheme_LXX_Light,
+        new KeyboardTheme(THEME_ID_LXX_CUSTOM, "LXXCustom", R.style.KeyboardTheme_LXX_Base,
                 // This has never been selected as default theme.
                 VERSION_CODES.LOLLIPOP),
-        new KeyboardTheme(THEME_ID_LXX_CUSTOM_BORDER, "LXXCustomBorder", R.style.KeyboardTheme_LXX_Light_Border,
+        new KeyboardTheme(THEME_ID_LXX_CUSTOM_BORDER, "LXXCustomBorder", R.style.KeyboardTheme_LXX_Base_Border,
                 // This has never been selected as default theme.
                 VERSION_CODES.LOLLIPOP),
         new KeyboardTheme(THEME_ID_KLP_CUSTOM, "KLPCustom", R.style.KeyboardTheme_KLP,
diff --git a/app/src/main/res/drawable-hdpi/btn_keyboard_key_popup_selected_lxx_base.9.png b/app/src/main/res/drawable-hdpi/btn_keyboard_key_popup_selected_lxx_base.9.png
new file mode 100644
index 000000000..913a22200
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/btn_keyboard_key_popup_selected_lxx_base.9.png differ
diff --git a/app/src/main/res/drawable-hdpi/btn_keyboard_spacebar_normal_lxx_base.9.png b/app/src/main/res/drawable-hdpi/btn_keyboard_spacebar_normal_lxx_base.9.png
new file mode 100644
index 000000000..8481d61ec
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/btn_keyboard_spacebar_normal_lxx_base.9.png differ
diff --git a/app/src/main/res/drawable-hdpi/btn_keyboard_spacebar_pressed_lxx_base.9.png b/app/src/main/res/drawable-hdpi/btn_keyboard_spacebar_pressed_lxx_base.9.png
new file mode 100644
index 000000000..e5af5fe5b
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/btn_keyboard_spacebar_pressed_lxx_base.9.png differ
diff --git a/app/src/main/res/drawable-hdpi/keyboard_popup_panel_background_lxx_base.9.png b/app/src/main/res/drawable-hdpi/keyboard_popup_panel_background_lxx_base.9.png
new file mode 100644
index 000000000..e432328c5
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/keyboard_popup_panel_background_lxx_base.9.png differ
diff --git a/app/src/main/res/drawable-hdpi/keyboard_popup_panel_background_lxx_base_border.9.png b/app/src/main/res/drawable-hdpi/keyboard_popup_panel_background_lxx_base_border.9.png
new file mode 100644
index 000000000..e432328c5
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/keyboard_popup_panel_background_lxx_base_border.9.png differ
diff --git a/app/src/main/res/drawable-mdpi/btn_keyboard_key_popup_selected_lxx_base.9.png b/app/src/main/res/drawable-mdpi/btn_keyboard_key_popup_selected_lxx_base.9.png
new file mode 100644
index 000000000..2b48028b1
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/btn_keyboard_key_popup_selected_lxx_base.9.png differ
diff --git a/app/src/main/res/drawable-mdpi/btn_keyboard_spacebar_normal_lxx_base.9.png b/app/src/main/res/drawable-mdpi/btn_keyboard_spacebar_normal_lxx_base.9.png
new file mode 100644
index 000000000..a253ea98a
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/btn_keyboard_spacebar_normal_lxx_base.9.png differ
diff --git a/app/src/main/res/drawable-mdpi/btn_keyboard_spacebar_pressed_lxx_base.9.png b/app/src/main/res/drawable-mdpi/btn_keyboard_spacebar_pressed_lxx_base.9.png
new file mode 100644
index 000000000..9a3c3847c
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/btn_keyboard_spacebar_pressed_lxx_base.9.png differ
diff --git a/app/src/main/res/drawable-mdpi/keyboard_popup_panel_background_lxx_base.9.png b/app/src/main/res/drawable-mdpi/keyboard_popup_panel_background_lxx_base.9.png
new file mode 100644
index 000000000..a46d79c87
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/keyboard_popup_panel_background_lxx_base.9.png differ
diff --git a/app/src/main/res/drawable-mdpi/keyboard_popup_panel_background_lxx_base_border.9.png b/app/src/main/res/drawable-mdpi/keyboard_popup_panel_background_lxx_base_border.9.png
new file mode 100644
index 000000000..a46d79c87
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/keyboard_popup_panel_background_lxx_base_border.9.png differ
diff --git a/app/src/main/res/drawable-xhdpi/btn_keyboard_key_popup_selected_lxx_base.9.png b/app/src/main/res/drawable-xhdpi/btn_keyboard_key_popup_selected_lxx_base.9.png
new file mode 100644
index 000000000..5cb775b59
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/btn_keyboard_key_popup_selected_lxx_base.9.png differ
diff --git a/app/src/main/res/drawable-xhdpi/btn_keyboard_spacebar_normal_lxx_base.9.png b/app/src/main/res/drawable-xhdpi/btn_keyboard_spacebar_normal_lxx_base.9.png
new file mode 100644
index 000000000..9889f4d94
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/btn_keyboard_spacebar_normal_lxx_base.9.png differ
diff --git a/app/src/main/res/drawable-xhdpi/btn_keyboard_spacebar_pressed_lxx_base.9.png b/app/src/main/res/drawable-xhdpi/btn_keyboard_spacebar_pressed_lxx_base.9.png
new file mode 100644
index 000000000..79a463326
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/btn_keyboard_spacebar_pressed_lxx_base.9.png differ
diff --git a/app/src/main/res/drawable-xhdpi/keyboard_popup_panel_background_lxx_base.9.png b/app/src/main/res/drawable-xhdpi/keyboard_popup_panel_background_lxx_base.9.png
new file mode 100644
index 000000000..f8643d144
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/keyboard_popup_panel_background_lxx_base.9.png differ
diff --git a/app/src/main/res/drawable-xhdpi/keyboard_popup_panel_background_lxx_base_border.9.png b/app/src/main/res/drawable-xhdpi/keyboard_popup_panel_background_lxx_base_border.9.png
new file mode 100644
index 000000000..f8643d144
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/keyboard_popup_panel_background_lxx_base_border.9.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_popup_selected_lxx_base.9.png b/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_popup_selected_lxx_base.9.png
new file mode 100644
index 000000000..295ca47d1
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_popup_selected_lxx_base.9.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/btn_keyboard_spacebar_normal_lxx_base.9.png b/app/src/main/res/drawable-xxhdpi/btn_keyboard_spacebar_normal_lxx_base.9.png
new file mode 100644
index 000000000..b02e4c57a
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/btn_keyboard_spacebar_normal_lxx_base.9.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/btn_keyboard_spacebar_pressed_lxx_base.9.png b/app/src/main/res/drawable-xxhdpi/btn_keyboard_spacebar_pressed_lxx_base.9.png
new file mode 100644
index 000000000..ea159d6f0
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/btn_keyboard_spacebar_pressed_lxx_base.9.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/keyboard_popup_panel_background_lxx_base.9.png b/app/src/main/res/drawable-xxhdpi/keyboard_popup_panel_background_lxx_base.9.png
new file mode 100644
index 000000000..01fcde7c2
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/keyboard_popup_panel_background_lxx_base.9.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/keyboard_popup_panel_background_lxx_base_border.9.png b/app/src/main/res/drawable-xxhdpi/keyboard_popup_panel_background_lxx_base_border.9.png
new file mode 100644
index 000000000..01fcde7c2
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/keyboard_popup_panel_background_lxx_base_border.9.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_popup_selected_lxx_base.9.png b/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_popup_selected_lxx_base.9.png
new file mode 100644
index 000000000..21aa60570
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_popup_selected_lxx_base.9.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/btn_keyboard_spacebar_normal_lxx_base.9.png b/app/src/main/res/drawable-xxxhdpi/btn_keyboard_spacebar_normal_lxx_base.9.png
new file mode 100644
index 000000000..fd2d4c751
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/btn_keyboard_spacebar_normal_lxx_base.9.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/btn_keyboard_spacebar_pressed_lxx_base.9.png b/app/src/main/res/drawable-xxxhdpi/btn_keyboard_spacebar_pressed_lxx_base.9.png
new file mode 100644
index 000000000..24fae31a4
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/btn_keyboard_spacebar_pressed_lxx_base.9.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/keyboard_popup_panel_background_lxx_base.9.png b/app/src/main/res/drawable-xxxhdpi/keyboard_popup_panel_background_lxx_base.9.png
new file mode 100644
index 000000000..ffb71aca8
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/keyboard_popup_panel_background_lxx_base.9.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/keyboard_popup_panel_background_lxx_base_border.9.png b/app/src/main/res/drawable-xxxhdpi/keyboard_popup_panel_background_lxx_base_border.9.png
new file mode 100644
index 000000000..ffb71aca8
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/keyboard_popup_panel_background_lxx_base_border.9.png differ
diff --git a/app/src/main/res/drawable/btn_keyboard_key_action_normal_lxx_base.xml b/app/src/main/res/drawable/btn_keyboard_key_action_normal_lxx_base.xml
new file mode 100644
index 000000000..7eb8167b7
--- /dev/null
+++ b/app/src/main/res/drawable/btn_keyboard_key_action_normal_lxx_base.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+
+    <solid
+        android:color="@color/action_key_background_lxx_base"/>
+
+    <size
+        android:width="35dp"
+        android:height="35dp"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/btn_keyboard_key_action_normal_lxx_base_border.xml b/app/src/main/res/drawable/btn_keyboard_key_action_normal_lxx_base_border.xml
new file mode 100644
index 000000000..40230b164
--- /dev/null
+++ b/app/src/main/res/drawable/btn_keyboard_key_action_normal_lxx_base_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_base" />
+            <corners android:radius="5dp"/>
+        </shape>
+    </item>
+    <item android:bottom="1dp">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/action_key_background_lxx_base" />
+            <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_action_pressed_lxx_base.xml b/app/src/main/res/drawable/btn_keyboard_key_action_pressed_lxx_base.xml
new file mode 100644
index 000000000..af89955da
--- /dev/null
+++ b/app/src/main/res/drawable/btn_keyboard_key_action_pressed_lxx_base.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+
+    <solid
+        android:color="@color/action_key_background_pressed_lxx_base"/>
+
+    <size
+        android:width="35dp"
+        android:height="35dp"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/btn_keyboard_key_action_pressed_lxx_base_border.xml b/app/src/main/res/drawable/btn_keyboard_key_action_pressed_lxx_base_border.xml
new file mode 100644
index 000000000..1e3980505
--- /dev/null
+++ b/app/src/main/res/drawable/btn_keyboard_key_action_pressed_lxx_base_border.xml
@@ -0,0 +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="@color/action_key_background_pressed_lxx_base" />
+    <corners android:radius="5dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/btn_keyboard_key_functional_lxx_base.xml b/app/src/main/res/drawable/btn_keyboard_key_functional_lxx_base.xml
new file mode 100644
index 000000000..9d8240d72
--- /dev/null
+++ b/app/src/main/res/drawable/btn_keyboard_key_functional_lxx_base.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 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">
+    <!-- Functional keys. -->
+    <item android:state_pressed="true"
+          android:drawable="@color/key_background_pressed_lxx_base" />
+    <item android:drawable="@color/key_background_lxx_base" />
+</selector>
diff --git a/app/src/main/res/drawable/btn_keyboard_key_functional_lxx_base_border.xml b/app/src/main/res/drawable/btn_keyboard_key_functional_lxx_base_border.xml
new file mode 100644
index 000000000..0dadb22ba
--- /dev/null
+++ b/app/src/main/res/drawable/btn_keyboard_key_functional_lxx_base_border.xml
@@ -0,0 +1,22 @@
+<?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_base_border" />
+    <item android:drawable="@drawable/btn_keyboard_key_functional_normal_lxx_base_border" />
+</selector>
diff --git a/app/src/main/res/drawable/btn_keyboard_key_functional_normal_lxx_base_border.xml b/app/src/main/res/drawable/btn_keyboard_key_functional_normal_lxx_base_border.xml
new file mode 100644
index 000000000..c696d9382
--- /dev/null
+++ b/app/src/main/res/drawable/btn_keyboard_key_functional_normal_lxx_base_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_base" />
+            <corners android:radius="5dp"/>
+        </shape>
+    </item>
+    <item android:bottom="1dp">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/key_background_functional_lxx_base_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_lxx_base.xml b/app/src/main/res/drawable/btn_keyboard_key_lxx_base.xml
new file mode 100644
index 000000000..104330ef6
--- /dev/null
+++ b/app/src/main/res/drawable/btn_keyboard_key_lxx_base.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 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">
+    <!-- Action keys. -->
+    <item android:state_active="true" android:state_pressed="true"
+          android:drawable="@drawable/btn_keyboard_key_action_pressed_lxx_base" />
+    <item android:state_active="true"
+          android:drawable="@drawable/btn_keyboard_key_action_normal_lxx_base" />
+
+    <!-- Toggle keys. Use checkable/checked state. -->
+        <item android:state_checkable="true" android:state_checked="true" android:state_pressed="true"
+              android:drawable="@color/key_background_pressed_lxx_base" />
+        <item android:state_checkable="true" android:state_pressed="true"
+              android:drawable="@color/key_background_lxx_base" />
+        <item android:state_checkable="true" android:state_checked="true"
+              android:drawable="@color/key_background_pressed_lxx_base" />
+        <item android:state_checkable="true"
+              android:drawable="@color/key_background_lxx_base" />
+
+        <!-- Empty background keys. -->
+    <item android:state_empty="true" android:state_pressed="true"
+          android:drawable="@color/key_background_pressed_lxx_base" />
+    <item android:state_empty="true"
+          android:drawable="@android:color/transparent" />
+
+    <!-- Normal keys. -->
+    <item android:state_pressed="true"
+          android:drawable="@color/key_background_pressed_lxx_base" />
+    <item android:drawable="@color/key_background_lxx_base" />
+</selector>
diff --git a/app/src/main/res/drawable/btn_keyboard_key_lxx_base_border.xml b/app/src/main/res/drawable/btn_keyboard_key_lxx_base_border.xml
new file mode 100644
index 000000000..fa24b65f0
--- /dev/null
+++ b/app/src/main/res/drawable/btn_keyboard_key_lxx_base_border.xml
@@ -0,0 +1,44 @@
+<?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">
+    <!-- Action keys. -->
+    <item android:state_active="true" android:state_pressed="true"
+          android:drawable="@drawable/btn_keyboard_key_action_pressed_lxx_base_border" />
+    <item android:state_active="true"
+          android:drawable="@drawable/btn_keyboard_key_action_normal_lxx_base_border" />
+
+    <!-- Toggle keys. Use checkable/checked state. -->
+    <item android:state_checkable="true" android:state_checked="true" android:state_pressed="true"
+          android:drawable="@drawable/btn_keyboard_key_functional_normal_lxx_base_border" />
+    <item android:state_checkable="true" android:state_pressed="true"
+          android:drawable="@drawable/btn_keyboard_key_pressed_lxx_base_border" />
+    <item android:state_checkable="true" android:state_checked="true"
+          android:drawable="@drawable/btn_keyboard_key_pressed_lxx_base_border" />
+    <item android:state_checkable="true"
+          android:drawable="@drawable/btn_keyboard_key_functional_normal_lxx_base_border" />
+
+    <!-- Empty background keys. -->
+    <item android:state_empty="true" android:state_pressed="true"
+          android:drawable="@drawable/btn_keyboard_key_pressed_lxx_base_border" />
+    <item android:state_empty="true"
+          android:drawable="@android:color/transparent" />
+
+    <!-- Normal keys. -->
+    <item android:state_pressed="true"
+          android:drawable="@drawable/btn_keyboard_key_pressed_lxx_base_border" />
+    <item android:drawable="@drawable/btn_keyboard_key_normal_lxx_base_border" />
+</selector>
diff --git a/app/src/main/res/drawable/btn_keyboard_key_normal_lxx_base_border.xml b/app/src/main/res/drawable/btn_keyboard_key_normal_lxx_base_border.xml
new file mode 100644
index 000000000..93981cdf2
--- /dev/null
+++ b/app/src/main/res/drawable/btn_keyboard_key_normal_lxx_base_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_base" />
+            <corners android:radius="5dp"/>
+        </shape>
+    </item>
+    <item android:bottom="1dp">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/key_background_normal_lxx_base_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_popup_action_lxx_base.xml b/app/src/main/res/drawable/btn_keyboard_key_popup_action_lxx_base.xml
new file mode 100644
index 000000000..662e0162b
--- /dev/null
+++ b/app/src/main/res/drawable/btn_keyboard_key_popup_action_lxx_base.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true"
+        android:drawable="@drawable/btn_keyboard_key_action_pressed_lxx_base" />
+    <item android:drawable="@drawable/btn_keyboard_key_action_normal_lxx_base" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/btn_keyboard_key_popup_lxx_base.xml b/app/src/main/res/drawable/btn_keyboard_key_popup_lxx_base.xml
new file mode 100644
index 000000000..0b62d5c5b
--- /dev/null
+++ b/app/src/main/res/drawable/btn_keyboard_key_popup_lxx_base.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 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_pressed="true"
+          android:drawable="@drawable/btn_keyboard_key_popup_selected_lxx_base" />
+    <item android:drawable="@android:color/transparent" />
+</selector>
diff --git a/app/src/main/res/drawable/btn_keyboard_key_pressed_lxx_base_border.xml b/app/src/main/res/drawable/btn_keyboard_key_pressed_lxx_base_border.xml
new file mode 100644
index 000000000..92cb663b4
--- /dev/null
+++ b/app/src/main/res/drawable/btn_keyboard_key_pressed_lxx_base_border.xml
@@ -0,0 +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="@color/key_background_pressed_lxx_base_border" />
+    <corners android:radius="5dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/btn_keyboard_spacebar_lxx_base.xml b/app/src/main/res/drawable/btn_keyboard_spacebar_lxx_base.xml
new file mode 100644
index 000000000..20b159e1b
--- /dev/null
+++ b/app/src/main/res/drawable/btn_keyboard_spacebar_lxx_base.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 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_pressed="true"
+          android:drawable="@drawable/btn_keyboard_spacebar_pressed_lxx_base" />
+    <item android:drawable="@drawable/btn_keyboard_spacebar_normal_lxx_base" />
+</selector>
diff --git a/app/src/main/res/drawable/btn_suggestion_lxx_base.xml b/app/src/main/res/drawable/btn_suggestion_lxx_base.xml
new file mode 100644
index 000000000..a640b1b3b
--- /dev/null
+++ b/app/src/main/res/drawable/btn_suggestion_lxx_base.xml
@@ -0,0 +1,27 @@
+<?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_pressed="true"
+        android:drawable="@color/suggested_word_background_selected_lxx_base" />
+</selector>
diff --git a/app/src/main/res/drawable/keyboard_background_lxx_base.xml b/app/src/main/res/drawable/keyboard_background_lxx_base.xml
new file mode 100644
index 000000000..e025a7677
--- /dev/null
+++ b/app/src/main/res/drawable/keyboard_background_lxx_base.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_base" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/keyboard_background_lxx_base_border.xml b/app/src/main/res/drawable/keyboard_background_lxx_base_border.xml
new file mode 100644
index 000000000..c8ab8752b
--- /dev/null
+++ b/app/src/main/res/drawable/keyboard_background_lxx_base_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_base_border" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/keyboard_suggest_strip_lxx_base.xml b/app/src/main/res/drawable/keyboard_suggest_strip_lxx_base.xml
new file mode 100644
index 000000000..a4e695fb1
--- /dev/null
+++ b/app/src/main/res/drawable/keyboard_suggest_strip_lxx_base.xml
@@ -0,0 +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="@color/keyboard_background_lxx_base" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/keyboard_suggest_strip_lxx_base_border.xml b/app/src/main/res/drawable/keyboard_suggest_strip_lxx_base_border.xml
new file mode 100644
index 000000000..894232954
--- /dev/null
+++ b/app/src/main/res/drawable/keyboard_suggest_strip_lxx_base_border.xml
@@ -0,0 +1,13 @@
+<?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="#e0e5ea" />
+        </shape>
+    </item>
+    <item android:top="1dp">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/keyboard_background_lxx_base_border" />
+        </shape>
+    </item>
+</layer-list>
\ 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 3baab95ca..d364f1005 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -105,6 +105,28 @@
 
     <color name="popup_background_material_dark_theme">#ff3c474c</color>
 
+    <!-- Color resources for LXX_Base theme.
+     15%:0x26 70%:0xB3 75%:0xC0 80%:0xCC 85%:0xD9 90%:0xE6 -->
+    <color name="keyboard_background_lxx_base">@android:color/white</color>
+    <color name="key_background_lxx_base">@android:color/white</color>
+    <color name="key_background_pressed_lxx_base">#F4F4F5</color>
+    <color name="action_key_background_lxx_base">@android:color/white</color>
+    <color name="action_key_background_pressed_lxx_base">#F4F4F5</color>
+    <color name="key_background_functional_lxx_base">@android:color/white</color>
+    <color name="morekey_normal_lxx_base">@android:color/white</color>
+    <color name="morekey_pressed_lxx_base">#F4F4F5</color>
+    <color name="suggested_word_background_selected_lxx_base">#F4F4F5</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 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_background_pressed_lxx_base_border">#F4F4F5</color>
+    <color name="key_background_functional_lxx_base_border">@android:color/white</color>
+    <color name="key_bottom_bevel_lxx_base">#A9ABAD</color>
+    <color name="emoji_tab_page_indicator_background_lxx_base_border">@android:color/white</color>
+
     <!-- Color resources for setup wizard and tutorial -->
     <color name="setup_background">#FFEBEBEB</color>
     <color name="setup_text_dark">#FF707070</color>
diff --git a/app/src/main/res/values/themes-lxx-base-border.xml b/app/src/main/res/values/themes-lxx-base-border.xml
new file mode 100644
index 000000000..cd3106042
--- /dev/null
+++ b/app/src/main/res/values/themes-lxx-base-border.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+    <style name="KeyboardTheme.LXX_Base_Border"
+           parent="KeyboardTheme.LXX_Base">
+        <item name="keyboardStyle">@style/Keyboard.LXX_Base_Border</item>
+        <item name="keyboardViewStyle">@style/KeyboardView.LXX_Base_Border</item>
+        <item name="mainKeyboardViewStyle">@style/MainKeyboardView.LXX_Base_Border</item>
+        <item name="emojiPalettesViewStyle">@style/EmojiPalettesView.LXX_Base_Border</item>
+        <item name="clipboardHistoryViewStyle">@style/ClipboardHistoryView.LXX_Base_Border</item>
+        <item name="moreKeysKeyboardViewStyle">@style/MoreKeysKeyboardView.LXX_Base_Border</item>
+        <item name="suggestionStripViewStyle">@style/SuggestionStripView.LXX_Base_Border</item>
+    </style>
+    <style
+        name="Keyboard.LXX_Base_Border"
+        parent="Keyboard"
+    >
+    </style>
+    <style
+        name="KeyboardView.LXX_Base_Border"
+        parent="KeyboardView.LXX_Base">
+        <item name="android:background">@drawable/keyboard_background_lxx_base_border</item>
+        <item name="keyBackground">@drawable/btn_keyboard_key_lxx_base_border</item>
+        <item name="functionalKeyBackground">@drawable/btn_keyboard_key_functional_lxx_base_border</item>
+        <item name="spacebarBackground">@drawable/btn_keyboard_key_lxx_base_border</item>
+    </style>
+
+    <style
+        name="MainKeyboardView.LXX_Base_Border"
+        parent="MainKeyboardView.LXX_Base">
+        <item name="android:background">@drawable/keyboard_background_lxx_base_border</item>
+        <item name="keyBackground">@drawable/btn_keyboard_key_lxx_base_border</item>
+        <item name="functionalKeyBackground">@drawable/btn_keyboard_key_functional_lxx_base_border</item>
+        <item name="spacebarBackground">@drawable/btn_keyboard_key_lxx_base_border</item>
+    </style>
+
+    <style
+        name="EmojiPalettesView.LXX_Base_Border"
+        parent="EmojiPalettesView.LXX_Base">
+        <item name="categoryPageIndicatorBackground">@color/emoji_tab_page_indicator_background_lxx_base_border</item>
+        <item name="android:background">@drawable/keyboard_background_lxx_base_border</item>
+        <item name="keyBackground">@drawable/btn_keyboard_key_lxx_base_border</item>
+        <item name="functionalKeyBackground">@drawable/btn_keyboard_key_functional_lxx_base_border</item>
+        <item name="spacebarBackground">@drawable/btn_keyboard_key_lxx_base_border</item>
+    </style>
+
+    <style
+        name="ClipboardHistoryView.LXX_Base_Border"
+        parent="ClipboardHistoryView.LXX_Base">
+        <item name="android:background">@drawable/keyboard_background_lxx_base_border</item>
+        <item name="keyBackground">@drawable/btn_keyboard_key_lxx_base_border</item>
+        <item name="functionalKeyBackground">@drawable/btn_keyboard_key_functional_lxx_base_border</item>
+    </style>
+
+    <style
+        name="MoreKeysKeyboardView.LXX_Base_Border"
+        parent="MoreKeysKeyboardView.LXX_Base">
+        <item name="android:background">@drawable/keyboard_popup_panel_background_lxx_base_border</item>
+        <item name="keyBackground">@drawable/btn_keyboard_key_popup_lxx_base</item>
+    </style>
+
+    <style
+        name="SuggestionStripView.LXX_Base_Border"
+        parent="SuggestionStripView.LXX_Base">
+        <item name="android:background">@drawable/keyboard_suggest_strip_lxx_base_border</item>
+    </style>
+
+</resources>
diff --git a/app/src/main/res/values/themes-lxx-base.xml b/app/src/main/res/values/themes-lxx-base.xml
new file mode 100644
index 000000000..8436d8c65
--- /dev/null
+++ b/app/src/main/res/values/themes-lxx-base.xml
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+    <style name="KeyboardTheme.LXX_Base" parent="KeyboardIcons.LXX_Light">
+        <item name="inputViewStyle">@style/InputView.LXX</item>
+        <item name="keyboardStyle">@style/Keyboard.LXX_Base</item>
+        <item name="keyboardViewStyle">@style/KeyboardView.LXX_Base</item>
+        <item name="mainKeyboardViewStyle">@style/MainKeyboardView.LXX_Base</item>
+        <item name="emojiPalettesViewStyle">@style/EmojiPalettesView.LXX_Base</item>
+        <item name="clipboardHistoryViewStyle">@style/ClipboardHistoryView.LXX_Base</item>
+        <item name="moreKeysKeyboardStyle">@style/MoreKeysKeyboard.LXX_Base</item>
+        <item name="moreKeysKeyboardViewStyle">@style/MoreKeysKeyboardView.LXX_Base</item>
+        <item name="moreKeysKeyboardViewForActionStyle">@style/MoreKeysKeyboardView.LXX_Base.Action</item>
+        <item name="suggestionStripViewStyle">@style/SuggestionStripView.LXX_Base</item>
+        <item name="suggestionWordStyle">@style/SuggestionWord.LXX_Base</item>
+    </style>
+    <style
+        name="Keyboard.LXX_Base"
+        parent="Keyboard"
+    >
+    </style>
+    <style
+        name="KeyboardView.LXX_Base"
+        parent="KeyboardView.LXX"
+        >
+        <item name="android:background">@drawable/keyboard_background_lxx_base</item>
+        <item name="keyBackground">@drawable/btn_keyboard_key_lxx_base</item>
+        <item name="functionalKeyBackground">@drawable/btn_keyboard_key_functional_lxx_base</item>
+        <item name="spacebarBackground">@drawable/btn_keyboard_spacebar_lxx_base</item>
+        <item name="keyTextColor">@color/key_text_color_lxx_light</item>
+        <item name="keyTextInactivatedColor">@color/key_text_inactive_color_lxx_light</item>
+        <item name="functionalTextColor">@color/key_functional_text_color_lxx_light</item>
+        <item name="keyHintLetterColor">@color/key_hint_letter_color_lxx_light</item>
+        <item name="keyHintLabelColor">@color/key_text_inactive_color_lxx_light</item>
+        <item name="keyShiftedLetterHintInactivatedColor">@color/key_text_inactive_color_lxx_light</item>
+        <item name="keyShiftedLetterHintActivatedColor">@color/key_text_color_lxx_light</item>
+        <item name="keyPreviewTextColor">@color/key_text_color_lxx_light</item>
+    </style>
+    <style
+        name="MainKeyboardView.LXX_Base"
+        parent="KeyboardView.LXX_Base"
+        >
+        <item name="moreKeysKeyboardForActionLayout">@layout/more_keys_keyboard_for_action_lxx</item>
+        <item name="keyPreviewBackground">@drawable/keyboard_key_feedback_lxx_light</item>
+        <item name="keyPreviewHeight">@dimen/config_key_preview_height_lxx</item>
+        <item name="keyPreviewOffset">@dimen/config_key_preview_offset_lxx</item>
+        <item name="keyPreviewShowUpAnimator">@anim/key_preview_show_up_lxx</item>
+        <item name="keyPreviewDismissAnimator">@anim/key_preview_dismiss_lxx</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/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>
+    <!-- Though {@link org.dslul.openboard.inputmethod.keyboard.emoji.EmojiPalettesView} doesn't extend
+         {@link org.dslul.openboard.inputmethod.keyboard.KeyboardView}, some views inside it, for instance
+         delete button, need themed {@link org.dslul.openboard.inputmethod.keyboard.KeyboardView}
+         attributes. -->
+    <style
+        name="EmojiPalettesView.LXX_Base"
+        parent="MainKeyboardView.LXX_Base"
+        >
+        <item name="categoryIndicatorEnabled">false</item>
+        <item name="categoryPageIndicatorColor">@color/highlight_color_lxx_light</item>
+        <item name="categoryPageIndicatorBackground">@color/emoji_tab_page_indicator_background_lxx_base</item>
+        <item name="iconEmojiRecentsTab">@drawable/ic_emoji_recents_lxx_light</item>
+        <item name="iconEmojiCategory1Tab">@drawable/ic_emoji_smileys_emotion_lxx_light</item>
+        <item name="iconEmojiCategory2Tab">@drawable/ic_emoji_people_body_lxx_light</item>
+        <item name="iconEmojiCategory3Tab">@drawable/ic_emoji_animals_nature_lxx_light</item>
+        <item name="iconEmojiCategory4Tab">@drawable/ic_emoji_food_drink_lxx_light</item>
+        <item name="iconEmojiCategory5Tab">@drawable/ic_emoji_travel_places_lxx_light</item>
+        <item name="iconEmojiCategory6Tab">@drawable/ic_emoji_activities_lxx_light</item>
+        <item name="iconEmojiCategory7Tab">@drawable/ic_emoji_objects_lxx_light</item>
+        <item name="iconEmojiCategory8Tab">@drawable/ic_emoji_symbols_lxx_light</item>
+        <item name="iconEmojiCategory9Tab">@drawable/ic_emoji_flags_lxx_light</item>
+        <item name="iconEmojiCategory10Tab">@drawable/ic_emoji_emoticons_lxx_light</item>
+    </style>
+    <style
+        name="ClipboardHistoryView.LXX_Base"
+        parent="MainKeyboardView.LXX_Base"
+        >
+        <item name="iconPinnedClip">@drawable/ic_clipboard_pin_lxx_light</item>
+        <item name="dividerBackground">@color/emoji_tab_page_indicator_background_lxx_base</item>
+    </style>
+    <style
+        name="MoreKeysKeyboard.LXX_Base"
+        parent="Keyboard.LXX_Base"
+        >
+        <item name="keyboardTopPadding">0%p</item>
+        <item name="keyboardBottomPadding">0%p</item>
+        <item name="horizontalGap">0%p</item>
+        <item name="touchPositionCorrectionData">@null</item>
+    </style>
+    <style
+        name="MoreKeysKeyboardView.LXX_Base"
+        parent="KeyboardView.LXX_Base"
+        >
+        <item name="android:background">@drawable/keyboard_popup_panel_background_lxx_base</item>
+        <item name="keyBackground">@drawable/btn_keyboard_key_popup_lxx_base</item>
+        <item name="divider">@drawable/more_keys_divider</item>
+        <item name="keyTypeface">normal</item>
+        <item name="verticalCorrection">@dimen/config_more_keys_keyboard_vertical_correction_holo</item>
+    </style>
+    <style
+        name="MoreKeysKeyboardView.LXX_Base.Action"
+        parent="MoreKeysKeyboardView.LXX_Base"
+        >
+        <item name="android:background">@android:color/transparent</item>
+        <item name="keyBackground">@drawable/btn_keyboard_key_popup_action_lxx_base</item>
+        <item name="divider">@null</item>
+        <item name="keyLabelFlags">keepBackgroundAspectRatio</item>
+    </style>
+    <style
+        name="SuggestionStripView.LXX_Base"
+        parent="KeyboardView.LXX_Base"
+        >
+        <item name="suggestionsCountInStrip">@integer/config_suggestions_count_in_strip</item>
+        <item name="centerSuggestionPercentile">@fraction/config_center_suggestion_percentile</item>
+        <item name="maxMoreSuggestionsRow">@integer/config_max_more_suggestions_row</item>
+        <item name="minMoreSuggestionsWidth">@fraction/config_min_more_suggestions_width</item>
+        <item name="android:background">@drawable/keyboard_suggest_strip_lxx_base</item>
+        <item name="android:src">@drawable/suggestions_strip_divider_lxx_light</item>
+        <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/auto_correct_color_lxx_light</item>
+        <item name="colorSuggested">@color/suggested_word_color_lxx_light</item>
+        <item name="alphaObsoleted">70%</item>
+    </style>
+    <style
+        name="SuggestionWord.LXX_Base"
+        parent="SuggestionWord"
+        >
+        <item name="android:background">@drawable/btn_suggestion_lxx_base</item>
+        <item name="android:textColor">@color/highlight_color_lxx_light</item>
+    </style>
+</resources>
\ No newline at end of file