diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 30de08ea..265fb8b9 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -13,8 +13,6 @@
         <attr name="keyTextSize" format="dimension" />
         <!-- Size of the text for custom keys with some text and no icon. -->
         <attr name="labelTextSize" format="dimension" />
-        <!-- Color to use for the label in a key. -->
-        <attr name="keyTextColor" format="color" />
         <!-- Layout resource for key press feedback. -->
         <attr name="keyPreviewLayout" format="reference" />
         <!-- Height of the key press feedback popup. -->
@@ -26,10 +24,10 @@
     </declare-styleable>
 
     <declare-styleable name="MyKeyboard">
-        <!-- Default width of a key, in pixels or percentage of display width. -->
-        <attr name="keyWidth" format="dimension|fraction" />
+        <!-- Default width of a key in percentage of display width. -->
+        <attr name="keyWidth" format="fraction" />
         <!-- Default horizontal gap between keys. -->
-        <attr name="horizontalGap" format="dimension|fraction" />
+        <attr name="horizontalGap" format="fraction" />
     </declare-styleable>
 
     <declare-styleable name="MyKeyboard_Row">
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 2d788a78..171eb85a 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -4,5 +4,6 @@
     <dimen name="top_small_number_margin_height">18dp</dimen>
     <dimen name="key_height">60dp</dimen>
 
+    <dimen name="keyboard_text_size">22sp</dimen>
     <dimen name="preview_text_size">26sp</dimen>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index c7657d41..138cd17c 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -8,8 +8,7 @@
 
     <style name="Widget.KeyboardView" parent="Widget">
         <item name="keyBackground">@drawable/keyboard_key_selector</item>
-        <item name="keyTextSize">22sp</item>
-        <item name="keyTextColor">#FFFFFFFF</item>
+        <item name="keyTextSize">@dimen/keyboard_text_size</item>
         <item name="keyPreviewLayout">@layout/keyboard_key_preview</item>
         <item name="keyPreviewHeight">60dp</item>
         <item name="labelTextSize">16sp</item>
diff --git a/app/src/main/res/xml/keys_letters.xml b/app/src/main/res/xml/keys_letters.xml
index 6b989f17..b1913770 100644
--- a/app/src/main/res/xml/keys_letters.xml
+++ b/app/src/main/res/xml/keys_letters.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Keyboard xmlns:app="http://schemas.android.com/apk/res-auto"
-    app:keyBackground="@color/color_primary_dark"
-    app:keyTextColor="@color/color_accent">
+<Keyboard xmlns:app="http://schemas.android.com/apk/res-auto">
     <Row>
         <Key
             app:codes="113"
diff --git a/app/src/main/res/xml/keys_symbols.xml b/app/src/main/res/xml/keys_symbols.xml
index 90a95416..c3cf6ea7 100755
--- a/app/src/main/res/xml/keys_symbols.xml
+++ b/app/src/main/res/xml/keys_symbols.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Keyboard xmlns:app="http://schemas.android.com/apk/res-auto"
-    app:keyBackground="@color/color_primary_dark"
-    app:keyTextColor="@color/color_accent">
+<Keyboard xmlns:app="http://schemas.android.com/apk/res-auto">
     <Row>
         <Key
             app:codes="49"
diff --git a/app/src/main/res/xml/keys_symbols_shift.xml b/app/src/main/res/xml/keys_symbols_shift.xml
index 24417257..31ffd9b7 100755
--- a/app/src/main/res/xml/keys_symbols_shift.xml
+++ b/app/src/main/res/xml/keys_symbols_shift.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Keyboard xmlns:app="http://schemas.android.com/apk/res-auto"
-    app:keyBackground="@color/color_primary_dark"
-    app:keyTextColor="@color/color_accent">
+<Keyboard xmlns:app="http://schemas.android.com/apk/res-auto">
     <Row>
         <Key
             app:codes="126"