diff --git a/java/res/values-cs/donottranslate-altchars.xml b/java/res/values-cs/donottranslate-altchars.xml
index f19ac00..8440d69 100644
--- a/java/res/values-cs/donottranslate-altchars.xml
+++ b/java/res/values-cs/donottranslate-altchars.xml
@@ -20,14 +20,14 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="alternates_for_a">á,à,â,ã,ä,å,æ</string>
     <string name="alternates_for_e">3,é,ě,è,ê,ë</string>
-    <string name="alternates_for_i">í,ì,î,ï,8</string>
-    <string name="alternates_for_o">ó,ò,ô,õ,ö,œ,ø,9</string>
-    <string name="alternates_for_u">ů,ú,ù,û,ü,7</string>
+    <string name="alternates_for_i">8,í,ì,î,ï</string>
+    <string name="alternates_for_o">9,ó,ò,ô,õ,ö,œ,ø</string>
+    <string name="alternates_for_u">7,ů,ú,ù,û,ü</string>
     <string name="alternates_for_s">š,§,ß</string>
     <string name="alternates_for_n">ň,ñ</string>
     <string name="alternates_for_c">č,ç</string>
     <string name="alternates_for_d">ď</string>
-    <string name="alternates_for_r">ř,4</string>
-    <string name="alternates_for_t">ť,5</string>
+    <string name="alternates_for_r">4,ř</string>
+    <string name="alternates_for_t">5,ť</string>
     <string name="alternates_for_z">ž</string>
 </resources>
diff --git a/java/res/values-da/donottranslate-altchars.xml b/java/res/values-da/donottranslate-altchars.xml
index ca1df7c..09c264e 100644
--- a/java/res/values-da/donottranslate-altchars.xml
+++ b/java/res/values-da/donottranslate-altchars.xml
@@ -20,16 +20,16 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="alternates_for_a">á,à,â,ą,ã</string>
     <string name="alternates_for_e">3,é,è,ê,ë,ę,€</string>
-    <string name="alternates_for_i">í,ì,î,ï,8</string>
-    <string name="alternates_for_o">ó,ò,ô,õ,9</string>
-    <string name="alternates_for_u">ú,ù,û,ū,7</string>
+    <string name="alternates_for_i">8,í,ì,î,ï</string>
+    <string name="alternates_for_o">9,ó,ò,ô,õ</string>
+    <string name="alternates_for_u">7,ú,ù,û,ū</string>
     <string name="alternates_for_s">ś,š,ş,ß</string>
     <string name="alternates_for_n">ń,ñ,ň</string>
     <string name="alternates_for_c">ç,ć,č</string>
-    <string name="alternates_for_y">ý,ÿ,ü,6</string>
+    <string name="alternates_for_y">6,ý,ÿ,ü</string>
     <string name="alternates_for_d">ð,ď</string>
-    <string name="alternates_for_r">ř,4</string>
-    <string name="alternates_for_t">ť,þ,5</string>
+    <string name="alternates_for_r">4,ř</string>
+    <string name="alternates_for_t">5,ť,þ</string>
     <string name="alternates_for_z">ź,ž,ż</string>
     <string name="alternates_for_l">ł</string>
     <string name="alternates_for_v">w</string>
diff --git a/java/res/values-de/donottranslate-altchars.xml b/java/res/values-de/donottranslate-altchars.xml
index 6c1abc6..141ad84 100644
--- a/java/res/values-de/donottranslate-altchars.xml
+++ b/java/res/values-de/donottranslate-altchars.xml
@@ -19,7 +19,7 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="alternates_for_a">ä</string>
-    <string name="alternates_for_o">ö,9</string>
+    <string name="alternates_for_o">9,ö</string>
     <string name="alternates_for_y">ý,ÿ</string>
     <string name="alternates_for_z">6</string>
 </resources>
