diff --git a/res/xml/azerty.xml b/res/xml/azerty.xml
index 0e3f073..59f0976 100644
--- a/res/xml/azerty.xml
+++ b/res/xml/azerty.xml
@@ -14,7 +14,7 @@
   </row>
   <row>
     <key key0="q" key2="tab"/>
-    <key key0="s" key1="loc accent_ring" key3="loc ß"/>
+    <key key0="s" key3="loc ß"/>
     <key key0="d" key1="accent_grave" key3="accent_aigu"/>
     <key key0="f" key3="{" key4="}"/>
     <key key0="g" key3="[" key4="]"/>
diff --git a/res/xml/local_bgph1.xml b/res/xml/local_bgph1.xml
index 7ed407a..c3c6fd4 100644
--- a/res/xml/local_bgph1.xml
+++ b/res/xml/local_bgph1.xml
@@ -9,28 +9,28 @@
     <key key0="ъ" key2="6" key3="^" key4="€"/>
     <key key0="у" key2="7" key3="&amp;" key4="§"/>
     <key key0="и" key2="8" key3="*"/>
-    <key key0="о" key1="loc accent_macron" key2="9" key3="(" key4=")"/>
+    <key key0="о" key2="9" key3="(" key4=")"/>
     <key key0="п" key1="0" key3="f11_placeholder" key4="f12_placeholder"/>
   </row>
   <row>
     <key shift="0.5" key0="а" key1="tab" key2="`"/>
     <key key0="с"/>
-    <key key0="д" key1="loc accent_grave" key3="loc accent_aigu"/>
+    <key key0="д"/>
     <key key0="ф"/>
-    <key key0="г" key1="loc accent_caron" key2="-" key3="_"/>
+    <key key0="г" key2="-" key3="_"/>
     <key key0="х" key2="=" key3="+"/>
-    <key key0="й" key1="loc accent_trema" key2="loc accent_circonflexe" key4="}" key3="{"/>
+    <key key0="й" key4="}" key3="{"/>
     <key key0="к" key2="ш" key3="[" key4="]"/>
     <key key0="л" key1="щ" key2="|" key3="\\" key4="ю"/>
   </row>
   <row>
     <key width="1.5" key0="shift"/>
     <key key0="з"/>
-    <key key0="ь" key1="loc accent_ring" key3="ѝ"/>
-    <key key0="ц" key1="loc accent_cedille" key2="&lt;" key3="."/>
+    <key key0="ь" key3="ѝ"/>
+    <key key0="ц" key2="&lt;" key3="."/>
     <key key0="ж" key2="&gt;" key3=","/>
     <key key0="б" key2="\?" key3="/"/>
-    <key key0="н" key1="loc accent_tilde" key2=":" key3=";"/>
+    <key key0="н" key2=":" key3=";"/>
     <key key0="м" key2="&quot;" key3="'"/>
     <key width="1.5" key0="backspace" key2="delete"/>
   </row>
diff --git a/res/xml/neo2.xml b/res/xml/neo2.xml
index b3d36d2..f20c8b9 100644
--- a/res/xml/neo2.xml
+++ b/res/xml/neo2.xml
@@ -14,17 +14,17 @@
     <key key0="ß" key1="-"/>
   </row>
   <row>
-    <key key0="u" key1="tab" key2="loc accent_circonflexe" key4="\\"/>
-    <key key0="i" key2="loc accent_caron" key4="/"/>
-    <key key0="a" key2="loc accent_dot_above" key4="{"/>
-    <key key0="e" key2="loc accent_macron" key4="}"/>
-    <key key0="o" key2="loc accent_trema" key4="*"/>
-    <key key0="s" key2="loc accent_tilde" key4="\?"/>
-    <key key0="n" key2="loc accent_cedille" key4="("/>
-    <key key0="r" key2="loc accent_grave" key4=")"/>
-    <key key0="t" key2="loc accent_aigu" key4="-"/>
-    <key key0="d" key2="loc accent_ring" key4=":"/>
-    <key key0="y" key2="loc accent_double_aigu" key3="\@"/>
+    <key key0="u" key1="tab" key4="\\"/>
+    <key key0="i" key4="/"/>
+    <key key0="a" key4="{"/>
+    <key key0="e" key4="}"/>
+    <key key0="o" key4="*"/>
+    <key key0="s" key4="\?"/>
+    <key key0="n" key4="("/>
+    <key key0="r" key4=")"/>
+    <key key0="t" key4="-"/>
+    <key key0="d" key4=":"/>
+    <key key0="y" key3="\@"/>
   </row>
   <row>
     <key width="1.5" key0="shift" key1="esc"/>
