diff --git a/check_layout.output b/check_layout.output
index fbeb8f4..9b49697 100644
--- a/check_layout.output
+++ b/check_layout.output
@@ -1,37 +1,29 @@
 # res/xml/ar_alt.xml
 Layout includes some ASCII punctuation but not all, missing: !, ", ', +, -, /, :, ;, <, =, >, ?, [, \, ], _, |, ~
-Layout doesn't specify a script.
-2 warnings
+1 warnings
 # res/xml/ar_pc.xml
 Layout includes some ASCII punctuation but not all, missing: !, ', +, ;, ?, \, |
-Layout doesn't specify a script.
-2 warnings
-# res/xml/azerty.xml
-Layout doesn't specify a script.
 1 warnings
+# res/xml/azerty.xml
+0 warnings
 # res/xml/bangla.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: $
-Layout doesn't specify a script.
-2 warnings
+1 warnings
 Not a layout file: res/xml/bottom_row.xml
 # res/xml/colemak.xml
-Layout doesn't specify a script.
-1 warnings
+0 warnings
 # res/xml/devanagari_1.xml
 Layout includes some ASCII punctuation but not all, missing: ", $, ', ^, _, `, |
-Layout doesn't specify a script.
-2 warnings
+1 warnings
 # res/xml/devanagari_2.xml
 Layout includes some ASCII punctuation but not all, missing: #, $, %, &, ', (, ), *, +, ., /, :, <, =, >, @, [, \, ], ^, _, `, {, |, }, ~
-Layout doesn't specify a script.
-2 warnings
-# res/xml/dvorak.xml
-Layout doesn't specify a script.
 1 warnings
+# res/xml/dvorak.xml
+0 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
@@ -39,30 +31,23 @@ Layout doesn't specify a script.
 3 warnings
 # res/xml/he_il_1452_1.xml
 Layout includes some ASCII punctuation but not all, missing: (, ), <, >, [, ], {, }
-Layout doesn't specify a script.
-2 warnings
+1 warnings
 # res/xml/he_il_1452_2.xml
 Layout includes some ASCII punctuation but not all, missing: (, ), <, >, [, ], {, }
-Layout doesn't specify a script.
-2 warnings
-# res/xml/jcuken_ua.xml
-Layout doesn't specify a script.
 1 warnings
+# res/xml/jcuken_ua.xml
+0 warnings
 # res/xml/kurdish.xml
 Layout includes some ASCII punctuation but not all, missing: ", %, ', +, ,, ., :, ;, <, =, >, ?, `, |, ~
-Layout doesn't specify a script.
-2 warnings
+1 warnings
 # res/xml/local_bgph1.xml
 Layout includes some ASCII punctuation but not all, missing: ~
-Layout doesn't specify a script.
-2 warnings
-# res/xml/local_ru_jcuken.xml
-Layout doesn't specify a script.
 1 warnings
+# res/xml/local_ru_jcuken.xml
+0 warnings
 Not a layout file: res/xml/method.xml
 # res/xml/neo2.xml
-Layout doesn't specify a script.
-1 warnings
+0 warnings
 Not a layout file: res/xml/number_row.xml
 # res/xml/numeric.xml
 Layout includes some ASCII punctuation but not all, missing: &, ?, @, `
@@ -77,65 +62,47 @@ Layout doesn't specify a script.
 4 warnings
 # res/xml/persian.xml
 Layout includes some ASCII punctuation but not all, missing: ", $, %, ', *, ,, /, ;, <, =, >, ?, [, \, ], ^, _, `, {, |, }, ~
-Layout doesn't specify a script.
-2 warnings
+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
-Layout doesn't specify a script.
-1 warnings
+0 warnings
 # res/xml/qwerty_es.xml
-Layout doesn't specify a script.
-1 warnings
+0 warnings
 # res/xml/qwerty_hu.xml
-Layout doesn't specify a script.
-1 warnings
+0 warnings
 # res/xml/qwerty_ko.xml
-Layout doesn't specify a script.
-1 warnings
+0 warnings
 # res/xml/qwerty_lv.xml
-Layout doesn't specify a script.
-1 warnings
+0 warnings
 # res/xml/qwerty_no.xml
-Layout doesn't specify a script.
-1 warnings
+0 warnings
 # res/xml/qwerty_pl.xml
-Layout doesn't specify a script.
-1 warnings
+0 warnings
 # res/xml/qwerty_pt.xml
