Sophie

Sophie

distrib > Fedora > 18 > i386 > by-pkgid > 9db9ce7a02f036c65b424ef7b8279be5 > files > 3

maliit-plugins-0.94.2-1.fc18.src.rpm

From 01e58c52f4757f8fdd20d3f026313873a91d2d23 Mon Sep 17 00:00:00 2001
From: Gary Martin <gary@garycmartin.com>
Date: Mon, 29 Oct 2012 19:27:25 +0000
Subject: [PATCH 1/2] XO layout and style patch including newly implemented
 right-layout key in maliit 0.93.0.

---
 maliit-keyboard/data/languages/ar.xml              |   73 ++++---
 maliit-keyboard/data/languages/bg_bg.xml           |   66 +++---
 maliit-keyboard/data/languages/cs.xml              |   50 +++--
 maliit-keyboard/data/languages/da.xml              |   68 +++---
 maliit-keyboard/data/languages/de.xml              |   72 ++++---
 maliit-keyboard/data/languages/el_gr.xml           |   60 +++---
 maliit-keyboard/data/languages/en_gb.xml           |   48 ++---
 maliit-keyboard/data/languages/en_us.xml           |   42 ++--
 maliit-keyboard/data/languages/es.xml              |   56 +++--
 maliit-keyboard/data/languages/et.xml              |   73 ++++---
 maliit-keyboard/data/languages/fa.xml              |   53 ++---
 maliit-keyboard/data/languages/fi.xml              |   77 +++----
 maliit-keyboard/data/languages/fr.xml              |   54 +++--
 maliit-keyboard/data/languages/fr_ca.xml           |   54 ++---
 maliit-keyboard/data/languages/he.xml              |   50 ++---
 maliit-keyboard/data/languages/hu.xml              |   68 +++---
 maliit-keyboard/data/languages/id.xml              |   42 ++--
 maliit-keyboard/data/languages/it.xml              |   55 ++---
 maliit-keyboard/data/languages/kk.xml              |   74 ++++---
 maliit-keyboard/data/languages/lt.xml              |   41 ++--
 maliit-keyboard/data/languages/mk_mk.xml           |  218 +++++---------------
 maliit-keyboard/data/languages/ms.xml              |   42 ++--
 maliit-keyboard/data/languages/nl.xml              |   36 ++--
 maliit-keyboard/data/languages/no.xml              |   68 +++---
 maliit-keyboard/data/languages/pl.xml              |   56 ++---
 maliit-keyboard/data/languages/pt.xml              |   54 ++---
 maliit-keyboard/data/languages/ro.xml              |   55 ++---
 maliit-keyboard/data/languages/ru.xml              |   60 +++---
 maliit-keyboard/data/languages/sk.xml              |   64 +++---
 maliit-keyboard/data/languages/sv.xml              |   68 +++---
 maliit-keyboard/data/languages/symbols-35-fi.xml   |  148 ++++++-------
 maliit-keyboard/data/languages/symbols-35.xml      |  117 ++++++-----
 .../data/languages/symbols-36-nordic.xml           |  138 ++++++++-----
 maliit-keyboard/data/languages/symbols-36.xml      |  135 ++++++------
 maliit-keyboard/data/languages/symbols-38.xml      |  109 +++++-----
 maliit-keyboard/data/languages/symbols-39.xml      |  115 ++++++-----
 maliit-keyboard/data/languages/symbols_ar.xml      |  143 +++++++------
 maliit-keyboard/data/languages/symbols_en.xml      |   80 +++----
 maliit-keyboard/data/languages/symbols_fa.xml      |  144 +++++++------
 maliit-keyboard/data/languages/symbols_he.xml      |   65 +++---
 maliit-keyboard/data/languages/symbols_kk.xml      |  145 +++++++------
 maliit-keyboard/data/languages/symbols_ru_uk.xml   |  146 +++++++------
 maliit-keyboard/data/languages/symbols_th.xml      |  122 ++++++-----
 maliit-keyboard/data/languages/symbols_vi.xml      |   69 ++++---
 .../data/languages/symbols_zh_cangjie.xml          |   24 +--
 .../data/languages/symbols_zh_pinyin.xml           |   24 +--
 .../data/languages/symbols_zh_zhuyin.xml           |   16 +-
 maliit-keyboard/data/languages/th.xml              |   78 +++----
 maliit-keyboard/data/languages/tr.xml              |   60 +++---
 maliit-keyboard/data/languages/uk.xml              |   78 +++----
 maliit-keyboard/data/languages/vi.xml              |   62 +++---
 maliit-keyboard/data/languages/zh_cn_cangjie.xml   |   10 +-
 maliit-keyboard/data/languages/zh_cn_pinyin.xml    |    8 +-
 maliit-keyboard/data/languages/zh_cn_zhuyin.xml    |   80 +------
 maliit-keyboard/data/styles/olpc-xo/main.ini       |    9 -
 55 files changed, 2090 insertions(+), 1932 deletions(-)

diff --git a/maliit-keyboard/data/languages/ar.xml b/maliit-keyboard/data/languages/ar.xml
index 76b6349..59c04bd 100644
--- a/maliit-keyboard/data/languages/ar.xml
+++ b/maliit-keyboard/data/languages/ar.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE keyboard SYSTEM 'VirtualKeyboardLayout.dtd'>
 <keyboard version="1.0" title="العربية" language="ar" catalog="ar" autocapitalization="false">
   <layout type="general">
-    <section id="main">
+    <section id="main" style="ar">
       <row>
         <key>
           <binding label="ض"/>
@@ -38,102 +38,115 @@
         <key>
           <binding label="ج"/>
         </key>
+        <key style="special" rtl="true" width="large">
+          <binding action="backspace"/>
+        </key>
       </row>
 
       <row>
-        <key>
+        <spacer/>
+        <key width="small">
           <binding label="ش"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="س"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="ي"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="ب"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="ل"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="ا"/>
           <binding shift="true" label="أ"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="ت"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="ن"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="م"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="ك"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="د"/>
         </key>
+        <key style="special" rtl="false" id="actionKey" width="x-large">
+          <binding action="return"/>
+        </key>
+        <spacer/>
       </row>
 	
       <row>
-        <key style="special">
+        <key style="special" width="large">
           <binding action="shift"/>
         </key>
 
-        <key>
+        <key width="small">
           <binding label="ئ"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="ء"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="ؤ"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="ر"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="ى"/>
           <binding shift="true" label="آ"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="ة"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="و"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="ز"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="ظ"/>
         </key>
-
-        <key style="special" rtl="true">
-          <binding action="backspace"/>
+        <key id="emailUrlKey" width="small"><binding label="،"/></key>
+        <key width="small"><binding label="."/></key>
+        <key style="special" width="large">
+          <binding action="shift"/>
         </key>
       </row>
 
       <row>
-        <key style="special" width="x-large">
+        <key style="special">
           <binding action="sym" label="&#x061F;&#x0663;&#x0662;&#x0661;"/>
         </key>
+        <key style="special">
+          <binding action="right-layout"/>
+        </key>
         
         <key><binding label="ذ"/></key>
-        <key id="emailUrlKey"><binding label="،"/></key>
 
         <key width="stretched">
           <binding action="space"/>
         </key>
         
-        <key><binding label="."/></key>
         <key><binding label="ط"/></key>
 
-        <key style="special" width="xx-large" rtl="false" id="actionKey">
-          <binding action="return"/>
+        <key style="special">
+          <binding action="sym" label="&#x061F;&#x0663;&#x0662;&#x0661;"/>
         </key>
+
+        <key style="special"><binding action="close"/></key>
+
       </row>
     </section>
   </layout>
diff --git a/maliit-keyboard/data/languages/bg_bg.xml b/maliit-keyboard/data/languages/bg_bg.xml
index 7355059..8fe9dbc 100644
--- a/maliit-keyboard/data/languages/bg_bg.xml
+++ b/maliit-keyboard/data/languages/bg_bg.xml
@@ -44,52 +44,56 @@
           <binding label="п"/>
           <binding shift="true" label="П"/>
         </key>
+        <key style="special">
+          <binding action="backspace"/>
+        </key>
       </row>
 
       <row>
         <spacer/>
-
-        <key>
+        <key width="small">
           <binding label="а" extended_labels="à"/>
           <binding shift="true" label="А" extended_labels="À"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="с" extended_labels="$"/>
           <binding shift="true" label="С" extended_labels="$"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="д" extended_labels="ð"/>
           <binding shift="true" label="Д" extended_labels="Ð"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="ф"/>
           <binding shift="true" label="Ф"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="г"/>
           <binding shift="true" label="Г"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="х"/>
           <binding shift="true" label="Х"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="й"/>
           <binding shift="true" label="Й"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="к"/>
           <binding shift="true" label="К"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="л"/>
           <binding shift="true" label="Л"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="ю"/>
           <binding shift="true" label="Ю"/>
         </key>
-
+        <key width="large" style="special" id="actionKey">
+          <binding action="return"/>
+        </key>
         <spacer/>
       </row>
 
@@ -98,68 +102,68 @@
           <binding action="shift"/>
         </key>
 
-        <key>
+        <key width="small">
           <binding label="з"/>
           <binding shift="true" label="З"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="ь"/>
           <binding shift="true" label="ѝ"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="ц"/>
           <binding shift="true" label="Ц"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="ж"/>
           <binding shift="true" label="Ж"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="б"/>
           <binding shift="true" label="Б"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="н"/>
           <binding shift="true" label="Н"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="м"/>
           <binding shift="true" label="М"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="ч"/>
           <binding shift="true" label="Ч"/>
         </key>
-
+        <key width="small" id="emailUrlKey"><binding label=","/></key>
+        <key width="small"><binding label="."/></key>
         <key style="special">
-          <binding action="backspace"/>
+          <binding action="shift"/>
         </key>
+
       </row>
 
       <row>
         <key style="special" width="large">
           <binding action="sym" label="?123"/>
         </key>
-
-        <spacer/>
+        <key style="special">
+          <binding action="right-layout"/>
+        </key>
 
         <key>
           <binding label="ш"/>
           <binding shift="true" label="Ш"/>
         </key>
-        <key id="emailUrlKey"><binding label=","/></key>
         <key width="xx-large"><binding action="space"/></key>
-        <key><binding label="."/></key>
         <key>
           <binding label="щ"/>
           <binding shift="true" label="Щ"/>
         </key>
-
-        <spacer/>
-
-        <key style="special" width="x-large" id="actionKey">
-          <binding action="return"/>
+        <key style="special" width="large">
+          <binding action="sym" label="?123"/>
         </key>
+        <key style="special"><binding action="close"/></key>
+
       </row>
     </section>
   </layout>
diff --git a/maliit-keyboard/data/languages/cs.xml b/maliit-keyboard/data/languages/cs.xml
index 9eac775..b1ecacf 100644
--- a/maliit-keyboard/data/languages/cs.xml
+++ b/maliit-keyboard/data/languages/cs.xml
@@ -44,52 +44,60 @@
           <binding label="p"/>
           <binding shift="true" label="P"/>
         </key>
+        <key style="special">
+          <binding action="backspace" label=""/>
+        </key>
       </row>
 
       <row>
-        <key>
+        <spacer/>
+        <key width="small">
           <binding extended_labels="áäăâą" accented_labels="á" accents="´" label="a"/>
           <binding extended_labels="ÁÄĂÂĄ" shift="true" accented_labels="Á" accents="´" label="A"/>
         </key>
-        <key>
+        <key width="small">
           <binding extended_labels="šßśş$" accented_labels="š" accents="ˇ" label="s"/>
           <binding extended_labels="ŠŚŞ$" shift="true" accented_labels="Š" accents="ˇ" label="S"/>
         </key>
-        <key>
+        <key width="small">
           <binding extended_labels="ďđ" accented_labels="ď" accents="ˇ" label="d"/>
           <binding extended_labels="ĎĐ" shift="true" accented_labels="Ď" accents="ˇ" label="D"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="f"/>
           <binding shift="true" label="F"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="g"/>
           <binding shift="true" label="G"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="h"/>
           <binding shift="true" label="H"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="j"/>
           <binding shift="true" label="J"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="k"/>
           <binding shift="true" label="K"/>
         </key>
-        <key>
+        <key width="small">
           <binding extended_labels="ľĺł" label="l"/>
           <binding extended_labels="ĽĹŁ" shift="true" label="L"/>
         </key>
-		<key style="special">
+	<key width="small" style="special">
             <binding dead="true" label="´"/>
         </key>
+        <key style="special" width="large" id="actionKey">
+          <binding action="return" label=""/>
+        </key>
+        <spacer/>
       </row>
 
       <row>
-        <key style="special" width="x-large">
+        <key style="special">
           <binding action="shift" label=""/>
         </key>
 
@@ -121,31 +129,35 @@
           <binding label="m"/>
           <binding shift="true" label="M"/>
         </key>
+        <key id="emailUrlKey"><binding label=","/></key>
+        <key><binding label="."/></key>
 
-        <key style="special" width="x-large">
-          <binding action="backspace" label=""/>
+        <key style="special">
+          <binding action="shift" label=""/>
         </key>
       </row>
 
       <row>
-        <key style="special" width="x-large">
+        <key style="special">
           <binding action="sym" label="?123"/>
         </key>
+        <key style="special">
+          <binding action="right-layout"/>
+        </key>
 
         <key style="special">
           <binding dead="true" label="ˇ"/>
         </key>
-        <key id="emailUrlKey"><binding label=","/></key>
 
         <key width="stretched">
           <binding action="space" label=""/>
         </key>
 
-        <key><binding label="."/></key>
-
-        <key style="special" width="xx-large" id="actionKey">
-          <binding action="return" label=""/>
+        <key style="special">
+          <binding action="sym" label="?123"/>
         </key>
+        <key style="special"><binding action="close"/></key>
+
       </row>
 
     </section>
diff --git a/maliit-keyboard/data/languages/da.xml b/maliit-keyboard/data/languages/da.xml
index 839bcb4..d24361c 100644
--- a/maliit-keyboard/data/languages/da.xml
+++ b/maliit-keyboard/data/languages/da.xml
@@ -44,103 +44,111 @@
         <binding label="p"/>
         <binding shift="true" label="P"/>
       </key>
+      <key style="special">
+        <binding action="backspace" label=""/>
+      </key>
       </row>
 
       <row>
-      <key>
+      <spacer/>
+      <key width="small">
         <binding label="a" extended_labels="æåäàáâã"/>
         <binding shift="true" label="A" extended_labels="ÆÅÄÀÁÂÃ"/>
       </key>
-      <key>
+      <key width="small">
         <binding label="s" extended_labels="ß$"/>
         <binding shift="true" label="S" extended_labels="ß$"/>
       </key>
-      <key>
+      <key width="small">
         <binding label="d" extended_labels="ð"/>
         <binding shift="true" label="D" extended_labels="Ð"/>
       </key>
-      <key>
+      <key width="small">
         <binding label="f"/>
         <binding shift="true" label="F"/>
       </key>
-      <key>
+      <key width="small">
         <binding label="g"/>
         <binding shift="true" label="G"/>
       </key>
-      <key>
+      <key width="small">
         <binding label="h"/>
         <binding shift="true" label="H"/>
       </key>
-      <key>
+      <key width="small">
         <binding label="j"/>
         <binding shift="true" label="J"/>
       </key>
-      <key>
+      <key width="small">
         <binding label="k"/>
         <binding shift="true" label="K"/>
       </key>
-      <key>
+      <key width="small">
         <binding label="l"/>
         <binding shift="true" label="L"/>
       </key>
-      <key>
+      <key width="small">
         <binding label="å"/>
         <binding shift="true" label="Å"/>
       </key>
+      <key style="special" width="large" id="actionKey">
+        <binding action="return" label=""/>
+      </key>
+      <spacer/>
       </row>
 
       <row>
       <key style="special">
         <binding action="shift" label=""/>
       </key>
-
-      <key>
+      <key width="small">
         <binding label="z"/>
         <binding shift="true" label="Z"/>
       </key>
-      <key>
+      <key width="small">
         <binding label="x"/>
         <binding shift="true" label="X"/>
       </key>
-      <key>
+      <key width="small">
         <binding label="c" extended_labels="ç"/>
         <binding shift="true" label="C" extended_labels="Ç"/>
       </key>
-      <key>
+      <key width="small">
         <binding label="v"/>
         <binding shift="true" label="V"/>
       </key>
-      <key>
+      <key width="small">
         <binding label="b"/>
         <binding shift="true" label="B"/>
       </key>
-      <key>
+      <key width="small">
         <binding label="n" extended_labels="ñ"/>
         <binding shift="true" label="N" extended_labels="Ñ"/>
       </key>
-      <key>
+      <key width="small">
         <binding label="m"/>
         <binding shift="true" label="M"/>
       </key>
-      <key>
+      <key width="small">
         <binding label="æ" extended_labels="ä"/>
         <binding shift="true" label="Æ" extended_labels="Ä"/>
       </key>
-
+      <key width="small" id="emailUrlKey"><binding label=","/></key>
+      <key width="small"><binding label="."/></key>
       <key style="special">
-        <binding action="backspace" label=""/>
+        <binding action="shift" label=""/>
       </key>
       </row>
 
       <row>
-      <key style="special" width="large">
+      <key style="special">
         <binding action="sym" label="?123"/>
       </key>
+      <key style="special">
+        <binding action="right-layout"/>
+      </key>
 
-      <key id="emailUrlKey"><binding label=","/></key>
-      <key><binding label="."/></key>
-
-      <key width="xx-large">
+      <key width="stretched">
         <binding action="space" label=""/>
       </key>
 
@@ -148,10 +156,12 @@
         <binding label="ø" extended_labels="ö"/>
         <binding shift="true" label="Ø" extended_labels="Ö"/>
       </key>
-
-      <key style="special" width="x-large" id="actionKey">
-        <binding action="return" label=""/>
+      <key style="special">
+        <binding action="sym" label="?123"/>
       </key>
+
+      <key style="special"><binding action="close"/></key>
+
     </row>
     </section>
   </layout>
diff --git a/maliit-keyboard/data/languages/de.xml b/maliit-keyboard/data/languages/de.xml
index 98d39d6..16235b8 100644
--- a/maliit-keyboard/data/languages/de.xml
+++ b/maliit-keyboard/data/languages/de.xml
@@ -47,114 +47,128 @@
         <binding label="p"/>
         <binding shift="true" label="P"/>
       </key>
+
+      <key style="special">
+        <binding action="backspace"/>
+      </key>
       </row>
 
       <row>
-      <key>
+      <spacer/>
+      <key width="small">
         <binding label="a" extended_labels="äàáãâåæ"/>
         <binding shift="true" label="A" extended_labels="ÄÀÁÃÂÅÆ"/>
       </key>
-      <key>
+      <key width="small">
         <binding label="s" extended_labels="ßş$"/>
         <binding shift="true" label="S" extended_labels="Ş$"/>
       </key>
-      <key>
+      <key width="small">
         <binding label="d"/>
         <binding shift="true" label="D"/>
       </key>
-      <key>
+      <key width="small">
         <binding label="f"/>
         <binding shift="true" label="F"/>
       </key>
-      <key>
+      <key width="small">
         <binding label="g" extended_labels="ğ"/>
         <binding shift="true" label="G" extended_labels="Ğ"/>
       </key>
-      <key>
+      <key width="small">
         <binding label="h"/>
         <binding shift="true" label="H"/>
       </key>
-      <key>
+      <key width="small">
         <binding label="j"/>
         <binding shift="true" label="J"/>
       </key>
-      <key>
+      <key width="small">
         <binding label="k"/>
         <binding shift="true" label="K"/>
       </key>
-      <key>
+      <key width="small">
         <binding label="l"/>
         <binding shift="true" label="L"/>
       </key>
-      <key>
+      <key width="small">
         <binding label="ü"/>
         <binding shift="true" label="Ü"/>
       </key>
+
+      <key style="special" width="large" id="actionKey">
+        <binding action="return" label=""/>
+      </key>
+      <spacer/>
       </row>
 
       <row>
       <key style="special">
-        <binding action="shift" label=""/>
+        <binding action="shift"/>
       </key>
 
-      <key>
+      <key width="small">
         <binding label="y" extended_labels="¥"/>
         <binding shift="true" label="Y" extended_labels="¥"/>
       </key>
-      <key>
+      <key width="small">
         <binding label="x"/>
         <binding shift="true" label="X"/>
       </key>
-      <key>
+      <key width="small">
         <binding label="c" extended_labels="ç"/>
         <binding shift="true" label="C" extended_labels="Ç"/>
       </key>
-      <key>
+      <key width="small">
         <binding label="v"/>
         <binding shift="true" label="V"/>
       </key>
-      <key>
+      <key width="small">
         <binding label="b"/>
         <binding shift="true" label="B"/>
       </key>
-      <key>
+      <key width="small">
         <binding label="n" extended_labels="ñ"/>
         <binding shift="true" label="N" extended_labels="Ñ"/>
       </key>
-      <key>
+      <key width="small">
         <binding label="m"/>
         <binding shift="true" label="M"/>
       </key>
-      <key>
+      <key width="small">
         <binding label="ä"/>
         <binding shift="true" label="Ä"/>
       </key>
+      <key id="emailUrlKey" width="small"><binding label=","/></key>
+      <key width="small"><binding label="."/></key>
 
       <key style="special">
-        <binding action="backspace" label=""/>
+        <binding action="shift"/>
       </key>
       </row>
 
       <row>
-      <key style="special" width="large">
+      <key style="special">
         <binding action="sym" label="?123"/>
       </key>
+        <key style="special">
+          <binding action="right-layout"/>
+        </key>
 
-      <key id="emailUrlKey"><binding label=","/></key>
-      <key><binding label="."/></key>
-
-      <key width="xx-large">
-        <binding action="space" label=""/>
+      <key width="stretched">
+        <binding action="space"/>
       </key>
 
       <key>
         <binding label="ö"/>
         <binding shift="true" label="Ö"/>
       </key>
-
-      <key style="special" width="x-large" id="actionKey">
-        <binding action="return" label=""/>
+      <key style="special">
+        <binding action="sym" label="?123"/>
       </key>
+
+      <key style="special"><binding action="close"/></key>
+
       </row>
     </section>
   </layout>
diff --git a/maliit-keyboard/data/languages/el_gr.xml b/maliit-keyboard/data/languages/el_gr.xml
index 45af547..6fcacda 100644
--- a/maliit-keyboard/data/languages/el_gr.xml
+++ b/maliit-keyboard/data/languages/el_gr.xml
@@ -44,60 +44,62 @@
           <binding label="π"/>
           <binding shift="true" label="Π"/>
         </key>
+        <key style="special">
+          <binding action="backspace"/>
+        </key>
       </row>
 
       <row>
         <spacer/>
-
-        <key>
+        <key width="small">
           <binding label="α" extended_labels="ά" accented_labels="ά" accents="΄"/>
           <binding shift="true" label="Α" extended_labels="Ά" accented_labels="Ά" accents="΄"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="σ" extended_labels="ς"/>
           <binding shift="true" label="Σ"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="δ"/>
           <binding shift="true" label="Δ"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="φ"/>
           <binding shift="true" label="Φ"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="γ"/>
           <binding shift="true" label="Γ"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="η" extended_labels="ή" accented_labels="ή" accents="΄"/>
           <binding shift="true" label="Η" extended_labels="Ή" accented_labels="Ή" accents="΄"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="ξ"/>
           <binding shift="true" label="Ξ"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="κ"/>
           <binding shift="true" label="Κ"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="λ"/>
           <binding shift="true" label="Λ"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="΄" dead="true" extended_labels="¨΅"/>
         </key>
+        <key style="special" width="large" id="actionKey">
+          <binding action="return"/>
+        </key>
         <spacer/>
       </row>
 
       <row>
-        <key style="special" width="large">
+        <key style="special">
           <binding action="shift"/>
         </key>
-
-        <spacer/>
-
         <key>
           <binding label="ζ"/>
           <binding shift="true" label="Ζ"/>
@@ -126,30 +128,28 @@
           <binding label="μ"/>
           <binding shift="true" label="Μ"/>
         </key>
-
-        <spacer/>
-
-        <key style="special" width="large">
-          <binding action="backspace"/>
+        <key><binding label=","/></key>
+        <key><binding label="."/></key>
+        <key style="special">
+          <binding action="shift"/>
         </key>
       </row>
 
       <row>
-        <key style="special" width="x-large">
+        <key style="special" width="large">
           <binding action="sym" label="?123"/>
         </key>
+      <key style="special">
+        <binding action="right-layout"/>
+      </key>
 
-        <spacer/>
-
-        <key id="emailUrlKey"><binding label=","/></key>
-        <key width="xx-large"><binding action="space"/></key>
-        <key><binding label="."/></key>
+        <key width="stretched"><binding action="space"/></key>
+        <key style="special" width="large">
+          <binding action="sym" label="?123"/>
+        </key>
 
-        <spacer/>
+        <key style="special"><binding action="close"/></key>
 
-        <key style="special" width="x-large" id="actionKey">
-          <binding action="return"/>
-        </key>
       </row>
     </section>
   </layout>
diff --git a/maliit-keyboard/data/languages/en_gb.xml b/maliit-keyboard/data/languages/en_gb.xml
index 7e192bb..c2a9fac 100644
--- a/maliit-keyboard/data/languages/en_gb.xml
+++ b/maliit-keyboard/data/languages/en_gb.xml
@@ -47,11 +47,13 @@
           <binding label="p"/>
           <binding shift="true" label="P"/>
         </key>
+        <key style="special">
+          <binding action="backspace"/>
+        </key>
       </row>
 
       <row>
-        <spacer/>
-
+	<spacer/>
         <key>
           <binding label="a" extended_labels="äàâáãå"/>
           <binding shift="true" label="A" extended_labels="ÄÀÂÁÃÅ"/>
@@ -88,17 +90,16 @@
           <binding label="l"/>
           <binding shift="true" label="L"/>
         </key>
-
+        <key style="special" width="large" id="actionKey">
+          <binding action="return"/>
+        </key>
         <spacer/>
       </row>
 
       <row>
-        <key style="special" width="large">
+        <key style="special">
           <binding action="shift"/>
         </key>
-
-        <spacer/>
-
         <key>
           <binding label="z"/>
           <binding shift="true" label="Z"/>
@@ -127,29 +128,28 @@
           <binding label="m"/>
           <binding shift="true" label="M"/>
         </key>
-
-        <spacer/>
-
-        <key style="special" width="large">
-          <binding action="backspace"/>
+        <key id="emailUrlKey"><binding label=","/></key>
+        <key><binding label="."/></key>
+        <key style="special">
+          <binding action="shift"/>
         </key>
       </row>
 
       <row>
-        <key style="special" width="x-large">
+        <key style="special" width="large">
           <binding action="sym" label="?123"/>
         </key>
-
-        <spacer/>
-
-        <key id="emailUrlKey"><binding label=","/></key>
-        <key width="xx-large"><binding action="space"/></key>
-        <key><binding label="."/></key>
-
-        <spacer/>
-
-        <key style="special" width="x-large" id="actionKey">
-          <binding action="return"/>
+        <key style="special">
+          <binding action="right-layout"/>
+        </key>
+        <key width="stretched">
+          <binding action="space"/>
+        </key>
+        <key style="special" width="large">
+          <binding action="sym" label="?123"/>
+        </key>
+        <key style="special">
+          <binding action="close"/>
         </key>
       </row>
     </section>
diff --git a/maliit-keyboard/data/languages/en_us.xml b/maliit-keyboard/data/languages/en_us.xml
index d12ef57..31b2126 100644
--- a/maliit-keyboard/data/languages/en_us.xml
+++ b/maliit-keyboard/data/languages/en_us.xml
@@ -44,6 +44,9 @@
           <binding label="p"/>
           <binding shift="true" label="P"/>
         </key>
+        <key style="special">
+          <binding action="backspace"/>
+        </key>
       </row>
 
       <row>
@@ -85,17 +88,18 @@
           <binding label="l"/>
           <binding shift="true" label="L"/>
         </key>
+        <key style="special" width="large" id="actionKey">
+          <binding action="return"/>
+        </key>
 
         <spacer/>
       </row>
 
       <row>
-        <key style="special" width="large">
+        <key style="special">
           <binding action="shift"/>
         </key>
 
-        <spacer/>
-
         <key>
           <binding label="z"/>
           <binding shift="true" label="Z"/>
@@ -124,33 +128,31 @@
           <binding label="m"/>
           <binding shift="true" label="M"/>
         </key>
-
-        <spacer/>
-
-        <key style="special" width="large">
-          <binding action="backspace"/>
+        <key id="emailUrlKey"><binding label=","/></key>
+        <key><binding label="."/></key>
+        <key style="special">
+          <binding action="shift"/>
         </key>
+
       </row>
 
       <row>
-        <key style="special" width="x-large">
+        <key style="special" width="large">
           <binding action="sym" label="?123"/>
         </key>
+        <key style="special">
+          <binding action="right-layout"/>
+        </key>
 
-        <spacer/>
-
-        <key id="emailUrlKey"><binding label=","/></key>
-        <key width="xx-large"><binding action="space"/></key>
-        <key><binding label="."/></key>
-
-        <spacer/>
-
-        <key style="special" width="x-large" id="actionKey">
-          <binding action="return"/>
+        <key width="stretched"><binding action="space"/></key>
+        <key style="special" width="large">
+          <binding action="sym" label="?123"/>
         </key>
+        <key style="special"><binding action="close"/></key>
+
       </row>
     </section>
   </layout>
 
   <import file="symbols_en.xml"/>
-</keyboard>
\ No newline at end of file
+</keyboard>
diff --git a/maliit-keyboard/data/languages/es.xml b/maliit-keyboard/data/languages/es.xml
index fbee235..9edacaf 100644
--- a/maliit-keyboard/data/languages/es.xml
+++ b/maliit-keyboard/data/languages/es.xml
@@ -44,54 +44,62 @@
         <binding label="p"/>
         <binding shift="true" label="P"/>
       </key>
+      <key style="special">
+        <binding action="backspace" label=""/>
+      </key>
       </row>
 
       <row>
-      <key>
+      <spacer/>
+      <key width="small">
         <binding accented_labels="áä" accents="´¨" label="a" extended_labels="áªäàâãæ"/>
         <binding shift="true" accented_labels="ÁÄ" accents="´¨" label="A" extended_labels="ÁªÄÀÂÃÆ"/>
       </key>
-      <key>
+      <key width="small">
         <binding label="s" extended_labels="ß$"/>
         <binding shift="true" label="S" extended_labels="$"/>
       </key>
-      <key>
+      <key width="small">
         <binding label="d"/>
         <binding shift="true" label="D"/>
       </key>
-      <key>
+      <key width="small">
         <binding label="f"/>
         <binding shift="true" label="F"/>
       </key>
-      <key>
+      <key width="small">
         <binding label="g"/>
         <binding shift="true" label="G"/>
       </key>
-      <key>
+      <key width="small">
         <binding label="h"/>
         <binding shift="true" label="H"/>
       </key>
-      <key>
+      <key width="small">
         <binding label="j"/>
         <binding shift="true" label="J"/>
       </key>
-      <key>
+      <key width="small">
         <binding label="k"/>
         <binding shift="true" label="K"/>
       </key>
-      <key>
+      <key width="small">
         <binding label="l" extended_labels="ŀ"/>
         <binding shift="true" label="L" extended_labels="Ŀ"/>
       </key>
-      <key>
+      <key width="small">
         <binding label="ñ"/>
         <binding shift="true" label="Ñ"/>
       </key>
+      <key style="special" id="actionKey" width="large">
+        <binding action="return" label=""/>
+      </key>
+      <spacer/>
       </row>
 
       <row>
-      <key style="special" width="x-large">
-        <binding action="shift" label=""/>
+      <key style="special">
+        <binding action="shift"/>
       </key>
 
       <key>
