diff --git a/check_layout.output b/check_layout.output
index 1752ce7..d5a0c96 100644
--- a/check_layout.output
+++ b/check_layout.output
@@ -8,30 +8,15 @@ arab_pc_ir: Layout includes some ASCII punctuation but not all, missing: ", %, '
 beng_national: Layout includes some ASCII punctuation but not all, missing: $
 beng_provat: Layout includes some ASCII punctuation but not all, missing: $, &, *, ., /, <, >, [, \, ], `, {, |, }
 cyrl_yaverti: Layout includes some ASCII punctuation but not all, missing: ~
-cyrl_yqukeng_tj: These keys are now added automatically, unexpected: f11_placeholder, f12_placeholder
 cyrl_yxukeng_os: Layout includes some ASCII punctuation but not all, missing: ", #, $, &, ', @, [, ], ~
-cyrl_yxukeng_os: These keys are now added automatically, unexpected: f11_placeholder, f12_placeholder
 deva_alt: Layout includes some ASCII punctuation but not all, missing: #, $, %, &, ', (, ), *, +, ., /, :, <, =, >, [, \, ], ^, _, `, {, |, }, ~
-deva_alt: Layout doesn't define some important keys, missing: delete
-deva_inscript: Duplicate keys: ।
 deva_inscript: Layout includes some ASCII punctuation but not all, missing: ", $, ', ^, _, `, |
-deva_phonetic_in: Duplicate keys: ट
-grek_qwerty: Duplicate keys: ;
-guj_phonetic_in: Duplicate keys: ટ, ડ
 hebr_1_il: Layout includes some ASCII punctuation but not all, missing: (, ), <, >, [, ], {, }
 hebr_2_il: Layout includes some ASCII punctuation but not all, missing: (, ), <, >, [, ], {, }
 kann_kannada: Layout includes some ASCII punctuation but not all, missing: #, $, %, (, ), *, +, /, <, =, >, [, \, ], ^, `, {, |, }, ~
-latn_bepo_fr: Missing important key, missing: loc capslock
-latn_bone: Missing important key, missing: loc capslock
 latn_colemak: Some keys contain whitespaces, unexpected:  ́
 latn_dvorak: Missing important key, missing: loc capslock
 latn_neo2: Layout redefines the bottom row but some important keys are missing, missing: loc switch_clipboard
-latn_qwerty_jp: Layout contains unknown keys: accent-macron
-latn_qwerty_se: Duplicate keys: !, ', ,, -, ., ?
-latn_qwerty_tly: Duplicate keys: a, c, j, q
-latn_qwerty_tly: Missing programming keys, missing: loc esc, loc tab
 latn_qwertz_cz_multifunctional: Layout includes some ASCII punctuation but not all, missing: `
 latn_qwertz_sk: Layout includes some ASCII punctuation but not all, missing: `