diff --git a/java/res/values-en/donottranslate-altchars.xml b/java/res/values-en/donottranslate-altchars.xml
index baded88..a564a8c 100644
--- a/java/res/values-en/donottranslate-altchars.xml
+++ b/java/res/values-en/donottranslate-altchars.xml
@@ -20,7 +20,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="alternates_for_a">à,á,â,ã,ä,å,ā,æ</string>
     <string name="alternates_for_e">3,è,é,ê,ë,ē</string>
-    <string name="alternates_for_i">ì,í,î,ï,ī,8</string>
-    <string name="alternates_for_o">ò,ó,ô,õ,ö,ō,œ,ø,9</string>
-    <string name="alternates_for_u">ù,ú,û,ü,ū,7</string>
+    <string name="alternates_for_i">8,ì,í,î,ï,ī</string>
+    <string name="alternates_for_o">9,ò,ó,ô,õ,ö,ō,œ,ø</string>
+    <string name="alternates_for_u">7,ù,ú,û,ü,ū</string>
 </resources>
diff --git a/java/res/values-es/donottranslate-altchars.xml b/java/res/values-es/donottranslate-altchars.xml
index 35187d0..65d5c11 100644
--- a/java/res/values-es/donottranslate-altchars.xml
+++ b/java/res/values-es/donottranslate-altchars.xml
@@ -20,5 +20,5 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="alternates_for_a">á</string>
     <string name="alternates_for_e">3,é</string>
-    <string name="alternates_for_o">ó,9</string>
+    <string name="alternates_for_o">9,ó</string>
 </resources>
diff --git a/java/res/values-it/donottranslate-altchars.xml b/java/res/values-it/donottranslate-altchars.xml
index 0e4a285..1c3dc7e 100644
--- a/java/res/values-it/donottranslate-altchars.xml
+++ b/java/res/values-it/donottranslate-altchars.xml
@@ -20,6 +20,6 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="alternates_for_a">à,á</string>
     <string name="alternates_for_e">3,è,é</string>
-    <string name="alternates_for_o">ò,ó,9</string>
+    <string name="alternates_for_o">9,ò,ó</string>
     <string name="alternates_for_s">§</string>
 </resources>
diff --git a/java/res/values-nb/donottranslate-altchars.xml b/java/res/values-nb/donottranslate-altchars.xml
index c65dea9..91f8b21 100644
--- a/java/res/values-nb/donottranslate-altchars.xml
+++ b/java/res/values-nb/donottranslate-altchars.xml
@@ -20,15 +20,15 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="alternates_for_a">ä,á,à,â,ą,ã</string>
     <string name="alternates_for_e">3,é,è,ê,ë,ę,€</string>
-    <string name="alternates_for_i">í,ì,î,ï,8</string>
-    <string name="alternates_for_o">ö,ó,ò,ô,õ,9</string>
-    <string name="alternates_for_u">ü,ú,ù,û,ū,7</string>
+    <string name="alternates_for_i">8,í,ì,î,ï</string>
+    <string name="alternates_for_o">9,ö,ó,ò,ô,õ</string>
+    <string name="alternates_for_u">7,ü,ú,ù,û,ū</string>
     <string name="alternates_for_s">ś,š,ş,ß</string>
     <string name="alternates_for_n">ń,ñ,ň</string>
     <string name="alternates_for_c">ç,ć,č</string>
     <string name="alternates_for_d">ð,ď</string>
-    <string name="alternates_for_r">ř,4</string>
-    <string name="alternates_for_t">ť,þ,5</string>
+    <string name="alternates_for_r">4,ř</string>
+    <string name="alternates_for_t">5,ť,þ</string>
     <string name="alternates_for_z">ź,ž,ż</string>
     <string name="alternates_for_l">ł</string>
     <string name="alternates_for_v">w</string>
diff --git a/java/res/values-pl/donottranslate-altchars.xml b/java/res/values-pl/donottranslate-altchars.xml
index df8c52b..ac09902 100644
--- a/java/res/values-pl/donottranslate-altchars.xml
+++ b/java/res/values-pl/donottranslate-altchars.xml
@@ -19,8 +19,8 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="alternates_for_a">ą</string>
-    <string name="alternates_for_e">ę,3</string>
-    <string name="alternates_for_o">ó,9</string>
+    <string name="alternates_for_e">3,ę</string>
+    <string name="alternates_for_o">9,ó</string>
     <string name="alternates_for_s">ś</string>
     <string name="alternates_for_n">ń</string>
     <string name="alternates_for_c">ć</string>