@@ -122,32 +130,36 @@
         <binding label="m"/>
         <binding shift="true" label="M"/>
       </key>
-
-      <key style="special" width="x-large">
-        <binding action="backspace" label=""/>
+      <key id="emailUrlKey"><binding label=","/></key>
+      <key><binding label="."/></key>
+      <key style="special">
+        <binding action="shift"/>
       </key>
-      
       </row>
 
       <row>
-      <key style="special" width="x-large">
+      <key style="special">
         <binding action="sym" label="?123"/>
       </key>
 
       <key style="special">
+        <binding action="right-layout"/>
+      </key>
+
+      <key style="special">
         <binding dead="true" label="´"/>
       </key>
-      <key id="emailUrlKey"><binding label=","/></key>
 
       <key width="stretched">
         <binding action="space" label=""/>
       </key>
 
-      <key><binding label="."/></key>
-
-      <key style="special" width="xx-large" id="actionKey">
-        <binding action="return" label=""/>
+      <key style="special">
+        <binding action="sym" label="?123"/>
       </key>
+
+      <key style="special"><binding action="close"/></key>
+
       </row>
     </section>
   </layout>
diff --git a/maliit-keyboard/data/languages/et.xml b/maliit-keyboard/data/languages/et.xml
index 981f4a2..ce4ef09 100644
--- a/maliit-keyboard/data/languages/et.xml
+++ b/maliit-keyboard/data/languages/et.xml
@@ -47,91 +47,103 @@
           <binding label="p"/>
           <binding shift="true" label="P"/>
         </key>
+        <key style="special">
+          <binding action="backspace" label=""/>
+        </key>
       </row>
 
       <row>
-        <key>
+        <spacer/>
+        <key width="small">
           <binding label="a" extended_labels="äåæàáâã"/>
           <binding shift="true" label="A" extended_labels="ÄÅÆÀÁÂÃ"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="s" extended_labels="šß$"/>
           <binding shift="true" label="S" extended_labels="Š$"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="d" extended_labels="ð"/>
           <binding shift="true" label="D" extended_labels="Ð"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="f"/>
           <binding shift="true" label="F"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="g"/>
           <binding shift="true" label="G"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="h"/>
           <binding shift="true" label="H"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="j"/>
           <binding shift="true" label="J"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="k"/>
           <binding shift="true" label="K"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="l"/>
           <binding shift="true" label="L"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="ü"/>
           <binding shift="true" label="Ü"/>
         </key>
+        <key style="special" width="large" id="actionKey">
+          <binding action="return" label=""/>
+        </key>
+        <spacer/>
       </row>
 
       <row>
         <key style="special">
           <binding action="shift" label=""/>
         </key>
-
-        <key>
+        <key width="small">
           <binding label="z" extended_labels="ž"/>
           <binding shift="true" label="Z" extended_labels="Ž"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="x"/>
           <binding shift="true" label="X"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="c" extended_labels="ç"/>
           <binding shift="true" label="C" extended_labels="Ç"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="v"/>
           <binding shift="true" label="V"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="b"/>
           <binding shift="true" label="B"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="n" extended_labels="ñ"/>
           <binding shift="true" label="N" extended_labels="Ñ"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="m"/>
           <binding shift="true" label="M"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="ä"/>
           <binding shift="true" label="Ä"/>
         </key>
-
+        <key width="small" id="emailUrlKey">
+          <binding label=","/>
+        </key>
+        <key width="small">
+          <binding label="."/>
+        </key>
         <key style="special">
-          <binding action="backspace" label=""/>
+          <binding action="shift" label=""/>
         </key>
       </row>
 
@@ -139,18 +151,12 @@
         <key style="special" width="large">
           <binding action="sym" label="?123"/>
         </key>
-
-        <key id="emailUrlKey">
-          <binding label=","/>
-        </key>
-        <key>
-          <binding label="."/>
+        <key style="special">
+          <binding action="right-layout"/>
         </key>
-
-        <key width="stretched">
+        <key width="xx-large">
           <binding action="space" label=""/>
         </key>
-
         <key>
           <binding label="ö"/>
           <binding shift="true" label="Ö"/>
@@ -159,10 +165,11 @@
           <binding label="õ"/>
           <binding shift="true" label="Õ"/>
         </key>
-
-        <key style="special" width="large" id="actionKey">
-          <binding action="return" label=""/>
+        <key style="special" width="large">
+          <binding action="sym" label="?123"/>
         </key>
+        <key style="special"><binding action="close"/></key>
+
       </row>
     </section>
   </layout>
diff --git a/maliit-keyboard/data/languages/fa.xml b/maliit-keyboard/data/languages/fa.xml
index b51955a..10c5d24 100644
--- a/maliit-keyboard/data/languages/fa.xml
+++ b/maliit-keyboard/data/languages/fa.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE keyboard SYSTEM 'VirtualKeyboardLayout.dtd'>
 <keyboard version="1.0" title="فارسى" language="fa" catalog="virtual-keyboard" autocapitalization="false">
   <layout type="general">
-    <section id="main">
+    <section id="main" style="ar">
       <row>
         <key>
           <binding label="ض"/>
@@ -37,46 +37,53 @@
         <key>
           <binding label="چ"/>
         </key>
+        <key style="special" rtl="true">
+          <binding action="backspace"/>
+        </key>
       </row>
 
       <row>
-        <key>
+        <spacer/>
+        <key width="small">
           <binding label="ش"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="س"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="ی"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="ب"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="ل"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="ا"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="ت"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="ن"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="م"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="ک"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="گ"/>
         </key>
+        <key style="special" width="x-large" rtl="false" id="actionKey">
+          <binding action="return"/>
+        </key>
+        <spacer/>
       </row>
 	
       <row>
-
         <key>
           <binding label="ظ"/>
         </key>
@@ -107,32 +114,30 @@
         <key>
           <binding label="ث"/>
         </key>
-
-        <key style="special" rtl="true">
-          <binding action="backspace"/>
-        </key>
+        <key id="emailUrlKey"><binding label="،"/></key>
+        <key><binding label="."/></key>
       </row>
 
       <row>
         <key style="special" width="x-large">
           <binding action="sym" label="&#x061F;&#x06F3;&#x06F2;&#x06F1;"/>
         </key>
+        <key style="special">
+          <binding action="right-layout"/>
+        </key>
         <key>
           <binding label="ئ"/>
         </key>
-        <key id="emailUrlKey"><binding label="،"/></key>
-
-        <key width="stretched">
+        <key width="xx-large">
           <binding action="space"/>
         </key>
-
-        <key><binding label="."/></key>
         <key>
           <binding label="آ"/>
         </key>
-        <key style="special" width="xx-large" rtl="false" id="actionKey">
-          <binding action="return"/>
+        <key style="special" width="x-large">
+          <binding action="sym" label="&#x061F;&#x06F3;&#x06F2;&#x06F1;"/>
         </key>
+        <key style="special"><binding action="close"/></key>
       </row>
     </section>
   </layout>
diff --git a/maliit-keyboard/data/languages/fi.xml b/maliit-keyboard/data/languages/fi.xml
index 4199e68..dec05c0 100644
--- a/maliit-keyboard/data/languages/fi.xml
+++ b/maliit-keyboard/data/languages/fi.xml
@@ -44,111 +44,116 @@
         <binding label="p"/>
         <binding shift="true" label="P"/>
       </key>
+      <key style="special">
+        <binding action="backspace" label=""/>
+      </key>
       </row>
 
       <row>
-      <key>
+      <spacer/>
+      <key width="small">
         <binding label="a" extended_labels="äåæàáâã"/>
         <binding shift="true" label="A" extended_labels="ÄÅÆÀÁÂÃ"/>
       </key>
-      <key>
+      <key width="small">
         <binding label="s" extended_labels="šß$"/>
         <binding shift="true" label="S" extended_labels="Š$"/>
       </key>
-      <key>
+      <key width="small">
         <binding label="d" extended_labels="ð"/>
         <binding shift="true" label="D" extended_labels="Ð"/>
       </key>
-      <key>
+      <key width="small">
         <binding label="f"/>
         <binding shift="true" label="F"/>
       </key>
-      <key>
+      <key width="small">
         <binding label="g"/>
         <binding shift="true" label="G"/>
       </key>
-      <key>
+      <key width="small">
         <binding label="h"/>
         <binding shift="true" label="H"/>
       </key>
-      <key>
+      <key width="small">
         <binding label="j"/>
         <binding shift="true" label="J"/>
       </key>
-      <key>
+      <key width="small">
         <binding label="k"/>
         <binding shift="true" label="K"/>
       </key>
-      <key>
+      <key width="small">
         <binding label="l"/>
         <binding shift="true" label="L"/>
       </key>
-      <key>
+      <key width="small">
         <binding label="ä" extended_labels="æ"/>
         <binding shift="true" label="Ä" extended_labels="Æ"/>
       </key>
-
+      <key style="special" width="large" id="actionKey">
+        <binding action="return" label=""/>
+      </key>
+      <spacer/>
       </row>
 
       <row>
-      <key style="special" width="x-large">
+      <key style="special">
         <binding action="shift" label=""/>
       </key>
-
-      <key>
+      <key width="small">
         <binding label="z" extended_labels="ž"/>
         <binding shift="true" label="Z" extended_labels="Ž"/>
       </key>
-      <key>
+      <key width="small">
         <binding label="x"/>
         <binding shift="true" label="X"/>
       </key>
-      <key>
+      <key width="small">
         <binding label="c" extended_labels="ç"/>
         <binding shift="true" label="C" extended_labels="Ç"/>
       </key>
-      <key>
+      <key width="small">
         <binding label="v"/>
         <binding shift="true" label="V"/>
       </key>
-      <key>
+      <key width="small">
         <binding label="b"/>
         <binding shift="true" label="B"/>
       </key>
-      <key>
+      <key width="small">
         <binding label="n" extended_labels="ñ"/>
         <binding shift="true" label="N" extended_labels="Ñ"/>
       </key>
-      <key>
+      <key width="small">
         <binding label="m"/>
         <binding shift="true" label="M"/>
       </key>
-
-      <key style="special" width="x-large">
-        <binding action="backspace" label=""/>
+      <key width="small" id="emailUrlKey"><binding label=","/></key>
+      <key width="small"><binding label="."/></key>
+      <key width="small">
+        <binding label="ö" extended_labels="ø"/>
+        <binding shift="true" label="Ö" extended_labels="Ø"/>
+      </key>
+      <key style="special">
+        <binding action="shift" label=""/>
       </key>
       </row>
 
       <row>
-      <key style="special" width="x-large">
+      <key style="special" width="large">
         <binding action="sym" label="?123"/>
       </key>
-
-      <key id="emailUrlKey"><binding label=","/></key>
-      <key><binding label="."/></key>
-
+      <key style="special">
+        <binding action="right-layout"/>
+      </key>
       <key width="stretched">
         <binding action="space" label=""/>
       </key>
-
-      <key>
-        <binding label="ö" extended_labels="ø"/>
-        <binding shift="true" label="Ö" extended_labels="Ø"/>
-      </key>
-
-      <key style="special" width="xx-large" id="actionKey">
-        <binding action="return" label=""/>
+      <key style="special" width="large">
+        <binding action="sym" label="?123"/>
       </key>
+      <key style="special"><binding action="close"/></key>
       </row>
     </section>
   </layout>
diff --git a/maliit-keyboard/data/languages/fr.xml b/maliit-keyboard/data/languages/fr.xml
index 7a2d481..5601261 100644
--- a/maliit-keyboard/data/languages/fr.xml
+++ b/maliit-keyboard/data/languages/fr.xml
@@ -44,56 +44,63 @@
           <binding label="p"/>
           <binding shift="true" label="P"/>
         </key>
+        <key style="special">
+          <binding action="backspace"/>
+        </key>
       </row>
 
       <row>
-        <key>
+        <spacer/>
+        <key width="small">
           <binding label="q"/>
           <binding shift="true" label="Q"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="s" extended_labels="ß$"/>
           <binding shift="true" label="S" extended_labels="$"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="d"/>
           <binding shift="true" label="D"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="f"/>
           <binding shift="true" label="F"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="g"/>
           <binding shift="true" label="G"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="h"/>
           <binding shift="true" label="H"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="j"/>
           <binding shift="true" label="J"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="k"/>
           <binding shift="true" label="K"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="l"/>
           <binding shift="true" label="L"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="m"/>
           <binding shift="true" label="M"/>
         </key>
+        <key style="special" width="large" id="actionKey">
+          <binding action="return"/>
+        </key>
+        <spacer/>
       </row>
 
       <row>
-        <key style="special" width="x-large">
+        <key style="special">
           <binding action="shift"/>
         </key>
-
         <key>
           <binding label="w"/>
           <binding shift="true" label="W"/>
@@ -122,27 +129,32 @@
           <binding label="ç"/>
           <binding shift="true" label="Ç"/>
         </key>
-
-        <key style="special" width="x-large">
-          <binding action="backspace"/>
+        <key id="emailUrlKey"><binding label=","/></key>
+        <key><binding label="."/></key>
+        <key style="special">
+          <binding action="shift"/>
         </key>
       </row>
 
       <row>
-        <key style="special" width="x-large">
+        <key style="special">
           <binding action="sym" label="?123"/>
         </key>
 
+        <key style="special">
+          <binding action="right-layout"/>
+        </key>
+
         <key><binding label="&#x0027;"/></key>
-        <key id="emailUrlKey"><binding label=","/></key>
 
         <key width="stretched"><binding action="space"/></key>
 
-        <key><binding label="."/></key>
-
-        <key style="special" width="xx-large" id="actionKey">
-          <binding action="return"/>
+        <key style="special">
+          <binding action="sym" label="?123"/>
         </key>
+
+        <key style="special"><binding action="close"/></key>
+
       </row>
     </section>
   </layout>
diff --git a/maliit-keyboard/data/languages/fr_ca.xml b/maliit-keyboard/data/languages/fr_ca.xml
index 712b17a..bb453d1 100644
--- a/maliit-keyboard/data/languages/fr_ca.xml
+++ b/maliit-keyboard/data/languages/fr_ca.xml
@@ -44,56 +44,63 @@
           <binding label="p"/>
           <binding shift="true" label="P"/>
         </key>
+        <key style="special">
+          <binding action="backspace" label=""/>
+        </key>
       </row>
 
       <row>
-        <key>
+        <spacer/>
+        <key width="small">
           <binding accented_labels="àáâä" accents="`´^¨" label="a" extended_labels="àâæáãä"/>
           <binding shift="true" accented_labels="ÀÁÂÄ" accents="`´^¨" label="A" extended_labels="ÀÂÆÁÃÄ"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="s" extended_labels="ß$"/>
           <binding shift="true" label="S" extended_labels="$"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="d"/>
           <binding shift="true" label="D"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="f"/>
           <binding shift="true" label="F"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="g"/>
           <binding shift="true" label="G"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="h"/>
           <binding shift="true" label="H"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="j"/>
           <binding shift="true" label="J"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="k"/>
           <binding shift="true" label="K"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="l"/>
           <binding shift="true" label="L"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="ç"/>
           <binding shift="true" label="Ç"/>
         </key>
+        <key style="special" width="large" id="actionKey">
+          <binding action="return" label=""/>
+        </key>
+        <spacer/>
       </row>
 
       <row>
-        <key style="special" width="x-large">
+        <key style="special">
           <binding action="shift" label=""/>
         </key>
-
         <key>
           <binding label="z"/>
           <binding shift="true" label="Z"/>
@@ -122,29 +129,28 @@
           <binding label="m"/>
           <binding shift="true" label="M"/>
         </key>
-
-        <key style="special" width="x-large">
-          <binding action="backspace" label=""/>
+        <key id="emailUrlKey"><binding label=","/></key>
+        <key><binding label="."/></key>
+        <key style="special">
+          <binding action="shift" label=""/>
         </key>
       </row>
 
       <row>
-        <key style="special" width="x-large">
+        <key style="special">
           <binding action="sym" label="?123"/>
         </key>
-
+        <key style="special">
+          <binding action="right-layout"/>
+        </key>
         <key><binding label="&#x0027;"/></key>
-        <key id="emailUrlKey"><binding label=","/></key>
-        
         <key width="stretched">
             <binding action="space" label=""/>
         </key>
-
-        <key><binding label="."/></key>
-
-        <key style="special" width="xx-large" id="actionKey">
-          <binding action="return" label=""/>
+        <key style="special">
+          <binding action="sym" label="?123"/>
         </key>
+        <key style="special"><binding action="close"/></key>
       </row>
 
     </section>
diff --git a/maliit-keyboard/data/languages/he.xml b/maliit-keyboard/data/languages/he.xml
index cf4e619..cad45ac 100644
--- a/maliit-keyboard/data/languages/he.xml
+++ b/maliit-keyboard/data/languages/he.xml
@@ -5,7 +5,6 @@
     <section id="main" style="hebrew">
       <row>
         <spacer/>
-        
         <key>
 	  <binding label="ק"/>
 	</key>
@@ -30,41 +29,48 @@
         <key>
 	  <binding label="פ"/>
 	</key>
-
+        <key style="special">
+          <binding action="backspace"/>
+        </key>
         <spacer/>
       </row>
 
       <row>
-        <key>
+        <spacer/>
+        <key width="small">
 	  <binding label="ש"/>
 	</key>
-        <key>
+        <key width="small">
 	  <binding label="ד"/>
 	</key>
-        <key>
+        <key width="small">
 	  <binding label="ג"/>
 	</key>
-        <key>
+        <key width="small">
 	  <binding label="כ"/>
 	</key>
-        <key>
+        <key width="small">
 	  <binding label="ע"/>
 	</key>
-        <key>
+        <key width="small">
 	  <binding label="י"/>
 	</key>
-        <key>
+        <key width="small">
 	  <binding label="ח"/>
 	</key>
-        <key>
+        <key width="small">
 	  <binding label="ל"/>
 	</key>
-        <key>
+        <key width="small">
 	  <binding label="ך"/>
 	</key>
-        <key>
+        <key width="small">
 	  <binding label="ף"/>
 	</key>
+        <key style="special" width="large" id="actionKey">
+          <binding action="return"/>
+        </key>
+        <spacer/>
       </row>
 
       <row>
@@ -95,24 +101,22 @@
         <key>
 	  <binding label="ץ"/>
 	</key>
-
-        <key style="special">
-          <binding action="backspace"/>
-        </key>
+        <key id="emailUrlKey"><binding label=","/></key>
+        <key><binding label="."/></key>
       </row>
 
       <row>
         <key style="special" width="large">
           <binding action="sym" label="?123"/>
         </key>
-
-        <key id="emailUrlKey"><binding label=","/></key>
-        <key width="xx-large"><binding action="space"/></key>
-        <key><binding label="."/></key>
-
-        <key style="special" width="x-large" id="actionKey">
-          <binding action="return"/>
+        <key style="special">
+          <binding action="right-layout"/>
+        </key>
+        <key width="stretched"><binding action="space"/></key>
+        <key style="special" width="large">
+          <binding action="sym" label="?123"/>
         </key>
+        <key style="special"><binding action="close"/></key>
       </row>
     </section>
   </layout>
diff --git a/maliit-keyboard/data/languages/hu.xml b/maliit-keyboard/data/languages/hu.xml
index f090185..ed4f1c1 100644
--- a/maliit-keyboard/data/languages/hu.xml
+++ b/maliit-keyboard/data/languages/hu.xml
@@ -44,109 +44,115 @@
         <binding label="p"/>
         <binding shift="true" label="P"/>
        </key>
+       <key style="special">
+        <binding action="backspace" label=""/>
+       </key>
       </row>
 
       <row>
-       <key>
+       <spacer/>
+       <key width="small">
         <binding accented_labels="á" accents="´" label="a" extended_labels="áäâăą"/>
         <binding shift="true" accented_labels="Á" accents="´" label="A" extended_labels="ÁÄÂĂĄ"/>
        </key>
-       <key>
+       <key width="small">
         <binding label="s" extended_labels="ßśşš$"/>
         <binding shift="true" label="S" extended_labels="ŚŞŠ$"/>
        </key>
-       <key>
+       <key width="small">
         <binding label="d" extended_labels="đď"/>
         <binding shift="true" label="D" extended_labels="ĐĎ"/>
        </key>
-       <key>
+       <key width="small">
         <binding label="f"/>
         <binding shift="true" label="F"/>
        </key>
-       <key>
+       <key width="small">
         <binding label="g"/>
         <binding shift="true" label="G"/>
        </key>
-       <key>
+       <key width="small">
         <binding label="h"/>
         <binding shift="true" label="H"/>
        </key>
-       <key>
+       <key width="small">
         <binding label="j"/>
         <binding shift="true" label="J"/>
        </key>
-       <key>
+       <key width="small">
         <binding label="k"/>
         <binding shift="true" label="K"/>
        </key>
-       <key>
+       <key width="small">
         <binding label="l"/>
         <binding shift="true" label="L"/>
        </key>
-       <key style="special">
+       <key width="small" style="special">
         <binding dead="true" label="&#x00B4;"/>
        </key>
+       <key style="special" width="large" id="actionKey">
+        <binding action="return" label=""/>
+       </key>
+       <spacer/>
       </row>
 
       <row>
        <key style="special">
         <binding action="shift" label=""/>
        </key>
-
-       <key>
+       <key width="small">
         <binding label="y" extended_labels="¥"/>
         <binding shift="true" label="Y" extended_labels="¥"/>
        </key>
-       <key>
+       <key width="small">
         <binding label="x"/>
         <binding shift="true" label="X"/>
        </key>
-       <key>
+       <key width="small">
         <binding label="c" extended_labels="ćčç"/>
         <binding shift="true" label="C" extended_labels="ĆČÇ"/>
        </key>
-       <key>
+       <key width="small">
         <binding label="v"/>
         <binding shift="true" label="V"/>
        </key>
-       <key>
+       <key width="small">
         <binding label="b"/>
         <binding shift="true" label="B"/>
        </key>
-       <key>
+       <key width="small">
         <binding label="n" extended_labels="ńňñ"/>
         <binding shift="true" label="N" extended_labels="ŃŇÑ"/>
        </key>
-       <key>
+       <key width="small">
         <binding label="m"/>
         <binding shift="true" label="M"/>
        </key>
-       <key style="special">
+       <key width="small" style="special">
         <binding dead="true" label="&#x02DD;"/>
        </key>
-
+       <key width="small" id="emailUrlKey"><binding label=","/></key>
+       <key width="small"><binding label="."/></key>
        <key style="special">
-        <binding action="backspace" label=""/>
+        <binding action="shift" label=""/>
        </key>
       </row>
 
       <row>
-       <key style="special" width="large">
+       <key style="special">
         <binding action="sym" label="?123"/>
        </key>
-
+        <key style="special">
+          <binding action="right-layout"/>
+        </key>
        <key style="special"><binding dead="true" label="¨"/></key>
-       <key id="emailUrlKey"><binding label=","/></key>
-
-       <key width="xx-large">
+       <key width="stretched">
         <binding action="space" label=""/>
        </key>
-
-       <key><binding label="."/></key>
-
-       <key style="special" width="x-large" id="actionKey">
-        <binding action="return" label=""/>
+       <key style="special">
+        <binding action="sym" label="?123"/>
        </key>
+       <key style="special"><binding action="close"/></key>
       </row>
     </section>
   </layout>
diff --git a/maliit-keyboard/data/languages/id.xml b/maliit-keyboard/data/languages/id.xml
index 92dbfd6..4c68d29 100644
--- a/maliit-keyboard/data/languages/id.xml
+++ b/maliit-keyboard/data/languages/id.xml
@@ -44,11 +44,13 @@
           <binding label="p"/>
           <binding shift="true" label="P"/>
         </key>
+        <key style="special">
+          <binding action="backspace"/>
+        </key>
       </row>
 
       <row>
         <spacer/>
-
         <key>
           <binding label="a" extended_labels="àâæáãä"/>
           <binding shift="true" label="A" extended_labels="ÀÂÆÁÃÄ"/>
@@ -85,17 +87,16 @@
           <binding label="l"/>
           <binding shift="true" label="L"/>
         </key>
-
+        <key style="special" width="large" id="actionKey">
+          <binding action="return"/>
+        </key>
         <spacer/>
       </row>
 
       <row>
-        <key style="special" width="large">
+        <key style="special">
           <binding action="shift"/>
         </key>
-
-        <spacer/>
-
         <key>
           <binding label="z"/>
           <binding shift="true" label="Z"/>
@@ -124,30 +125,25 @@
           <binding label="m"/>
           <binding shift="true" label="M"/>
         </key>
-
-        <spacer/>
-
-        <key style="special" width="large">
-          <binding action="backspace"/>
+        <key id="emailUrlKey"><binding label=","/></key>
+        <key><binding label="."/></key>
+        <key style="special">
+          <binding action="shift"/>
         </key>
       </row>
 
       <row>
-        <key style="special" width="x-large">
+        <key style="special" width="large">
           <binding action="sym" label="?123"/>
         </key>
-
-        <spacer/>
-
-        <key id="emailUrlKey"><binding label=","/></key>
-        <key width="xx-large"><binding action="space"/></key>
-        <key><binding label="."/></key>
-
-        <spacer/>
-
-        <key style="special" width="x-large" id="actionKey">
-          <binding action="return"/>
+        <key style="special">
+          <binding action="right-layout"/>
+        </key>
+        <key width="stretched"><binding action="space"/></key>
+        <key style="special" width="large">
+          <binding action="sym" label="?123"/>
         </key>
+        <key style="special"><binding action="close"/></key>
       </row>
     </section>
   </layout>
diff --git a/maliit-keyboard/data/languages/it.xml b/maliit-keyboard/data/languages/it.xml
index 851f7d4..2a956f7 100644
--- a/maliit-keyboard/data/languages/it.xml
+++ b/maliit-keyboard/data/languages/it.xml
@@ -44,52 +44,60 @@
           <binding label="p"/>
           <binding shift="true" label="P"/>
         </key>
+        <key style="special">
+          <binding action="backspace"/>
+        </key>
       </row>
+
       <row>
-        <key>
+        <spacer/>
+        <key width="small">
           <binding accented_labels="à" accents="`" label="a" extended_labels="àªäáâã"/>
           <binding shift="true" accented_labels="À" accents="`" label="A" extended_labels="ÀªÄÁÂÃ"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="s" extended_labels="ß$"/>
           <binding shift="true" label="S" extended_labels="$"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="d"/>
           <binding shift="true" label="D"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="f"/>
           <binding shift="true" label="F"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="g"/>
           <binding shift="true" label="G"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="h"/>
           <binding shift="true" label="H"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="j"/>
           <binding shift="true" label="J"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="k"/>
           <binding shift="true" label="K"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="l"/>
           <binding shift="true" label="L"/>
         </key>
-        <key><binding label="&#x0027;"/></key>
+        <key width="small"><binding label="&#x0027;"/></key>
+        <key style="special" width="large" id="actionKey">
+          <binding action="return"/>
+        </key>
+        <spacer/>
       </row>
 
       <row>
-        <key style="special" width="x-large">
+        <key style="special">
           <binding action="shift"/>
         </key>
-
         <key>
           <binding label="z"/>
           <binding shift="true" label="Z"/>
@@ -118,29 +126,28 @@
           <binding label="m"/>
           <binding shift="true" label="M"/>
         </key>
-
-        <key style="special" width="x-large">
-          <binding action="backspace"/>
+        <key id="emailUrlKey"><binding label=","/></key>
+        <key><binding label="."/></key>
+        <key style="special">
+          <binding action="shift"/>
         </key>
       </row>
 
       <row>
-        <key style="special" width="x-large">
+        <key style="special">
           <binding action="sym" label="?123"/>
         </key>
-
+        <key style="special">
+          <binding action="right-layout"/>
+        </key>
         <key style="special">
           <binding dead="true" label="`"/>
         </key>
-        <key id="emailUrlKey"><binding label=","/></key>
-
         <key width="stretched"><binding action="space"/></key>
-
-        <key><binding label="."/></key>
-
-        <key style="special" width="xx-large" id="actionKey">
-          <binding action="return"/>
+        <key style="special">
+          <binding action="sym" label="?123"/>
         </key>
+        <key style="special"><binding action="close"/></key>
       </row>
     </section>
   </layout>
diff --git a/maliit-keyboard/data/languages/kk.xml b/maliit-keyboard/data/languages/kk.xml
index b10712e..b4316ce 100644
--- a/maliit-keyboard/data/languages/kk.xml
+++ b/maliit-keyboard/data/languages/kk.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE keyboard SYSTEM 'VirtualKeyboardLayout.dtd'>
 <keyboard title="Қазақ" version="1.0" catalog="virtual-keyboard" language="kk">
   <layout type="general">
-    <section id="main">
+    <section id="main" style="ar">
       <row>
         <key>
           <binding label="й"/>
@@ -48,123 +48,129 @@
           <binding label="х" extended_labels="һ"/>
           <binding shift="true" label="Х" extended_labels="Һ"/>
         </key>
+        <key style="special">
+          <binding action="backspace"/>
+        </key>
       </row>
 
       <row>
-        <key>
+        <spacer/>
+        <key width="small">
           <binding label="ф"/>
           <binding shift="true" label="Ф"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="ы" extended_labels="і"/>
           <binding shift="true" label="Ы" extended_labels="І"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="в"/>
           <binding shift="true" label="В"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="а" extended_labels="ә"/>
           <binding shift="true" label="А" extended_labels="Ә"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="п"/>
           <binding shift="true" label="П"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="р"/>
           <binding shift="true" label="Р"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="о" extended_labels="ө"/>
           <binding shift="true" label="О" extended_labels="Ө"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="л"/>
           <binding shift="true" label="Л"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="д"/>
           <binding shift="true" label="Д"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="ж"/>
           <binding shift="true" label="Ж"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="э"/>
           <binding shift="true" label="Э"/>
         </key>
+        <key style="special" width="x-large" id="actionKey">
+          <binding action="return"/>
+        </key>
+        <spacer/>
       </row>
 
       <row>
         <key style="special">
           <binding action="shift" label=""/>
         </key>
-
-        <key>
+        <key width="small">
           <binding label="я"/>
           <binding shift="true" label="Я"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="ч"/>
           <binding shift="true" label="Ч"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="с"/>
           <binding shift="true" label="С"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="м"/>
           <binding shift="true" label="М"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="и"/>
           <binding shift="true" label="И"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="т"/>
           <binding shift="true" label="Т"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="ь"/>
           <binding shift="true" label="Ь"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="б"/>
           <binding shift="true" label="Б"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="ю"/>
           <binding shift="true" label="Ю"/>
         </key>
-
+        <key width="small" id="emailUrlKey"><binding label=","/></key>
+        <key width="small"><binding label="."/></key>
         <key style="special">
-          <binding action="backspace"/>
+          <binding action="shift" label=""/>
         </key>
       </row>
 
       <row>
-        <key style="special" width="large">
+        <key style="special" width="x-large">
           <binding action="sym" label="?123"/>
         </key>
-
+        <key style="special">
+          <binding action="right-layout"/>
+        </key>
         <key><binding label="-"/></key>
-        <key id="emailUrlKey"><binding label=","/></key>
-
-        <key width="stretched">
+        <key width="xx-large">
           <binding action="space" label=""/>
         </key>
-
-        <key><binding label="."/></key>
         <key>
           <binding label="ъ"/>
           <binding shift="true" label="Ъ"/>
         </key>
-
-        <key style="special" width="xx-large" id="actionKey">
-          <binding action="return"/>
+        <key style="special" width="x-large">
+          <binding action="sym" label="?123"/>
         </key>
+        <key style="special"><binding action="close"/></key>
       </row>
     </section>
   </layout>
diff --git a/maliit-keyboard/data/languages/lt.xml b/maliit-keyboard/data/languages/lt.xml
index 746a46e..fa75a1a 100644
--- a/maliit-keyboard/data/languages/lt.xml
+++ b/maliit-keyboard/data/languages/lt.xml
@@ -44,11 +44,13 @@
           <binding label="p"/>
           <binding shift="true" label="P"/>
         </key>