-Layout doesn't specify a script.
-1 warnings
+0 warnings
 # res/xml/qwerty_sv_se.xml
-Layout doesn't specify a script.
-1 warnings
+0 warnings
 # res/xml/qwerty_tr.xml
-Layout doesn't specify a script.
-1 warnings
+0 warnings
 # res/xml/qwerty_vi.xml
 Layout includes some ASCII punctuation but not all, missing: \
-Layout doesn't specify a script.
-2 warnings
-# res/xml/qwerty.xml
-Layout doesn't specify a script.
 1 warnings
+# res/xml/qwerty.xml
+0 warnings
 # res/xml/qwertz_cs.xml
 Layout includes some ASCII punctuation but not all, missing: `
-Layout doesn't specify a script.
-2 warnings
+1 warnings
 # res/xml/qwertz_de.xml
-Layout doesn't specify a script.
-1 warnings
+0 warnings
 # res/xml/qwertz_hu.xml
-Layout doesn't specify a script.
-1 warnings
+0 warnings
 # res/xml/qwertz_sk.xml
 Layout includes some ASCII punctuation but not all, missing: \, `
-Layout doesn't specify a script.
-2 warnings
-# res/xml/qwertz.xml
-Layout doesn't specify a script.
 1 warnings
+# res/xml/qwertz.xml
+0 warnings
 Not a layout file: res/xml/settings.xml
diff --git a/res/xml/ar_alt.xml b/res/xml/ar_alt.xml
index f3beb8e..bc5f123 100644
--- a/res/xml/ar_alt.xml
+++ b/res/xml/ar_alt.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<keyboard>
+<keyboard script="arabic">
   <row>
     <key key0="ض" key2="١" key3="`" key4="esc"/>
     <key key0="ص" key2="٢" key3="\@"/>
diff --git a/res/xml/ar_pc.xml b/res/xml/ar_pc.xml
index f92ee43..8ab8650 100644
--- a/res/xml/ar_pc.xml
+++ b/res/xml/ar_pc.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<keyboard>
+<keyboard script="arabic">
   <row>
     <key key0="ض" key1="&#1614;" key2="١" key3="`" key4="esc"/>
     <key key0="ص" key1="&#1611;" key2="٢" key3="\@"/>
diff --git a/res/xml/azerty.xml b/res/xml/azerty.xml
index a91315d..88f3db6 100644
--- a/res/xml/azerty.xml
+++ b/res/xml/azerty.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<keyboard>
+<keyboard script="latin">
   <row>
     <key key0="a" key2="1" key4="esc"/>
     <key key0="z" key2="2" key3="&amp;" key4="~"/>
diff --git a/res/xml/bone.xml b/res/xml/bone.xml
index 692ccb1..612290c 100644
--- a/res/xml/bone.xml
+++ b/res/xml/bone.xml
@@ -1,5 +1,5 @@
 <?xml	version="1.0"	encoding="utf-8"?>
-<keyboard bottom_row="false">
+<keyboard bottom_row="false" script="latin">
 	<row>
 		<key key0="j"				key2="esc"				key4="…"/>
 		<key key0="d"				key2="°"				key4="_"/>
diff --git a/res/xml/colemak.xml b/res/xml/colemak.xml
index 6e968c9..4bac3ff 100644
--- a/res/xml/colemak.xml
+++ b/res/xml/colemak.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<keyboard>
+<keyboard script="latin">
   <row>
     <key key0="q" key1="esc"                key2="loc accent_aigu"    key3="loc accent_tilde"   shift="0.5"/>
     <key key0="w" key1="loc accent_grave"       key2=" ́"              key3="~"            />
diff --git a/res/xml/devanagari_1.xml b/res/xml/devanagari_1.xml
index a8787a4..1f306e7 100644
--- a/res/xml/devanagari_1.xml
+++ b/res/xml/devanagari_1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<keyboard>
+<keyboard script="devanagari">
   <row>
     <key key0="ौ" key1="औ" key2="₹" key3="esc" key4="१"/>
     <key key0="ै" key1="ऐ" key2="ऍ" key3="¶" key4="२"/>
diff --git a/res/xml/devanagari_2.xml b/res/xml/devanagari_2.xml
index 7e1f770..1606abd 100644
--- a/res/xml/devanagari_2.xml
+++ b/res/xml/devanagari_2.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<keyboard>
+<keyboard script="devanagari">
   <row>
     <key shift="0.35" width="0.9" key0="क" key1="ख" key2="घ" key3="ङ"  key4="ग"/>
     <key              width="0.9" key0="च" key1="छ" key2="झ" key3="ञ"  key4="ज"/>
