From 601470747e88ff1fce8c31a74e093909072c5852 Mon Sep 17 00:00:00 2001
From: Aleksandras Kostarevas <aleks076@protonmail.com>
Date: Thu, 19 Sep 2024 09:49:08 +0300
Subject: [PATCH] Port Devanagari layouts

---
 java/assets/layouts/Arabic/kurdish.yaml       |  107 +
 java/assets/layouts/Devanagari/hindi.yaml     |   37 +
 .../layouts/Devanagari/hindi_compact.yaml     |   41 +
 java/assets/layouts/Devanagari/marathi.yaml   |  146 +
 .../layouts/Devanagari/nepali_romanized.yaml  |  128 +
 .../Devanagari/nepali_traditional.yaml        |  166 ++
 .../keyboard/internal/KeyboardTextsTable.java | 2449 ++++++++---------
 .../latin/settings/LongPressKeySettings.kt    |   23 +-
 .../v2keyboard/KeyboardLayoutSet.kt           |    2 +-
 .../inputmethod/v2keyboard/MoreKeysBuilder.kt |    4 +-
 tools/make-keyboard-text-py/locales/hi.json   |   28 +-
 tools/make-keyboard-text-py/locales/ne.json   |   28 +-
 12 files changed, 1859 insertions(+), 1300 deletions(-)
 create mode 100644 java/assets/layouts/Arabic/kurdish.yaml
 create mode 100644 java/assets/layouts/Devanagari/hindi.yaml
 create mode 100644 java/assets/layouts/Devanagari/hindi_compact.yaml
 create mode 100644 java/assets/layouts/Devanagari/marathi.yaml
 create mode 100644 java/assets/layouts/Devanagari/nepali_romanized.yaml
 create mode 100644 java/assets/layouts/Devanagari/nepali_traditional.yaml

