diff --git a/app/src/main/res/xml/keys_letters_danish.xml b/app/src/main/res/xml/keys_letters_danish.xml
index f421e68..f0639a5 100644
--- a/app/src/main/res/xml/keys_letters_danish.xml
+++ b/app/src/main/res/xml/keys_letters_danish.xml
@@ -81,13 +81,13 @@
         <Key
             app:keyLabel="i"
             app:keyWidth="9.05%p"
-            app:popupCharacters="íìî8ïī"
+            app:popupCharacters="íì8îïī"
             app:popupKeyboard="@xml/keyboard_popup_template"
             app:topSmallNumber="8" />
         <Key
             app:keyLabel="o"
             app:keyWidth="9.05%p"
-            app:popupCharacters="őöøóôòõ9ō"
+            app:popupCharacters="őöøóôò9õō"
             app:popupKeyboard="@xml/keyboard_popup_template"
             app:topSmallNumber="9" />
         <Key
@@ -142,13 +142,13 @@
             app:keyLabel="æ"
             app:keyWidth="9.05%p"
             app:popupCharacters="ä"
-            app:popupKeyboard="@xml/keyboard_popup_template"/>
+            app:popupKeyboard="@xml/keyboard_popup_template" />
         <Key
             app:keyEdgeFlags="right"
             app:keyLabel="ø"
             app:keyWidth="9.05%p"
             app:popupCharacters="ö"
-            app:popupKeyboard="@xml/keyboard_popup_template"/>
+            app:popupKeyboard="@xml/keyboard_popup_template" />
 
     </Row>
     <Row>
diff --git a/app/src/main/res/xml/keys_letters_lithuanian.xml b/app/src/main/res/xml/keys_letters_lithuanian.xml
index 6ac6345..f27a032 100644
--- a/app/src/main/res/xml/keys_letters_lithuanian.xml
+++ b/app/src/main/res/xml/keys_letters_lithuanian.xml
@@ -73,7 +73,7 @@
             app:topSmallNumber="7" />
         <Key
             app:keyLabel="i"
-            app:popupCharacters="íìî8įïī"
+            app:popupCharacters="íìîį8ïī"
             app:popupKeyboard="@xml/keyboard_popup_template"
             app:topSmallNumber="8" />
         <Key
@@ -159,17 +159,17 @@
             app:code="-6"
             app:keyEdgeFlags="left"
             app:keyIcon="@drawable/ic_emoji_emotions_outline_vector"
-            app:secondaryKeyIcon="@drawable/ic_language_outlined"
-            app:keyWidth="10%p" />
+            app:keyWidth="10%p"
+            app:secondaryKeyIcon="@drawable/ic_language_outlined" />
         <Key
             app:code="32"
             app:isRepeatable="true"
             app:keyWidth="40%p" />
         <Key
             app:keyLabel="."
+            app:keyWidth="10%p"
             app:popupCharacters=",?!;:…"
-            app:popupKeyboard="@xml/keyboard_popup_template"
-            app:keyWidth="10%p" />
+            app:popupKeyboard="@xml/keyboard_popup_template" />
         <Key
             app:code="-4"
             app:keyEdgeFlags="right"
diff --git a/app/src/main/res/xml/keys_letters_norwegian.xml b/app/src/main/res/xml/keys_letters_norwegian.xml
index 8db27c8..920f3b1 100644
--- a/app/src/main/res/xml/keys_letters_norwegian.xml
+++ b/app/src/main/res/xml/keys_letters_norwegian.xml
@@ -81,13 +81,13 @@
         <Key
             app:keyLabel="i"
             app:keyWidth="9.05%p"
-            app:popupCharacters="íìî8ïī"
+            app:popupCharacters="íì8îïī"
             app:popupKeyboard="@xml/keyboard_popup_template"
             app:topSmallNumber="8" />
         <Key
             app:keyLabel="o"
             app:keyWidth="9.05%p"
-            app:popupCharacters="őöøóôòõ9ō"
+            app:popupCharacters="őöøóôò9õō"
             app:popupKeyboard="@xml/keyboard_popup_template"
             app:topSmallNumber="9" />
         <Key
