diff --git a/app/src/main/res/xml/keys_letters.xml b/app/src/main/res/xml/keys_letters.xml
index 1f5409a..ac0ce42 100644
--- a/app/src/main/res/xml/keys_letters.xml
+++ b/app/src/main/res/xml/keys_letters.xml
@@ -2,62 +2,52 @@
 <Keyboard xmlns:app="http://schemas.android.com/apk/res-auto">
     <Row>
         <Key
-            app:code="113"
             app:keyEdgeFlags="left"
             app:keyLabel="q"
             app:popupCharacters="1"
             app:popupKeyboard="@xml/keyboard_popup_template"
             app:topSmallNumber="1" />
         <Key
-            app:code="119"
             app:keyLabel="w"
             app:popupCharacters="2"
             app:popupKeyboard="@xml/keyboard_popup_template"
             app:topSmallNumber="2" />
         <Key
-            app:code="101"
             app:keyLabel="e"
             app:popupCharacters="3é"
             app:popupKeyboard="@xml/keyboard_popup_template"
             app:topSmallNumber="3" />
         <Key
-            app:code="114"
             app:keyLabel="r"
             app:popupCharacters="ř4ŕ"
             app:popupKeyboard="@xml/keyboard_popup_template"
             app:topSmallNumber="4" />
         <Key
-            app:code="116"
             app:keyLabel="t"
             app:popupCharacters="5ť"
             app:popupKeyboard="@xml/keyboard_popup_template"
             app:topSmallNumber="5" />
         <Key
-            app:code="121"
             app:keyLabel="y"
             app:popupCharacters="6ý"
             app:popupKeyboard="@xml/keyboard_popup_template"
             app:topSmallNumber="6" />
         <Key
-            app:code="117"
             app:keyLabel="u"
             app:popupCharacters="ű7üú"
             app:popupKeyboard="@xml/keyboard_popup_template"
             app:topSmallNumber="7" />
         <Key
-            app:code="105"
             app:keyLabel="i"
             app:popupCharacters="8í"
             app:popupKeyboard="@xml/keyboard_popup_template"
             app:topSmallNumber="8" />
         <Key
-            app:code="111"
             app:keyLabel="o"
             app:popupCharacters="őöó9ô"
             app:popupKeyboard="@xml/keyboard_popup_template"
             app:topSmallNumber="9" />
         <Key
-            app:code="112"
             app:keyEdgeFlags="right"
             app:keyLabel="p"
             app:popupCharacters="0"
@@ -66,39 +56,25 @@
     </Row>
     <Row>
         <Key
-            app:code="97"
             app:horizontalGap="5%"
             app:keyEdgeFlags="left"
             app:keyLabel="a"
             app:popupCharacters="á"
             app:popupKeyboard="@xml/keyboard_popup_template" />
         <Key
-            app:code="115"
             app:keyLabel="s"
             app:popupCharacters="š"
             app:popupKeyboard="@xml/keyboard_popup_template" />
         <Key
-            app:code="100"
             app:keyLabel="d"
             app:popupCharacters="ď"
             app:popupKeyboard="@xml/keyboard_popup_template" />
+        <Key app:keyLabel="f" />
+        <Key app:keyLabel="g" />
+        <Key app:keyLabel="h" />
+        <Key app:keyLabel="j" />
+        <Key app:keyLabel="k" />
         <Key
-            app:code="102"
-            app:keyLabel="f" />
-        <Key
-            app:code="103"
-            app:keyLabel="g" />
-        <Key
-            app:code="104"
-            app:keyLabel="h" />
-        <Key
-            app:code="106"
-            app:keyLabel="j" />
-        <Key
-            app:code="107"
-            app:keyLabel="k" />
-        <Key
-            app:code="108"
             app:keyEdgeFlags="right"
             app:keyLabel="l"
             app:popupCharacters="ĺľ"
@@ -111,32 +87,21 @@
             app:keyIcon="@drawable/ic_caps_outline_vector"
             app:keyWidth="15%p" />
         <Key
-            app:code="122"
             app:keyLabel="z"
             app:popupCharacters="ž"
             app:popupKeyboard="@xml/keyboard_popup_template" />
+        <Key app:keyLabel="x" />
         <Key
-            app:code="120"
-            app:keyLabel="x" />
-        <Key
-            app:code="99"
             app:keyLabel="c"
             app:popupCharacters="č"
             app:popupKeyboard="@xml/keyboard_popup_template" />
+        <Key app:keyLabel="v" />
+        <Key app:keyLabel="b" />
         <Key
-            app:code="118"
-            app:keyLabel="v" />
-        <Key
-            app:code="98"
-            app:keyLabel="b" />
-        <Key
-            app:code="110"
             app:keyLabel="n"
             app:popupCharacters="ňń"
             app:popupKeyboard="@xml/keyboard_popup_template" />