+        <key style="special">
+          <binding action="backspace"/>
+        </key>
       </row>
 
       <row>
         <spacer/>
-
         <key>
           <binding label="a" extended_labels="ą"/>
           <binding shift="true" label="A" extended_labels="Ą"/>
@@ -85,17 +87,17 @@
           <binding label="l"/>
           <binding shift="true" label="L"/>
         </key>
-
+        <key style="special" width="large" id="actionKey">
+          <binding action="return"/>
+        </key>
         <spacer/>
       </row>
 
       <row>
-        <key style="special" width="large">
+        <key style="special">
           <binding action="shift"/>
         </key>
 
-        <spacer/>
-
         <key>
           <binding label="z" extended_labels="ž"/>
           <binding shift="true" label="Z" extended_labels="Ž"/>
@@ -124,30 +126,25 @@
           <binding label="m"/>
           <binding shift="true" label="M"/>
         </key>
-
-        <spacer/>
-
-        <key style="special" width="large">
-          <binding action="backspace"/>
+        <key id="emailUrlKey"><binding label=","/></key>
+        <key><binding label="."/></key>
+        <key style="special">
+          <binding action="shift"/>
         </key>
       </row>
 
       <row>
-        <key style="special" width="x-large">
+        <key style="special" width="large">
           <binding action="sym" label="?123"/>
         </key>
-
-        <spacer/>
-
-        <key id="emailUrlKey"><binding label=","/></key>
-        <key width="xx-large"><binding action="space"/></key>
-        <key><binding label="."/></key>
-
-        <spacer/>
-
-        <key style="special" width="x-large" id="actionKey">
-          <binding action="return"/>
+        <key style="special">
+          <binding action="right-layout"/>
+        </key>
+        <key width="stretched"><binding action="space"/></key>
+        <key style="special" width="large">
+          <binding action="sym" label="?123"/>
         </key>
+        <key style="special"><binding action="close"/></key>
       </row>
     </section>
   </layout>
diff --git a/maliit-keyboard/data/languages/mk_mk.xml b/maliit-keyboard/data/languages/mk_mk.xml
index b232ea3..60d376d 100644
--- a/maliit-keyboard/data/languages/mk_mk.xml
+++ b/maliit-keyboard/data/languages/mk_mk.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE keyboard SYSTEM 'VirtualKeyboardLayout.dtd'>
 <keyboard title="Македонски (Macedonian)" version="1.0" autocapitalization="false" catalog="mk_mk" language="mk_mk">
   <layout type="general">
-    <section id="main">
+    <section id="main" style="ar">
       <row>
         <key>
           <binding label="љ"/>
@@ -23,8 +23,8 @@
         <key>
           <binding label="т"/>
           <binding shift="true" label="Т"/>
-        </key>        
-	<key>
+        </key>
+        <key>
           <binding label="ѕ"/>
           <binding shift="true" label="Ѕ"/>
         </key>
@@ -48,245 +48,127 @@
           <binding label="ш"/>
           <binding shift="true" label="Ш"/>
         </key>
+        <key style="special" width="large">
+          <binding action="backspace"/>
+        </key>
       </row>
+
       <row>
-        <key>
+        <spacer/>
+        <key width="small">
           <binding label="а"/>
           <binding shift="true" label="А"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="с" extended_labels="$"/>
           <binding shift="true" label="С" extended_labels="$"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="д"/>
           <binding shift="true" label="Д"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="ф"/>
           <binding shift="true" label="Ф"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="г"/>
           <binding shift="true" label="Г"/>
-        </key>        
-	<key>
+        </key>
+        <key width="small">
           <binding label="х"/>
           <binding shift="true" label="Х"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="ј"/>
           <binding shift="true" label="Ј"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="к"/>
           <binding shift="true" label="К"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="л"/>
           <binding shift="true" label="Л"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="ч"/>
           <binding shift="true" label="Ч"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="ќ"/>
           <binding shift="true" label="Ќ"/>
         </key>
+        <key style="special" width="x-large" id="actionKey">
+          <binding action="return"/>
+        </key>
+        <spacer/>
       </row>
+
       <row>
-        <key style="special" width="x-large">
+        <key style="special" width="large">
           <binding action="shift"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="з"/>
           <binding shift="true" label="З"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="џ"/>
           <binding shift="true" label="Џ"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="ц"/>
           <binding shift="true" label="Ц"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="в"/>
           <binding shift="true" label="В"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="б"/>
           <binding shift="true" label="Б"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="н"/>
           <binding shift="true" label="Н"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="м"/>
           <binding shift="true" label="М"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="ѓ"/>
           <binding shift="true" label="Ѓ"/>
         </key>
-        <key style="special" width="x-large">
-          <binding action="backspace"/>
-        </key>
-      </row>
-      <row>
-        <key style="special" width="x-large">
-          <binding action="sym" label="+!="/>
-        </key>
-        <key>
-          <binding label=","/>
-         </key>
-        <key>
-          <binding label="."/>
-        </key>
-        <key style="special" width="stretched">
-          <binding action="space"/>
-        </key>
-        <key>
-          <binding label="@"/>
-        </key>
-        <key>
+        <key width="small">
           <binding label="ж"/>
           <binding shift="true" label="Ж"/>
         </key>
-        <key style="special" width="x-large" id="actionKey">
-          <binding action="return"/>
-        </key>
-      </row>
-    </section>
-    <section id="symbols0" type="non-sloppy">
-      <row>
-        <key>
-          <binding label="1"/>
-       </key>
-        <key>
-          <binding label="2"/>
-        </key>
-        <key>
-          <binding label="3"/>
-        </key>
-        <key>
-          <binding label="4"/>
-        </key>
-        <key>
-          <binding label="5"/>
-        </key>
-        <key>
-          <binding label="6"/>
-        </key>
-        <key>
-          <binding label="7"/>
-        </key>
-        <key>
-          <binding label="8"/>
-        </key>
-        <key>
-          <binding label="9"/>
-        </key>
-        <key>
-          <binding label="0"/>
-        </key>
-        <key>
-          <binding label="'"/>
-        </key>
-      </row>
-      <row>
-        <key>
-          <binding label="+"/>
-        </key>
-        <key>
-          <binding label="\"/>
-        </key>
-        <key>
-          <binding label="/"/>
-        </key>
-        <key>
-          <binding label="%"/>
-        </key>
-        <key>
-          <binding label="#"/>
-        </key>
-        <key>
-          <binding label="?"/>
-        </key>
-        <key>
-          <binding label="!"/>
-        </key>
-        <key>
-          <binding label="|"/>
-        </key>
-        <key>
-          <binding label="&#x0022;"/>
-        </key>
-        <key>
-          <binding label="&#x0027;"/>
-        </key>
-        <key>
-          <binding label="@"/>
-        </key>
-      </row>
-      <row>
-        <key style="special" width="x-large">
+        <key width="small" id="emailUrlKey"><binding label=","/></key>
+        <key width="small"><binding label="."/></key>
+        <key style="special" width="large">
           <binding action="shift"/>
         </key>
-        <key>
-          <binding label=","/>
-        </key>
-        <key>
-          <binding label="."/>
-        </key>
-        <key>
-          <binding label="("/>
-        </key>
-        <key>
-          <binding label=")"/>
-        </key>
-        <key>
-          <binding label="€"/>
-        </key>
-        <key>
-          <binding label="£"/>
-        </key>
-        <key>
-          <binding label="$"/>
-        </key>
-        <key>
-          <binding label="₹"/>
-        </key>
-        <key style="special" width="x-large">
-          <binding action="backspace"/>
-        </key>
       </row>
+
       <row>
-        <key style="special" width="x-large">
-          <binding action="sym" label="љ"/>
+        <key style="special">
+          <binding action="sym" label="?123"/>
         </key>
-        <key>
-          <binding label="="/>
-         </key>
-        <key>
-          <binding label="+"/>
+        <key style="special">
+          <binding action="right-layout"/>
         </key>
-        <key style="special" width="stretched">
-          <binding action="space"/>
-        </key>
-        <key>
-          <binding label="-"/>
-        </key>
-        <key>
-          <binding label="*"/>
-        </key>
-        <key style="special" width="x-large" id="actionKey">
-          <binding action="return"/>
+        <key><binding label=";"/></key>
+        <key width="stretched"><binding action="space"/></key>
+        <key><binding label=":"/></key>
+        <key style="special">
+          <binding action="sym" label="?123"/>
         </key>
+        <key style="special"><binding action="close"/></key>
       </row>
     </section>
   </layout>
 
+  <import file="symbols_ru_uk.xml"/>
 </keyboard>
diff --git a/maliit-keyboard/data/languages/ms.xml b/maliit-keyboard/data/languages/ms.xml
index 6d4c514..c82a95a 100644
--- a/maliit-keyboard/data/languages/ms.xml
+++ b/maliit-keyboard/data/languages/ms.xml
@@ -44,11 +44,13 @@
           <binding label="p"/>
           <binding shift="true" label="P"/>
         </key>
+        <key style="special">
+          <binding action="backspace"/>
+        </key>
       </row>
 
       <row>
         <spacer/>
-
         <key>
           <binding label="a" extended_labels="àâæáãä"/>
           <binding shift="true" label="A" extended_labels="ÀÂÆÁÃÄ"/>
@@ -85,17 +87,16 @@
           <binding label="l"/>
           <binding shift="true" label="L"/>
         </key>
-
+        <key style="special" width="large" id="actionKey">
+          <binding action="return"/>
+        </key>
         <spacer/>
       </row>
 
       <row>
-        <key style="special" width="large">
+        <key style="special">
           <binding action="shift"/>
         </key>
-
-        <spacer/>
-
         <key>
           <binding label="z"/>
           <binding shift="true" label="Z"/>
@@ -124,30 +125,25 @@
           <binding label="m"/>
           <binding shift="true" label="M"/>
         </key>
-
-        <spacer/>
-
-        <key style="special" width="large">
-          <binding action="backspace"/>
+        <key id="emailUrlKey"><binding label=","/></key>
+        <key><binding label="."/></key>
+        <key style="special">
+          <binding action="shift"/>
         </key>
       </row>
 
       <row>
-        <key style="special" width="x-large">
+        <key style="special" width="large">
           <binding action="sym" label="?123"/>
         </key>
-
-        <spacer/>
-
-        <key id="emailUrlKey"><binding label=","/></key>
-        <key width="xx-large"><binding action="space"/></key>
-        <key><binding label="."/></key>
-
-        <spacer/>
-
-        <key style="special" width="x-large" id="actionKey">
-          <binding action="return"/>
+        <key style="special">
+          <binding action="right-layout"/>
+        </key>
+        <key width="stretched"><binding action="space"/></key>
+        <key style="special" width="large">
+          <binding action="sym" label="?123"/>
         </key>
+        <key style="special"><binding action="close"/></key>
       </row>
     </section>
   </layout>
diff --git a/maliit-keyboard/data/languages/nl.xml b/maliit-keyboard/data/languages/nl.xml
index 25ef262..16a4f0b 100644
--- a/maliit-keyboard/data/languages/nl.xml
+++ b/maliit-keyboard/data/languages/nl.xml
@@ -44,6 +44,9 @@
           <binding label="p"/>
           <binding shift="true" label="P"/>
         </key>
+        <key style="special">
+          <binding action="backspace"/>
+        </key>
       </row>
 
       <row>
@@ -84,14 +87,16 @@
           <binding label="l"/>
           <binding shift="true" label="L"/>
         </key>
+        <key style="special" width="large" id="actionKey">
+          <binding action="return"/>
+        </key>
         <spacer/>
       </row>
 
       <row>
-        <key style="special" width="large">
+        <key style="special">
           <binding action="shift"/>
         </key>
-        <spacer/>
         <key>
           <binding label="z"/>
           <binding shift="true" label="Z"/>
@@ -120,28 +125,25 @@
           <binding label="m"/>
           <binding shift="true" label="M"/>
         </key>
-        <spacer/>
-        <key style="special" width="large">
-          <binding action="backspace"/>
+        <key id="emailUrlKey"><binding label=","/></key>
+        <key><binding label="."/></key>
+        <key style="special">
+          <binding action="shift"/>
         </key>
       </row>
 
       <row>
-        <key style="special" width="x-large">
+        <key style="special" width="large">
           <binding action="sym" label="?123"/>
         </key>
-
-        <spacer/>
-
-        <key id="emailUrlKey"><binding label=","/></key>
-        <key width="xx-large"><binding action="space"/></key>
-        <key><binding label="."/></key>
-
-        <spacer/>
-
-        <key style="special" width="x-large" id="actionKey">
-          <binding action="return"/>
+        <key style="special">
+          <binding action="right-layout"/>
+        </key>
+        <key width="stretched"><binding action="space"/></key>
+        <key style="special" width="large">
+          <binding action="sym" label="?123"/>
         </key>
+        <key style="special"><binding action="close"/></key>
       </row>
     </section>
   </layout>
diff --git a/maliit-keyboard/data/languages/no.xml b/maliit-keyboard/data/languages/no.xml
index 1fe2cf7..af0343a 100644
--- a/maliit-keyboard/data/languages/no.xml
+++ b/maliit-keyboard/data/languages/no.xml
@@ -44,114 +44,120 @@
           <binding label="p"/>
           <binding shift="true" label="P"/>
         </key>
+        <key style="special">
+          <binding action="backspace" label=""/>
+        </key>
       </row>
 
       <row>
-        <key>
+        <spacer/>
+        <key width="small">
           <binding label="a" extended_labels="åæäàáâã"/>
           <binding shift="true" label="A" extended_labels="ÅÆÄÀÁÂÃ"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="s" extended_labels="ß$"/>
           <binding shift="true" label="S" extended_labels="ß$"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="d" extended_labels="ð"/>
           <binding shift="true" label="D" extended_labels="Ð"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="f"/>
           <binding shift="true" label="F"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="g"/>
           <binding shift="true" label="G"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="h"/>
           <binding shift="true" label="H"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="j"/>
           <binding shift="true" label="J"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="k"/>
           <binding shift="true" label="K"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="l"/>
           <binding shift="true" label="L"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="å"/>
           <binding shift="true" label="Å"/>
         </key>
+        <key style="special" width="large" id="actionKey">
+          <binding action="return" label=""/>
+        </key>
+        <spacer/>
       </row>
 
       <row>
         <key style="special">
           <binding action="shift" label=""/>
         </key>
-
-        <key>
+        <key width="small">
           <binding label="z"/>
           <binding shift="true" label="Z"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="x"/>
           <binding shift="true" label="X"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="c" extended_labels="ç"/>
           <binding shift="true" label="C" extended_labels="Ç"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="v"/>
           <binding shift="true" label="V"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="b"/>
           <binding shift="true" label="B"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="n" extended_labels="ñ"/>
           <binding shift="true" label="N" extended_labels="Ñ"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="m"/>
           <binding shift="true" label="M"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="æ" extended_labels="ä"/>
           <binding shift="true" label="Æ" extended_labels="Ä"/>
         </key>
-
+        <key width="small" id="emailUrlKey"><binding label=","/></key>
+        <key width="small"><binding label="."/></key>
         <key style="special">
-          <binding action="backspace" label=""/>
+          <binding action="shift" label=""/>
         </key>
       </row>
 
       <row>
-        <key style="special" width="large">
+        <key style="special">
           <binding action="sym" label="?123"/>
         </key>
-
-        <key id="emailUrlKey"><binding label=","/></key>
-        <key><binding label="."/></key>
-
-        <key width="xx-large">
+        <key style="special">
+          <binding action="right-layout"/>
+        </key>
+        <key width="stretched">
           <binding action="space" label=""/>
         </key>
-
         <key>
           <binding label="ø" extended_labels="ö"/>
           <binding shift="true" label="Ø" extended_labels="Ö"/>
         </key>
-
-        <key style="special" width="x-large" id="actionKey">
-          <binding action="return" label=""/>
+        <key style="special">
+          <binding action="sym" label="?123"/>
         </key>
+        <key style="special"><binding action="close"/></key>
       </row>
 
     </section>
diff --git a/maliit-keyboard/data/languages/pl.xml b/maliit-keyboard/data/languages/pl.xml
index 946b333..62a79de 100644
--- a/maliit-keyboard/data/languages/pl.xml
+++ b/maliit-keyboard/data/languages/pl.xml
@@ -5,7 +5,7 @@
     <symview src="symbols-38.xml"/>
   </import>
   <layout type="general">
-    <section id="main">
+    <section id="main" style="ar">
       <row>
         <key>
           <binding label="q"/>
@@ -47,65 +47,71 @@
           <binding label="p"/>
           <binding shift="true" label="P"/>
         </key>
-        <key>
+        <key width="large">
           <binding label="ż"/>
           <binding shift="true" label="Ż"/>
         </key>
+        <key style="special" width="large">
+          <binding action="backspace"/>
+        </key>
       </row>
 
       <row>
-        <key>
+        <spacer/>
+        <key width="small">
           <binding label="a" extended_labels="ąäáâă"/>
           <binding shift="true" label="A" extended_labels="ĄÄÁÂĂ"/>
         </key>
-        <key>
+        <key width="small">
           <binding accented_labels="ś" accents="´" label="s" extended_labels="śßşš$"/>
           <binding shift="true" accented_labels="Ś" accents="´" label="S" extended_labels="ŚŞŠ$"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="d" extended_labels="ďđ"/>
           <binding shift="true" label="D" extended_labels="ĎĐ"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="f"/>
           <binding shift="true" label="F"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="g"/>
           <binding shift="true" label="G"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="h"/>
           <binding shift="true" label="H"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="j"/>
           <binding shift="true" label="J"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="k"/>
           <binding shift="true" label="K"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="l" extended_labels="łľĺ"/>
           <binding shift="true" label="L" extended_labels="ŁĽĹ"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="ł"/>
           <binding shift="true" label="Ł"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="ą"/>
           <binding shift="true" label="Ą"/>
         </key>
-
+        <key style="special" width="x-large" id="actionKey">
+          <binding action="return"/>
+        </key>
+        <spacer/>
       </row>
 
       <row>
         <key style="special" width="large">
           <binding action="shift"/>
         </key>
-
         <key>
           <binding accented_labels="ź" accents="´" label="z" extended_labels="żźž"/>
           <binding shift="true" accented_labels="Ź" accents="´" label="Z" extended_labels="ŻŹŽ"/>
@@ -138,9 +144,10 @@
           <binding label="ę"/>
           <binding shift="true" label="Ę"/>
         </key>
-
+        <key id="emailUrlKey"><binding label=","/></key>
+        <key><binding label="."/></key>
         <key style="special" width="large">
-          <binding action="backspace"/>
+          <binding action="shift"/>
         </key>
       </row>
 
@@ -148,18 +155,17 @@
         <key style="special" width="x-large">
           <binding action="sym" label="?123"/>
         </key>
-
-        <key style="special">
+        <key style="special" width="small">
+          <binding action="right-layout"/>
+        </key>
+        <key style="special" width="small">
           <binding dead="true" label="´"/>
         </key>
-        <key id="emailUrlKey"><binding label=","/></key>
         <key width="stretched"><binding action="space"/></key>
-
-        <key><binding label="."/></key>
-
-        <key style="special" width="xx-large" id="actionKey">
-          <binding action="return"/>
+        <key style="special" width="x-large">
+          <binding action="sym" label="?123"/>
         </key>
+        <key style="special" width="small"><binding action="close"/></key>
       </row>
     </section>
   </layout>
diff --git a/maliit-keyboard/data/languages/pt.xml b/maliit-keyboard/data/languages/pt.xml
index 3356b51..2a29def 100644
--- a/maliit-keyboard/data/languages/pt.xml
+++ b/maliit-keyboard/data/languages/pt.xml
@@ -44,56 +44,63 @@
           <binding label="p"/>
           <binding shift="true" label="P"/>
         </key>
+        <key style="special">
+          <binding action="backspace"/>
+        </key>
       </row>
 
       <row>
-        <key>
+        <spacer/>
+        <key width="small">
           <binding accented_labels="àáâã" accents="`´^~" label="a" extended_labels="ãáàâªäæ"/>
           <binding shift="true" accented_labels="ÀÁÂÃ" accents="`´^~" label="A" extended_labels="ÃÁÀªÄÆ"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="s" extended_labels="ß$"/>
           <binding shift="true" label="S" extended_labels="$"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="d"/>
           <binding shift="true" label="D"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="f"/>
           <binding shift="true" label="F"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="g"/>
           <binding shift="true" label="G"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="h"/>
           <binding shift="true" label="H"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="j"/>
           <binding shift="true" label="J"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="k"/>
           <binding shift="true" label="K"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="l"/>
           <binding shift="true" label="L"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="ç"/>
           <binding shift="true" label="Ç"/>
         </key>
+        <key style="special" width="large" id="actionKey">
+          <binding action="return"/>
+        </key>
+        <spacer/>
       </row>
 
       <row>
-        <key style="special" width="x-large">
+        <key style="special">
           <binding action="shift" label=""/>
         </key>
-
         <key>
           <binding label="z"/>
           <binding shift="true" label="Z"/>
@@ -122,27 +129,26 @@
           <binding label="m"/>
           <binding shift="true" label="M"/>
         </key>
-
-        <key style="special" width="x-large">
-          <binding action="backspace"/>
+        <key id="emailUrlKey"><binding label=","/></key>
+        <key><binding label="."/></key>
+        <key style="special">
+          <binding action="shift" label=""/>
         </key>
       </row>
 
       <row>
-        <key style="special" width="x-large">
+        <key style="special">
           <binding action="sym" label="?123"/>
         </key>
-
+        <key style="special">
+          <binding action="right-layout"/>
+        </key>
         <key><binding label="-"/></key>
-        <key id="emailUrlKey"><binding label=","/></key>
-
         <key width="stretched"><binding action="space" label=""/></key>
-
-        <key><binding label="."/></key>
-
-        <key style="special" width="xx-large" id="actionKey">
-          <binding action="return"/>
+        <key style="special">
+          <binding action="sym" label="?123"/>
         </key>
+        <key style="special"><binding action="close"/></key>
       </row>
     </section>
   </layout>
diff --git a/maliit-keyboard/data/languages/ro.xml b/maliit-keyboard/data/languages/ro.xml
index 44d18e5..dc2381d 100644
--- a/maliit-keyboard/data/languages/ro.xml
+++ b/maliit-keyboard/data/languages/ro.xml
@@ -44,54 +44,60 @@
           <binding label="p"/>
           <binding shift="true" label="P"/>
         </key>
+        <key style="special">
+          <binding action="backspace"/>
+        </key>
       </row>
 
       <row>
-        <key>
+        <spacer/>
+        <key width="small">
           <binding label="a" extended_labels="ăâäáą"/>
           <binding shift="true" label="A" extended_labels="ĂÂÄÁĄ"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="s" extended_labels="şßśš$"/>
           <binding shift="true" label="S" extended_labels="ŞŚŠ$"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="d" extended_labels="ďđ"/>
           <binding shift="true" label="D" extended_labels="ĎĐ"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="f"/>
           <binding shift="true" label="F"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="g"/>
           <binding shift="true" label="G"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="h"/>
           <binding shift="true" label="H"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="j"/>
           <binding shift="true" label="J"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="k"/>
           <binding shift="true" label="K"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="l" extended_labels="ĺľł"/>
           <binding shift="true" label="L" extended_labels="ĹĽŁ"/>
         </key>
-        
-        <key><binding label="&#x0027;"/></key>
+        <key width="small"><binding label="&#x0027;"/></key>
+        <key style="special" width="large" id="actionKey">
+          <binding action="return"/>
+        </key>
+        <spacer/>
       </row>
 
       <row>
-        <key style="special" width="x-large">
+        <key style="special">
           <binding action="shift"/>
         </key>
-
         <key>
           <binding label="z" extended_labels="źžż"/>
           <binding shift="true" label="Z" extended_labels="ŹŽŻ"/>
@@ -120,27 +126,26 @@
           <binding label="m"/>
           <binding shift="true" label="M"/>
         </key>
-
-        <key style="special" width="x-large">
-          <binding action="backspace"/>
+        <key id="emailUrlKey"><binding label=","/></key>
+        <key><binding label="."/></key>
+        <key style="special">
+          <binding action="shift"/>
         </key>
       </row>
 
       <row>
-        <key style="special" width="x-large">
+        <key style="special">
           <binding action="sym" label="?123"/>
         </key>
-
+        <key style="special">
+          <binding action="right-layout"/>
+        </key>
         <key><binding label="-"/></key>
-        <key id="emailUrlKey"><binding label=","/></key>
-
         <key width="stretched"><binding action="space"/></key>
-
-        <key><binding label="."/></key>
-
-        <key style="special" width="xx-large" id="actionKey">
-          <binding action="return"/>
+        <key style="special">
+          <binding action="sym" label="?123"/>
         </key>
+        <key style="special"><binding action="close"/></key>
       </row>
     </section>
   </layout>
diff --git a/maliit-keyboard/data/languages/ru.xml b/maliit-keyboard/data/languages/ru.xml
index 2d75f51..33df9a4 100644
--- a/maliit-keyboard/data/languages/ru.xml
+++ b/maliit-keyboard/data/languages/ru.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE keyboard SYSTEM 'VirtualKeyboardLayout.dtd'>
 <keyboard title="Русский" version="1.0" catalog="ru" language="ru">
   <layout type="general">
-    <section id="main">
+    <section id="main" style="ar">
       <row>
         <key>
           <binding label="й"/>
@@ -48,60 +48,67 @@
           <binding label="х"/>
           <binding shift="true" label="Х"/>
         </key>
+        <key style="special" width="large">
+          <binding action="backspace"/>
+        </key>
       </row>
 
       <row>
-        <key>
+        <spacer/>
+        <key width="small">
           <binding label="ф"/>
           <binding shift="true" label="Ф"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="ы"/>
           <binding shift="true" label="Ы"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="в"/>
           <binding shift="true" label="В"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="а"/>
           <binding shift="true" label="А"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="п"/>
           <binding shift="true" label="П"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="р"/>
           <binding shift="true" label="Р"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="о"/>
           <binding shift="true" label="О"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="л"/>
           <binding shift="true" label="Л"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="д"/>
           <binding shift="true" label="Д"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="ж"/>
           <binding shift="true" label="Ж"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="э"/>
           <binding shift="true" label="Э"/>
         </key>
+        <key style="special" width="x-large" id="actionKey">
+          <binding action="return"/>
+        </key>
+        <spacer/>
       </row>
 
       <row>
-        <key style="special">
+        <key style="special" width="large">
           <binding action="shift" label=""/>
         </key>
-
         <key>
           <binding label="я"/>
           <binding shift="true" label="Я"/>
@@ -138,33 +145,32 @@
           <binding label="ю"/>
           <binding shift="true" label="Ю"/>
         </key>
-
-        <key style="special">
-          <binding action="backspace"/>
+        <key id="emailUrlKey"><binding label=","/></key>
+        <key><binding label="."/></key>
+        <key style="special" width="large">
+          <binding action="shift" label=""/>
         </key>
       </row>
 
       <row>
-        <key style="special" width="large">
+        <key style="special">
           <binding action="sym" label="?123"/>
         </key>
-
+        <key style="special">
+          <binding action="right-layout"/>
+        </key>
         <key><binding label="-"/></key>
-        <key id="emailUrlKey"><binding label=","/></key>
-
-        <key width="xx-large">
+        <key width="stretched">
           <binding action="space" label=""/>
         </key>
-
-        <key><binding label="."/></key>
         <key>
           <binding label="ъ"/>
           <binding shift="true" label="Ъ"/>
         </key>
-
-        <key style="special" width="x-large" id="actionKey">
-          <binding action="return"/>
+        <key style="special">
+          <binding action="sym" label="?123"/>
         </key>
+        <key style="special"><binding action="close"/></key>
       </row>
     </section>
   </layout>
diff --git a/maliit-keyboard/data/languages/sk.xml b/maliit-keyboard/data/languages/sk.xml
index d1fdaa4..9fafeb2 100644
--- a/maliit-keyboard/data/languages/sk.xml
+++ b/maliit-keyboard/data/languages/sk.xml
@@ -44,91 +44,99 @@
           <binding label="p"/>
           <binding shift="true" label="P"/>
         </key>
+        <key style="special">
+          <binding action="backspace"/>
+        </key>
       </row>
 
       <row>
-        <key>
+        <spacer/>
+        <key width="small">
           <binding accented_labels="á" accents="´" label="a" extended_labels="áäăâą"/>
           <binding shift="true" accented_labels="Á" accents="´" label="A" extended_labels="ÁÄĂÂĄ"/>
         </key>
-        <key>
+        <key width="small">
           <binding accented_labels="š" accents="ˇ" label="s" extended_labels="šßśş$"/>
           <binding shift="true" accented_labels="Š" accents="ˇ" label="S" extended_labels="ŠŚŞ$"/>
         </key>
-        <key>
+        <key width="small">
           <binding accented_labels="ď" accents="ˇ" label="d" extended_labels="ďđ"/>
           <binding shift="true" accented_labels="Ď" accents="ˇ" label="D" extended_labels="ĎĐ"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="f"/>
           <binding shift="true" label="F"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="g"/>
           <binding shift="true" label="G"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="h"/>
           <binding shift="true" label="H"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="j"/>
           <binding shift="true" label="J"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="k"/>
           <binding shift="true" label="K"/>
         </key>
-        <key>
+        <key width="small">
           <binding accented_labels="ĺľ" accents="´ˇ" label="l" extended_labels="ľĺł"/>
           <binding shift="true" accented_labels="ĹĽ" accents="´ˇ" label="L" extended_labels="ĽĹŁ"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="ä"/>
           <binding shift="true" label="Ä"/>
         </key>
+        <key style="special" width="large" id="actionKey">
+          <binding action="return"/>
+        </key>
+        <spacer/>
       </row>
 
       <row>
         <key style="special">
           <binding action="shift" label=""/>
         </key>
-
-        <key>
+        <key width="small">
           <binding accented_labels="ý" accents="´" label="y" extended_labels="ý¥"/>
           <binding shift="true" accented_labels="Ý" accents="´" label="Y" extended_labels="Ý¥"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="x"/>
           <binding shift="true" label="X"/>
         </key>
-        <key>
+        <key width="small">
           <binding accented_labels="č" accents="ˇ" label="c" extended_labels="čćç"/>
           <binding shift="true" accented_labels="Č" accents="ˇ" label="C" extended_labels="ČĆÇ"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="v"/>
           <binding shift="true" label="V"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="b"/>
           <binding shift="true" label="B"/>
         </key>
-        <key>
+        <key width="small">
           <binding accented_labels="ň" accents="ˇ" label="n" extended_labels="ňńñ"/>
           <binding shift="true" accented_labels="Ň" accents="ˇ" label="N" extended_labels="ŇŃÑ"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="m"/>
           <binding shift="true" label="M"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="ô"/>
           <binding shift="true" label="Ô"/>
         </key>
-
+        <key width="small" id="emailUrlKey"><binding label=","/></key>
+        <key width="small"><binding label="."/></key>
         <key style="special">
-          <binding action="backspace"/>
+          <binding action="shift" label=""/>
         </key>
       </row>
 
@@ -136,20 +144,18 @@
         <key style="special" width="large">
           <binding action="sym" label="?123"/>
         </key>
-
+        <key style="special">
+          <binding action="right-layout"/>
+        </key>
         <key style="special"><binding dead="true" label="´"/></key>
-        <key id="emailUrlKey"><binding label=","/></key>
-
         <key width="xx-large">
           <binding action="space" label=""/>
         </key>
-
-        <key><binding label="."/></key>
         <key style="special"><binding dead="true" label="ˇ"/></key>
-
-        <key style="special" width="x-large" id="actionKey">
-          <binding action="return"/>
+        <key style="special" width="large">
+          <binding action="sym" label="?123"/>
         </key>
