diff --git a/check_layout.output b/check_layout.output
index 0d89cdf..4aa2838 100644
--- a/check_layout.output
+++ b/check_layout.output
@@ -4,7 +4,7 @@ Layout doesn't define some important keys, missing: f11_placeholder, f12_placeho
 2 warnings
 # arab_hamvaj_tly
 Layout includes some ASCII punctuation but not all, missing: ", %, ', ,, /, ;, <, =, >, ?, [, \, ], _, `, {, |, }
-Layout doesn't define some important keys, missing: esc, f11_placeholder, f12_placeholder
+Layout doesn't define some important keys, missing: f11_placeholder, f12_placeholder, loc esc
 2 warnings
 # arab_pc
 Layout includes some ASCII punctuation but not all, missing: !, ', +, ;, ?, \, |
@@ -40,7 +40,7 @@ Layout includes some ASCII punctuation but not all, missing: ~
 1 warnings
 # deva_alt
 Layout includes some ASCII punctuation but not all, missing: #, $, %, &, ', (, ), +, ., /, :, <, =, >, [, \, ], ^, _, `, {, |, }, ~
-Layout doesn't define some important keys, missing: esc, f11_placeholder, f12_placeholder, tab
+Layout doesn't define some important keys, missing: f11_placeholder, f12_placeholder, loc esc, loc tab
 2 warnings
 # deva_inscript
 Duplicate keys: ।
@@ -55,7 +55,7 @@ Duplicate keys: ટ, ડ
 Layout doesn't define some important keys, missing: f11_placeholder, f12_placeholder
 2 warnings
 # hang_dubeolsik_kr
-Layout doesn't define some important keys, missing: esc, f11_placeholder, f12_placeholder, tab
+Layout doesn't define some important keys, missing: f11_placeholder, f12_placeholder, loc esc, loc tab
 1 warnings
 # hebr_1_il
 Layout includes some ASCII punctuation but not all, missing: (, ), <, >, [, ], {, }
@@ -109,7 +109,7 @@ Layout doesn't define some important keys, missing: f11_placeholder, f12_placeho
 1 warnings
 # latn_qwerty_tly
 Duplicate keys: a, c, j, q
-Layout doesn't define some important keys, missing: esc, f11_placeholder, f12_placeholder, tab
+Layout doesn't define some important keys, missing: f11_placeholder, f12_placeholder, loc esc, loc tab
 2 warnings
 # latn_qwerty_tr
 Layout doesn't define some important keys, missing: f11_placeholder, f12_placeholder