diff --git a/java/assets/layouts/Arabic/kurdish.yaml b/java/assets/layouts/Arabic/kurdish.yaml
new file mode 100644
index 000000000..13bd457ce
--- /dev/null
+++ b/java/assets/layouts/Arabic/kurdish.yaml
@@ -0,0 +1,107 @@
+name: Kurdish
+languages: ckb
+rows:
+  - letters: # rowkeys_kurdish1.xml
+    # U+0642: ق ARABIC LETTER QAF
+    - {type: case, normal: ["\u0642", "`"], shifted: ["`", "\u0642"]}
+
+    # U+0648: و ARABIC LETTER WAW
+    - {type: case, normal: ["\u0648", "\u0648\u0648"], shifted: ["\u0648\u0648", "\u0648"]}
+
+    # U+06D5: ە ARABIC LETTER AE
+    # U+064A: ي ARABIC LETTER YEH
+    - {type: case, normal: ["\u06d5", "\u064a"], shifted: ["\u064a", "\u06d5"]}
+
+    # U+0631: ر ARABIC LETTER REH
+    # U+0695: ڕ ARABIC LETTER REH WITH SMALL V BELOW
+    - {type: case, normal: ["\u0631", "\u0695"], shifted: ["\u0695", "\u0631"]}
+
+    # U+062A: ت ARABIC LETTER TEH
+    # U+0637: ط ARABIC LETTER TAH
+    - {type: case, normal: ["\u062a", "\u0637"], shifted: ["\u0637", "\u062a"]}
+
+    # U+06CC: ی ARABIC LETTER FARSI YEH
+    # U+06CE: ێ ARABIC LETTER YEH WITH SMALL V
+    - {type: case, normal: ["\u06cc", "\u06ce"], shifted: ["\u06ce", "\u06cc"]}
+
+    # U+0626: ئ ARABIC LETTER YEH WITH HAMZA ABOVE
+    # U+0621: ء ARABIC LETTER HAMZA
+    - {type: case, normal: ["\u0626", "\u0621"], shifted: ["\u0621", "\u0626"]}
+
+    # U+062D: ح ARABIC LETTER HAH
+    # U+0639: ع ARABIC LETTER AIN
+    - {type: case, normal: ["\u062d", "\u0639"], shifted: ["\u0639", "\u062d"]}
+
+    # U+06C6: ۆ ARABIC LETTER OE
+    # U+0624: ؤ ARABIC LETTER WAW WITH HAMZA ABOVE
+    - {type: case, normal: ["\u06c6", "\u0624"], shifted: ["\u0624", "\u06c6"]}
+
+    # U+067E: پ ARABIC LETTER PEH
+    # U+062B: ث ARABIC LETTER THEH
+    - {type: case, normal: ["\u067e", "\u062b"], shifted: ["\u062b", "\u067e"]}
+
+  - letters: # rowkeys_kurdish2.xml
+    # U+0627: ا ARABIC LETTER ALEF
+    # U+0622: آ ARABIC LETTER ALEF WITH MADDA ABOVE
+    - {type: case, normal: ["\u0627", "\u0622"], shifted: ["\u0622", "\u0627"]}
+
+    # U+0633: س ARABIC LETTER SEEN
+    # U+0634: ش ARABIC LETTER SHEEN
+    - {type: case, normal: ["\u0633", "\u0634"], shifted: ["\u0634", "\u0633"]}
+
+    # U+062F: د ARABIC LETTER DAL
+    # U+0630: ذ ARABIC LETTER THAL
+    - {type: case, normal: ["\u062f", "\u0630"], shifted: ["\u0630", "\u062f"]}
+
+    # U+0641: ف ARABIC LETTER FEH
+    # U+0625: إ ARABIC LETTER ALEF WITH HAMZA BELOW
+    - {type: case, normal: ["\u0641", "\u0625"], shifted: ["\u0625", "\u0641"]}
+
+    # U+06AF: گ ARABIC LETTER GAF
+    # U+063A: غ ARABIC LETTER GHAIN
+    - {type: case, normal: ["\u06af", "\u063a"], shifted: ["\u063a", "\u06af"]}
+
+    # U+0647: ه ARABIC LETTER HEH
+    # U+200C: ‌ ZERO WIDTH NON-JOINER
+    - {type: case, normal: ["\u0647", "!icon/zwnj_key|\u200c"], shifted: ["!icon/zwnj_key|\u200c", "\u0647"]}
+
+    # U+0698: ژ ARABIC LETTER JEH
+    # U+0623: أ ARABIC LETTER ALEF WITH HAMZA ABOVE
+    - {type: case, normal: ["\u0698", "\u0623"], shifted: ["\u0623", "\u0698"]}
+
+    # U+06A9: ک ARABIC LETTER KEHEH
+    # U+0643: ك ARABIC LETTER KAF
+    - {type: case, normal: ["\u06a9", "\u0643"], shifted: ["\u0643", "\u06a9"]}
+
+    # U+0644: ل ARABIC LETTER LAM
+    # U+06B5: ڵ ARABIC LETTER LAM WITH SMALL V
+    - {type: case, normal: ["\u0644", "\u06b5"], shifted: ["\u06b5", "\u0644"]}
+
+  - letters: # rowkeys_kurdish3.xml
+    # U+0632: ز ARABIC LETTER ZAIN
+    # U+0636: ض ARABIC LETTER DAD
+    - {type: case, normal: ["\u0632", "\u0636"], shifted: ["\u0636", "\u0632"]}
+
+    # U+062E: خ ARABIC LETTER KHAH
+    # U+0635: ص ARABIC LETTER SAD
+    - {type: case, normal: ["\u062e", "\u0635"], shifted: ["\u0635", "\u062e"]}
+
+    # U+062C: ج ARABIC LETTER JEEM
+    # U+0686: چ ARABIC LETTER TCHEH
+    - {type: case, normal: ["\u062c", "\u0686"], shifted: ["\u0686", "\u062c"]}
+
+    # U+06A4: ڤ ARABIC LETTER VEH
+    # U+0638: ظ ARABIC LETTER ZAH
+    - {type: case, normal: ["\u06a4", "\u0638"], shifted: ["\u0638", "\u06a4"]}
+
+    # U+0628: ب ARABIC LETTER BEH
+    # U+0649: ى ARABIC LETTER ALEF MAKSURA
+    - {type: case, normal: ["\u0628", "\u0649"], shifted: ["\u0649", "\u0628"]}
+
+    # U+0646: ن ARABIC LETTER NOON
+    # U+0648: و ARABIC LETTER WAW
+    - {type: case, normal: ["\u0646", "\u0648"], shifted: ["\u0648", "\u0646"]}
+
+    # U+0645: م ARABIC LETTER MEEM
+    # U+0640: ـ ARABIC TATWEEL
+    - {type: case, normal: ["\u0645", "\u0640"], shifted: ["\u0640", "\u0645"]}
\ No newline at end of file
diff --git a/java/assets/layouts/Devanagari/hindi.yaml b/java/assets/layouts/Devanagari/hindi.yaml
new file mode 100644
index 000000000..a6a0ef4a8
--- /dev/null
+++ b/java/assets/layouts/Devanagari/hindi.yaml
@@ -0,0 +1,37 @@
+name: Hindi
+languages: hi
+rows:
+  - letters: # rowkeys_hindi1.xml
+      - {type: case, normal: ['ौ', 'ौं'], shifted: ['औ', 'ऒं']}
+      - {type: case, normal: ['ै', 'ैं'], shifted: ['ऐ', 'ऐं']}
+      - {type: case, normal: ['ा', 'ां', 'ाँ'], shifted: ['आ', 'आं', 'आँ']}
+      - {type: case, normal: ['ी', 'ीं'], shifted: ['ई', 'ईं']}
+      - {type: case, normal: ['ू', 'ूं', 'ूँ'], shifted: ['ऊ', 'ऊं', 'ऊँ']}
+      - {type: case, normal: ['ब', 'ब॒'], shifted: ['भ']}
+      - {type: case, normal: ['ह'], shifted: ['ः']}
+      - {type: case, normal: ['ग', 'ज्ञ', 'ग़', 'ग॒'], shifted: ['घ']}
+      - {type: case, normal: ['द'], shifted: ['ध', 'क्ष', 'श्र']}
+      - {type: case, normal: ['ज', 'ज॒', 'ज्ञ', 'ज़'], shifted: ['झ']}
+      - {type: case, normal: ['ड', 'ड॒', 'ड़'], shifted: ['ढ']}
+  - letters: # rowkeys_hindi2.xml
+      - {type: case, normal: ['ो', 'ों', 'ॉ', 'ॊ'], shifted: ['ओ', 'ओं', 'ऑ', 'ऒ']}
+      - {type: case, normal: ['े', 'ें'], shifted: ['ए', 'एं', 'एँ', 'ऍ', 'ऎ']}
+      - {type: case, normal: ['्'], shifted: ['अ', 'अं', 'अँ']}
+      - {type: case, normal: ['ि', 'िं'], shifted: ['इ', 'इं', 'इँ']}
+      - {type: case, normal: ['ु', 'ुं', 'ुँ'], shifted: ['उ', 'उं', 'उँ']}
+      - {type: case, normal: ['प'], shifted: ['फ', 'फ़']}
+      - {type: case, normal: ['र', 'ऋ', 'ऱ', 'ॠ'], shifted: ['ऱ', '्र', 'र्']}
+      - {type: case, normal: ['क', 'क़'], shifted: ['ख', 'ख़']}
+      - {type: case, normal: ['त', 'त्र'], shifted: ['थ']}
+      - {type: case, normal: ['च'], shifted: ['छ']}
+      - {type: case, normal: ['ट'], shifted: ['ठ']}
+  - letters: # rowkeys_hindi3.xml
+      - {type: case, normal: ['ॉ'], shifted: ['ऑ']}
+      - {type: case, normal: ['ं'], shifted: ['ँ', 'ॅ']}
+      - {type: case, normal: ['म', 'ॐ'], shifted: ['ण']}
+      - {type: case, normal: ['न', 'ञ', 'ङ', 'ऩ'], shifted: ['ऩ']}
+      - {type: case, normal: ['व'], shifted: ['ळ', 'ऴ']}
+      - {type: case, normal: ['ल', 'ऌ', 'ॡ'], shifted: ['श']}
+      - {type: case, normal: ['स'], shifted: ['ष']}
+      - {type: case, normal: ['य', 'य़'], shifted: ['ृ', 'ॄ']}
+      - {type: case, normal: ['़', 'ॽ', '॰', 'ऽ'], shifted: ['ञ']}
\ No newline at end of file
diff --git a/java/assets/layouts/Devanagari/hindi_compact.yaml b/java/assets/layouts/Devanagari/hindi_compact.yaml
new file mode 100644
index 000000000..844b4b726
--- /dev/null
+++ b/java/assets/layouts/Devanagari/hindi_compact.yaml
@@ -0,0 +1,41 @@
+name: Hindi Compact
+languages: hi
+useZWNJKey: true
+rows:
+  - letters: # rowkeys_hindi_compact1.xml
+    - ['औ', 'ौ']
+    - ['ऐ', 'ै']
+    - ['आ', 'ा']
+    - ['ई', 'ी']
+    - ['ऊ', 'ू']
+    - ['ब', 'भ']
+    - ['ह']
+    - ['ग', 'घ']
+    - ['द', 'ध']
+    - ['ज', 'झ', 'ज्ञ']
+    - ['ड', 'ढ']
+  - letters: # rowkeys_hindi_compact2.xml
+    - ['ओ', 'ो']
+    - ['ए', 'े']
+    - ['अ', '्']
+    - ['इ', 'ि']
+    - ['उ', 'ु']
+    - ['प', 'फ']
+    - ['र', 'ऋ', 'ृ']
+    - ['क', 'ख']
+    - ['त', 'थ', 'त्र']
+    - ['च', 'छ']
+    - ['ट', 'ठ']
+  - letters: # rowkeys_hindi_compact3.xml
+    - ['ऑ', 'ॉ']
+    - ['्', 'ॅ', 'ऍ']
+    - ['ं', 'ः', 'ँ', '़']
+    - ['म', 'ॐ']
+    - ['न', 'ण', 'ञ', 'ङ']
+    - ['व']
+    - ['ल']
+    - ['स', 'श', 'ष', 'श्र']
+    - ['य']
+    - ['क्ष']
+    - $delete
+# detected 3 rows
\ No newline at end of file
diff --git a/java/assets/layouts/Devanagari/marathi.yaml b/java/assets/layouts/Devanagari/marathi.yaml
new file mode 100644
index 000000000..db9e0ece3
--- /dev/null
+++ b/java/assets/layouts/Devanagari/marathi.yaml
@@ -0,0 +1,146 @@
+name: Marathi
+languages: mr-IN
+rows:
+  - letters: # rowkeys_marathi1.xml
+    # U+094C: ौ DEVANAGARI VOWEL SIGN AU
+    # U+0914: औ DEVANAGARI LETTER AU
+    - ["\u094c", "\u0914"]
+
+    # U+0948: ै DEVANAGARI VOWEL SIGN AI
+    # U+0910: ऐ DEVANAGARI LETTER AI
+    - ["\u0948", "\u0910"]
+
+    # U+093E: ा DEVANAGARI VOWEL SIGN AA
+    # U+0906: आ DEVANAGARI LETTER AA
+    - ["\u093e", "\u0906"]
+
+    # U+0940: ी DEVANAGARI VOWEL SIGN II
+    # U+0908: ई DEVANAGARI LETTER II
+    - ["\u0940", "\u0908"]
+
+    # U+0942: ू DEVANAGARI VOWEL SIGN UU
+    # U+090A: ऊ DEVANAGARI LETTER UU
+    - ["\u0942", "\u090a"]
+
+    # U+092C: ब DEVANAGARI LETTER BA
+    # U+092D: भ DEVANAGARI LETTER BHA
+    - ["\u092c", "\u092d"]
+
+    # U+0939: ह DEVANAGARI LETTER HA
+    - ["\u0939"]
+
+    # U+0917: ग DEVANAGARI LETTER GA
+    # U+0918: घ DEVANAGARI LETTER GHA
+    - ["\u0917", "\u0918"]
+
+    # U+0926: द DEVANAGARI LETTER DA
+    # U+0927: ध DEVANAGARI LETTER DHA
+    - ["\u0926", "\u0927"]
+
+    # U+091C: ज DEVANAGARI LETTER JA
+    # U+091D: झ DEVANAGARI LETTER JHA
+    # U+094D: ् DEVANAGARI SIGN VIRAMA
+    # U+091E: ञ DEVANAGARI LETTER NYA
+    - ["\u091c", "\u091d", "\u091c\u094d\u091e"]
+
+    # U+0921: ड DEVANAGARI LETTER DDA
+    # U+0922: ढ DEVANAGARI LETTER DDHA
+    - ["\u0921", "\u0922"]
+
+  - letters: # rowkeys_marathi2.xml
+    # U+094B: ो DEVANAGARI VOWEL SIGN O
+    # U+0913: ओ DEVANAGARI LETTER O
+    - ["\u094b", "\u0913"]
+
+    # U+0947: े DEVANAGARI VOWEL SIGN E
+    # U+090F: ए DEVANAGARI LETTER E
+    - ["\u0947", "\u090f"]
+
+    # U+094D: ् DEVANAGARI SIGN VIRAMA
+    # U+0905: अ DEVANAGARI LETTER A
+    - ["\u094d", "\u0905"]
+
+    # U+093F: ि DEVANAGARI VOWEL SIGN I
+    # U+0907: इ DEVANAGARI LETTER I
+    - ["\u093f", "\u0907"]
+
+    # U+0941: ु DEVANAGARI VOWEL SIGN U
+    # U+0909: उ DEVANAGARI LETTER U
+    - ["\u0941", "\u0909"]
+
+    # U+092A: प DEVANAGARI LETTER PA
+    # U+092B: फ DEVANAGARI LETTER PHA
+    - ["\u092a", "\u092b"]
+
+    # U+0930: र DEVANAGARI LETTER RA
+    # U+0931: ऱ DEVANAGARI LETTER RRA
+    # U+090B: ऋ DEVANAGARI LETTER VOCALIC R
+    # U+0943: ृ DEVANAGARI VOWEL SIGN VOCALIC R
+    - ["\u0930", "\u0931", "\u090b", "\u0943"]
+
+    # U+0915: क DEVANAGARI LETTER KA
+    # U+0916: ख DEVANAGARI LETTER KHA
+    - ["\u0915", "\u0916"]
+
+    # U+0924: त DEVANAGARI LETTER TA
+    # U+0925: थ DEVANAGARI LETTER THA
+    # U+094D: ् DEVANAGARI SIGN VIRAMA
+    # U+0930: र DEVANAGARI LETTER RA
+    - ["\u0924", "\u0925", "\u0924\u094d\u0930"]
+
+    # U+091A: च DEVANAGARI LETTER CA
+    # U+091B: छ DEVANAGARI LETTER CHA
+    - ["\u091a", "\u091b"]
+
+    # U+091F: ट DEVANAGARI LETTER TTA
+    # U+0920: ठ DEVANAGARI LETTER TTHA
+    - ["\u091f", "\u0920"]
+
+  - letters: # rowkeys_marathi3.xml
+    # U+0949: ॉ DEVANAGARI VOWEL SIGN CANDRA O
+    # U+0911: ऑ DEVANAGARI LETTER CANDRA O
+    - ["\u0949", "\u0911"]
+
+    # U+0945: ॅ DEVANAGARI VOWEL SIGN CANDRA E
+    # U+090D: ऍ DEVANAGARI LETTER CANDRA E
+    - ["\u0945", "\u090d"]
+
+    # U+0902: ं DEVANAGARI SIGN ANUSVARA
+    # U+0903: ः DEVANAGARI SIGN VISARGA
+    # U+0901: ँ DEVANAGARI SIGN CANDRABINDU
+    - ["\u0902", "\u0903", "\u0901"]
+
+    # U+092E: म DEVANAGARI LETTER MA
+    - ["\u092e"]
+
+    # U+0928: न DEVANAGARI LETTER NA
+    # U+0923: ण DEVANAGARI LETTER NNA
+    # U+091E: ञ DEVANAGARI LETTER NYA
+    # U+0919: ङ DEVANAGARI LETTER NGA
+    - ["\u0928", "\u0923", "\u091e", "\u0919"]
+
+    # U+0935: व DEVANAGARI LETTER VA
+    - ["\u0935"]
+
+    # U+0932: ल DEVANAGARI LETTER LA
+    # U+0933: ळ DEVANAGARI LETTER LLA
+    - ["\u0932", "\u0933"]
+
+    # U+0938: स DEVANAGARI LETTER SA
+    # U+0936: श DEVANAGARI LETTER SHA
+    # U+0937: ष DEVANAGARI LETTER SSA
+    # U+094D: ् DEVANAGARI SIGN VIRAMA
+    # U+0930: र DEVANAGARI LETTER RA
+    - ["\u0938", "\u0936", "\u0937", "\u0936\u094d\u0930"]
+
+    # U+092F: य DEVANAGARI LETTER YA
+    - ["\u092f"]
+
+    # U+0915: क DEVANAGARI LETTER KA
+    # U+094D: ् DEVANAGARI SIGN VIRAMA
+    # U+0937: ष DEVANAGARI LETTER SSA
+    - ["\u0915\u094d\u0937"]
+
+    - $delete
+
+# detected 3 rows
\ No newline at end of file
diff --git a/java/assets/layouts/Devanagari/nepali_romanized.yaml b/java/assets/layouts/Devanagari/nepali_romanized.yaml
new file mode 100644
index 000000000..4bf85c7f5
--- /dev/null
+++ b/java/assets/layouts/Devanagari/nepali_romanized.yaml
@@ -0,0 +1,128 @@
+name: Nepali (Romanized)
+languages: ne-NP
+useZWNJKey: true
+rows:
+  - letters: # rowkeys_nepali_romanized1.xml
+    # U+091F: ट DEVANAGARI LETTER TTA
+    # U+093C: ़ DEVANAGARI SIGN NUKTA
+    # U+0920: ठ DEVANAGARI LETTER TTHA
+    - {type: case, normal: ["\u091f", "%", "\u093c"], shifted: ["\u0920"]}
+
+    # U+094C: ौ DEVANAGARI VOWEL SIGN AU
+    # U+0914: औ DEVANAGARI LETTER AU
+    - {type: case, normal: ["\u094c"], shifted: ["\u0914"]}
+
+    # U+0947: े DEVANAGARI VOWEL SIGN E
+    # U+0948: ै DEVANAGARI VOWEL SIGN AI
+    - {type: case, normal: ["\u0947"], shifted: ["\u0948"]}
+
+    # U+0930: र DEVANAGARI LETTER RA
+    # U+0943: ृ DEVANAGARI VOWEL SIGN VOCALIC R
+    - {type: case, normal: ["\u0930"], shifted: ["\u0943"]}
+
+    # U+0924: त DEVANAGARI LETTER TA
+    # U+0925: थ DEVANAGARI LETTER THA
+    - {type: case, normal: ["\u0924"], shifted: ["\u0925"]}
+
+    # U+092F: य DEVANAGARI LETTER YA
+    # U+091E: ञ DEVANAGARI LETTER NYA
+    - {type: case, normal: ["\u092f"], shifted: ["\u091e"]}
+
+    # U+0941: ु DEVANAGARI VOWEL SIGN U
+    # U+0942: ू DEVANAGARI VOWEL SIGN UU
+    - {type: case, normal: ["\u0941"], shifted: ["\u0942"]}
+
+    # U+093F: ि DEVANAGARI VOWEL SIGN I
+    # U+0940: ी DEVANAGARI VOWEL SIGN II
+    - {type: case, normal: ["\u093f"], shifted: ["\u0940"]}
+
+    # U+094B: ो DEVANAGARI VOWEL SIGN O
+    # U+0913: ओ DEVANAGARI LETTER O
+    - {type: case, normal: ["\u094b"], shifted: ["\u0913"]}
+
+    # U+092A: प DEVANAGARI LETTER PA
+    # U+092B: फ DEVANAGARI LETTER PHA
+    - {type: case, normal: ["\u092a"], shifted: ["\u092b"]}
+
+    # U+0907: इ DEVANAGARI LETTER I
+    # U+0908: ई DEVANAGARI LETTER II
+    - {type: case, normal: ["\u0907"], shifted: ["\u0908"]}
+
+  - letters: # rowkeys_nepali_romanized2.xml
+    # U+093E: ा DEVANAGARI VOWEL SIGN AA
+    # U+0906: आ DEVANAGARI LETTER AA
+    - {type: case, normal: ["\u093e"], shifted: ["\u0906"]}
+
+    # U+0938: स DEVANAGARI LETTER SA
+    # U+0936: श DEVANAGARI LETTER SHA
+    - {type: case, normal: ["\u0938"], shifted: ["\u0936"]}
+
+    # U+0926: द DEVANAGARI LETTER DA
+    # U+0927: ध DEVANAGARI LETTER DHA
+    - {type: case, normal: ["\u0926"], shifted: ["\u0927"]}
+
+    # U+0909: उ DEVANAGARI LETTER U
+    # U+090A: ऊ DEVANAGARI LETTER UU
+    - {type: case, normal: ["\u0909"], shifted: ["\u090a"]}
+
+    # U+0917: ग DEVANAGARI LETTER GA
+    # U+0918: घ DEVANAGARI LETTER GHA
+    - {type: case, normal: ["\u0917"], shifted: ["\u0918"]}
+
+    # U+0939: ह DEVANAGARI LETTER HA
+    # U+0905: अ DEVANAGARI LETTER A
+    - {type: case, normal: ["\u0939"], shifted: ["\u0905"]}
+
+    # U+091C: ज DEVANAGARI LETTER JA
+    # U+091D: झ DEVANAGARI LETTER JHA
+    - {type: case, normal: ["\u091c"], shifted: ["\u091d"]}
+
+    # U+0915: क DEVANAGARI LETTER KA
+    # U+0916: ख DEVANAGARI LETTER KHA
+    - {type: case, normal: ["\u0915"], shifted: ["\u0916"]}
+
+    # U+0932: ल DEVANAGARI LETTER LA
+    # U+0965: ॥ DEVANAGARI DOUBLE DANDA
+    - {type: case, normal: ["\u0932"], shifted: ["\u0965"]}
+
+    # U+090F: ए DEVANAGARI LETTER E
+    # U+0910: ऐ DEVANAGARI LETTER AI
+    - {type: case, normal: ["\u090f"], shifted: ["\u0910"]}
+
+    # U+0950: ॐ DEVANAGARI OM
+    # U+0903: ः DEVANAGARI SIGN VISARGA
+    - {type: case, normal: ["\u0950"], shifted: ["\u0903"]}
+
+  - letters: # rowkeys_nepali_romanized3.xml
+    # U+0937: ष DEVANAGARI LETTER SSA
+    # U+090B: ऋ DEVANAGARI LETTER VOCALIC R
+    - {type: case, normal: ["\u0937"], shifted: ["\u090b"]}
+
+    # U+0921: ड DEVANAGARI LETTER DDA
+    # U+0922: ढ DEVANAGARI LETTER DDHA
+    - {type: case, normal: ["\u0921"], shifted: ["\u0922"]}
+
+    # U+091A: च DEVANAGARI LETTER CA
+    # U+091B: छ DEVANAGARI LETTER CHA
+    - {type: case, normal: ["\u091a"], shifted: ["\u091b"]}
+
+    # U+0935: व DEVANAGARI LETTER VA
+    # U+0901: ँ DEVANAGARI SIGN CANDRABINDU
+    - {type: case, normal: ["\u0935"], shifted: ["\u0901"]}
+
+    # U+092C: ब DEVANAGARI LETTER BA
+    # U+092D: भ DEVANAGARI LETTER BHA
+    - {type: case, normal: ["\u092c"], shifted: ["\u092d"]}
+
+    # U+0928: न DEVANAGARI LETTER NA
+    # U+0923: ण DEVANAGARI LETTER NNA
+    - {type: case, normal: ["\u0928"], shifted: ["\u0923"]}
+
+    # U+092E: म DEVANAGARI LETTER MA
+    # U+0902: ं DEVANAGARI SIGN ANUSVARA
+    - {type: case, normal: ["\u092e"], shifted: ["\u0902"]}
+
+    # U+094D: ् DEVANAGARI SIGN VIRAMA
+    # U+093D: ऽ DEVANAGARI SIGN AVAGRAHA
+    # U+0919: ङ DEVANAGARI LETTER NGA
+    - {type: case, normal: ["\u094d", "\u093d"], shifted: ["\u0919"]}
\ No newline at end of file
diff --git a/java/assets/layouts/Devanagari/nepali_traditional.yaml b/java/assets/layouts/Devanagari/nepali_traditional.yaml
new file mode 100644
index 000000000..53488a653
--- /dev/null
+++ b/java/assets/layouts/Devanagari/nepali_traditional.yaml
@@ -0,0 +1,166 @@
+name: Nepali (Traditional)
+languages: ne-NP
+useZWNJKey: true
+rows:
+  - letters: # rowkeys_nepali_traditional1.xml
+    # U+091F: ट DEVANAGARI LETTER TTA
+    # U+0924: त DEVANAGARI LETTER TA
+    # U+094D: ् DEVANAGARI SIGN VIRAMA
+    # U+091E: ञ DEVANAGARI LETTER NYA
+    # U+091C: ज DEVANAGARI LETTER JA
+    # U+0965: ॥ DEVANAGARI DOUBLE DANDA
+    - {type: case, normal: ["\u091f"], shifted: ["\u0924\u094d\u0924", "\u091e", "\u091c\u094d\u091e", "\u0965"]}
+
+    # U+0927: ध DEVANAGARI LETTER DHA
+    # U+0921: ड DEVANAGARI LETTER DDA
+    # U+094D: ् DEVANAGARI SIGN VIRAMA
+    # U+0922: ढ DEVANAGARI LETTER DDHA
+    # U+0908: ई DEVANAGARI LETTER II
+    - {type: case, normal: ["\u0927"], shifted: ["\u0921\u094d\u0922", "\u0908"]}
+
+    # U+092D: भ DEVANAGARI LETTER BHA
+    # U+0910: ऐ DEVANAGARI LETTER AI
+    # U+0918: घ DEVANAGARI LETTER GHA
+    - {type: case, normal: ["\u092d"], shifted: ["\u0910", "\u0918"]}
+
+    # U+091A: च DEVANAGARI LETTER CA
+    # U+0926: द DEVANAGARI LETTER DA
+    # U+094D: ् DEVANAGARI SIGN VIRAMA
+    # U+0935: व DEVANAGARI LETTER VA
+    # U+0927: ध DEVANAGARI LETTER DHA
+    - {type: case, normal: ["\u091a"], shifted: ["\u0926\u094d\u0935", "\u0926\u094d\u0927"]}
+
+    # U+0924: त DEVANAGARI LETTER TA
+    # U+091F: ट DEVANAGARI LETTER TTA
+    # U+094D: ् DEVANAGARI SIGN VIRAMA
+    # U+091B: छ DEVANAGARI LETTER CHA
+    - {type: case, normal: ["\u0924"], shifted: ["\u091f\u094d\u091f", "\u091b"]}
+
+    # U+0925: थ DEVANAGARI LETTER THA
+    # U+0920: ठ DEVANAGARI LETTER TTHA
+    # U+094D: ् DEVANAGARI SIGN VIRAMA
+    # U+091F: ट DEVANAGARI LETTER TTA
+    - {type: case, normal: ["\u0925"], shifted: ["\u0920\u094d\u0920", "\u091f"]}
+
+    # U+0917: ग DEVANAGARI LETTER GA
+    # U+090A: ऊ DEVANAGARI LETTER UU
+    # U+0920: ठ DEVANAGARI LETTER TTHA
+    - {type: case, normal: ["\u0917"], shifted: ["\u090a", "\u0920"]}
+
+    # U+0937: ष DEVANAGARI LETTER SSA
+    # U+0915: क DEVANAGARI LETTER KA
+    # U+094D: ् DEVANAGARI SIGN VIRAMA
+    # U+0921: ड DEVANAGARI LETTER DDA
+    - {type: case, normal: ["\u0937"], shifted: ["\u0915\u094d\u0937", "\u0921"]}
+
+    # U+092F: य DEVANAGARI LETTER YA
+    # U+0907: इ DEVANAGARI LETTER I
+    # U+0922: ढ DEVANAGARI LETTER DDHA
+    - {type: case, normal: ["\u092f"], shifted: ["\u0907", "\u0922"]}
+
+    # U+0909: उ DEVANAGARI LETTER U
+    # U+090F: ए DEVANAGARI LETTER E
+    # U+0923: ण DEVANAGARI LETTER NNA
+    - {type: case, normal: ["\u0909"], shifted: ["\u090f", "\u0923"]}
+
+    # U+0907: इ DEVANAGARI LETTER I
+    # U+0914: औ DEVANAGARI LETTER AU
+    # U+0943: ृ DEVANAGARI VOWEL SIGN VOCALIC R
+    # U+0913: ओ DEVANAGARI LETTER O
+    - {type: case, normal: ["\u0907", "\u0914"], shifted: ["\u0943", "\u0913"]}
+
+  - letters: # rowkeys_nepali_traditional2.xml
+    # U+092C: ब DEVANAGARI LETTER BA
+    # U+0906: आ DEVANAGARI LETTER AA
+    - {type: case, normal: ["\u092c"], shifted: ["\u0906"]}
+
+    # U+0915: क DEVANAGARI LETTER KA
+    # U+0919: ङ DEVANAGARI LETTER NGA
+    # U+094D: ् DEVANAGARI SIGN VIRAMA
+    - {type: case, normal: ["\u0915"], shifted: ["\u0919\u094d"]}
+
+    # U+092E: म DEVANAGARI LETTER MA
+    # U+0921: ड DEVANAGARI LETTER DDA
+    # U+094D: ् DEVANAGARI SIGN VIRAMA
+    - {type: case, normal: ["\u092e"], shifted: ["\u0921\u094d\u0921"]}
+
+    # U+093E: ा DEVANAGARI VOWEL SIGN AA
+    # U+0901: ँ DEVANAGARI SIGN CANDRABINDU
+    - {type: case, normal: ["\u093e"], shifted: ["\u0901"]}
+
+    # U+0928: न DEVANAGARI LETTER NA
+    # U+0926: द DEVANAGARI LETTER DA
+    # U+094D: ् DEVANAGARI SIGN VIRAMA
+    - {type: case, normal: ["\u0928"], shifted: ["\u0926\u094d\u0926"]}
+
+    # U+091C: ज DEVANAGARI LETTER JA
+    # U+091D: झ DEVANAGARI LETTER JHA
+    - {type: case, normal: ["\u091c"], shifted: ["\u091d"]}
+
+    # U+0935: व DEVANAGARI LETTER VA
+    # U+094B: ो DEVANAGARI VOWEL SIGN O
+    - {type: case, normal: ["\u0935"], shifted: ["\u094b"]}
+
+    # U+092A: प DEVANAGARI LETTER PA
+    # U+092B: फ DEVANAGARI LETTER PHA
+    - {type: case, normal: ["\u092a"], shifted: ["\u092b"]}
+
+    # U+093F: ि DEVANAGARI VOWEL SIGN I
+    # U+0940: ी DEVANAGARI VOWEL SIGN II
+    - {type: case, normal: ["\u093f"], shifted: ["\u0940"]}
+
+    # U+0938: स DEVANAGARI LETTER SA
+    # U+091F: ट DEVANAGARI LETTER TTA
+    # U+094D: ् DEVANAGARI SIGN VIRAMA
+    # U+0920: ठ DEVANAGARI LETTER TTHA
+    - {type: case, normal: ["\u0938"], shifted: ["\u091f\u094d\u0920"]}
+
+    # U+0941: ु DEVANAGARI VOWEL SIGN U
+    # U+0942: ू DEVANAGARI VOWEL SIGN UU
+    - {type: case, normal: ["\u0941"], shifted: ["\u0942"]}
+
+  - letters: # rowkeys_nepali_traditional3.xml
+    # U+0936: श DEVANAGARI LETTER SHA
+    # U+0915: क DEVANAGARI LETTER KA
+    # U+094D: ् DEVANAGARI SIGN VIRAMA
+    - {type: case, normal: ["\u0936"], shifted: ["\u0915\u094d"]}
+
+    # U+0939: ह DEVANAGARI LETTER HA
+    # U+094D: ् DEVANAGARI SIGN VIRAMA
+    # U+092E: म DEVANAGARI LETTER MA
+    - {type: case, normal: ["\u0939"], shifted: ["\u0939\u094d\u092e"]}
+
+    # U+0905: अ DEVANAGARI LETTER A
+    # U+090B: ऋ DEVANAGARI LETTER VOCALIC R
+    - {type: case, normal: ["\u0905"], shifted: ["\u090b"]}
+
+    # U+0916: ख DEVANAGARI LETTER KHA
+    # U+0950: ॐ DEVANAGARI OM
+    - {type: case, normal: ["\u0916"], shifted: ["\u0950"]}
+
+    # U+0926: द DEVANAGARI LETTER DA
+    # U+094C: ौ DEVANAGARI VOWEL SIGN AU
+    - {type: case, normal: ["\u0926"], shifted: ["\u094c"]}
+
+    # U+0932: ल DEVANAGARI LETTER LA
+    # U+0926: द DEVANAGARI LETTER DA
+    # U+094D: ् DEVANAGARI SIGN VIRAMA
+    # U+092F: य DEVANAGARI LETTER YA
+    - {type: case, normal: ["\u0932"], shifted: ["\u0926\u094d\u092f"]}
+
+    # U+0947: े DEVANAGARI VOWEL SIGN E
+    # U+0903: ः DEVANAGARI SIGN VISARGA
+    # U+093D: ऽ DEVANAGARI SIGN AVAGRAHA
+    # U+0902: ं DEVANAGARI SIGN ANUSVARA
+    - {type: case, normal: ["\u0947", "\u0903", "\u093d"], shifted: ["\u0902"]}
+
+    # U+094D: ् DEVANAGARI SIGN VIRAMA
+    # U+0919: ङ DEVANAGARI LETTER NGA
+    - {type: case, normal: ["\u094d"], shifted: ["\u0919"]}
+
+    # U+0930: र DEVANAGARI LETTER RA
+    # U+0941: ु DEVANAGARI VOWEL SIGN U
+    # U+0948: ै DEVANAGARI VOWEL SIGN AI
+    # U+0936: श DEVANAGARI LETTER SHA
+    # U+094D: ् DEVANAGARI SIGN VIRAMA
+    - {type: case, normal: ["\u0930", "\u0930\u0941"], shifted: ["\u0948", "\u0936\u094d\u0930"]}
\ No newline at end of file
diff --git a/java/src/org/futo/inputmethod/keyboard/internal/KeyboardTextsTable.java b/java/src/org/futo/inputmethod/keyboard/internal/KeyboardTextsTable.java
index 7bad31dcc..3370ba83e 100644
--- a/java/src/org/futo/inputmethod/keyboard/internal/KeyboardTextsTable.java
+++ b/java/src/org/futo/inputmethod/keyboard/internal/KeyboardTextsTable.java
@@ -91,285 +91,285 @@ public final class KeyboardTextsTable {
         "morekeys_c",
         "keyspec_currency",
         "morekeys_s",
-        "morekeys_misc_o",
         "morekeys_misc_a",
+        "morekeys_misc_o",
         "morekeys_misc_u",
         "morekeys_misc_e",
-        "morekeys_z",
         "morekeys_misc_i",
+        "morekeys_z",
         "morekeys_n",
-        "morekeys_misc_s",
         "morekeys_misc_c",
-        "double_angle_quotes",
+        "morekeys_misc_s",
         "single_angle_quotes",
-        "keyspec_symbols_0",
-        "additional_morekeys_symbols_2",
-        "keyspec_symbols_4",
+        "double_angle_quotes",
         "additional_morekeys_symbols_0",
-        "keyspec_symbols_7",
-        "keyspec_symbols_3",
-        "keyspec_symbols_1",
-        "morekeys_y",
-        "additional_morekeys_symbols_6",
-        "additional_morekeys_symbols_3",
+        "keyspec_symbols_0",
         "keyspec_symbols_9",
-        "additional_morekeys_symbols_1",
-        "additional_morekeys_symbols_4",
-        "keyspec_symbols_2",
-        "keyspec_symbols_8",
-        "additional_morekeys_symbols_5",
-        "additional_morekeys_symbols_7",
-        "keyspec_symbols_6",
-        "additional_morekeys_symbols_9",
         "keyspec_symbols_5",
+        "keyspec_symbols_6",
+        "keyspec_symbols_8",
         "additional_morekeys_symbols_8",
+        "keyspec_symbols_7",
+        "additional_morekeys_symbols_7",
+        "additional_morekeys_symbols_4",
+        "keyspec_symbols_4",
+        "additional_morekeys_symbols_2",
+        "morekeys_y",
+        "additional_morekeys_symbols_5",
+        "keyspec_symbols_3",
+        "additional_morekeys_symbols_6",
+        "keyspec_symbols_1",
+        "additional_morekeys_symbols_1",
+        "keyspec_symbols_2",
+        "additional_morekeys_symbols_3",
+        "additional_morekeys_symbols_9",
+        "morekeys_misc_z",
         "morekeys_g",
         "keylabel_to_symbol",
         "morekeys_d",
-        "morekeys_misc_z",
         "morekeys_cyrillic_ie",
         "morekeys_tablet_period",
-        "morekeys_nordic_row2_10",
-        "morekeys_t",
-        "keyspec_nordic_row2_11",
-        "keyspec_nordic_row2_10",
-        "keyspec_tablet_comma",
-        "keyspec_east_slavic_row3_5",
         "morekeys_cyrillic_soft_sign",
-        "morekeys_period",
-        "keyspec_nordic_row1_11",
-        "keyspec_east_slavic_row2_11",
-        "keyspec_east_slavic_row1_9",
-        "keyspec_period",
-        "keyspec_east_slavic_row2_2",
+        "keyspec_tablet_comma",
+        "morekeys_nordic_row2_10",
+        "keyspec_nordic_row2_11",
         "morekeys_misc_n",
-        "keyspec_left_parenthesis",
-        "keyhintlabel_period",
-        "morekeys_r",
-        "keyspec_less_than_equal",
-        "keyspec_greater_than",
-        "keyspec_left_square_bracket",
-        "keyspec_left_single_angle_quote",
-        "keyspec_right_curly_bracket",
-        "keyspec_right_single_angle_quote",
-        "keyspec_comma",
+        "keyspec_period",
+        "keyspec_nordic_row2_10",
+        "keyspec_east_slavic_row2_2",
+        "keyspec_nordic_row1_11",
+        "morekeys_period",
+        "morekeys_t",
+        "keyspec_east_slavic_row1_9",
+        "keyspec_east_slavic_row2_11",
+        "keyspec_east_slavic_row3_5",
         "keyspec_left_double_angle_quote",
-        "keyspec_left_curly_bracket",
-        "keyspec_right_square_bracket",
-        "morekeys_l",
-        "morekeys_question",
-        "keyspec_greater_than_equal",
+        "morekeys_r",
+        "keyspec_tablet_period",
+        "keyhintlabel_period",
+        "keyspec_right_curly_bracket",
+        "keyspec_comma",
+        "morekeys_punctuation",
         "morekeys_nordic_row2_11",
         "keyspec_less_than",
-        "morekeys_punctuation",
-        "keyspec_tablet_period",
+        "keyspec_left_single_angle_quote",
+        "keyspec_greater_than",
         "morekeys_star",
-        "keyspec_right_parenthesis",
         "keyspec_right_double_angle_quote",
+        "keyspec_left_parenthesis",
+        "keyspec_left_square_bracket",
+        "keyspec_right_single_angle_quote",
+        "keyspec_left_curly_bracket",
+        "keyspec_greater_than_equal",
+        "keyspec_less_than_equal",
+        "keyspec_right_parenthesis",
+        "morekeys_question",
         "morekeys_tablet_comma",
-        "keyspec_spanish_row2_10",
-        "keyhintlabel_tablet_comma",
-        "morekeys_misc_y",
-        "keyspec_swiss_row1_11",
-        "morekeys_swiss_row2_10",
-        "keyspec_symbols_semicolon",
-        "morekeys_right_parenthesis",
-        "keyhintlabel_tablet_period",
-        "morekeys_symbols_semicolon",
-        "keyspec_symbols_percent",
-        "keyspec_symbols_question",
-        "morekeys_symbols_percent",
-        "morekeys_left_parenthesis",
-        "keyspec_swiss_row2_11",
-        "morekeys_swiss_row2_11",
-        "keyspec_swiss_row2_10",
+        "keyspec_right_square_bracket",
+        "morekeys_l",
         "morekeys_bullet",
         "morekeys_swiss_row1_11",
+        "morekeys_symbols_semicolon",
+        "keyspec_spanish_row2_10",
+        "morekeys_misc_y",
+        "keyhintlabel_tablet_comma",
+        "keyspec_symbols_question",
+        "keyhintlabel_tablet_period",
+        "keyspec_swiss_row2_11",
+        "keyspec_swiss_row1_11",
+        "morekeys_swiss_row2_10",
+        "keyspec_symbols_percent",
+        "morekeys_left_parenthesis",
+        "morekeys_right_parenthesis",
+        "keyspec_symbols_semicolon",
+        "keyspec_swiss_row2_10",
         "morekeys_arabic_diacritics",
-        "morekeys_k",
-        "keyspec_south_slavic_row2_11",
-        "label_search_key",
-        "label_pause_key",
-        "label_send_key",
-        "morekeys_cyrillic_u",
-        "morekeys_cyrillic_o",
-        "keyspec_south_slavic_row3_1",
-        "label_next_key",
-        "keyspec_south_slavic_row1_6",
+        "morekeys_symbols_percent",
+        "morekeys_swiss_row2_11",
+        "morekeys_cyrillic_ghe",
         "label_done_key",
-        "label_previous_key",
+        "morekeys_misc_g",
+        "morekeys_h",
+        "label_search_key",
+        "morekeys_cyrillic_o",
+        "label_go_key",
         "label_wait_key",
         "morekeys_tablet_punctuation",
-        "morekeys_cyrillic_en",
-        "morekeys_east_slavic_row2_2",
+        "label_send_key",
+        "keyspec_south_slavic_row2_11",
+        "label_next_key",
+        "label_pause_key",
+        "morekeys_cyrillic_u",
         "keyspec_south_slavic_row3_8",
-        "morekeys_misc_g",
-        "label_go_key",
+        "keyspec_south_slavic_row3_1",
+        "morekeys_east_slavic_row2_2",
         "morekeys_j",
-        "morekeys_cyrillic_ghe",
-        "morekeys_cyrillic_i",
-        "morekeys_misc_r",
-        "morekeys_h",
+        "morekeys_cyrillic_en",
         "morekeys_misc_l",
-        "keyspec_y",
-        "morekeys_east_slavic_row2_11",
-        "morekeys_currency_dollar",
-        "morekeys_w",
-        "morekeys_cyrillic_a",
+        "label_previous_key",
+        "morekeys_misc_r",
+        "morekeys_cyrillic_i",
+        "morekeys_k",
+        "keyspec_south_slavic_row1_6",
         "morekeys_misc_h",
-        "keyspec_q",
-        "keyspec_x",
         "morekeys_misc_t",
-        "morekeys_less_than",
         "morekeys_plus",
-        "morekeys_exclamation",
+        "keyspec_w",
+        "morekeys_currency_dollar",
         "morekeys_cyrillic_ka",
         "morekeys_greater_than",
-        "keyspec_w",
-        "keyspec_action_previous",
-        "keyspec_popular_domain",
-        "qwertysyms_s",
-        "morekeys_misc_d",
-        "double_laqm_raqm",
-        "qwertysyms_4",
-        "morekeys_x",
-        "qwertysyms_t",
-        "morekeys_am_pm",
-        "qwertysyms_x",
-        "morekeys_misc_q",
-        "qwertysyms_b",
-        "keylabel_to_phone_symbols",
-        "number_0",
-        "qwertysyms_1",
-        "qwertysyms_7",
-        "actions_d",
-        "keyspecs_left_parenthesis_more_keys",
-        "actions_b",
-        "morekeys_misc_f",
-        "keylabel_to_more_symbol",
-        "actions_8",
-        "morekeys_misc_x",
-        "double_lqm_rqm",
-        "morekeys_symbols_0",
-        "actions_x",
-        "qwertysyms_v",
-        "actions_h",
-        "actions_a",
-        "single_lqm_rqm",
-        "qwertysyms_5",
-        "morekeys_symbols_6",
-        "morekeys_q",
-        "morekeys_misc_p",
-        "actions_j",
-        "number_1",
-        "number_3",
-        "keylabel_time_am",
-        "morekeys_f",
-        "morekeys_b",
-        "keyspec_emoji_action_key",
-        "qwertysyms_r",
-        "single_raqm_laqm",
-        "double_raqm_laqm",
-        "actions_2",
-        "actions_v",
-        "qwertysyms_3",
-        "double_rqm_9qm",
-        "keyspec_shortcut",
-        "single_9qm_rqm",
-        "morekeys_symbols_5",
-        "morekeys_symbols_7",
+        "keyspec_x",
+        "keyspec_q",
+        "morekeys_exclamation",
+        "keyspec_y",
+        "morekeys_cyrillic_a",
+        "morekeys_less_than",
+        "morekeys_w",
+        "morekeys_east_slavic_row2_11",
         "morekeys_single_quote",
-        "actions_k",
-        "morekeys_misc_j",
-        "actions_l",
-        "actions_n",
-        "number_7",
-        "qwertysyms_9",
-        "morekeys_double_quote",
-        "actions_z",
-        "keyspec_emoji_action_key_navigation",
-        "morekeys_tablet_double_quote",
-        "morekeys_symbols_2",
-        "morekeys_misc_w",
-        "actions_p",
-        "qwertysyms_j",
-        "qwertysyms_a",
-        "actions_e",
-        "actions_m",
-        "qwertysyms_p",
-        "qwertysyms_z",
-        "actions_6",
-        "actions_1",
-        "actions_u",
-        "morekeys_symbols_4",
-        "qwertysyms_h",
-        "actions_9",
-        "keylabel_time_pm",
-        "morekeys_v",
-        "actions_7",
-        "qwertysyms_f",
-        "number_2",
-        "morekeys_popular_domain",
-        "qwertysyms_g",
-        "actions_g",
-        "morekeys_misc_k",
-        "actions_c",
-        "number_6",
-        "actions_4",
-        "number_4",
-        "morekeys_p",
-        "morekeys_symbols_3",
-        "qwertysyms_2",
-        "qwertysyms_d",
-        "single_laqm_raqm",
-        "double_9qm_rqm",
-        "keylabel_to_phone_numeric",
-        "actions_w",
-        "actions_y",
-        "actions_t",
-        "morekeys_symbols_8",
         "actions_0",
-        "qwertysyms_y",
-        "actions_i",
-        "morekeys_misc_v",
-        "keyspecs_right_parenthesis_more_keys",
-        "qwertysyms_6",
-        "actions_5",
-        "qwertysyms_i",
-        "keyspec_settings",
-        "morekeys_symbols_9",
-        "qwertysyms_k",
-        "qwertysyms_m",
-        "single_rqm_9qm",
-        "number_8",
-        "number_9",
-        "actions_f",
-        "qwertysyms_o",
-        "morekeys_misc_m",
-        "qwertysyms_l",
-        "morekeys_m",
-        "qwertysyms_u",
-        "actions_s",
-        "morekeys_bottomrow_comma",
-        "actions_3",
-        "actions_o",
-        "morekeys_currency_generic",
-        "actions_r",
-        "qwertysyms_q",
-        "number_5",
-        "morekeys_misc_b",
-        "qwertysyms_e",
+        "number_1",
+        "morekeys_symbols_8",
         "single_9qm_lqm",
+        "morekeys_f",
+        "morekeys_am_pm",
+        "actions_j",
+        "morekeys_symbols_0",
+        "actions_f",
+        "actions_b",
+        "double_laqm_raqm",
+        "single_9qm_rqm",
         "actions_q",
-        "qwertysyms_n",
+        "morekeys_misc_j",
+        "qwertysyms_r",
+        "morekeys_x",
         "keyspec_action_next",
+        "actions_w",
+        "morekeys_misc_p",
+        "double_9qm_rqm",
+        "actions_y",
+        "keyspecs_right_parenthesis_more_keys",
         "morekeys_symbols_1",
-        "qwertysyms_c",
+        "qwertysyms_n",
+        "actions_c",
+        "qwertysyms_6",
+        "qwertysyms_g",
+        "morekeys_tablet_double_quote",
+        "qwertysyms_1",
+        "number_8",
+        "actions_a",
+        "qwertysyms_2",
         "qwertysyms_8",
-        "qwertysyms_0",
-        "keylabel_tablet_to_more_symbol",
+        "morekeys_q",
+        "morekeys_misc_b",
+        "qwertysyms_4",
+        "morekeys_symbols_7",
+        "actions_o",
+        "keylabel_to_phone_numeric",
         "double_9qm_lqm",
-        "qwertysyms_w"
+        "morekeys_double_quote",
+        "keylabel_time_pm",
+        "keyspec_settings",
+        "actions_m",
+        "qwertysyms_q",
+        "qwertysyms_y",
+        "number_6",
+        "morekeys_misc_f",
+        "morekeys_misc_k",
+        "single_rqm_9qm",
+        "qwertysyms_0",
+        "qwertysyms_c",
+        "actions_7",
+        "morekeys_misc_v",
+        "actions_4",
+        "actions_d",
+        "actions_e",
+        "morekeys_v",
+        "actions_s",
+        "keyspec_emoji_action_key_navigation",
+        "single_lqm_rqm",
+        "morekeys_popular_domain",
+        "keyspec_shortcut",
+        "qwertysyms_d",
+        "qwertysyms_w",
+        "actions_u",
+        "actions_6",
+        "actions_l",
+        "actions_t",
+        "qwertysyms_j",
+        "keylabel_to_more_symbol",
+        "qwertysyms_3",
+        "morekeys_bottomrow_comma",
+        "qwertysyms_h",
+        "morekeys_misc_d",
+        "morekeys_misc_x",
+        "qwertysyms_i",
+        "morekeys_symbols_5",
+        "morekeys_symbols_2",
+        "single_laqm_raqm",
+        "keyspec_popular_domain",
+        "actions_h",
+        "number_0",
+        "morekeys_p",
+        "keylabel_to_phone_symbols",
+        "qwertysyms_o",
+        "actions_v",
+        "morekeys_symbols_6",
+        "morekeys_symbols_4",
+        "actions_1",
+        "actions_9",
+        "actions_z",
+        "actions_x",
+        "keyspec_emoji_action_key",
+        "double_rqm_9qm",
+        "qwertysyms_f",
+        "qwertysyms_7",
+        "qwertysyms_l",
+        "qwertysyms_m",
+        "actions_i",
+        "single_raqm_laqm",
+        "morekeys_misc_q",
+        "qwertysyms_5",
+        "number_2",
+        "morekeys_symbols_9",
+        "keylabel_tablet_to_more_symbol",
+        "morekeys_symbols_3",
+        "actions_p",
+        "qwertysyms_p",
+        "actions_k",
+        "double_lqm_rqm",
+        "number_7",
+        "keyspecs_left_parenthesis_more_keys",
+        "qwertysyms_e",
+        "qwertysyms_t",
+        "morekeys_misc_m",
+        "morekeys_b",
+        "actions_5",
+        "qwertysyms_b",
+        "number_5",
+        "qwertysyms_s",
+        "actions_2",
+        "actions_3",
+        "double_raqm_laqm",
+        "keyspec_action_previous",
+        "number_9",
+        "morekeys_m",
+        "qwertysyms_a",
+        "number_3",
+        "morekeys_currency_generic",
+        "morekeys_misc_w",
+        "keylabel_time_am",
+        "qwertysyms_9",
+        "actions_8",
+        "number_4",
+        "qwertysyms_x",
+        "actions_n",
+        "actions_g",
+        "qwertysyms_z",
+        "qwertysyms_v",
+        "actions_r",
+        "qwertysyms_k",
+        "qwertysyms_u"
     };
 
     private static final String EMPTY = "";