diff --git a/res/xml/qwerty_es.xml b/res/xml/qwerty_es.xml
index f83bb4a..de32b02 100644
--- a/res/xml/qwerty_es.xml
+++ b/res/xml/qwerty_es.xml
@@ -9,17 +9,17 @@
     <key key0="y" key2="6" key3="^"/>
     <key key0="u" key2="7" key3="&amp;"/>
     <key key0="i" key2="8" key3="*"/>
-    <key key0="o" key1="loc accent_macron" key2="9" key3="(" key4=")"/>
+    <key key0="o" key2="9" key3="(" key4=")"/>
     <key key0="p" key1="0" key3="f11_placeholder" key4="f12_placeholder"/>
   </row>
   <row>
     <key key0="a" key2="tab" key4="`"/>
-    <key key0="s" key1="loc accent_ring" key2="¡" key3="loc ß"/>
+    <key key0="s" key2="¡" key3="loc ß"/>
     <key key0="d" key1="accent_grave" key3="accent_aigu"/>
     <key key0="f"/>
-    <key key0="g" key1="loc accent_caron" key2="-" key3="_"/>
+    <key key0="g" key2="-" key3="_"/>
     <key key0="h" key2="=" key3="+"/>
-    <key key0="j" key1="accent_trema" key2="loc accent_circonflexe" key4="}" key3="{"/>
+    <key key0="j" key1="accent_trema" key4="}" key3="{"/>
     <key key0="k" key3="[" key4="]"/>
     <key key0="l" key2="|" key3="\\"/>
     <key key0="ñ" key1="·" key3="ç" />
diff --git a/res/xml/qwerty_ko.xml b/res/xml/qwerty_ko.xml
index 482f342..30d31e6 100644
--- a/res/xml/qwerty_ko.xml
+++ b/res/xml/qwerty_ko.xml
@@ -14,7 +14,7 @@
   </row>
   <row>
     <key shift="0.5" key0="ㅁ" key1="tab" key2="`"/>
-    <key key0="ㄴ" key3="loc ß"/>
+    <key key0="ㄴ"/>
     <key key0="ㅇ"/>
     <key key0="ㄹ"/>
     <key key0="ㅎ" key2="-" key3="_"/>
diff --git a/res/xml/qwerty_pt.xml b/res/xml/qwerty_pt.xml
index 6e5d28d..fe8b580 100644
--- a/res/xml/qwerty_pt.xml
+++ b/res/xml/qwerty_pt.xml
@@ -6,7 +6,7 @@
     <key key0="e" key2="3" key3="\#" key4="€"/>
     <key key0="r" key2="4" key3="$" key4="f11_placeholder"/>
     <key key0="t" key2="5" key3="%" key4="f12_placeholder"/>
-    <key key0="y" key1="loc accent_caron" key2="6" key3="^" key4="loc accent_trema"/>
+    <key key0="y" key2="6" key3="^" key4="loc accent_trema"/>
     <key key0="u" key2="7" key3="&amp;"/>
     <key key0="i" key2="8" key3="*"/>
     <key key0="o" key2="9" key3="(" key4=")"/>
@@ -15,8 +15,8 @@
   <row>
     <key key0="a" key2="tab" key4="`"/>
     <key key0="s" key1="'" key3="loc ß" key4="accent_cedille"/>
-    <key key0="d" key1="&quot;" key2="loc accent_ring"/>
-    <key key0="f" key2="loc accent_caron"/>
+    <key key0="d" key1="&quot;"/>
+    <key key0="f"/>
     <key key0="g"/>
     <key key0="h"/>
     <key key0="j" key1="-" key2="=" key4="+" key3="_"/>
diff --git a/res/xml/qwerty_sv_se.xml b/res/xml/qwerty_sv_se.xml
index fe41134..80ce617 100644
--- a/res/xml/qwerty_sv_se.xml
+++ b/res/xml/qwerty_sv_se.xml
@@ -15,9 +15,9 @@
   </row>
   <row>
     <key key0="a" key2="tab"/>
-    <key key0="s" key1="accent_ring" key2="loc accent_cedille" key3="loc ß" key4="loc accent_tilde"/>
-    <key key0="d" key1="loc accent_grave" key2="loc accent_caron" key3="accent_aigu"/>
-    <key key0="f" key1="accent_trema" key2="loc accent_circonflexe"/>
+    <key key0="s" key1="accent_ring" key3="loc ß"/>
+    <key key0="d" key3="accent_aigu"/>
+    <key key0="f" key1="accent_trema"/>
     <key key0="g"/>
     <key key0="h"/>
     <key key0="j" key1="{" key4="}"/>