diff --git a/java/res/values-rm/donottranslate-altchars.xml b/java/res/values-rm/donottranslate-altchars.xml
index b44c3c0..0a5d2aa 100644
--- a/java/res/values-rm/donottranslate-altchars.xml
+++ b/java/res/values-rm/donottranslate-altchars.xml
@@ -18,5 +18,5 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="alternates_for_o">ò,ó,ö,ô,õ,œ,ø,9</string>
+    <string name="alternates_for_o">9,ò,ó,ö,ô,õ,œ,ø</string>
 </resources>
diff --git a/java/res/values-ru/donottranslate-altchars.xml b/java/res/values-ru/donottranslate-altchars.xml
index c4f9d66..2da8b84 100644
--- a/java/res/values-ru/donottranslate-altchars.xml
+++ b/java/res/values-ru/donottranslate-altchars.xml
@@ -18,6 +18,6 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="alternates_for_cyrillic_e">ё5</string>
+    <string name="alternates_for_cyrillic_e">5,ё</string>
     <string name="alternates_for_cyrillic_soft_sign">ъ</string>
 </resources>
diff --git a/java/res/values-sv/donottranslate-altchars.xml b/java/res/values-sv/donottranslate-altchars.xml
index e156de8..46b3803 100644
--- a/java/res/values-sv/donottranslate-altchars.xml
+++ b/java/res/values-sv/donottranslate-altchars.xml
@@ -20,16 +20,16 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="alternates_for_a">á,à,â,ą,ã</string>
     <string name="alternates_for_e">3,é,è,ê,ë,ę,€</string>
-    <string name="alternates_for_i">í,ì,î,ï,8</string>
-    <string name="alternates_for_o">ó,ò,ô,õ,9</string>
-    <string name="alternates_for_u">ú,ù,û,ū,7</string>
+    <string name="alternates_for_i">8,í,ì,î,ï</string>
+    <string name="alternates_for_o">9,ó,ò,ô,õ</string>
+    <string name="alternates_for_u">7,ú,ù,û,ū</string>
     <string name="alternates_for_s">ś,š,ş,ß</string>
     <string name="alternates_for_n">ń,ñ,ň</string>
     <string name="alternates_for_c">ç,ć,č</string>
-    <string name="alternates_for_y">ý,ÿ,ü,6</string>
+    <string name="alternates_for_y">6,ý,ÿ,ü</string>
     <string name="alternates_for_d">ð,ď</string>
-    <string name="alternates_for_r">ř,4</string>
-    <string name="alternates_for_t">ť,þ,5</string>
+    <string name="alternates_for_r">4,ř</string>
+    <string name="alternates_for_t">5,ť,þ</string>
     <string name="alternates_for_z">ź,ž,ż</string>
     <string name="alternates_for_l">ł</string>
     <string name="alternates_for_v">w</string>
diff --git a/java/res/values-tr/donottranslate-altchars.xml b/java/res/values-tr/donottranslate-altchars.xml
index 5e98cc3..1378fa9 100644
--- a/java/res/values-tr/donottranslate-altchars.xml
+++ b/java/res/values-tr/donottranslate-altchars.xml
@@ -18,8 +18,8 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="alternates_for_o">ö,ò,ó,ô,õ,œ,ø,9</string>
-    <string name="alternates_for_u">ü,ù,ú,û,7</string>
+    <string name="alternates_for_o">9,ö,ò,ó,ô,õ,œ,ø</string>
+    <string name="alternates_for_u">7,ü,ù,ú,û</string>
     <string name="alternates_for_s">ş,§,ß</string>
     <string name="alternates_for_g">ğ</string>
 </resources>