+        <key style="special"><binding action="close"/></key>
       </row>
     </section>
   </layout>
diff --git a/maliit-keyboard/data/languages/sv.xml b/maliit-keyboard/data/languages/sv.xml
index 8753d1c..2cc0700 100644
--- a/maliit-keyboard/data/languages/sv.xml
+++ b/maliit-keyboard/data/languages/sv.xml
@@ -44,114 +44,120 @@
         <binding label="p"/>
         <binding shift="true" label="P"/>
       </key>
+      <key style="special">
+        <binding action="backspace" label=""/>
+      </key>
       </row>
 
       <row>
-      <key>
+      <spacer/>
+      <key width="small">
         <binding label="a" extended_labels="æåäàáâã"/>
         <binding shift="true" label="A" extended_labels="ÆÅÄÀÁÂÃ"/>
       </key>
-      <key>
+      <key width="small">
         <binding label="s" extended_labels="ß$"/>
         <binding shift="true" label="S" extended_labels="ß$"/>
       </key>
-      <key>
+      <key width="small">
         <binding label="d" extended_labels="ð"/>
         <binding shift="true" label="D" extended_labels="Ð"/>
       </key>
-      <key>
+      <key width="small">
         <binding label="f"/>
         <binding shift="true" label="F"/>
       </key>
-      <key>
+      <key width="small">
         <binding label="g"/>
         <binding shift="true" label="G"/>
       </key>
-      <key>
+      <key width="small">
         <binding label="h"/>
         <binding shift="true" label="H"/>
       </key>
-      <key>
+      <key width="small">
         <binding label="j"/>
         <binding shift="true" label="J"/>
       </key>
-      <key>
+      <key width="small">
         <binding label="k"/>
         <binding shift="true" label="K"/>
       </key>
-      <key>
+      <key width="small">
         <binding label="l"/>
         <binding shift="true" label="L"/>
       </key>
-      <key>
+      <key width="small">
         <binding label="å" />
         <binding shift="true" label="Å" />
       </key>
+      <key style="special" width="large" id="actionKey">
+        <binding action="return" label=""/>
+      </key>
+      <spacer/>
       </row>
 
       <row>
       <key style="special">
         <binding action="shift" label=""/>
       </key>
-
-      <key>
+      <key width="small">
         <binding label="z"/>
         <binding shift="true" label="Z"/>
       </key>
-      <key>
+      <key width="small">
         <binding label="x"/>
         <binding shift="true" label="X"/>
       </key>
-      <key>
+      <key width="small">
         <binding label="c" extended_labels="ç"/>
         <binding shift="true" label="C" extended_labels="Ç"/>
       </key>
-      <key>
+      <key width="small">
         <binding label="v"/>
         <binding shift="true" label="V"/>
       </key>
-      <key>
+      <key width="small">
         <binding label="b"/>
         <binding shift="true" label="B"/>
       </key>
-      <key>
+      <key width="small">
         <binding label="n" extended_labels="ñ"/>
         <binding shift="true" label="N" extended_labels="Ñ"/>
       </key>
-      <key>
+      <key width="small">
         <binding label="m"/>
         <binding shift="true" label="M"/>
       </key>
-      <key>
+      <key width="small">
         <binding label="ä" extended_labels="æ"/>
         <binding shift="true" label="Ä" extended_labels="Æ"/>
       </key>
-
+      <key width="small" id="emailUrlKey"><binding label=","/></key>
+      <key width="small"><binding label="."/></key>
       <key style="special">
-        <binding action="backspace" label=""/>
+        <binding action="shift" label=""/>
       </key>
       </row>
 
       <row>
-      <key style="special" width="large">
+      <key style="special">
         <binding action="sym" label="?123"/>
       </key>
-
-      <key id="emailUrlKey"><binding label=","/></key>
-      <key><binding label="."/></key>
-
-      <key width="xx-large">
+      <key style="special">
+        <binding action="right-layout"/>
+      </key>
+      <key width="stretched">
         <binding action="space" label=""/>
       </key>
-
       <key>
         <binding label="ö" extended_labels="ø"/>
         <binding shift="true" label="Ö" extended_labels="Ø"/>
       </key>
-
-      <key style="special" width="x-large" id="actionKey">
-        <binding action="return" label=""/>
+      <key style="special">
+        <binding action="sym" label="?123"/>
       </key>
+      <key style="special"><binding action="close"/></key>
     </row>
     </section>
   </layout>
diff --git a/maliit-keyboard/data/languages/symbols-35-fi.xml b/maliit-keyboard/data/languages/symbols-35-fi.xml
index 51d1421..fae2b28 100644
--- a/maliit-keyboard/data/languages/symbols-35-fi.xml
+++ b/maliit-keyboard/data/languages/symbols-35-fi.xml
@@ -34,95 +34,96 @@
         <key>
           <binding label="0"/>
         </key>
+        <key style="special">
+          <binding action="backspace"/>
+        </key>
       </row>
 
       <row>
-        <key>
+        <spacer/>
+        <key width="small">
           <binding label="*"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="#"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="+"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="-"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="="/>
         </key>
-        <key>
+        <key width="small">
           <binding label="("/>
         </key>
-        <key>
+        <key width="small">
           <binding label=")"/>
         </key>
-        <key>
+        <key width="small">
           <binding label=";"/>
         </key>
-        <key>
+        <key width="small">
           <binding label=":"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="?"/>
         </key>
+        <key style="special" width="large" id="actionKey">
+          <binding action="return"/>
+        </key>
+        <spacer/>
       </row>
 
       <row>
-        <key style="special" width="x-large">
+        <key style="special">
           <binding action="switch" label="1/2"/>
         </key>
-
-        <spacer/>
-
-        <key>
+        <key width="small">
           <binding label="@" quickpick="true"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="~"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="/"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="\"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x0027;" quickpick="true"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x0022;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="!"/>
         </key>
-
-        <spacer/>
- 
-        <key style="special" width="x-large">
-          <binding action="backspace"/>
+        <key width="small"><binding label="_"/></key>
+        <key width="small"><binding label=","/></key>
+        <key width="small"><binding label="."/></key>
+        <key style="special">
+          <binding action="switch" label="1/2"/>
         </key>
       </row>
 
       <row>
-        <key style="special" width="x-large">
+        <key style="special" width="large">
           <binding action="sym" label="ABC"/>
         </key>
-        
-        <key><binding label=","/></key>
-        <key><binding label="."/></key>
-        
+        <key style="special">
+          <binding action="right-layout"/>
+        </key>
         <key width="stretched">
           <binding action="space"/>
         </key>
-        
-        <key><binding label="_"/></key>
-        
-        <key style="special" width="xx-large" id="actionKey">
-          <binding action="return"/>
+        <key style="special" width="large">
+          <binding action="sym" label="ABC"/>
         </key>
-
+        <key style="special"><binding action="close"/></key>
       </row>
     </section>
 
@@ -158,94 +159,97 @@
         <key>
           <binding label="0"/>
         </key>
+        <key style="special">
+          <binding action="backspace"/>
+        </key>
       </row>
 
       <row>
-        <key>
+        <spacer/>
+        <key width="small">
           <binding label="&#x20AC;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x00A3;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x0024;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x00A5;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x0025;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x005B;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x005D;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x00AB;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x00BB;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x00BF;"/>
         </key>
+        <key style="special" width="large" id="actionKey">
+          <binding action="return"/>
+        </key>
+        <spacer/>
       </row>
 
       <row>
-        <key style="special" width="x-large">
+        <key style="special">
           <binding action="switch" label="2/2"/>
         </key>
 
-        <spacer/>
-
-        <key>
+        <key width="small">
           <binding label="&#x0060;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x005E;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x007C;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x201C;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x201D;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x201E;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x00A1;"/>
         </key>
-
-        <spacer/>
-
-        <key style="special" width="x-large">
-          <binding action="backspace"/>
+        <key width="small"><binding label="&#x003C;"/></key>
+        <key width="small"><binding label="&#x003E;"/></key>
+        <key width="small"><binding label="&#x0026;"/></key>
+        <key style="special">
+          <binding action="switch" label="2/2"/>
         </key>
       </row>
 
       <row>
-        <key style="special" width="x-large">
+        <key style="special" width="large">
           <binding action="sym" label="ABC"/>
         </key>
-        
-        <key><binding label="&#x003C;"/></key>
-        <key><binding label="&#x003E;"/></key>
-        
+        <key style="special">
+          <binding action="right-layout"/>
+        </key>
         <key width="stretched">
           <binding action="space"/>
         </key>
-        
-        <key><binding label="&#x0026;"/></key>
-        
-        <key style="special" width="xx-large" id="actionKey">
-          <binding action="return"/>
+        <key style="special" width="large">
+          <binding action="sym" label="ABC"/>
         </key>
+        <key style="special"><binding action="close"/></key>
       </row>
     </section>
   </layout>
diff --git a/maliit-keyboard/data/languages/symbols-35.xml b/maliit-keyboard/data/languages/symbols-35.xml
index 275c9ab..5b8402d 100644
--- a/maliit-keyboard/data/languages/symbols-35.xml
+++ b/maliit-keyboard/data/languages/symbols-35.xml
@@ -34,48 +34,54 @@
         <key>
           <binding label="0"/>
         </key>
+        <key style="special">
+          <binding action="backspace"/>
+        </key>
       </row>
 
       <row>
-        <key>
+        <spacer/>
+        <key width="small">
           <binding label="*"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="#"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="+"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="-"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="="/>
         </key>
-        <key>
+        <key width="small">
           <binding label="("/>
         </key>
-        <key>
+        <key width="small">
           <binding label=")"/>
         </key>
-        <key>
+        <key width="small">
           <binding label=";"/>
         </key>
-        <key>
+        <key width="small">
           <binding label=":"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="?"/>
         </key>
+        <key style="special" width="large" id="actionKey">
+          <binding action="return"/>
+        </key>
+        <spacer/>
       </row>
 
       <row>
-        <key style="special" width="x-large">
+        <key style="special">
           <binding action="switch" label="1/2"/>
         </key>
 
-        <spacer/>
-
         <key>
           <binding label="@" quickpick="true"/>
         </key>
@@ -97,32 +103,34 @@
         <key>
           <binding label="!"/>
         </key>
-
-        <spacer/>
- 
-        <key style="special" width="x-large">
-          <binding action="backspace"/>
+        <key><binding label=","/></key>
+        <key><binding label="."/></key>
+        <key style="special">
+          <binding action="switch" label="1/2"/>
         </key>
+
       </row>
 
       <row>
-        <key style="special" width="x-large">
+        <key style="special">
           <binding action="sym" label="ABC"/>
         </key>
-        
+        <key style="special">
+          <binding action="right-layout"/>
+        </key>
+
         <key><binding label="_"/></key>
-        <key><binding label=","/></key>
         
         <key width="stretched">
           <binding action="space"/>
         </key>
         
-        <key><binding label="."/></key>
-        
-        <key style="special" width="xx-large" id="actionKey">
-          <binding action="return"/>
+        <key style="special">
+          <binding action="sym" label="ABC"/>
         </key>
 
+        <key style="special"><binding action="close"/></key>
+
       </row>
     </section>
 
@@ -158,48 +166,54 @@
         <key>
           <binding label="0"/>
         </key>
+        <key style="special">
+          <binding action="backspace"/>
+        </key>
       </row>
 
       <row>
-        <key>
+        <spacer/>
+        <key width="small">
           <binding label="&#x20AC;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x00A3;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x0024;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x00A5;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x0025;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x005B;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x005D;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x00AB;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x00BB;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x00BF;"/>
         </key>
+        <key style="special" width="large" id="actionKey">
+          <binding action="return"/>
+        </key>
+        <spacer/>
       </row>
 
       <row>
-        <key style="special" width="x-large">
+        <key style="special">
           <binding action="switch" label="2/2"/>
         </key>
 
-        <spacer/>
-
         <key>
           <binding label="&#x0060;"/>
         </key>
@@ -221,31 +235,28 @@
         <key>
           <binding label="&#x00A1;"/>
         </key>
-
-        <spacer/>
-
-        <key style="special" width="x-large">
-          <binding action="backspace"/>
+        <key><binding label="&#x003C;"/></key>
+        <key><binding label="&#x003E;"/></key>
+        <key style="special">
+          <binding action="switch" label="2/2"/>
         </key>
       </row>
 
       <row>
-        <key style="special" width="x-large">
+        <key style="special">
           <binding action="sym" label="ABC"/>
         </key>
-        
-        <key><binding label="&#x003C;"/></key>
-        <key><binding label="&#x003E;"/></key>
-        
+        <key style="special">
+          <binding action="right-layout"/>
+        </key>
+        <key><binding label="&#x0026;"/></key>
         <key width="stretched">
           <binding action="space"/>
         </key>
-        
-        <key><binding label="&#x0026;"/></key>
-        
-        <key style="special" width="xx-large" id="actionKey">
-          <binding action="return"/>
+        <key style="special">
+          <binding action="sym" label="ABC"/>
         </key>
+        <key style="special"><binding action="close"/></key>
       </row>
     </section>
   </layout>
diff --git a/maliit-keyboard/data/languages/symbols-36-nordic.xml b/maliit-keyboard/data/languages/symbols-36-nordic.xml
index 3e59c9a..69f7fdf 100644
--- a/maliit-keyboard/data/languages/symbols-36-nordic.xml
+++ b/maliit-keyboard/data/languages/symbols-36-nordic.xml
@@ -34,92 +34,104 @@
         <key>
           <binding label="0"/>
         </key>
+        <key style="special">
+          <binding action="backspace"/>
+        </key>
       </row>
 
       <row>
-        <key>
+        <spacer/>
+        <key width="small">
           <binding label="*"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="#"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="+"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="-"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="="/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x0026;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="("/>
         </key>
-        <key>
+        <key width="small">
           <binding label=")"/>
         </key>
-        <key>
+        <key width="small">
           <binding label=";"/>
         </key>
-        <key>
+        <key width="small">
           <binding label=":"/>
         </key>
+        <key style="special" width="large" id="actionKey">
+          <binding action="return"/>
+        </key>
+        <spacer/>
       </row>
 
       <row>
         <key style="special">
           <binding action="switch" label="1/2"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="@" quickpick="true"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="~"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="/"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="\"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x0027;" quickpick="true"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x0022;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="!"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="?"/>
         </key>
+        <key width="small"><binding label=","/></key>
+        <key width="small"><binding label="."/></key>
         <key style="special">
-          <binding action="backspace"/>
+          <binding action="switch" label="1/2"/>
         </key>
       </row>
 
       <row>
-        <key style="special" width="large">
+        <key style="special">
           <binding action="sym" label="ABC"/>
         </key>
-        
-        <key><binding label=","/></key>
-        <key><binding label="."/></key>
-        
-        <key width="xx-large">
+
+        <key style="special">
+          <binding action="right-layout"/>
+        </key>
+
+        <key width="stretched">
           <binding action="space"/>
         </key>
         
         <key><binding label="_"/></key>
-        
-        <key style="special" width="x-large" id="actionKey">
-          <binding action="return"/>
-        </key>
 
+        <key style="special">
+          <binding action="sym" label="ABC"/>
+        </key>
+ 
+        <key style="special"><binding action="close"/></key>
       </row>
     </section>
 
@@ -155,91 +167,105 @@
         <key>
           <binding label="0"/>
         </key>
+        <key style="special">
+          <binding action="backspace"/>
+        </key>
       </row>
 
       <row>
-        <key>
+        <spacer/>
+        <key width="small">
           <binding label="&#x20AC;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x00A3;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x0024;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x00A5;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x00A7;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x0025;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x005B;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x005D;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x00AB;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x00BB;"/>
         </key>
+        <key style="special" width="large" id="actionKey">
+          <binding action="return"/>
+        </key>
+        <spacer/>
       </row>
 
       <row>
         <key style="special">
           <binding action="switch" label="2/2"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x0060;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x005E;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x007C;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x201C;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x201D;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x201E;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x00A1;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x00BF;"/>
         </key>
+        <key width="small"><binding label="&#x003C;"/></key>
+        <key width="small"><binding label="&#x003E;"/></key>
         <key style="special">
-          <binding action="backspace"/>
+          <binding action="switch" label="2/2"/>
         </key>
       </row>
 
       <row>
-        <key style="special" width="large">
+        <key style="special">
           <binding action="sym" label="ABC"/>
         </key>
+
+        <key style="special">
+          <binding action="right-layout"/>
+        </key>
         
-        <key><binding label="&#x003C;"/></key>
-        <key><binding label="&#x003E;"/></key>
-        
-        <key width="xx-large">
+        <key width="stretched">
           <binding action="space"/>
         </key>
         
         <key><binding label="&#x00B0;"/></key>
-        
-        <key style="special" width="x-large" id="actionKey">
-          <binding action="return"/>
+
+        <key style="special">
+          <binding action="sym" label="ABC"/>
         </key>
+
+        <key style="special"><binding action="close"/></key>
+        
       </row>
     </section>
   </layout>
diff --git a/maliit-keyboard/data/languages/symbols-36.xml b/maliit-keyboard/data/languages/symbols-36.xml
index 4709472..bddd9dd 100644
--- a/maliit-keyboard/data/languages/symbols-36.xml
+++ b/maliit-keyboard/data/languages/symbols-36.xml
@@ -34,92 +34,99 @@
         <key>
           <binding label="0"/>
         </key>
+        <key style="special">
+          <binding action="backspace"/>
+        </key>
       </row>
 
       <row>
-        <key>
+        <spacer/>
+        <key width="small">
           <binding label="*"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="#"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="+"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="-"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="="/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x0026;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="("/>
         </key>
-        <key>
+        <key width="small">
           <binding label=")"/>
         </key>
-        <key>
+        <key width="small">
           <binding label=";"/>
         </key>
-        <key>
+        <key width="small">
           <binding label=":"/>
         </key>
+        <key style="special" width="large" id="actionKey">
+          <binding action="return"/>
+        </key>
+        <spacer/>
       </row>
 
       <row>
         <key style="special">
           <binding action="switch" label="1/2"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="@" quickpick="true"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="~"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="/"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="\"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x0027;" quickpick="true"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x0022;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="!"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="?"/>
         </key>
+        <key width="small"><binding label=","/></key>
+        <key width="small"><binding label="."/></key>
         <key style="special">
-          <binding action="backspace"/>
+          <binding action="switch" label="1/2"/>
         </key>
       </row>
 
       <row>
-        <key style="special" width="large">
+        <key style="special">
           <binding action="sym" label="ABC"/>
         </key>
-        
+        <key style="special">
+          <binding action="right-layout"/>
+        </key>
         <key><binding label="_"/></key>
-        <key><binding label=","/></key>
-        
-        <key width="xx-large">
+        <key width="stretched">
           <binding action="space"/>
         </key>
-        
-        <key><binding label="."/></key>
-        
-        <key style="special" width="x-large" id="actionKey">
-          <binding action="return"/>
+        <key style="special">
+          <binding action="sym" label="ABC"/>
         </key>
-
+        <key style="special"><binding action="close"/></key>
       </row>
     </section>
 
@@ -155,91 +162,99 @@
         <key>
           <binding label="0"/>
         </key>
+        <key style="special">
+          <binding action="backspace"/>
+        </key>
       </row>
 
       <row>
-        <key>
+        <spacer/>
+        <key width="small">
           <binding label="&#x20AC;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x00A3;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x0024;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x00A5;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x00A7;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x0025;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x005B;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x005D;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x00AB;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x00BB;"/>
         </key>
+        <key style="special" width="large" id="actionKey">
+          <binding action="return"/>
+        </key>
+        <spacer/>
       </row>
 
       <row>
         <key style="special">
           <binding action="switch" label="2/2"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x0060;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x005E;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x007C;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x201C;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x201D;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x201E;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x00A1;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x00BF;"/>
         </key>
+        <key width="small"><binding label="&#x003C;"/></key>
+        <key width="small"><binding label="&#x003E;"/></key>
         <key style="special">
-          <binding action="backspace"/>
+          <binding action="switch" label="2/2"/>
         </key>
       </row>
 
       <row>
-        <key style="special" width="large">
+        <key style="special">
           <binding action="sym" label="ABC"/>
         </key>
-        
-        <key><binding label="&#x003C;"/></key>
-        <key><binding label="&#x003E;"/></key>
-        
-        <key width="xx-large">
-          <binding action="space"/>
+        <key style="special">
+          <binding action="right-layout"/>
         </key>
-        
         <key><binding label="&#x00B0;"/></key>
-        
-        <key style="special" width="x-large" id="actionKey">
-          <binding action="return"/>
+        <key width="stretched">
+          <binding action="space"/>
+        </key>
+        <key style="special">
+          <binding action="sym" label="ABC"/>
         </key>
+        <key style="special"><binding action="close"/></key>
       </row>
     </section>
   </layout>
diff --git a/maliit-keyboard/data/languages/symbols-38.xml b/maliit-keyboard/data/languages/symbols-38.xml
index 86ebbf7..c8ec819 100644
--- a/maliit-keyboard/data/languages/symbols-38.xml
+++ b/maliit-keyboard/data/languages/symbols-38.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE keyboard SYSTEM 'VirtualKeyboardLayout.dtd'>
 <keyboard version="1.0" catalog="symbols">
   <layout type="general">
-    <section id="symbols0" type="non-sloppy">
+    <section id="symbols0" type="non-sloppy" style="ar">
       <row>
         <key>
           <binding label="1"/>
@@ -34,45 +34,53 @@
         <key>
           <binding label="0"/>
         </key>
-        <key>
+        <key width="large">
           <binding label="%"/>
         </key>
+        <key style="special" width="large">
+          <binding action="backspace"/>
+        </key>
       </row>
 
       <row>
-        <key>
+        <spacer/>
+        <key width="small">
           <binding label="*"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="#"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="+"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="-"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="="/>
         </key>
-        <key>
+        <key width="small">
           <binding label="("/>
         </key>
-        <key>
+        <key width="small">
           <binding label=")"/>
         </key>
-        <key>
+        <key width="small">
           <binding label=";"/>
         </key>
-        <key>
+        <key width="small">
           <binding label=":"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="!"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="?"/>
         </key>
+        <key style="special" width="x-large" id="actionKey">
+          <binding action="return"/>
+        </key>
+        <spacer/>
       </row>
 
       <row>
@@ -103,8 +111,10 @@
         <key>
           <binding label="&#x0026;"/>
         </key>
+        <key><binding label=","/></key>
+        <key><binding label="."/></key>
         <key style="special" width="large">
-          <binding action="backspace"/>
+          <binding action="switch" label="1/2"/>
         </key>
       </row>
 
@@ -112,26 +122,23 @@
         <key style="special" width="x-large">
           <binding action="sym" label="ABC"/>
         </key>
-        
-        <key>
+        <key style="special" width="small">
+          <binding action="right-layout"/>
+        </key>
+        <key width="small">
           <binding label="_"/>
         </key>
-        <key><binding label=","/></key>
-        
         <key width="stretched">
           <binding action="space"/>
         </key>
-
-        <key><binding label="."/></key>
-        
-        <key style="special" width="xx-large" id="actionKey">
-          <binding action="return"/>
+        <key style="special" width="x-large">
+          <binding action="sym" label="ABC"/>
         </key>
-
+        <key style="special" width="small"><binding action="close"/></key>
       </row>
     </section>
 
-    <section id="symbols1" type="non-sloppy">
+    <section id="symbols1" type="non-sloppy" style="ar">
       <row>
         <key>
           <binding label="1"/>
@@ -163,45 +170,53 @@
         <key>
           <binding label="0"/>
         </key>
-        <key>
+        <key width="large">
           <binding label="&#x2030;"/>
         </key>
+        <key style="special" width="large">
+          <binding action="backspace"/>
+        </key>
       </row>
 
       <row>
-        <key>
+        <spacer/>
+        <key width="small">
           <binding label="&#x20AC;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x00A3;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x0024;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x00A5;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x00A7;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x005B;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x005D;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x007B;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x007D;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x00A1;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x00BF;"/>
         </key>
+        <key style="special" width="x-large" id="actionKey">
+          <binding action="return"/>
+        </key>
+        <spacer/>
       </row>
 
       <row>
@@ -232,8 +247,10 @@
         <key>
           <binding label="&#x00BB;"/>
         </key>
+        <key><binding label="&#x003C;"/></key>
+        <key><binding label="&#x003E;"/></key>
         <key style="special" width="large">
-          <binding action="backspace"/>
+          <binding action="switch" label="2/2"/>
         </key>
       </row>
 
@@ -241,19 +258,17 @@
         <key style="special" width="x-large">
           <binding action="sym" label="ABC"/>
         </key>
-        
-        <key><binding label="&#x003C;"/></key>
-        <key><binding label="&#x003E;"/></key>
-        
+        <key style="special" width="small">
+          <binding action="right-layout"/>
+        </key>
+        <key width="small"><binding label="&#x00A9;"/></key>
         <key width="stretched">
           <binding action="space"/>
         </key>
-
-        <key><binding label="&#x00A9;"/></key>
-        
-        <key style="special" width="xx-large" id="actionKey">
-          <binding action="return"/>
+        <key style="special" width="x-large">
+          <binding action="sym" label="ABC"/>
         </key>
+        <key style="special" width="small"><binding action="close"/></key>
       </row>
     </section>
   </layout>
diff --git a/maliit-keyboard/data/languages/symbols-39.xml b/maliit-keyboard/data/languages/symbols-39.xml
index b269a42..00bd668 100644
--- a/maliit-keyboard/data/languages/symbols-39.xml
+++ b/maliit-keyboard/data/languages/symbols-39.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE keyboard SYSTEM 'VirtualKeyboardLayout.dtd'>
 <keyboard version="1.0" catalog="symbols">
   <layout type="general">
-    <section id="symbols0" type="non-sloppy">
+    <section id="symbols0" type="non-sloppy" style="ar">
       <row>
         <key>
           <binding label="1"/>
@@ -37,46 +37,54 @@
         <key>
           <binding label="%"/>
         </key>
+        <key style="special" width="large">
+          <binding action="backspace"/>
+        </key>
       </row>
 
       <row>
-        <key>
+        <spacer/>
+        <key width="small">
           <binding label="*"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="#"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="+"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="-"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="="/>
         </key>
-        <key>
+        <key width="small">
           <binding label="("/>
         </key>
-        <key>
+        <key width="small">
           <binding label=")"/>
         </key>
-        <key>
+        <key width="small">
           <binding label=";"/>
         </key>
-        <key>
+        <key width="small">
           <binding label=":"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="!"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="?"/>
         </key>
+        <key style="special" width="x-large" id="actionKey">
+          <binding action="return"/>
+        </key>
+        <spacer/>
       </row>
 
       <row>
-        <key style="special" width="x-large">
+        <key style="special" width="large">
           <binding action="switch" label="1/2"/>
         </key>
         <key>
@@ -103,36 +111,35 @@
         <key>
           <binding label="&#x0026;"/>
         </key>
-        <key style="special" width="x-large">
-          <binding action="backspace"/>
+        <key><binding label=","/></key>
+        <key><binding label="."/></key>
+        <key style="special">
+          <binding action="switch" label="1/2"/>
         </key>
       </row>
 
       <row>
-        <key style="special" width="x-large">
+        <key style="special">
           <binding action="sym" label="ABC"/>
         </key>
-        
+        <key style="special">
+          <binding action="right-layout"/>
+        </key>
         <key>
           <binding label="_"/>
         </key>
-        <key><binding label=","/></key>
-        
         <key width="stretched">
           <binding action="space"/>
         </key>
-
-        <key><binding label="."/></key>
         <key><binding label="&#x2014;"/></key>
-        
-        <key style="special" width="xx-large" id="actionKey">
-          <binding action="return"/>
+        <key style="special">
+          <binding action="sym" label="ABC"/>
         </key>
-
+        <key style="special"><binding action="close"/></key>
       </row>
     </section>
 
-    <section id="symbols1" type="non-sloppy">
+    <section id="symbols1" type="non-sloppy" style="ar">
       <row>
         <key>
           <binding label="1"/>
@@ -167,46 +174,54 @@
         <key>
           <binding label="&#x2030;"/>
         </key>
+        <key style="special" width="large">
+          <binding action="backspace"/>
+        </key>
       </row>
 
       <row>
-        <key>
+        <spacer/>
+        <key width="small">
           <binding label="&#x20AC;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x00A3;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x0024;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x00A5;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x00A7;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x005B;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x005D;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x007B;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x007D;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x00A1;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x00BF;"/>
         </key>
+        <key style="special" width="x-large" id="actionKey">
+          <binding action="return"/>
+        </key>
+        <spacer/>
       </row>
 
       <row>
-        <key style="special" width="x-large">
+        <key style="special" width="large">
           <binding action="switch" label="2/2"/>
         </key>
         <key>
@@ -233,29 +248,29 @@
         <key>
           <binding label="&#x00BB;"/>
         </key>
-        <key style="special" width="x-large">
-          <binding action="backspace"/>
+        <key><binding label="&#x00A9;"/></key>
+        <key><binding label="&#x00AE;"/></key>
+        <key style="special">
+          <binding action="switch" label="2/2"/>
         </key>
       </row>
 
       <row>
-        <key style="special" width="x-large">
+        <key style="special">
           <binding action="sym" label="ABC"/>
         </key>
-        
+        <key style="special">
+          <binding action="right-layout"/>
+        </key>
         <key><binding label="&#x003C;"/></key>
-        <key><binding label="&#x003E;"/></key>
-        
         <key width="stretched">
           <binding action="space"/>
         </key>
-
-        <key><binding label="&#x00A9;"/></key>
-        <key><binding label="&#x00AE;"/></key>
-        
-        <key style="special" width="xx-large" id="actionKey">
-          <binding action="return"/>
+        <key><binding label="&#x003E;"/></key>
+        <key style="special">
+          <binding action="sym" label="ABC"/>
         </key>
+        <key style="special"><binding action="close"/></key>
       </row>
     </section>
   </layout>
diff --git a/maliit-keyboard/data/languages/symbols_ar.xml b/maliit-keyboard/data/languages/symbols_ar.xml
index 4cb128b..47fa15c 100644
--- a/maliit-keyboard/data/languages/symbols_ar.xml
+++ b/maliit-keyboard/data/languages/symbols_ar.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE keyboard SYSTEM 'VirtualKeyboardLayout.dtd'>
 <keyboard version="1.0" catalog="symbols">
   <layout type="general">
-    <section id="symbols0" type="non-sloppy">
+    <section id="symbols0" type="non-sloppy" style="ar">
       <row>
         <key>
           <binding label="&#x0661;"/>
@@ -37,103 +37,114 @@
         <key>
           <binding label="&#x066A;"/>
         </key>
+        <key style="special" rtl="true" width="large">
+          <binding action="backspace"/>
+        </key>
       </row>
 
       <row>
-        <key>
+        <spacer/>
+        <key width="small">
           <binding label="*"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="#"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="+"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="-"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="_"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="="/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x0026;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label=")" rtl="true"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="(" rtl="true"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&gt;" rtl="true"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&lt;" rtl="true"/>
         </key>
+        <key style="special" width="x-large" id="actionKey">
+          <binding action="return"/>
+        </key>
+        <spacer/>
       </row>
 
       <row>
-        <key style="special">
+        <key style="special" width="large">
           <binding action="switch" label="&#x0662;/&#x0661;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="@" quickpick="true"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="~"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="/"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="\"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x0027;" quickpick="true"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x066B;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x066C;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="!"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x061F;"/>
         </key>
-        <key style="special" rtl="true">
-          <binding action="backspace"/>
+        <key width="small"><binding label="&#x060C;"/></key>
+        <key width="small"><binding label="."/></key>
+        <key style="special" width="large">
+          <binding action="switch" label="&#x0662;/&#x0661;"/>
         </key>
       </row>
 
       <row>