@@ -387,11 +387,10 @@ public final class KeyboardTextsTable {
         null,
         null,
         null,
-        "\u00f6,\u00f2,\u00f5,\u0153,\u00f8,\u014d",
         "\u00e2,\u00e4,\u00e0,\u00e6,\u00e3,\u00e5,\u0101",
+        "\u00f6,\u00f2,\u00f5,\u0153,\u00f8,\u014d",
         "\u00fc,\u00f9,\u016b",
         "\u0119,\u0117,\u0113",
-        null,
         "\u012f,\u012b,\u0133"
     };
 
@@ -419,90 +418,89 @@ public final class KeyboardTextsTable {
         null,
         null,
         null,
-        "\u0660",
-        "2",
-        "\u0664",
         "0,\u066b,\u066c",
-        "\u0667",
-        "\u0663",
-        "\u0661",
-        null,
-        "6",
-        "3",
+        "\u0660",
         "\u0669",
-        "1",
-        "4",
-        "\u0662",
-        "\u0668",
-        "5",
-        "7",
-        "\u0666",
-        "9",
         "\u0665",
+        "\u0666",
+        "\u0668",
         "8",
+        "\u0667",
+        "7",
+        "4",
+        "\u0664",
+        "2",
+        null,
+        "5",
+        "\u0663",
+        "6",
+        "\u0661",
+        "1",
+        "\u0662",
+        "3",
+        "9",
+        null,
         null,
         "\u0663\u0662\u0661\u061f",
         null,
         null,
-        null,
         "!text/morekeys_arabic_diacritics",
         null,
-        null,
-        null,
-        null,
         "\u060c",
         null,
         null,
+        null,
+        null,
+        null,
+        null,
+        null,
         "!text/morekeys_arabic_diacritics",
         null,
         null,
         null,
         null,
-        null,
-        null,
-        "(|)",
-        "\u0651",
-        null,
-        "\u2264|\u2265",
-        ">|<",
-        "[|]",
-        "\u2039|\u203a",
-        "}|{",
-        "\u203a|\u2039",
-        "\u060c",
         "\u00ab|\u00bb",
-        "{|}",
-        "]|[",
         null,
-        "?,\u00bf",
-        "\u2265|\u2264",
+        null,
+        "\u0651",
+        "}|{",
+        "\u060c",
+        null,
         null,
         "<|>",
-        null,
-        null,
+        "\u2039|\u203a",
+        ">|<",
         "\u2605,\u066d",
-        ")|(",
         "\u00bb|\u00ab",
+        "(|)",
+        "[|]",
+        "\u203a|\u2039",
+        "{|}",
+        "\u2265|\u2264",
+        "\u2264|\u2265",
+        ")|(",
+        "?,\u00bf",
         "!fixedColumnOrder!4,:,!,\u061f,\u061b,-,\\\",\\'",
-        null,
-        "\u061f",
-        null,
-        null,
-        null,
-        "\u061b",
-        "!fixedColumnOrder!4,\ufd3f|\ufd3e,!text/keyspecs_right_parenthesis_more_keys",
-        "\u0651",
-        ";",
-        "\u066a",
-        "\u061f",
-        "\\%,\u2030",
-        "!fixedColumnOrder!4,\ufd3e|\ufd3f,!text/keyspecs_left_parenthesis_more_keys",
-        null,
-        null,
+        "]|[",
         null,
         "\u266a",
         null,
-        "!fixedColumnOrder!8, \u0654\u25cc|\u0654, \u0652\u25cc|\u0652, \u064d\u25cc|\u064d, \u064c\u25cc|\u064c, \u0651\u25cc|\u0651, \u064b\u25cc|\u064b,!text/keyspec_symbols_question,!, \u0656\u25cc|\u0656, \u0670\u25cc|\u0670, \u0653\u25cc|\u0653, \u0650\u25cc|\u0650, \u064f\u25cc|\u064f,\u0640, \u0655\u25cc|\u0655, \u064e\u25cc|\u064e"
+        ";",
+        null,
+        null,
+        "\u061f",
+        "\u061f",
+        "\u0651",
+        null,
+        null,
+        null,
+        "\u066a",
+        "!fixedColumnOrder!4,\ufd3e|\ufd3f,!text/keyspecs_left_parenthesis_more_keys",
+        "!fixedColumnOrder!4,\ufd3f|\ufd3e,!text/keyspecs_right_parenthesis_more_keys",
+        "\u061b",
+        null,
+        "!fixedColumnOrder!8, \u0654\u25cc|\u0654, \u0652\u25cc|\u0652, \u064d\u25cc|\u064d, \u064c\u25cc|\u064c, \u0651\u25cc|\u0651, \u064b\u25cc|\u064b,!text/keyspec_symbols_question,!, \u0656\u25cc|\u0656, \u0670\u25cc|\u0670, \u0653\u25cc|\u0653, \u0650\u25cc|\u0650, \u064f\u25cc|\u064f,\u0640, \u0655\u25cc|\u0655, \u064e\u25cc|\u064e",
+        "\\%,\u2030"
     };
 
     private static final String[] TEXTS_az = {
@@ -522,8 +520,8 @@ public final class KeyboardTextsTable {
         null,
         null,
         null,
-        "\u017e",
         null,
+        "\u017e",
         "\u0148,\u00f1",
         null,
         null,
@@ -536,6 +534,11 @@ public final class KeyboardTextsTable {
         null,
         null,
         null,
+        null,
+        null,
+        null,
+        null,
+        null,
         "\u00fd",
         null,
         null,
@@ -546,10 +549,6 @@ public final class KeyboardTextsTable {
         null,
         null,
         null,
-        null,
-        null,
-        null,
-        null,
         "\u011f"
     };
 
@@ -604,19 +603,20 @@ public final class KeyboardTextsTable {
         null,
         "\u0451",
         null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u0456",
         "\u044a",
         null,
         null,
-        "\u044d",
-        "\u045e",
         null,
-        "\u044b"
+        null,
+        null,
+        null,
+        "\u044b",
+        null,
+        null,
+        null,
+        "\u045e",
+        "\u044d",
+        "\u0456"
     };
 
     private static final String[] TEXTS_bg = {
@@ -654,27 +654,27 @@ public final class KeyboardTextsTable {
         null,
         null,
         null,
-        "\u09e6",
-        "2",
-        "\u09ea",
         "0",
-        "\u09ed",
-        "\u09e9",
-        "\u09e7",
-        null,
-        "6",
-        "3",
+        "\u09e6",
         "\u09ef",
-        "1",
-        "4",
-        "\u09e8",
-        "\u09ee",
-        "5",
-        "7",
-        "\u09ec",
-        "9",
         "\u09eb",
-        "8"
+        "\u09ec",
+        "\u09ee",
+        "8",
+        "\u09ed",
+        "7",
+        "4",
+        "\u09ea",
+        "2",
+        null,
+        "5",
+        "\u09e9",
+        "6",
+        "\u09e7",
+        "1",
+        "\u09e8",
+        "3",
+        "9"
     };
 
     private static final String[] TEXTS_bn_IN = {
@@ -704,11 +704,10 @@ public final class KeyboardTextsTable {
         "\u00e7",
         null,
         null,
-        "\u00f6,\u00f4,\u00f5,\u00f8,\u0153,\u014d,\u00ba",
         "\u00e1,\u00e4,\u00e2,\u00e3,\u00e5,\u0105,\u00e6,\u0101,\u00aa",
+        "\u00f6,\u00f4,\u00f5,\u00f8,\u0153,\u014d,\u00ba",
         "\u00f9,\u00fb,\u016b",
         "\u00eb,\u00ea,\u0119,\u0117,\u0113",
-        null,
         "\u00ec,\u00ee,\u012f,\u012b",
         null,
         null,
@@ -763,23 +762,27 @@ public final class KeyboardTextsTable {
         null,
         null,
         null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
         "!autoColumnOrder!9,\\\\,?,!,\u00b7,#,),(,/,;,',@,:,-,\\\",+,\\%,&",
         null,
         null,
         null,
         null,
         null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
         "\u00e7",
         null,
         null,
@@ -804,14 +807,6 @@ public final class KeyboardTextsTable {
         null,
         null,
         null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
         "!autoColumnOrder!8,\\\\,',\u00b7,#,),(,/,;,@,:,-,\\\",+,\\%,&"
     };
 
@@ -839,90 +834,89 @@ public final class KeyboardTextsTable {
         null,
         null,
         null,
-        "\u0660",
-        "2",
-        "\u0664",
         "0,\u066b,\u066c",
-        "\u0667",
-        "\u0663",
-        "\u0661",
-        null,
-        "6",
-        "3",
+        "\u0660",
         "\u0669",
-        "1",
-        "4",
-        "\u0662",
-        "\u0668",
-        "5",
-        "7",
-        "\u0666",
-        "9",
         "\u0665",
+        "\u0666",
+        "\u0668",
         "8",
+        "\u0667",
+        "7",
+        "4",
+        "\u0664",
+        "2",
+        null,
+        "5",
+        "\u0663",
+        "6",
+        "\u0661",
+        "1",
+        "\u0662",
+        "3",
+        "9",
+        null,
         null,
         "\u0663\u0662\u0661\u061f",
         null,
         null,
-        null,
         "\u061f",
         null,
-        null,
-        null,
-        null,
         "\u060c",
         null,
         null,
-        "\u061f",
-        null,
-        null,
         null,
         ".",
         null,
         null,
-        "(|)",
-        "\u0651",
         null,
-        "\u2264|\u2265",
-        ">|<",
-        "[|]",
-        "\u2039|\u203a",
-        "}|{",
-        "\u203a|\u2039",
-        "\u060c",
+        "\u061f",
+        null,
+        null,
+        null,
+        null,
         "\u00ab|\u00bb",
-        "{|}",
-        "]|[",
         null,
-        "?,\u00bf",
-        "\u2265|\u2264",
+        null,
+        "\u0651",
+        "}|{",
+        "\u060c",
+        null,
         null,
         "<|>",
-        null,
-        null,
+        "\u2039|\u203a",
+        ">|<",
         "\u2605,\u066d",
-        ")|(",
         "\u00bb|\u00ab",
+        "(|)",
+        "[|]",
+        "\u203a|\u2039",
+        "{|}",
+        "\u2265|\u2264",
+        "\u2264|\u2265",
+        ")|(",
+        "?,\u00bf",
         "!fixedColumnOrder!4,:,!,\u061f,\u061b,-,\\\",\\'",
-        null,
-        "\u061f",
-        null,
-        null,
-        null,
-        "\u061b",
-        "!fixedColumnOrder!4,\ufd3f|\ufd3e,!text/keyspecs_right_parenthesis_more_keys",
-        "\u0651",
-        ";",
-        "\u066a",
-        "\u061f",
-        "\\%,\u2030",
-        "!fixedColumnOrder!4,\ufd3e|\ufd3f,!text/keyspecs_left_parenthesis_more_keys",
-        null,
-        null,
+        "]|[",
         null,
         "\u266a",
         null,
-        "!fixedColumnOrder!7, \u0655\u25cc|\u0655, \u0654\u25cc|\u0654, \u0652\u25cc|\u0652, \u064d\u25cc|\u064d, \u064c\u25cc|\u064c, \u064b\u25cc|\u064b, \u0651\u25cc|\u0651, \u0656\u25cc|\u0656, \u0670\u25cc|\u0670, \u0653\u25cc|\u0653, \u0650\u25cc|\u0650, \u064f\u25cc|\u064f, \u064e\u25cc|\u064e,\u0640|\u0640"
+        ";",
+        null,
+        null,
+        "\u061f",
+        "\u061f",
+        "\u0651",
+        null,
+        null,
+        null,
+        "\u066a",
+        "!fixedColumnOrder!4,\ufd3e|\ufd3f,!text/keyspecs_left_parenthesis_more_keys",
+        "!fixedColumnOrder!4,\ufd3f|\ufd3e,!text/keyspecs_right_parenthesis_more_keys",
+        "\u061b",
+        null,
+        "!fixedColumnOrder!7, \u0655\u25cc|\u0655, \u0654\u25cc|\u0654, \u0652\u25cc|\u0652, \u064d\u25cc|\u064d, \u064c\u25cc|\u064c, \u064b\u25cc|\u064b, \u0651\u25cc|\u0651, \u0656\u25cc|\u0656, \u0670\u25cc|\u0670, \u0653\u25cc|\u0653, \u0650\u25cc|\u0650, \u064f\u25cc|\u064f, \u064e\u25cc|\u064e,\u0640|\u0640",
+        "\\%,\u2030"
     };
 
     private static final String[] TEXTS_cs = {
@@ -938,17 +932,22 @@ public final class KeyboardTextsTable {
         "\u010d",
         null,
         "\u0161",
-        "\u00f6,\u00f4,\u00f2,\u00f5,\u0153,\u00f8,\u014d",
         "\u00e0,\u00e2,\u00e4,\u00e6,\u00e3,\u00e5,\u0101",
+        "\u00f6,\u00f4,\u00f2,\u00f5,\u0153,\u00f8,\u014d",
         "\u00fb,\u00fc,\u00f9,\u016b",
         "\u00e8,\u00ea,\u00eb,\u0119,\u0117,\u0113",
-        "\u017e",
         "\u00ee,\u00ef,\u00ec,\u012f,\u012b",
+        "\u017e",
         "\u0148",
-        "\u00df,\u015b",
         "\u00e7,\u0107",
-        "!text/double_raqm_laqm",
+        "\u00df,\u015b",
         "!text/single_raqm_laqm",
+        "!text/double_raqm_laqm",
+        null,
+        null,
+        null,
+        null,
+        null,
         null,
         null,
         null,
@@ -965,24 +964,10 @@ public final class KeyboardTextsTable {
         null,
         null,
         null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u010f",
         "\u017a,\u017c",
         null,
         null,
-        null,
-        "\u0165",
-        null,
-        null,
-        null,
-        null,
-        null,
+        "\u010f",
         null,
         null,
         null,
@@ -992,6 +977,14 @@ public final class KeyboardTextsTable {
         "\u00f1,\u0144",
         null,
         null,
+        null,
+        null,
+        null,
+        "\u0165",
+        null,
+        null,
+        null,
+        null,
         "\u0159",
         null,
         null,
@@ -1016,6 +1009,9 @@ public final class KeyboardTextsTable {
         null,
         null,
         null,
+        null,
+        null,
+        null,
         "\u00ff"
     };
 
@@ -1032,8 +1028,8 @@ public final class KeyboardTextsTable {
         null,
         null,
         null,
-        "\u00f6,\u00f3,\u00f4,\u00f2,\u00f5,\u0153,\u014d",
         "\u00e1,\u00e4,\u00e0,\u00e2,\u00e3,\u0101",
+        "\u00f6,\u00f3,\u00f4,\u00f2,\u00f5,\u0153,\u014d",
         null,
         null,
         null,
@@ -1041,8 +1037,10 @@ public final class KeyboardTextsTable {
         null,
         null,
         null,
-        "!text/double_raqm_laqm",
         "!text/single_raqm_laqm",
+        "!text/double_raqm_laqm",
+        null,
+        null,
         null,
         null,
         null,
@@ -1071,13 +1069,11 @@ public final class KeyboardTextsTable {
         null,
         null,
         "\u00e4",
-        null,
         "\u00f8",
+        null,
+        null,
         "\u00e6",
         null,
-        null,
-        null,
-        null,
         "\u00e5",
         null,
         null,
@@ -1091,15 +1087,6 @@ public final class KeyboardTextsTable {
         null,
         null,
         null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
         "\u00f6"
     };
 
@@ -1116,17 +1103,17 @@ public final class KeyboardTextsTable {
         null,
         null,
         "\u00df",
-        "%,\u00f4,\u00f2,\u00f3,\u00f5,\u0153,\u00f8,\u014d",
         "%,\u00e2,\u00e0,\u00e1,\u00e6,\u00e3,\u00e5,\u0101",
+        "%,\u00f4,\u00f2,\u00f3,\u00f5,\u0153,\u00f8,\u014d",
         "%,\u00fb,\u00f9,\u00fa,\u016b",
         null,
         null,
         null,
         null,
+        null,
         "\u015b,\u0161",
-        null,
-        "!text/double_raqm_laqm",
         "!text/single_raqm_laqm",
+        "!text/double_raqm_laqm",
         null,
         null,
         null,
@@ -1193,12 +1180,7 @@ public final class KeyboardTextsTable {
         null,
         null,
         null,
-        null,
-        null,
-        "\u00fc",
-        "\u00e9",
-        null,
-        null,
+        "\u00e8",
         null,
         null,
         null,
@@ -1206,10 +1188,16 @@ public final class KeyboardTextsTable {
         null,
         null,
         "\u00e4",
-        "\u00e0",
+        "\u00fc",
+        "\u00e9",
+        null,
+        null,
+        null,
+        null,
         "\u00f6",
         null,
-        "\u00e8"
+        null,
+        "\u00e0"
     };
 
     private static final String[] TEXTS_el = {
@@ -1241,8 +1229,9 @@ public final class KeyboardTextsTable {
         null,
         null,
         null,
-        "\u00df,\u0161,\u015b,\u0219,\u015f",
         "\u0107,\u010d,\u00e7,\u010b",
+        "\u00df,\u0161,\u015b,\u0219,\u015f",
+        null,
         null,
         null,
         null,
@@ -1310,6 +1299,8 @@ public final class KeyboardTextsTable {
         null,
         null,
         null,
+        null,
+        null,
         "\u0135",
         null,
         null,
@@ -1328,47 +1319,40 @@ public final class KeyboardTextsTable {
         null,
         null,
         null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
         "\u011f,\u0121,\u0123",
+        "\u0125",
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
         null,
         "\u0135",
         null,
         null,
         null,
-        "\u0125",
-        null,
-        "\u016d",
         null,
         null,
         null,
         null,
         "\u0127",
-        "\u015d",
+        null,
+        null,
+        "\u011d",
+        null,
+        null,
+        null,
         "\u0109",
+        "\u015d",
         null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u011d"
+        "\u016d"
     };
 
     private static final String[] TEXTS_es = {
@@ -1384,12 +1368,12 @@ public final class KeyboardTextsTable {
         null,
         null,
         null,
-        "\u00f2,\u00f6,\u00f4,\u00f5,\u00f8,\u0153,\u014d,\u00ba",
         "\u00e0,\u00e4,\u00e2,\u00e3,\u00e5,\u0105,\u00e6,\u0101,\u00aa",
+        "\u00f2,\u00f6,\u00f4,\u00f5,\u00f8,\u0153,\u014d,\u00ba",
         "\u00f9,\u00fb,\u016b",
         "\u00e8,\u00eb,\u00ea,\u0119,\u0117,\u0113",
-        null,
         "\u00ef,\u00ec,\u00ee,\u012f,\u012b",
+        null,
         "\u00f1",
         null,
         null,
@@ -1426,15 +1410,6 @@ public final class KeyboardTextsTable {
         null,
         null,
         null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
         "\u0144",
         null,
         null,
@@ -1451,9 +1426,6 @@ public final class KeyboardTextsTable {
         null,
         null,
         null,
-        null,
-        null,
-        null,
         "!autoColumnOrder!9,\\\\,?,!,#,),(,/,;,\u00a1,',@,:,-,\\\",+,\\%,&,\u00bf"
     };
 
@@ -1470,10 +1442,11 @@ public final class KeyboardTextsTable {
         null,
         null,
         "\u0161",
-        "\u00f2,\u00f3,\u00f4,\u0153,\u0151,\u00f8",
         "\u0101,\u00e0,\u00e1,\u00e2,\u00e3,\u00e5,\u00e6,\u0105",
+        "\u00f2,\u00f3,\u00f4,\u0153,\u0151,\u00f8",
         "\u016b,\u0173,\u00f9,\u00fa,\u00fb,\u016f,\u0171",
         null,
+        null,
         "\u017e",
         null,
         null,
@@ -1501,21 +1474,20 @@ public final class KeyboardTextsTable {
         null,
         null,
         null,
-        null,
-        null,
-        null,
-        null,
         "\u017c,\u017a",
         null,
         null,
+        null,
+        null,
+        null,
+        null,
+        null,
         "\u00f5",
-        null,
         "\u00e4",
+        null,
+        null,
         "\u00f6",
         null,
-        null,
-        null,
-        null,
         "\u00fc"
     };
 
@@ -1565,90 +1537,89 @@ public final class KeyboardTextsTable {
         null,
         null,
         null,
-        "\u06f0",
-        "2",
-        "\u06f4",
         "0,\u066b,\u066c",
-        "\u06f7",
-        "\u06f3",
-        "\u06f1",
-        null,
-        "6",
-        "3",
+        "\u06f0",
         "\u06f9",
-        "1",
-        "4",
-        "\u06f2",
-        "\u06f8",
-        "5",
-        "7",
-        "\u06f6",
-        "9",
         "\u06f5",
+        "\u06f6",
+        "\u06f8",
         "8",
+        "\u06f7",
+        "7",
+        "4",
+        "\u06f4",
+        "2",
+        null,
+        "5",
+        "\u06f3",
+        "6",
+        "\u06f1",
+        "1",
+        "\u06f2",
+        "3",
+        "9",
+        null,
         null,
         "\u06f3\u06f2\u06f1\u061f",
         null,
         null,
-        null,
         "!text/morekeys_arabic_diacritics",
         null,
-        null,
-        null,
-        null,
         "\u060c",
         null,
         null,
+        null,
+        null,
+        null,
+        null,
+        null,
         "!text/morekeys_arabic_diacritics",
         null,
         null,
         null,
         null,
-        null,
-        null,
-        "(|)",
-        "\u064b",
-        null,
-        "\u2264|\u2265",
-        ">|<",
-        "[|]",
-        "\u2039|\u203a",
-        "}|{",
-        "\u203a|\u2039",
-        "\u060c",
         "\u00ab|\u00bb",
-        "{|}",
-        "]|[",
         null,
-        "?,\u00bf",
-        "\u2265|\u2264",
+        null,
+        "\u064b",
+        "}|{",
+        "\u060c",
+        null,
         null,
         "<|>",
-        null,
-        null,
+        "\u2039|\u203a",
+        ">|<",
         "\u2605,\u066d",
-        ")|(",
         "\u00bb|\u00ab",
+        "(|)",
+        "[|]",
+        "\u203a|\u2039",
+        "{|}",
+        "\u2265|\u2264",
+        "\u2264|\u2265",
+        ")|(",
+        "?,\u00bf",
         "!fixedColumnOrder!4,:,!,\u061f,\u061b,-,!text/keyspec_left_double_angle_quote,!text/keyspec_right_double_angle_quote",
-        null,
-        "\u061f",
-        null,
-        null,
-        null,
-        "\u061b",
-        "!fixedColumnOrder!4,\ufd3f|\ufd3e,!text/keyspecs_right_parenthesis_more_keys",
-        "\u064b",
-        ";",
-        "\u066a",
-        "\u061f",
-        "\\%,\u2030",
-        "!fixedColumnOrder!4,\ufd3e|\ufd3f,!text/keyspecs_left_parenthesis_more_keys",
-        null,
-        null,
+        "]|[",
         null,
         "\u266a",
         null,
+        ";",
+        null,
+        null,
+        "\u061f",
+        "\u061f",
+        "\u064b",
+        null,
+        null,
+        null,
+        "\u066a",
+        "!fixedColumnOrder!4,\ufd3e|\ufd3f,!text/keyspecs_left_parenthesis_more_keys",
+        "!fixedColumnOrder!4,\ufd3f|\ufd3e,!text/keyspecs_right_parenthesis_more_keys",
+        "\u061b",
+        null,
         "!fixedColumnOrder!8, \u0654\u25cc|\u0654, \u0652\u25cc|\u0652, \u064d\u25cc|\u064d, \u064c\u25cc|\u064c, \u0651\u25cc|\u0651, \u064b\u25cc|\u064b,!text/keyspec_symbols_question,!, \u0656\u25cc|\u0656, \u0670\u25cc|\u0670, \u0653\u25cc|\u0653, \u0650\u25cc|\u0650, \u064f\u25cc|\u064f,\u0640, \u0655\u25cc|\u0655, \u064e\u25cc|\u064e",
+        "\\%,\u2030",
         null,
         null,
         null,
@@ -1681,13 +1652,13 @@ public final class KeyboardTextsTable {
         null,
         null,
         null,
-        null,
-        null,
-        "!fixedColumnOrder!3,!text/keyspec_left_single_angle_quote,!text/keyspec_less_than_equal,!text/keyspec_less_than",
+        "!fixedColumnOrder!3,!text/keyspec_right_single_angle_quote,!text/keyspec_greater_than_equal,!text/keyspec_greater_than",
         null,
         null,
         null,
-        "!fixedColumnOrder!3,!text/keyspec_right_single_angle_quote,!text/keyspec_greater_than_equal,!text/keyspec_greater_than"
+        null,
+        null,
+        "!fixedColumnOrder!3,!text/keyspec_left_single_angle_quote,!text/keyspec_less_than_equal,!text/keyspec_less_than"
     };
 
     private static final String[] TEXTS_fi = {
@@ -1703,8 +1674,9 @@ public final class KeyboardTextsTable {
         null,
         null,
         "\u0161",
-        "\u00f8,\u00f4,\u00f2,\u00f3,\u00f5,\u0153,\u014d",
         "\u00e6,\u00e0,\u00e1,\u00e2,\u00e3,\u0101",
+        "\u00f8,\u00f4,\u00f2,\u00f3,\u00f5,\u0153,\u014d",
+        null,
         null,
         null,
         "\u017e",
@@ -1734,21 +1706,20 @@ public final class KeyboardTextsTable {
         null,
         null,
         null,
-        null,
-        null,
-        null,
-        null,
         "\u017a,\u017c",
         null,
         null,
-        "\u00f8",
         null,
+        null,
+        null,
+        null,
+        null,
+        "\u00f8",
         "\u00e4",
+        null,
+        null,
         "\u00f6",
         null,
-        null,
-        null,
-        null,
         "\u00e5",
         null,
         null,
@@ -1762,15 +1733,6 @@ public final class KeyboardTextsTable {
         null,
         null,
         null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
         "\u00e6"
     };
 
@@ -1787,11 +1749,10 @@ public final class KeyboardTextsTable {
         "\u00e7",
         null,
         null,
-        "%,\u00f6,\u00f2,\u00f3,\u00f5,\u00f8,\u014d,\u00ba",
         "\u00e1,\u00e4,\u00e3,\u00e5,\u0101,\u00aa",
+        "%,\u00f6,\u00f2,\u00f3,\u00f5,\u00f8,\u014d,\u00ba",
         "\u00fa,\u016b",
         "%,\u0119,\u0117,\u0113",
-        null,
         "\u00ec,\u00ed,\u012f,\u012b",
         null,
         null,
@@ -1805,6 +1766,12 @@ public final class KeyboardTextsTable {
         null,
         null,
         null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
         "%,\u00ff",
         null,
         null,
@@ -1859,17 +1826,7 @@ public final class KeyboardTextsTable {
         null,
         null,
         null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u00e8",
-        "\u00f6",
-        null,
-        null,
+        "\u00fc",
         null,
         null,
         null,
@@ -1877,10 +1834,16 @@ public final class KeyboardTextsTable {
         null,
         null,
         "\u00e0",
-        "\u00e4",
+        "\u00e8",
+        "\u00f6",
+        null,
+        null,
+        null,
+        null,
         "\u00e9",
         null,
-        "\u00fc"
+        null,
+        "\u00e4"
     };
 
     private static final String[] TEXTS_gl = {
@@ -1929,60 +1892,43 @@ public final class KeyboardTextsTable {
         null,
         null,
         null,
-        "\u0966",
-        "2",
-        "\u096a",
         "0",
-        "\u096d",
-        "\u0969",
-        "\u0967",
-        null,
-        "6",
-        "3",
+        "\u0966",
         "\u096f",
-        "1",
-        "4",
-        "\u0968",
-        "\u096e",
-        "5",
-        "7",
-        "\u096c",
-        "9",
         "\u096b",
+        "\u096c",
+        "\u096e",
         "8",
+        "\u096d",
+        "7",
+        "4",
+        "\u096a",
+        "2",
+        null,
+        "5",
+        "\u0969",
+        "6",
+        "\u0967",
+        "1",
+        "\u0968",
+        "3",
+        "9",
+        null,
         null,
         "?\u0967\u0968\u0969",
         null,
         null,
-        null,
-        "!autoColumnOrder!8,\\\\,.,',#,),(,/,;,@,:,-,\\\",+,\\%,&",
+        "!autoColumnOrder!8,.,\\,,?,!,\u0965,#,),(,',/,@,:,;,-,\",+",
         null,
         null,
         null,
         null,
         null,
-        null,
-        null,
-        "!autoColumnOrder!9,\\\\,.,?,!,#,),(,/,;,',@,:,-,\\\",+,\\%,&",
-        null,
-        null,
-        null,
         "\u0964",
         null,
         null,
         null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
+        "!autoColumnOrder!8,\\,,.,?,!,\u0965,#,),(,/,',@,:,;,-,\",+",
         null,
         null,
         null,
@@ -2101,24 +2047,26 @@ public final class KeyboardTextsTable {
         null,
         null,
         null,
+        "Done",
+        null,
         null,
         "Search",
-        "Pause",
-        "Send",
         null,
-        null,
-        null,
-        "Next",
-        null,
-        "Done",
-        "Prev",
+        "Go",
         "Wait",
         null,
+        "Send",
+        null,
+        "Next",
+        "Pause",
         null,
         null,
         null,
         null,
-        "Go"
+        null,
+        null,
+        null,
+        "Prev"
     };
 
     private static final String[] TEXTS_hr = {
@@ -2138,13 +2086,13 @@ public final class KeyboardTextsTable {
         null,
         null,
         null,
+        null,
         "\u017e",
         null,
-        null,
-        "\u015b,\u00df",
         "\u00e7",
-        "!text/double_raqm_laqm",
+        "\u015b,\u00df",
         "!text/single_raqm_laqm",
+        "!text/double_raqm_laqm",
         null,
         null,
         null,
@@ -2166,10 +2114,10 @@ public final class KeyboardTextsTable {
         null,
         null,
         null,
+        "\u017a,\u017c",
         null,
         null,
-        "\u0111",
-        "\u017a,\u017c"
+        "\u0111"
     };
 
     private static final String[] TEXTS_hu = {
@@ -2185,17 +2133,17 @@ public final class KeyboardTextsTable {
         null,
         null,
         null,
-        "\u00f4,\u00f2,\u00f5,\u0153,\u00f8,\u014d",
         "\u00e0,\u00e2,\u00e4,\u00e6,\u00e3,\u00e5,\u0101",
+        "\u00f4,\u00f2,\u00f5,\u0153,\u00f8,\u014d",
         "\u00fb,\u00f9,\u016b",
         "\u00e8,\u00ea,\u00eb,\u0119,\u0117,\u0113",
-        null,
         "\u00ee,\u00ef,\u00ec,\u012f,\u012b",
         null,
         null,
         null,
-        "!text/double_raqm_laqm",
-        "!text/single_raqm_laqm"
+        null,
+        "!text/single_raqm_laqm",
+        "!text/double_raqm_laqm"
     };
 
     private static final String[] TEXTS_hy = {
@@ -2250,16 +2198,10 @@ public final class KeyboardTextsTable {
         null,
         "!text/morekeys_punctuation",
         null,
-        null,
-        null,
-        null,
         "\u055d",
         null,
         null,
         null,
-        null,
-        null,
-        null,
         "\u0589",
         null,
         null,
@@ -2271,8 +2213,20 @@ public final class KeyboardTextsTable {
         null,
         null,
         null,
+        "\u0589",
+        null,
         null,
         "\u055d",
+        "!autoColumnOrder!8,\\,,\u055e,\u055c,.,\u055a,\u0559,?,!,\u055d,\u055b,\u058a,\u00bb,\u00ab,\u055f,;,:",
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
         null,
         null,
         null,
@@ -2281,14 +2235,6 @@ public final class KeyboardTextsTable {
         null,
         null,
         null,
-        "!autoColumnOrder!8,\\,,\u055e,\u055c,.,\u055a,\u0559,?,!,\u055d,\u055b,\u058a,\u00bb,\u00ab,\u055f,;,:",
-        "\u0589",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
         null,
         null,
         null,
@@ -2358,11 +2304,10 @@ public final class KeyboardTextsTable {
         null,
         null,
         null,
-        "\u00f4,\u00f2,\u00f5,\u0153,\u00f8,\u014d",
         "\u00e5,\u00e0,\u00e2,\u00e3,\u0101",
+        "\u00f4,\u00f2,\u00f5,\u0153,\u00f8,\u014d",
         "\u00fc,\u00fb,\u00f9,\u016b",
         "\u00eb,\u00e8,\u00ea,\u0119,\u0117,\u0113",
-        null,
         "\u00ef,\u00ee,\u00ec,\u012f,\u012b",
         null,
         null,
@@ -2376,6 +2321,12 @@ public final class KeyboardTextsTable {
         null,
         null,
         null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
         "\u00fd",
         null,
         null,
@@ -2388,15 +2339,19 @@ public final class KeyboardTextsTable {
         null,
         null,
         null,
-        null,
-        null,
-        null,
-        null,
         "\u00f0",
         null,
         null,
         null,
         null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
         "\u00fe",
         null,
         null,
@@ -2429,13 +2384,6 @@ public final class KeyboardTextsTable {
         null,
         null,
         null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
         "\u00ff"
     };
 
@@ -2452,11 +2400,10 @@ public final class KeyboardTextsTable {
         null,
         null,
         null,
-        "\u00f3,\u00f4,\u00f6,\u00f5,\u0153,\u00f8,\u014d,\u00ba",
         "\u00e1,\u00e2,\u00e4,\u00e6,\u00e3,\u00e5,\u0101,\u00aa",
+        "\u00f3,\u00f4,\u00f6,\u00f5,\u0153,\u00f8,\u014d,\u00ba",
         "\u00fa,\u00fb,\u00fc,\u016b",
         "\u00ea,\u00eb,\u0119,\u0117,\u0113",
-        null,
         "\u00ed,\u00ee,\u00ef,\u012f,\u012b",
         null,
         null,
@@ -2530,11 +2477,7 @@ public final class KeyboardTextsTable {
         null,
         null,
         null,
-        null,
-        "\u00fc",
-        "\u00e9",
-        null,
-        null,
+        "\u00e8",
         null,
         null,
         null,
@@ -2542,10 +2485,16 @@ public final class KeyboardTextsTable {
         null,
         null,
         "\u00e4",
-        "\u00e0",
+        "\u00fc",
+        "\u00e9",
+        null,
+        null,
+        null,
+        null,
         "\u00f6",
         null,
-        "\u00e8"
+        null,
+        "\u00e0"
     };
 
     private static final String[] TEXTS_iw = {
@@ -2613,37 +2562,29 @@ public final class KeyboardTextsTable {
         null,
         null,
         null,
-        "(|)",
-        null,
-        null,
-        "\u2264|\u2265",
-        ">|<",
-        "[|]",
-        "\u2039|\u203a",
-        "}|{",
-        "\u203a|\u2039",
-        null,
         "\u00ab|\u00bb",
-        "{|}",
-        "]|[",
         null,
         null,
-        "\u2265|\u2264",
+        null,
+        "}|{",
+        null,
+        null,
         null,
         "<|>",
-        null,
-        null,
+        "\u2039|\u203a",
+        ">|<",
         "\u2605",
-        ")|(",
         "\u00bb|\u00ab",
+        "(|)",
+        "[|]",
+        "\u203a|\u2039",
+        "{|}",
+        "\u2265|\u2264",
+        "\u2264|\u2265",
+        ")|(",
         null,
         null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
+        "]|[",
         null,
         null,
         null,
@@ -2757,22 +2698,20 @@ public final class KeyboardTextsTable {
         null,
         "\u0451",
         null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u0438",
         "\u044a",
         null,
         null,
-        "\u044d",
-        "\u0449",
+        null,
+        null,
+        null,
         null,
         "\u044b",
         null,
         null,
         null,
+        "\u0449",
+        "\u044d",
+        "\u0438",
         null,
         null,
         null,
@@ -2816,42 +2755,46 @@ public final class KeyboardTextsTable {
         null,
         null,
         null,
-        null,
-        null,
-        null,
-        "\u04af,\u04b1",
-        "\u04e9",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u04a3",
-        "\u0456",
-        null,
-        null,
-        null,
-        null,
         "\u0493",
         null,
         null,
         null,
         null,
+        "\u04e9",
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        "\u04af,\u04b1",
+        null,
+        null,
+        "\u0456",
+        null,
+        "\u04a3",
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        "\u049b",
+        null,
+        null,
         null,
-        "\u04bb",
         null,
         null,
         "\u04d9",
         null,
         null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u049b"
+        "\u04bb"
     };
 
     private static final String[] TEXTS_km = {
@@ -2989,6 +2932,8 @@ public final class KeyboardTextsTable {
         null,
         null,
         null,
+        null,
+        null,
         "\u17db,\u00a2,\u00a3,\u20ac,\u00a5,\u20b1"
     };
 
@@ -3016,27 +2961,28 @@ public final class KeyboardTextsTable {
         null,
         null,
         null,
-        "\u0ce6",
-        "2",
-        "\u0cea",
         "0",
-        "\u0ced",
-        "\u0ce9",
-        "\u0ce7",
-        null,
-        "6",
-        "3",
+        "\u0ce6",
         "\u0cef",
-        "1",
-        "4",
-        "\u0ce8",
-        "\u0cee",
-        "5",
-        "7",
-        "\u0cec",
-        "9",
         "\u0ceb",
+        "\u0cec",
+        "\u0cee",
         "8",
+        "\u0ced",
+        "7",
+        "4",
+        "\u0cea",
+        "2",
+        null,
+        "5",
+        "\u0ce9",
+        "6",
+        "\u0ce7",
+        "1",
+        "\u0ce8",
+        "3",
+        "9",
+        null,
         null,
         "?\u0ce7\u0ce8\u0ce9"
     };
@@ -3092,22 +3038,20 @@ public final class KeyboardTextsTable {
         null,
         "\u0451",
         null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u0438",
         "\u044a",
         null,
         null,
-        "\u044d",
-        "\u0449",
+        null,
+        null,
+        null,
         null,
         "\u044b",
         null,
         null,
         null,
+        "\u0449",
+        "\u044d",
+        "\u0438",
         null,
         null,
         null,
@@ -3154,11 +3098,17 @@ public final class KeyboardTextsTable {
         null,
         null,
         null,
+        null,
+        null,
+        "\u04e9",
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
         "\u04af",
-        "\u04e9",
-        null,
-        null,
-        null,
         null,
         null,
         null,
@@ -3197,6 +3147,7 @@ public final class KeyboardTextsTable {
         null,
         null,
         null,
+        null,
         "\u017e"
     };
 
@@ -3213,15 +3164,15 @@ public final class KeyboardTextsTable {
         "\u010d",
         null,
         "\u0161",
-        "\u00f2,\u00f3,\u00f4,\u00f5,\u00f6,\u0153,\u0151,\u00f8",
         "\u00e0,\u00e1,\u00e2,\u00e3,\u00e4,\u00e5,\u00e6,\u0105",
+        "\u00f2,\u00f3,\u00f4,\u00f5,\u00f6,\u0153,\u0151,\u00f8",
         "\u0173,\u00f9,\u00fa,\u00fb,\u00fc,\u016f,\u0171",
         "\u0117,\u00e8,\u00e9,\u00ea,\u00eb,\u0119,\u011b",
-        "\u017e",
         "\u012f,\u00ec,\u00ed,\u00ee,\u00ef,\u0131",
+        "\u017e",
         "\u0146",
-        "\u00df,\u015b,\u015f",
         "\u00e7,\u0107",
+        "\u00df,\u015b,\u015f",
         null,
         null,
         null,
@@ -3245,17 +3196,8 @@ public final class KeyboardTextsTable {
         null,
         null,
         null,
-        "\u0123",
-        null,
-        null,
         "\u017c,\u017a",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
+        "\u0123",
         null,
         null,
         null,
@@ -3267,6 +3209,14 @@ public final class KeyboardTextsTable {
         "\u00f1,\u0144",
         null,
         null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
         "\u0157",
         null,
         null,
@@ -3278,6 +3228,17 @@ public final class KeyboardTextsTable {
         null,
         null,
         null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
         "\u013c",
         null,
         null,
@@ -3300,39 +3261,28 @@ public final class KeyboardTextsTable {
         null,
         null,
         null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u0137",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
         "\u011f",
         null,
         null,
         null,
         null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        "\u0142,\u013a,\u013e",
+        null,
         "\u0159,\u0155",
         null,
-        "\u0142,\u013a,\u013e"
+        "\u0137"
     };
 
     private static final String[] TEXTS_mk = {
@@ -3444,27 +3394,30 @@ public final class KeyboardTextsTable {
         null,
         null,
         null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
         "\u045c",
         null,
         null,
         null,
-        null,
-        null,
+        "\u0453",
         "\u0437",
         null,
-        "\u0455",
         null,
         null,
         null,
         null,
         null,
+        "\u045d",
         null,
-        "\u0453",
-        null,
-        null,
-        null,
-        null,
-        "\u045d"
+        "\u0455"
     };
 
     private static final String[] TEXTS_ml = {
@@ -3519,27 +3472,28 @@ public final class KeyboardTextsTable {
         null,
         null,
         null,
-        "\u0966",
-        "2",
-        "\u096a",
         "0",
-        "\u096d",
-        "\u0969",
-        "\u0967",
-        null,
-        "6",
-        "3",
+        "\u0966",
         "\u096f",
-        "1",
-        "4",
-        "\u0968",
-        "\u096e",
-        "5",
-        "7",
-        "\u096c",
-        "9",
         "\u096b",
+        "\u096c",
+        "\u096e",
         "8",
+        "\u096d",
+        "7",
+        "4",
+        "\u096a",
+        "2",
+        null,
+        "5",
+        "\u0969",
+        "6",
+        "\u0967",
+        "1",
+        "\u0968",
+        "3",
+        "9",
+        null,
         null,
         "?\u0967\u0968\u0969"
     };
@@ -3596,39 +3550,37 @@ public final class KeyboardTextsTable {
         null,
         null,
         null,
-        null,
-        null,
-        null,
         "\u104a",
         null,
         null,
         null,
-        null,
-        null,
-        null,
         "\u104b",
         null,
         null,
         null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        "\u104b",
         "\u104a",
         null,
         null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
         "!autoColumnOrder!9,\u104a,.,?,!,#,),(,/,;,...,',@,:,-,\\\",+,\\%,&",
-        "\u104b",
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
         null,
         null,
         null,
@@ -3662,9 +3614,6 @@ public final class KeyboardTextsTable {
         null,
         null,
         null,
-        null,
-        null,
-        null,
         "!autoColumnOrder!8,.,',#,),(,/,;,@,...,:,-,\\\",+,\\%,&"
     };
 
@@ -3719,14 +3668,14 @@ public final class KeyboardTextsTable {
         null,
         null,
         null,
-        "\u00f6",
         null,
+        null,
+        "\u00f6",
         "\u00e6",
+        null,
+        null,
         "\u00f8",
         null,
-        null,
-        null,
-        null,
         "\u00e5",
         null,
         null,
@@ -3740,15 +3689,6 @@ public final class KeyboardTextsTable {
         null,
         null,
         null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
         "\u00e4"
     };
 
@@ -3776,60 +3716,43 @@ public final class KeyboardTextsTable {
         null,
         null,
         null,
-        "\u0966",
-        "2",
-        "\u096a",
         "0",
-        "\u096d",
-        "\u0969",
-        "\u0967",
-        null,
-        "6",
-        "3",
+        "\u0966",
         "\u096f",
-        "1",
-        "4",
-        "\u0968",
-        "\u096e",
-        "5",
-        "7",
-        "\u096c",
-        "9",
         "\u096b",
+        "\u096c",
+        "\u096e",
         "8",
+        "\u096d",
+        "7",
+        "4",
+        "\u096a",
+        "2",
+        null,
+        "5",
+        "\u0969",
+        "6",
+        "\u0967",
+        "1",
+        "\u0968",
+        "3",
+        "9",
+        null,
         null,
         "?\u0967\u0968\u0969",
         null,
         null,
-        null,
-        "!autoColumnOrder!8,.,\\\\,',#,),(,/,;,@,:,-,\\\",+,\\%,&",
+        "!autoColumnOrder!8,.,\\,,?,!,\u0965,#,),(,',/,@,:,;,-,\",+",
         null,
         null,
         null,
         null,
         null,
-        null,
-        null,
-        "!autoColumnOrder!9,.,\\\\,?,!,#,),(,/,;,',@,:,-,\\\",+,\\%,&",
-        null,
-        null,
-        null,
         "\u0964",
         null,
         null,
         null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
+        "!autoColumnOrder!8,\\,,.,?,!,\u0965,#,),(,/,',@,:,;,-,\",+",
         null,
         null,
         null,
@@ -3852,8 +3775,8 @@ public final class KeyboardTextsTable {
         null,
         null,
         null,
-        "\u00f4,\u00f2,\u00f5,\u0153,\u00f8,\u014d",
         "\u00e6,\u00e3,\u00e5,\u0101",
+        "\u00f4,\u00f2,\u00f5,\u0153,\u00f8,\u014d",
         "\u00fb,\u00f9,\u016b",
         "\u0119,\u0117,\u0113"
     };
@@ -3871,18 +3794,15 @@ public final class KeyboardTextsTable {
         "\u0107",
         null,
         "\u015b",
-        "\u00f6,\u00f4,\u00f2,\u00f5,\u0153,\u00f8,\u014d",
         "\u00e1,\u00e0,\u00e2,\u00e4,\u00e6,\u00e3,\u00e5,\u0101",
+        "\u00f6,\u00f4,\u00f2,\u00f5,\u0153,\u00f8,\u014d",
         null,
         "\u00e8,\u00e9,\u00ea,\u00eb,\u0117,\u0113",
+        null,
         "\u017c,\u017a",
-        null,
         "\u0144",
-        "\u00df,\u0161",
         "\u00e7,\u010d",
-        null,
-        null,
-        null,
+        "\u00df,\u0161",
         null,
         null,
         null,
@@ -3916,12 +3836,6 @@ public final class KeyboardTextsTable {
         null,
         null,
         null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
         "\u00f1",
         null,
         null,
@@ -3936,6 +3850,25 @@ public final class KeyboardTextsTable {
         null,
         null,
         null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
         "\u0142"
     };
 
@@ -3952,11 +3885,10 @@ public final class KeyboardTextsTable {
         "\u00e7",
         null,
         null,
-        "\u00f2,\u00f6,\u0153,\u00f8,\u014d,\u00ba",
         "\u00e4,\u00e5,\u00e6,\u00aa",
+        "\u00f2,\u00f6,\u0153,\u00f8,\u014d,\u00ba",
         "\u00f9,\u00fb,\u016b",
         "\u00e8,\u0119,\u0117,\u0113,\u00eb",
-        null,
         "\u00ee,\u00ec,\u00ef,\u012f,\u012b",
         null,
         null,
@@ -4028,6 +3960,10 @@ public final class KeyboardTextsTable {
         null,
         null,
         null,
+        null,
+        null,
+        null,
+        null,
         "\u00e7"
     };
 
@@ -4051,13 +3987,14 @@ public final class KeyboardTextsTable {
         null,
         null,
         "\u0219",
-        null,
         "\u00e3,\u00e0,\u00e1,\u00e4,\u00e6,\u00e5,\u0101",
         null,
         null,
         null,
         "\u00ef,\u00ec,\u00ed,\u012f,\u012b",
         null,
+        null,
+        null,
         "\u00df,\u015b,\u0161",
         null,
         null,
@@ -4090,6 +4027,14 @@ public final class KeyboardTextsTable {
         null,
         null,
         null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
         "\u021b"
     };
 
@@ -4144,19 +4089,20 @@ public final class KeyboardTextsTable {
         null,
         "\u0451",
         null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u0438",
         "\u044a",
         null,
         null,
-        "\u044d",
-        "\u0449",
         null,
-        "\u044b"
+        null,
+        null,
+        null,
+        "\u044b",
+        null,
+        null,
+        null,
+        "\u0449",
+        "\u044d",
+        "\u0438"
     };
 
     private static final String[] TEXTS_si = {
@@ -4186,17 +4132,22 @@ public final class KeyboardTextsTable {
         "\u010d",
         null,
         "\u0161",
-        "\u00f6,\u00f2,\u00f5,\u0153,\u0151,\u00f8",
         "\u0101,\u00e0,\u00e2,\u00e3,\u00e5,\u00e6,\u0105",
+        "\u00f6,\u00f2,\u00f5,\u0153,\u0151,\u00f8",
         "\u016f,\u00fc,\u016b,\u0173,\u00f9,\u00fb,\u0171",
         "\u011b,\u0113,\u0117,\u00e8,\u00ea,\u00eb,\u0119",
-        "\u017e",
         "\u012b,\u012f,\u00ec,\u00ee,\u00ef,\u0131",
+        "\u017e",
         "\u0148",
-        "\u00df,\u015b,\u015f",
         "\u00e7,\u0107",
-        "!text/double_raqm_laqm",
+        "\u00df,\u015b,\u015f",
         "!text/single_raqm_laqm",
+        "!text/double_raqm_laqm",
+        null,
+        null,
+        null,
+        null,
+        null,
         null,
         null,
         null,
@@ -4213,24 +4164,10 @@ public final class KeyboardTextsTable {
         null,
         null,
         null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u010f",
         "\u017c,\u017a",
         null,
         null,
-        null,
-        "\u0165",
-        null,
-        null,
-        null,
-        null,
-        null,
+        "\u010f",
         null,
         null,
         null,
@@ -4240,6 +4177,14 @@ public final class KeyboardTextsTable {
         "\u0146,\u00f1,\u0144",
         null,
         null,
+        null,
+        null,
+        null,
+        "\u0165",
+        null,
+        null,
+        null,
+        null,
         "\u0155",
         null,
         null,
@@ -4251,19 +4196,22 @@ public final class KeyboardTextsTable {
         null,
         null,
         null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
         "\u013e,\u013a",
         null,
         null,
         null,
         null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
         "\u00ff",
         null,
         null,
@@ -4298,18 +4246,9 @@ public final class KeyboardTextsTable {
         null,
         null,
         null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u0159,\u0157",
-        null,
         "\u013c,\u0142",
         null,
-        null,
-        null,
-        null,
+        "\u0159,\u0157",
         null,
         null,
         null,
@@ -4334,13 +4273,13 @@ public final class KeyboardTextsTable {
         null,
         null,
         null,
+        null,
         "\u017e",
         null,
-        null,
-        null,
         "\u0107",
-        "!text/double_raqm_laqm",
-        "!text/single_raqm_laqm"
+        null,
+        "!text/single_raqm_laqm",
+        "!text/double_raqm_laqm"
     };
 
     private static final String[] TEXTS_sr = {
@@ -4365,8 +4304,8 @@ public final class KeyboardTextsTable {
         null,
         null,
         null,
-        "!text/double_raqm_laqm",
         "!text/single_raqm_laqm",
+        "!text/double_raqm_laqm",
         null,
         null,
         null,
@@ -4452,27 +4391,30 @@ public final class KeyboardTextsTable {
         null,
         null,
         null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
         "\u045b",
         null,
         null,
         null,
-        null,
-        null,
+        "\u0452",
         "\u0455",
         null,
-        "\u0437",
         null,
         null,
         null,
         null,
         null,
+        "\u045d",
         null,
-        "\u0452",
-        null,
-        null,
-        null,
-        null,
-        "\u045d"
+        "\u0437"
     };
 
     private static final String[] TEXTS_sr_ZZ = {
@@ -4492,6 +4434,7 @@ public final class KeyboardTextsTable {
         null,
         null,
         null,
+        null,
         "\u017e,%",
         null,
         null,
@@ -4583,25 +4526,26 @@ public final class KeyboardTextsTable {
         null,
         null,
         null,
+        "Gotov",
         null,
         null,
         "Tra\u017ei",
-        "Pauza",
-        "\u0160alji",
         null,
-        null,
-        null,
-        "Sled",
-        null,
-        "Gotov",
-        "Preth",
+        "Idi",
         "\u010cekaj",
         null,
+        "\u0160alji",
+        null,
+        "Sled",
+        "Pauza",
         null,
         null,
         null,
         null,
-        "Idi"
+        null,
+        null,
+        null,
+        "Preth"
     };
 
     private static final String[] TEXTS_sv = {
@@ -4617,8 +4561,8 @@ public final class KeyboardTextsTable {
         null,
         null,
         null,
-        "\u00f8,\u0153,\u00f3,\u00f2,\u00f4,\u00f5,\u014d",
         "\u00e6,\u00e1,\u00e0,\u00e2,\u0105,\u00e3",
+        "\u00f8,\u0153,\u00f3,\u00f2,\u00f4,\u00f5,\u014d",
         null,
         "\u00e8,\u00ea,\u00eb,\u0119",
         null,
@@ -4626,8 +4570,10 @@ public final class KeyboardTextsTable {
         null,
         null,
         null,
-        "!text/double_raqm_laqm",
         "!text/single_raqm_laqm",
+        "!text/double_raqm_laqm",
+        null,
+        null,
         null,
         null,
         null,
@@ -4656,13 +4602,11 @@ public final class KeyboardTextsTable {
         null,
         null,
         "\u00f8,\u0153",
-        null,
         "\u00e4",
+        null,
+        null,
         "\u00f6",
         null,
-        null,
-        null,
-        null,
         "\u00e5",
         null,
         null,
@@ -4676,15 +4620,6 @@ public final class KeyboardTextsTable {
         null,
         null,
         null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
         "\u00e6"
     };
 
@@ -4733,6 +4668,7 @@ public final class KeyboardTextsTable {
         null,
         null,
         null,
+        null,
         "g\\'"
     };
 
@@ -4832,15 +4768,16 @@ public final class KeyboardTextsTable {
         "\u00e7",
         null,
         "\u015f",
+        null,
         "\u00f4,\u0153,\u00f2,\u00f3,\u00f5,\u00f8,\u014d",
-        null,
         "\u00fb,\u00f9,\u00fa,\u016b",
         null,
-        null,
         "\u00ee,\u00ef,\u00ec,\u00ed,\u012f,\u012b",
         null,
-        "\u00df,\u015b,\u0161",
+        null,
         "\u0107,\u010d",
+        "\u00df,\u015b,\u0161",
+        null,
         null,
         null,
         null,
@@ -4918,22 +4855,20 @@ public final class KeyboardTextsTable {
         null,
         null,
         null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u0438",
         "\u044a",
         null,
         null,
-        "\u0454",
-        "\u0449",
+        null,
+        null,
+        null,
         null,
         "\u0456",
         null,
         null,
         null,
+        "\u0449",
+        "\u0454",
+        "\u0438",
         null,
         null,
         null,
@@ -4977,6 +4912,7 @@ public final class KeyboardTextsTable {
         null,
         null,
         null,
+        "\u0491",
         null,
         null,
         null,
@@ -4990,12 +4926,9 @@ public final class KeyboardTextsTable {
         null,
         null,
         null,
-        "\u0457",
         null,
         null,
-        null,
-        null,
-        "\u0491"
+        "\u0457"
     };
 
     private static final String[] TEXTS_uz = {
@@ -5015,8 +4948,8 @@ public final class KeyboardTextsTable {
         null,
         null,
         null,
-        "\u017e",
         null,
+        "\u017e",
         "\u0148,\u00f1",
         null,
         null,
@@ -5029,6 +4962,11 @@ public final class KeyboardTextsTable {
         null,
         null,
         null,
+        null,
+        null,
+        null,
+        null,
+        null,
         "\u00fd",
         null,
         null,
@@ -5039,10 +4977,6 @@ public final class KeyboardTextsTable {
         null,
         null,
         null,
-        null,
-        null,
-        null,
-        null,
         "\u011f"
     };
 
@@ -5077,6 +5011,11 @@ public final class KeyboardTextsTable {
         null,
         null,
         null,
+        null,
+        null,
+        null,
+        null,
+        null,
         "\u1ef3,\u00fd,\u1ef7,\u1ef9,\u1ef5",
         null,
         null,
@@ -5089,10 +5028,6 @@ public final class KeyboardTextsTable {
         null,
         null,
         null,
-        null,
-        null,
-        null,
-        null,
         "\u0111"
     };
 
@@ -5135,8 +5070,8 @@ public final class KeyboardTextsTable {
         null,
         null,
         null,
-        "\u017a,\u017c,\u017e",
         null,
+        "\u017a,\u017c,\u017e",
         "\u00f1,\u0144,\u0146,\u0148,\u0149,\u014b",
         null,
         null,
@@ -5149,6 +5084,11 @@ public final class KeyboardTextsTable {
         null,
         null,
         null,
+        null,
+        null,
+        null,
+        null,
+        null,
         "\u00fd,\u0177,\u00ff,\u0133",
         null,
         null,
@@ -5159,10 +5099,6 @@ public final class KeyboardTextsTable {
         null,
         null,
         null,
-        null,
-        null,
-        null,
-        null,
         "\u011d,\u011f,\u0121,\u0123",
         null,
         "\u010f,\u0111,\u00f0",
@@ -5170,21 +5106,19 @@ public final class KeyboardTextsTable {
         null,
         null,
         null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
         "\u00fe,\u0163,\u0165,\u0167",
         null,
         null,
         null,
         null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
         "\u0155,\u0157,\u0159",
         null,
         null,
@@ -5196,6 +5130,17 @@ public final class KeyboardTextsTable {
         null,
         null,
         null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
         "\u013a,\u013c,\u013e,\u0140,\u0142",
         null,
         null,
@@ -5219,6 +5164,7 @@ public final class KeyboardTextsTable {
         null,
         null,
         null,
+        "\u0125",
         null,
         null,
         null,
@@ -5226,6 +5172,18 @@ public final class KeyboardTextsTable {
         null,
         null,
         null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        "\u0135",
+        null,
+        null,
+        null,
+        null,
+        null,
         "\u0137,\u0138",
         null,
         null,
@@ -5241,19 +5199,6 @@ public final class KeyboardTextsTable {
         null,
         null,
         null,
-        null,
-        null,
-        null,
-        null,
-        "\u0135",
-        null,
-        null,
-        null,
-        "\u0125",
-        null,
-        null,
-        null,
-        null,
         "\u0175"
     };
 
@@ -5270,285 +5215,285 @@ public final class KeyboardTextsTable {
         EMPTY,
         "$",
         EMPTY,
-        "\u00f3,\u00f4,\u00f6,\u00f2,\u0153,\u00f8,\u014d,\u00f5",
         "\u00e0,\u00e1,\u00e2,\u00e4,\u00e6,\u00e3,\u00e5,\u0101",
+        "\u00f3,\u00f4,\u00f6,\u00f2,\u0153,\u00f8,\u014d,\u00f5",
         "\u00fa,\u00fb,\u00fc,\u00f9,\u016b",
         "\u00e9,\u00e8,\u00ea,\u00eb,\u0113",
-        EMPTY,
         "\u00ed,\u00ee,\u00ef,\u012b,\u00ec",
         EMPTY,
-        "\u00df",
+        EMPTY,
         "\u00e7",
-        "!text/double_laqm_raqm",
+        "\u00df",
         "!text/single_laqm_raqm",
+        "!text/double_laqm_raqm",
+        EMPTY,
         "0",
+        "9",
+        "5",
+        "6",
+        "8",
+        EMPTY,
+        "7",
+        EMPTY,
         EMPTY,
         "4",
         EMPTY,
-        "7",
+        EMPTY,
+        EMPTY,
         "3",
+        EMPTY,
         "1",
         EMPTY,
-        EMPTY,
-        EMPTY,
-        "9",
-        EMPTY,
-        EMPTY,
         "2",
-        "8",
         EMPTY,
         EMPTY,
-        "6",
-        EMPTY,
-        "5",
         EMPTY,
         EMPTY,
         "?123",
         EMPTY,
         EMPTY,
-        EMPTY,
         "!text/morekeys_tablet_punctuation",
-        "\u00f8",
         EMPTY,
-        "\u00e4",
-        "\u00f6",
         ",",
+        "\u00f8",
+        "\u00e4",
+        "\u00f1",
+        ".",
+        "\u00f6",
         EMPTY,
-        EMPTY,
-        "!text/morekeys_punctuation",
         "\u00e5",
+        "!text/morekeys_punctuation",
         EMPTY,
         EMPTY,
+        EMPTY,
+        EMPTY,
+        "\u00ab",
+        EMPTY,
         ".",
         EMPTY,
-        "\u00f1",
-        "(",
-        EMPTY,
-        EMPTY,
-        "\u2264",
-        ">",
-        "[",
-        "\u2039",
         "}",
-        "\u203a",
         ",",
-        "\u00ab",
-        "{",
-        "]",
-        EMPTY,
-        "\u00bf",
-        "\u2265",
+        "!autoColumnOrder!8,\\,,?,!,#,!text/keyspec_right_parenthesis,!text/keyspec_left_parenthesis,/,;,',@,:,-,\",+,\\%,&",
         "\u00e6",
         "<",
-        "!autoColumnOrder!8,\\,,?,!,#,!text/keyspec_right_parenthesis,!text/keyspec_left_parenthesis,/,;,',@,:,-,\",+,\\%,&",
-        ".",
+        "\u2039",
+        ">",
         "\u2020,\u2021,\u2605",
-        ")",
         "\u00bb",
+        "(",
+        "[",
+        "\u203a",
+        "{",
+        "\u2265",
+        "\u2264",
+        ")",
+        "\u00bf",
         EMPTY,
-        "\u00f1",
-        EMPTY,
-        EMPTY,
-        EMPTY,
-        EMPTY,
-        ";",
-        "!autoColumnOrder!3,!text/keyspecs_right_parenthesis_more_keys",
-        EMPTY,
-        EMPTY,
-        "%",
-        "?",
-        "\u2030",
-        "!autoColumnOrder!3,!text/keyspecs_left_parenthesis_more_keys",
-        EMPTY,
-        EMPTY,
+        "]",
         EMPTY,
         "\u266a,\u2665,\u2660,\u2666,\u2663",
         EMPTY,
         EMPTY,
+        "\u00f1",
+        EMPTY,
+        EMPTY,
+        "?",
+        EMPTY,
+        EMPTY,
+        EMPTY,
+        EMPTY,
+        "%",
+        "!autoColumnOrder!3,!text/keyspecs_left_parenthesis_more_keys",
+        "!autoColumnOrder!3,!text/keyspecs_right_parenthesis_more_keys",
+        ";",
+        EMPTY,
+        EMPTY,
+        "\u2030",
+        EMPTY,
+        EMPTY,
+        "!string/label_done_key",
         EMPTY,
         EMPTY,
         "!string/label_search_key",
-        "!string/label_pause_key",
-        "!string/label_send_key",
-        EMPTY,
-        EMPTY,
-        EMPTY,
-        "!string/label_next_key",
-        EMPTY,
-        "!string/label_done_key",
-        "!string/label_previous_key",
-        "!string/label_wait_key",
-        "!autoColumnOrder!8,\\,,?,!,#,!text/keyspec_right_parenthesis,!text/keyspec_left_parenthesis,/,;,',@,:,-,\",+,\\%,&",
-        EMPTY,
-        EMPTY,
-        EMPTY,
         EMPTY,
         "!string/label_go_key",
+        "!string/label_wait_key",
+        "!autoColumnOrder!8,\\,,?,!,#,!text/keyspec_right_parenthesis,!text/keyspec_left_parenthesis,/,;,',@,:,-,\",+,\\%,&",
+        "!string/label_send_key",
+        EMPTY,
+        "!string/label_next_key",
+        "!string/label_pause_key",
         EMPTY,
         EMPTY,
         EMPTY,
         EMPTY,
         EMPTY,
         EMPTY,
-        "y",
         EMPTY,
+        "!string/label_previous_key",
+        EMPTY,
+        EMPTY,
+        EMPTY,
+        EMPTY,
+        EMPTY,
+        EMPTY,
+        "\u00b1",
+        "w",
         "\u00a2,\u00a3,\u20ac,\u00a5,\u20b1",
         EMPTY,
-        EMPTY,
-        EMPTY,
-        "q",
+        "!fixedColumnOrder!3,!text/keyspec_right_single_angle_quote,!text/keyspec_greater_than_equal,!text/keyspec_right_double_angle_quote",
         "x",
+        "q",
+        "\u00a1,\u203d",
+        "y",
         EMPTY,
         "!fixedColumnOrder!3,!text/keyspec_left_single_angle_quote,!text/keyspec_less_than_equal,!text/keyspec_left_double_angle_quote",
-        "\u00b1",
-        "\u00a1,\u203d",
-        EMPTY,
-        "!fixedColumnOrder!3,!text/keyspec_right_single_angle_quote,!text/keyspec_greater_than_equal,!text/keyspec_right_double_angle_quote",
-        "w",
-        "!hasLabels!,!text/label_previous_key|!code/key_action_previous",
-        ".com",
-        "#",
-        EMPTY,
-        "!text/keyspec_left_double_angle_quote,!text/keyspec_right_double_angle_quote",
-        "$",
-        EMPTY,
-        "[",
-        "!fixedColumnOrder!2,!hasLabels!,!text/keylabel_time_am,!text/keylabel_time_pm",
-        "\"",
-        EMPTY,
-        ";",
-        "\uff0a\uff03",
-        "0",
-        "!",
-        "&",
-        EMPTY,
-        "!text/keyspec_less_than,!text/keyspec_left_curly_bracket,!text/keyspec_left_square_bracket",
         EMPTY,
         EMPTY,
-        "= \\\\ <",
-        EMPTY,
-        EMPTY,
-        "\u201e,\u201c,\u201d",
-        "\u2070,\u2080,\u207f,\u2205",
-        "!icon/action_cut|!code/action_cut",
-        ":",
-        EMPTY,
-        "!icon/action_select_all|!code/action_select_all",
-        "\u201a,\u2018,\u2019",
-        "%",
-        "\u2076,\u2086",
-        EMPTY,
-        EMPTY,
-        EMPTY,
-        "1",
-        "3",
-        "AM",
-        EMPTY,
-        EMPTY,
-        "!fixedColumnOrder!4,!needsDividers!,!icon/action_switch_language|!code/action_switch_language,!icon/action_text_edit|!code/action_text_edit,!icon/action_clipboard_history|!code/action_clipboard_history,!icon/action_emoji|!code/action_emoji,!icon/action_undo|!code/action_undo,!icon/action_redo|!code/action_redo",
-        "=",
-        "!text/keyspec_right_single_angle_quote,!text/keyspec_left_single_angle_quote",
-        "!text/keyspec_right_double_angle_quote,!text/keyspec_left_double_angle_quote",
-        EMPTY,
-        "!icon/action_paste|!code/action_paste",
-        "#",
-        "\u201c,\u201d,\u201e",
-        "!icon/shortcut_key|!code/key_shortcut",
-        "\u2018,\u201a,\u2019",
-        "\u2075,\u2085,\u215d",
-        "\u2077,\u2087,\u215e",
         "!fixedColumnOrder!5,!text/single_quotes,!text/single_angle_quotes",
         EMPTY,
+        "1",
+        "\u2078,\u2088",
+        "\u2019,\u201a,\u2018",
+        EMPTY,
+        "!fixedColumnOrder!2,!hasLabels!,!text/keylabel_time_am,!text/keylabel_time_pm",
+        EMPTY,
+        "\u2070,\u2080,\u207f,\u2205",
         EMPTY,
         EMPTY,
+        "!text/keyspec_left_double_angle_quote,!text/keyspec_right_double_angle_quote",
+        "\u2018,\u201a,\u2019",
         EMPTY,
-        "7",
-        "(",
-        "!fixedColumnOrder!5,!text/double_quotes,!text/double_angle_quotes",
-        "!icon/action_undo|!code/action_undo",
-        "!fixedColumnOrder!4,!needsDividers!,!icon/action_switch_language|!code/action_switch_language,!icon/action_text_edit|!code/action_text_edit,!icon/action_clipboard_history|!code/action_clipboard_history,!icon/action_emoji|!code/action_emoji,!icon/previous_key|!code/key_action_previous,!icon/next_key|!code/key_action_next,!icon/action_undo|!code/action_undo,!icon/action_redo|!code/action_redo",
+        EMPTY,
+        "=",
+        EMPTY,
+        "!hasLabels!,!text/label_next_key|!code/key_action_next",
+        EMPTY,
+        EMPTY,
+        "\u201c,\u201e,\u201d",
+        "!icon/action_redo|!code/action_redo",
+        "!text/keyspec_greater_than,!text/keyspec_right_curly_bracket,!text/keyspec_right_square_bracket",
+        "\u00b9,\u2081,\u00bd,\u2153,\u00bc,\u215b",
+        "!",
+        "!icon/action_copy|!code/action_copy",
+        "^",
+        "&,|",
         "!fixedColumnOrder!6,!text/double_quotes,!text/single_quotes,!text/double_angle_quotes,!text/single_angle_quotes",
-        "\u00b2,\u2082,\u2154",
+        "!",
+        "8",
+        "!icon/action_select_all|!code/action_select_all",
+        "@",
+        "*",
+        EMPTY,
+        EMPTY,
+        "$",
+        "\u2077,\u2087,\u215e",
+        EMPTY,
+        "123",
+        "\u201d,\u201e,\u201c",
+        "!fixedColumnOrder!5,!text/double_quotes,!text/double_angle_quotes",
+        "PM",
+        "!icon/settings_key|!code/key_settings",
+        EMPTY,
+        "\\%",
+        "]",
+        "6",
+        EMPTY,
+        EMPTY,
+        "\u2018,\u2019,\u201a",
+        ")",
+        "'",
+        EMPTY,
+        EMPTY,
+        EMPTY,
+        EMPTY,
+        EMPTY,
+        EMPTY,
+        EMPTY,
+        "!fixedColumnOrder!4,!needsDividers!,!icon/action_switch_language|!code/action_switch_language,!icon/action_text_edit|!code/action_text_edit,!icon/action_clipboard_history|!code/action_clipboard_history,!icon/action_emoji|!code/action_emoji,!icon/previous_key|!code/key_action_previous,!icon/next_key|!code/key_action_next,!icon/action_undo|!code/action_undo,!icon/action_redo|!code/action_redo",
+        "\u201a,\u2018,\u2019",
+        "!hasLabels!,.net,.org,.gov,.edu",
+        "!icon/shortcut_key|!code/key_shortcut",
+        "!text/keyspec_currency,$",
+        "\\\\",
+        EMPTY,
+        EMPTY,
         EMPTY,
         EMPTY,
         "+,=",
-        "@",
-        EMPTY,
-        EMPTY,
-        "}",
-        "*",
-        EMPTY,
-        EMPTY,
-        EMPTY,
-        "\u2074,\u2084",
+        "= \\\\ <",
+        "#",
+        "!icon/action_settings|!code/action_settings",
         "-,\u2013,\u2014,_",
         EMPTY,
-        "PM",
-        EMPTY,
-        EMPTY,
-        "\\%",
-        "2",
-        "!hasLabels!,.net,.org,.gov,.edu",
-        "&,|",
-        EMPTY,
-        EMPTY,
-        "!icon/action_copy|!code/action_copy",
-        "6",
-        EMPTY,
-        "4",
-        EMPTY,
-        "\u00b3,\u2083,\u00be,\u215c",
-        "@",
-        "!text/keyspec_currency,$",
-        "!text/keyspec_left_single_angle_quote,!text/keyspec_right_single_angle_quote",
-        "\u201c,\u201e,\u201d",
-        "123",
-        EMPTY,
-        "!icon/action_redo|!code/action_redo",
-        EMPTY,
-        "\u2078,\u2088",
-        EMPTY,
-        "]",
-        EMPTY,
-        EMPTY,
-        "!text/keyspec_greater_than,!text/keyspec_right_curly_bracket,!text/keyspec_right_square_bracket",
-        "^",
         EMPTY,
         ">",
-        "!icon/settings_key|!code/key_settings",
-        "\u2079,\u2089",
-        "(,[,{,<",
+        "\u2075,\u2085,\u215d",
+        "\u00b2,\u2082,\u2154",
+        "!text/keyspec_left_single_angle_quote,!text/keyspec_right_single_angle_quote",
+        ".com",
+        EMPTY,
+        "0",
+        EMPTY,
+        "\uff0a\uff03",
+        "{",
+        "!icon/action_paste|!code/action_paste",
+        "\u2076,\u2086",
+        "\u2074,\u2084",
+        EMPTY,
+        EMPTY,
+        "!icon/action_undo|!code/action_undo",
+        "!icon/action_cut|!code/action_cut",
+        "!fixedColumnOrder!4,!needsDividers!,!icon/action_switch_language|!code/action_switch_language,!icon/action_text_edit|!code/action_text_edit,!icon/action_clipboard_history|!code/action_clipboard_history,!icon/action_emoji|!code/action_emoji,!icon/action_undo|!code/action_undo,!icon/action_redo|!code/action_redo",
+        "\u201c,\u201d,\u201e",
+        "\\%",
+        "&",
+        "),],},>",
         "?,/",
-        "\u2018,\u2019,\u201a",
-        "8",
+        EMPTY,
+        "!text/keyspec_right_single_angle_quote,!text/keyspec_left_single_angle_quote",
+        EMPTY,
+        "%",
+        "2",
+        "\u2079,\u2089",
+        "~ [ <",
+        "\u00b3,\u2083,\u00be,\u215c",
+        EMPTY,
+        "}",
+        EMPTY,
+        "\u201e,\u201c,\u201d",
+        "7",
+        "!text/keyspec_less_than,!text/keyspec_left_curly_bracket,!text/keyspec_left_square_bracket",
+        "|",
+        "[",
+        EMPTY,
+        EMPTY,
+        EMPTY,
+        ";",
+        "5",
+        "#",
+        EMPTY,
+        EMPTY,
+        "!text/keyspec_right_double_angle_quote,!text/keyspec_left_double_angle_quote",
+        "!hasLabels!,!text/label_previous_key|!code/key_action_previous",
         "9",
         EMPTY,
-        "{",
-        EMPTY,
-        "),],},>",
-        EMPTY,
-        "<",
-        EMPTY,
-        "!icon/action_settings|!code/action_settings",
-        EMPTY,
-        EMPTY,
+        "@",
+        "3",
         "$,\u00a2,\u20ac,\u00a3,\u00a5,\u20b1",
         EMPTY,
-        "\\%",
-        "5",
+        "AM",
+        "(",
+        EMPTY,
+        "4",
+        "\"",
         EMPTY,
-        "|",
-        "\u2019,\u201a,\u2018",
         EMPTY,
-        "!",
-        "!hasLabels!,!text/label_next_key|!code/key_action_next",
-        "\u00b9,\u2081,\u00bd,\u2153,\u00bc,\u215b",
-        "'",
         "*",
-        ")",
-        "~ [ <",
-        "\u201d,\u201e,\u201c",
-        "\\\\"
+        ":",
+        EMPTY,
+        "(,[,{,<",
+        "<"
     };
 
 
diff --git a/java/src/org/futo/inputmethod/latin/settings/LongPressKeySettings.kt b/java/src/org/futo/inputmethod/latin/settings/LongPressKeySettings.kt
index ad6cb9486..0da4ac272 100644
--- a/java/src/org/futo/inputmethod/latin/settings/LongPressKeySettings.kt
+++ b/java/src/org/futo/inputmethod/latin/settings/LongPressKeySettings.kt
@@ -100,13 +100,12 @@ fun List<LongPressKey>.toEncodedString(): String {
     }
 }
 
-class LongPressKeySettings(val context: Context) {
-    private val currentSetting = context.getSettingBlocking(LongPressKeyLayoutSetting).toLongPressKeyLayoutItems()
-
-    val currentOrder: List<LongPressKey>
-        get() = currentSetting
-
+data class LongPressKeySettings(val currentOrder: List<LongPressKey>) {
     companion object {
+        @JvmStatic
+        fun load(context: Context): LongPressKeySettings =
+            LongPressKeySettings(context.getSettingBlocking(LongPressKeyLayoutSetting).toLongPressKeyLayoutItems())
+
         @JvmStatic
         fun joinMoreKeys(keys: List<String>): String =
             keys.map {
@@ -138,7 +137,7 @@ class LongPressKeySettings(val context: Context) {
 
         // Add the necessary configurable keys in the correct order.
         // Key kinds not enabled are not added
-        currentSetting.forEach { kind ->
+        currentOrder.forEach { kind ->
             keys.forEach { key ->
                 if(getKind(key) == kind) {
                     finalKeys.add(key)
@@ -148,14 +147,4 @@ class LongPressKeySettings(val context: Context) {
 
         return finalKeys
     }
-
-    override operator fun equals(other: Any?): Boolean {
-        return other is LongPressKeySettings && (other.currentSetting.joinToString(",") == currentSetting.joinToString(","))
-    }
-
-    override fun hashCode(): Int {
-        var result = context.hashCode()
-        result = 31 * result + currentSetting.hashCode()
-        return result
-    }
 }
\ No newline at end of file
diff --git a/java/src/org/futo/inputmethod/v2keyboard/KeyboardLayoutSet.kt b/java/src/org/futo/inputmethod/v2keyboard/KeyboardLayoutSet.kt
index 67387e086..bf7fdd5fd 100644
--- a/java/src/org/futo/inputmethod/v2keyboard/KeyboardLayoutSet.kt
+++ b/java/src/org/futo/inputmethod/v2keyboard/KeyboardLayoutSet.kt
@@ -215,7 +215,7 @@ class KeyboardLayoutSetV2 internal constructor(
             false,
             false,
             isNumberRowActive,
-            LongPressKeySettings(context)
+            LongPressKeySettings.load(context)
         )
 
         val layout = getKeyboardLayoutForElement(element)
diff --git a/java/src/org/futo/inputmethod/v2keyboard/MoreKeysBuilder.kt b/java/src/org/futo/inputmethod/v2keyboard/MoreKeysBuilder.kt
index 233f19d54..3caa507a9 100644
--- a/java/src/org/futo/inputmethod/v2keyboard/MoreKeysBuilder.kt
+++ b/java/src/org/futo/inputmethod/v2keyboard/MoreKeysBuilder.kt
@@ -22,9 +22,9 @@ private fun getNumForCoordinate(keyCoordinate: KeyCoordinate): String {
         val centeredCol = keyCoordinate.regularColumn - colOffset
 
         if(centeredCol == 9) {
-            return "!text/keyspec_symbols_0"
+            return "!text/keyspec_symbols_0,!text/additional_morekeys_symbols_0"
         } else if(centeredCol in 0 until 9) {
-            return "!text/keyspec_symbols_${centeredCol + 1}"
+            return "!text/keyspec_symbols_${centeredCol + 1},!text/additional_morekeys_symbols_${centeredCol + 1}"
         } else {
             return ""
         }
diff --git a/tools/make-keyboard-text-py/locales/hi.json b/tools/make-keyboard-text-py/locales/hi.json
index f5a878e02..6c225f6f3 100644
--- a/tools/make-keyboard-text-py/locales/hi.json
+++ b/tools/make-keyboard-text-py/locales/hi.json
@@ -2,42 +2,42 @@
     "locale": "hi",
     "morekeys": {
         "period": [
-            "!autoColumnOrder!9",
-            "\\\\",
+            "!autoColumnOrder!8",
+            "\\,",
             ".",
             "?",
             "!",
+            "॥",
             "#",
             ")",
             "(",
             "/",
-            ";",
             "'",
             "@",
             ":",
+            ";",
             "-",
-            "\\\"",
-            "+",
-            "\\%",
-            "&"
+            "\"",
+            "+"
         ],
         "tablet_period": [
             "!autoColumnOrder!8",
-            "\\\\",
             ".",
-            "'",
+            "\\,",
+            "?",
+            "!",
+            "॥",
             "#",
             ")",
             "(",
+            "'",
             "/",
-            ";",
             "@",
             ":",
+            ";",
             "-",
-            "\\\"",
-            "+",
-            "\\%",
-            "&"
+            "\"",
+            "+"
         ]
     },
     "keyspec": {
diff --git a/tools/make-keyboard-text-py/locales/ne.json b/tools/make-keyboard-text-py/locales/ne.json
index 0b89306a7..0140b6682 100644
--- a/tools/make-keyboard-text-py/locales/ne.json
+++ b/tools/make-keyboard-text-py/locales/ne.json
@@ -2,42 +2,42 @@
     "locale": "ne",
     "morekeys": {
         "period": [
-            "!autoColumnOrder!9",
+            "!autoColumnOrder!8",
+            "\\,",
             ".",
-            "\\\\",
             "?",
             "!",
+            "॥",
             "#",
             ")",
             "(",
             "/",
-            ";",
             "'",
             "@",
             ":",
+            ";",
             "-",
-            "\\\"",
-            "+",
-            "\\%",
-            "&"
+            "\"",
+            "+"
         ],
         "tablet_period": [
             "!autoColumnOrder!8",
             ".",
-            "\\\\",
-            "'",
+            "\\,",
+            "?",
+            "!",
+            "॥",
             "#",
             ")",
             "(",
+            "'",
             "/",
-            ";",
             "@",
             ":",
+            ";",
             "-",
-            "\\\"",
-            "+",
-            "\\%",
-            "&"
+            "\"",
+            "+"
         ]
     },
     "keyspec": {