@@ -142,13 +142,13 @@
             app:keyLabel="ø"
             app:keyWidth="9.05%p"
             app:popupCharacters="ö"
-            app:popupKeyboard="@xml/keyboard_popup_template"/>
+            app:popupKeyboard="@xml/keyboard_popup_template" />
         <Key
             app:keyEdgeFlags="right"
             app:keyLabel="æ"
             app:keyWidth="9.05%p"
             app:popupCharacters="ä"
-            app:popupKeyboard="@xml/keyboard_popup_template"/>
+            app:popupKeyboard="@xml/keyboard_popup_template" />
 
     </Row>
     <Row>
diff --git a/app/src/main/res/xml/keys_letters_swedish.xml b/app/src/main/res/xml/keys_letters_swedish.xml
index 7c6f246..8b2c74c 100644
--- a/app/src/main/res/xml/keys_letters_swedish.xml
+++ b/app/src/main/res/xml/keys_letters_swedish.xml
@@ -81,13 +81,13 @@
         <Key
             app:keyLabel="i"
             app:keyWidth="9.05%p"
-            app:popupCharacters="íìî8ïī"
+            app:popupCharacters="íì8îïī"
             app:popupKeyboard="@xml/keyboard_popup_template"
             app:topSmallNumber="8" />
         <Key
             app:keyLabel="o"
             app:keyWidth="9.05%p"
-            app:popupCharacters="őöøóôòõ9ō"
+            app:popupCharacters="őöøóôò9õō"
             app:popupKeyboard="@xml/keyboard_popup_template"
             app:topSmallNumber="9" />
         <Key
@@ -142,13 +142,13 @@
             app:keyLabel="ö"
             app:keyWidth="9.05%p"
             app:popupCharacters="Ͽ"
-            app:popupKeyboard="@xml/keyboard_popup_template"/>
+            app:popupKeyboard="@xml/keyboard_popup_template" />
         <Key
             app:keyEdgeFlags="right"
             app:keyLabel="ä"
             app:keyWidth="9.05%p"
             app:popupCharacters="æ"
-            app:popupKeyboard="@xml/keyboard_popup_template"/>
+            app:popupKeyboard="@xml/keyboard_popup_template" />
     </Row>
     <Row>
         <Key
diff --git a/app/src/main/res/xml/keys_letters_turkish_q.xml b/app/src/main/res/xml/keys_letters_turkish_q.xml
index 64ec35d..4c801fa 100644
--- a/app/src/main/res/xml/keys_letters_turkish_q.xml
+++ b/app/src/main/res/xml/keys_letters_turkish_q.xml
@@ -73,12 +73,12 @@
             app:topSmallNumber="7" />
         <Key
             app:keyLabel="ı"
-            app:popupCharacters="íìî8ïī"
+            app:popupCharacters="íì8îïī"
             app:popupKeyboard="@xml/keyboard_popup_template"
             app:topSmallNumber="8" />
         <Key
             app:keyLabel="o"
-            app:popupCharacters="őöóôòõ9ō"
+            app:popupCharacters="őöóô9òõō"
             app:popupKeyboard="@xml/keyboard_popup_template"
             app:topSmallNumber="9" />
         <Key
@@ -167,17 +167,17 @@
             app:code="-6"
             app:keyEdgeFlags="left"
             app:keyIcon="@drawable/ic_emoji_emotions_outline_vector"
-            app:secondaryKeyIcon="@drawable/ic_language_outlined"
-            app:keyWidth="10%p" />
+            app:keyWidth="10%p"
+            app:secondaryKeyIcon="@drawable/ic_language_outlined" />
         <Key
             app:code="32"
             app:isRepeatable="true"
             app:keyWidth="40%p" />
         <Key
             app:keyLabel="."
+            app:keyWidth="10%p"
             app:popupCharacters=",?!;:…"
-            app:popupKeyboard="@xml/keyboard_popup_template"
-            app:keyWidth="10%p" />
+            app:popupKeyboard="@xml/keyboard_popup_template" />
         <Key
             app:code="-4"
             app:keyEdgeFlags="right"