-        <key style="special" width="x-large">
+        <key style="special">
           <binding action="sym" label="&#x0627;&#x200C;&#x0628;&#x200C;&#x062A;"/>
         </key>
+        <key style="special">
+          <binding action="right-layout"/>
+        </key>
         
         <key><binding label="&#x061B;"/></key>
-        <key><binding label="&#x060C;"/></key>
         
         <key width="stretched">
           <binding action="space"/>
         </key>
         
-        <key><binding label="."/></key>
         <key><binding label=":"/></key>
-        
-        <key style="special" width="xx-large" id="actionKey">
-          <binding action="return"/>
+        <key style="special">
+          <binding action="sym" label="&#x0627;&#x200C;&#x0628;&#x200C;&#x062A;"/>
         </key>
+        <key style="special"><binding action="close"/></key> 
 
       </row>
     </section>
 
-    <section id="symbols1" type="non-sloppy">
+    <section id="symbols1" type="non-sloppy" style="ar">
       <row>
         <key>
           <binding label="1"/>
@@ -168,98 +179,110 @@
         <key>
           <binding label="%"/>
         </key>
+        <key style="special" rtl="true" width="large">
+          <binding action="backspace"/>
+        </key>
       </row>
 
       <row>
-        <key>
+        <spacer/>
+        <key width="small">
           <binding label="&#x20AC;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x00A3;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x0024;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x00A5;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x00A7;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x007D;" rtl="true"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x007B;" rtl="true"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x005D;" rtl="true"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x005B;" rtl="true"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x00BB;" rtl="true"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x00AB;" rtl="true"/>
         </key>
+        <key style="special" width="x-large" id="actionKey">
+          <binding action="return"/>
+        </key>
+        <spacer/>
       </row>
 
       <row>
-        <key style="special">
+        <key style="special" width="large">
           <binding action="switch" label="&#x0662;/&#x0662;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x0060;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x005E;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x007C;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x2030;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x0022;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x201C;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x201D;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x201E;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="?"/>
         </key>
-        <key style="special" rtl="true">
-          <binding action="backspace"/>
+        <key width="small"><binding label=","/></key>
+        <key width="small"><binding label="."/></key>
+        <key style="special" width="large">
+          <binding action="switch" label="&#x0662;/&#x0662;"/>
         </key>
       </row>
 
       <row>
-        <key style="special" width="x-large">
+        <key style="special">
           <binding action="sym" label="&#x0627;&#x200C;&#x0628;&#x200C;&#x062A;"/>
         </key>
+        <key style="special">
+          <binding action="right-layout"/>
+        </key>
         
         <key><binding label=";"/></key>
-        <key><binding label=","/></key>
         
         <key width="stretched">
           <binding action="space"/>
         </key>
 		
-        <key><binding label="."/></key>
         <key><binding label=":"/></key>
-        
-        <key style="special" width="xx-large" id="actionKey">
-          <binding action="return"/>
+        <key style="special">
+          <binding action="sym" label="&#x0627;&#x200C;&#x0628;&#x200C;&#x062A;"/>
         </key>
+        <key style="special"><binding action="close"/></key>
+        
       </row>
     </section>
   </layout>
diff --git a/maliit-keyboard/data/languages/symbols_en.xml b/maliit-keyboard/data/languages/symbols_en.xml
index e1fb1bc..f94ad47 100644
--- a/maliit-keyboard/data/languages/symbols_en.xml
+++ b/maliit-keyboard/data/languages/symbols_en.xml
@@ -34,11 +34,13 @@
         <key>
           <binding label="0"/>
         </key>
+        <key style="special">
+          <binding action="backspace"/>
+        </key>
       </row>
 
       <row>
         <spacer/>
-
         <key>
           <binding label="*"/>
         </key>
@@ -66,18 +68,17 @@
         <key>
           <binding label="?"/>
         </key>
-
+        <key style="special" width="large" id="actionKey">
+          <binding action="return"/>
+        </key>
         <spacer/>
-
       </row>
 
       <row>
-        <key style="special" width="large">
+        <key style="special">
           <binding action="switch" label="1/2"/>
         </key>
 
-        <spacer/>
-
         <key>
           <binding label="@" quickpick="true"/>
         </key>
@@ -99,31 +100,30 @@
         <key>
           <binding label=":"/>
         </key>
-
-        <spacer/>
-
-        <key style="special" width="large">
-          <binding action="backspace"/>
+        <key><binding label=","/></key>
+        <key><binding label="."/></key>
+        <key style="special">
+          <binding action="switch" label="1/2"/>
         </key>
+
       </row>
 
       <row>
-        <key style="special" width="x-large">
+        <key style="special" width="large">
           <binding action="sym" label="ABC"/>
         </key>
 
-        <spacer/>
-
-        <key><binding label=","/></key>
-        <key width="xx-large"><binding action="space"/></key>
-        <key><binding label="."/></key>
+        <key style="special">
+          <binding action="right-layout"/>
+        </key>
 
-        <spacer/>
+        <key width="stretched"><binding action="space"/></key>
 
-        <key style="special" width="x-large" id="actionKey">
-          <binding action="return"/>
+        <key style="special" width="large">
+          <binding action="sym" label="ABC"/>
         </key>
 
+        <key style="special"><binding action="close"/></key>
       </row>
     </section>
 
@@ -159,11 +159,13 @@
         <key>
           <binding label="&#x005D;"/>
         </key>
+        <key style="special" >
+          <binding action="backspace"/>
+        </key>
       </row>
 
       <row>
         <spacer/>
-
          <key>
           <binding label="&#x0060;"/>
         </key>
@@ -191,17 +193,17 @@
         <key>
           <binding label="&#x00BF;"/>
         </key>
-
+        <key style="special" width="large" id="actionKey">
+          <binding action="return"/>
+        </key>
         <spacer/>
       </row>
 
       <row>
-        <key style="special" width="large">
+        <key style="special">
           <binding action="switch" label="2/2"/>
         </key>
 
-        <spacer/>
-
         <key>
           <binding label="&#x00AB;"/>
         </key>
@@ -223,30 +225,28 @@
         <key>
           <binding label="&#x0026;"/>
         </key>
-
-        <spacer/>
-
-        <key style="special" width="large">
-          <binding action="backspace"/>
+        <key><binding label=","/></key>
+        <key><binding label="."/></key>
+        <key style="special">
+          <binding action="switch" label="2/2"/>
         </key>
       </row>
 
       <row>
-        <key style="special" width="x-large">
+        <key style="special" width="large">
           <binding action="sym" label="ABC"/>
         </key>
 
-        <spacer/>
-
-        <key><binding label=","/></key>
-        <key width="xx-large"><binding action="space"/></key>
-        <key><binding label="."/></key>
-
-        <spacer/>
+        <key style="special">
+          <binding action="right-layout"/>
+        </key>
 
-        <key style="special" width="x-large" id="actionKey">
-          <binding action="return"/>
+        <key width="stretched"><binding action="space"/></key>
+        <key style="special" width="large">
+          <binding action="sym" label="ABC"/>
         </key>
+        <key style="special"><binding action="close"/></key>
+
       </row>
     </section>
   </layout>
diff --git a/maliit-keyboard/data/languages/symbols_fa.xml b/maliit-keyboard/data/languages/symbols_fa.xml
index a1d46c9..3972113 100644
--- a/maliit-keyboard/data/languages/symbols_fa.xml
+++ b/maliit-keyboard/data/languages/symbols_fa.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE keyboard SYSTEM 'VirtualKeyboardLayout.dtd'>
 <keyboard version="1.0" catalog="symbols">
   <layout type="general">
-    <section id="symbols0" type="non-sloppy">
+    <section id="symbols0" type="non-sloppy" style="ar">
       <row>
         <key>
           <binding label="&#x06F1;"/>
@@ -37,78 +37,87 @@
         <key>
           <binding label="٪"/>
         </key>
+        <key style="special">
+          <binding action="backspace"/>
+        </key>
       </row>
 
       <row>
-        <key>
+        <spacer/>
+        <key width="small">
           <binding label="*"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="#"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="+"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="-"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="_"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="="/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x0026;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label=")" rtl="true"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="(" rtl="true"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&gt;" rtl="true"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&lt;" rtl="true"/>
         </key>
+        <key style="special" width="x-large" id="actionKey">
+          <binding action="return"/>
+        </key>
+        <spacer/>
       </row>
 
       <row>
-        <key style="special">
+        <key style="special" width="large">
           <binding action="switch" label="&#x0662;/&#x0661;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="@" quickpick="true"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="~"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="/"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="\"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x0027;" quickpick="true"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x066B;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x066C;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="!"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x061F;"/>
         </key>
-        
+        <key width="small"><binding label="&#x060C;"/></key>
+        <key width="small"><binding label="&#x002E;"/></key>
         <key style="special">
-          <binding action="backspace"/>
+          <binding action="switch" label="&#x0662;/&#x0661;"/>
         </key>
       </row>
 
@@ -116,24 +125,23 @@
         <key style="special" width="x-large">
           <binding action="sym" label="&#x0627;&#x200C;&#x0628;&#x200C;&#x067E;"/>
         </key>
+        <key style="special">
+          <binding action="right-layout"/>
+        </key>
         <key><binding label="&#x061B;"/></key>
-        <key><binding label="&#x060C;"/></key>
-        
-        <key width="stretched">
+        <key width="xx-large">
           <binding action="space"/>
         </key>
-        
-        <key><binding label="&#x002E;"/></key>
         <key><binding label="&#x003A;"/></key>
-        
-        <key style="special" width="xx-large" id="actionKey">
-          <binding action="return"/>
+        <key style="special" width="x-large">
+          <binding action="sym" label="&#x0627;&#x200C;&#x0628;&#x200C;&#x067E;"/>
         </key>
+        <key style="special"><binding action="close"/></key>
 
       </row>
     </section>
 
-    <section id="symbols1" type="non-sloppy">
+    <section id="symbols1" type="non-sloppy" style="ar">
       <row>
         <key>
           <binding label="1"/>
@@ -168,78 +176,87 @@
         <key>
           <binding label="%"/>
         </key>
+        <key style="special">
+          <binding action="backspace"/>
+        </key>
       </row>
 
       <row>
-        <key>
+        <spacer/>
+        <key width="small">
           <binding label="€"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="£"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="$"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="¥"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#1585;&#1740;&#1575;&#1604;" rtl="true"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x007D;" rtl="true"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x007B;" rtl="true"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x005D;" rtl="true"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x005B;" rtl="true"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x00BB;" rtl="true"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x00AB;" rtl="true"/>
         </key>
+        <key style="special" width="x-large" id="actionKey">
+          <binding action="return"/>
+        </key>
+        <spacer/>
       </row>
 
       <row>
-        <key style="special">
+        <key style="special" width="large">
           <binding action="switch" label="&#x0662;/&#x0662;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x0060;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x005E;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x007C;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="‰"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x0022;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x201C;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x201D;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x201E;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="?"/>
         </key>
-
+        <key width="small"><binding label="&#x002C;"/></key>
+	<key width="small"><binding label="."/></key>
         <key style="special">
-          <binding action="backspace"/>
+          <binding action="switch" label="&#x0662;/&#x0662;"/>
         </key>
       </row>
 
@@ -247,19 +264,18 @@
         <key style="special" width="x-large">
           <binding action="sym" label="&#x0627;&#x200C;&#x0628;&#x200C;&#x067E;"/>
         </key>
-        
+        <key style="special">
+          <binding action="right-layout"/>
+        </key>
         <key><binding label=";"/></key>
-        <key><binding label="&#x002C;"/></key>
-        
-        <key width="stretched">
+        <key width="xx-large">
           <binding action="space"/>
         </key>
-	<key><binding label="."/></key>
         <key><binding label=":"/></key>
-        
-        <key style="special" width="xx-large" id="actionKey">
-          <binding action="return"/>
+        <key style="special" width="x-large">
+          <binding action="sym" label="&#x0627;&#x200C;&#x0628;&#x200C;&#x067E;"/>
         </key>
+        <key style="special"><binding action="close"/></key>
       </row>
     </section>
   </layout>
diff --git a/maliit-keyboard/data/languages/symbols_he.xml b/maliit-keyboard/data/languages/symbols_he.xml
index 542f3d5..7bb88cf 100644
--- a/maliit-keyboard/data/languages/symbols_he.xml
+++ b/maliit-keyboard/data/languages/symbols_he.xml
@@ -34,11 +34,13 @@
         <key>
           <binding label="0"/>
         </key>
+        <key style="special">
+          <binding action="backspace"/>
+        </key>
       </row>
 
       <row>
         <spacer/>
-        
         <key>
           <binding label="*"/>
         </key>
@@ -66,7 +68,9 @@
         <key>
           <binding label="?"/>
         </key>
-        
+        <key style="special" width="large" id="actionKey">
+          <binding action="return"/>
+        </key>
         <spacer/>
       </row>
 
@@ -74,9 +78,6 @@
         <key style="special">
           <binding action="switch" label="1/2"/>
         </key>
-        
-        <spacer/>
-
         <key>
           <binding label="@" quickpick="true"/>
         </key>
@@ -98,11 +99,10 @@
         <key>
           <binding label=":"/>
         </key>
-        
-        <spacer/>
-
+        <key><binding label=","/></key>
+        <key><binding label="."/></key>
         <key style="special">
-          <binding action="backspace"/>
+          <binding action="switch" label="1/2"/>
         </key>
       </row>
 
@@ -110,17 +110,16 @@
         <key style="special" width="large">
           <binding action="sym" label="&#x05D0;&#x05D1;&#x05D2;"/>
         </key>
-        
-        <key><binding label=","/></key>
-        <key width="xx-large">
+        <key style="special">
+          <binding action="right-layout"/>
+        </key>
+        <key width="stretched">
             <binding action="space"/>
         </key>
-        <key><binding label="."/></key>
-        
-        <key style="special" width="x-large" id="actionKey">
-          <binding action="return"/>
+        <key style="special" width="large">
+          <binding action="sym" label="&#x05D0;&#x05D1;&#x05D2;"/>
         </key>
-
+        <key style="special"><binding action="close"/></key>
       </row>
     </section>
 
@@ -156,11 +155,13 @@
         <key>
           <binding label="[" rtl="true"/>
         </key>
+        <key style="special">
+          <binding action="backspace"/>
+        </key>
       </row>
 
       <row>
         <spacer/>
-
         <key>
           <binding label="`"/>
         </key>
@@ -188,7 +189,9 @@
         <key>
           <binding label="¿"/>
         </key>
-        
+        <key style="special" width="large" id="actionKey">
+          <binding action="return"/>
+        </key>
         <spacer/>
       </row>
 
@@ -196,9 +199,6 @@
         <key style="special">
           <binding action="switch" label="2/2"/>
         </key>
-        
-        <spacer/>
-
         <key>
           <binding label="»" rtl="true"/>
         </key>
@@ -220,11 +220,10 @@
         <key>
           <binding label="&amp;"/>
         </key>
-
-        <spacer/>
-
+        <key><binding label=","/></key>
+        <key><binding label="."/></key>
         <key style="special">
-          <binding action="backspace"/>
+          <binding action="switch" label="2/2"/>
         </key>
       </row>
 
@@ -232,16 +231,16 @@
         <key style="special" width="large">
           <binding action="sym" label="&#x05D0;&#x05D1;&#x05D2;"/>
         </key>
-        
-        <key><binding label=","/></key>
-        <key width="xx-large">
+        <key style="special">
+          <binding action="right-layout"/>
+        </key>
+        <key width="stretched">
             <binding action="space"/>
         </key>
-        <key><binding label="."/></key>
-        
-        <key style="special" width="x-large" id="actionKey">
-          <binding action="return"/>
+        <key style="special" width="large">
+          <binding action="sym" label="&#x05D0;&#x05D1;&#x05D2;"/>
         </key>
+        <key style="special"><binding action="close"/></key>
       </row>
     </section>
   </layout>
diff --git a/maliit-keyboard/data/languages/symbols_kk.xml b/maliit-keyboard/data/languages/symbols_kk.xml
index 8b2e7e1..85f4a77 100644
--- a/maliit-keyboard/data/languages/symbols_kk.xml
+++ b/maliit-keyboard/data/languages/symbols_kk.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE keyboard SYSTEM 'VirtualKeyboardLayout.dtd'>
 <keyboard version="1.0" catalog="symbols">
   <layout type="general">
-    <section id="symbols0" type="non-sloppy">
+    <section id="symbols0" type="non-sloppy" style="ar">
       <row>
         <key>
           <binding label="1"/>
@@ -37,103 +37,110 @@
         <key>
           <binding label="%"/>
         </key>
+        <key style="special">
+          <binding action="backspace"/>
+        </key>
       </row>
 
       <row>
-        <key>
+        <spacer/>
+        <key width="small">
           <binding label="*"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="#"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="+"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="-"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="_"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="="/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x0026;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="("/>
         </key>
-        <key>
+        <key width="small">
           <binding label=")"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&lt;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&gt;"/>
         </key>
+        <key style="special" width="x-large" id="actionKey">
+          <binding action="return"/>
+        </key>
+        <spacer/>
       </row>
 
       <row>
         <key style="special">
           <binding action="switch" label="1/2"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="@" quickpick="true"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="~"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="/"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="\"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x0027;" quickpick="true"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x0022;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x2116;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="!"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="?"/>
         </key>
+        <key width="small"><binding label=","/></key>
+        <key width="small"><binding label="."/></key>
         <key style="special">
-          <binding action="backspace"/>
+          <binding action="switch" label="1/2"/>
         </key>
       </row>
 
       <row>
-        <key style="special" width="large">
+        <key style="special" width="x-large">
           <binding action="sym" label="АБВ"/>
         </key>
-        
+        <key style="special">
+          <binding action="right-layout"/>
+        </key>
         <key><binding label=";"/></key>
-        <key><binding label=","/></key>
-        
-        <key width="stretched">
+        <key width="xx-large">
           <binding action="space"/>
         </key>
-        
-        <key><binding label="."/></key>
         <key><binding label=":"/></key>
-        
-        <key style="special" width="xx-large" id="actionKey">
-          <binding action="return"/>
+        <key style="special" width="x-large">
+          <binding action="sym" label="АБВ"/>
         </key>
-
+        <key style="special"><binding action="close"/></key>
       </row>
     </section>
 
-    <section id="symbols1" type="non-sloppy">
+    <section id="symbols1" type="non-sloppy" style="ar">
       <row>
         <key>
           <binding label="1"/>
@@ -168,98 +175,106 @@
         <key>
           <binding label="§"/>
         </key>
+        <key style="special">
+          <binding action="backspace"/>
+        </key>
       </row>
 
       <row>
-        <key>
+        <spacer/>
+        <key width="small">
           <binding label="&#x20AC;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x00A3;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x0024;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x00A5;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x20B8;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x007B;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x007D;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x005B;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x005D;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x00AB;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x00BB;"/>
         </key>
+        <key style="special" width="x-large" id="actionKey">
+          <binding action="return"/>
+        </key>
+        <spacer/>
       </row>
 
       <row>
         <key style="special">
           <binding action="switch" label="2/2"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x0060;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x005E;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x007C;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x201C;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x201D;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x201E;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x00B0;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x00A9;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x00AE;"/>
         </key>
+        <key width="small"><binding label=","/></key>
+        <key width="small"><binding label="."/></key>
         <key style="special">
-          <binding action="backspace"/>
+          <binding action="switch" label="2/2"/>
         </key>
       </row>
 
       <row>
-        <key style="special" width="large">
+        <key style="special" width="x-large">
           <binding action="sym" label="АБВ"/>
         </key>
-        
+        <key style="special">
+          <binding action="right-layout"/>
+        </key>
         <key><binding label=";"/></key>
-        <key><binding label=","/></key>
-        
-        <key width="stretched">
+        <key width="xx-large">
           <binding action="space"/>
         </key>
-        
-        <key><binding label="."/></key>
         <key><binding label=":"/></key>
-        
-        <key style="special" width="xx-large" id="actionKey">
-          <binding action="return"/>
+        <key style="special" width="x-large">
+          <binding action="sym" label="АБВ"/>
         </key>
+        <key style="special"><binding action="close"/></key>
       </row>
     </section>
   </layout>
diff --git a/maliit-keyboard/data/languages/symbols_ru_uk.xml b/maliit-keyboard/data/languages/symbols_ru_uk.xml
index 88ff169..8709202 100644
--- a/maliit-keyboard/data/languages/symbols_ru_uk.xml
+++ b/maliit-keyboard/data/languages/symbols_ru_uk.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE keyboard SYSTEM 'VirtualKeyboardLayout.dtd'>
 <keyboard version="1.0" catalog="symbols">
   <layout type="general">
-    <section id="symbols0" type="non-sloppy">
+    <section id="symbols0" type="non-sloppy" style="ar">
       <row>
         <key>
           <binding label="1"/>
@@ -37,103 +37,115 @@
         <key>
           <binding label="%"/>
         </key>
+        <key style="special" width="large">
+          <binding action="backspace"/>
+        </key>
       </row>
 
       <row>
-        <key>
+        <spacer/>
+        <key width="small">
           <binding label="*"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="#"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="+"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="-"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="_"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="="/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x0026;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="("/>
         </key>
-        <key>
+        <key width="small">
           <binding label=")"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&lt;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&gt;"/>
         </key>
+        <key style="special" width="x-large" id="actionKey">
+          <binding action="return"/>
+        </key>
+        <spacer/>
       </row>
 
       <row>
-        <key style="special">
+        <key style="special" width="large">
           <binding action="switch" label="1/2"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="@" quickpick="true"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="~"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="/"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="\"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x0027;" quickpick="true"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x0022;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x2116;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="!"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="?"/>
         </key>
-        <key style="special">
-          <binding action="backspace"/>
+        <key width="small"><binding label=","/></key>
+        <key width="small"><binding label="."/></key>
+        <key style="special" width="large">
+          <binding action="switch" label="1/2"/>
         </key>
       </row>
 
       <row>
-        <key style="special" width="large">
+        <key style="special">
           <binding action="sym" label="АБВ"/>
         </key>
+        <key style="special">
+          <binding action="right-layout"/>
+        </key>
         
         <key><binding label=";"/></key>
-        <key><binding label=","/></key>
         
-        <key width="xx-large">
+        <key width="stretched">
           <binding action="space"/>
         </key>
         
-        <key><binding label="."/></key>
         <key><binding label=":"/></key>
         
-        <key style="special" width="x-large" id="actionKey">
-          <binding action="return"/>
+        <key style="special">
+          <binding action="sym" label="АБВ"/>
         </key>
+        <key style="special"><binding action="close"/></key>
 
       </row>
     </section>
 
-    <section id="symbols1" type="non-sloppy">
+    <section id="symbols1" type="non-sloppy" style="ar">
       <row>
         <key>
           <binding label="1"/>
@@ -168,98 +180,110 @@
         <key>
           <binding label="&#x2030;"/>
         </key>
+        <key style="special" width="large">
+          <binding action="backspace"/>
+        </key>
       </row>
 
       <row>
-        <key>
+        <spacer/>
+        <key width="small">
           <binding label="&#x20AC;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x00A3;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x0024;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x00A5;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x00A7;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x007B;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x007D;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x005B;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x005D;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x00AB;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x00BB;"/>
         </key>
+        <key style="special" width="x-large" id="actionKey">
+          <binding action="return"/>
+        </key>
+        <spacer/>
       </row>
 
       <row>
-        <key style="special">
+        <key style="special" width="large">
           <binding action="switch" label="2/2"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x0060;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x005E;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x007C;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x201C;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x201D;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x201E;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x00B0;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x00A9;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x00AE;"/>
         </key>
-        <key style="special">
-          <binding action="backspace"/>
+        <key width="small"><binding label=","/></key>
+        <key width="small"><binding label="."/></key>
+        <key style="special" width="large">
+          <binding action="switch" label="2/2"/>
         </key>
       </row>
 
       <row>
-        <key style="special" width="large">
+        <key style="special">
           <binding action="sym" label="АБВ"/>
         </key>
+        <key style="special">
+          <binding action="right-layout"/>
+        </key>
         
         <key><binding label=";"/></key>
-        <key><binding label=","/></key>
         
-        <key width="xx-large">
+        <key width="stretched">
           <binding action="space"/>
         </key>
         
-        <key><binding label="."/></key>
         <key><binding label=":"/></key>
-        
-        <key style="special" width="x-large" id="actionKey">
-          <binding action="return"/>
+
+        <key style="special">
+          <binding action="sym" label="АБВ"/>
         </key>
+        <key style="special"><binding action="close"/></key>
       </row>
     </section>
   </layout>
diff --git a/maliit-keyboard/data/languages/symbols_th.xml b/maliit-keyboard/data/languages/symbols_th.xml
index bddefab..42cb529 100644
--- a/maliit-keyboard/data/languages/symbols_th.xml
+++ b/maliit-keyboard/data/languages/symbols_th.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE keyboard SYSTEM 'VirtualKeyboardLayout.dtd'>
 <keyboard version="1.0" catalog="symbols">
   <layout type="general">
-    <section id="symbols0" type="non-sloppy">
+    <section id="symbols0" type="non-sloppy" style="ar">
       <row>
         <key>
           <binding label="1"/>
@@ -37,46 +37,54 @@
         <key>
           <binding label="%"/>
         </key>
+        <key style="special" width="large">
+          <binding action="backspace"/>
+        </key>
       </row>
 
       <row>
-        <key>
+        <spacer/>
+        <key width="small">
           <binding label="*"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="#"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="+"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="-"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="_"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="="/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&amp;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="("/>
         </key>
-        <key>
+        <key width="small">
           <binding label=")"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&lt;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&gt;"/>
         </key>
+        <key style="special" width="x-large" id="actionKey">
+          <binding action="return"/>
+        </key>
+        <spacer/>
       </row>
 
       <row>
-        <key style="special" width="x-large">
+        <key style="special">
           <binding action="switch" label="1/2"/>
         </key>
         <key>
@@ -103,35 +111,34 @@
         <key>
           <binding label="?"/>
         </key>
-        
-        <key style="special" width="x-large">
-          <binding action="backspace"/>
+        <key><binding label=","/></key>
+        <key><binding label="."/></key>
+        <key style="special">
+          <binding action="switch" label="1/2"/>
         </key>
       </row>
 
       <row>
-        <key style="special" width="x-large">
+        <key style="special" width="large">
           <binding action="sym" label="&#x0E01;&#x0E02;&#x0E03;"/>
         </key>
-        
-        <key><binding label=";"/></key>
-        <key><binding label=","/></key>
-        
+        <key style="special">
+          <binding action="right-layout"/>
+        </key>
+        <key width="small"><binding label=";"/></key>
         <key width="stretched">
           <binding action="space"/>
         </key>
-        
-        <key><binding label="."/></key>
-        <key><binding label=":"/></key>
-        
-        <key style="special" width="xx-large" id="actionKey">
-          <binding action="return"/>
+        <key width="small"><binding label=":"/></key>
+        <key style="special" width="large">
+          <binding action="sym" label="&#x0E01;&#x0E02;&#x0E03;"/>
         </key>
+        <key style="special"><binding action="close"/></key>
 
       </row>
     </section>
 
-    <section id="symbols1" type="non-sloppy">
+    <section id="symbols1" type="non-sloppy" style="ar">
       <row>
         <key>
           <binding label="๑"/>
@@ -166,46 +173,54 @@
         <key>
           <binding label="‰"/>
         </key>
+        <key style="special" width="large">
+          <binding action="backspace"/>
+        </key>
       </row>
 
       <row>
-        <key>
+        <spacer/>
+        <key width="small">
           <binding label="€"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="£"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="$"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="¥"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="฿"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="{"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="}"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="["/>
         </key>
-        <key>
+        <key width="small">
           <binding label="]"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="«"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="»"/>
         </key>
+        <key style="special" width="x-large" id="actionKey">
+          <binding action="return"/>
+        </key>
+        <spacer/>
       </row>
 
       <row>
-        <key style="special" width="x-large">
+        <key style="special">
           <binding action="switch" label="2/2"/>
         </key>
         <key>
@@ -232,30 +247,29 @@
         <key>
           <binding label="®"/>
         </key>
-        
-        <key style="special" width="x-large">
-          <binding action="backspace"/>
+        <key><binding label=","/></key>
+        <key><binding label="."/></key>
+        <key style="special">
+          <binding action="switch" label="2/2"/>
         </key>
       </row>
 
       <row>
-        <key style="special" width="x-large">
+        <key style="special" width="large">
           <binding action="sym" label="&#x0E01;&#x0E02;&#x0E03;"/>
         </key>
-        
-        <key><binding label=";"/></key>
-        <key><binding label=","/></key>
-        
+        <key style="special">
+          <binding action="right-layout"/>
+        </key>
+        <key width="small"><binding label=";"/></key>
         <key width="stretched">
           <binding action="space"/>
         </key>
-        
-        <key><binding label="."/></key>
-        <key><binding label=":"/></key>
-        
-        <key style="special" width="xx-large" id="actionKey">
-          <binding action="return"/>
+        <key width="small"><binding label=":"/></key>
+        <key style="special" width="large">
+          <binding action="sym" label="&#x0E01;&#x0E02;&#x0E03;"/>
         </key>
+        <key style="special"><binding action="close"/></key>
       </row>
     </section>
   </layout>
diff --git a/maliit-keyboard/data/languages/symbols_vi.xml b/maliit-keyboard/data/languages/symbols_vi.xml
index 14707ef..94aa9f4 100644
--- a/maliit-keyboard/data/languages/symbols_vi.xml
+++ b/maliit-keyboard/data/languages/symbols_vi.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE keyboard SYSTEM 'VirtualKeyboardLayout.dtd'>
 <keyboard version="1.0" catalog="symbols">
   <layout type="general">
-    <section id="symbols0" type="non-sloppy" style="vietnamese">
+    <section id="symbols0" type="non-sloppy">
       <row>
         <key>
            <binding label="1"/>
@@ -40,42 +40,46 @@
       </row>
 
       <row>
-        <key>
+        <key width="small">
           <binding label="*"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="#"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="+"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="-"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="="/>
         </key>
-        <key>
+        <key width="small">
           <binding label="("/>
         </key>
-        <key>
+        <key width="small">
           <binding label=")"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="["/>
         </key>
-        <key>
+        <key width="small">
           <binding label="]"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="!"/>
         </key>
         <key>
           <binding label="?"/>
         </key>
+        <key style="special">
+          <binding action="backspace"/>
+        </key>
       </row>
 
       <row>
+        <spacer/>
         <key>
           <binding label="@" quickpick="true"/>
         </key>
@@ -103,12 +107,10 @@
         <key>
           <binding label="§"/>
         </key>
-        <key>
-          <binding label="&lt;"/>
-        </key>
-        <key>
-          <binding label="&gt;"/>
+        <key style="special" width="large" id="actionKey">
+          <binding action="return"/>
         </key>
+        <spacer/>
       </row>
 
       <row>
@@ -136,34 +138,33 @@
         <key>
           <binding label="₫"/>
         </key>
-        <key>
-          <binding label=";"/>
-        </key>
+        <key id="emailUrlKey"><binding label=","/></key>
         <key>
           <binding label=":"/>
         </key>
-
-        <key style="special">
-          <binding action="backspace"/>
+        <key>
+          <binding label=";"/>
         </key>
       </row>
 
       <row>
-        <key style="special" width="x-large">
+        <key style="special" width="large">
           <binding action="sym" label="ABC"/>
         </key>
-
-        <spacer/>
-
-        <key><binding label=","/></key>
-        <key width="stretched"><binding action="space"/></key>
-        <key><binding label="."/></key>
-
-        <spacer/>
-
-        <key style="special" width="xx-large" id="actionKey">
-          <binding action="return"/>
+        <key style="special">
+          <binding action="right-layout"/>
+        </key>
+        <key>
+          <binding label="&lt;"/>
+        </key>
+        <key width="xx-large"><binding action="space"/></key>
+        <key>
+          <binding label="&gt;"/>
+        </key>
+        <key style="special" width="large">
+          <binding action="sym" label="ABC"/>
         </key>