-urdu_phonetic_ur: Duplicate keys:  
 urdu_phonetic_ur: Layout includes some ASCII punctuation but not all, missing: <, >, ?, `, |, ~
-urdu_phonetic_ur: Some keys contain whitespaces, unexpected:  
diff --git a/srcs/layouts/cyrl_yqukeng_tj.xml b/srcs/layouts/cyrl_yqukeng_tj.xml
index e1e393a..313c48f 100644
--- a/srcs/layouts/cyrl_yqukeng_tj.xml
+++ b/srcs/layouts/cyrl_yqukeng_tj.xml
@@ -22,8 +22,8 @@
     <key key0="р" key7="6" />
     <key key0="о" key7="7" />
     <key key0="л" key7="8" />
-    <key key0="д" key7="9" key8="f11_placeholder" />
-    <key key0="ж" key7="0" key8="f12_placeholder" />
+    <key key0="д" key7="9" />
+    <key key0="ж" key7="0" />
     <key key0="э" key7="\?" key3="/" />
   </row>
   <row>
@@ -39,4 +39,4 @@
     <key width="0.96" key0="ю" key7="&quot;" key8="'"/>
     <key width="1.18" key0="." key7="," />
   </row>
-</keyboard>
\ No newline at end of file
+</keyboard>
diff --git a/srcs/layouts/cyrl_yxukeng_os.xml b/srcs/layouts/cyrl_yxukeng_os.xml
index 60be1ca..5da54e5 100644
--- a/srcs/layouts/cyrl_yxukeng_os.xml
+++ b/srcs/layouts/cyrl_yxukeng_os.xml
@@ -22,8 +22,8 @@
     <key key0="р" key7="6" />
     <key key0="о" key7="7" key8="ѡ" />
     <key key0="л" key7="8" />
-    <key key0="д" key7="9" key8="f11_placeholder" />
-    <key key0="ж" key7="0" key8="f12_placeholder" />
+    <key key0="д" key7="9" />
+    <key key0="ж" key7="0" />
     <key key0="э" key7="/" key8="|" />
   </row>
   <row>
@@ -39,4 +39,4 @@
     <key width="0.96" key0="ю" key3="{" key2="}" />
     <key width="1.18" key0="." key7="," key8="_" />
   </row>
-</keyboard>
\ No newline at end of file
+</keyboard>
diff --git a/srcs/layouts/deva_alt.xml b/srcs/layouts/deva_alt.xml
index 1b8a684..d956777 100644
--- a/srcs/layouts/deva_alt.xml
+++ b/srcs/layouts/deva_alt.xml
@@ -24,6 +24,6 @@
     <key c="ं" nw="ॐ" ne="।" sw="ः" se="&quot;" anticircle="१" indication="१"/>
     <key c="्" nw="," ne=";" sw="!" se="\?" anticircle="२" indication="२"/>
     <key c="़" nw="॰" sw="-" se="॒" anticircle="३" indication="३"/>
-    <key width="2" c="backspace"/>
+    <key width="2" c="backspace" ne="delete"/>
   </row>
 </keyboard>
diff --git a/srcs/layouts/deva_inscript.xml b/srcs/layouts/deva_inscript.xml
index bc20d15..1e2def3 100644
--- a/srcs/layouts/deva_inscript.xml
+++ b/srcs/layouts/deva_inscript.xml
@@ -26,12 +26,12 @@
   <row>
     <key width="1.4" key0="shift" key2="loc capslock"/>
     <key shift="0.1" key0="ट" key1="ठ" key2="ड़" key3="\#" key4="*"/>
-    <key key0="ं" key1="ँ" key2="।" key3="ॐ" key4="\@"/>
+    <key key0="ं" key1="ँ" key3="ॐ" key4="\@"/>
     <key key0="म" key1="ण" key2="य" key3="य़" key4="%"/>
     <key key0="न" key2="।" key3=":" key4="&amp;"/>
     <key key0="व" key2="ढ़" key3=";" key4="."/>
     <key key0="ल" key1="ळ" key2="फ़" key3="!" key4=","/>
-    <key key0="स" key1="श" key2="ष" key3="\?" key4="।"/>
+    <key key0="स" key1="श" key2="ष" key3="\?"/>
     <key shift="0.1" width="1.4" key0="backspace" key2="delete"/>
   </row>
 </keyboard>
diff --git a/srcs/layouts/deva_phonetic_in.xml b/srcs/layouts/deva_phonetic_in.xml
index f9c6954..86bc2b9 100644
--- a/srcs/layouts/deva_phonetic_in.xml
+++ b/srcs/layouts/deva_phonetic_in.xml
@@ -10,7 +10,7 @@
     <key key0="ड" key1="~" key2="2" key3="\@" />
     <key key0="े" key1="ए" key2="3" key3="\#" key4="$" />
     <key key0="र" key1="ऋ" key2="4" key3="ृ" key4="₹"/>
-    <key key0="त" key1="ट" key2="5" key3="%" key4="त्र"/>
+    <key key0="त" key2="5" key3="%" key4="त्र"/>
     <key key0="य" key2="6" key3="^"/>
     <key key0="ु" key1="उ" key2="7" key3="&amp;"/>
     <key key0="ि" key1="इ" key2="8" key3="*" />
diff --git a/srcs/layouts/grek_qwerty.xml b/srcs/layouts/grek_qwerty.xml
index 7bd3609..640ff53 100644
--- a/srcs/layouts/grek_qwerty.xml
+++ b/srcs/layouts/grek_qwerty.xml
@@ -31,7 +31,7 @@
     <key key0="ψ" key2="&lt;" key3="."/>
     <key key0="ω" key2="&gt;" key3=","/>
     <key key0="β" key2="\?" key3="/"/>
-    <key key0="ν" key2=":" key3=";"/>
+    <key key0="ν" key2=":"/>
     <key key0="μ" key2="&quot;" key3="'"/>
     <key width="1.5" key0="backspace" key2="delete"/>
   </row>
diff --git a/srcs/layouts/guj_phonetic_in.xml b/srcs/layouts/guj_phonetic_in.xml
index 6f78c4a..4b91f7e 100644
--- a/srcs/layouts/guj_phonetic_in.xml
+++ b/srcs/layouts/guj_phonetic_in.xml
@@ -5,7 +5,7 @@
     <key key0="ડ" key1="~" key2="2" key3="\@" key4="\#"/>
     <key key0="ે" key1="એ" key2="3" key3="$" key4="૱"/>
     <key key0="ર" key1="ઋ" key2="4" key3="ૃ" key4="₹"/>
-    <key key0="ત" key1="ટ" key2="5" key3="%"/>
+    <key key0="ત" key2="5" key3="%"/>
     <key key0="ય" key2="6" key3="^"/>
     <key key0="ુ" key1="ઉ" key2="7" key3="&amp;"/>
     <key key0="િ" key1="ઇ" key2="8" key3="*" key4="ઁ"/>
@@ -15,7 +15,7 @@
   <row>
     <key shift="0.5" key0="ા" key1="loc tab" key3="અ"/>
     <key key0="સ" key1="“" key4="”"/>
-    <key key0="દ" key1="ડ"/>
+    <key key0="દ"/>
     <key key0="્" key1="ૠ" key3="ૄ"/>
     <key key0="ગ" key2="-" key3="_"/>
     <key key0="હ" key2="=" key3="+"/>
diff --git a/srcs/layouts/latn_bepo_fr.xml b/srcs/layouts/latn_bepo_fr.xml
index d6b3a58..e0e85f3 100644
--- a/srcs/layouts/latn_bepo_fr.xml
+++ b/srcs/layouts/latn_bepo_fr.xml
@@ -26,7 +26,7 @@
     <key width="1.1" key0="m" key2="&quot;"/>
   </row>
   <row>
-    <key width="1.5" key0="shift" key2="capslock" key3="&lt;"/>
+    <key width="1.5" key0="shift" key2="loc capslock" key3="&lt;"/>
     <key key0="y" key4="%"/>
     <key key0="x" key4="\@"/>
     <key key0="k" key4="~"/>
diff --git a/srcs/layouts/latn_bone.xml b/srcs/layouts/latn_bone.xml
index 16cb35d..d4f5004 100644
--- a/srcs/layouts/latn_bone.xml
+++ b/srcs/layouts/latn_bone.xml
@@ -114,7 +114,7 @@
 	-->
 	<row>
 		<!--left side-->
-		<key width="1.5" key0="shift"
+		<key width="1.5" key0="shift" ne="loc capslock"
 		              se="\#"/>
 		<key key0="f" se="$"/>
 		<key key0="v" se="|"/>
diff --git a/srcs/layouts/latn_qwerty_jp.xml b/srcs/layouts/latn_qwerty_jp.xml
index e92ba33..999b879 100644
--- a/srcs/layouts/latn_qwerty_jp.xml
+++ b/srcs/layouts/latn_qwerty_jp.xml
@@ -9,7 +9,7 @@
     <key key0="y" key2="6" key3="&amp;"/>
     <key key0="u" key2="7" key3="'"/>
     <key key0="i" key2="8" key3="(" key4=")"/>
-    <key key0="o" key1="=" key2="9" key3="-" key4="accent-macron"/>
+    <key key0="o" key1="=" key2="9" key3="-" key4="accent_macron"/>
     <key key0="p" key1="~" key2="0" key3="^"/>
   </row>
   <row>
diff --git a/srcs/layouts/latn_qwerty_se.xml b/srcs/layouts/latn_qwerty_se.xml
index 5e8fb7d..94b13cc 100644
--- a/srcs/layouts/latn_qwerty_se.xml
+++ b/srcs/layouts/latn_qwerty_se.xml
@@ -9,9 +9,9 @@
     <key key0="y" key2="6" key3="^" key4="%"/>
     <key key0="u" key2="7" key3="~" key4="\\"/>
     <key key0="i" key2="8" key3="*" key4="/"/>
-    <key key0="o" key2="9" key3="+" key4="-"/>
+    <key key0="o" key2="9" key3="+"/>
     <key key0="p" key2="0" key3="="/>
-    <key key0="å" key1="\?" key3="!"/>
+    <key key0="å"/>
   </row>
   <row>
     <key key0="a" key2="loc tab"/>
@@ -33,9 +33,9 @@
     <key key0="c"/>
     <key key0="v"/>
     <key key0="b" key2=";" key4=","/>
-    <key key0="n" key2=":" key4="."/>
+    <key key0="n" key2=":"/>
     <key key0="m" key2="-" key4="_"/>
-    <key width="1.0" key0="." key1="!" key2="\?" key3="'" key4=","/>
+    <key key0="." key1="!" key2="\?"/>
     <key width="1.5" key0="backspace" key2="delete"/>
   </row>
 </keyboard>
diff --git a/srcs/layouts/latn_qwerty_tly.xml b/srcs/layouts/latn_qwerty_tly.xml
index a39c124..a360c51 100644
--- a/srcs/layouts/latn_qwerty_tly.xml
+++ b/srcs/layouts/latn_qwerty_tly.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <keyboard name="QWERTY (Talysh New Latin)" script="latin">
   <row>
-    <key key0="g" key2="1" key4="q"/>
+    <key key0="g" key2="1" se="loc esc"/>
     <key key0="ú" key2="2" key4="ü"/>
     <key key0="e" key2="3" key3="\#"/>
     <key key0="ê" key2="4" key3="!"/>
@@ -15,12 +15,12 @@
     <key key0="q" key3="&amp;" key4="ğ"/>
   </row>
   <row>
-    <key shift="0.5" key0="á" key2="`" key4="a"/>
+    <key shift="0.5" key0="á" key2="`" nw="loc tab"/>
     <key key0="s" key2="~"/>
     <key key0="d" key1="{"/>
     <key key0="f" key2="}"/>
     <key key0="h" key2="=" key3="+"/>