@@ -27,4 +27,4 @@
     <key key0="५" key1="१" key2="३" key3="७" key4="९" key5="४" key6="६" key7="२" key8="८"/>
     <key key0="backspace" key2="delete"/>
   </row>
-</keyboard>
\ No newline at end of file
+</keyboard>
diff --git a/res/xml/dvorak.xml b/res/xml/dvorak.xml
index c3fe774..4dccc23 100644
--- a/res/xml/dvorak.xml
+++ b/res/xml/dvorak.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<keyboard>
+<keyboard script="latin">
   <row>
     <key key0="shift" width="1.5" key2="esc" key4="tab"/>
     <key key0="p" key1="loc accent_ring" key2="." key3="&lt;" key4="f11_placeholder"/>
diff --git a/res/xml/he_il_1452_1.xml b/res/xml/he_il_1452_1.xml
index c007bbb..ff1b961 100644
--- a/res/xml/he_il_1452_1.xml
+++ b/res/xml/he_il_1452_1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<keyboard>
+<keyboard script="hebrew">
   <row>
     <key key0="/" key2="1" key3="!" key4="esc"/>
     <key key0="'" key2="2" key3="\@" key1=";"/>
diff --git a/res/xml/he_il_1452_2.xml b/res/xml/he_il_1452_2.xml
index 78d1536..ebd6d84 100644
--- a/res/xml/he_il_1452_2.xml
+++ b/res/xml/he_il_1452_2.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<keyboard>
+<keyboard script="hebrew">
   <row>
     <key key0="ץ" key2="1" key3="!" key4="esc"/>
     <key key0="ן" key2="2" key3="\@" key1=";"/>
diff --git a/res/xml/jcuken_ua.xml b/res/xml/jcuken_ua.xml
index 5b2027e..d5ae950 100644
--- a/res/xml/jcuken_ua.xml
+++ b/res/xml/jcuken_ua.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<keyboard>
+<keyboard script="cyrillic">
   <row>
     <key shift="0.1 " key0="й" key2="1" key4="esc"/>
     <key key0="ц" key1="~" key2="2" key3="\@"/>
diff --git a/res/xml/kurdish.xml b/res/xml/kurdish.xml
index 743094e..bc8bb4a 100644
--- a/res/xml/kurdish.xml
+++ b/res/xml/kurdish.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<keyboard>
+<keyboard script="arabic">
   <row>
     <key key0="ق" key1="ٯ" key2="١" key3="esc"/>
     <key key0="و" key1="وو" key2="٢" key3="\@"/>
diff --git a/res/xml/local_bgph1.xml b/res/xml/local_bgph1.xml
index c84d54e..f4eb820 100644
--- a/res/xml/local_bgph1.xml
+++ b/res/xml/local_bgph1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<keyboard>
+<keyboard script="cyrillic">
   <row>
     <key key0="я" key2="1" key4="esc"/>
     <key key0="в" key1="!" key2="2" key3="\@" key4="ч"/>
diff --git a/res/xml/local_ru_jcuken.xml b/res/xml/local_ru_jcuken.xml
index 59c1e2e..5f392ca 100644
--- a/res/xml/local_ru_jcuken.xml
+++ b/res/xml/local_ru_jcuken.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<keyboard>
+<keyboard script="cyrillic">
   <row>
     <key key0="й" key2="1" key4="esc"/>
     <key key0="ц" key1="loc ї" key2="2" key3="\@" key4="~"/>
diff --git a/res/xml/method.xml b/res/xml/method.xml
index 31d03f8..7df6a65 100644
--- a/res/xml/method.xml
+++ b/res/xml/method.xml
@@ -1,34 +1,34 @@
 <?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="default_layout=ar_pc"/>