+	<key style="special"><binding action="close"/></key>
       </row>
     </section>
   </layout>
diff --git a/maliit-keyboard/data/languages/symbols_zh_cangjie.xml b/maliit-keyboard/data/languages/symbols_zh_cangjie.xml
index f1f0884..233f252 100644
--- a/maliit-keyboard/data/languages/symbols_zh_cangjie.xml
+++ b/maliit-keyboard/data/languages/symbols_zh_cangjie.xml
@@ -33,7 +33,6 @@
        <row>
          <key style="special" width="large"><binding action="switch" label="1/2"/></key>
 
-        <spacer/>
          <key><binding label="&#x201C;"/></key>
          <key><binding label="&#x201D;"/></key>
          <key><binding label="&#xFF1B;"/></key>
@@ -41,7 +40,6 @@
          <key><binding label="&#x3001;"/></key>
          <key><binding label="&#xFF01;"/></key>
          <key><binding label="&#xFF1F;"/></key>
-        <spacer/>
 
   	 <key style="special" width="large"><binding action="backspace"/></key>
        </row>
@@ -52,9 +50,11 @@
          </key>
 
          <key><binding label="&#xFF0C;"/></key>
-         <key width="stretched"><binding action="space"/></key>
+         <key width="xx-large"><binding action="space"/></key>
          <key><binding label="&#x3002;"/></key>
 
+         <key style="special"><binding action="close"/></key>
+
          <key style="special" width="x-large" id="actionKey">
            <binding action="return"/>
          </key>
@@ -92,7 +92,6 @@
        <row>
          <key style="special" width="large"><binding action="switch" label="2/2"/></key>
 
-         <spacer/>
          <key><binding label="&#x0027;"/></key>
          <key><binding label="&#x0022;"/></key>
          <key><binding label="&#x003B;"/></key>
@@ -100,7 +99,6 @@
          <key><binding label="&#x00B7;"/></key>
          <key><binding label="&#x0021;"/></key>
          <key><binding label="&#x003F;"/></key>
-         <spacer/>
 
   	 <key style="special" width="large"><binding action="backspace"/></key>
        </row>
@@ -111,9 +109,11 @@
          </key>
 
          <key><binding label="&#x002C;"/></key>
-         <key width="stretched"><binding action="space"/></key>
+         <key width="xx-large"><binding action="space"/></key>
          <key><binding label="&#x002E;"/></key>
 
+         <key style="special"><binding action="close"/></key>
+
          <key style="special" width="x-large" id="actionKey">
            <binding action="return"/>
          </key>
@@ -153,7 +153,6 @@
        <row>
          <key style="special" width="large"><binding action="switch" label="1/2"/></key>
 
-         <spacer/>
          <key><binding label="&#x201C;"/></key>
          <key><binding label="&#x201D;"/></key>
          <key><binding label="&#xFF1B;"/></key>
@@ -161,7 +160,6 @@
          <key><binding label="&#x3001;"/></key>
          <key><binding label="&#xFF01;"/></key>
          <key><binding label="&#xFF1F;"/></key>
-         <spacer/>
 
   	 <key style="special" width="large"><binding action="backspace"/></key>
        </row>
@@ -172,9 +170,11 @@
          </key>
 
          <key><binding label="&#xFF0C;"/></key>
-         <key width="stretched"><binding action="space"/></key>
+         <key width="xx-large"><binding action="space"/></key>
          <key><binding label="&#x3002;"/></key>
 
+         <key style="special"><binding action="close"/></key>
+
          <key style="special" width="x-large" id="actionKey">
            <binding action="return"/>
          </key>
@@ -212,7 +212,6 @@
        <row>
          <key style="special" width="large"><binding action="switch" label="2/2"/></key>
 
-         <spacer/>
          <key><binding label="&#x0027;"/></key>
          <key><binding label="&#x0022;"/></key>
          <key><binding label="&#x003B;"/></key>
@@ -220,7 +219,6 @@
          <key><binding label="&#x00B7;"/></key>
          <key><binding label="&#x0021;"/></key>
          <key><binding label="&#x003F;"/></key>
-         <spacer/>
 
   	 <key style="special" width="large"><binding action="backspace"/></key>
        </row>
@@ -231,9 +229,11 @@
          </key>
 
          <key><binding label="&#x002C;"/></key>
-         <key width="stretched"><binding action="space"/></key>
+         <key width="xx-large"><binding action="space"/></key>
          <key><binding label="&#x002E;"/></key>
 
+         <key style="special"><binding action="close"/></key>
+
          <key style="special" width="x-large" id="actionKey">
            <binding action="return"/>
          </key>
diff --git a/maliit-keyboard/data/languages/symbols_zh_pinyin.xml b/maliit-keyboard/data/languages/symbols_zh_pinyin.xml
index 2ccc662..1ada89b 100644
--- a/maliit-keyboard/data/languages/symbols_zh_pinyin.xml
+++ b/maliit-keyboard/data/languages/symbols_zh_pinyin.xml
@@ -33,7 +33,6 @@
        <row>
          <key style="special" width="large"><binding action="switch" label="1/2"/></key>
 
-         <spacer/>
          <key><binding label="&#x201C;"/></key>
          <key><binding label="&#x201D;"/></key>
          <key><binding label="&#xFF1B;"/></key>
@@ -41,7 +40,6 @@
          <key><binding label="&#x3001;"/></key>
          <key><binding label="&#xFF01;"/></key>
          <key><binding label="&#xFF1F;"/></key>
-         <spacer/>
 
   	 <key style="special" width="large"><binding action="backspace"/></key>
        </row>
@@ -52,9 +50,11 @@
          </key>
 
          <key><binding label="&#xFF0C;"/></key>
-         <key width="stretched"><binding action="space"/></key>
+         <key width="xx-large"><binding action="space"/></key>
          <key><binding label="&#x3002;"/></key>
 
+         <key style="special"><binding action="close"/></key>
+
          <key style="special" width="x-large" id="actionKey">
            <binding action="return"/>
          </key>
@@ -92,7 +92,6 @@
        <row>
          <key style="special" width="large"><binding action="switch" label="2/2"/></key>
 
-         <spacer/>
          <key><binding label="&#x0027;"/></key>
          <key><binding label="&#x0022;"/></key>
          <key><binding label="&#x003B;"/></key>
@@ -100,7 +99,6 @@
          <key><binding label="&#x00B7;"/></key>
          <key><binding label="&#x0021;"/></key>
          <key><binding label="&#x003F;"/></key>
-         <spacer/>
 
   	 <key style="special" width="large"><binding action="backspace"/></key>
        </row>
@@ -111,9 +109,11 @@
          </key>
 
          <key><binding label="&#x002C;"/></key>
-         <key width="stretched"><binding action="space"/></key>
+         <key width="xx-large"><binding action="space"/></key>
          <key><binding label="&#x002E;"/></key>
 
+         <key style="special"><binding action="close"/></key>
+
          <key style="special" width="x-large" id="actionKey">
            <binding action="return"/>
          </key>
@@ -153,7 +153,6 @@
        <row>
          <key style="special" width="large"><binding action="switch" label="1/2"/></key>
 
-         <spacer/>
          <key><binding label="&#x201C;"/></key>
          <key><binding label="&#x201D;"/></key>
          <key><binding label="&#xFF1B;"/></key>
@@ -161,7 +160,6 @@
          <key><binding label="&#x3001;"/></key>
          <key><binding label="&#xFF01;"/></key>
          <key><binding label="&#xFF1F;"/></key>
-         <spacer/>
 
   	 <key style="special" width="large"><binding action="backspace"/></key>
        </row>
@@ -172,9 +170,11 @@
          </key>
 
          <key><binding label="&#xFF0C;"/></key>
-         <key width="stretched"><binding action="space"/></key>
+         <key width="xx-large"><binding action="space"/></key>
          <key><binding label="&#x3002;"/></key>
 
+         <key style="special"><binding action="close"/></key>
+
          <key style="special" width="x-large" id="actionKey">
            <binding action="return"/>
          </key>
@@ -212,7 +212,6 @@
        <row>
          <key style="special" width="large"><binding action="switch" label="2/2"/></key>
 
-         <spacer/>
          <key><binding label="&#x0027;"/></key>
          <key><binding label="&#x0022;"/></key>
          <key><binding label="&#x003B;"/></key>
@@ -220,7 +219,6 @@
          <key><binding label="&#x00B7;"/></key>
          <key><binding label="&#x0021;"/></key>
          <key><binding label="&#x003F;"/></key>
-         <spacer/>
 
   	 <key style="special" width="large"><binding action="backspace"/></key>
        </row>
@@ -231,9 +229,11 @@
          </key>
 
          <key><binding label="&#x002C;"/></key>
-         <key width="stretched"><binding action="space"/></key>
+         <key width="xx-large"><binding action="space"/></key>
          <key><binding label="&#x002E;"/></key>
 
+         <key style="special"><binding action="close"/></key>
+
          <key style="special" width="x-large" id="actionKey">
            <binding action="return"/>
          </key>
diff --git a/maliit-keyboard/data/languages/symbols_zh_zhuyin.xml b/maliit-keyboard/data/languages/symbols_zh_zhuyin.xml
index c845573..178bda1 100644
--- a/maliit-keyboard/data/languages/symbols_zh_zhuyin.xml
+++ b/maliit-keyboard/data/languages/symbols_zh_zhuyin.xml
@@ -63,9 +63,11 @@
          </key>
 
          <key><binding label="&#xFF0C;"/></key>
-         <key width="stretched"><binding action="space"/></key>
+         <key width="xx-large"><binding action="space"/></key>
          <key><binding label="&#x3002;"/></key>
 
+         <key style="special"><binding action="close"/></key>
+
          <key style="special" width="x-large" id="actionKey">
            <binding action="return"/>
          </key>
@@ -133,9 +135,11 @@
          </key>
 
          <key><binding label="&#x002C;"/></key>
-         <key width="stretched"><binding action="space"/></key>
+         <key width="xx-large"><binding action="space"/></key>
          <key><binding label="&#x002E;"/></key>
 
+         <key style="special"><binding action="close"/></key>
+
          <key style="special" width="x-large" id="actionKey">
            <binding action="return"/>
          </key>
@@ -205,9 +209,11 @@
          </key>
 
          <key><binding label="&#xFF0C;"/></key>
-         <key width="stretched"><binding action="space"/></key>
+         <key width="xx-large"><binding action="space"/></key>
          <key><binding label="&#x3002;"/></key>
 
+         <key style="special"><binding action="close"/></key>
+
          <key style="special" width="x-large" id="actionKey">
            <binding action="return"/>
          </key>
@@ -275,9 +281,11 @@
          </key>
 
          <key><binding label="&#x002C;"/></key>
-         <key width="stretched"><binding action="space"/></key>
+         <key width="xx-large"><binding action="space"/></key>
          <key><binding label="&#x002E;"/></key>
 
+         <key style="special"><binding action="close"/></key>
+
          <key style="special" width="x-large" id="actionKey">
            <binding action="return"/>
          </key>
diff --git a/maliit-keyboard/data/languages/th.xml b/maliit-keyboard/data/languages/th.xml
index 3fbe558..329737c 100644
--- a/maliit-keyboard/data/languages/th.xml
+++ b/maliit-keyboard/data/languages/th.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE keyboard SYSTEM 'VirtualKeyboardLayout.dtd'>
 <keyboard title="ภาษาไทย" version="1.0" catalog="virtual-keyboard" language="th" autocapitalization="false">
   <layout type="general">
-    <section id="main">
+    <section id="main" style="ar">
       <row>
         <key>
           <binding label="ไ"/>
@@ -48,60 +48,67 @@
           <binding label="ล"/>
           <binding shift="true" label="ฐ"/>
         </key>
+        <key style="special" width="large">
+          <binding action="backspace"/>
+        </key>
       </row>
 
       <row>
-        <key>
+        <spacer/>
+        <key width="small">
           <binding label="ฟ"/>
           <binding shift="true" label="ฤ"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="ห"/>
           <binding shift="true" label="ฆ"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="ก"/>
           <binding shift="true" label="ฏ"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="ด"/>
           <binding shift="true" label="โ"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="เ"/>
           <binding shift="true" label="ฌ"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="้"/>
           <binding shift="true" label="็"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="่"/>
           <binding shift="true" label="๋"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="า"/>
           <binding shift="true" label="ษ"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="ส"/>
           <binding shift="true" label="ศ"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="ว"/>
           <binding shift="true" label="ณ"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="ง"/>
           <binding shift="true" label="ญ"/>
         </key>
+        <key style="special" width="x-large" id="actionKey">
+          <binding action="return"/>
+        </key>
+        <spacer/>
       </row>
 
       <row>
-        <key style="special" width="x-large">
+        <key style="special">
           <binding action="shift"/>
         </key>
-
         <key>
           <binding label="ผ"/>
           <binding shift="true" label="ฉ"/>
@@ -134,42 +141,41 @@
           <binding label="ม"/>
           <binding shift="true" label="ซ"/>
         </key>
-
-        <key style="special" width="x-large">
-          <binding action="backspace"/>
+        <key>
+          <binding label="ใ"/>
+          <binding shift="true" label="ฒ"/>
+        </key>
+        <key>
+          <binding label="ฝ"/>
+          <binding shift="true" label="ฬ"/>
+        </key>
+        <key style="special">
+          <binding action="shift"/>
         </key>
       </row>
 
       <row>
-        <key style="special" width="x-large">
+        <key style="special" width="large">
           <binding action="sym" label="?123"/>
         </key>
-
-        <key>
+        <key style="special">
+          <binding action="right-layout"/>
+        </key>
+        <key width="small">
           <binding label="ึ"/>
           <binding shift="true" label="."/>
         </key>
-        <key id="emailUrlKey">
-          <binding label="ุ"/>
-          <binding shift="true" label="ู"/>          
-        </key>
-
         <key width="stretched">
           <binding action="space" label=""/>
         </key>
-
-        <key>
-          <binding label="ใ"/>
-          <binding shift="true" label="ฒ"/>
-        </key>
-        <key>
-          <binding label="ฝ"/>
-          <binding shift="true" label="ฬ"/>
+        <key width="small" id="emailUrlKey">
+          <binding label="ุ"/>
+          <binding shift="true" label="ู"/>          
         </key>
-
-        <key style="special" width="xx-large" id="actionKey">
-          <binding action="return"/>
+        <key style="special" width="large">
+          <binding action="sym" label="?123"/>
         </key>
+        <key style="special"><binding action="close"/></key>
       </row>
     </section>
   </layout>
diff --git a/maliit-keyboard/data/languages/tr.xml b/maliit-keyboard/data/languages/tr.xml
index 40f4676..3e8d1e1 100644
--- a/maliit-keyboard/data/languages/tr.xml
+++ b/maliit-keyboard/data/languages/tr.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE keyboard SYSTEM 'VirtualKeyboardLayout.dtd'>
 <keyboard title="Türkçe" version="1.0" catalog="" language="tr">
   <layout type="general">
-    <section id="main">
+    <section id="main" style="ar">
       <row>
         <key>
           <binding label="q"/>
@@ -48,60 +48,67 @@
           <binding label="ü"/>
           <binding shift="true" label="Ü"/>
         </key>
+        <key style="special" width="large">
+          <binding action="backspace"/>
+        </key>
       </row>
 
       <row>
-        <key>
+        <spacer/>
+        <key width="small">
           <binding label="a" extended_labels="&#226;"/>
           <binding shift="true" label="A" extended_labels="&#194;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="s" extended_labels="$"/>
           <binding shift="true" label="S" extended_labels="$"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="d"/>
           <binding shift="true" label="D"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="f"/>
           <binding shift="true" label="F"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="g"/>
           <binding shift="true" label="G"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="h"/>
           <binding shift="true" label="H"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="j"/>
           <binding shift="true" label="J"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="k"/>
           <binding shift="true" label="K"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="l"/>
           <binding shift="true" label="L"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="ş"/>
           <binding shift="true" label="Ş"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="i"/>
           <binding shift="true" label="İ"/>
         </key>
+        <key style="special" width="x-large" id="actionKey">
+          <binding action="return"/>
+        </key>
+        <spacer/>
       </row>
 
       <row>
-        <key style="special" width="x-large">
+        <key style="special" width="large">
           <binding action="shift"/>
         </key>
-
         <key>
           <binding label="z"/>
           <binding shift="true" label="Z"/>
@@ -134,36 +141,35 @@
           <binding label="ö"/>
           <binding shift="true" label="Ö"/>
         </key>
-
-        <key style="special" width="x-large">
-          <binding action="backspace"/>
+        <key id="emailUrlKey"><binding label=","/></key>
+        <key><binding label="."/></key>
+        <key style="special">
+          <binding action="shift"/>
         </key>
       </row>
 
       <row>
-        <key style="special" width="x-large">
+        <key style="special">
           <binding action="sym" label="?123"/>
         </key>
-
+        <key style="special">
+          <binding action="right-layout"/>
+        </key>
         <key>
           <binding label="ğ"/>
           <binding shift="true" label="Ğ"/>
         </key>
-        <key id="emailUrlKey"><binding label=","/></key>
-
         <key width="stretched">
-          <binding action="space" label=""/>
+          <binding action="space"/>
         </key>
-
-        <key><binding label="."/></key>
         <key>
           <binding label="ç"/>
           <binding shift="true" label="Ç"/>
         </key>
-
-        <key style="special" width="xx-large" id="actionKey">
-          <binding action="return"/>
+        <key style="special">
+          <binding action="sym" label="?123"/>
         </key>
+        <key style="special"><binding action="close"/></key>
       </row>
     </section>
   </layout>
diff --git a/maliit-keyboard/data/languages/uk.xml b/maliit-keyboard/data/languages/uk.xml
index 690a301..4c27965 100644
--- a/maliit-keyboard/data/languages/uk.xml
+++ b/maliit-keyboard/data/languages/uk.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE keyboard SYSTEM 'VirtualKeyboardLayout.dtd'>
 <keyboard title="Українська" version="1.0" catalog="" language="uk">
   <layout type="general">
-    <section id="main">
+    <section id="main" style="ar">
       <row>
         <key>
           <binding label="й"/>
@@ -48,126 +48,132 @@
           <binding label="х"/>
           <binding shift="true" label="Х"/>
         </key>
+        <key style="special" width="large">
+          <binding action="backspace"/>
+        </key>
       </row>
 
       <row>
-        <key>
+        <spacer/>
+        <key width="small">
           <binding label="ф"/>
           <binding shift="true" label="Ф"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="і"/>
           <binding shift="true" label="І"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="в"/>
           <binding shift="true" label="В"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="а"/>
           <binding shift="true" label="А"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="п"/>
           <binding shift="true" label="П"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="р"/>
           <binding shift="true" label="Р"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="о"/>
           <binding shift="true" label="О"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="л"/>
           <binding shift="true" label="Л"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="д"/>
           <binding shift="true" label="Д"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="ж"/>
           <binding shift="true" label="Ж"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="є"/>
           <binding shift="true" label="Є"/>
         </key>
+        <key style="special" width="x-large" id="actionKey">
+          <binding action="return"/>
+        </key>
+        <spacer/>
       </row>
 
       <row>
-        <key style="special">
+        <key style="special" width="large">
           <binding action="shift"/>
         </key>
-
-        <key>
+        <key width="small">
           <binding label="ґ"/>
           <binding shift="true" label="Ґ"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="я"/>
           <binding shift="true" label="Я"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="ч"/>
           <binding shift="true" label="Ч"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="с"/>
           <binding shift="true" label="С"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="м"/>
           <binding shift="true" label="М"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="и"/>
           <binding shift="true" label="И"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="т"/>
           <binding shift="true" label="Т"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="ь"/>
           <binding shift="true" label="Ь"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="б"/>
           <binding shift="true" label="Б"/>
         </key>
-
-        <key style="special">
-          <binding action="backspace"/>
+        <key width="small" id="emailUrlKey"><binding label=","/></key>
+        <key width="small"><binding label="."/></key>
+        <key style="special" width="large">
+          <binding action="shift"/>
         </key>
       </row>
 
       <row>
-        <key style="special" width="large">
+        <key style="special">
           <binding action="sym" label="?123"/>
         </key>
-
+        <key style="special">
+          <binding action="right-layout"/>
+        </key>
         <key>
           <binding label="ї"/>
           <binding shift="true" label="Ї"/>
         </key>
-        <key id="emailUrlKey"><binding label=","/></key>
-
-        <key width="xx-large">
+        <key width="stretched">
           <binding action="space" label=""/>
         </key>
-
-        <key><binding label="."/></key>
         <key>
           <binding label="ю"/>
           <binding shift="true" label="Ю"/>
         </key>
-
-        <key style="special" width="x-large" id="actionKey">
-          <binding action="return"/>
+        <key style="special">
+          <binding action="sym" label="?123"/>
         </key>
+        <key style="special"><binding action="close"/></key>
       </row>
     </section>
   </layout>
diff --git a/maliit-keyboard/data/languages/vi.xml b/maliit-keyboard/data/languages/vi.xml
index e979839..75ab281 100644
--- a/maliit-keyboard/data/languages/vi.xml
+++ b/maliit-keyboard/data/languages/vi.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE keyboard SYSTEM 'VirtualKeyboardLayout.dtd'>
 <keyboard title="Việt" version="1.0" catalog="virtual-keyboard" language="vi">
   <layout type="general">
-    <section id="main" style="vietnamese">
+    <section id="main">
       <row>
         <key>
            <binding label="&#x0301;"/>
@@ -46,43 +46,43 @@
       </row>
 
       <row>
-        <key>
+        <key width="small">
           <binding label="q"/>
           <binding shift="true" label="Q"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="w"/>
           <binding shift="true" label="W"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="e"/>
           <binding shift="true" label="E"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="r"/>
           <binding shift="true" label="R"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="t"/>
           <binding shift="true" label="T"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="y"/>
           <binding shift="true" label="Y"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="u"/>
           <binding shift="true" label="U"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="i"/>
           <binding shift="true" label="I"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="o"/>
           <binding shift="true" label="O"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="p"/>
           <binding shift="true" label="P"/>
         </key>
@@ -90,11 +90,13 @@
           <binding label="đ"/>
           <binding shift="true" label="Đ"/>
         </key>
+        <key style="special">
+          <binding action="backspace"/>
+        </key>
       </row>
 
       <row>
         <spacer/>
-
         <key>
           <binding label="a"/>
           <binding shift="true" label="A"/>
@@ -131,17 +133,16 @@
           <binding label="l"/>
           <binding shift="true" label="L"/>
         </key>
-
+        <key style="special" width="large" id="actionKey">
+          <binding action="return"/>
+        </key>
         <spacer/>
       </row>
 
       <row>
-        <key style="special" width="x-large">
+        <key style="special">
           <binding action="shift"/>
         </key>
-
-        <spacer/>
-
         <key>
           <binding label="z"/>
           <binding shift="true" label="Z"/>
@@ -170,30 +171,25 @@
           <binding label="m"/>
           <binding shift="true" label="M"/>
         </key>
-
-        <spacer/>
-
-        <key style="special" width="x-large">
-          <binding action="backspace"/>
+        <key id="emailUrlKey"><binding label=","/></key>
+        <key><binding label="."/></key>
+        <key style="special">
+          <binding action="shift"/>
         </key>
       </row>
 
       <row>
-        <key style="special" width="x-large">
+        <key style="special" width="large">
           <binding action="sym" label="?123"/>
         </key>
-
-        <spacer/>
-
-        <key id="emailUrlKey"><binding label=","/></key>
+        <key style="special">
+          <binding action="right-layout"/>
+        </key>
         <key width="stretched"><binding action="space"/></key>
-        <key><binding label="."/></key>
-
-        <spacer/>
-
-        <key style="special" width="xx-large" id="actionKey">
-          <binding action="return"/>
+        <key style="special" width="large">
+          <binding action="sym" label="?123"/>
         </key>
+        <key style="special"><binding action="close"/></key>
       </row>
     </section>
   </layout>
diff --git a/maliit-keyboard/data/languages/zh_cn_cangjie.xml b/maliit-keyboard/data/languages/zh_cn_cangjie.xml
index 0428e6f..b1a96a8 100644
--- a/maliit-keyboard/data/languages/zh_cn_cangjie.xml
+++ b/maliit-keyboard/data/languages/zh_cn_cangjie.xml
@@ -35,7 +35,6 @@
             <binding action="on_off_toggle" label="&#x901F;&#x6210;"/>
           </key>
 
-          <spacer/>
           <key><binding label="&#x91CD;"/></key>
           <key><binding label="&#x96E3;"/></key>
           <key><binding label="&#x91D1;"/></key>
@@ -43,7 +42,6 @@
           <key><binding label="&#x6708;"/></key>
           <key><binding label="&#x5F13;"/></key>
           <key><binding label="&#x4E00;"/></key>
-          <spacer/>
 
           <key style="special" width="large">
             <binding action="backspace" label=""/>
@@ -56,9 +54,11 @@
           </key>
 
           <key id="emailUrlKey"><binding label="&#xFF0C;"/></key>
-          <key width="stretched"><binding action="space" label=""/></key>
+          <key width="xx-large"><binding action="space" label=""/></key>
           <key id="emailUrlDotKey"><binding label="&#x3002;"/></key>
 
+          <key style="special"><binding action="close"/></key>
+
           <key style="special" width="x-large" id="actionKey">
             <binding action="return"/>
           </key>
@@ -100,7 +100,6 @@
             <binding action="on_off_toggle" label="&#x901F;&#x6210;"/>
           </key>
 
-          <spacer/>
           <key><binding label="&#x91CD;"/></key>
           <key><binding label="&#x96E3;"/></key>
           <key><binding label="&#x91D1;"/></key>
@@ -108,7 +107,6 @@
           <key><binding label="&#x6708;"/></key>
           <key><binding label="&#x5F13;"/></key>
           <key><binding label="&#x4E00;"/></key>
-          <spacer/>
 
           <key style="special" width="large">
             <binding action="backspace" label=""/>
@@ -124,6 +122,8 @@
           <key width="stretched"><binding action="space" label=""/></key>
           <key id="emailUrlDotKey"><binding label="&#x3002;"/></key>
 
+          <key style="special"><binding action="close"/></key>
+
           <key style="special" width="xx-large" id="actionKey">
             <binding action="return"/>
           </key>
diff --git a/maliit-keyboard/data/languages/zh_cn_pinyin.xml b/maliit-keyboard/data/languages/zh_cn_pinyin.xml
index 7fea7e3..398c1eb 100644
--- a/maliit-keyboard/data/languages/zh_cn_pinyin.xml
+++ b/maliit-keyboard/data/languages/zh_cn_pinyin.xml
@@ -94,8 +94,6 @@
             <binding action="shift" label=""/>
           </key>
 
-          <spacer/>
-
           <key>
             <binding label="z"/>
             <binding shift="true" label="Z"/>
@@ -125,8 +123,6 @@
             <binding shift="true" label="M"/>
           </key>
 
-          <spacer/>
-
           <key style="special" width="large">
             <binding action="backspace" label=""/>
           </key>
@@ -138,9 +134,11 @@
           </key>
 
           <key id="emailUrlKey"><binding label="&#xFF0C;"/></key>
-          <key width="stretched"><binding action="space" label=""/></key>
+          <key width="xx-large"><binding action="space" label=""/></key>
           <key id="emailUrlDotKey"><binding label="&#x3002;"/></key>
 
+          <key style="special"><binding action="close"/></key>
+
           <key style="special" width="x-large" id="actionKey">
                 <binding action="compose" label="&#36755;&#20837;"/>
           </key>
diff --git a/maliit-keyboard/data/languages/zh_cn_zhuyin.xml b/maliit-keyboard/data/languages/zh_cn_zhuyin.xml
index 6febc82..31039d7 100644
--- a/maliit-keyboard/data/languages/zh_cn_zhuyin.xml
+++ b/maliit-keyboard/data/languages/zh_cn_zhuyin.xml
@@ -5,89 +5,53 @@
       <section id="main">
         <row>
           <key><binding label="&#x3105;"/></key>
-          <spacer/>
           <key><binding label="&#x3109;"/></key>
-          <spacer/>
           <key><binding label="&#x02C7;"/></key>
-          <spacer/>
           <key><binding label="&#x02CB;"/></key>
-          <spacer/>
           <key><binding label="&#x3113;"/></key>
-          <spacer/>
           <key><binding label="&#x02CA;"/></key>
-          <spacer/>
           <key><binding label="&#x02D9;"/></key>
-          <spacer/>
           <key><binding label="&#x311A;"/></key>
-          <spacer/>
           <key><binding label="&#x311E;"/></key>
-          <spacer/>
           <key><binding label="&#x3122;"/></key>
         </row>
 
         <row>
           <key><binding label="&#x3106;"/></key>
-          <spacer/>
           <key><binding label="&#x310A;"/></key>
-          <spacer/>
           <key><binding label="&#x310D;"/></key>
-          <spacer/>
           <key><binding label="&#x3110;"/></key>
-          <spacer/>
           <key><binding label="&#x3114;"/></key>
-          <spacer/>
           <key><binding label="&#x3117;"/></key>
-          <spacer/>
           <key><binding label="&#x3127;"/></key>
-          <spacer/>
           <key><binding label="&#x311B;"/></key>
-          <spacer/>
           <key><binding label="&#x311F;"/></key>
-          <spacer/>
           <key><binding label="&#x3123;"/></key>
         </row>
 
         <row>
           <key><binding label="&#x3107;"/></key>
-          <spacer/>
           <key><binding label="&#x310B;"/></key>
-          <spacer/>
           <key><binding label="&#x310E;"/></key>
-          <spacer/>
           <key><binding label="&#x3111;"/></key>
-          <spacer/>
           <key><binding label="&#x3115;"/></key>
-          <spacer/>
           <key><binding label="&#x3118;"/></key>
-          <spacer/>
           <key><binding label="&#x3128;"/></key>
-          <spacer/>
           <key><binding label="&#x311C;"/></key>
-          <spacer/>
           <key><binding label="&#x3120;"/></key>
-          <spacer/>
           <key><binding label="&#x3124;"/></key>
         </row>
 
         <row>
           <key><binding label="&#x3108;"/></key>
-          <spacer/>
           <key><binding label="&#x310C;"/></key>
-          <spacer/>
           <key><binding label="&#x310F;"/></key>
-          <spacer/>
           <key><binding label="&#x3112;"/></key>
-          <spacer/>
           <key><binding label="&#x3116;"/></key>
-          <spacer/>
           <key><binding label="&#x3119;"/></key>
-          <spacer/>
           <key><binding label="&#x3129;"/></key>
-          <spacer/>
           <key><binding label="&#x311D;"/></key>
-          <spacer/>
           <key><binding label="&#x3121;"/></key>
-          <spacer/>
           <key><binding label="&#x3125;"/></key>
         </row>
 
@@ -98,14 +62,16 @@
 
           <key id="emailUrlKey"><binding label="&#xFF0C;"/></key>
           <key id="emailUrlDotKey"><binding label="&#x3002;"/></key>
-          <key width="stretched"><binding action="space" label=""/> </key>
+          <key width="x-large"><binding action="space" label=""/> </key>
           <key><binding label="&#x3126;"/></key>
 
-          <key style="special" width="large">
+          <key style="special">
             <binding action="backspace" label=""/>
           </key>
 
-          <key style="special" width="x-large" id="actionKey">
+          <key style="special"><binding action="close"/></key>
+
+          <key style="special" id="actionKey">
             <binding action="compose" label="&#36664;&#20837;"/>
           </key>
         </row>
@@ -116,89 +82,53 @@
       <section id="main">
         <row>
           <key><binding label="&#x3105;"/></key>
-          <spacer/>
           <key><binding label="&#x3109;"/></key>