diff --git a/java/res/values-xlarge/config.xml b/java/res/values-xlarge/config.xml
index 004b39b..40fdce0 100644
--- a/java/res/values-xlarge/config.xml
+++ b/java/res/values-xlarge/config.xml
@@ -33,10 +33,12 @@
     <!-- Whether or not Popup on key press is enabled by default -->
     <bool name="config_default_popup_preview">false</bool>
     <bool name="config_use_spacebar_language_switcher">false</bool>
+    <!-- Showing mini keyboard, just above the touched point if true, aligned to the key if false -->
+    <bool name="config_show_mini_keyboard_at_touched_point">true</bool>
     <!-- The language is never displayed if == 0, always displayed if < 0 -->
     <integer name="config_delay_before_fadeout_language_on_spacebar">1200</integer>
     <!-- This configuration is the index of the array {@link KeyboardSwitcher.KEYBOARD_THEMES}. -->
     <string name="config_default_keyboard_theme_id" translatable="false">5</string>
     <string name="config_text_size_of_language_on_spacebar" translatable="false">medium</string>
-    <integer name="config_max_popup_keyboard_column">9</integer>
+    <integer name="config_max_popup_keyboard_column">5</integer>
 </resources>
diff --git a/java/res/values/config.xml b/java/res/values/config.xml
index 6a1b27a..ceb4f12 100644
--- a/java/res/values/config.xml
+++ b/java/res/values/config.xml
@@ -40,6 +40,8 @@
     <bool name="config_default_quick_fixes">true</bool>
     <bool name="config_default_bigram_suggestions">true</bool>
     <bool name="config_use_spacebar_language_switcher">true</bool>
+    <!-- Showing mini keyboard, just above the touched point if true, aligned to the key if false -->
+    <bool name="config_show_mini_keyboard_at_touched_point">false</bool>
     <!-- The language is never displayed if == 0, always displayed if < 0 -->
     <integer name="config_delay_before_fadeout_language_on_spacebar">-1</integer>
     <integer name="config_duration_of_fadeout_language_on_spacebar">50</integer>
@@ -61,7 +63,7 @@
     <!-- This configuration is the index of the array {@link KeyboardSwitcher.KEYBOARD_THEMES}. -->
     <string name="config_default_keyboard_theme_id" translatable="false">4</string>
     <string name="config_text_size_of_language_on_spacebar" translatable="false">small</string>
-    <integer name="config_max_popup_keyboard_column">9</integer>
+    <integer name="config_max_popup_keyboard_column">10</integer>
     <!-- Whether or not auto-correction should be enabled by default -->
     <bool name="enable_autocorrect">true</bool>
     <string-array name="auto_correction_threshold_values" translatable="false">
diff --git a/java/res/values/donottranslate-altchars.xml b/java/res/values/donottranslate-altchars.xml
index 85e06f2..c5a369f 100644
--- a/java/res/values/donottranslate-altchars.xml
+++ b/java/res/values/donottranslate-altchars.xml
@@ -20,13 +20,13 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="alternates_for_a">à,á,â,ã,ä,å,æ</string>
     <string name="alternates_for_e">3,è,é,ê,ë</string>
-    <string name="alternates_for_i">ì,í,î,ï,8</string>
-    <string name="alternates_for_o">ò,ó,ô,õ,ö,œ,ø,9</string>
-    <string name="alternates_for_u">ù,ú,û,ü,7</string>
+    <string name="alternates_for_i">8,ì,í,î,ï</string>
+    <string name="alternates_for_o">9,ò,ó,ô,õ,ö,œ,ø</string>
+    <string name="alternates_for_u">7,ù,ú,û,ü</string>
     <string name="alternates_for_s">§,ß</string>
     <string name="alternates_for_n">ñ</string>
     <string name="alternates_for_c">ç</string>
-    <string name="alternates_for_y">ý,ÿ,6</string>
+    <string name="alternates_for_y">6,ý,ÿ</string>
     <string name="alternates_for_q">1</string>
     <string name="alternates_for_w">2</string>
     <string name="alternates_for_d"></string>