Standard layout names (#386)

The names are comprised of: script, layout name, country code.

Co-authored-by: grim <verdastelo9604@hotmail.com>

41 files changed, 206 insertions, 195 deletions

diff --git a/check_layout.output b/check_layout.output
index f08bf39..a1af606 100644
--- a/check_layout.output
+++ b/check_layout.output
@@ -1,114 +1,114 @@
-# res/xml/ar_alt.xml
+# res/xml/arab_alt.xml
 Layout includes some ASCII punctuation but not all, missing: !, ", ', +, -, /, :, ;, <, =, >, ?, [, \, ], _, |, ~
 1 warnings
-# res/xml/ar_pc.xml
+# res/xml/arab_pc_ckb.xml
+Layout includes some ASCII punctuation but not all, missing: ", %, ', +, ,, ., :, ;, <, =, >, ?, `, |, ~
+1 warnings
+# res/xml/arab_pc_ir.xml
+Layout includes some ASCII punctuation but not all, missing: ", $, %, ', *, ,, /, ;, <, =, >, ?, [, \, ], ^, _, `, {, |, }, ~
+1 warnings
+# res/xml/arab_pc.xml
 Layout includes some ASCII punctuation but not all, missing: !, ', +, ;, ?, \, |
 1 warnings
-# res/xml/azerty.xml
-0 warnings
-# res/xml/bengali_national.xml
+# res/xml/beng_national.xml
 Layout includes some ASCII punctuation but not all, missing: $
 Layout doesn't specify a script.
 2 warnings
-# res/xml/bengali_provat.xml
+# res/xml/beng_provat.xml
 Layout includes some ASCII punctuation but not all, missing: $, &, *, ., /, <, >, [, \, ], `, {, |, }
 Layout doesn't specify a script.
 2 warnings
-# res/xml/bone.xml
-Layout includes some ASCII punctuation but not all, missing: $
-1 warnings
 Not a layout file: res/xml/bottom_row.xml
-# res/xml/colemak.xml
+# res/xml/cyrl_jcuken_ru.xml
 0 warnings
-# res/xml/devanagari_1.xml
-Layout includes some ASCII punctuation but not all, missing: ", $, ', ^, _, `, |
+# res/xml/cyrl_jcuken_uk.xml
+0 warnings
+# res/xml/cyrl_yaverti.xml
+Layout includes some ASCII punctuation but not all, missing: ~
 1 warnings
-# res/xml/devanagari_2.xml
+# res/xml/deva_alt.xml
 Layout includes some ASCII punctuation but not all, missing: #, $, %, &, ', (, ), *, +, ., /, :, <, =, >, @, [, \, ], ^, _, `, {, |, }, ~
 1 warnings
-# res/xml/dvorak.xml
-0 warnings
+# res/xml/deva_inscript.xml
+Layout includes some ASCII punctuation but not all, missing: ", $, ', ^, _, `, |
+1 warnings
 # res/xml/greekmath.xml
 Layout includes some ASCII punctuation but not all, missing: !, ", #, $, %, &, ', (, ), *, +, ,, -, /, :, ;, <, >, ?, @, [, \, ], _, `, {, |, }, ~
 Layout redefines the bottom row but some important keys are missing, missing: change_method, config, ctrl, switch_emoji, switch_second
 Layout doesn't specify a script.
 3 warnings
-# res/xml/he_il_1452_1.xml
+# res/xml/grek_qwerty.xml
+0 warnings
+# res/xml/hang_dubeolsik_kr.xml
+0 warnings
+# res/xml/hebr_1_il.xml
 Layout includes some ASCII punctuation but not all, missing: (, ), <, >, [, ], {, }
 1 warnings
-# res/xml/he_il_1452_2.xml
+# res/xml/hebr_2_il.xml
 Layout includes some ASCII punctuation but not all, missing: (, ), <, >, [, ], {, }
 1 warnings
-# res/xml/jcuken_ua.xml
+# res/xml/latn_azerty_fr.xml
 0 warnings
-# res/xml/kurdish.xml
-Layout includes some ASCII punctuation but not all, missing: ", %, ', +, ,, ., :, ;, <, =, >, ?, `, |, ~
-1 warnings
-# res/xml/local_bgph1.xml
-Layout includes some ASCII punctuation but not all, missing: ~
+# res/xml/latn_bone.xml
+Layout includes some ASCII punctuation but not all, missing: $
 1 warnings
-# res/xml/local_ru_jcuken.xml
+# res/xml/latn_colemak.xml
 0 warnings
-Not a layout file: res/xml/method.xml
-# res/xml/neo2.xml
+# res/xml/latn_dvorak.xml
 0 warnings
-Not a layout file: res/xml/number_row.xml
-# res/xml/numeric.xml
-Layout includes some ASCII punctuation but not all, missing: &, ?, @, `
-Layout redefines the bottom row but some important keys are missing, missing: change_method, config, switch_emoji, switch_numeric, switch_second
-Layout doesn't specify a script.
-3 warnings
-# res/xml/numpad.xml
-Layout includes some ASCII punctuation but not all, missing: !, ", #, $, %, &, ', (, ), ,, :, ;, <, >, ?, @, [, \, ], ^, _, `, {, |, }, ~
-Layout doesn't define some important keys, missing: backspace, delete
-Layout redefines the bottom row but some important keys are missing, missing: action, change_method, config, ctrl, down, enter, fn, left, right, space, switch_emoji, switch_numeric, switch_second, up
-Layout doesn't specify a script.
-4 warnings
-# res/xml/persian.xml
-Layout includes some ASCII punctuation but not all, missing: ", $, %, ', *, ,, /, ;, <, =, >, ?, [, \, ], ^, _, `, {, |, }, ~
-1 warnings
-# res/xml/pin.xml
-Layout includes some ASCII punctuation but not all, missing: !, ", $, %, &, ', ;, <, =, >, ?, @, [, \, ], ^, _, `, {, |, }, ~
-Layout redefines the bottom row but some important keys are missing, missing: change_method, config, ctrl, fn, switch_emoji, switch_second
-Layout doesn't specify a script.
-3 warnings
-# res/xml/qwerty_el.xml
+# res/xml/latn_neo2.xml
 0 warnings
-# res/xml/qwerty_es.xml
+# res/xml/latn_qwerty_br.xml
 0 warnings
-# res/xml/qwerty_hu.xml
+# res/xml/latn_qwerty_es.xml
 0 warnings
-# res/xml/qwerty_ko.xml
+# res/xml/latn_qwerty_hu.xml
 0 warnings
-# res/xml/qwerty_lv.xml
+# res/xml/latn_qwerty_lv.xml
 0 warnings
-# res/xml/qwerty_no.xml
+# res/xml/latn_qwerty_no.xml
 0 warnings
-# res/xml/qwerty_pl.xml
+# res/xml/latn_qwerty_pl.xml
 0 warnings
-# res/xml/qwerty_pt.xml
+# res/xml/latn_qwerty_ro.xml
 0 warnings
-# res/xml/qwerty_ro.xml
+# res/xml/latn_qwerty_se.xml
 0 warnings
-# res/xml/qwerty_sv_se.xml
+# res/xml/latn_qwerty_tr.xml
 0 warnings
-# res/xml/qwerty_tr.xml
+# res/xml/latn_qwerty_us.xml
 0 warnings
-# res/xml/qwerty_vi.xml
+# res/xml/latn_qwerty_vi.xml
 Layout includes some ASCII punctuation but not all, missing: \
 1 warnings
-# res/xml/qwerty.xml
-0 warnings
-# res/xml/qwertz_cs.xml
+# res/xml/latn_qwertz_cz.xml
 Layout includes some ASCII punctuation but not all, missing: `
 1 warnings
-# res/xml/qwertz_de.xml
+# res/xml/latn_qwertz_de.xml
 0 warnings
-# res/xml/qwertz_hu.xml
+# res/xml/latn_qwertz_hu.xml
 0 warnings
-# res/xml/qwertz_sk.xml
+# res/xml/latn_qwertz_sk.xml
 Layout includes some ASCII punctuation but not all, missing: \, `
 1 warnings
-# res/xml/qwertz.xml
+# res/xml/latn_qwertz.xml
 0 warnings
+Not a layout file: res/xml/method.xml
+Not a layout file: res/xml/number_row.xml
+# res/xml/numeric.xml
+Layout includes some ASCII punctuation but not all, missing: &, ?, @, `
+Layout redefines the bottom row but some important keys are missing, missing: change_method, config, switch_emoji, switch_numeric, switch_second
+Layout doesn't specify a script.
+3 warnings
+# res/xml/numpad.xml
+Layout includes some ASCII punctuation but not all, missing: !, ", #, $, %, &, ', (, ), ,, :, ;, <, >, ?, @, [, \, ], ^, _, `, {, |, }, ~
+Layout doesn't define some important keys, missing: backspace, delete
+Layout redefines the bottom row but some important keys are missing, missing: action, change_method, config, ctrl, down, enter, fn, left, right, space, switch_emoji, switch_numeric, switch_second, up
+Layout doesn't specify a script.
+4 warnings
+# res/xml/pin.xml
+Layout includes some ASCII punctuation but not all, missing: !, ", $, %, &, ', ;, <, =, >, ?, @, [, \, ], ^, _, `, {, |, }, ~
+Layout redefines the bottom row but some important keys are missing, missing: change_method, config, ctrl, fn, switch_emoji, switch_second
+Layout doesn't specify a script.
+3 warnings
 Not a layout file: res/xml/settings.xml
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 5f65927..713459d 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -2,82 +2,82 @@
 <resources>
   <string-array name="pref_layout_values">
     <item>none</item>
-    <item>azerty</item>
-    <item>qwerty</item>
-    <item>qwerty_pt</item>
-    <item>qwerty_es</item>
-    <item>qwerty_ro</item>
-    <item>qwerty_el</item>
-    <item>qwerty_ko</item>
-    <item>qwerty_lv</item>
-    <item>qwerty_no</item>
-    <item>qwerty_sv_se</item>
-    <item>qwerty_hu</item>
-    <item>qwerty_tr</item>
-    <item>qwerty_pl</item>
-    <item>qwerty_vi</item>
-    <item>ru_jcuken</item>
-    <item>qwertz</item>
-    <item>qwertz_cs</item>
-    <item>qwertz_de</item>
-    <item>qwertz_hu</item>
-    <item>qwertz_sk</item>
-    <item>bgph1</item>
-    <item>dvorak</item>
-    <item>colemak</item>
-    <item>neo2</item>
-    <item>bone</item>
-    <item>jcuken_ua</item>
-    <item>bengali_national</item>
-    <item>bengali_provat</item>
-    <item>devanagari_1</item>
-    <item>devanagari_2</item>
-    <item>he_il_1452_1</item>
-    <item>he_il_1452_2</item>
-    <item>ar_pc</item>
-    <item>ar_alt</item>
-    <item>persian</item>
-    <item>kurdish</item>
+    <item>latn_qwerty_us</item>
+    <item>latn_colemak</item>
+    <item>latn_dvorak</item>
+    <item>arab_pc_ckb</item>
+    <item>arab_pc</item>
+    <item>arab_alt</item>
+    <item>arab_pc_ir</item>
+    <item>beng_national</item>
+    <item>beng_provat</item>
+    <item>cyrl_jcuken_ru</item>
+    <item>cyrl_jcuken_uk</item>
+    <item>cyrl_yaverti</item>
+    <item>deva_inscript</item>
+    <item>deva_alt</item>
+    <item>grek_qwerty</item>
+    <item>hang_dubeolsik_kr</item>
+    <item>hebr_1_il</item>
+    <item>hebr_2_il</item>
+    <item>latn_azerty_fr</item>
+    <item>latn_bone</item>
+    <item>latn_neo2</item>
+    <item>latn_qwerty_hu</item>
+    <item>latn_qwerty_br</item>
+    <item>latn_qwerty_es</item>
+    <item>latn_qwerty_lv</item>
+    <item>latn_qwerty_no</item>
+    <item>latn_qwerty_pl</item>
+    <item>latn_qwerty_se</item>
+    <item>latn_qwerty_tr</item>
+    <item>latn_qwerty_vi</item>
+    <item>latn_qwerty_ro</item>
+    <item>latn_qwertz</item>
+    <item>latn_qwertz_cz</item>
+    <item>latn_qwertz_de</item>
+    <item>latn_qwertz_hu</item>
+    <item>latn_qwertz_sk</item>
     <item>custom</item>
   </string-array>
   <string-array name="pref_layout_entries">
     <item>None</item>
-    <item>AZERTY</item>
-    <item>QWERTY</item>
+    <item>QWERTY (US)</item>
+    <item>Colemak</item>
+    <item>Dvorak</item>
+    <item>Arabic (کوردی)</item>
+    <item>Arabic PC</item>
+    <item>Arabic Alt</item>
+    <item>Persian PC</item>
+    <item>বাংলা (জাতীয়)</item>
+    <item>বাংলা (প্রভাত)</item>
+    <item>ЙЦУКЕН (Русский)</item>
+    <item>ЙЦУКЕН (Українська)</item>
+    <item>ЯВЕРТЪ</item>
+    <item>देवनागरी (हिंदी)-1</item>
+    <item>देवनागरी (हिंदी)-2</item>
+    <item>QWERTY (Greek)</item>
+    <item>두벌식 (Korean)</item>
+    <item>Hebrew 1</item>
+    <item>Hebrew 2</item>
+    <item>AZERTY (Français)</item>
+    <item>Bone</item>
+    <item>Neo 2</item>
+    <item>QWERTY (Magyar)</item>
     <item>QWERTY (Brasileiro)</item>
     <item>QWERTY (Español)</item>
-    <item>QWERTY (Română)</item>
-    <item>QWERTY (Greek)</item>
-    <item>QWERTY (Korean)</item>
     <item>QWERTY (Latvian)</item>
     <item>QWERTY (Norwegian)</item>
+    <item>QWERTY (Polski)</item>
     <item>QWERTY (Swedish)</item>
-    <item>QWERTY (Hungarian)</item>
     <item>QWERTY (Türkçe)</item>
-    <item>QWERTY (Polski)</item>
     <item>QWERTY (Vietnamese)</item>
-    <item>ЙЦУКЕН (Русский)</item>
+    <item>QWERTY (Română)</item>
     <item>QWERTZ</item>
     <item>QWERTZ (Czech)</item>
     <item>QWERTZ (Deutsch)</item>
-    <item>QWERTZ (Hungarian)</item>
+    <item>QWERTZ (Magyar)</item>
     <item>QWERTZ (Slovak)</item>
-    <item>Bulgarian (Phonetic Traditional)</item>
-    <item>Dvorak</item>
-    <item>Colemak</item>
-    <item>Neo 2</item>
-    <item>Bone</item>
-    <item>ЙЦУКЕН (Українська)</item>
-    <item>বাংলা (জাতীয়)</item>
-    <item>বাংলা (প্রভাত)</item>
-    <item>देवनागरी (हिंदी)-1</item>
-    <item>देवनागरी (हिंदी)-2</item>
-    <item>Hebrew SI-1452-1</item>
-    <item>Hebrew SI-1452-2</item>
-    <item>Arabic PC</item>
-    <item>Arabic ALT</item>
-    <item>Persian</item>
-    <item>کوردی</item>
     <item>@string/pref_layout_e_custom</item>
   </string-array>
   <string-array name="pref_accents_entries">
diff --git a/res/xml/ar_alt.xml b/res/xml/arab_alt.xml
index bc5f123..bc5f123 100644
--- a/res/xml/ar_alt.xml
+++ b/res/xml/arab_alt.xml
diff --git a/res/xml/ar_pc.xml b/res/xml/arab_pc.xml
index 8ab8650..8ab8650 100644
--- a/res/xml/ar_pc.xml
+++ b/res/xml/arab_pc.xml
diff --git a/res/xml/kurdish.xml b/res/xml/arab_pc_ckb.xml
index bc8bb4a..bc8bb4a 100644
--- a/res/xml/kurdish.xml
+++ b/res/xml/arab_pc_ckb.xml
diff --git a/res/xml/persian.xml b/res/xml/arab_pc_ir.xml
index d6a4127..be2720c 100644
--- a/res/xml/persian.xml
+++ b/res/xml/arab_pc_ir.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- Adapted from standard SIRI 9147 -->
 <keyboard script="arabic">
   <row>
     <key key0="ض" key2="۱"/>
diff --git a/res/xml/bengali_national.xml b/res/xml/beng_national.xml
index 9d70e37..9d70e37 100644
--- a/res/xml/bengali_national.xml
+++ b/res/xml/beng_national.xml
diff --git a/res/xml/bengali_provat.xml b/res/xml/beng_provat.xml
index caaa836..caaa836 100644
--- a/res/xml/bengali_provat.xml
+++ b/res/xml/beng_provat.xml
diff --git a/res/xml/local_ru_jcuken.xml b/res/xml/cyrl_jcuken_ru.xml
index 5f392ca..5f392ca 100644
--- a/res/xml/local_ru_jcuken.xml
+++ b/res/xml/cyrl_jcuken_ru.xml
diff --git a/res/xml/jcuken_ua.xml b/res/xml/cyrl_jcuken_uk.xml
index d5ae950..d5ae950 100644
--- a/res/xml/jcuken_ua.xml
+++ b/res/xml/cyrl_jcuken_uk.xml
diff --git a/res/xml/local_bgph1.xml b/res/xml/cyrl_yaverti.xml
index f4eb820..f4eb820 100644
--- a/res/xml/local_bgph1.xml
+++ b/res/xml/cyrl_yaverti.xml
diff --git a/res/xml/devanagari_2.xml b/res/xml/deva_alt.xml
index 1606abd..1606abd 100644
--- a/res/xml/devanagari_2.xml
+++ b/res/xml/deva_alt.xml
diff --git a/res/xml/devanagari_1.xml b/res/xml/deva_inscript.xml
index 1f306e7..1f306e7 100644
--- a/res/xml/devanagari_1.xml
+++ b/res/xml/deva_inscript.xml
diff --git a/res/xml/qwerty_el.xml b/res/xml/grek_qwerty.xml
index 50da475..50da475 100644
--- a/res/xml/qwerty_el.xml
+++ b/res/xml/grek_qwerty.xml
diff --git a/res/xml/qwerty_ko.xml b/res/xml/hang_dubeolsik_kr.xml
index 998ab8f..998ab8f 100644
--- a/res/xml/qwerty_ko.xml
+++ b/res/xml/hang_dubeolsik_kr.xml
diff --git a/res/xml/he_il_1452_1.xml b/res/xml/hebr_1_il.xml
index ff1b961..50ba86e 100644
--- a/res/xml/he_il_1452_1.xml
+++ b/res/xml/hebr_1_il.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- Based on standard SI-1452-1 -->
 <keyboard script="hebrew">
   <row>
     <key key0="/" key2="1" key3="!" key4="esc"/>
diff --git a/res/xml/he_il_1452_2.xml b/res/xml/hebr_2_il.xml
index ebd6d84..ff83a91 100644
--- a/res/xml/he_il_1452_2.xml
+++ b/res/xml/hebr_2_il.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- Based on standard SI-1452-2 -->
 <keyboard script="hebrew">
   <row>
     <key key0="ץ" key2="1" key3="!" key4="esc"/>
diff --git a/res/xml/azerty.xml b/res/xml/latn_azerty_fr.xml
index 88f3db6..8434466 100644
--- a/res/xml/azerty.xml
+++ b/res/xml/latn_azerty_fr.xml
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- Adapted from standard NF Z71-300 -->
+<!-- https://norme-azerty.fr/ -->
 <keyboard script="latin">
   <row>
     <key key0="a" key2="1" key4="esc"/>
diff --git a/res/xml/bone.xml b/res/xml/latn_bone.xml
index 612290c..2f8a012 100644
--- a/res/xml/bone.xml
+++ b/res/xml/latn_bone.xml
@@ -1,4 +1,5 @@
 <?xml	version="1.0"	encoding="utf-8"?>
+<!-- https://neo-layout.org/Layouts/bone/ -->
 <keyboard bottom_row="false" script="latin">
 	<row>
 		<key key0="j"				key2="esc"				key4="…"/>
diff --git a/res/xml/colemak.xml b/res/xml/latn_colemak.xml
index 4bac3ff..a7c78f2 100644
--- a/res/xml/colemak.xml
+++ b/res/xml/latn_colemak.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- https://colemak.com/ -->
 <keyboard script="latin">
   <row>
     <key key0="q" key1="esc"                key2="loc accent_aigu"    key3="loc accent_tilde"   shift="0.5"/>
diff --git a/res/xml/dvorak.xml b/res/xml/latn_dvorak.xml
index 4dccc23..4dccc23 100644
--- a/res/xml/dvorak.xml
+++ b/res/xml/latn_dvorak.xml
diff --git a/res/xml/neo2.xml b/res/xml/latn_neo2.xml
index 14dbf20..6f20f38 100644
--- a/res/xml/neo2.xml
+++ b/res/xml/latn_neo2.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- https://neo-layout.org/Layouts/neo/ -->
 <keyboard bottom_row="false" script="latin">
   <row>
     <key key0="x" key1="°" key2="1" key4="…"/>
diff --git a/res/xml/qwerty_pt.xml b/res/xml/latn_qwerty_br.xml
index 0c9015e..fda6f93 100644
--- a/res/xml/qwerty_pt.xml
+++ b/res/xml/latn_qwerty_br.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- Adapted from standard ABNT NBR 10346 -->
 <keyboard script="latin">
   <row>
     <key key0="q" key2="1" key4="esc"/>
diff --git a/res/xml/qwerty_es.xml b/res/xml/latn_qwerty_es.xml
index 273cfed..273cfed 100644
--- a/res/xml/qwerty_es.xml
+++ b/res/xml/latn_qwerty_es.xml
diff --git a/res/xml/qwerty_hu.xml b/res/xml/latn_qwerty_hu.xml
index 302c304..302c304 100644
--- a/res/xml/qwerty_hu.xml
+++ b/res/xml/latn_qwerty_hu.xml
diff --git a/res/xml/qwerty_lv.xml b/res/xml/latn_qwerty_lv.xml
index 7f16d5a..7f16d5a 100644
--- a/res/xml/qwerty_lv.xml
+++ b/res/xml/latn_qwerty_lv.xml
diff --git a/res/xml/qwerty_no.xml b/res/xml/latn_qwerty_no.xml
index 33e9f3b..33e9f3b 100644
--- a/res/xml/qwerty_no.xml
+++ b/res/xml/latn_qwerty_no.xml
diff --git a/res/xml/qwerty_pl.xml b/res/xml/latn_qwerty_pl.xml
index 1c28766..1c28766 100644
--- a/res/xml/qwerty_pl.xml
+++ b/res/xml/latn_qwerty_pl.xml
diff --git a/res/xml/qwerty_ro.xml b/res/xml/latn_qwerty_ro.xml
index e5e0a19..e5e0a19 100644
--- a/res/xml/qwerty_ro.xml
+++ b/res/xml/latn_qwerty_ro.xml
diff --git a/res/xml/qwerty_sv_se.xml b/res/xml/latn_qwerty_se.xml
index 69884d7..69884d7 100644
--- a/res/xml/qwerty_sv_se.xml
+++ b/res/xml/latn_qwerty_se.xml
diff --git a/res/xml/qwerty_tr.xml b/res/xml/latn_qwerty_tr.xml
index 60f52a2..60f52a2 100644
--- a/res/xml/qwerty_tr.xml
+++ b/res/xml/latn_qwerty_tr.xml
diff --git a/res/xml/qwerty.xml b/res/xml/latn_qwerty_us.xml
index 06e91b9..06e91b9 100644
--- a/res/xml/qwerty.xml
+++ b/res/xml/latn_qwerty_us.xml
diff --git a/res/xml/qwerty_vi.xml b/res/xml/latn_qwerty_vi.xml
index 1e3a64a..8b51299 100644
--- a/res/xml/qwerty_vi.xml
+++ b/res/xml/latn_qwerty_vi.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- Adapted from standard TCVN 6064-->
 <keyboard script="latin">
   <row>
     <key key0="q" key1="~" key2="1" key3="`" key4="esc"/>
diff --git a/res/xml/qwertz.xml b/res/xml/latn_qwertz.xml
index 107b738..107b738 100644
--- a/res/xml/qwertz.xml
+++ b/res/xml/latn_qwertz.xml
diff --git a/res/xml/qwertz_cs.xml b/res/xml/latn_qwertz_cz.xml
index 6546163..6546163 100644
--- a/res/xml/qwertz_cs.xml
+++ b/res/xml/latn_qwertz_cz.xml
diff --git a/res/xml/qwertz_de.xml b/res/xml/latn_qwertz_de.xml
index 6d01610..906c4fc 100644
--- a/res/xml/qwertz_de.xml
+++ b/res/xml/latn_qwertz_de.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- Adapted from standard DIN 2137-1 -->
 <keyboard script="latin">
   <row>
     <key key0="q" key2="1" key4="esc"/>
diff --git a/res/xml/qwertz_hu.xml b/res/xml/latn_qwertz_hu.xml
index 557b2e5..557b2e5 100644
--- a/res/xml/qwertz_hu.xml
+++ b/res/xml/latn_qwertz_hu.xml
diff --git a/res/xml/qwertz_sk.xml b/res/xml/latn_qwertz_sk.xml
index 7d3d1f4..7d3d1f4 100644
--- a/res/xml/qwertz_sk.xml
+++ b/res/xml/latn_qwertz_sk.xml
diff --git a/res/xml/method.xml b/res/xml/method.xml
index 68a002a..2d5dc4a 100644
--- a/res/xml/method.xml
+++ b/res/xml/method.xml
@@ -1,35 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <input-method xmlns:android="http://schemas.android.com/apk/res/android" android:settingsActivity="juloo.keyboard2.SettingsActivity" android:supportsSwitchingToNextInputMethod="true">
-  <subtype android:label="%s" android:languageTag="ar" android:imeSubtypeLocale="ar" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=arabic,default_layout=ar_pc"/>
-  <subtype android:label="%s" android:languageTag="be" android:imeSubtypeLocale="be_BY" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=cyrillic,default_layout=ru_jcuken,extra_keys=ґ|є|і|ї|ў"/>
-  <subtype android:label="%s" android:languageTag="bg" android:imeSubtypeLocale="bg_BG" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=cyrillic,default_layout=bgph1,extra_keys=€"/>
-  <subtype android:label="%s" android:languageTag="bn" android:imeSubtypeLocale="bn_BD" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=qwerty,extra_keys=৳"/>
-  <subtype android:label="%s" android:languageTag="cs" android:imeSubtypeLocale="cs_CZ" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=qwertz_cs,extra_keys=a|accent_cedille|accent_circonflexe"/>
-  <subtype android:label="%s" android:languageTag="de" android:imeSubtypeLocale="de_DE" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=qwertz_de,extra_keys=accent_trema|ß|€"/>
-  <subtype android:label="%s" android:languageTag="el" android:imeSubtypeLocale="el" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=qwerty_el,extra_keys=£|€"/>
-  <subtype android:label="%s" android:languageTag="en-GB" android:imeSubtypeLocale="en_GB" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=qwerty,extra_keys=£|€"/>
-  <subtype android:label="%s" android:languageTag="en-US" android:imeSubtypeLocale="en_US" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=qwerty"/>
-  <subtype android:label="%s" android:languageTag="es" android:imeSubtypeLocale="es_ES" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=qwerty_es,extra_keys=accent_grave|accent_aigu|accent_tilde|accent_trema|€"/>
-  <subtype android:label="%s" android:languageTag="ro" android:imeSubtypeLocale="ro_RO" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwerty_ro,extra_keys=ă|â|î|ș|ț|€|$"/>
-  <subtype android:label="%s" android:languageTag="fr" android:imeSubtypeLocale="fr_FR" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=azerty,extra_keys=accent_grave|accent_aigu|accent_circonflexe|accent_cedille|accent_trema|€"/>
-  <subtype android:label="%s" android:languageTag="he" android:imeSubtypeLocale="he_IL" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=hebrew,default_layout=he_il_1452_1,extra_keys=₪|€"/>
-  <subtype android:label="%s" android:languageTag="hi" android:imeSubtypeLocale="hi_IN" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=devanagari,default_layout=devanagari_1,extra_keys=₹"/>
-  <subtype android:label="%s" android:languageTag="hu" android:imeSubtypeLocale="hu_HU" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=qwertz_hu,extra_keys=accent_aigu|accent_trema|accent_ogonek|€"/>
-  <subtype android:label="%s" android:languageTag="is" android:imeSubtypeLocale="is_IS" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=qwerty,extra_keys=ð|þ|ö|æ|accent_aigu"/>
-  <subtype android:label="%s" android:languageTag="it" android:imeSubtypeLocale="it_IT" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=qwerty,extra_keys=accent_grave|accent_aigu|€|ə"/>
-  <subtype android:label="%s" android:languageTag="ko" android:imeSubtypeLocale="ko_KR" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=hangul,default_layout=qwerty_ko"/>
-  <subtype android:label="%s" android:languageTag="lt" android:imeSubtypeLocale="lt_LT" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=qwerty,extra_keys=accent_ogonek|accent_caron|accent_dot_above|accent_macron|€"/>
-  <subtype android:label="%s" android:languageTag="lv" android:imeSubtypeLocale="lv_LV" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=qwerty_lv,extra_keys=accent_caron|accent_cedille|accent_macron|€"/>
-  <subtype android:label="%s" android:languageTag="mr" android:imeSubtypeLocale="mr_IN" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=devanagari,default_layout=devanagari_1,extra_keys=₹"/>
-  <subtype android:label="%s" android:languageTag="ne" android:imeSubtypeLocale="ne_NE" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=devanagari,default_layout=devanagari_1,extra_keys=₹"/>
-  <subtype android:label="%s" android:languageTag="nl-BE" android:imeSubtypeLocale="nl_BE" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=azerty,extra_keys=accent_grave|accent_aigu|accent_circonflexe|accent_cedille|accent_trema|€"/>
-  <subtype android:label="%s" android:languageTag="no" android:imeSubtypeLocale="no_NO" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=qwerty_no,extra_keys=accent_aigu|€"/>
-  <subtype android:label="%s" android:languageTag="pl" android:imeSubtypeLocale="pl_PL" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=qwerty_pl"/>
-  <subtype android:label="%s" android:languageTag="pt" android:imeSubtypeLocale="pt_BR" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=qwerty_pt,extra_keys=accent_aigu|accent_cedille|accent_circonflexe|accent_grave|accent_tilde|€"/>
-  <subtype android:label="%s" android:languageTag="ru" android:imeSubtypeLocale="ru_RU" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=ru_jcuken"/>
-  <subtype android:label="%s" android:languageTag="sk" android:imeSubtypeLocale="sk_SK" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=qwertz_sk,extra_keys=é|ě|ŕ|ř|ť|ž|ü|ú|ů|í|ö|ó|ô|á|ä|ś|š|ď|ĺ|ľ|ý|č|ň"/>
-  <subtype android:label="%s" android:languageTag="sv" android:imeSubtypeLocale="sv_SE" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=qwerty_sv_se,extra_keys=accent_aigu|accent_trema|accent_ring|€"/>
-  <subtype android:label="%s" android:languageTag="tr" android:imeSubtypeLocale="tr_TR" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=qwerty_tr,extra_keys=accent_cedille|accent_trema|₺|ı|ğ"/>
-  <subtype android:label="%s" android:languageTag="uk" android:imeSubtypeLocale="uk_UA" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=cyrillic,default_layout=jcuken_ua,extra_keys=ґ|є|і|ї"/>
-  <subtype android:label="%s" android:languageTag="vi" android:imeSubtypeLocale="vi_VN" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=qwerty_vi"/>
+  <subtype android:label="%s" android:languageTag="ar" android:imeSubtypeLocale="ar" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=arabic,default_layout=arab_ibm"/>
+  <subtype android:label="%s" android:languageTag="be" android:imeSubtypeLocale="be_BY" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=cyrillic,default_layout=cyrl_jcuken_ru,extra_keys=ґ|є|і|ї|ў"/>
+  <subtype android:label="%s" android:languageTag="bg" android:imeSubtypeLocale="bg_BG" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=cyrillic,default_layout=cyrl_yaverti,extra_keys=€"/>
+  <subtype android:label="%s" android:languageTag="bn" android:imeSubtypeLocale="bn_BD" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwerty_us,extra_keys=৳"/>
+  <subtype android:label="%s" android:languageTag="cs" android:imeSubtypeLocale="cs_CZ" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwertz_cz,extra_keys=a|accent_cedille|accent_circonflexe"/>
+  <subtype android:label="%s" android:languageTag="de" android:imeSubtypeLocale="de_DE" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwertz_de,extra_keys=accent_trema|ß|€"/>
+  <subtype android:label="%s" android:languageTag="el" android:imeSubtypeLocale="el" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=grek_qwerty,extra_keys=£|€"/>
+  <subtype android:label="%s" android:languageTag="en-GB" android:imeSubtypeLocale="en_GB" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwerty_us,extra_keys=£|€"/>
+  <subtype android:label="%s" android:languageTag="en-US" android:imeSubtypeLocale="en_US" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwerty_us"/>
+  <subtype android:label="%s" android:languageTag="es" android:imeSubtypeLocale="es_ES" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwerty_es,extra_keys=accent_grave|accent_aigu|accent_tilde|accent_trema|€"/>
+  <subtype android:label="%s" android:languageTag="fr" android:imeSubtypeLocale="fr_FR" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_azerty_fr,extra_keys=accent_grave|accent_aigu|accent_circonflexe|accent_cedille|accent_trema|€"/>
+  <subtype android:label="%s" android:languageTag="he" android:imeSubtypeLocale="he_IL" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=hebrew,default_layout=hebr_1_il,extra_keys=₪|€"/>
+  <subtype android:label="%s" android:languageTag="hi" android:imeSubtypeLocale="hi_IN" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=devanagari,default_layout=deva_inscript,extra_keys=₹"/>
+  <subtype android:label="%s" android:languageTag="hu" android:imeSubtypeLocale="hu_HU" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwertz_hu,extra_keys=accent_aigu|accent_trema|accent_ogonek|€"/>
+  <subtype android:label="%s" android:languageTag="is" android:imeSubtypeLocale="is_IS" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwerty_us,extra_keys=ð|þ|ö|æ|accent_aigu"/>
+  <subtype android:label="%s" android:languageTag="it" android:imeSubtypeLocale="it_IT" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwerty_us,extra_keys=accent_grave|accent_aigu|€|ə"/>
+  <subtype android:label="%s" android:languageTag="ko" android:imeSubtypeLocale="ko_KR" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=hangul,default_layout=latn_qwerty_us"/>
+  <subtype android:label="%s" android:languageTag="lt" android:imeSubtypeLocale="lt_LT" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwerty_us,extra_keys=accent_ogonek|accent_caron|accent_dot_above|accent_macron|€"/>
+  <subtype android:label="%s" android:languageTag="lv" android:imeSubtypeLocale="lv_LV" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwerty_lv,extra_keys=accent_caron|accent_cedille|accent_macron|€"/>
+  <subtype android:label="%s" android:languageTag="mr" android:imeSubtypeLocale="mr_IN" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=devanagari,default_layout=deva_inscript,extra_keys=₹"/>
+  <subtype android:label="%s" android:languageTag="ne" android:imeSubtypeLocale="ne_NE" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=devanagari,default_layout=deva_inscript,extra_keys=₹"/>
+  <subtype android:label="%s" android:languageTag="nl-BE" android:imeSubtypeLocale="nl_BE" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_azerty_fr,extra_keys=accent_grave|accent_aigu|accent_circonflexe|accent_cedille|accent_trema|€"/>
+  <subtype android:label="%s" android:languageTag="no" android:imeSubtypeLocale="no_NO" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwerty_no,extra_keys=accent_aigu|€"/>
+  <subtype android:label="%s" android:languageTag="pl" android:imeSubtypeLocale="pl_PL" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwerty_pl"/>
+  <subtype android:label="%s" android:languageTag="pt" android:imeSubtypeLocale="pt_BR" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwerty_pt,extra_keys=accent_aigu|accent_cedille|accent_circonflexe|accent_grave|accent_tilde|€"/>
+  <subtype android:label="%s" android:languageTag="ro" android:imeSubtypeLocale="ro_RO" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwerty_ro,extra_keys=ă|â|î|ș|ț|€|$"/>
+  <subtype android:label="%s" android:languageTag="ru" android:imeSubtypeLocale="ru_RU" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=cyrl_jcuken_ru"/>
+  <subtype android:label="%s" android:languageTag="sk" android:imeSubtypeLocale="sk_SK" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwertz_sk,extra_keys=é|ě|ŕ|ř|ť|ž|ü|ú|ů|í|ö|ó|ô|á|ä|ś|š|ď|ĺ|ľ|ý|č|ň"/>
+  <subtype android:label="%s" android:languageTag="sv" android:imeSubtypeLocale="sv_SE" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwerty_se,extra_keys=accent_aigu|accent_trema|accent_ring|€"/>
+  <subtype android:label="%s" android:languageTag="tr" android:imeSubtypeLocale="tr_TR" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwerty_tr,extra_keys=accent_cedille|accent_trema|₺|ı|ğ"/>
+  <subtype android:label="%s" android:languageTag="uk" android:imeSubtypeLocale="uk_UA" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=cyrillic,default_layout=cyrl_jcuken_uk,extra_keys=ґ|є|і|ї"/>
+  <subtype android:label="%s" android:languageTag="vi" android:imeSubtypeLocale="vi_VN" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwerty_vi"/>
 </input-method>
diff --git a/srcs/juloo.keyboard2/Config.java b/srcs/juloo.keyboard2/Config.java
index 68fd81b..ddcd587 100644
--- a/srcs/juloo.keyboard2/Config.java
+++ b/srcs/juloo.keyboard2/Config.java
@@ -342,42 +342,42 @@ final class Config
     int id;
     switch (name)
     {
-      case "azerty": id = R.xml.azerty; break;
-      case "bengali_national": id = R.xml.bengali_national; break;
-      case "bengali_provat": id = R.xml.bengali_provat; break;
-      case "bgph1": id = R.xml.local_bgph1; break;
-      case "bone": id = R.xml.bone; break;
-      case "colemak": id = R.xml.colemak; break;
-      case "dvorak": id = R.xml.dvorak; break;
-      case "devanagari_1": id = R.xml.devanagari_1; break;
-      case "devanagari_2": id = R.xml.devanagari_2; break;
-      case "jcuken_ua": id = R.xml.jcuken_ua; break;
-      case "neo2": id = R.xml.neo2; break;
-      case "qwerty": id = R.xml.qwerty; break;
-      case "qwerty_el": id = R.xml.qwerty_el; break;
-      case "qwerty_es": id = R.xml.qwerty_es; break;
-      case "qwerty_ro": id = R.xml.qwerty_ro; break;
-      case "qwerty_hu": id = R.xml.qwerty_hu; break;
-      case "qwerty_ko": id = R.xml.qwerty_ko; break;
-      case "qwerty_lv": id = R.xml.qwerty_lv; break;
-      case "qwerty_no": id = R.xml.qwerty_no; break;
-      case "qwerty_pt": id = R.xml.qwerty_pt; break;
-      case "qwerty_sv_se": id = R.xml.qwerty_sv_se; break;
-      case "qwerty_tr": id = R.xml.qwerty_tr; break;
-      case "qwerty_pl": id = R.xml.qwerty_pl; break;
-      case "qwerty_vi": id = R.xml.qwerty_vi; break;
-      case "qwertz": id = R.xml.qwertz; break;
-      case "qwertz_cs": id = R.xml.qwertz_cs; break;
-      case "qwertz_de": id = R.xml.qwertz_de; break;
-      case "qwertz_hu": id = R.xml.qwertz_hu; break;
-      case "qwertz_sk": id = R.xml.qwertz_sk; break;
-      case "ru_jcuken": id = R.xml.local_ru_jcuken; break;
-      case "he_il_1452_1": id = R.xml.he_il_1452_1; break;
-      case "he_il_1452_2": id = R.xml.he_il_1452_2; break;
-      case "ar_pc": id = R.xml.ar_pc; break;
-      case "ar_alt": id = R.xml.ar_alt; break;
-      case "persian": id = R.xml.persian; break;
-      case "kurdish": id = R.xml.kurdish; break;
+      case "arab_pc_ckb": id = R.xml.arab_pc_ckb; break;
+      case "arab_pc_ir": id = R.xml.arab_pc_ir; break;
+      case "arab_pc": id = R.xml.arab_pc; break;
+      case "arab_alt": id = R.xml.arab_alt; break;
+      case "beng_national": id = R.xml.beng_national; break;
+      case "beng_provat": id = R.xml.beng_provat; break;
+      case "cyrl_jcuken_ru": id = R.xml.cyrl_jcuken_ru; break;
+      case "cyrl_jcuken_uk": id = R.xml.cyrl_jcuken_uk; break;
+      case "cyrl_yaverti": id = R.xml.cyrl_yaverti; break;
+      case "deva_inscript": id = R.xml.deva_inscript; break;
+      case "deva_alt": id = R.xml.deva_alt; break;
+      case "grek_qwerty": id = R.xml.grek_qwerty; break;
+      case "hang_dubeolsik_kr": id = R.xml.hang_dubeolsik_kr; break;
+      case "hebr_1_il": id = R.xml.hebr_1_il; break;
+      case "hebr_2_il": id = R.xml.hebr_2_il; break;
+      case "latn_azerty_fr": id = R.xml.latn_azerty_fr; break;
+      case "latn_bone": id = R.xml.latn_bone; break;
+      case "latn_colemak": id = R.xml.latn_colemak; break;
+      case "latn_dvorak": id = R.xml.latn_dvorak; break;
+      case "latn_neo2": id = R.xml.latn_neo2; break;
+      case "latn_qwerty_hu": id = R.xml.latn_qwerty_hu; break;
+      case "latn_qwerty_br": id = R.xml.latn_qwerty_br; break;
+      case "latn_qwerty_es": id = R.xml.latn_qwerty_es; break;
+      case "latn_qwerty_lv": id = R.xml.latn_qwerty_lv; break;
+      case "latn_qwerty_no": id = R.xml.latn_qwerty_no; break;
+      case "latn_qwerty_pl": id = R.xml.latn_qwerty_pl; break;
+      case "latn_qwerty_ro": id = R.xml.latn_qwerty_ro; break;
+      case "latn_qwerty_se": id = R.xml.latn_qwerty_se; break;
+      case "latn_qwerty_tr": id = R.xml.latn_qwerty_tr; break;
+      case "latn_qwerty_us": id = R.xml.latn_qwerty_us; break;
+      case "latn_qwerty_vi": id = R.xml.latn_qwerty_vi; break;
+      case "latn_qwertz": id = R.xml.latn_qwertz; break;
+      case "latn_qwertz_cz": id = R.xml.latn_qwertz_cz; break;
+      case "latn_qwertz_de": id = R.xml.latn_qwertz_de; break;
+      case "latn_qwertz_hu": id = R.xml.latn_qwertz_hu; break;
+      case "latn_qwertz_sk": id = R.xml.latn_qwertz_sk; break;
       case "custom": return custom_layout;
       case "system": case "none": default: return null;
     }
diff --git a/srcs/juloo.keyboard2/Keyboard2.java b/srcs/juloo.keyboard2/Keyboard2.java
index 8a5c69b..4b82c33 100644
--- a/srcs/juloo.keyboard2/Keyboard2.java
+++ b/srcs/juloo.keyboard2/Keyboard2.java
@@ -158,7 +158,7 @@ public class Keyboard2 extends InputMethodService
       }
     }
     if (default_layout == null)
-      default_layout = KeyboardData.load(getResources(), R.xml.qwerty);
+      default_layout = KeyboardData.load(getResources(), R.xml.latn_qwerty_us);
     _localeTextLayout = default_layout;
     if (_config.second_layout == null)
     {