-  <subtype android:label="%s" android:languageTag="be" android:imeSubtypeLocale="be_BY" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="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="default_layout=bgph1,extra_keys=€"/>
-  <subtype android:label="%s" android:languageTag="bn" android:imeSubtypeLocale="bn_BD" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwerty,extra_keys=৳"/>
-  <subtype android:label="%s" android:languageTag="cs" android:imeSubtypeLocale="cs_CZ" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="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="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="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="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="default_layout=qwerty"/>
-  <subtype android:label="%s" android:languageTag="es" android:imeSubtypeLocale="es_ES" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=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="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="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="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="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="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="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="default_layout=qwerty_ko"/>
-  <subtype android:label="%s" android:languageTag="lt" android:imeSubtypeLocale="lt_LT" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="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="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="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="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="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="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="default_layout=qwerty_pl"/>
-  <subtype android:label="%s" android:languageTag="pt" android:imeSubtypeLocale="pt_BR" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="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="default_layout=ru_jcuken"/>
-  <subtype android:label="%s" android:languageTag="sk" android:imeSubtypeLocale="sk_SK" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="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="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="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="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="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=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="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"/>
 </input-method>
diff --git a/res/xml/neo2.xml b/res/xml/neo2.xml
index c409fec..14dbf20 100644
--- a/res/xml/neo2.xml
+++ b/res/xml/neo2.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<keyboard bottom_row="false">
+<keyboard bottom_row="false" script="latin">
   <row>
     <key key0="x" key1="°" key2="1" key4="…"/>
     <key key0="v" key1="§" key2="2" key4="_"/>
diff --git a/res/xml/persian.xml b/res/xml/persian.xml
index 7d35293..d6a4127 100644
--- a/res/xml/persian.xml
+++ b/res/xml/persian.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<keyboard>
+<keyboard script="arabic">
   <row>
     <key key0="ض" key2="۱"/>
     <key key0="ص" key2="۲"/>
diff --git a/res/xml/qwerty.xml b/res/xml/qwerty.xml
index 4f5245b..06e91b9 100644
--- a/res/xml/qwerty.xml
+++ b/res/xml/qwerty.xml
@@ -20,7 +20,7 @@ See bottom_row.xml for the definition of the bottom row and neo2.xml for a
 layout that re-defines it.
 See srcs/juloo.keyboard2/KeyValue.java for the keys that have a special meaning.
 -->
-<keyboard>
+<keyboard script="latin">
   <row>
     <key key0="q" key2="1" key4="esc"/>
     <key key0="w" key1="~" key2="2" key3="\@"/>
diff --git a/res/xml/qwerty_el.xml b/res/xml/qwerty_el.xml
index 9aff8b9..50da475 100644
--- a/res/xml/qwerty_el.xml
+++ b/res/xml/qwerty_el.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<keyboard>
+<keyboard script="latin">
   <row>
     <key key0=";" key2="1" key4="esc"/>
     <key key0="ς" key1="~" key2="2" key3="\@"/>
diff --git a/res/xml/qwerty_es.xml b/res/xml/qwerty_es.xml
index 7b2ead2..273cfed 100644
--- a/res/xml/qwerty_es.xml
+++ b/res/xml/qwerty_es.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<keyboard>
+<keyboard script="latin">
   <row>
     <key key0="q" key2="1" key4="esc"/>
     <key key0="w" key1="~" key2="2" key3="\@"/>
diff --git a/res/xml/qwerty_hu.xml b/res/xml/qwerty_hu.xml
index 95e1fee..302c304 100644
--- a/res/xml/qwerty_hu.xml
+++ b/res/xml/qwerty_hu.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<keyboard>
+<keyboard script="latin">
   <row>
     <key key0="q" key2="0" key4="esc"/>
     <key key0="w" key1="'" key2="1" key3="~" key4="|"/>
diff --git a/res/xml/qwerty_ko.xml b/res/xml/qwerty_ko.xml
index 62f7fb7..998ab8f 100644
--- a/res/xml/qwerty_ko.xml
+++ b/res/xml/qwerty_ko.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<keyboard>
+<keyboard script="hangul">
   <row>
     <key key0="ㅂ" key2="1" key4="esc"/>
     <key key0="ㅈ" key1="~" key2="2" key3="\@"/>
diff --git a/res/xml/qwerty_lv.xml b/res/xml/qwerty_lv.xml
index 6cf8d5a..7f16d5a 100644
--- a/res/xml/qwerty_lv.xml
+++ b/res/xml/qwerty_lv.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<keyboard>
+<keyboard script="latin">
   <row>
     <key key0="q" key2="1" key4="esc"/>
     <key key0="w" key1="~" key2="2" key3="\@" key4="!"/>
diff --git a/res/xml/qwerty_no.xml b/res/xml/qwerty_no.xml
index c6ed74f..33e9f3b 100644
--- a/res/xml/qwerty_no.xml
+++ b/res/xml/qwerty_no.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<keyboard>
+<keyboard script="latin">
   <row>
     <key key0="q" key2="1" key4="esc"/>
     <key key0="w" key1="~" key2="2" key3="\@"/>