-          <spacer/>
           <key><binding label="&#x02C7;"/></key>
-          <spacer/>
           <key><binding label="&#x02CB;"/></key>
-          <spacer/>
           <key><binding label="&#x3113;"/></key>
-          <spacer/>
           <key><binding label="&#x02CA;"/></key>
-          <spacer/>
           <key><binding label="&#x02D9;"/></key>
-          <spacer/>
           <key><binding label="&#x311A;"/></key>
-          <spacer/>
           <key><binding label="&#x311E;"/></key>
-          <spacer/>
           <key><binding label="&#x3122;"/></key>
         </row>
 
         <row>
           <key><binding label="&#x3106;"/></key>
-          <spacer/>
           <key><binding label="&#x310A;"/></key>
-          <spacer/>
           <key><binding label="&#x310D;"/></key>
-          <spacer/>
           <key><binding label="&#x3110;"/></key>
-          <spacer/>
           <key><binding label="&#x3114;"/></key>
-          <spacer/>
           <key><binding label="&#x3117;"/></key>
-          <spacer/>
           <key><binding label="&#x3127;"/></key>
-          <spacer/>
           <key><binding label="&#x311B;"/></key>
-          <spacer/>
           <key><binding label="&#x311F;"/></key>
-          <spacer/>
           <key><binding label="&#x3123;"/></key>
         </row>
 
         <row>
           <key><binding label="&#x3107;"/></key>
-          <spacer/>
           <key><binding label="&#x310B;"/></key>
-          <spacer/>
           <key><binding label="&#x310E;"/></key>
-          <spacer/>
           <key><binding label="&#x3111;"/></key>
-          <spacer/>
           <key><binding label="&#x3115;"/></key>
-          <spacer/>
           <key><binding label="&#x3118;"/></key>
-          <spacer/>
           <key><binding label="&#x3128;"/></key>
-          <spacer/>
           <key><binding label="&#x311C;"/></key>
-          <spacer/>
           <key><binding label="&#x3120;"/></key>
-          <spacer/>
           <key><binding label="&#x3124;"/></key>
         </row>
 
         <row>
           <key><binding label="&#x3108;"/></key>
-          <spacer/>
           <key><binding label="&#x310C;"/></key>
-          <spacer/>
           <key><binding label="&#x310F;"/></key>
-          <spacer/>
           <key><binding label="&#x3112;"/></key>
-          <spacer/>
           <key><binding label="&#x3116;"/></key>
-          <spacer/>
           <key><binding label="&#x3119;"/></key>
-          <spacer/>
           <key><binding label="&#x3129;"/></key>
-          <spacer/>
           <key><binding label="&#x311D;"/></key>
-          <spacer/>
           <key><binding label="&#x3121;"/></key>
-          <spacer/>
           <key><binding label="&#x3125;"/></key>
         </row>
 
diff --git a/maliit-keyboard/data/styles/olpc-xo/main.ini b/maliit-keyboard/data/styles/olpc-xo/main.ini
index 039bb89..fe10c43 100644
--- a/maliit-keyboard/data/styles/olpc-xo/main.ini
+++ b/maliit-keyboard/data/styles/olpc-xo/main.ini
@@ -98,12 +98,3 @@ portrait\key-width-large=70
 portrait\key-width-xlarge=115
 portrait\key-width-xxlarge=338
 portrait\key-width-stretched=440
-
-[vietnamese]
-landscape\key-width=99
-landscape\key-width-small=88
-landscape\key-width-large=170
-landscape\key-width-xlarge=208
-landscape\key-width-xxlarge=426
-landscape\key-width-stretched=470
-
-- 
1.7.9.6 (Apple Git-31.1)


From 02630a4d650adc0f0a1605cf9cd07374ae336f39 Mon Sep 17 00:00:00 2001
From: Gary Martin <gary@garycmartin.com>
Date: Tue, 30 Oct 2012 23:34:07 +0000
Subject: [PATCH 2/2] Swap language and left symbol key position for stable
 language key location when navigating, includes xo
 layout update for hy_am_alt (Armenian).

---
 maliit-keyboard/data/languages/ar.xml              |    9 +-
 maliit-keyboard/data/languages/bg_bg.xml           |    7 +-
 maliit-keyboard/data/languages/cs.xml              |    8 +-
 maliit-keyboard/data/languages/da.xml              |    8 +-
 maliit-keyboard/data/languages/de.xml              |   10 +-
 maliit-keyboard/data/languages/el_gr.xml           |    9 +-
 maliit-keyboard/data/languages/en_gb.xml           |    6 +-
 maliit-keyboard/data/languages/en_us.xml           |    8 +-
 maliit-keyboard/data/languages/es.xml              |   10 +-
 maliit-keyboard/data/languages/et.xml              |    7 +-
 maliit-keyboard/data/languages/fa.xml              |    6 +-
 maliit-keyboard/data/languages/fi.xml              |    6 +-
 maliit-keyboard/data/languages/fr.xml              |   10 +-
 maliit-keyboard/data/languages/fr_ca.xml           |    4 +-
 maliit-keyboard/data/languages/he.xml              |    6 +-
 maliit-keyboard/data/languages/hu.xml              |    6 +-
 maliit-keyboard/data/languages/hy_am_alt.xml       |  188 ---------------
 maliit-keyboard/data/languages/id.xml              |    6 +-
 maliit-keyboard/data/languages/it.xml              |    4 +-
 maliit-keyboard/data/languages/kk.xml              |    6 +-
 maliit-keyboard/data/languages/lt.xml              |    6 +-
 maliit-keyboard/data/languages/mk_mk.xml           |    4 +-
 maliit-keyboard/data/languages/ms.xml              |    6 +-
 maliit-keyboard/data/languages/nl.xml              |    6 +-
 maliit-keyboard/data/languages/no.xml              |    4 +-
 maliit-keyboard/data/languages/pl.xml              |    6 +-
 maliit-keyboard/data/languages/pt.xml              |    4 +-
 maliit-keyboard/data/languages/ro.xml              |    4 +-
 maliit-keyboard/data/languages/ru.xml              |    4 +-
 maliit-keyboard/data/languages/sk.xml              |    6 +-
 maliit-keyboard/data/languages/sv.xml              |    4 +-
 maliit-keyboard/data/languages/symbols-35-fi.xml   |   12 +-
 maliit-keyboard/data/languages/symbols-35.xml      |    8 +-
 .../data/languages/symbols-36-nordic.xml           |   10 +-
 maliit-keyboard/data/languages/symbols-36.xml      |    8 +-
 maliit-keyboard/data/languages/symbols-38.xml      |   12 +-
 maliit-keyboard/data/languages/symbols-39.xml      |    8 +-
 maliit-keyboard/data/languages/symbols_ar.xml      |    8 +-
 maliit-keyboard/data/languages/symbols_en.xml      |   12 +-
 maliit-keyboard/data/languages/symbols_fa.xml      |   12 +-
 maliit-keyboard/data/languages/symbols_he.xml      |   12 +-
 maliit-keyboard/data/languages/symbols_hy.xml      |  239 ++++++++++++--------
 maliit-keyboard/data/languages/symbols_kk.xml      |   12 +-
 maliit-keyboard/data/languages/symbols_ru_uk.xml   |    8 +-
 maliit-keyboard/data/languages/symbols_th.xml      |   28 +--
 maliit-keyboard/data/languages/symbols_vi.xml      |    6 +-
 maliit-keyboard/data/languages/th.xml              |   14 +-
 maliit-keyboard/data/languages/tr.xml              |    4 +-
 maliit-keyboard/data/languages/uk.xml              |    4 +-
 maliit-keyboard/data/languages/vi.xml              |    6 +-
 maliit-keyboard/data/styles/olpc-xo/main.ini       |    2 +-
 51 files changed, 308 insertions(+), 495 deletions(-)
 delete mode 100644 maliit-keyboard/data/languages/hy_am_alt.xml

diff --git a/maliit-keyboard/data/languages/ar.xml b/maliit-keyboard/data/languages/ar.xml
index 59c04bd..b8041b0 100644
--- a/maliit-keyboard/data/languages/ar.xml
+++ b/maliit-keyboard/data/languages/ar.xml
@@ -127,24 +127,19 @@
 
       <row>
         <key style="special">
-          <binding action="sym" label="&#x061F;&#x0663;&#x0662;&#x0661;"/>
+          <binding action="right-layout"/>
         </key>
         <key style="special">
-          <binding action="right-layout"/>
+          <binding action="sym" label="&#x061F;&#x0663;&#x0662;&#x0661;"/>
         </key>
-        
         <key><binding label="ذ"/></key>
-
         <key width="stretched">
           <binding action="space"/>
         </key>
-        
         <key><binding label="ط"/></key>
-
         <key style="special">
           <binding action="sym" label="&#x061F;&#x0663;&#x0662;&#x0661;"/>
         </key>
-
         <key style="special"><binding action="close"/></key>
 
       </row>
diff --git a/maliit-keyboard/data/languages/bg_bg.xml b/maliit-keyboard/data/languages/bg_bg.xml
index 8fe9dbc..ac25a6e 100644
--- a/maliit-keyboard/data/languages/bg_bg.xml
+++ b/maliit-keyboard/data/languages/bg_bg.xml
@@ -143,13 +143,12 @@
       </row>
 
       <row>
-        <key style="special" width="large">
-          <binding action="sym" label="?123"/>
-        </key>
         <key style="special">
           <binding action="right-layout"/>
         </key>
-
+        <key style="special" width="large">
+          <binding action="sym" label="?123"/>
+        </key>
         <key>
           <binding label="ш"/>
           <binding shift="true" label="Ш"/>
diff --git a/maliit-keyboard/data/languages/cs.xml b/maliit-keyboard/data/languages/cs.xml
index b1ecacf..61f23f5 100644
--- a/maliit-keyboard/data/languages/cs.xml
+++ b/maliit-keyboard/data/languages/cs.xml
@@ -139,25 +139,21 @@
 
       <row>
         <key style="special">
-          <binding action="sym" label="?123"/>
+          <binding action="right-layout"/>
         </key>
         <key style="special">
-          <binding action="right-layout"/>
+          <binding action="sym" label="?123"/>
         </key>
-
         <key style="special">
           <binding dead="true" label="ˇ"/>
         </key>
-
         <key width="stretched">
           <binding action="space" label=""/>
         </key>
-
         <key style="special">
           <binding action="sym" label="?123"/>
         </key>
         <key style="special"><binding action="close"/></key>
-
       </row>
 
     </section>
diff --git a/maliit-keyboard/data/languages/da.xml b/maliit-keyboard/data/languages/da.xml
index d24361c..2db2137 100644
--- a/maliit-keyboard/data/languages/da.xml
+++ b/maliit-keyboard/data/languages/da.xml
@@ -142,16 +142,14 @@
 
       <row>
       <key style="special">
-        <binding action="sym" label="?123"/>
+        <binding action="right-layout"/>
       </key>
       <key style="special">
-        <binding action="right-layout"/>
+        <binding action="sym" label="?123"/>
       </key>
-
       <key width="stretched">
         <binding action="space" label=""/>
       </key>
-
       <key>
         <binding label="ø" extended_labels="ö"/>
         <binding shift="true" label="Ø" extended_labels="Ö"/>
@@ -159,9 +157,7 @@
       <key style="special">
         <binding action="sym" label="?123"/>
       </key>
-
       <key style="special"><binding action="close"/></key>
-
     </row>
     </section>
   </layout>
diff --git a/maliit-keyboard/data/languages/de.xml b/maliit-keyboard/data/languages/de.xml
index 16235b8..4cb8503 100644
--- a/maliit-keyboard/data/languages/de.xml
+++ b/maliit-keyboard/data/languages/de.xml
@@ -148,17 +148,15 @@
       </row>
 
       <row>
-      <key style="special">
-        <binding action="sym" label="?123"/>
-      </key>
         <key style="special">
           <binding action="right-layout"/>
         </key>
-
+      <key style="special">
+        <binding action="sym" label="?123"/>
+      </key>
       <key width="stretched">
         <binding action="space"/>
       </key>
-
       <key>
         <binding label="ö"/>
         <binding shift="true" label="Ö"/>
@@ -166,9 +164,7 @@
       <key style="special">
         <binding action="sym" label="?123"/>
       </key>
-
       <key style="special"><binding action="close"/></key>
-
       </row>
     </section>
   </layout>
diff --git a/maliit-keyboard/data/languages/el_gr.xml b/maliit-keyboard/data/languages/el_gr.xml
index 6fcacda..0c92106 100644
--- a/maliit-keyboard/data/languages/el_gr.xml
+++ b/maliit-keyboard/data/languages/el_gr.xml
@@ -136,20 +136,17 @@
       </row>
 
       <row>
+        <key style="special">
+          <binding action="right-layout"/>
+        </key>
         <key style="special" width="large">
           <binding action="sym" label="?123"/>
         </key>
-      <key style="special">
-        <binding action="right-layout"/>
-      </key>
-
         <key width="stretched"><binding action="space"/></key>
         <key style="special" width="large">
           <binding action="sym" label="?123"/>
         </key>
-
         <key style="special"><binding action="close"/></key>
-
       </row>
     </section>
   </layout>
diff --git a/maliit-keyboard/data/languages/en_gb.xml b/maliit-keyboard/data/languages/en_gb.xml
index c2a9fac..20e30ae 100644
--- a/maliit-keyboard/data/languages/en_gb.xml
+++ b/maliit-keyboard/data/languages/en_gb.xml
@@ -136,12 +136,12 @@
       </row>
 
       <row>
-        <key style="special" width="large">
-          <binding action="sym" label="?123"/>
-        </key>
         <key style="special">
           <binding action="right-layout"/>
         </key>
+        <key style="special" width="large">
+          <binding action="sym" label="?123"/>
+        </key>
         <key width="stretched">
           <binding action="space"/>
         </key>
diff --git a/maliit-keyboard/data/languages/en_us.xml b/maliit-keyboard/data/languages/en_us.xml
index 31b2126..94be3e7 100644
--- a/maliit-keyboard/data/languages/en_us.xml
+++ b/maliit-keyboard/data/languages/en_us.xml
@@ -137,19 +137,17 @@
       </row>
 
       <row>
-        <key style="special" width="large">
-          <binding action="sym" label="?123"/>
-        </key>
         <key style="special">
           <binding action="right-layout"/>
         </key>
-
+        <key style="special" width="large">
+          <binding action="sym" label="?123"/>
+        </key>
         <key width="stretched"><binding action="space"/></key>
         <key style="special" width="large">
           <binding action="sym" label="?123"/>
         </key>
         <key style="special"><binding action="close"/></key>
-
       </row>
     </section>
   </layout>
diff --git a/maliit-keyboard/data/languages/es.xml b/maliit-keyboard/data/languages/es.xml
index 9edacaf..e986e94 100644
--- a/maliit-keyboard/data/languages/es.xml
+++ b/maliit-keyboard/data/languages/es.xml
@@ -139,27 +139,21 @@
 
       <row>
       <key style="special">
-        <binding action="sym" label="?123"/>
+        <binding action="right-layout"/>
       </key>
-
       <key style="special">
-        <binding action="right-layout"/>
+        <binding action="sym" label="?123"/>
       </key>
-
       <key style="special">
         <binding dead="true" label="´"/>
       </key>
-
       <key width="stretched">
         <binding action="space" label=""/>
       </key>
-
       <key style="special">
         <binding action="sym" label="?123"/>
       </key>
-
       <key style="special"><binding action="close"/></key>
-
       </row>
     </section>
   </layout>
diff --git a/maliit-keyboard/data/languages/et.xml b/maliit-keyboard/data/languages/et.xml
index ce4ef09..d31ebfe 100644
--- a/maliit-keyboard/data/languages/et.xml
+++ b/maliit-keyboard/data/languages/et.xml
@@ -148,12 +148,12 @@
       </row>
 
       <row>
-        <key style="special" width="large">
-          <binding action="sym" label="?123"/>
-        </key>
         <key style="special">
           <binding action="right-layout"/>
         </key>
+        <key style="special" width="large">
+          <binding action="sym" label="?123"/>
+        </key>
         <key width="xx-large">
           <binding action="space" label=""/>
         </key>
@@ -169,7 +169,6 @@
           <binding action="sym" label="?123"/>
         </key>
         <key style="special"><binding action="close"/></key>
-
       </row>
     </section>
   </layout>
diff --git a/maliit-keyboard/data/languages/fa.xml b/maliit-keyboard/data/languages/fa.xml
index 10c5d24..bcef238 100644
--- a/maliit-keyboard/data/languages/fa.xml
+++ b/maliit-keyboard/data/languages/fa.xml
@@ -119,12 +119,12 @@
       </row>
 
       <row>
-        <key style="special" width="x-large">
-          <binding action="sym" label="&#x061F;&#x06F3;&#x06F2;&#x06F1;"/>
-        </key>
         <key style="special">
           <binding action="right-layout"/>
         </key>
+        <key style="special" width="x-large">
+          <binding action="sym" label="&#x061F;&#x06F3;&#x06F2;&#x06F1;"/>
+        </key>
         <key>
           <binding label="ئ"/>
         </key>
diff --git a/maliit-keyboard/data/languages/fi.xml b/maliit-keyboard/data/languages/fi.xml
index dec05c0..f722b8f 100644
--- a/maliit-keyboard/data/languages/fi.xml
+++ b/maliit-keyboard/data/languages/fi.xml
@@ -141,12 +141,12 @@
       </row>
 
       <row>
-      <key style="special" width="large">
-        <binding action="sym" label="?123"/>
-      </key>
       <key style="special">
         <binding action="right-layout"/>
       </key>
+      <key style="special" width="large">
+        <binding action="sym" label="?123"/>
+      </key>
       <key width="stretched">
         <binding action="space" label=""/>
       </key>
diff --git a/maliit-keyboard/data/languages/fr.xml b/maliit-keyboard/data/languages/fr.xml
index 5601261..3249213 100644
--- a/maliit-keyboard/data/languages/fr.xml
+++ b/maliit-keyboard/data/languages/fr.xml
@@ -138,23 +138,17 @@
 
       <row>
         <key style="special">
-          <binding action="sym" label="?123"/>
+          <binding action="right-layout"/>
         </key>
-
         <key style="special">
-          <binding action="right-layout"/>
+          <binding action="sym" label="?123"/>
         </key>
-
         <key><binding label="&#x0027;"/></key>
-
         <key width="stretched"><binding action="space"/></key>
-
         <key style="special">
           <binding action="sym" label="?123"/>
         </key>
-
         <key style="special"><binding action="close"/></key>
-
       </row>
     </section>
   </layout>
diff --git a/maliit-keyboard/data/languages/fr_ca.xml b/maliit-keyboard/data/languages/fr_ca.xml
index bb453d1..a22ee37 100644
--- a/maliit-keyboard/data/languages/fr_ca.xml
+++ b/maliit-keyboard/data/languages/fr_ca.xml
@@ -138,10 +138,10 @@
 
       <row>
         <key style="special">
-          <binding action="sym" label="?123"/>
+          <binding action="right-layout"/>
         </key>
         <key style="special">
-          <binding action="right-layout"/>
+          <binding action="sym" label="?123"/>
         </key>
         <key><binding label="&#x0027;"/></key>
         <key width="stretched">
diff --git a/maliit-keyboard/data/languages/he.xml b/maliit-keyboard/data/languages/he.xml
index cad45ac..228d2d2 100644
--- a/maliit-keyboard/data/languages/he.xml
+++ b/maliit-keyboard/data/languages/he.xml
@@ -106,12 +106,12 @@
       </row>
 
       <row>
-        <key style="special" width="large">
-          <binding action="sym" label="?123"/>
-        </key>
         <key style="special">
           <binding action="right-layout"/>
         </key>
+        <key style="special" width="large">
+          <binding action="sym" label="?123"/>
+        </key>
         <key width="stretched"><binding action="space"/></key>
         <key style="special" width="large">
           <binding action="sym" label="?123"/>
diff --git a/maliit-keyboard/data/languages/hu.xml b/maliit-keyboard/data/languages/hu.xml
index ed4f1c1..8453e6f 100644
--- a/maliit-keyboard/data/languages/hu.xml
+++ b/maliit-keyboard/data/languages/hu.xml
@@ -139,12 +139,12 @@
       </row>
 
       <row>
-       <key style="special">
-        <binding action="sym" label="?123"/>
-       </key>
         <key style="special">
           <binding action="right-layout"/>
         </key>
+       <key style="special">
+        <binding action="sym" label="?123"/>
+       </key>
        <key style="special"><binding dead="true" label="¨"/></key>
        <key width="stretched">
         <binding action="space" label=""/>
diff --git a/maliit-keyboard/data/languages/hy_am_alt.xml b/maliit-keyboard/data/languages/hy_am_alt.xml
deleted file mode 100644
index 04d133c..0000000
--- a/maliit-keyboard/data/languages/hy_am_alt.xml
+++ /dev/null
@@ -1,188 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE keyboard SYSTEM 'VirtualKeyboardLayout.dtd'>
-<keyboard title="Հայերեն (հնչյունային)" version="1.0" catalog="hy" language="hy">
-  <layout type="general">
-    <section id="main">
-      <row>
-        <key>
-          <binding label="ք"/>
-          <binding shift="true" label="Ք"/>
-        </key>
-        <key>
-          <binding label="ո" extended_labels="օ"/>
-          <binding shift="true" label="Ո" extended_labels="Օ"/>
-        </key>
-		<key>
-          <binding label="ե"/>
-          <binding shift="true" label="Ե"/>
-        </key>
-        <key>
-          <binding label="ռ" extended_labels="12345"/>
-          <binding shift="true" label="Ռ" extended_labels="12345"/>
-        </key>
-        <key>
-          <binding label="տ" extended_labels="67890"/>
-          <binding shift="true" label="Տ" extended_labels="67890"/>
-        </key>
-        <key>
-          <binding label="ը"/>
-          <binding shift="true" label="Ը"/>
-        </key>
-        <key>
-          <binding label="ւ" extended_labels="()"/>
-          <binding shift="true" label="Ւ" extended_labels="()"/>
-        </key>
-        <key>
-          <binding label="ի"/>
-          <binding shift="true" label="Ի"/>
-        </key>
-        <key>
-          <binding label="շ"/>
-          <binding shift="true" label="Շ"/>
-        </key>
-
-		<key>
-          <binding label="պ" extended_labels="փ"/>
-          <binding shift="true" label="Պ" extended_labels="Փ"/>
-        </key>
-		<key>
-          <binding label="չ" extended_labels="ճ"/>
-          <binding shift="true" label="Չ" extended_labels="Ճ"/>
-        </key>        
-      </row>
-
-      <row>
-        <key>
-
-          <binding label="ա"/>
-          <binding shift="true" label="Ա"/>
-        </key>
-        <key>
-          <binding label="ս"/>
-          <binding shift="true" label="Ս"/>
-        </key>
-        <key>
-          <binding label="դ"/>
-          <binding shift="true" label="Դ"/>
-        </key>
-        <key>
-          <binding label="թ"/>
-          <binding shift="true" label="Թ"/>
-        </key>
-        <key>
-          <binding label="գ"/>
-          <binding shift="true" label="Գ"/>
-        </key>
-        <key>
-          <binding label="հ"/>
-          <binding shift="true" label="Հ"/>
-        </key>
-        <key>
-          <binding label="յ"/>
-          <binding shift="true" label="Յ"/>
-        </key>
-        <key>
-          <binding label="կ"/>
-          <binding shift="true" label="Կ"/>
-        </key>
-        <key>
-
-          <binding label="լ"/>
-          <binding shift="true" label="Լ"/>
-        </key>
-        <key>
-          <binding label="խ"/>
-          <binding shift="true" label="Խ"/>
-        </key>
-        <key>
-          <binding label="ծ"/>
-          <binding shift="true" label="Ծ"/>
-        </key>
-      </row>
-
-      <row>
-        <key style="special">
-          <binding action="shift" label=""/>
-        </key>
-
-        <key>
-          <binding label="զ"/>
-          <binding shift="true" label="Զ"/>
-        </key>
-        <key>
-          <binding label="ղ"/>
-          <binding shift="true" label="Ղ"/>
-        </key>
-        <key>
-          <binding label="ց"/>
-          <binding shift="true" label="Ց"/>
-        </key>
-        <key>
-          <binding label="վ" extended_labels="ֆ"/>
-          <binding shift="true" label="Վ" extended_labels="Ֆ"/>
-        </key>
-        <key>
-          <binding label="բ"/>
-          <binding shift="true" label="Բ"/>
-        </key>
-        <key>
-          <binding label="ն"/>
-          <binding shift="true" label="Ն"/>
-        </key>
-        <key>
-          <binding label="մ"/>
-          <binding shift="true" label="Մ"/>
-        </key>
-        <key>
-          <binding label="ձ"/>
-          <binding shift="true" label="Ձ"/>
-        </key>
-        <key>
-          <binding label="ժ"/>
-          <binding shift="true" label="Ժ"/>
-        </key>
-
-        <key style="special">
-          <binding action="backspace"/>
-        </key>
-      </row>
-
-      <row>
-        <key style="special" width="large">
-          <binding action="sym" label="՞123"/>
-        </key>
-
-        <key id="emailUrlKey"><binding label="," extended_labels="՞՛–՜"/></key>
-        <key>
-			<binding label="ր"/>
-			<binding shift="true" label="Ր"/>        
-		</key>
-		<key>
-			<binding label="ջ"/>
-			<binding shift="true" label="Ջ"/>        
-		</key>
-
-        <key width="stretched">
-          <binding action="space" label=""/>
-        </key>
-
-        <key><binding label="։" extended_labels="՝․"/></key>
-        <key>
-          <binding label="է"/>
-          <binding shift="true" label="Է"/>
-        </key>
-		
-		<key>
-          <binding label="և" extended_labels="«»"/>
-          <binding shift="true" label="ություն" extended_labels="«»"/>
-        </key>
-
-        <key style="special" width="x-large" id="actionKey">
-          <binding action="return"/>
-        </key>
-      </row>
-    </section>
-  </layout>
-
-  <import file="symbols_hy.xml"/>
-</keyboard>
diff --git a/maliit-keyboard/data/languages/id.xml b/maliit-keyboard/data/languages/id.xml
index 4c68d29..69c6ae9 100644
--- a/maliit-keyboard/data/languages/id.xml
+++ b/maliit-keyboard/data/languages/id.xml
@@ -133,12 +133,12 @@
       </row>
 
       <row>
-        <key style="special" width="large">
-          <binding action="sym" label="?123"/>
-        </key>
         <key style="special">
           <binding action="right-layout"/>
         </key>
+        <key style="special" width="large">
+          <binding action="sym" label="?123"/>
+        </key>
         <key width="stretched"><binding action="space"/></key>
         <key style="special" width="large">
           <binding action="sym" label="?123"/>
diff --git a/maliit-keyboard/data/languages/it.xml b/maliit-keyboard/data/languages/it.xml
index 2a956f7..860be3e 100644
--- a/maliit-keyboard/data/languages/it.xml
+++ b/maliit-keyboard/data/languages/it.xml
@@ -135,10 +135,10 @@
 
       <row>
         <key style="special">
-          <binding action="sym" label="?123"/>
+          <binding action="right-layout"/>
         </key>
         <key style="special">
-          <binding action="right-layout"/>
+          <binding action="sym" label="?123"/>
         </key>
         <key style="special">
           <binding dead="true" label="`"/>
diff --git a/maliit-keyboard/data/languages/kk.xml b/maliit-keyboard/data/languages/kk.xml
index b4316ce..4515e4a 100644
--- a/maliit-keyboard/data/languages/kk.xml
+++ b/maliit-keyboard/data/languages/kk.xml
@@ -153,12 +153,12 @@
       </row>
 
       <row>
-        <key style="special" width="x-large">
-          <binding action="sym" label="?123"/>
-        </key>
         <key style="special">
           <binding action="right-layout"/>
         </key>
+        <key style="special" width="x-large">
+          <binding action="sym" label="?123"/>
+        </key>
         <key><binding label="-"/></key>
         <key width="xx-large">
           <binding action="space" label=""/>
diff --git a/maliit-keyboard/data/languages/lt.xml b/maliit-keyboard/data/languages/lt.xml
index fa75a1a..63d957b 100644
--- a/maliit-keyboard/data/languages/lt.xml
+++ b/maliit-keyboard/data/languages/lt.xml
@@ -134,12 +134,12 @@
       </row>
 
       <row>
-        <key style="special" width="large">
-          <binding action="sym" label="?123"/>
-        </key>
         <key style="special">
           <binding action="right-layout"/>
         </key>
+        <key style="special" width="large">
+          <binding action="sym" label="?123"/>
+        </key>
         <key width="stretched"><binding action="space"/></key>
         <key style="special" width="large">
           <binding action="sym" label="?123"/>
diff --git a/maliit-keyboard/data/languages/mk_mk.xml b/maliit-keyboard/data/languages/mk_mk.xml
index 60d376d..4a12b8c 100644
--- a/maliit-keyboard/data/languages/mk_mk.xml
+++ b/maliit-keyboard/data/languages/mk_mk.xml
@@ -154,10 +154,10 @@
 
       <row>
         <key style="special">
-          <binding action="sym" label="?123"/>
+          <binding action="right-layout"/>
         </key>
         <key style="special">
-          <binding action="right-layout"/>
+          <binding action="sym" label="?123"/>
         </key>
         <key><binding label=";"/></key>
         <key width="stretched"><binding action="space"/></key>
diff --git a/maliit-keyboard/data/languages/ms.xml b/maliit-keyboard/data/languages/ms.xml
index c82a95a..5be5221 100644
--- a/maliit-keyboard/data/languages/ms.xml
+++ b/maliit-keyboard/data/languages/ms.xml
@@ -133,12 +133,12 @@
       </row>
 
       <row>
-        <key style="special" width="large">
-          <binding action="sym" label="?123"/>
-        </key>
         <key style="special">
           <binding action="right-layout"/>
         </key>
+        <key style="special" width="large">
+          <binding action="sym" label="?123"/>
+        </key>
         <key width="stretched"><binding action="space"/></key>
         <key style="special" width="large">
           <binding action="sym" label="?123"/>
diff --git a/maliit-keyboard/data/languages/nl.xml b/maliit-keyboard/data/languages/nl.xml
index 16a4f0b..ad37d09 100644
--- a/maliit-keyboard/data/languages/nl.xml
+++ b/maliit-keyboard/data/languages/nl.xml
@@ -133,12 +133,12 @@
       </row>
 
       <row>
-        <key style="special" width="large">
-          <binding action="sym" label="?123"/>
-        </key>
         <key style="special">
           <binding action="right-layout"/>
         </key>
+        <key style="special" width="large">
+          <binding action="sym" label="?123"/>
+        </key>
         <key width="stretched"><binding action="space"/></key>
         <key style="special" width="large">
           <binding action="sym" label="?123"/>
diff --git a/maliit-keyboard/data/languages/no.xml b/maliit-keyboard/data/languages/no.xml
index af0343a..9ece717 100644
--- a/maliit-keyboard/data/languages/no.xml
+++ b/maliit-keyboard/data/languages/no.xml
@@ -142,10 +142,10 @@
 
       <row>
         <key style="special">
-          <binding action="sym" label="?123"/>
+          <binding action="right-layout"/>
         </key>
         <key style="special">
-          <binding action="right-layout"/>
+          <binding action="sym" label="?123"/>
         </key>
         <key width="stretched">
           <binding action="space" label=""/>
diff --git a/maliit-keyboard/data/languages/pl.xml b/maliit-keyboard/data/languages/pl.xml
index 62a79de..eaa1d07 100644
--- a/maliit-keyboard/data/languages/pl.xml
+++ b/maliit-keyboard/data/languages/pl.xml
@@ -152,12 +152,12 @@
       </row>
 
       <row>