-    <key key0="ž" key4="j"/>
+    <key key0="ž"/>
     <key key0="k" key2="]" key3="["/>
     <key key0="l" key2="|" key3="\\"/>
     <key key0="ı" key2="-" key8="_"/>
@@ -31,7 +31,7 @@
     <key width="1.5" key0="shift" key2="loc capslock"/>
     <key key0="z"/>
     <key key0="x"/>
-    <key key0="j" key2="&lt;" key3="." key4="c"/>
+    <key key0="j" key2="&lt;" key3="."/>
     <key key0="v" key1="w" key2=">" key3=","/>
     <key key0="b" key2="\?" key3="/"/>
     <key key0="n" key2=":" key3=";"/>
diff --git a/srcs/layouts/urdu_phonetic_ur.xml b/srcs/layouts/urdu_phonetic_ur.xml
index e302899..67083b8 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="loc esc" key7="1"/>
+    <key key0="ق" key4="loc esc" key7="1"/>
     <key key0="و" key2="ؤ" key3="\@" key7="2"/>
     <key key0="ع" key1="!" key3="\#" key7="3"/>
     <key key0="ر" key2="ڑ" key3="$" key7="4"/>
@@ -15,7 +15,7 @@
   <row>
     <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="ڈ"/>
     <key width="1.1" key0="ف" key2="پھ"/>
     <key width="1.15" key0="گ" key1="-" key2="غ" key3="_" key4="گھ"/>
     <key width="1.1" key0="ھ" key1="=" key2="ح" key3="+"/>