diff --git a/res/xml/qwerty_pl.xml b/res/xml/qwerty_pl.xml
index 4300b27..1c28766 100644
--- a/res/xml/qwerty_pl.xml
+++ b/res/xml/qwerty_pl.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<keyboard>
+<keyboard script="latin">
   <row>
     <key key0="q" key2="1" key4="esc"/>
     <key key0="w" key1="~" key2="2" key3="\@"/>
diff --git a/res/xml/qwerty_pt.xml b/res/xml/qwerty_pt.xml
index 8eb34da..0c9015e 100644
--- a/res/xml/qwerty_pt.xml
+++ b/res/xml/qwerty_pt.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<keyboard>
+<keyboard script="latin">
   <row>
     <key key0="q" key2="1" key4="esc"/>
     <key key0="w" key1="~" key2="2" key3="\@" key4="!"/>
diff --git a/res/xml/qwerty_sv_se.xml b/res/xml/qwerty_sv_se.xml
index 63d16c2..69884d7 100644
--- a/res/xml/qwerty_sv_se.xml
+++ b/res/xml/qwerty_sv_se.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<keyboard>
+<keyboard script="latin">
   <row>
     <key key0="q" key4="esc" key2="1"/>
     <key key0="w" key2="2" key3="`" key4="\@"/>
diff --git a/res/xml/qwerty_tr.xml b/res/xml/qwerty_tr.xml
index e0c60e5..60f52a2 100644
--- a/res/xml/qwerty_tr.xml
+++ b/res/xml/qwerty_tr.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<keyboard>
+<keyboard script="latin">
   <row>
     <key key0="q" key2="1" key4="esc"/>
     <key key0="w" key1="~" key2="2" key3="\@"/>
diff --git a/res/xml/qwerty_vi.xml b/res/xml/qwerty_vi.xml
index e61f1f7..1e3a64a 100644
--- a/res/xml/qwerty_vi.xml
+++ b/res/xml/qwerty_vi.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<keyboard>
+<keyboard script="latin">
   <row>
     <key key0="q" key1="~" key2="1" key3="`" key4="esc"/>
     <key key0="w" key1="accent_horn" key2="2" key3="\@"/>
diff --git a/res/xml/qwertz.xml b/res/xml/qwertz.xml
index 9b01a23..107b738 100644
--- a/res/xml/qwertz.xml
+++ b/res/xml/qwertz.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?> 
-<keyboard>
+<keyboard script="latin">
   <row>
     <key key0="q" key2="1" key4="esc"/>
     <key key0="w" key1="^" key2="2" key3="&quot;" key4="\@"/>
diff --git a/res/xml/qwertz_cs.xml b/res/xml/qwertz_cs.xml
index 5a4d4fd..6546163 100644
--- a/res/xml/qwertz_cs.xml
+++ b/res/xml/qwertz_cs.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<keyboard>
+<keyboard script="latin">
   <row>
     <key key0="q" key1="1" key4="esc"/>
     <key key0="w" key1="2" key3="~"/>
diff --git a/res/xml/qwertz_de.xml b/res/xml/qwertz_de.xml
index 2181716..6d01610 100644
--- a/res/xml/qwertz_de.xml
+++ b/res/xml/qwertz_de.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<keyboard>
+<keyboard script="latin">
   <row>
     <key key0="q" key2="1" key4="esc"/>
     <key key0="w" key1="^" key2="2" key3="&quot;" key4="\@"/>
diff --git a/res/xml/qwertz_hu.xml b/res/xml/qwertz_hu.xml
index 7e4f6c3..557b2e5 100644
--- a/res/xml/qwertz_hu.xml
+++ b/res/xml/qwertz_hu.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<keyboard>
+<keyboard script="latin">
   <row>
     <key key0="q" key2="0" key4="esc"/>
     <key key0="w" key1="'" key2="1" key3="~" key4="|"/>
diff --git a/res/xml/qwertz_sk.xml b/res/xml/qwertz_sk.xml
index fa038c5..7d3d1f4 100644
--- a/res/xml/qwertz_sk.xml
+++ b/res/xml/qwertz_sk.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<keyboard>
+<keyboard script="latin">
   <row>
     <key key0="q" key1="1" key4="esc"/>
     <key key0="w" key1="2"/>