-        <Key
-            app:code="109"
-            app:keyLabel="m" />
+        <Key app:keyLabel="m" />
         <Key
             app:code="-5"
             app:isRepeatable="true"
@@ -151,16 +116,13 @@
             app:keyLabel="123"
             app:keyWidth="15%p" />
         <Key
-            app:code="44"
             app:keyLabel=","
             app:keyWidth="10%p" />
         <Key
             app:code="32"
             app:isRepeatable="true"
             app:keyWidth="45%p" />
-        <Key
-            app:code="46"
-            app:keyLabel="." />
+        <Key app:keyLabel="." />
         <Key
             app:code="-4"
             app:keyEdgeFlags="right"
diff --git a/app/src/main/res/xml/keys_symbols.xml b/app/src/main/res/xml/keys_symbols.xml
index fe9854c..68f7c07 100755
--- a/app/src/main/res/xml/keys_symbols.xml
+++ b/app/src/main/res/xml/keys_symbols.xml
@@ -2,69 +2,33 @@
 <Keyboard xmlns:app="http://schemas.android.com/apk/res-auto">
     <Row>
         <Key
-            app:code="49"
             app:keyEdgeFlags="left"
             app:keyLabel="1" />
+        <Key app:keyLabel="2" />
+        <Key app:keyLabel="3" />
+        <Key app:keyLabel="4" />
+        <Key app:keyLabel="5" />
+        <Key app:keyLabel="6" />
+        <Key app:keyLabel="7" />
+        <Key app:keyLabel="8" />
+        <Key app:keyLabel="9" />
         <Key
-            app:code="50"
-            app:keyLabel="2" />
-        <Key
-            app:code="51"
-            app:keyLabel="3" />
-        <Key
-            app:code="52"
-            app:keyLabel="4" />
-        <Key
-            app:code="53"
-            app:keyLabel="5" />
-        <Key
-            app:code="54"
-            app:keyLabel="6" />
-        <Key
-            app:code="55"
-            app:keyLabel="7" />
-        <Key
-            app:code="56"
-            app:keyLabel="8" />
-        <Key
-            app:code="57"
-            app:keyLabel="9" />
-        <Key
-            app:code="48"
             app:keyEdgeFlags="right"
             app:keyLabel="0" />
     </Row>
     <Row>
         <Key
-            app:code="64"
             app:keyEdgeFlags="left"
             app:keyLabel="\@" />
+        <Key app:keyLabel="\#" />
+        <Key app:keyLabel="$" />
+        <Key app:keyLabel="%" />
+        <Key app:keyLabel="&amp;" />
+        <Key app:keyLabel="*" />
+        <Key app:keyLabel="-" />
+        <Key app:keyLabel="=" />
+        <Key app:keyLabel="(" />
         <Key
-            app:code="35"
-            app:keyLabel="\#" />
-        <Key
-            app:code="36"
-            app:keyLabel="$" />
-        <Key
-            app:code="37"
-            app:keyLabel="%" />
-        <Key
-            app:code="38"
-            app:keyLabel="&amp;" />
-        <Key
-            app:code="42"
-            app:keyLabel="*" />
-        <Key
-            app:code="45"
-            app:keyLabel="-" />
-        <Key
-            app:code="61"
-            app:keyLabel="=" />
-        <Key
-            app:code="40"
-            app:keyLabel="(" />
-        <Key
-            app:code="41"
             app:keyEdgeFlags="right"
             app:keyLabel=")" />
     </Row>
@@ -74,27 +38,13 @@
             app:keyEdgeFlags="left"
             app:keyLabel="=\\&lt;"
             app:keyWidth="15%p" />
-        <Key
-            app:code="33"
-            app:keyLabel="!" />
-        <Key
-            app:code="34"
-            app:keyLabel="&quot;" />
-        <Key
-            app:code="39"
-            app:keyLabel="\'" />
-        <Key
-            app:code="58"
-            app:keyLabel=":" />
-        <Key
-            app:code="59"
-            app:keyLabel=";" />
-        <Key
-            app:code="47"
-            app:keyLabel="/" />
-        <Key
-            app:code="63"
-            app:keyLabel="\?" />
+        <Key app:keyLabel="!" />
+        <Key app:keyLabel="&quot;" />
+        <Key app:keyLabel="\'" />
+        <Key app:keyLabel=":" />
+        <Key app:keyLabel=";" />
+        <Key app:keyLabel="/" />
+        <Key app:keyLabel="\?" />
         <Key
             app:code="-5"
             app:isRepeatable="true"
@@ -109,16 +59,13 @@
             app:keyLabel="abc"
             app:keyWidth="15%p" />
         <Key