-        <key style="special" width="x-large">
-          <binding action="sym" label="?123"/>
-        </key>
         <key style="special" width="small">
           <binding action="right-layout"/>
         </key>
+        <key style="special" width="x-large">
+          <binding action="sym" label="?123"/>
+        </key>
         <key style="special" width="small">
           <binding dead="true" label="´"/>
         </key>
diff --git a/maliit-keyboard/data/languages/pt.xml b/maliit-keyboard/data/languages/pt.xml
index 2a29def..81d9add 100644
--- a/maliit-keyboard/data/languages/pt.xml
+++ b/maliit-keyboard/data/languages/pt.xml
@@ -138,10 +138,10 @@
 
       <row>
         <key style="special">
-          <binding action="sym" label="?123"/>
+          <binding action="right-layout"/>
         </key>
         <key style="special">
-          <binding action="right-layout"/>
+          <binding action="sym" label="?123"/>
         </key>
         <key><binding label="-"/></key>
         <key width="stretched"><binding action="space" label=""/></key>
diff --git a/maliit-keyboard/data/languages/ro.xml b/maliit-keyboard/data/languages/ro.xml
index dc2381d..da17045 100644
--- a/maliit-keyboard/data/languages/ro.xml
+++ b/maliit-keyboard/data/languages/ro.xml
@@ -135,10 +135,10 @@
 
       <row>
         <key style="special">
-          <binding action="sym" label="?123"/>
+          <binding action="right-layout"/>
         </key>
         <key style="special">
-          <binding action="right-layout"/>
+          <binding action="sym" label="?123"/>
         </key>
         <key><binding label="-"/></key>
         <key width="stretched"><binding action="space"/></key>
diff --git a/maliit-keyboard/data/languages/ru.xml b/maliit-keyboard/data/languages/ru.xml
index 33df9a4..7315b54 100644
--- a/maliit-keyboard/data/languages/ru.xml
+++ b/maliit-keyboard/data/languages/ru.xml
@@ -154,10 +154,10 @@
 
       <row>
         <key style="special">
-          <binding action="sym" label="?123"/>
+          <binding action="right-layout"/>
         </key>
         <key style="special">
-          <binding action="right-layout"/>
+          <binding action="sym" label="?123"/>
         </key>
         <key><binding label="-"/></key>
         <key width="stretched">
diff --git a/maliit-keyboard/data/languages/sk.xml b/maliit-keyboard/data/languages/sk.xml
index 9fafeb2..b830e12 100644
--- a/maliit-keyboard/data/languages/sk.xml
+++ b/maliit-keyboard/data/languages/sk.xml
@@ -141,12 +141,12 @@
       </row>
 
       <row>
-        <key style="special" width="large">
-          <binding action="sym" label="?123"/>
-        </key>
         <key style="special">
           <binding action="right-layout"/>
         </key>
+        <key style="special" width="large">
+          <binding action="sym" label="?123"/>
+        </key>
         <key style="special"><binding dead="true" label="´"/></key>
         <key width="xx-large">
           <binding action="space" label=""/>
diff --git a/maliit-keyboard/data/languages/sv.xml b/maliit-keyboard/data/languages/sv.xml
index 2cc0700..485e4b0 100644
--- a/maliit-keyboard/data/languages/sv.xml
+++ b/maliit-keyboard/data/languages/sv.xml
@@ -142,10 +142,10 @@
 
       <row>
       <key style="special">
-        <binding action="sym" label="?123"/>
+        <binding action="right-layout"/>
       </key>
       <key style="special">
-        <binding action="right-layout"/>
+        <binding action="sym" label="?123"/>
       </key>
       <key width="stretched">
         <binding action="space" label=""/>
diff --git a/maliit-keyboard/data/languages/symbols-35-fi.xml b/maliit-keyboard/data/languages/symbols-35-fi.xml
index fae2b28..00fb036 100644
--- a/maliit-keyboard/data/languages/symbols-35-fi.xml
+++ b/maliit-keyboard/data/languages/symbols-35-fi.xml
@@ -111,12 +111,12 @@
       </row>
 
       <row>
-        <key style="special" width="large">
-          <binding action="sym" label="ABC"/>
-        </key>
         <key style="special">
           <binding action="right-layout"/>
         </key>
+        <key style="special" width="large">
+          <binding action="sym" label="ABC"/>
+        </key>
         <key width="stretched">
           <binding action="space"/>
         </key>
@@ -237,12 +237,12 @@
       </row>
 
       <row>
-        <key style="special" width="large">
-          <binding action="sym" label="ABC"/>
-        </key>
         <key style="special">
           <binding action="right-layout"/>
         </key>
+        <key style="special" width="large">
+          <binding action="sym" label="ABC"/>
+        </key>
         <key width="stretched">
           <binding action="space"/>
         </key>
diff --git a/maliit-keyboard/data/languages/symbols-35.xml b/maliit-keyboard/data/languages/symbols-35.xml
index 5b8402d..8366dd7 100644
--- a/maliit-keyboard/data/languages/symbols-35.xml
+++ b/maliit-keyboard/data/languages/symbols-35.xml
@@ -113,10 +113,10 @@
 
       <row>
         <key style="special">
-          <binding action="sym" label="ABC"/>
+          <binding action="right-layout"/>
         </key>
         <key style="special">
-          <binding action="right-layout"/>
+          <binding action="sym" label="ABC"/>
         </key>
 
         <key><binding label="_"/></key>
@@ -244,10 +244,10 @@
 
       <row>
         <key style="special">
-          <binding action="sym" label="ABC"/>
+          <binding action="right-layout"/>
         </key>
         <key style="special">
-          <binding action="right-layout"/>
+          <binding action="sym" label="ABC"/>
         </key>
         <key><binding label="&#x0026;"/></key>
         <key width="stretched">
diff --git a/maliit-keyboard/data/languages/symbols-36-nordic.xml b/maliit-keyboard/data/languages/symbols-36-nordic.xml
index 69f7fdf..7719328 100644
--- a/maliit-keyboard/data/languages/symbols-36-nordic.xml
+++ b/maliit-keyboard/data/languages/symbols-36-nordic.xml
@@ -114,11 +114,10 @@
 
       <row>
         <key style="special">
-          <binding action="sym" label="ABC"/>
+          <binding action="right-layout"/>
         </key>
-
         <key style="special">
-          <binding action="right-layout"/>
+          <binding action="sym" label="ABC"/>
         </key>
 
         <key width="stretched">
@@ -247,11 +246,10 @@
 
       <row>
         <key style="special">
-          <binding action="sym" label="ABC"/>
+          <binding action="right-layout"/>
         </key>
-
         <key style="special">
-          <binding action="right-layout"/>
+          <binding action="sym" label="ABC"/>
         </key>
         
         <key width="stretched">
diff --git a/maliit-keyboard/data/languages/symbols-36.xml b/maliit-keyboard/data/languages/symbols-36.xml
index bddd9dd..fedd626 100644
--- a/maliit-keyboard/data/languages/symbols-36.xml
+++ b/maliit-keyboard/data/languages/symbols-36.xml
@@ -114,10 +114,10 @@
 
       <row>
         <key style="special">
-          <binding action="sym" label="ABC"/>
+          <binding action="right-layout"/>
         </key>
         <key style="special">
-          <binding action="right-layout"/>
+          <binding action="sym" label="ABC"/>
         </key>
         <key><binding label="_"/></key>
         <key width="stretched">
@@ -242,10 +242,10 @@
 
       <row>
         <key style="special">
-          <binding action="sym" label="ABC"/>
+          <binding action="right-layout"/>
         </key>
         <key style="special">
-          <binding action="right-layout"/>
+          <binding action="sym" label="ABC"/>
         </key>
         <key><binding label="&#x00B0;"/></key>
         <key width="stretched">
diff --git a/maliit-keyboard/data/languages/symbols-38.xml b/maliit-keyboard/data/languages/symbols-38.xml
index c8ec819..bb0c34c 100644
--- a/maliit-keyboard/data/languages/symbols-38.xml
+++ b/maliit-keyboard/data/languages/symbols-38.xml
@@ -119,12 +119,12 @@
       </row>
 
       <row>
-        <key style="special" width="x-large">
-          <binding action="sym" label="ABC"/>
-        </key>
         <key style="special" width="small">
           <binding action="right-layout"/>
         </key>
+        <key style="special" width="x-large">
+          <binding action="sym" label="ABC"/>
+        </key>
         <key width="small">
           <binding label="_"/>
         </key>
@@ -255,12 +255,12 @@
       </row>
 
       <row>
-        <key style="special" width="x-large">
-          <binding action="sym" label="ABC"/>
-        </key>
         <key style="special" width="small">
           <binding action="right-layout"/>
         </key>
+        <key style="special" width="x-large">
+          <binding action="sym" label="ABC"/>
+        </key>
         <key width="small"><binding label="&#x00A9;"/></key>
         <key width="stretched">
           <binding action="space"/>
diff --git a/maliit-keyboard/data/languages/symbols-39.xml b/maliit-keyboard/data/languages/symbols-39.xml
index 00bd668..a81232b 100644
--- a/maliit-keyboard/data/languages/symbols-39.xml
+++ b/maliit-keyboard/data/languages/symbols-39.xml
@@ -120,10 +120,10 @@
 
       <row>
         <key style="special">
-          <binding action="sym" label="ABC"/>
+          <binding action="right-layout"/>
         </key>
         <key style="special">
-          <binding action="right-layout"/>
+          <binding action="sym" label="ABC"/>
         </key>
         <key>
           <binding label="_"/>
@@ -257,10 +257,10 @@
 
       <row>
         <key style="special">
-          <binding action="sym" label="ABC"/>
+          <binding action="right-layout"/>
         </key>
         <key style="special">
-          <binding action="right-layout"/>
+          <binding action="sym" label="ABC"/>
         </key>
         <key><binding label="&#x003C;"/></key>
         <key width="stretched">
diff --git a/maliit-keyboard/data/languages/symbols_ar.xml b/maliit-keyboard/data/languages/symbols_ar.xml
index 47fa15c..1e44d84 100644
--- a/maliit-keyboard/data/languages/symbols_ar.xml
+++ b/maliit-keyboard/data/languages/symbols_ar.xml
@@ -123,10 +123,10 @@
 
       <row>
         <key style="special">
-          <binding action="sym" label="&#x0627;&#x200C;&#x0628;&#x200C;&#x062A;"/>
+          <binding action="right-layout"/>
         </key>
         <key style="special">
-          <binding action="right-layout"/>
+          <binding action="sym" label="&#x0627;&#x200C;&#x0628;&#x200C;&#x062A;"/>
         </key>
         
         <key><binding label="&#x061B;"/></key>
@@ -265,10 +265,10 @@
 
       <row>
         <key style="special">
-          <binding action="sym" label="&#x0627;&#x200C;&#x0628;&#x200C;&#x062A;"/>
+          <binding action="right-layout"/>
         </key>
         <key style="special">
-          <binding action="right-layout"/>
+          <binding action="sym" label="&#x0627;&#x200C;&#x0628;&#x200C;&#x062A;"/>
         </key>
         
         <key><binding label=";"/></key>
diff --git a/maliit-keyboard/data/languages/symbols_en.xml b/maliit-keyboard/data/languages/symbols_en.xml
index f94ad47..6aeda24 100644
--- a/maliit-keyboard/data/languages/symbols_en.xml
+++ b/maliit-keyboard/data/languages/symbols_en.xml
@@ -109,13 +109,13 @@
       </row>
 
       <row>
-        <key style="special" width="large">
-          <binding action="sym" label="ABC"/>
-        </key>
 
         <key style="special">
           <binding action="right-layout"/>
         </key>
+        <key style="special" width="large">
+          <binding action="sym" label="ABC"/>
+        </key>
 
         <key width="stretched"><binding action="space"/></key>
 
@@ -233,13 +233,13 @@
       </row>
 
       <row>
-        <key style="special" width="large">
-          <binding action="sym" label="ABC"/>
-        </key>
 
         <key style="special">
           <binding action="right-layout"/>
         </key>
+        <key style="special" width="large">
+          <binding action="sym" label="ABC"/>
+        </key>
 
         <key width="stretched"><binding action="space"/></key>
         <key style="special" width="large">
diff --git a/maliit-keyboard/data/languages/symbols_fa.xml b/maliit-keyboard/data/languages/symbols_fa.xml
index 3972113..9596a56 100644
--- a/maliit-keyboard/data/languages/symbols_fa.xml
+++ b/maliit-keyboard/data/languages/symbols_fa.xml
@@ -122,12 +122,12 @@
       </row>
 
       <row>
-        <key style="special" width="x-large">
-          <binding action="sym" label="&#x0627;&#x200C;&#x0628;&#x200C;&#x067E;"/>
-        </key>
         <key style="special">
           <binding action="right-layout"/>
         </key>
+        <key style="special" width="x-large">
+          <binding action="sym" label="&#x0627;&#x200C;&#x0628;&#x200C;&#x067E;"/>
+        </key>
         <key><binding label="&#x061B;"/></key>
         <key width="xx-large">
           <binding action="space"/>
@@ -261,12 +261,12 @@
       </row>
 
       <row>
-        <key style="special" width="x-large">
-          <binding action="sym" label="&#x0627;&#x200C;&#x0628;&#x200C;&#x067E;"/>
-        </key>
         <key style="special">
           <binding action="right-layout"/>
         </key>
+        <key style="special" width="x-large">
+          <binding action="sym" label="&#x0627;&#x200C;&#x0628;&#x200C;&#x067E;"/>
+        </key>
         <key><binding label=";"/></key>
         <key width="xx-large">
           <binding action="space"/>
diff --git a/maliit-keyboard/data/languages/symbols_he.xml b/maliit-keyboard/data/languages/symbols_he.xml
index 7bb88cf..a6dfa72 100644
--- a/maliit-keyboard/data/languages/symbols_he.xml
+++ b/maliit-keyboard/data/languages/symbols_he.xml
@@ -107,12 +107,12 @@
       </row>
 
       <row>
-        <key style="special" width="large">
-          <binding action="sym" label="&#x05D0;&#x05D1;&#x05D2;"/>
-        </key>
         <key style="special">
           <binding action="right-layout"/>
         </key>
+        <key style="special" width="large">
+          <binding action="sym" label="&#x05D0;&#x05D1;&#x05D2;"/>
+        </key>
         <key width="stretched">
             <binding action="space"/>
         </key>
@@ -228,12 +228,12 @@
       </row>
 
       <row>
-        <key style="special" width="large">
-          <binding action="sym" label="&#x05D0;&#x05D1;&#x05D2;"/>
-        </key>
         <key style="special">
           <binding action="right-layout"/>
         </key>
+        <key style="special" width="large">
+          <binding action="sym" label="&#x05D0;&#x05D1;&#x05D2;"/>
+        </key>
         <key width="stretched">
             <binding action="space"/>
         </key>
diff --git a/maliit-keyboard/data/languages/symbols_hy.xml b/maliit-keyboard/data/languages/symbols_hy.xml
index 72ffbe6..d1b947b 100644
--- a/maliit-keyboard/data/languages/symbols_hy.xml
+++ b/maliit-keyboard/data/languages/symbols_hy.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE keyboard SYSTEM 'VirtualKeyboardLayout.dtd'>
 <keyboard version="1.0" catalog="symbols">
   <layout type="general">
-    <section id="symbols0" type="non-sloppy">
+    <section id="symbols0" type="non-sloppy" style="ar">
       <row>
         <key>
           <binding label="1"/>
@@ -34,164 +34,195 @@
         <key>
           <binding label="0"/>
         </key>
+        <key>
+          <binding label="%"/>
+        </key>
+        <key style="special" width="large">
+          <binding action="backspace"/>
+        </key>
       </row>
 
       <row>
         <spacer/>
-
-        <key>
+        <key width="small">
           <binding label="*"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="#"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="+"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="-"/>
         </key>
-        <key>
+        <key width="small">
+          <binding label="_"/>
+        </key>
+        <key width="small">
           <binding label="="/>
         </key>
-        <key>
+        <key width="small">
+          <binding label="&#x0026;"/>
+        </key>
+        <key width="small">
           <binding label="("/>
         </key>
-        <key>
+        <key width="small">
           <binding label=")"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="՜"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="՞"/>
         </key>
-
+        <key style="special" width="x-large" id="actionKey">
+          <binding action="return"/>
+        </key>
         <spacer/>
-
       </row>
 
       <row>
         <key style="special" width="large">
           <binding action="switch" label="1/2"/>
         </key>
-
-        <spacer/>
-
-        <key>
+        <key width="small">
           <binding label="@" quickpick="true"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="~"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="/"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="\"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x0027;" quickpick="true"/>
         </key>
-        <key>
-          <binding label="՝"/>
+        <key width="small">
+          <binding label="&#x0022;"/>
         </key>
-        <key>
-          <binding label="։" extended_labels=":"/>
+        <key width="small">
+          <binding label="&#x2116;"/>
         </key>
-
-        <spacer/>
-
+        <key width="small">
+          <binding label="!"/>
+        </key>
+        <key width="small">
+          <binding label="?"/>
+        </key>
+        <key width="small"><binding label=","/></key>
+        <key width="small"><binding label="."/></key>
         <key style="special" width="large">
-          <binding action="backspace"/>
+          <binding action="switch" label="1/2"/>
         </key>
       </row>
 
       <row>
-        <key style="special" width="x-large">
+        <key style="special">
+          <binding action="right-layout"/>
+        </key>
+        <key style="special">
           <binding action="sym" label="ԱԲԳ"/>
         </key>
-
-        <spacer/>
-
-        <key><binding label=","/></key>
-        <key width="xx-large"><binding action="space"/></key>
-        <key><binding label="."/></key>
-
-        <spacer/>
-
-        <key style="special" width="x-large" id="actionKey">
-          <binding action="return"/>
+        
+        <key><binding label=";"/></key>
+        
+        <key width="stretched">
+          <binding action="space"/>
+        </key>
+        
+        <key><binding label=":"/></key>
+        
+        <key style="special">
+          <binding action="sym" label="ԱԲԳ"/>
         </key>
+        <key style="special"><binding action="close"/></key>
 
       </row>
     </section>
 
-    <section id="symbols1" type="non-sloppy">
+    <section id="symbols1" type="non-sloppy" style="ar">
       <row>
         <key>
-          <binding label="&#x20AC;"/>
+          <binding label="1"/>
         </key>
         <key>
-          <binding label="&#x00A3;"/>
+          <binding label="2"/>
         </key>
         <key>
-          <binding label="&#x0024;"/>
+          <binding label="3"/>
         </key>
         <key>
-          <binding label="&#x00A5;"/>
+          <binding label="4"/>
         </key>
         <key>
-          <binding label="&#x058F;"/>
+          <binding label="5"/>
         </key>
         <key>
-          <binding label="&#x0025;"/>
+          <binding label="6"/>
         </key>
         <key>
-          <binding label="&#x003C;"/>
+          <binding label="7"/>
         </key>
         <key>
-          <binding label="&#x003E;"/>
+          <binding label="8"/>
         </key>
         <key>
-          <binding label="&#x005B;"/>
+          <binding label="9"/>
         </key>
         <key>
-          <binding label="&#x005D;"/>
+          <binding label="0"/>
+        </key>
+        <key>
+          <binding label="&#x2030;"/>
+        </key>
+        <key style="special" width="large">
+          <binding action="backspace"/>
         </key>
       </row>
 
       <row>
         <spacer/>
-
-         <key>
-          <binding label="&#x0060;"/>
+        <key width="small">
+          <binding label="&#x20AC;"/>
         </key>
-        <key>
-          <binding label="&#x005E;"/>
+        <key width="small">
+          <binding label="&#x00A3;"/>
         </key>
-        <key>
-          <binding label="&#x007C;"/>
+        <key width="small">
+          <binding label="&#x0024;"/>
         </key>
-        <key>
-          <binding label="&#x005F;"/>
+        <key width="small">
+          <binding label="&#x00A5;"/>
         </key>
-        <key>
-          <binding label="&#x00A7;"/>
+        <key width="small">
+          <binding label="&#x058F;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x007B;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x007D;"/>
         </key>
-        <key>
-          <binding label="&#x00A1;"/>
+        <key width="small">
+          <binding label="&#x005B;"/>
         </key>
-        <key>
-          <binding label="&#x00BF;"/>
+        <key width="small">
+          <binding label="&#x005D;"/>
+        </key>
+        <key width="small">
+          <binding label="&#x00AB;"/>
+        </key>
+        <key width="small">
+          <binding label="&#x00BB;"/>
+        </key>
+        <key style="special" width="x-large" id="actionKey">
+          <binding action="return"/>
         </key>
-
         <spacer/>
       </row>
 
@@ -199,54 +230,62 @@
         <key style="special" width="large">
           <binding action="switch" label="2/2"/>
         </key>
-
-        <spacer/>
-
-        <key>
-          <binding label="&#x00AB;"/>
+        <key width="small">
+          <binding label="&#x0060;"/>
         </key>
-        <key>
-          <binding label="&#x00BB;"/>
+        <key width="small">
+          <binding label="&#x005E;"/>
         </key>
-        <key>
-          <binding label="&#x0022;"/>
+        <key width="small">
+          <binding label="&#x007C;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x201C;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x201D;"/>
         </key>
-        <key>
+        <key width="small">
           <binding label="&#x201E;"/>
         </key>
-        <key>
-          <binding label="&#x0026;"/>
+        <key width="small">
+          <binding label="&#x00B0;"/>
         </key>
-
-        <spacer/>
-
+        <key width="small">
+          <binding label="&#x00A9;"/>
+        </key>
+        <key width="small">
+          <binding label="&#x00AE;"/>
+        </key>
+        <key width="small">
+          <binding label="&#x00A7;"/>
+        </key>
+        <key width="small"><binding label="."/></key>
         <key style="special" width="large">
-          <binding action="backspace"/>
+          <binding action="switch" label="2/2"/>
         </key>
       </row>
 
       <row>
-        <key style="special" width="x-large">
-          <binding action="sym" label="ABC"/>
+        <key style="special">
+          <binding action="right-layout"/>
         </key>
+        <key style="special">
+          <binding action="sym" label="ԱԲԳ"/>
+        </key>
+        
+        <key><binding label=";"/></key>
+        
+        <key width="stretched">
+          <binding action="space"/>
+        </key>
+        
+        <key><binding label=":"/></key>
 
-        <spacer/>
-
-        <key><binding label=","/></key>
-        <key width="xx-large"><binding action="space"/></key>
-        <key><binding label="."/></key>
-
-        <spacer/>
-
-        <key style="special" width="x-large" id="actionKey">
-          <binding action="return"/>
+        <key style="special">
+          <binding action="sym" label="ԱԲԳ"/>
         </key>
+        <key style="special"><binding action="close"/></key>
       </row>
     </section>
   </layout>
diff --git a/maliit-keyboard/data/languages/symbols_kk.xml b/maliit-keyboard/data/languages/symbols_kk.xml
index 85f4a77..2ff0b8f 100644
--- a/maliit-keyboard/data/languages/symbols_kk.xml
+++ b/maliit-keyboard/data/languages/symbols_kk.xml
@@ -122,12 +122,12 @@
       </row>
 
       <row>
-        <key style="special" width="x-large">
-          <binding action="sym" label="АБВ"/>
-        </key>
         <key style="special">
           <binding action="right-layout"/>
         </key>
+        <key style="special" width="x-large">
+          <binding action="sym" label="АБВ"/>
+        </key>
         <key><binding label=";"/></key>
         <key width="xx-large">
           <binding action="space"/>
@@ -260,12 +260,12 @@
       </row>
 
       <row>
-        <key style="special" width="x-large">
-          <binding action="sym" label="АБВ"/>
-        </key>
         <key style="special">
           <binding action="right-layout"/>
         </key>
+        <key style="special" width="x-large">
+          <binding action="sym" label="АБВ"/>
+        </key>
         <key><binding label=";"/></key>
         <key width="xx-large">
           <binding action="space"/>
diff --git a/maliit-keyboard/data/languages/symbols_ru_uk.xml b/maliit-keyboard/data/languages/symbols_ru_uk.xml
index 8709202..ad24a7f 100644
--- a/maliit-keyboard/data/languages/symbols_ru_uk.xml
+++ b/maliit-keyboard/data/languages/symbols_ru_uk.xml
@@ -123,10 +123,10 @@
 
       <row>
         <key style="special">
-          <binding action="sym" label="АБВ"/>
+          <binding action="right-layout"/>
         </key>
         <key style="special">
-          <binding action="right-layout"/>
+          <binding action="sym" label="АБВ"/>
         </key>
         
         <key><binding label=";"/></key>
@@ -266,10 +266,10 @@
 
       <row>
         <key style="special">
-          <binding action="sym" label="АБВ"/>
+          <binding action="right-layout"/>
         </key>
         <key style="special">
-          <binding action="right-layout"/>
+          <binding action="sym" label="АБВ"/>
         </key>
         
         <key><binding label=";"/></key>
diff --git a/maliit-keyboard/data/languages/symbols_th.xml b/maliit-keyboard/data/languages/symbols_th.xml
index 42cb529..3eff194 100644
--- a/maliit-keyboard/data/languages/symbols_th.xml
+++ b/maliit-keyboard/data/languages/symbols_th.xml
@@ -84,7 +84,7 @@
       </row>
 
       <row>
-        <key style="special">
+        <key width="large" style="special">
           <binding action="switch" label="1/2"/>
         </key>
         <key>
@@ -119,18 +119,18 @@
       </row>
 
       <row>
-        <key style="special" width="large">
-          <binding action="sym" label="&#x0E01;&#x0E02;&#x0E03;"/>
-        </key>
         <key style="special">
           <binding action="right-layout"/>
         </key>
-        <key width="small"><binding label=";"/></key>
+        <key style="special">
+          <binding action="sym" label="&#x0E01;&#x0E02;&#x0E03;"/>
+        </key>
+        <key><binding label=";"/></key>
         <key width="stretched">
           <binding action="space"/>
         </key>
-        <key width="small"><binding label=":"/></key>
-        <key style="special" width="large">
+        <key><binding label=":"/></key>
+        <key style="special">
           <binding action="sym" label="&#x0E01;&#x0E02;&#x0E03;"/>
         </key>
         <key style="special"><binding action="close"/></key>
@@ -220,7 +220,7 @@
       </row>
 
       <row>
-        <key style="special">
+        <key width="large" style="special">
           <binding action="switch" label="2/2"/>
         </key>
         <key>
@@ -255,18 +255,18 @@
       </row>
 
       <row>
-        <key style="special" width="large">
-          <binding action="sym" label="&#x0E01;&#x0E02;&#x0E03;"/>
-        </key>
         <key style="special">
           <binding action="right-layout"/>
         </key>
-        <key width="small"><binding label=";"/></key>
+        <key style="special">
+          <binding action="sym" label="&#x0E01;&#x0E02;&#x0E03;"/>
+        </key>
+        <key><binding label=";"/></key>
         <key width="stretched">
           <binding action="space"/>
         </key>
-        <key width="small"><binding label=":"/></key>
-        <key style="special" width="large">
+        <key><binding label=":"/></key>
+        <key style="special">
           <binding action="sym" label="&#x0E01;&#x0E02;&#x0E03;"/>
         </key>
         <key style="special"><binding action="close"/></key>
diff --git a/maliit-keyboard/data/languages/symbols_vi.xml b/maliit-keyboard/data/languages/symbols_vi.xml
index 94aa9f4..5076512 100644
--- a/maliit-keyboard/data/languages/symbols_vi.xml
+++ b/maliit-keyboard/data/languages/symbols_vi.xml
@@ -148,12 +148,12 @@
       </row>
 
       <row>
-        <key style="special" width="large">
-          <binding action="sym" label="ABC"/>
-        </key>
         <key style="special">
           <binding action="right-layout"/>
         </key>
+        <key style="special" width="large">
+          <binding action="sym" label="ABC"/>
+        </key>
         <key>
           <binding label="&lt;"/>
         </key>
diff --git a/maliit-keyboard/data/languages/th.xml b/maliit-keyboard/data/languages/th.xml
index 329737c..120be6a 100644
--- a/maliit-keyboard/data/languages/th.xml
+++ b/maliit-keyboard/data/languages/th.xml
@@ -106,7 +106,7 @@
       </row>
 
       <row>
-        <key style="special">
+        <key width="large" style="special">
           <binding action="shift"/>
         </key>
         <key>
@@ -155,24 +155,24 @@
       </row>
 
       <row>
-        <key style="special" width="large">
-          <binding action="sym" label="?123"/>
-        </key>
         <key style="special">
           <binding action="right-layout"/>
         </key>
-        <key width="small">
+        <key style="special">
+          <binding action="sym" label="?123"/>
+        </key>
+        <key>
           <binding label="ึ"/>
           <binding shift="true" label="."/>
         </key>
         <key width="stretched">
           <binding action="space" label=""/>
         </key>
-        <key width="small" id="emailUrlKey">
+        <key id="emailUrlKey">
           <binding label="ุ"/>
           <binding shift="true" label="ู"/>          
         </key>
-        <key style="special" width="large">
+        <key style="special">
           <binding action="sym" label="?123"/>
         </key>
         <key style="special"><binding action="close"/></key>
diff --git a/maliit-keyboard/data/languages/tr.xml b/maliit-keyboard/data/languages/tr.xml
index 3e8d1e1..22579bb 100644
--- a/maliit-keyboard/data/languages/tr.xml
+++ b/maliit-keyboard/data/languages/tr.xml
@@ -150,10 +150,10 @@
 
       <row>
         <key style="special">
-          <binding action="sym" label="?123"/>
+          <binding action="right-layout"/>
         </key>
         <key style="special">
-          <binding action="right-layout"/>
+          <binding action="sym" label="?123"/>
         </key>
         <key>
           <binding label="ğ"/>
diff --git a/maliit-keyboard/data/languages/uk.xml b/maliit-keyboard/data/languages/uk.xml
index 4c27965..7808645 100644
--- a/maliit-keyboard/data/languages/uk.xml
+++ b/maliit-keyboard/data/languages/uk.xml
@@ -154,10 +154,10 @@
 
       <row>
         <key style="special">
-          <binding action="sym" label="?123"/>
+          <binding action="right-layout"/>
         </key>
         <key style="special">
-          <binding action="right-layout"/>
+          <binding action="sym" label="?123"/>
         </key>
         <key>
           <binding label="ї"/>
diff --git a/maliit-keyboard/data/languages/vi.xml b/maliit-keyboard/data/languages/vi.xml
index 75ab281..6b0c0a7 100644
--- a/maliit-keyboard/data/languages/vi.xml
+++ b/maliit-keyboard/data/languages/vi.xml
@@ -179,12 +179,12 @@
       </row>
 
       <row>
-        <key style="special" width="large">
-          <binding action="sym" label="?123"/>
-        </key>
         <key style="special">
           <binding action="right-layout"/>
         </key>
+        <key style="special" width="large">
+          <binding action="sym" label="?123"/>
+        </key>
         <key width="stretched"><binding action="space"/></key>
         <key style="special" width="large">
           <binding action="sym" label="?123"/>
diff --git a/maliit-keyboard/data/styles/olpc-xo/main.ini b/maliit-keyboard/data/styles/olpc-xo/main.ini
index fe10c43..6ee54dd 100644
--- a/maliit-keyboard/data/styles/olpc-xo/main.ini
+++ b/maliit-keyboard/data/styles/olpc-xo/main.ini
@@ -89,7 +89,7 @@ landscape\key-width=90
 landscape\key-width-small=81
 landscape\key-width-large=90
 landscape\key-width-xlarge=154
-landscape\key-width-xxlarge=463
+landscape\key-width-xxlarge=454
 landscape\key-width-stretched=590
 
 portrait\key-width=66
-- 
1.7.9.6 (Apple Git-31.1)

Perl :: Catalyst :: PostgreSQL :: RPM Valid HTML 4.01 Transitional