diff --git a/check_layout.py b/check_layout.py
index 96e9164..b1701a2 100644
--- a/check_layout.py
+++ b/check_layout.py
@@ -68,7 +68,7 @@ def check_layout(layout):
     missing_some_of(keys, "~!@#$%^&*(){}`[]=\\-_;:/.,?<>'\"+|", "ASCII punctuation")
     missing_some_of(keys, "0123456789", "digits")
     missing_required(keys,
-                     ["esc", "tab", "backspace", "delete",
+                     ["loc esc", "loc tab", "backspace", "delete",
                       "f11_placeholder", "f12_placeholder"],
                      "Layout doesn't define some important keys")
     unexpected_keys(keys,
diff --git a/res/xml/greekmath.xml b/res/xml/greekmath.xml
index 4821840..4e953d4 100644
--- a/res/xml/greekmath.xml
+++ b/res/xml/greekmath.xml
@@ -36,8 +36,8 @@
     <key width="1.5" key0="backspace" key3="delete"/>
   </row>
   <row height="0.95">
-    <key width="1.2" key0="switch_text" key2="esc"/>
-    <key width="1.2" key0="switch_numeric" key2="tab"/>
+    <key width="1.2" key0="switch_text" key2="loc esc"/>
+    <key width="1.2" key0="switch_numeric" key2="loc tab"/>
     <key width="1.2" key0="fn"/>
     <key width="2.8" key0="space" key1="superscript" key3="subscript"/>
     <key width="1.2" key0="0" key2="."/>
diff --git a/res/xml/numeric.xml b/res/xml/numeric.xml
index ca4eeb9..f50948c 100644
--- a/res/xml/numeric.xml
+++ b/res/xml/numeric.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <keyboard bottom_row="false">
   <row>
-    <key width="0.75" key0="esc" key2="~" key4="!"/>
+    <key width="0.75" key0="loc esc" key2="~" key4="!"/>
     <key width="0.75" key0="(" key2="[" key4="{"/>
     <key key0="7" key1="&lt;" key2="&gt;"/>
     <key key0="8" key2="∞"/>
@@ -10,7 +10,7 @@
     <key width="0.75" key0="/" key1="%" key3="÷"/>
   </row>
   <row>
-    <key width="0.75" key0="tab" key2="|" key4="\\"/>
+    <key width="0.75" key0="loc tab" key2="|" key4="\\"/>
     <key width="0.75" key0=")" key2="]" key4="}"/>
     <key key0="4" key1="box" key3="arrows"/>
     <key key0="5" key7="up" key6="right" key5="left" key8="down"/>
diff --git a/srcs/juloo.keyboard2/prefs/ExtraKeysPreference.java b/srcs/juloo.keyboard2/prefs/ExtraKeysPreference.java
index c15dff3..5e56369 100644
--- a/srcs/juloo.keyboard2/prefs/ExtraKeysPreference.java
+++ b/srcs/juloo.keyboard2/prefs/ExtraKeysPreference.java
@@ -49,6 +49,8 @@ public class ExtraKeysPreference extends PreferenceCategory
     "†",
     "ª",
     "º",
+    "tab",
+    "esc",
     "page_up",
     "page_down",
     "home",
@@ -76,6 +78,8 @@ public class ExtraKeysPreference extends PreferenceCategory
       case "voice_typing":
       case "change_method":
       case "compose":
+      case "tab":
+      case "esc":
         return true;
       default:
         return false;
diff --git a/srcs/layouts/arab_alt.xml b/srcs/layouts/arab_alt.xml
index 380d206..49436f1 100644
--- a/srcs/layouts/arab_alt.xml
+++ b/srcs/layouts/arab_alt.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <keyboard name="Arabic Alt" script="arabic" numpad_script="hindu-arabic">
   <row>
-    <key key0="ض" key2="١" key3="`" key4="esc"/>
+    <key key0="ض" key2="١" key3="`" key4="loc esc"/>
     <key key0="ص" key2="٢" key3="\@"/>
     <key key0="ث" key2="٣" key3="\#"/>
     <key key0="ق" key2="٤" key3="$"/>
@@ -14,7 +14,7 @@
     <key key0="ج"/>
   </row>
   <row>
-    <key key0="ش" key4="tab"/>
+    <key key0="ش" key4="loc tab"/>
     <key key0="س"/>
     <key key0="ي"/>
     <key key0="ب"/>
diff --git a/srcs/layouts/arab_hamvaj_tly.xml b/srcs/layouts/arab_hamvaj_tly.xml
index 896ad9f..a0912cd 100644
--- a/srcs/layouts/arab_hamvaj_tly.xml
+++ b/srcs/layouts/arab_hamvaj_tly.xml
@@ -14,7 +14,7 @@
     <key key0="ج"/>
   </row>
   <row>
-    <key key0="ش" key1="َ" key2="tab"/>
+    <key key0="ش" key1="َ" key2="loc tab"/>
     <key key0="س" key1="ُ"/>
     <key key0="ی" key4="ئ"/>
     <key key0="ب" key1="ّ"/>
diff --git a/srcs/layouts/arab_pc.xml b/srcs/layouts/arab_pc.xml
index 62b086d..dc0f453 100644
--- a/srcs/layouts/arab_pc.xml
+++ b/srcs/layouts/arab_pc.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <keyboard name="Arabic PC" script="arabic">
   <row>
-    <key key0="ض" key1="&#1614;" key2="1" key3="`" key4="esc"/>
+    <key key0="ض" key1="&#1614;" key2="1" key3="`" key4="loc esc"/>
     <key key0="ص" key1="&#1611;" key2="2" key3="\@"/>
     <key key0="ث" key1="&#1615;" key2="3" key3="\#" key4="loc €"/>
     <key key0="ق" key1="&#1612;" key2="4" key3="$" key4="loc £"/>
@@ -16,7 +16,7 @@
     <!-- <key key0="ذ" key1="&#1617;" key3="\\" key4="|"/> -->
   </row>
   <row>
-    <key shift="0.5" key0="ش" key1="&#1616;" key4="tab"/>
+    <key shift="0.5" key0="ش" key1="&#1616;" key4="loc tab"/>
     <key key0="س" key1="&#1613;"/>
     <key key0="ي" key1="["/>
     <key key0="ب" key1="]"/>
diff --git a/srcs/layouts/arab_pc_ckb.xml b/srcs/layouts/arab_pc_ckb.xml
index 0e9bd4f..4b63ad4 100644
--- a/srcs/layouts/arab_pc_ckb.xml
+++ b/srcs/layouts/arab_pc_ckb.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <keyboard name="Kurdish (کوردی)" script="arabic" numpad_script="hindu-arabic">
   <row>
-    <key key0="ق" key1="ٯ" key2="١" key3="esc"/>
+    <key key0="ق" key1="ٯ" key2="١" key3="loc esc"/>
     <key key0="و" key1="وو" key2="٢" key3="\@"/>
     <key key0="ە" key1="ة" key2="٣" key3="\#" />
     <key key0="ر" key1="ڕ" key2="٤" key3="$"/>
@@ -13,7 +13,7 @@
     <key key0="پ" key1="ث" key2="٠"/>
   </row>
   <row>
-    <key key0="ا" key1="أ" key2="tab"/>
+    <key key0="ا" key1="أ" key2="loc tab"/>
     <key key0="س" key1="ص"/>
     <key key0="ش" key1="ض"/>
     <key key0="د" key1="ذ" key2="ۮ"/>
diff --git a/srcs/layouts/arab_pc_hindu.xml b/srcs/layouts/arab_pc_hindu.xml
index b25eed1..9808ff4 100644
--- a/srcs/layouts/arab_pc_hindu.xml
+++ b/srcs/layouts/arab_pc_hindu.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <keyboard name="Arabic PC (Hindu numerals)" script="arabic" numpad_script="hindu-arabic">
   <row>
-    <key key0="ض" key1="&#1614;" key2="١" key3="`" key4="esc"/>
+    <key key0="ض" key1="&#1614;" key2="١" key3="`" key4="loc esc"/>
     <key key0="ص" key1="&#1611;" key2="٢" key3="\@"/>
     <key key0="ث" key1="&#1615;" key2="٣" key3="\#" key4="loc €"/>
     <key key0="ق" key1="&#1612;" key2="٤" key3="$" key4="loc £"/>
@@ -16,7 +16,7 @@
     <!-- <key key0="ذ" key1="&#1617;" key3="\\" key4="|"/> -->
   </row>
   <row>
-    <key shift="0.5" key0="ش" key1="&#1616;" key4="tab"/>
+    <key shift="0.5" key0="ش" key1="&#1616;" key4="loc tab"/>
     <key key0="س" key1="&#1613;"/>
     <key key0="ي" key1="["/>
     <key key0="ب" key1="]"/>
diff --git a/srcs/layouts/arab_pc_ir.xml b/srcs/layouts/arab_pc_ir.xml
index 4b5caa1..f5823bb 100644
--- a/srcs/layouts/arab_pc_ir.xml
+++ b/srcs/layouts/arab_pc_ir.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <keyboard name="Persian PC" script="persian">
   <row>
-    <key key0="ض" key2="۱" key4="esc"/>
+    <key key0="ض" key2="۱" key4="loc esc"/>
     <key key0="ص" key2="۲" key1="~" key3="\@"/>
     <key key0="ث" key2="۳" key1="!" key3="\#"/>
     <key key0="ق" key2="۴" key1="﷼" key3="$"/>
@@ -14,7 +14,7 @@
     <key key0="ج" key1="f11_placeholder" key3="f12_placeholder"/>
   </row>
   <row>
-    <key key0="ش" key2="tab"/>
+    <key key0="ش" key2="loc tab"/>
     <key key0="س"/>
     <key key0="ی" key2="ئ"/>
     <key key0="ب"/>
diff --git a/srcs/layouts/armenian_ph_am.xml b/srcs/layouts/armenian_ph_am.xml
index a11737a..f8933bf 100644
--- a/srcs/layouts/armenian_ph_am.xml
+++ b/srcs/layouts/armenian_ph_am.xml
@@ -13,7 +13,7 @@
         <key key0="ծ" key2="0"/>
     </row>
     <row>
-        <key key0="ք" key4="esc"/>
+        <key key0="ք" key4="loc esc"/>
         <key key0="ո"/>
         <key key0="ե" key1="և"/>
         <key key0="ռ"/>
@@ -25,7 +25,7 @@
         <key key0="պ"/>
     </row>
     <row>
-        <key key0="ա" key1="tab" key2="`"/>
+        <key key0="ա" key1="loc tab" key2="`"/>
         <key key0="ս"/>
         <key key0="դ"/>
         <key key0="ֆ"/>
diff --git a/srcs/layouts/beng_national.xml b/srcs/layouts/beng_national.xml
index a3c0d55..beaa6d6 100644
--- a/srcs/layouts/beng_national.xml
+++ b/srcs/layouts/beng_national.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <keyboard name="বাংলা (জাতীয়)" script="bengali">
   <row>
-    <key key0="ঙ" key2="ং" key3="esc" key4="১"/>
+    <key key0="ঙ" key2="ং" key3="loc esc" key4="১"/>
     <key key0="য" key2="য়" key3="¶" key4="২"/>
     <key key0="ড" key2="ঢ" key3="π" key4="৩"/>
     <key key0="প" key2="ফ" key3="√" key4="৪"/>
@@ -13,7 +13,7 @@
     <key key0="ড়" key2="ঢ়" key3="-" key4="০"/>
   </row>
   <row>
-    <key shift="0.5" key0="ৃ" key1="ৠ" key2="ঋ" key3="tab" key4="র্"/>
+    <key shift="0.5" key0="ৃ" key1="ৠ" key2="ঋ" key3="loc tab" key4="র্"/>
     <key key0="ু" key1="ঊ" key2="উ" key3="~" key4="ূ"/>
     <key key0="ি" key1="ঈ" key2="ই" key3="•" key4="ী"/>
     <key key0="া" key1="ৄ" key2="আ" key3="°" key4="অ"/>
diff --git a/srcs/layouts/beng_provat.xml b/srcs/layouts/beng_provat.xml
index ee7be4a..e13a4a2 100644
--- a/srcs/layouts/beng_provat.xml
+++ b/srcs/layouts/beng_provat.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <keyboard name="বাংলা (প্রভাত)" script="bengali">
 	<row>
-		<key 				key0="দ"	key1="ধ"	key2="১"	key3="!"				key5="esc"	/>
+		<key 				key0="দ"	key1="ধ"	key2="১"	key3="!"				key5="loc esc"	/>
 		<key 				key0="ূ"		key1="ঊ"	key2="২"	key3="\@"							/>
 		<key 				key0="ী"		key1="ঈ"	key2="৩"	key3="\#"							/>
 		<key 				key0="র"	key1="ড়"	key2="৪"	key3="৳"							/>
@@ -13,7 +13,7 @@
 		<key 				key0="প"	key1="ফ"	key2="০"	key3="zwj"	key4="~"				/>
 	</row>
 	<row>
-		<key shift="0.5"	key0="া"		key1="অ"										key5="tab"	/>
+		<key shift="0.5"	key0="া"		key1="অ"										key5="loc tab"	/>
 		<key 				key0="স"	key1="ষ"													/>
 		<key 				key0="ড"	key1="ঢ"														/>
 		<key 				key0="ত"	key1="থ"													/>
diff --git a/srcs/layouts/cyrl_jcuken_ru.xml b/srcs/layouts/cyrl_jcuken_ru.xml
index 81cf35c..a9d7f1a 100644
--- a/srcs/layouts/cyrl_jcuken_ru.xml
+++ b/srcs/layouts/cyrl_jcuken_ru.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <keyboard name="ЙЦУКЕН (Русский)" script="cyrillic">
   <row>
-    <key key0="й" key2="1" key4="esc"/>
+    <key key0="й" key2="1" key4="loc esc"/>
     <key key0="ц" key1="loc ї" key2="2" key3="\@" key4="~"/>
     <key key0="у" key1="loc ў" key2="3" key3="\#" key4="!"/>
     <key key0="к" key2="4" key3="$"/>
@@ -14,7 +14,7 @@
     <key key0="х" key3="[" key4="]" key1="f11_placeholder" key2="f12_placeholder"/>
   </row>
   <row>
-    <key key0="ф" key1="tab" key2="`"/>
+    <key key0="ф" key1="loc tab" key2="`"/>
     <key key0="ы"/>
     <key key0="в"/>
     <key key0="а"/>
diff --git a/srcs/layouts/cyrl_jcuken_uk.xml b/srcs/layouts/cyrl_jcuken_uk.xml
index 905f0e1..45f9966 100644
--- a/srcs/layouts/cyrl_jcuken_uk.xml
+++ b/srcs/layouts/cyrl_jcuken_uk.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <keyboard name="ЙЦУКЕН (Українська)" script="cyrillic">
   <row>
-    <key shift="0.1 " key0="й" key2="1" key4="esc"/>
+    <key shift="0.1 " key0="й" key2="1" key4="loc esc"/>
     <key key0="ц" key1="~" key2="2" key3="\@"/>
     <key key0="у" key1="!" key2="3" key3="\#" key4="loc €"/>
     <key key0="к" key2="4" key3="$"/>
@@ -14,7 +14,7 @@
     <key key0="х"/>
   </row>
   <row>
-    <key shift="0.1" key0="ф" key1="tab" key2="`"/>
+    <key shift="0.1" key0="ф" key1="loc tab" key2="`"/>
     <key key0="і" key2="ї"/>
     <key key0="в" />
     <key key0="а" />
diff --git a/srcs/layouts/cyrl_ueishsht.xml b/srcs/layouts/cyrl_ueishsht.xml
index e2972a8..296b908 100644
--- a/srcs/layouts/cyrl_ueishsht.xml
+++ b/srcs/layouts/cyrl_ueishsht.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <keyboard name="УЕИШЩ (Български, БДС)" script="cyrillic">
   <row>
-    <key key0="у" key2="1" key4="esc"/>
+    <key key0="у" key2="1" key4="loc esc"/>
     <key key0="е" key1="~" key2="2" key3="\@"/>
     <key key0="и" key1="!" key2="3" key3="\#" key4="ѝ"/>
     <key key0="ш" key2="4" key3="$"/>
@@ -14,7 +14,7 @@
     <key key0="б" key2="€"/>
   </row>
   <row>
-    <key key0="ь" key1="tab" key2="`"/>
+    <key key0="ь" key1="loc tab" key2="`"/>
     <key key0="я"/>
     <key key0="а"/>
     <key key0="о" key2="-" key3="_"/>
diff --git a/srcs/layouts/cyrl_yaverti.xml b/srcs/layouts/cyrl_yaverti.xml
index a228f24..ef32644 100644
--- a/srcs/layouts/cyrl_yaverti.xml
+++ b/srcs/layouts/cyrl_yaverti.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <keyboard name="ЯВЕРТЪ" script="cyrillic">
   <row>
-    <key key0="я" key2="1" key4="esc"/>
+    <key key0="я" key2="1" key4="loc esc"/>
     <key key0="в" key1="!" key2="2" key3="\@" key4="ч"/>
     <key key0="е" key2="3" key3="\#" key4="№"/>
     <key key0="р" key2="4" key3="$"/>
@@ -13,7 +13,7 @@
     <key key0="п" key2="0" key3="f11_placeholder" key4="f12_placeholder"/>
   </row>
   <row>
-    <key shift="0.5" key0="а" key1="tab" key2="`"/>
+    <key shift="0.5" key0="а" key1="loc tab" key2="`"/>
     <key key0="с"/>
     <key key0="д"/>
     <key key0="ф"/>
diff --git a/srcs/layouts/deva_inscript.xml b/srcs/layouts/deva_inscript.xml
index 0bcd86d..bc20d15 100644
--- a/srcs/layouts/deva_inscript.xml
+++ b/srcs/layouts/deva_inscript.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <keyboard name="देवनागरी (हिंदी)-1" script="devanagari">
   <row>
-    <key key0="ौ" key1="औ" key2="₹" key3="esc" key4="१"/>
+    <key key0="ौ" key1="औ" key2="₹" key3="loc esc" key4="१"/>
     <key key0="ै" key1="ऐ" key2="ऍ" key3="¶" key4="२"/>
     <key key0="ा" key1="आ" key2="ॅ" key3="ग़" key4="३"/>
     <key key0="ी" key1="ई" key2="ज्ञ" key3="ज़" key4="४"/>
@@ -13,7 +13,7 @@
     <key key0="ज" key1="झ" key2="ृ" key3="-" key4="०"/>
   </row>
   <row>
-    <key shift="0.5" key0="ो" key1="ओ" key2="ॉ" key3="tab" key4="ऑ"/>
+    <key shift="0.5" key0="ो" key1="ओ" key2="ॉ" key3="loc tab" key4="ऑ"/>
     <key key0="े" key1="ए" key2="ञ" key3="~" key4="॰"/>
     <key key0="्" key1="अ" key2="़" key3="ऽ" key4="ऺ"/>
     <key key0="ि" key1="इ" key2="ढ" key3="॥" key4="ॄ"/>
diff --git a/srcs/layouts/grek_qwerty.xml b/srcs/layouts/grek_qwerty.xml
index f5499ec..00143de 100644
--- a/srcs/layouts/grek_qwerty.xml
+++ b/srcs/layouts/grek_qwerty.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <keyboard name="QWERTY (Greek)" script="latin">
   <row>
-    <key key0=";" key2="1" key4="esc"/>
+    <key key0=";" key2="1" key4="loc esc"/>
     <key key0="ς" key1="~" key2="2" key3="\@"/>
     <key key0="ε" key1="!" key2="3" key3="\#" key4="loc €"/>
     <key key0="ρ" key2="4" key3="$"/>
@@ -13,7 +13,7 @@
     <key key0="π" key2="0" key3="f11_placeholder" key4="f12_placeholder"/>
   </row>
   <row>
-    <key shift="0.5" key0="α" key1="tab" key2="`"/>
+    <key shift="0.5" key0="α" key1="loc tab" key2="`"/>
     <key key0="σ"/>
     <key key0="δ" key2="loc £"/>
     <key key0="φ"/>
diff --git a/srcs/layouts/guj_phonetic_in.xml b/srcs/layouts/guj_phonetic_in.xml
index a2e82cf..6f78c4a 100644
--- a/srcs/layouts/guj_phonetic_in.xml
+++ b/srcs/layouts/guj_phonetic_in.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <keyboard name="ગુજરાતી ફોનેટિક - Gujarati Phonetic" script="gujarati">
   <row>
-    <key key0="ટ" key1="`" key2="1" key3="!" key4="esc"/>
+    <key key0="ટ" key1="`" key2="1" key3="!" key4="loc esc"/>
     <key key0="ડ" key1="~" key2="2" key3="\@" key4="\#"/>
     <key key0="ે" key1="એ" key2="3" key3="$" key4="૱"/>
     <key key0="ર" key1="ઋ" key2="4" key3="ૃ" key4="₹"/>
@@ -13,7 +13,7 @@
     <key key0="પ" key1="૰" key2="0" key4="॒"/>
   </row>
   <row>
-    <key shift="0.5" key0="ા" key1="tab" key3="અ"/>
+    <key shift="0.5" key0="ા" key1="loc tab" key3="અ"/>
     <key key0="સ" key1="“" key4="”"/>
     <key key0="દ" key1="ડ"/>
     <key key0="્" key1="ૠ" key3="ૄ"/>
@@ -34,4 +34,4 @@
     <key key0="મ" key1="ૐ" key2="&quot;" key3="'" key4="॑" key6="ઽ"/>
     <key width="1.5" key0="backspace" key2="delete"/>
   </row>
-</keyboard>
\ No newline at end of file
+</keyboard>
diff --git a/srcs/layouts/hebr_1_il.xml b/srcs/layouts/hebr_1_il.xml
index bbf5e56..5fe219c 100644
--- a/srcs/layouts/hebr_1_il.xml
+++ b/srcs/layouts/hebr_1_il.xml
@@ -2,7 +2,7 @@
 <!-- Based on standard SI-1452-1 -->
 <keyboard name="Hebrew 1" script="hebrew">
   <row>
-    <key key0="/" key2="1" key3="!" key4="esc"/>
+    <key key0="/" key2="1" key3="!" key4="loc esc"/>
     <key key0="'" key2="2" key3="\@" key1=";"/>
     <key key0="ק" key2="3" key3="\#" key1="€"/>
     <key key0="ר" key2="4" key3="$" key1="₪"/>
@@ -15,7 +15,7 @@
     <key key0="backspace" key2="delete" key3="f11_placeholder" key4="f12_placeholder"/>
   </row>
   <row>
-    <key key0="ש" key2="`" key1="tab" key3="sindot_placeholder" key4="shindot_placeholder" width="1.333"/>
+    <key key0="ש" key2="`" key1="loc tab" key3="sindot_placeholder" key4="shindot_placeholder" width="1.333"/>
     <key key0="ד" key1="~" width="1.0333"/>
     <key key0="ג" key1="geresh" key2="gershayim" width="1.0333"/>
     <key key0="כ" width="1.0333"/>
diff --git a/srcs/layouts/hebr_2_il.xml b/srcs/layouts/hebr_2_il.xml
index 090bef8..42bd805 100644
--- a/srcs/layouts/hebr_2_il.xml
+++ b/srcs/layouts/hebr_2_il.xml
@@ -2,7 +2,7 @@
 <!-- Based on standard SI-1452-2 -->
 <keyboard name="Hebrew 2" script="hebrew">
   <row>
-    <key key0="ץ" key2="1" key3="!" key4="esc"/>
+    <key key0="ץ" key2="1" key3="!" key4="loc esc"/>
     <key key0="ן" key2="2" key3="\@" key1=";"/>
     <key key0="ק" key2="3" key3="\#" key1="€"/>
     <key key0="ר" key2="4" key3="$" key1="₪"/>
@@ -14,7 +14,7 @@
     <key key0="פ" key2="0" key3="b)" key4="rlm" width="1.333"/>
   </row>
   <row>
-    <key key0="ש" key2="`" key1="tab" key3="sindot_placeholder" key4="shindot_placeholder" width="1.333"/>
+    <key key0="ש" key2="`" key1="loc tab" key3="sindot_placeholder" key4="shindot_placeholder" width="1.333"/>
     <key key0="ד" key1="~"/>
     <key key0="ג" key1="geresh" key2="gershayim"/>
     <key key0="כ"/>
diff --git a/srcs/layouts/latn_azerty_fr.xml b/srcs/layouts/latn_azerty_fr.xml
index cecafa5..db39718 100644
--- a/srcs/layouts/latn_azerty_fr.xml
+++ b/srcs/layouts/latn_azerty_fr.xml
@@ -3,7 +3,7 @@
 <!-- https://norme-azerty.fr/ -->
 <keyboard name="AZERTY (Français)" script="latin">
   <row>
-    <key key0="a" key2="1" key4="esc"/>
+    <key key0="a" key2="1" key4="loc esc"/>
     <key key0="z" key2="2" key3="&amp;" key4="~"/>
     <key key0="e" key2="3" key3="&quot;" key4="\#"/>
     <key key0="r" key2="4" key3="'"/>
@@ -15,7 +15,7 @@
     <key key0="p" key2="0" key3="f12_placeholder"/>
   </row>
   <row>
-    <key key0="q" key2="tab"/>
+    <key key0="q" key2="loc tab"/>
     <key key0="s" key3="loc ß"/>
     <key key0="d" key1="loc accent_grave" key2="é" key3="loc accent_aigu"/>
     <key key0="f" key3="{" key4="}"/>
diff --git a/srcs/layouts/latn_bepo_fr.xml b/srcs/layouts/latn_bepo_fr.xml
index 941c3ee..d6b3a58 100644
--- a/srcs/layouts/latn_bepo_fr.xml
+++ b/srcs/layouts/latn_bepo_fr.xml
@@ -2,7 +2,7 @@
 <!-- Inspired by the bépo layout, but adapted to smartphone -->
 <keyboard name="BEPO (Français)" script="latin">
   <row>
-    <key width="1.1" key0="b" key1="esc" key2="1" key4="|"/>
+    <key width="1.1" key0="b" key1="loc esc" key2="1" key4="|"/>
     <key width="1.1" key0="é" key2="2" key4="è"/>
     <key width="1.1" key0="p" key2="3"/>
     <key width="1.1" key0="o" key2="4" key4="accent_circonflexe"/>
@@ -14,7 +14,7 @@
     <key width="1.1" key0="w" key2="0" key4="]"/>
   </row>
   <row>
-    <key width="1.1" key0="a" key1="tab" key4="à"/>
+    <key width="1.1" key0="a" key1="loc tab" key4="à"/>
     <key width="1.1" key0="u" key1="$" key4="ù"/>
     <key width="1.1" key0="i" key4="&amp;"/>
     <key width="1.1" key0="e" key1="+" key2="accent_trema" key4="€"/>
diff --git a/srcs/layouts/latn_bone.xml b/srcs/layouts/latn_bone.xml
index f9ce147..1452dca 100644
--- a/srcs/layouts/latn_bone.xml
+++ b/srcs/layouts/latn_bone.xml
@@ -2,7 +2,7 @@
 <!-- https://neo-layout.org/Layouts/bone/ -->
 <keyboard name="Bone" bottom_row="false" script="latin">
 	<row>
-		<key key0="j"				key2="esc"				key4="…"/>
+		<key key0="j"				key2="loc esc"				key4="…"/>
 		<key key0="d"				key2="°"				key4="_"/>
 		<key key0="u"				key2="§"				key4="["/>
 		<key key0="a"										key4="]"/>
@@ -14,7 +14,7 @@
 		<key key0="w"							key3="&amp;"	key4="f12_placeholder"/>
 	</row>
 	<row>
-		<key key0="c"				key2="tab"											key4="\\"/>
+		<key key0="c"				key2="loc tab"											key4="\\"/>
 		<key key0="t"	key1="accent_circonflexe"	key2="accent_caron"					key4="/"/>
 		<key key0="i"	key1="accent_aigu"			key2="accent_grave"					key4="{"/>
 		<key key0="e"	key1="accent_cedille"		key2="accent_ogonek"				key4="}"/>
diff --git a/srcs/layouts/latn_colemak.xml b/srcs/layouts/latn_colemak.xml
index 1a73fbb..d79f7a3 100644
--- a/srcs/layouts/latn_colemak.xml
+++ b/srcs/layouts/latn_colemak.xml
@@ -2,7 +2,7 @@
 <!-- https://colemak.com/ -->
 <keyboard name="Colemak" script="latin">
   <row>
-    <key key0="q" key1="esc"                key2="loc accent_aigu"    key3="loc accent_tilde"   shift="0.5"/>
+    <key key0="q" key1="loc esc"                key2="loc accent_aigu"    key3="loc accent_tilde"   shift="0.5"/>
     <key key0="w" key1="loc accent_grave"       key2=" ́"              key3="~"            />
     <key key0="f" key1="`"                  key2="-"              key3="+" />
     <key key0="p"                           key2="="              key3="%"/>
@@ -14,7 +14,7 @@
 
   </row>
   <row>
-    <key key0="a"                           key2="1" key4="tab"/>
+    <key key0="a"                           key2="1" key4="loc tab"/>
     <key key0="r" key1="\@"                 key2="2" />
     <key key0="s" key1="\#"                 key2="3" key4="loc ß"/>
     <key key0="t" key1="$"                  key2="4" key4="loc accent_ogonek" />
diff --git a/srcs/layouts/latn_dvorak.xml b/srcs/layouts/latn_dvorak.xml
index cff4c4c..c826b1b 100644
--- a/srcs/layouts/latn_dvorak.xml
+++ b/srcs/layouts/latn_dvorak.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <keyboard name="Dvorak" script="latin">
   <row>
-    <key key0="shift" width="1.5" key2="esc" key4="tab"/>
+    <key key0="shift" width="1.5" key2="loc esc" key4="loc tab"/>
     <key key0="p" key1="loc accent_ring" key2="." key3="&lt;" key4="f11_placeholder"/>
     <key key0="y" key1="loc accent_grave" key2="," key3="&gt;" key4="f12_placeholder"/>
     <key key0="f" key4="loc €"/>
diff --git a/srcs/layouts/latn_neo2.xml b/srcs/layouts/latn_neo2.xml
index 013cd74..baeee12 100644
--- a/srcs/layouts/latn_neo2.xml
+++ b/srcs/layouts/latn_neo2.xml
@@ -16,7 +16,7 @@
     <key key0="ß" key1="—"/>
   </row>
   <row>
-    <key key0="u" key1="tab" key4="\\"/>
+    <key key0="u" key1="loc tab" key4="\\"/>
     <key key0="i" key4="/"/>
     <key key0="a" key4="{"/>
     <key key0="e" key4="}"/>
@@ -29,7 +29,7 @@
     <key key0="y" key3="\@"/>
   </row>
   <row>
-    <key width="1.5" key0="shift" key1="esc" key2="loc capslock"/>
+    <key width="1.5" key0="shift" key1="loc esc" key2="loc capslock"/>
     <key key0="ü" key4="\#"/>
     <key key0="ö" key4="$"/>
     <key key0="ä" key4="|"/>
diff --git a/srcs/layouts/latn_qwerty_br.xml b/srcs/layouts/latn_qwerty_br.xml
index e4829ae..2b40301 100644
--- a/srcs/layouts/latn_qwerty_br.xml
+++ b/srcs/layouts/latn_qwerty_br.xml
@@ -2,7 +2,7 @@
 <!-- Adapted from standard ABNT NBR 10346 -->
 <keyboard name="QWERTY (Brasileiro)" script="latin">
   <row>
-    <key key0="q" key2="1" key4="esc"/>
+    <key key0="q" key2="1" key4="loc esc"/>
     <key key0="w" key1="~" key2="2" key3="\@" key4="!"/>
     <key key0="e" key2="3" key3="\#" key4="€"/>
     <key key0="r" key2="4" key3="$" key4="f11_placeholder"/>
@@ -14,7 +14,7 @@
     <key key0="p" key2="0" key3="\\"/>
   </row>
   <row>
-    <key key0="a" key2="tab" key4="`"/>
+    <key key0="a" key2="loc tab" key4="`"/>
     <key key0="s" key1="'" key2="loc §" key3="loc ß" key4="accent_cedille"/>
     <key key0="d" key1="&quot;"/>
     <key key0="f"/>
diff --git a/srcs/layouts/latn_qwerty_cz.xml b/srcs/layouts/latn_qwerty_cz.xml
index 8d4207c..5b038bd 100644
--- a/srcs/layouts/latn_qwerty_cz.xml
+++ b/srcs/layouts/latn_qwerty_cz.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <keyboard script="latin" name="QWERTY (Czech)">
   <row>
-    <key key0="q" key1="1" key2="esc" key4="~"/>
+    <key key0="q" key1="1" key2="loc esc" key4="~"/>
     <key key0="w" key1="2" key2="+" key3="|" key4="\\"/>
     <key key0="e" key1="3" key2="é" key3="^" key4="ě"/>
     <key key0="r" key1="4" key4="ř"/>
@@ -13,7 +13,7 @@
     <key key0="p" key1="0" key3="="/>
   </row>
   <row>
-    <key shift="0.5" key0="a" key1="tab" key2="á" key3=";"/>
+    <key shift="0.5" key0="a" key1="loc tab" key2="á" key3=";"/>
     <key key0="s" key1="loc §" key4="š"/>
     <key key0="d" key4="ď"/>
     <key key0="f" key3="["/>
diff --git a/srcs/layouts/latn_qwerty_da.xml b/srcs/layouts/latn_qwerty_da.xml
index b1ba957..d2b90c6 100644
--- a/srcs/layouts/latn_qwerty_da.xml
+++ b/srcs/layouts/latn_qwerty_da.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <keyboard name="QWERTY (Danish)" script="latin">
   <row>
-    <key key0="q" key1="~" key2="1" key4="esc"/>
+    <key key0="q" key1="~" key2="1" key4="loc esc"/>
     <key key0="w" key2="2" key3="`" key4="\@"/>
     <key key0="e" key2="3" key3="€" key4="\#"/>
     <key key0="r" key2="4" key4="$"/>
@@ -14,7 +14,7 @@
     <key key0="å" key1="\?" key3="!" key4="f12_placeholder"/>
   </row>
   <row>
-    <key key0="a" key2="tab"/>
+    <key key0="a" key2="loc tab"/>
     <key key0="s" key1="accent_ring" key2="loc §" key3="loc ß"/>
     <key key0="d" key1="accent_aigu"/>
     <key key0="f" key1="accent_trema"/>
@@ -38,4 +38,4 @@
     <key width="1.5" key0="backspace" key2="delete"/>
   </row>
 
-</keyboard>
\ No newline at end of file
+</keyboard>
diff --git a/srcs/layouts/latn_qwerty_es.xml b/srcs/layouts/latn_qwerty_es.xml
index cb3c2cc..e7e7ce7 100644
--- a/srcs/layouts/latn_qwerty_es.xml
+++ b/srcs/layouts/latn_qwerty_es.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <keyboard name="QWERTY (Español)" script="latin">
   <row>
-    <key key0="q" key2="1" key4="esc"/>
+    <key key0="q" key2="1" key4="loc esc"/>
     <key key0="w" key1="~" key2="2" key3="\@"/>
     <key key0="e" key1="!" key2="3" key3="\#" key4="€"/>
     <key key0="r" key2="4" key3="$"/>
@@ -13,7 +13,7 @@
     <key key0="p" key2="0" key3="f11_placeholder" key4="f12_placeholder"/>
   </row>
   <row>
-    <key key0="a" key2="tab" key4="`"/>
+    <key key0="a" key2="loc tab" key4="`"/>
     <key key0="s" key1="loc §" key2="¡" key3="loc ß"/>
     <key key0="d" key1="accent_grave" key3="accent_aigu"/>
     <key key0="f"/>
diff --git a/srcs/layouts/latn_qwerty_gb.xml b/srcs/layouts/latn_qwerty_gb.xml
index 4abd761..4bf2f36 100644
--- a/srcs/layouts/latn_qwerty_gb.xml
+++ b/srcs/layouts/latn_qwerty_gb.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <keyboard name="QWERTY (UK)" script="latin">
   <row>
-    <key key0="q" key2="1" key4="esc"/>
+    <key key0="q" key2="1" key4="loc esc"/>
     <key key0="w" key2="2" key3="&quot;"/>
     <key key0="e" key1="!" key2="3" key3="loc £" key4="loc €"/>
     <key key0="r" key2="4" key3="$" key1="loc ₪"/>
@@ -13,7 +13,7 @@
     <key key0="p" key2="0" key3="f11_placeholder" key4="f12_placeholder"/>
   </row>
   <row>
-    <key shift="0.5" key0="a" key1="tab" key2="`"/>
+    <key shift="0.5" key0="a" key1="loc tab" key2="`"/>
     <key key0="s" key1="loc accent_ring" key2="loc §" key3="loc ß" key4="loc accent_ogonek"/>
     <key key0="d" key1="loc accent_grave" key3="loc accent_aigu"/>
     <key key0="f" key1="loc accent_dot_above"/>
diff --git a/srcs/layouts/latn_qwerty_hu.xml b/srcs/layouts/latn_qwerty_hu.xml
index 1caf242..d511dfb 100644
--- a/srcs/layouts/latn_qwerty_hu.xml
+++ b/srcs/layouts/latn_qwerty_hu.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <keyboard name="QWERTY (Magyar)" script="latin">
   <row>
-    <key key0="q" key2="0" key4="esc"/>
+    <key key0="q" key2="0" key4="loc esc"/>
     <key key0="w" key1="'" key2="1" key3="~" key4="|"/>
     <key key0="e" key1="&quot;" key2="2" key4="é"/>
     <key key0="r" key2="3" key4="^"/>
@@ -13,7 +13,7 @@
     <key key0="p" key2="9"/>
   </row>
   <row>
-    <key shift="0.5" key0="a" key1="tab" key4="á"/>
+    <key shift="0.5" key0="a" key1="loc tab" key4="á"/>
     <key key0="s" key1="§" key2="\\" key3="[" key4="]"/>
     <key key0="d" key3="{" key4="}"/>
     <key key0="f" key3="+"/>
diff --git a/srcs/layouts/latn_qwerty_lv.xml b/srcs/layouts/latn_qwerty_lv.xml
index a373eb8..06f27a9 100644
--- a/srcs/layouts/latn_qwerty_lv.xml
+++ b/srcs/layouts/latn_qwerty_lv.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <keyboard name="QWERTY (Latvian)" script="latin">
   <row>
-    <key key0="q" key2="1" key4="esc"/>
+    <key key0="q" key2="1" key4="loc esc"/>
     <key key0="w" key1="~" key2="2" key3="\@" key4="!"/>
     <key key0="e" key1="ē" key2="3" key3="\#" key4="€"/>
     <key key0="r" key1="ŗ" key2="4" key3="$" key4="f11_placeholder"/>
@@ -13,7 +13,7 @@
     <key key0="p" key2="0"/>
   </row>
   <row>
-    <key shift="0.5" key0="a" key1="ā" key2="tab"/>
+    <key shift="0.5" key0="a" key1="ā" key2="loc tab"/>
     <key key0="s" key1="š" key2="loc §" key3="loc ß" key4="loc accent_ogonek"/>
     <key key0="d"/>
     <key key0="f" key1="loc accent_dot_above"/>
diff --git a/srcs/layouts/latn_qwerty_no.xml b/srcs/layouts/latn_qwerty_no.xml
index b86ea34..60d1582 100644
--- a/srcs/layouts/latn_qwerty_no.xml
+++ b/srcs/layouts/latn_qwerty_no.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <keyboard name="QWERTY (Norwegian)" script="latin">
   <row>
-    <key key0="q" key2="1" key4="esc"/>
+    <key key0="q" key2="1" key4="loc esc"/>
     <key key0="w" key1="~" key2="2" key3="\@"/>
     <key key0="e" key1="!" key2="3" key3="\#" key4="loc €"/>
     <key key0="r" key2="4" key3="$"/>
@@ -13,7 +13,7 @@
     <key key0="p" key2="0" key3="f11_placeholder" key4="f12_placeholder"/>
   </row>
   <row>
-    <key shift="0.5" key0="a" key1="tab" key2="`" key3="æ" key4="å"/>
+    <key shift="0.5" key0="a" key1="loc tab" key2="`" key3="æ" key4="å"/>
     <key key0="s" key1="loc accent_ring" key2="loc §" key3="loc ß" key4="loc accent_ogonek"/>
     <key key0="d" key1="loc accent_grave" key2="loc £" key3="loc accent_aigu"/>
     <key key0="f" key1="loc accent_dot_above"/>
diff --git a/srcs/layouts/latn_qwerty_pl.xml b/srcs/layouts/latn_qwerty_pl.xml
index 6bece78..218a37a 100644
--- a/srcs/layouts/latn_qwerty_pl.xml
+++ b/srcs/layouts/latn_qwerty_pl.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <keyboard name="QWERTY (Polski)" script="latin">
   <row>
-    <key key0="q" key2="1" key4="esc"/>
+    <key key0="q" key2="1" key4="loc esc"/>
     <key key0="w" key1="~" key2="2" key3="\@"/>
     <key key0="e" key1="!" key2="3" key3="\#" key4="ę"/>
     <key key0="r" key2="4" key3="$"/>
@@ -13,7 +13,7 @@
     <key key0="p" key2="0" key3="(" key4=")"/>
   </row>
   <row>
-    <key shift="0.5" key0="a" key1="tab" key2="`" key4="ą"/>
+    <key shift="0.5" key0="a" key1="loc tab" key2="`" key4="ą"/>
     <key key0="s" key1="loc accent_ring" key2="loc §" key3="loc ß" key4="ś"/>
     <key key0="d" key1="loc accent_grave" key2="loc £" key3="loc accent_aigu"/>
     <key key0="f" key1="loc accent_dot_above" key4="loc accent_ogonek"/>
diff --git a/srcs/layouts/latn_qwerty_ro.xml b/srcs/layouts/latn_qwerty_ro.xml
index fdc4232..63cf6d2 100644
--- a/srcs/layouts/latn_qwerty_ro.xml
+++ b/srcs/layouts/latn_qwerty_ro.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <keyboard name="QWERTY (Română)" script="latin">
   <row>
-    <key key0="q" key2="1" key4="esc"/>
+    <key key0="q" key2="1" key4="loc esc"/>
     <key key0="w" key1="~" key2="2" key3="\@"/>
     <key key0="e" key1="!" key2="3" key3="\#" key4="loc €"/>
     <key key0="r" key2="4" key3="$" key1="loc ₪"/>
@@ -13,7 +13,7 @@
     <key key0="p" key2="0" key3="f11_placeholder" key4="f12_placeholder"/>
   </row>
   <row>
-    <key shift="0.5" key0="a" key1="â" key2="ă" key3="`" key4="tab"/>
+    <key shift="0.5" key0="a" key1="â" key2="ă" key3="`" key4="loc tab"/>
     <key key0="s" key1="ș" key2="loc §" key3="loc ß" key4="loc accent_ogonek"/>
     <key key0="d" key1="loc accent_grave" key2="loc £" key3="loc accent_aigu"/>
     <key key0="f" key1="loc accent_dot_above"/>
diff --git a/srcs/layouts/latn_qwerty_se.xml b/srcs/layouts/latn_qwerty_se.xml
index bf3bb7d..fdea993 100644
--- a/srcs/layouts/latn_qwerty_se.xml
+++ b/srcs/layouts/latn_qwerty_se.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <keyboard name="QWERTY (Swedish)" script="latin">
   <row>
-    <key key0="q" key4="esc" key2="1"/>
+    <key key0="q" key4="loc esc" key2="1"/>
     <key key0="w" key2="2" key3="`" key4="\@"/>
     <key key0="e" key2="3" key4="\#" key3="€"/>
     <key key0="r" key2="4" key4="$"/>
@@ -14,7 +14,7 @@
     <key key0="å" key1="\?" key3="!" key4="f12_placeholder"/>
   </row>
   <row>
-    <key key0="a" key2="tab"/>
+    <key key0="a" key2="loc tab"/>
     <key key0="s" key1="accent_ring" key2="loc §" key3="loc ß"/>
     <key key0="d" key3="accent_aigu"/>
     <key key0="f" key1="accent_trema"/>
diff --git a/srcs/layouts/latn_qwerty_sk.xml b/srcs/layouts/latn_qwerty_sk.xml
index 3545b52..d38c1f1 100644
--- a/srcs/layouts/latn_qwerty_sk.xml
+++ b/srcs/layouts/latn_qwerty_sk.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <keyboard name="QWERTY (Slovak)" script="latin">
   <row>
-    <key key0="q" key1="1" key4="esc"/>
+    <key key0="q" key1="1" key4="loc esc"/>
     <key key0="w" key1="2" key3="`"/>
     <key key0="e" key1="3" key2="€" key3="é" key4="ě"/>
     <key key0="r" key1="4" key3="ŕ" key4="ř"/>
@@ -13,7 +13,7 @@
     <key key0="p" key1="0" key3="="/>
   </row>
   <row>
-    <key shift="0.5" key0="a" key1="tab" key2="&amp;" key3="á" key4="ä"/>
+    <key shift="0.5" key0="a" key1="loc tab" key2="&amp;" key3="á" key4="ä"/>
     <key key0="s" key1="loc §" key2="$" key3="ś" key4="š"/>
     <key key0="d" key4="ď"/>
     <key key0="f" key1="%" key3="\\" key4="/"/>
diff --git a/srcs/layouts/latn_qwerty_tr.xml b/srcs/layouts/latn_qwerty_tr.xml
index d2cf522..2218510 100644
--- a/srcs/layouts/latn_qwerty_tr.xml
+++ b/srcs/layouts/latn_qwerty_tr.xml
@@ -5,7 +5,7 @@
     <shift a="ı" b="I" />
   </modmap>
   <row>
-    <key key0="q" key2="1" key4="esc"/>
+    <key key0="q" key2="1" key4="loc esc"/>
     <key key0="w" key1="~" key2="2" key3="\@"/>
     <key key0="e" key1="!" key2="3" key3="\#" key4="€"/>
     <key key0="r" key2="4" key3="$"/>
@@ -17,7 +17,7 @@
     <key key0="p" key1="0" />
   </row>
   <row>
-    <key shift="0.5" key0="a" key1="tab" key2="`"/>
+    <key shift="0.5" key0="a" key1="loc tab" key2="`"/>
     <key key0="s" key1="ş" key2="loc §"/>
     <key key0="d"/>
     <key key0="f"/>
diff --git a/srcs/layouts/latn_qwerty_us.xml b/srcs/layouts/latn_qwerty_us.xml
index 0d394ac..6397ff8 100644
--- a/srcs/layouts/latn_qwerty_us.xml
+++ b/srcs/layouts/latn_qwerty_us.xml
@@ -22,7 +22,7 @@ See srcs/juloo.keyboard2/KeyValue.java for the keys that have a special meaning.
 -->
 <keyboard name="QWERTY (US)" script="latin">
   <row>
-    <key key0="q" key2="1" key4="esc"/>
+    <key key0="q" key2="1" key4="loc esc"/>
     <key key0="w" key1="~" key2="2" key3="\@"/>
     <key key0="e" key1="!" key2="3" key3="\#" key4="loc €"/>
     <key key0="r" key2="4" key3="$" key1="loc ₪"/>
@@ -34,7 +34,7 @@ See srcs/juloo.keyboard2/KeyValue.java for the keys that have a special meaning.
     <key key0="p" key2="0" key3="f11_placeholder" key4="f12_placeholder"/>
   </row>
   <row>
-    <key shift="0.5" key0="a" key1="tab" key2="`"/>
+    <key shift="0.5" key0="a" key1="loc tab" key2="`"/>
     <key key0="s" key1="loc accent_ring" key2="loc §" key3="loc ß" key4="loc accent_ogonek"/>
     <key key0="d" key1="loc accent_grave" key2="loc £" key3="loc accent_aigu"/>
     <key key0="f" key1="loc accent_dot_above"/>
diff --git a/srcs/layouts/latn_qwerty_vi.xml b/srcs/layouts/latn_qwerty_vi.xml
index b042b1d..ea76a83 100644
--- a/srcs/layouts/latn_qwerty_vi.xml
+++ b/srcs/layouts/latn_qwerty_vi.xml
@@ -2,7 +2,7 @@
 <!-- Adapted from standard TCVN 6064-->
 <keyboard name="QWERTY (Vietnamese)" script="latin">
   <row>
-    <key key0="q" key1="~" key2="1" key3="`" key4="esc"/>
+    <key key0="q" key1="~" key2="1" key3="`" key4="loc esc"/>
     <key key0="w" key1="accent_horn" key2="2" key3="\@"/>
     <key key0="e" key1="!" key2="3" key3="\#" key4="ê"/>
     <key key0="r" key2="4" key3="$" key1="accent_hook_above"/>
@@ -14,7 +14,7 @@
     <key key0="p" key2="0" key3="f11_placeholder" key4="f12_placeholder"/>
   </row>
   <row>
-    <key shift="0.5" key0="a" key1="tab" key2="ă" key3="â"/>
+    <key shift="0.5" key0="a" key1="loc tab" key2="ă" key3="â"/>
     <key key0="s" key1="accent_aigu" key2="loc §"/>
     <key key0="d" key1="accent_bar" key2="₫" key3="đ"/>
     <key key0="f" key1="accent_grave"/>
diff --git a/srcs/layouts/latn_qwertz.xml b/srcs/layouts/latn_qwertz.xml
index e3c5b3b..4a07445 100644
--- a/srcs/layouts/latn_qwertz.xml
+++ b/srcs/layouts/latn_qwertz.xml
@@ -2,7 +2,7 @@
 <!-- copyright 2022 Moini <Moini@users.noreply.github.com> -->
 <keyboard name="QWERTZ" script="latin">
   <row>
-    <key key0="q" key2="1" key4="esc"/>
+    <key key0="q" key2="1" key4="loc esc"/>
     <key key0="w" key1="^" key2="2" key3="&quot;" key4="\@"/>
     <key key0="e" key1="§" key2="3" key3="!" key4="€"/>
     <key key0="r" key2="4" key3="$" key4="f11_placeholder"/>
@@ -14,7 +14,7 @@
     <key key0="p" key2="0" key3="\?"/>
   </row>
   <row>
-    <key shift="0.5" key0="a" key1="tab" key2="`" key3="ä"/>
+    <key shift="0.5" key0="a" key1="loc tab" key2="`" key3="ä"/>
     <key key0="s" key3="ß"/>
     <key key0="d"/>
     <key key0="f" key1="~"/>
diff --git a/srcs/layouts/latn_qwertz_cz.xml b/srcs/layouts/latn_qwertz_cz.xml
index e3bbae9..b50a57e 100644
--- a/srcs/layouts/latn_qwertz_cz.xml
+++ b/srcs/layouts/latn_qwertz_cz.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <keyboard script="latin" name="QWERTZ (Czech)">
   <row>
-    <key key0="q" key1="1" key2="esc" key4="~"/>
+    <key key0="q" key1="1" key2="loc esc" key4="~"/>
     <key key0="w" key1="2" key2="+" key3="|" key4="\\"/>
     <key key0="e" key1="3" key2="é" key3="^" key4="ě"/>
     <key key0="r" key1="4" key4="ř"/>
@@ -13,7 +13,7 @@
     <key key0="p" key1="0" key3="="/>
   </row>
   <row>
-    <key shift="0.5" key0="a" key1="tab" key2="á" key3=";"/>
+    <key shift="0.5" key0="a" key1="loc tab" key2="á" key3=";"/>
     <key key0="s" key1="loc §" key4="š"/>
     <key key0="d" key4="ď"/>
     <key key0="f" key3="["/>
diff --git a/srcs/layouts/latn_qwertz_cz_multifunctional.xml b/srcs/layouts/latn_qwertz_cz_multifunctional.xml
index 9fc8dab..33fbe08 100644
--- a/srcs/layouts/latn_qwertz_cz_multifunctional.xml
+++ b/srcs/layouts/latn_qwertz_cz_multifunctional.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <keyboard name="QWERTZ Multifunctional (Czech)" script="latin">
   <row>
-    <key key0="q" key1="1" key4="esc"/>
+    <key key0="q" key1="1" key4="loc esc"/>
     <key key0="w" key1="2" key3="~"/>
     <key key0="e" key1="3" key2="é" key3="ë" key4="ě"/>
     <key key0="r" key1="4" key2="ŕ" key3="°" key4="ř"/>
@@ -13,7 +13,7 @@
     <key key0="p" key1="0" key2="=" key3="/" key4="π"/>
   </row>
   <row>
-    <key shift="0.5" key0="a" key1="tab" key2="á" key3="ä" key4="α"/>
+    <key shift="0.5" key0="a" key1="loc tab" key2="á" key3="ä" key4="α"/>
     <key key0="s" key1="{" key2="&lt;" key3="§" key4="š"/>
     <key key0="d" key1="$" key2="δ" key3="Δ" key4="ď"/>
     <key key0="f" key1="&gt;" key2="}" key3="ѳ" key4="φ"/>
diff --git a/srcs/layouts/latn_qwertz_de.xml b/srcs/layouts/latn_qwertz_de.xml
index 122375b..087c8f3 100644
--- a/srcs/layouts/latn_qwertz_de.xml
+++ b/srcs/layouts/latn_qwertz_de.xml
@@ -2,7 +2,7 @@
 <!-- Adapted from standard DIN 2137-1 -->
 <keyboard name="QWERTZ (Deutsch)" script="latin">
   <row>
-    <key key0="q" key2="1" key4="esc"/>
+    <key key0="q" key2="1" key4="loc esc"/>
     <key key0="w" key1="^" key2="2" key3="&quot;" key4="\@"/>
     <key key0="e" key1="§" key2="3" key3="!" key4="€"/>
     <key key0="r" key2="4" key3="$" key4="f11_placeholder"/>
@@ -15,7 +15,7 @@
     <key key0="ü" key3="\?"/>
   </row>
   <row>
-    <key key0="a" key2="tab"/>
+    <key key0="a" key2="loc tab"/>
     <key key0="s" key1="`" key3="ß"/>
     <key key0="d"/>
     <key key0="f" key1="~"/>
diff --git a/srcs/layouts/latn_qwertz_fr_ch.xml b/srcs/layouts/latn_qwertz_fr_ch.xml
index b3e4cce..9f41448 100644
--- a/srcs/layouts/latn_qwertz_fr_ch.xml
+++ b/srcs/layouts/latn_qwertz_fr_ch.xml
@@ -2,7 +2,7 @@
 <!-- Freely adapted from standard SN 074021:1999-01 by Eluc -->
 <keyboard name="QWERTZ (Swiss French)" script="latin">
   <row>
-    <key key0="q" key1="§" key2="1" key4="esc"/>
+    <key key0="q" key1="§" key2="1" key4="loc esc"/>
     <key key0="w" key1="^" key2="2" key3="&quot;" key4="\@"/>
     <key key0="e" key2="3" key3="\#" key4="€"/>
     <key key0="r" key2="4" key3="$" key4="f11_placeholder"/>
@@ -15,7 +15,7 @@
     <key key0="è" key2="ü" key3="!"/>
   </row>
   <row>
-    <key key0="a" key1="æ" key2="tab"/>
+    <key key0="a" key1="æ" key2="loc tab"/>
     <key key0="s" key1="`" key3="ß" key4="£"/>
     <key key0="d"/>
     <key key0="f" key1="~"/>
diff --git a/srcs/layouts/latn_qwertz_hu.xml b/srcs/layouts/latn_qwertz_hu.xml
index 61ebf24..65f53d0 100644
--- a/srcs/layouts/latn_qwertz_hu.xml
+++ b/srcs/layouts/latn_qwertz_hu.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <keyboard name="QWERTZ (Magyar)" script="latin">
   <row>
-    <key key0="q" key2="0" key4="esc"/>
+    <key key0="q" key2="0" key4="loc esc"/>
     <key key0="w" key1="'" key2="1" key3="~" key4="|"/>
     <key key0="e" key1="&quot;" key2="2" key4="é"/>
     <key key0="r" key2="3" key4="^"/>
@@ -13,7 +13,7 @@
     <key key0="p" key2="9"/>
   </row>
   <row>
-    <key shift="0.5" key0="a" key1="tab" key4="á"/>
+    <key shift="0.5" key0="a" key1="loc tab" key4="á"/>
     <key key0="s" key1="§" key2="\\" key3="[" key4="]"/>
     <key key0="d" key3="{" key4="}"/>
     <key key0="f" key3="+"/>
diff --git a/srcs/layouts/latn_qwertz_sk.xml b/srcs/layouts/latn_qwertz_sk.xml
index 5227370..3bf10f6 100644
--- a/srcs/layouts/latn_qwertz_sk.xml
+++ b/srcs/layouts/latn_qwertz_sk.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <keyboard name="QWERTZ (Slovak)" script="latin">
   <row>
-    <key key0="q" key1="1" key4="esc"/>
+    <key key0="q" key1="1" key4="loc esc"/>
     <key key0="w" key1="2"/>
     <key key0="e" key1="3" key3="é" key4="ě"/>
     <key key0="r" key1="4" key3="ŕ" key4="ř"/>
@@ -13,7 +13,7 @@
     <key key0="p" key1="0" key2="=" key3="\\" key4="/"/>
   </row>
   <row>
-    <key key0="a" key1="tab" key3="á" key4="ä"/>
+    <key key0="a" key1="loc tab" key3="á" key4="ä"/>
     <key key0="s" key1="loc §" key3="ś" key4="š"/>
     <key key0="d" key4="ď"/>
     <key key0="f" key1="%" key2="*"/>
diff --git a/srcs/layouts/shaw_imperial_en.xml b/srcs/layouts/shaw_imperial_en.xml
index 7d71c2c..4900baf 100644
--- a/srcs/layouts/shaw_imperial_en.xml
+++ b/srcs/layouts/shaw_imperial_en.xml
@@ -2,7 +2,7 @@
 <!-- Shaw Imperial layout for shavian alphabet, see https://www.shavian.info/keyboards/ -->
 <keyboard name="Shaw Imperial" script="shavian">
   <row>
-    <key key0="𐑶" key2="1" key4="esc"/>
+    <key key0="𐑶" key2="1" key4="loc esc"/>
     <key key0="𐑬" key1="~" key2="2" key3="\@"/>
     <key key0="𐑫" key1="!" key2="3" key3="\#"/>
     <key key0="𐑜" key2="4" key3="$"/>
@@ -14,7 +14,7 @@
     <key key0="𐑔" key2="0" key3="f11_placeholder" key4="f12_placeholder"/>
   </row>
   <row>
-    <key key0="𐑭" key1="tab" key2="𐑸" key3="`"/>
+    <key key0="𐑭" key1="loc tab" key2="𐑸" key3="`"/>
     <key key0="𐑷" key2="𐑹"/>
     <key key0="𐑵" key2="𐑿"/>
     <key key0="𐑱" key2="𐑺"/>
@@ -49,4 +49,4 @@
     <key key0="𐑛" key2="&quot;" key3="'"/>
     <key key0="backspace" key2="delete"/>
   </row>
-</keyboard>
\ No newline at end of file
+</keyboard>
diff --git a/srcs/layouts/urdu_phonetic_ur.xml b/srcs/layouts/urdu_phonetic_ur.xml
index a1fd561..e302899 100644
--- a/srcs/layouts/urdu_phonetic_ur.xml
+++ b/srcs/layouts/urdu_phonetic_ur.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <keyboard name="Urdu Phonetic" script="urdu">
   <row>
-    <key key0="ق" key3=" " key4="esc" key7="1"/>
+    <key key0="ق" key3=" " key4="loc esc" key7="1"/>
     <key key0="و" key2="ؤ" key3="\@" key7="2"/>
     <key key0="ع" key1="!" key3="\#" key7="3"/>
     <key key0="ر" key2="ڑ" key3="$" key7="4"/>
@@ -13,7 +13,7 @@
     <key key0="پ" key1="ٰ" key2="0" key3="؟" key5="ٓ" key7="ٗ" key8="ٖ"/>
   </row>
   <row>
-    <key width="1.1" key0="ا" key1="tab" key2="آ" key4="أ"/>
+    <key width="1.1" key0="ا" key1="loc tab" key2="آ" key4="أ"/>
     <key width="1.1" key0="س" key2="ص"/>
     <key width="1.1" key0="د" key2="ڈ" key4=" "/>
     <key width="1.1" key0="ف" key2="پھ"/>