-            app:code="44"
             app:keyLabel=","
             app:keyWidth="10%p" />
         <Key
             app:code="32"
             app:isRepeatable="true"
             app:keyWidth="45%p" />
-        <Key
-            app:code="46"
-            app:keyLabel="." />
+        <Key app:keyLabel="." />
         <Key
             app:code="-4"
             app:keyEdgeFlags="right"
diff --git a/app/src/main/res/xml/keys_symbols_shift.xml b/app/src/main/res/xml/keys_symbols_shift.xml
index 994256d..bb6b100 100755
--- a/app/src/main/res/xml/keys_symbols_shift.xml
+++ b/app/src/main/res/xml/keys_symbols_shift.xml
@@ -2,69 +2,33 @@
 <Keyboard xmlns:app="http://schemas.android.com/apk/res-auto">
     <Row>
         <Key
-            app:code="126"
             app:keyEdgeFlags="left"
             app:keyLabel="~" />
+        <Key app:keyLabel="±" />
+        <Key app:keyLabel="×" />
+        <Key app:keyLabel="÷" />
+        <Key app:keyLabel="•" />
+        <Key app:keyLabel="°" />
+        <Key app:keyLabel="`" />
+        <Key app:keyLabel="´" />
+        <Key app:keyLabel="{" />
         <Key
-            app:code="177"
-            app:keyLabel="±" />
-        <Key
-            app:code="215"
-            app:keyLabel="×" />
-        <Key
-            app:code="247"
-            app:keyLabel="÷" />
-        <Key
-            app:code="8226"
-            app:keyLabel="•" />
-        <Key
-            app:code="176"
-            app:keyLabel="°" />
-        <Key
-            app:code="96"
-            app:keyLabel="`" />
-        <Key
-            app:code="180"
-            app:keyLabel="´" />
-        <Key
-            app:code="123"
-            app:keyLabel="{" />
-        <Key
-            app:code="125"
             app:keyEdgeFlags="right"
             app:keyLabel="}" />
     </Row>
     <Row>
         <Key
-            app:code="169"
             app:keyEdgeFlags="left"
             app:keyLabel="©" />
+        <Key app:keyLabel="£" />
+        <Key app:keyLabel="€" />
+        <Key app:keyLabel="^" />
+        <Key app:keyLabel="®" />
+        <Key app:keyLabel="¥" />
+        <Key app:keyLabel="_" />
+        <Key app:keyLabel="+" />
+        <Key app:keyLabel="[" />
         <Key
-            app:code="163"
-            app:keyLabel="£" />
-        <Key
-            app:code="8364"
-            app:keyLabel="€" />
-        <Key
-            app:code="94"
-            app:keyLabel="^" />
-        <Key
-            app:code="174"
-            app:keyLabel="®" />
-        <Key
-            app:code="165"
-            app:keyLabel="¥" />
-        <Key
-            app:code="95"
-            app:keyLabel="_" />
-        <Key
-            app:code="43"
-            app:keyLabel="+" />
-        <Key
-            app:code="91"
-            app:keyLabel="[" />
-        <Key
-            app:code="93"
             app:keyEdgeFlags="right"
             app:keyLabel="]" />
     </Row>
@@ -74,27 +38,13 @@
             app:keyEdgeFlags="left"
             app:keyLabel="\?123"
             app:keyWidth="15%p" />
-        <Key
-            app:code="161"
-            app:keyLabel="¡" />
-        <Key
-            app:code="60"
-            app:keyLabel="&lt;" />
-        <Key
-            app:code="62"
-            app:keyLabel="&gt;" />
-        <Key
-            app:code="162"
-            app:keyLabel="¢" />
-        <Key
-            app:code="124"
-            app:keyLabel="|" />
-        <Key
-            app:code="92"
-            app:keyLabel="\\" />
-        <Key
-            app:code="191"
-            app:keyLabel="¿" />
+        <Key app:keyLabel="¡" />
+        <Key app:keyLabel="&lt;" />
+        <Key app:keyLabel="&gt;" />
+        <Key app:keyLabel="¢" />
+        <Key app:keyLabel="|" />
+        <Key app:keyLabel="\\" />
+        <Key app:keyLabel="¿" />
         <Key
             app:code="-5"
             app:isRepeatable="true"
@@ -109,16 +59,13 @@
             app:keyLabel="abc"
             app:keyWidth="15%p" />
         <Key
-            app:code="44"
             app:keyLabel=","
             app:keyWidth="10%p" />
         <Key
             app:code="32"
             app:isRepeatable="true"
             app:keyWidth="45%p" />
-        <Key
-            app:code="46"
-            app:keyLabel="." />
+        <Key app:keyLabel="." />
         <Key
             app:code="-4"
             app:keyEdgeFlags="right"