[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [ktouch/KDE/4.10] data/keyboardlayouts: data: fix keyboard layout issues
From:       Sebastian Gottfried <sebastiangottfried () web ! de>
Date:       2012-12-31 14:58:02
Message-ID: 20121231145802.18495A6091 () git ! kde ! org
[Download RAW message or body]

Git commit 778548727af972829dae2a1077ed142593a5c2dd by Sebastian Gottfried.
Committed on 31/12/2012 at 15:56.
Pushed by gottfried into branch 'KDE/4.10'.

data: fix keyboard layout issues

Mostly minor geometry issues and a double key in the Turkish F layout.

M  +320  -321  data/keyboardlayouts/de.neo2.xml
M  +224  -224  data/keyboardlayouts/ee.xml
M  +205  -205  data/keyboardlayouts/es.dvorak.xml
M  +1    -1    data/keyboardlayouts/es.xml
M  +1    -1    data/keyboardlayouts/hu.xml
M  +1    -1    data/keyboardlayouts/it.xml
M  +1    -1    data/keyboardlayouts/latam.xml
M  +1    -5    data/keyboardlayouts/tr.f.xml
M  +1    -1    data/keyboardlayouts/us.dvorak.xml

http://commits.kde.org/ktouch/778548727af972829dae2a1077ed142593a5c2dd

diff --git a/data/keyboardlayouts/de.neo2.xml b/data/keyboardlayouts/de.neo2.xml
index 262358b..d2d6690 100644
--- a/data/keyboardlayouts/de.neo2.xml
+++ b/data/keyboardlayouts/de.neo2.xml
@@ -3,327 +3,326 @@
   <id>{479e26ab-46a9-4412-b87d-6b0164c0b484}</id>
   <title>Deutsches Neo 2</title>
   <name>de(neo)</name>
-  <width>1500</width>
+  <width>1480</width>
   <height>480</height>
   <keys>
-    <key left="180" top="200" width="80" height="80" fingerIndex="0">
-      <char position="topLeft" modifier="right_shift">U</char>
-      <char position="hidden">u</char>
-      <char position="topRight">&#x21F1;</char>
-      <char position="bottomLeft">u</char>
-      <char position="bottomRight" modifier="altgr">\</char>
-    </key>
-    <key left="280" top="200" width="80" height="80" fingerIndex="1">
-      <char position="topLeft" modifier="right_shift">I</char>
-      <char position="hidden">i</char>
-      <char position="topRight">&#x21E0;</char>
-      <char position="bottomLeft">i</char>
-      <char position="bottomRight" modifier="altgr">/</char>
-    </key>
-    <key left="380" top="200" width="80" height="80" fingerIndex="2">
-      <char position="topLeft" modifier="right_shift">A</char>
-      <char position="hidden">a</char>
-      <char position="topRight">&#x21E3;</char>
-      <char position="bottomLeft">a</char>
-      <char position="bottomRight" modifier="altgr">{</char>
-    </key>
-    <key left="480" top="200" width="80" height="80" fingerIndex="3" \
                hasHapticMarker="true">
-      <char position="topLeft" modifier="right_shift">E</char>
-      <char position="hidden">e</char>
-      <char position="topRight">&#x21E2;</char>
-      <char position="bottomLeft">e</char>
-      <char position="bottomRight" modifier="altgr">}</char>
-    </key>
-    <key left="780" top="200" width="80" height="80" fingerIndex="4" \
                hasHapticMarker="true">
-      <char position="topLeft" modifier="left_shift">N</char>
-      <char position="hidden">n</char>
-      <char position="topRight">4</char>
-      <char position="bottomLeft">n</char>
-      <char position="bottomRight" modifier="altgr">(</char>
-    </key>
-    <key left="880" top="200" width="80" height="80" fingerIndex="5">
-      <char position="topLeft" modifier="left_shift">R</char>
-      <char position="hidden">r</char>
-      <char position="topRight">5</char>
-      <char position="bottomLeft">r</char>
-      <char position="bottomRight" modifier="altgr">)</char>
-    </key>
-    <key left="980" top="200" width="80" height="80" fingerIndex="6">
-      <char position="topLeft" modifier="left_shift">T</char>
-      <char position="hidden">t</char>
-      <char position="topRight">6</char>
-      <char position="bottomLeft">t</char>
-      <char position="bottomRight" modifier="altgr">-</char>
-    </key>
-    <key left="1080" top="200" width="80" height="80" fingerIndex="7">
-      <char position="topLeft" modifier="left_shift">D</char>
-      <char position="hidden">d</char>
-      <char position="topRight">,</char>
-      <char position="bottomLeft">d</char>
-      <char position="bottomRight" modifier="altgr">:</char>
-    </key>
-    <key left="0" top="0" width="80" height="80" fingerIndex="0">
-      <char position="topLeft" modifier="right_shift">&#x2DC;</char>
-      <char position="topRight">&#x2C7;</char>
-      <char position="bottomLeft">&#x2C6;</char>
-      <char position="bottomRight" modifier="altgr">&#x2DA;</char>
-    </key>
-    <key left="100" top="0" width="80" height="80" fingerIndex="0">
-      <char position="topLeft" modifier="right_shift">&#xB0;</char>
-      <char position="topRight">&#xAA;</char>
-      <char position="bottomLeft">1</char>
-      <char position="bottomRight" modifier="altgr">&#xB9;</char>
-    </key>
-    <key left="200" top="0" width="80" height="80" fingerIndex="0">
-      <char position="topLeft" modifier="right_shift">&#xA7;</char>
-      <char position="topRight">&#xBA;</char>
-      <char position="bottomLeft">2</char>
-      <char position="bottomRight" modifier="altgr">&#xB2;</char>
-    </key>
-    <key left="300" top="0" width="80" height="80" fingerIndex="1">
-      <char position="topLeft" modifier="right_shift">&#x2113;</char>
-      <char position="topRight">&#x2116;</char>
-      <char position="bottomLeft">3</char>
-      <char position="bottomRight" modifier="altgr">&#xB3;</char>
-    </key>
-    <key left="400" top="0" width="80" height="80" fingerIndex="2">
-      <char position="topLeft" modifier="right_shift">&#xBB;</char>
-      <char position="topRight">&#x21DE;</char>
-      <char position="bottomLeft">4</char>
-      <char position="bottomRight" modifier="altgr">&#x203A;</char>
-    </key>
-    <key left="500" top="0" width="80" height="80" fingerIndex="3">
-      <char position="topLeft" modifier="right_shift">&#xAB;</char>
-      <char position="topRight">&#xB7;</char>
-      <char position="bottomLeft">5</char>
-      <char position="bottomRight" modifier="altgr">&#x2039;</char>
-    </key>
-    <key left="600" top="0" width="80" height="80" fingerIndex="3">
-      <char position="topLeft" modifier="right_shift">$</char>
-      <char position="topRight">&#xA3;</char>
-      <char position="bottomLeft">6</char>
-      <char position="bottomRight" modifier="altgr">&#xA2;</char>
-    </key>
-    <key left="700" top="0" width="80" height="80" fingerIndex="4">
-      <char position="topLeft" modifier="left_shift">&#x20AC;</char>
-      <char position="topRight">&#xA4;</char>
-      <char position="bottomLeft">7</char>
-      <char position="bottomRight" modifier="altgr">&#xA5;</char>
-    </key>
-    <key left="800" top="0" width="80" height="80" fingerIndex="4">
-      <char position="topLeft" modifier="left_shift">&#x201E;</char>
-      <char position="topRight">&#x21E5;</char>
-      <char position="bottomLeft">8</char>
-      <char position="bottomRight" modifier="altgr">&#x201A;</char>
-    </key>
-    <key left="900" top="0" width="80" height="80" fingerIndex="5">
-      <char position="topLeft" modifier="left_shift">&#x201C;</char>
-      <char position="topRight">/</char>
-      <char position="bottomLeft">9</char>
-      <char position="bottomRight" modifier="altgr">&#x2018;</char>
-    </key>
-    <key left="1000" top="0" width="80" height="80" fingerIndex="6">
-      <char position="topLeft" modifier="left_shift">&#x201D;</char>
-      <char position="topRight">*</char>
-      <char position="bottomLeft">0</char>
-      <char position="bottomRight" modifier="altgr">&#x2019;</char>
-    </key>
-    <key left="1100" top="0" width="80" height="80" fingerIndex="7">
-      <char position="topLeft" modifier="left_shift">&#x2014;</char>
-      <char position="topRight">-</char>
-      <char position="bottomLeft">-</char>
-    </key>
-    <key left="1200" top="0" width="80" height="80" fingerIndex="7">
-      <char position="topLeft" modifier="left_shift">&#x21BB;</char>
-      <char position="topRight">&#x30F;</char>
-      <char position="bottomLeft">`</char>
-      <char position="bottomRight" modifier="altgr">&#xA8;</char>
-    </key>
-    <key left="150" top="100" width="80" height="80" fingerIndex="0">
-      <char position="topLeft" modifier="right_shift">X</char>
-      <char position="hidden">x</char>
-      <char position="topRight">&#x22EE;</char>
-      <char position="bottomLeft">x</char>
-      <char position="bottomRight" modifier="altgr">&#x2026;</char>
-    </key>
-    <key left="250" top="100" width="80" height="80" fingerIndex="1">
-      <char position="topLeft" modifier="right_shift">V</char>
-      <char position="hidden">v</char>
-      <char position="topRight">&#x232B;</char>
-      <char position="bottomLeft">v</char>
-      <char position="bottomRight" modifier="altgr">_</char>
-    </key>
-    <key left="350" top="100" width="80" height="80" fingerIndex="2">
-      <char position="topLeft" modifier="right_shift">L</char>
-      <char position="hidden">l</char>
-      <char position="topRight">&#x21E1;</char>
-      <char position="bottomLeft">l</char>
-      <char position="bottomRight" modifier="altgr">[</char>
-    </key>
-    <key left="450" top="100" width="80" height="80" fingerIndex="3">
-      <char position="topLeft" modifier="right_shift">C</char>
-      <char position="hidden">c</char>
-      <char position="topRight">&#x2326;</char>
-      <char position="bottomLeft">c</char>
-      <char position="bottomRight" modifier="altgr">]</char>
-    </key>
-    <key left="550" top="100" width="80" height="80" fingerIndex="3">
-      <char position="topLeft" modifier="right_shift">W</char>
-      <char position="hidden">w</char>
-      <char position="topRight">&#x2380;</char>
-      <char position="bottomLeft">w</char>
-      <char position="bottomRight" modifier="altgr">^</char>
-    </key>
-    <key left="230" top="300" width="80" height="80" fingerIndex="0">
-      <char position="topLeft" modifier="right_shift">&#xDC;</char>
-      <char position="hidden">&#xFC;</char>
-      <char position="topRight">&#x2327;</char>
-      <char position="bottomLeft">&#xFC;</char>
-      <char position="bottomRight" modifier="altgr">#</char>
-    </key>
-    <key left="750" top="100" width="80" height="80" fingerIndex="4">
-      <char position="topLeft" modifier="left_shift">H</char>
-      <char position="hidden">h</char>
-      <char position="topRight">7</char>
-      <char position="bottomLeft">h</char>
-      <char position="bottomRight" modifier="altgr">&lt;</char>
-    </key>
-    <key left="850" top="100" width="80" height="80" fingerIndex="5">
-      <char position="topLeft" modifier="left_shift">G</char>
-      <char position="hidden">g</char>
-      <char position="topRight">8</char>
-      <char position="bottomLeft">g</char>
-      <char position="bottomRight" modifier="altgr">&gt;</char>
-    </key>
-    <key left="950" top="100" width="80" height="80" fingerIndex="6">
-      <char position="topLeft" modifier="left_shift">F</char>
-      <char position="hidden">f</char>
-      <char position="topRight">9</char>
-      <char position="bottomLeft">f</char>
-      <char position="bottomRight" modifier="altgr">=</char>
-    </key>
-    <key left="1050" top="100" width="80" height="80" fingerIndex="7">
-      <char position="topLeft" modifier="left_shift">Q</char>
-      <char position="hidden">q</char>
-      <char position="topRight">+</char>
-      <char position="bottomLeft">q</char>
-      <char position="bottomRight" modifier="altgr">&amp;</char>
-    </key>
-    <key left="1150" top="100" width="80" height="80" fingerIndex="7">
-      <char position="topLeft" modifier="left_shift">&#x1E9E;</char>
-      <char position="hidden">&#xDF;</char>
-      <char position="topRight">&#x2212;</char>
-      <char position="bottomLeft">&#xDF;</char>
-      <char position="bottomRight" modifier="altgr">&#x17F;</char>
-    </key>
-    <key left="1250" top="100" width="80" height="80" fingerIndex="7">
-      <char position="topLeft" modifier="left_shift">&#xB8;</char>
-      <char position="topRight">&#x2DD;</char>
-      <char position="bottomLeft">&#xB4;</char>
-      <char position="bottomRight" modifier="altgr">/</char>
-    </key>
-    <key left="580" top="200" width="80" height="80" fingerIndex="3">
-      <char position="topLeft" modifier="right_shift">O</char>
-      <char position="hidden">o</char>
-      <char position="topRight">&#x21F2;</char>
-      <char position="bottomLeft">o</char>
-      <char position="bottomRight" modifier="altgr">*</char>
-    </key>
-    <key left="680" top="200" width="80" height="80" fingerIndex="4">
-      <char position="topLeft" modifier="left_shift">S</char>
-      <char position="hidden">s</char>
-      <char position="topRight">&#xBF;</char>
-      <char position="bottomLeft">s</char>
-      <char position="bottomRight" modifier="altgr">?</char>
-    </key>
-    <key left="1180" top="200" width="80" height="80" fingerIndex="7">
-      <char position="topLeft" modifier="left_shift">Y</char>
-      <char position="hidden">y</char>
-      <char position="topRight">.</char>
-      <char position="bottomLeft">y</char>
-      <char position="bottomRight" modifier="altgr">@</char>
-    </key>
-    <key left="650" top="100" width="80" height="80" fingerIndex="4">
-      <char position="topLeft" modifier="left_shift">K</char>
-      <char position="hidden">k</char>
-      <char position="topRight">&#xA1;</char>
-      <char position="bottomLeft">k</char>
-      <char position="bottomRight" modifier="altgr">!</char>
-    </key>
-    <key left="330" top="300" width="80" height="80" fingerIndex="1">
-      <char position="topLeft" modifier="right_shift">&#xD6;</char>
-      <char position="hidden">&#xF6;</char>
-      <char position="topRight">&#x21E5;</char>
-      <char position="bottomLeft">&#xF6;</char>
-      <char position="bottomRight" modifier="altgr">$</char>
-    </key>
-    <key left="430" top="300" width="80" height="80" fingerIndex="2">
-      <char position="topLeft" modifier="right_shift">&#xC4;</char>
-      <char position="hidden">&#xE4;</char>
-      <char position="topRight">&#x21DF;</char>
-      <char position="bottomLeft">&#xE4;</char>
-      <char position="bottomRight" modifier="altgr">|</char>
-    </key>
-    <key left="530" top="300" width="80" height="80" fingerIndex="3">
-      <char position="topLeft" modifier="right_shift">P</char>
-      <char position="hidden">p</char>
-      <char position="topRight">&#x21B2;</char>
-      <char position="bottomLeft">p</char>
-      <char position="bottomRight" modifier="altgr">~</char>
-    </key>
-    <key left="630" top="300" width="80" height="80" fingerIndex="3">
-      <char position="topLeft" modifier="right_shift">Z</char>
-      <char position="hidden">z</char>
-      <char position="topRight">&#x21B6;</char>
-      <char position="bottomLeft">z</char>
-      <char position="bottomRight" modifier="altgr">`</char>
-    </key>
-    <key left="730" top="300" width="80" height="80" fingerIndex="4">
-      <char position="topLeft" modifier="left_shift">B</char>
-      <char position="hidden">b</char>
-      <char position="topRight">:</char>
-      <char position="bottomLeft">b</char>
-      <char position="bottomRight" modifier="altgr">+</char>
-    </key>
-    <key left="830" top="300" width="80" height="80" fingerIndex="4">
-      <char position="topLeft" modifier="left_shift">M</char>
-      <char position="hidden">m</char>
-      <char position="topRight">1</char>
-      <char position="bottomLeft">m</char>
-      <char position="bottomRight" modifier="altgr">%</char>
-    </key>
-    <key left="930" top="300" width="80" height="80" fingerIndex="5">
-      <char position="topLeft" modifier="left_shift">&#x2013;</char>
-      <char position="topRight">2</char>
-      <char position="bottomLeft">,</char>
-      <char position="bottomRight" modifier="altgr">"</char>
-    </key>
-    <key left="1030" top="300" width="80" height="80" fingerIndex="6">
-      <char position="topLeft" modifier="left_shift">&#x2022;</char>
-      <char position="topRight">3</char>
-      <char position="bottomLeft">.</char>
-      <char position="bottomRight" modifier="altgr">'</char>
-    </key>
-    <key left="1130" top="300" width="80" height="80" fingerIndex="7">
-      <char position="topLeft" modifier="left_shift">J</char>
-      <char position="hidden">j</char>
-      <char position="topRight">;</char>
-      <char position="bottomLeft">j</char>
-      <char position="bottomRight" modifier="altgr">;</char>
-    </key>
-    <specialKey left="0" top="100" width="130" height="80" type="tab"/>
-    <specialKey left="1380" top="100" width="120" height="180" type="return"/>
-    <specialKey left="1230" top="300" width="270" height="80" type="shift" \
                modifierId="right_shift"/>
-    <specialKey left="990" top="400" width="110" height="80" type="other" \
                label="M4"/>
-    <specialKey left="1380" top="400" width="120" height="80" type="other" \
                label="Strg"/>
-    <specialKey left="290" top="400" width="100" height="80" type="other" \
                label="Alt"/>
-    <specialKey left="0" top="400" width="150" height="80" type="other" \
                label="Strg"/>
-    <specialKey left="410" top="400" width="560" height="80" type="space"/>
-    <specialKey left="0" top="300" width="110" height="80" type="shift" \
                modifierId="left_shift"/>
-    <specialKey left="0" top="200" width="160" height="80" type="other" label="M3"/>
-    <specialKey left="1300" top="0" width="200" height="80" type="backspace"/>
-    <specialKey left="130" top="300" width="80" height="80" type="other" \
                label="M4"/>
-    <specialKey left="1280" top="200" width="80" height="80" type="other" \
                label="M3"/>
-    <specialKey left="1250" top="400" width="110" height="80" type="other" \
                label="Menu"/>
-  </keys>
+  <key width="80" left="180" height="80" fingerIndex="0" top="200">
+   <char position="topLeft" modifier="right_shift">U</char>
+   <char position="hidden">u</char>
+   <char position="topRight">⇱</char>
+   <char position="bottomLeft">u</char>
+   <char position="bottomRight" modifier="altgr">\</char>
+  </key>
+  <key width="80" left="280" height="80" fingerIndex="1" top="200">
+   <char position="topLeft" modifier="right_shift">I</char>
+   <char position="hidden">i</char>
+   <char position="topRight"> </char>
+   <char position="bottomLeft">i</char>
+   <char position="bottomRight" modifier="altgr">/</char>
+  </key>
+  <key width="80" left="380" height="80" fingerIndex="2" top="200">
+   <char position="topLeft" modifier="right_shift">A</char>
+   <char position="hidden">a</char>
+   <char position="topRight">⇣</char>
+   <char position="bottomLeft">a</char>
+   <char position="bottomRight" modifier="altgr">{</char>
+  </key>
+  <key width="80" left="480" height="80" hasHapticMarker="true" fingerIndex="3" \
top="200"> +   <char position="topLeft" modifier="right_shift">E</char>
+   <char position="hidden">e</char>
+   <char position="topRight">⇢</char>
+   <char position="bottomLeft">e</char>
+   <char position="bottomRight" modifier="altgr">}</char>
+  </key>
+  <key width="80" left="780" height="80" hasHapticMarker="true" fingerIndex="4" \
top="200"> +   <char position="topLeft" modifier="left_shift">N</char>
+   <char position="hidden">n</char>
+   <char position="topRight">4</char>
+   <char position="bottomLeft">n</char>
+   <char position="bottomRight" modifier="altgr">(</char>
+  </key>
+  <key width="80" left="880" height="80" fingerIndex="5" top="200">
+   <char position="topLeft" modifier="left_shift">R</char>
+   <char position="hidden">r</char>
+   <char position="topRight">5</char>
+   <char position="bottomLeft">r</char>
+   <char position="bottomRight" modifier="altgr">)</char>
+  </key>
+  <key width="80" left="980" height="80" fingerIndex="6" top="200">
+   <char position="topLeft" modifier="left_shift">T</char>
+   <char position="hidden">t</char>
+   <char position="topRight">6</char>
+   <char position="bottomLeft">t</char>
+   <char position="bottomRight" modifier="altgr">-</char>
+  </key>
+  <key width="80" left="1080" height="80" fingerIndex="7" top="200">
+   <char position="topLeft" modifier="left_shift">D</char>
+   <char position="hidden">d</char>
+   <char position="topRight">,</char>
+   <char position="bottomLeft">d</char>
+   <char position="bottomRight" modifier="altgr">:</char>
+  </key>
+  <key width="80" left="0" height="80" fingerIndex="0" top="0">
+   <char position="topLeft" modifier="right_shift">˜</char>
+   <char position="topRight">ˇ</char>
+   <char position="bottomLeft">ˆ</char>
+   <char position="bottomRight" modifier="altgr">˚</char>
+  </key>
+  <key width="80" left="100" height="80" fingerIndex="0" top="0">
+   <char position="topLeft" modifier="right_shift"> </char>
+   <char position="topRight"> </char>
+   <char position="bottomLeft">1</char>
+   <char position="bottomRight" modifier="altgr"> </char>
+  </key>
+  <key width="80" left="200" height="80" fingerIndex="0" top="0">
+   <char position="topLeft" modifier="right_shift"> </char>
+   <char position="topRight"> </char>
+   <char position="bottomLeft">2</char>
+   <char position="bottomRight" modifier="altgr"> </char>
+  </key>
+  <key width="80" left="300" height="80" fingerIndex="1" top="0">
+   <char position="topLeft" modifier="right_shift">ℓ</char>
+   <char position="topRight">№</char>
+   <char position="bottomLeft">3</char>
+   <char position="bottomRight" modifier="altgr"> </char>
+  </key>
+  <key width="80" left="400" height="80" fingerIndex="2" top="0">
+   <char position="topLeft" modifier="right_shift"> </char>
+   <char position="topRight">⇞</char>
+   <char position="bottomLeft">4</char>
+   <char position="bottomRight" modifier="altgr">›</char>
+  </key>
+  <key width="80" left="500" height="80" fingerIndex="3" top="0">
+   <char position="topLeft" modifier="right_shift"> </char>
+   <char position="topRight"> </char>
+   <char position="bottomLeft">5</char>
+   <char position="bottomRight" modifier="altgr">‹</char>
+  </key>
+  <key width="80" left="600" height="80" fingerIndex="3" top="0">
+   <char position="topLeft" modifier="right_shift">$</char>
+   <char position="topRight"> </char>
+   <char position="bottomLeft">6</char>
+   <char position="bottomRight" modifier="altgr"> </char>
+  </key>
+  <key width="80" left="700" height="80" fingerIndex="4" top="0">
+   <char position="topLeft" modifier="left_shift">€</char>
+   <char position="topRight"> </char>
+   <char position="bottomLeft">7</char>
+   <char position="bottomRight" modifier="altgr"> </char>
+  </key>
+  <key width="80" left="800" height="80" fingerIndex="4" top="0">
+   <char position="topLeft" modifier="left_shift">„</char>
+   <char position="topRight">⇥</char>
+   <char position="bottomLeft">8</char>
+   <char position="bottomRight" modifier="altgr">‚</char>
+  </key>
+  <key width="80" left="900" height="80" fingerIndex="5" top="0">
+   <char position="topLeft" modifier="left_shift">"</char>
+   <char position="topRight">/</char>
+   <char position="bottomLeft">9</char>
+   <char position="bottomRight" modifier="altgr">‘</char>
+  </key>
+  <key width="80" left="1000" height="80" fingerIndex="6" top="0">
+   <char position="topLeft" modifier="left_shift">"</char>
+   <char position="topRight">*</char>
+   <char position="bottomLeft">0</char>
+   <char position="bottomRight" modifier="altgr">'</char>
+  </key>
+  <key width="80" left="1100" height="80" fingerIndex="7" top="0">
+   <char position="topLeft" modifier="left_shift">—</char>
+   <char position="topRight">-</char>
+   <char position="bottomLeft">-</char>
+  </key>
+  <key width="80" left="1200" height="80" fingerIndex="7" top="0">
+   <char position="topLeft" modifier="left_shift">↻</char>
+   <char position="topRight">̏</char>
+   <char position="bottomLeft">`</char>
+   <char position="bottomRight" modifier="altgr"> </char>
+  </key>
+  <key width="80" left="150" height="80" fingerIndex="0" top="100">
+   <char position="topLeft" modifier="right_shift">X</char>
+   <char position="hidden">x</char>
+   <char position="topRight">⋮</char>
+   <char position="bottomLeft">x</char>
+   <char position="bottomRight" modifier="altgr">…</char>
+  </key>
+  <key width="80" left="250" height="80" fingerIndex="1" top="100">
+   <char position="topLeft" modifier="right_shift">V</char>
+   <char position="hidden">v</char>
+   <char position="topRight">⌫</char>
+   <char position="bottomLeft">v</char>
+   <char position="bottomRight" modifier="altgr">_</char>
+  </key>
+  <key width="80" left="350" height="80" fingerIndex="2" top="100">
+   <char position="topLeft" modifier="right_shift">L</char>
+   <char position="hidden">l</char>
+   <char position="topRight">⇡</char>
+   <char position="bottomLeft">l</char>
+   <char position="bottomRight" modifier="altgr">[</char>
+  </key>
+  <key width="80" left="450" height="80" fingerIndex="3" top="100">
+   <char position="topLeft" modifier="right_shift">C</char>
+   <char position="hidden">c</char>
+   <char position="topRight">⌦</char>
+   <char position="bottomLeft">c</char>
+   <char position="bottomRight" modifier="altgr">]</char>
+  </key>
+  <key width="80" left="550" height="80" fingerIndex="3" top="100">
+   <char position="topLeft" modifier="right_shift">W</char>
+   <char position="hidden">w</char>
+   <char position="topRight">⎀</char>
+   <char position="bottomLeft">w</char>
+   <char position="bottomRight" modifier="altgr">^</char>
+  </key>
+  <key width="80" left="230" height="80" fingerIndex="0" top="300">
+   <char position="topLeft" modifier="right_shift">Ü</char>
+   <char position="hidden">ü</char>
+   <char position="topRight">⌧</char>
+   <char position="bottomLeft">ü</char>
+   <char position="bottomRight" modifier="altgr">#</char>
+  </key>
+  <key width="80" left="750" height="80" fingerIndex="4" top="100">
+   <char position="topLeft" modifier="left_shift">H</char>
+   <char position="hidden">h</char>
+   <char position="topRight">7</char>
+   <char position="bottomLeft">h</char>
+   <char position="bottomRight" modifier="altgr">&lt;</char>
+  </key>
+  <key width="80" left="850" height="80" fingerIndex="5" top="100">
+   <char position="topLeft" modifier="left_shift">G</char>
+   <char position="hidden">g</char>
+   <char position="topRight">8</char>
+   <char position="bottomLeft">g</char>
+   <char position="bottomRight" modifier="altgr">></char>
+  </key>
+  <key width="80" left="950" height="80" fingerIndex="6" top="100">
+   <char position="topLeft" modifier="left_shift">F</char>
+   <char position="hidden">f</char>
+   <char position="topRight">9</char>
+   <char position="bottomLeft">f</char>
+   <char position="bottomRight" modifier="altgr">=</char>
+  </key>
+  <key width="80" left="1050" height="80" fingerIndex="7" top="100">
+   <char position="topLeft" modifier="left_shift">Q</char>
+   <char position="hidden">q</char>
+   <char position="topRight">+</char>
+   <char position="bottomLeft">q</char>
+   <char position="bottomRight" modifier="altgr">&amp;</char>
+  </key>
+  <key width="80" left="1150" height="80" fingerIndex="7" top="100">
+   <char position="topLeft" modifier="left_shift">ẞ</char>
+   <char position="hidden">ß</char>
+   <char position="topRight">−</char>
+   <char position="bottomLeft">ß</char>
+   <char position="bottomRight" modifier="altgr">ſ</char>
+  </key>
+  <key width="80" left="1250" height="80" fingerIndex="7" top="100">
+   <char position="topLeft" modifier="left_shift"> </char>
+   <char position="topRight">˝</char>
+   <char position="bottomLeft"> </char>
+   <char position="bottomRight" modifier="altgr">/</char>
+  </key>
+  <key width="80" left="580" height="80" fingerIndex="3" top="200">
+   <char position="topLeft" modifier="right_shift">O</char>
+   <char position="hidden">o</char>
+   <char position="topRight">⇲</char>
+   <char position="bottomLeft">o</char>
+   <char position="bottomRight" modifier="altgr">*</char>
+  </key>
+  <key width="80" left="680" height="80" fingerIndex="4" top="200">
+   <char position="topLeft" modifier="left_shift">S</char>
+   <char position="hidden">s</char>
+   <char position="topRight"> </char>
+   <char position="bottomLeft">s</char>
+   <char position="bottomRight" modifier="altgr">?</char>
+  </key>
+  <key width="80" left="1180" height="80" fingerIndex="7" top="200">
+   <char position="topLeft" modifier="left_shift">Y</char>
+   <char position="hidden">y</char>
+   <char position="topRight">.</char>
+   <char position="bottomLeft">y</char>
+   <char position="bottomRight" modifier="altgr">@</char>
+  </key>
+  <key width="80" left="650" height="80" fingerIndex="4" top="100">
+   <char position="topLeft" modifier="left_shift">K</char>
+   <char position="hidden">k</char>
+   <char position="topRight"> </char>
+   <char position="bottomLeft">k</char>
+   <char position="bottomRight" modifier="altgr">!</char>
+  </key>
+  <key width="80" left="330" height="80" fingerIndex="1" top="300">
+   <char position="topLeft" modifier="right_shift">Ö</char>
+   <char position="hidden">ö</char>
+   <char position="topRight">⇥</char>
+   <char position="bottomLeft">ö</char>
+   <char position="bottomRight" modifier="altgr">$</char>
+  </key>
+  <key width="80" left="430" height="80" fingerIndex="2" top="300">
+   <char position="topLeft" modifier="right_shift">Ä</char>
+   <char position="hidden">ä</char>
+   <char position="topRight">⇟</char>
+   <char position="bottomLeft">ä</char>
+   <char position="bottomRight" modifier="altgr">|</char>
+  </key>
+  <key width="80" left="530" height="80" fingerIndex="3" top="300">
+   <char position="topLeft" modifier="right_shift">P</char>
+   <char position="hidden">p</char>
+   <char position="topRight">↲</char>
+   <char position="bottomLeft">p</char>
+   <char position="bottomRight" modifier="altgr">~</char>
+  </key>
+  <key width="80" left="630" height="80" fingerIndex="3" top="300">
+   <char position="topLeft" modifier="right_shift">Z</char>
+   <char position="hidden">z</char>
+   <char position="topRight">↶</char>
+   <char position="bottomLeft">z</char>
+   <char position="bottomRight" modifier="altgr">`</char>
+  </key>
+  <key width="80" left="730" height="80" fingerIndex="4" top="300">
+   <char position="topLeft" modifier="left_shift">B</char>
+   <char position="hidden">b</char>
+   <char position="topRight">:</char>
+   <char position="bottomLeft">b</char>
+   <char position="bottomRight" modifier="altgr">+</char>
+  </key>
+  <key width="80" left="830" height="80" fingerIndex="4" top="300">
+   <char position="topLeft" modifier="left_shift">M</char>
+   <char position="hidden">m</char>
+   <char position="topRight">1</char>
+   <char position="bottomLeft">m</char>
+   <char position="bottomRight" modifier="altgr">%</char>
+  </key>
+  <key width="80" left="930" height="80" fingerIndex="5" top="300">
+   <char position="topLeft" modifier="left_shift">–</char>
+   <char position="topRight">2</char>
+   <char position="bottomLeft">,</char>
+   <char position="bottomRight" modifier="altgr">"</char>
+  </key>
+  <key width="80" left="1030" height="80" fingerIndex="6" top="300">
+   <char position="topLeft" modifier="left_shift">•</char>
+   <char position="topRight">3</char>
+   <char position="bottomLeft">.</char>
+   <char position="bottomRight" modifier="altgr">'</char>
+  </key>
+  <key width="80" left="1130" height="80" fingerIndex="7" top="300">
+   <char position="topLeft" modifier="left_shift">J</char>
+   <char position="hidden">j</char>
+   <char position="topRight">;</char>
+   <char position="bottomLeft">j</char>
+   <char position="bottomRight" modifier="altgr">;</char>
+  </key>
+  <specialKey width="130" left="0" height="80" type="tab" top="100"/>
+  <specialKey width="100" left="1380" height="180" type="return" top="100"/>
+  <specialKey width="250" modifierId="right_shift" left="1230" height="80" \
type="shift" top="300"/> +  <specialKey width="180" left="1140" height="80" \
type="other" label="M4" top="400"/> +  <specialKey width="140" left="1340" \
height="80" type="other" label="Strg" top="400"/> +  <specialKey width="130" \
left="150" height="80" type="other" label="Alt" top="400"/> +  <specialKey \
width="130" left="0" height="80" type="other" label="Strg" top="400"/> +  <specialKey \
width="820" left="300" height="80" type="space" top="400"/> +  <specialKey \
width="110" modifierId="left_shift" left="0" height="80" type="shift" top="300"/> +  \
<specialKey width="160" left="0" height="80" type="other" label="M3" top="200"/> +  \
<specialKey width="180" left="1300" height="80" type="backspace" top="0"/> +  \
<specialKey width="80" left="130" height="80" type="other" label="M4" top="300"/> +  \
<specialKey width="80" left="1280" height="80" type="other" label="M3" top="200"/> + \
</keys>  </keyboardLayout>
diff --git a/data/keyboardlayouts/ee.xml b/data/keyboardlayouts/ee.xml
index 961480b..ac4dec5 100644
--- a/data/keyboardlayouts/ee.xml
+++ b/data/keyboardlayouts/ee.xml
@@ -1,227 +1,227 @@
 <?xml version="1.0"?>
 <keyboardLayout>
-  <id>{b373bedc-5510-4a71-b083-15c2d1dfe666}</id>
-  <title>Estonian</title>
-  <name>ee</name>
-  <width>1480</width>
-  <height>480</height>
-  <keys>
-    <key left="170" top="200" width="80" height="80" fingerIndex="0">
-      <char position="topLeft" modifier="right_shift">A</char>
-      <char position="hidden">a</char>
-    </key>
-    <key left="270" top="200" width="80" height="80" fingerIndex="1">
-      <char position="topLeft" modifier="right_shift">S</char>
-      <char position="hidden">s</char>
-    </key>
-    <key left="370" top="200" width="80" height="80" fingerIndex="2">
-      <char position="topLeft" modifier="right_shift">D</char>
-      <char position="hidden">d</char>
-    </key>
-    <key left="470" top="200" width="80" height="80" fingerIndex="3" \
                hasHapticMarker="true">
-      <char position="topLeft" modifier="right_shift">F</char>
-      <char position="hidden">f</char>
-    </key>
-    <key left="770" top="200" width="80" height="80" fingerIndex="4" \
                hasHapticMarker="true">
-      <char position="topLeft" modifier="left_shift">J</char>
-      <char position="hidden">j</char>
-    </key>
-    <key left="870" top="200" width="80" height="80" fingerIndex="5">
-      <char position="topLeft" modifier="left_shift">K</char>
-      <char position="hidden">k</char>
-    </key>
-    <key left="970" top="200" width="80" height="80" fingerIndex="6">
-      <char position="topLeft" modifier="left_shift">L</char>
-      <char position="hidden">l</char>
-    </key>
-    <key left="1070" top="200" width="80" height="80" fingerIndex="7">
-      <char position="topLeft" modifier="left_shift">&#xD6;</char>
-      <char position="hidden">&#xF6;</char>
-    </key>
-    <key left="0" top="0" width="80" height="80" fingerIndex="0">
-      <char position="topLeft" modifier="right_shift">~</char>
-      <char position="bottomLeft">&#x2C7;</char>
-    </key>
-    <key left="100" top="0" width="80" height="80" fingerIndex="0">
-      <char position="topLeft" modifier="right_shift">!</char>
-      <char position="bottomLeft">1</char>
-    </key>
-    <key left="200" top="0" width="80" height="80" fingerIndex="1">
-      <char position="topLeft" modifier="right_shift">"</char>
-      <char position="topRight">@</char>
-      <char position="bottomLeft">2</char>
-    </key>
-    <key left="300" top="0" width="80" height="80" fingerIndex="2">
-      <char position="topLeft" modifier="right_shift">#</char>
-      <char position="topRight">&#xA3;</char>
-      <char position="bottomLeft">3</char>
-    </key>
-    <key left="400" top="0" width="80" height="80" fingerIndex="3">
-      <char position="topLeft" modifier="right_shift">&#xA4;</char>
-      <char position="topRight">$</char>
-      <char position="bottomLeft">4</char>
-    </key>
-    <key left="500" top="0" width="80" height="80" fingerIndex="3">
-      <char position="topLeft" modifier="right_shift">%</char>
-      <char position="bottomLeft">5</char>
-    </key>
-    <key left="600" top="0" width="80" height="80" fingerIndex="4">
-      <char position="topLeft" modifier="left_shift">&amp;</char>
-      <char position="bottomLeft">6</char>
-    </key>
-    <key left="700" top="0" width="80" height="80" fingerIndex="4">
-      <char position="topLeft" modifier="left_shift">/</char>
-      <char position="topRight">{</char>
-      <char position="bottomLeft">7</char>
-    </key>
-    <key left="800" top="0" width="80" height="80" fingerIndex="5">
-      <char position="topLeft" modifier="left_shift">(</char>
-      <char position="topRight">[</char>
-      <char position="bottomLeft">8</char>
-    </key>
-    <key left="900" top="0" width="80" height="80" fingerIndex="6">
-      <char position="topLeft" modifier="left_shift">)</char>
-      <char position="topRight">]</char>
-      <char position="bottomLeft">9</char>
-    </key>
-    <key left="1000" top="0" width="80" height="80" fingerIndex="7">
-      <char position="topLeft" modifier="left_shift">=</char>
-      <char position="topRight">}</char>
-      <char position="bottomLeft">0</char>
-    </key>
-    <key left="1100" top="0" width="80" height="80" fingerIndex="7">
-      <char position="topLeft" modifier="left_shift">?</char>
-      <char position="topRight">\</char>
-      <char position="bottomLeft">+</char>
-    </key>
-    <key left="1200" top="0" width="80" height="80" fingerIndex="7">
-      <char position="topLeft" modifier="left_shift">`</char>
-      <char position="bottomLeft">&#xB4;</char>
-    </key>
-    <key left="150" top="100" width="80" height="80" fingerIndex="0">
-      <char position="topLeft" modifier="right_shift">Q</char>
-      <char position="hidden">q</char>
-    </key>
-    <key left="250" top="100" width="80" height="80" fingerIndex="1">
-      <char position="topLeft" modifier="right_shift">W</char>
-      <char position="hidden">w</char>
-    </key>
-    <key left="350" top="100" width="80" height="80" fingerIndex="2">
-      <char position="topLeft" modifier="right_shift">E</char>
-      <char position="hidden">e</char>
-      <char position="bottomRight" modifier="altgr">&#x20AC;</char>
-    </key>
-    <key left="450" top="100" width="80" height="80" fingerIndex="3">
-      <char position="topLeft" modifier="right_shift">R</char>
-      <char position="hidden">r</char>
-    </key>
-    <key left="550" top="100" width="80" height="80" fingerIndex="3">
-      <char position="topLeft" modifier="right_shift">T</char>
-      <char position="hidden">t</char>
-    </key>
-    <key left="650" top="100" width="80" height="80" fingerIndex="4">
-      <char position="topLeft" modifier="left_shift">Y</char>
-      <char position="hidden">y</char>
-    </key>
-    <key left="750" top="100" width="80" height="80" fingerIndex="4">
-      <char position="topLeft" modifier="left_shift">U</char>
-      <char position="hidden">u</char>
-    </key>
-    <key left="850" top="100" width="80" height="80" fingerIndex="5">
-      <char position="topLeft" modifier="left_shift">I</char>
-      <char position="hidden">i</char>
-    </key>
-    <key left="950" top="100" width="80" height="80" fingerIndex="6">
-      <char position="topLeft" modifier="left_shift">O</char>
-      <char position="hidden">o</char>
-    </key>
-    <key left="1050" top="100" width="80" height="80" fingerIndex="7">
-      <char position="topLeft" modifier="left_shift">P</char>
-      <char position="hidden">p</char>
-    </key>
-    <key left="1150" top="100" width="80" height="80" fingerIndex="7">
-      <char position="topLeft" modifier="left_shift">&#xDC;</char>
-      <char position="hidden">&#xFC;</char>
-    </key>
-    <key left="1250" top="100" width="80" height="80" fingerIndex="7">
-      <char position="topLeft" modifier="left_shift">&#xD5;</char>
-      <char position="hidden">&#xF5;</char>
-      <char position="bottomRight" modifier="altgr">&#xA7;</char>
-    </key>
-    <key left="570" top="200" width="80" height="80" fingerIndex="3">
-      <char position="topLeft" modifier="right_shift">G</char>
-      <char position="hidden">g</char>
-    </key>
-    <key left="670" top="200" width="80" height="80" fingerIndex="4">
-      <char position="topLeft" modifier="left_shift">H</char>
-      <char position="hidden">h</char>
-    </key>
-    <key left="1270" top="200" width="80" height="80" fingerIndex="7">
-      <char position="topLeft" modifier="left_shift">*</char>
-      <char position="topRight">&#xBD;</char>
-      <char position="bottomLeft">'</char>
-    </key>
-    <key left="230" top="300" width="80" height="80" fingerIndex="0">
-      <char position="topLeft" modifier="right_shift">Z</char>
-      <char position="hidden">z</char>
-      <char position="bottomRight" modifier="right_shift">&#x17D;</char>
-      <char position="hidden">&#x17E;</char>
-    </key>
-    <key left="330" top="300" width="80" height="80" fingerIndex="1">
-      <char position="topLeft" modifier="right_shift">X</char>
-      <char position="hidden">x</char>
-    </key>
-    <key left="430" top="300" width="80" height="80" fingerIndex="2">
-      <char position="topLeft" modifier="right_shift">C</char>
-      <char position="hidden">c</char>
-    </key>
-    <key left="530" top="300" width="80" height="80" fingerIndex="3">
-      <char position="topLeft" modifier="right_shift">V</char>
-      <char position="hidden">v</char>
-    </key>
-    <key left="630" top="300" width="80" height="80" fingerIndex="3">
-      <char position="topLeft" modifier="right_shift">B</char>
-      <char position="hidden">b</char>
-    </key>
-    <key left="730" top="300" width="80" height="80" fingerIndex="4">
-      <char position="topLeft" modifier="left_shift">N</char>
-      <char position="hidden">n</char>
-    </key>
-    <key left="830" top="300" width="80" height="80" fingerIndex="4">
-      <char position="topLeft" modifier="left_shift">M</char>
-      <char position="hidden">m</char>
-    </key>
-    <key left="930" top="300" width="80" height="80" fingerIndex="5">
-      <char position="topLeft" modifier="left_shift">;</char>
-      <char position="bottomLeft">,</char>
-    </key>
-    <key left="1030" top="300" width="80" height="80" fingerIndex="6">
-      <char position="topLeft" modifier="left_shift">:</char>
-      <char position="bottomLeft">.</char>
-    </key>
-    <key left="1130" top="300" width="80" height="80" fingerIndex="7">
-      <char position="topLeft" modifier="left_shift">_</char>
-      <char position="bottomLeft">-</char>
-    </key>
-    <key left="1170" top="200" width="80" height="80" fingerIndex="7">
-      <char position="topLeft" modifier="left_shift">&#xC4;</char>
-      <char position="hidden">&#xE4;</char>
-    </key>
-    <key left="130" top="300" width="80" height="80" fingerIndex="0">
-      <char position="topLeft" modifier="right_shift">&gt;</char>
-      <char position="bottomLeft">&lt;</char>
-      <char position="bottomRight" modifier="altgr">|</char>
-    </key>
-    <specialKey left="0" top="100" width="130" height="80" type="tab"/>
-    <specialKey left="1370" top="100" width="110" height="180" type="return"/>
-    <specialKey left="1230" top="300" width="250" height="80" type="shift" \
                modifierId="right_shift"/>
-    <specialKey left="1200" top="400" width="130" height="80" type="other" \
                modifierId="altgr" label="Alt Gr"/>
-    <specialKey left="1350" top="400" width="130" height="80" type="other" \
                label="Ctrl"/>
-    <specialKey left="150" top="400" width="130" height="80" type="other" \
                label="Alt"/>
-    <specialKey left="0" top="400" width="130" height="80" type="other" \
                label="Ctrl"/>
-    <specialKey left="300" top="400" width="880" height="80" type="space"/>
-    <specialKey left="0" top="300" width="110" height="80" type="shift" \
                modifierId="left_shift"/>
-    <specialKey left="0" top="200" width="150" height="80" type="capslock"/>
-    <specialKey left="1300" top="0" width="180" height="80" type="backspace"/>
-  </keys>
+ <id>{b373bedc-5510-4a71-b083-15c2d1dfe666}</id>
+ <title>Estonian</title>
+ <name>ee</name>
+ <width>1480</width>
+ <height>480</height>
+ <keys>
+  <key width="80" left="180" height="80" fingerIndex="0" top="200">
+   <char position="topLeft" modifier="right_shift">A</char>
+   <char position="hidden">a</char>
+  </key>
+  <key width="80" left="280" height="80" fingerIndex="1" top="200">
+   <char position="topLeft" modifier="right_shift">S</char>
+   <char position="hidden">s</char>
+  </key>
+  <key width="80" left="380" height="80" fingerIndex="2" top="200">
+   <char position="topLeft" modifier="right_shift">D</char>
+   <char position="hidden">d</char>
+  </key>
+  <key width="80" left="480" height="80" hasHapticMarker="true" fingerIndex="3" \
top="200"> +   <char position="topLeft" modifier="right_shift">F</char>
+   <char position="hidden">f</char>
+  </key>
+  <key width="80" left="780" height="80" hasHapticMarker="true" fingerIndex="4" \
top="200"> +   <char position="topLeft" modifier="left_shift">J</char>
+   <char position="hidden">j</char>
+  </key>
+  <key width="80" left="880" height="80" fingerIndex="5" top="200">
+   <char position="topLeft" modifier="left_shift">K</char>
+   <char position="hidden">k</char>
+  </key>
+  <key width="80" left="980" height="80" fingerIndex="6" top="200">
+   <char position="topLeft" modifier="left_shift">L</char>
+   <char position="hidden">l</char>
+  </key>
+  <key width="80" left="1080" height="80" fingerIndex="7" top="200">
+   <char position="topLeft" modifier="left_shift">Ö</char>
+   <char position="hidden">ö</char>
+  </key>
+  <key width="80" left="0" height="80" fingerIndex="0" top="0">
+   <char position="topLeft" modifier="right_shift">~</char>
+   <char position="bottomLeft">ˇ</char>
+  </key>
+  <key width="80" left="100" height="80" fingerIndex="0" top="0">
+   <char position="topLeft" modifier="right_shift">!</char>
+   <char position="bottomLeft">1</char>
+  </key>
+  <key width="80" left="200" height="80" fingerIndex="1" top="0">
+   <char position="topLeft" modifier="right_shift">"</char>
+   <char position="topRight">@</char>
+   <char position="bottomLeft">2</char>
+  </key>
+  <key width="80" left="300" height="80" fingerIndex="2" top="0">
+   <char position="topLeft" modifier="right_shift">#</char>
+   <char position="topRight"> </char>
+   <char position="bottomLeft">3</char>
+  </key>
+  <key width="80" left="400" height="80" fingerIndex="3" top="0">
+   <char position="topLeft" modifier="right_shift"> </char>
+   <char position="topRight">$</char>
+   <char position="bottomLeft">4</char>
+  </key>
+  <key width="80" left="500" height="80" fingerIndex="3" top="0">
+   <char position="topLeft" modifier="right_shift">%</char>
+   <char position="bottomLeft">5</char>
+  </key>
+  <key width="80" left="600" height="80" fingerIndex="4" top="0">
+   <char position="topLeft" modifier="left_shift">&amp;</char>
+   <char position="bottomLeft">6</char>
+  </key>
+  <key width="80" left="700" height="80" fingerIndex="4" top="0">
+   <char position="topLeft" modifier="left_shift">/</char>
+   <char position="topRight">{</char>
+   <char position="bottomLeft">7</char>
+  </key>
+  <key width="80" left="800" height="80" fingerIndex="5" top="0">
+   <char position="topLeft" modifier="left_shift">(</char>
+   <char position="topRight">[</char>
+   <char position="bottomLeft">8</char>
+  </key>
+  <key width="80" left="900" height="80" fingerIndex="6" top="0">
+   <char position="topLeft" modifier="left_shift">)</char>
+   <char position="topRight">]</char>
+   <char position="bottomLeft">9</char>
+  </key>
+  <key width="80" left="1000" height="80" fingerIndex="7" top="0">
+   <char position="topLeft" modifier="left_shift">=</char>
+   <char position="topRight">}</char>
+   <char position="bottomLeft">0</char>
+  </key>
+  <key width="80" left="1100" height="80" fingerIndex="7" top="0">
+   <char position="topLeft" modifier="left_shift">?</char>
+   <char position="topRight">\</char>
+   <char position="bottomLeft">+</char>
+  </key>
+  <key width="80" left="1200" height="80" fingerIndex="7" top="0">
+   <char position="topLeft" modifier="left_shift">`</char>
+   <char position="bottomLeft"> </char>
+  </key>
+  <key width="80" left="150" height="80" fingerIndex="0" top="100">
+   <char position="topLeft" modifier="right_shift">Q</char>
+   <char position="hidden">q</char>
+  </key>
+  <key width="80" left="250" height="80" fingerIndex="1" top="100">
+   <char position="topLeft" modifier="right_shift">W</char>
+   <char position="hidden">w</char>
+  </key>
+  <key width="80" left="350" height="80" fingerIndex="2" top="100">
+   <char position="topLeft" modifier="right_shift">E</char>
+   <char position="hidden">e</char>
+   <char position="bottomRight" modifier="altgr">€</char>
+  </key>
+  <key width="80" left="450" height="80" fingerIndex="3" top="100">
+   <char position="topLeft" modifier="right_shift">R</char>
+   <char position="hidden">r</char>
+  </key>
+  <key width="80" left="550" height="80" fingerIndex="3" top="100">
+   <char position="topLeft" modifier="right_shift">T</char>
+   <char position="hidden">t</char>
+  </key>
+  <key width="80" left="650" height="80" fingerIndex="4" top="100">
+   <char position="topLeft" modifier="left_shift">Y</char>
+   <char position="hidden">y</char>
+  </key>
+  <key width="80" left="750" height="80" fingerIndex="4" top="100">
+   <char position="topLeft" modifier="left_shift">U</char>
+   <char position="hidden">u</char>
+  </key>
+  <key width="80" left="850" height="80" fingerIndex="5" top="100">
+   <char position="topLeft" modifier="left_shift">I</char>
+   <char position="hidden">i</char>
+  </key>
+  <key width="80" left="950" height="80" fingerIndex="6" top="100">
+   <char position="topLeft" modifier="left_shift">O</char>
+   <char position="hidden">o</char>
+  </key>
+  <key width="80" left="1050" height="80" fingerIndex="7" top="100">
+   <char position="topLeft" modifier="left_shift">P</char>
+   <char position="hidden">p</char>
+  </key>
+  <key width="80" left="1150" height="80" fingerIndex="7" top="100">
+   <char position="topLeft" modifier="left_shift">Ü</char>
+   <char position="hidden">ü</char>
+  </key>
+  <key width="80" left="1250" height="80" fingerIndex="7" top="100">
+   <char position="topLeft" modifier="left_shift">Õ</char>
+   <char position="hidden">õ</char>
+   <char position="bottomRight" modifier="altgr"> </char>
+  </key>
+  <key width="80" left="580" height="80" fingerIndex="3" top="200">
+   <char position="topLeft" modifier="right_shift">G</char>
+   <char position="hidden">g</char>
+  </key>
+  <key width="80" left="680" height="80" fingerIndex="4" top="200">
+   <char position="topLeft" modifier="left_shift">H</char>
+   <char position="hidden">h</char>
+  </key>
+  <key width="80" left="1280" height="80" fingerIndex="7" top="200">
+   <char position="topLeft" modifier="left_shift">*</char>
+   <char position="topRight"> </char>
+   <char position="bottomLeft">'</char>
+  </key>
+  <key width="80" left="230" height="80" fingerIndex="0" top="300">
+   <char position="topLeft" modifier="right_shift">Z</char>
+   <char position="hidden">z</char>
+   <char position="bottomRight" modifier="right_shift">Ž</char>
+   <char position="hidden">ž</char>
+  </key>
+  <key width="80" left="330" height="80" fingerIndex="1" top="300">
+   <char position="topLeft" modifier="right_shift">X</char>
+   <char position="hidden">x</char>
+  </key>
+  <key width="80" left="430" height="80" fingerIndex="2" top="300">
+   <char position="topLeft" modifier="right_shift">C</char>
+   <char position="hidden">c</char>
+  </key>
+  <key width="80" left="530" height="80" fingerIndex="3" top="300">
+   <char position="topLeft" modifier="right_shift">V</char>
+   <char position="hidden">v</char>
+  </key>
+  <key width="80" left="630" height="80" fingerIndex="3" top="300">
+   <char position="topLeft" modifier="right_shift">B</char>
+   <char position="hidden">b</char>
+  </key>
+  <key width="80" left="730" height="80" fingerIndex="4" top="300">
+   <char position="topLeft" modifier="left_shift">N</char>
+   <char position="hidden">n</char>
+  </key>
+  <key width="80" left="830" height="80" fingerIndex="4" top="300">
+   <char position="topLeft" modifier="left_shift">M</char>
+   <char position="hidden">m</char>
+  </key>
+  <key width="80" left="930" height="80" fingerIndex="5" top="300">
+   <char position="topLeft" modifier="left_shift">;</char>
+   <char position="bottomLeft">,</char>
+  </key>
+  <key width="80" left="1030" height="80" fingerIndex="6" top="300">
+   <char position="topLeft" modifier="left_shift">:</char>
+   <char position="bottomLeft">.</char>
+  </key>
+  <key width="80" left="1130" height="80" fingerIndex="7" top="300">
+   <char position="topLeft" modifier="left_shift">_</char>
+   <char position="bottomLeft">-</char>
+  </key>
+  <key width="80" left="1180" height="80" fingerIndex="7" top="200">
+   <char position="topLeft" modifier="left_shift">Ä</char>
+   <char position="hidden">ä</char>
+  </key>
+  <key width="80" left="130" height="80" fingerIndex="0" top="300">
+   <char position="topLeft" modifier="right_shift">></char>
+   <char position="bottomLeft">&lt;</char>
+   <char position="bottomRight" modifier="altgr">|</char>
+  </key>
+  <specialKey width="130" left="0" height="80" type="tab" top="100"/>
+  <specialKey width="100" left="1380" height="180" type="return" top="100"/>
+  <specialKey width="250" modifierId="right_shift" left="1230" height="80" \
type="shift" top="300"/> +  <specialKey width="130" modifierId="altgr" left="1200" \
height="80" type="other" label="Alt Gr" top="400"/> +  <specialKey width="130" \
left="1350" height="80" type="other" label="Ctrl" top="400"/> +  <specialKey \
width="130" left="150" height="80" type="other" label="Alt" top="400"/> +  \
<specialKey width="130" left="0" height="80" type="other" label="Ctrl" top="400"/> +  \
<specialKey width="880" left="300" height="80" type="space" top="400"/> +  \
<specialKey width="110" modifierId="left_shift" left="0" height="80" type="shift" \
top="300"/> +  <specialKey width="160" left="0" height="80" type="capslock" \
top="200"/> +  <specialKey width="180" left="1300" height="80" type="backspace" \
top="0"/> + </keys>
 </keyboardLayout>
diff --git a/data/keyboardlayouts/es.dvorak.xml b/data/keyboardlayouts/es.dvorak.xml
index 8ff1cd9..77477b6 100644
--- a/data/keyboardlayouts/es.dvorak.xml
+++ b/data/keyboardlayouts/es.dvorak.xml
@@ -3,211 +3,211 @@
   <id>{bcdf002d-0474-425f-980e-c7529a05cd72}</id>
   <title>Dvorak español</title>
   <name>es(dvorak)</name>
-  <width>1530</width>
+  <width>1480</width>
   <height>480</height>
   <keys>
-    <key left="180" top="200" width="80" height="80" fingerIndex="0">
-      <char position="topLeft" modifier="right_shift">A</char>
-      <char position="hidden">a</char>
-    </key>
-    <key left="280" top="200" width="80" height="80" fingerIndex="1">
-      <char position="topLeft" modifier="right_shift">O</char>
-      <char position="hidden">o</char>
-    </key>
-    <key left="380" top="200" width="80" height="80" fingerIndex="2">
-      <char position="topLeft" modifier="right_shift">E</char>
-      <char position="hidden">e</char>
-    </key>
-    <key left="480" top="200" width="80" height="80" fingerIndex="3" \
                hasHapticMarker="true">
-      <char position="topLeft" modifier="right_shift">U</char>
-      <char position="hidden">u</char>
-    </key>
-    <key left="780" top="200" width="80" height="80" fingerIndex="4" \
                hasHapticMarker="true">
-      <char position="topLeft" modifier="left_shift">R</char>
-      <char position="hidden">r</char>
-    </key>
-    <key left="880" top="200" width="80" height="80" fingerIndex="5">
-      <char position="topLeft" modifier="left_shift">T</char>
-      <char position="hidden">t</char>
-    </key>
-    <key left="980" top="200" width="80" height="80" fingerIndex="6">
-      <char position="topLeft" modifier="left_shift">N</char>
-      <char position="hidden">n</char>
-    </key>
-    <key left="1080" top="200" width="80" height="80" fingerIndex="7">
-      <char position="topLeft" modifier="left_shift">S</char>
-      <char position="hidden">s</char>
-    </key>
-    <key left="0" top="0" width="80" height="80" fingerIndex="0">
-      <char position="topLeft" modifier="right_shift">&#xAA;</char>
-      <char position="bottomLeft">&#xBA;</char>
-    </key>
-    <key left="100" top="0" width="80" height="80" fingerIndex="0">
-      <char position="topLeft" modifier="right_shift">!</char>
-      <char position="bottomLeft">1</char>
-    </key>
-    <key left="200" top="0" width="80" height="80" fingerIndex="1">
-      <char position="topLeft" modifier="right_shift">"</char>
-      <char position="bottomLeft">2</char>
-    </key>
-    <key left="300" top="0" width="80" height="80" fingerIndex="2">
-      <char position="topLeft" modifier="right_shift">&#xB7;</char>
-      <char position="bottomLeft">3</char>
-    </key>
-    <key left="400" top="0" width="80" height="80" fingerIndex="3">
-      <char position="topLeft" modifier="right_shift">$</char>
-      <char position="bottomLeft">4</char>
-    </key>
-    <key left="500" top="0" width="80" height="80" fingerIndex="3">
-      <char position="topLeft" modifier="right_shift">%</char>
-      <char position="bottomLeft">5</char>
-    </key>
-    <key left="600" top="0" width="80" height="80" fingerIndex="4">
-      <char position="topLeft" modifier="left_shift">&amp;</char>
-      <char position="bottomLeft">6</char>
-    </key>
-    <key left="700" top="0" width="80" height="80" fingerIndex="4">
-      <char position="topLeft" modifier="left_shift">/</char>
-      <char position="bottomLeft">7</char>
-    </key>
-    <key left="800" top="0" width="80" height="80" fingerIndex="5">
-      <char position="topLeft" modifier="left_shift">(</char>
-      <char position="bottomLeft">8</char>
-    </key>
-    <key left="900" top="0" width="80" height="80" fingerIndex="6">
-      <char position="topLeft" modifier="left_shift">)</char>
-      <char position="bottomLeft">9</char>
-    </key>
-    <key left="1000" top="0" width="80" height="80" fingerIndex="7">
-      <char position="topLeft" modifier="left_shift">=</char>
-      <char position="bottomLeft">0</char>
-    </key>
-    <key left="1100" top="0" width="80" height="80" fingerIndex="7">
-      <char position="topLeft" modifier="left_shift">?</char>
-      <char position="bottomLeft">'</char>
-    </key>
-    <key left="1200" top="0" width="80" height="80" fingerIndex="7">
-      <char position="topLeft" modifier="left_shift">&#xA1;</char>
-      <char position="bottomLeft">&#xBF;</char>
-    </key>
-    <key left="150" top="100" width="80" height="80" fingerIndex="0">
-      <char position="topLeft" modifier="right_shift">:</char>
-      <char position="bottomLeft">.</char>
-    </key>
-    <key left="250" top="100" width="80" height="80" fingerIndex="1">
-      <char position="topLeft" modifier="right_shift">;</char>
-      <char position="bottomLeft">,</char>
-    </key>
-    <key left="350" top="100" width="80" height="80" fingerIndex="2">
-      <char position="topLeft" modifier="right_shift">&#xD1;</char>
-      <char position="hidden">&#xF1;</char>
-    </key>
-    <key left="450" top="100" width="80" height="80" fingerIndex="3">
-      <char position="topLeft" modifier="right_shift">P</char>
-      <char position="hidden">p</char>
-    </key>
-    <key left="550" top="100" width="80" height="80" fingerIndex="3">
-      <char position="topLeft" modifier="right_shift">Y</char>
-      <char position="hidden">y</char>
-    </key>
-    <key left="650" top="100" width="80" height="80" fingerIndex="4">
-      <char position="topLeft" modifier="left_shift">F</char>
-      <char position="hidden">f</char>
-    </key>
-    <key left="750" top="100" width="80" height="80" fingerIndex="4">
-      <char position="topLeft" modifier="left_shift">G</char>
-      <char position="hidden">g</char>
-    </key>
-    <key left="850" top="100" width="80" height="80" fingerIndex="5">
-      <char position="topLeft" modifier="left_shift">C</char>
-      <char position="hidden">c</char>
-    </key>
-    <key left="950" top="100" width="80" height="80" fingerIndex="6">
-      <char position="topLeft" modifier="left_shift">H</char>
-      <char position="hidden">h</char>
-    </key>
-    <key left="1050" top="100" width="80" height="80" fingerIndex="7">
-      <char position="topLeft" modifier="left_shift">L</char>
-      <char position="hidden">l</char>
-    </key>
-    <key left="1150" top="100" width="80" height="80" fingerIndex="7">
-      <char position="topLeft" modifier="left_shift">^</char>
-      <char position="bottomLeft">`</char>
-    </key>
-    <key left="1250" top="100" width="80" height="80" fingerIndex="7">
-      <char position="topLeft" modifier="left_shift">*</char>
-      <char position="bottomLeft">+</char>
-    </key>
-    <key left="580" top="200" width="80" height="80" fingerIndex="3">
-      <char position="topLeft" modifier="right_shift">I</char>
-      <char position="hidden">i</char>
-    </key>
-    <key left="680" top="200" width="80" height="80" fingerIndex="4">
-      <char position="topLeft" modifier="left_shift">D</char>
-      <char position="hidden">d</char>
-    </key>
-    <key left="1180" top="200" width="80" height="80" fingerIndex="7">
-      <char position="topLeft" modifier="left_shift">&#xA8;</char>
-      <char position="bottomLeft">&#xB4;</char>
-    </key>
-    <key left="1280" top="200" width="80" height="80" fingerIndex="7">
-      <char position="topLeft" modifier="left_shift">&#xC7;</char>
-      <char position="hidden">&#xE7;</char>
-    </key>
-    <key left="130" top="300" width="80" height="80" fingerIndex="0">
-      <char position="topLeft" modifier="right_shift">&gt;</char>
-      <char position="bottomLeft">&lt;</char>
-    </key>
-    <key left="230" top="300" width="80" height="80" fingerIndex="0">
-      <char position="topLeft" modifier="right_shift">_</char>
-      <char position="bottomLeft">-</char>
-    </key>
-    <key left="330" top="300" width="80" height="80" fingerIndex="1">
-      <char position="topLeft" modifier="right_shift">Q</char>
-      <char position="hidden">q</char>
-    </key>
-    <key left="430" top="300" width="80" height="80" fingerIndex="2">
-      <char position="topLeft" modifier="right_shift">J</char>
-      <char position="hidden">j</char>
-    </key>
-    <key left="530" top="300" width="80" height="80" fingerIndex="3">
-      <char position="topLeft" modifier="right_shift">K</char>
-      <char position="hidden">k</char>
-    </key>
-    <key left="630" top="300" width="80" height="80" fingerIndex="3">
-      <char position="topLeft" modifier="right_shift">X</char>
-      <char position="hidden">x</char>
-    </key>
-    <key left="730" top="300" width="80" height="80" fingerIndex="4">
-      <char position="topLeft" modifier="left_shift">B</char>
-      <char position="hidden">b</char>
-    </key>
-    <key left="830" top="300" width="80" height="80" fingerIndex="4">
-      <char position="topLeft" modifier="left_shift">M</char>
-      <char position="hidden">m</char>
-    </key>
-    <key left="930" top="300" width="80" height="80" fingerIndex="5">
-      <char position="topLeft" modifier="left_shift">W</char>
-      <char position="hidden">w</char>
-    </key>
-    <key left="1030" top="300" width="80" height="80" fingerIndex="6">
-      <char position="topLeft" modifier="left_shift">V</char>
-      <char position="hidden">v</char>
-    </key>
-    <key left="1130" top="300" width="80" height="80" fingerIndex="7">
-      <char position="topLeft" modifier="left_shift">Z</char>
-      <char position="hidden">z</char>
-    </key>
-    <specialKey left="0" top="100" width="130" height="80" type="tab"/>
-    <specialKey left="1380" top="100" width="100" height="180" type="return"/>
-    <specialKey left="1230" top="300" width="250" height="80" type="shift" \
                modifierId="right_shift"/>
-    <specialKey left="1150" top="400" width="180" height="80" type="other" \
                modifierId="altgr" label="Alt Gr"/>
-    <specialKey left="1350" top="400" width="130" height="80" type="other" \
                label="Strg"/>
-    <specialKey left="150" top="400" width="130" height="80" type="other" \
                label="Alt"/>
-    <specialKey left="0" top="400" width="130" height="80" type="other" \
                label="Strg"/>
-    <specialKey left="300" top="400" width="830" height="80" type="space"/>
-    <specialKey left="0" top="300" width="110" height="80" type="shift" \
                modifierId="left_shift"/>
-    <specialKey left="0" top="200" width="160" height="80" type="capslock"/>
-    <specialKey left="1300" top="0" width="180" height="80" type="backspace"/>
-  </keys>
+  <key width="80" left="180" height="80" fingerIndex="0" top="200">
+   <char position="topLeft" modifier="right_shift">A</char>
+   <char position="hidden">a</char>
+  </key>
+  <key width="80" left="280" height="80" fingerIndex="1" top="200">
+   <char position="topLeft" modifier="right_shift">O</char>
+   <char position="hidden">o</char>
+  </key>
+  <key width="80" left="380" height="80" fingerIndex="2" top="200">
+   <char position="topLeft" modifier="right_shift">E</char>
+   <char position="hidden">e</char>
+  </key>
+  <key width="80" left="480" height="80" hasHapticMarker="true" fingerIndex="3" \
top="200"> +   <char position="topLeft" modifier="right_shift">U</char>
+   <char position="hidden">u</char>
+  </key>
+  <key width="80" left="780" height="80" hasHapticMarker="true" fingerIndex="4" \
top="200"> +   <char position="topLeft" modifier="left_shift">R</char>
+   <char position="hidden">r</char>
+  </key>
+  <key width="80" left="880" height="80" fingerIndex="5" top="200">
+   <char position="topLeft" modifier="left_shift">T</char>
+   <char position="hidden">t</char>
+  </key>
+  <key width="80" left="980" height="80" fingerIndex="6" top="200">
+   <char position="topLeft" modifier="left_shift">N</char>
+   <char position="hidden">n</char>
+  </key>
+  <key width="80" left="1080" height="80" fingerIndex="7" top="200">
+   <char position="topLeft" modifier="left_shift">S</char>
+   <char position="hidden">s</char>
+  </key>
+  <key width="80" left="0" height="80" fingerIndex="0" top="0">
+   <char position="topLeft" modifier="right_shift"> </char>
+   <char position="bottomLeft"> </char>
+  </key>
+  <key width="80" left="100" height="80" fingerIndex="0" top="0">
+   <char position="topLeft" modifier="right_shift">!</char>
+   <char position="bottomLeft">1</char>
+  </key>
+  <key width="80" left="200" height="80" fingerIndex="1" top="0">
+   <char position="topLeft" modifier="right_shift">"</char>
+   <char position="bottomLeft">2</char>
+  </key>
+  <key width="80" left="300" height="80" fingerIndex="2" top="0">
+   <char position="topLeft" modifier="right_shift"> </char>
+   <char position="bottomLeft">3</char>
+  </key>
+  <key width="80" left="400" height="80" fingerIndex="3" top="0">
+   <char position="topLeft" modifier="right_shift">$</char>
+   <char position="bottomLeft">4</char>
+  </key>
+  <key width="80" left="500" height="80" fingerIndex="3" top="0">
+   <char position="topLeft" modifier="right_shift">%</char>
+   <char position="bottomLeft">5</char>
+  </key>
+  <key width="80" left="600" height="80" fingerIndex="4" top="0">
+   <char position="topLeft" modifier="left_shift">&amp;</char>
+   <char position="bottomLeft">6</char>
+  </key>
+  <key width="80" left="700" height="80" fingerIndex="4" top="0">
+   <char position="topLeft" modifier="left_shift">/</char>
+   <char position="bottomLeft">7</char>
+  </key>
+  <key width="80" left="800" height="80" fingerIndex="5" top="0">
+   <char position="topLeft" modifier="left_shift">(</char>
+   <char position="bottomLeft">8</char>
+  </key>
+  <key width="80" left="900" height="80" fingerIndex="6" top="0">
+   <char position="topLeft" modifier="left_shift">)</char>
+   <char position="bottomLeft">9</char>
+  </key>
+  <key width="80" left="1000" height="80" fingerIndex="7" top="0">
+   <char position="topLeft" modifier="left_shift">=</char>
+   <char position="bottomLeft">0</char>
+  </key>
+  <key width="80" left="1100" height="80" fingerIndex="7" top="0">
+   <char position="topLeft" modifier="left_shift">?</char>
+   <char position="bottomLeft">'</char>
+  </key>
+  <key width="80" left="1200" height="80" fingerIndex="7" top="0">
+   <char position="topLeft" modifier="left_shift"> </char>
+   <char position="bottomLeft"> </char>
+  </key>
+  <key width="80" left="150" height="80" fingerIndex="0" top="100">
+   <char position="topLeft" modifier="right_shift">:</char>
+   <char position="bottomLeft">.</char>
+  </key>
+  <key width="80" left="250" height="80" fingerIndex="1" top="100">
+   <char position="topLeft" modifier="right_shift">;</char>
+   <char position="bottomLeft">,</char>
+  </key>
+  <key width="80" left="350" height="80" fingerIndex="2" top="100">
+   <char position="topLeft" modifier="right_shift">Ñ</char>
+   <char position="hidden">ñ</char>
+  </key>
+  <key width="80" left="450" height="80" fingerIndex="3" top="100">
+   <char position="topLeft" modifier="right_shift">P</char>
+   <char position="hidden">p</char>
+  </key>
+  <key width="80" left="550" height="80" fingerIndex="3" top="100">
+   <char position="topLeft" modifier="right_shift">Y</char>
+   <char position="hidden">y</char>
+  </key>
+  <key width="80" left="650" height="80" fingerIndex="4" top="100">
+   <char position="topLeft" modifier="left_shift">F</char>
+   <char position="hidden">f</char>
+  </key>
+  <key width="80" left="750" height="80" fingerIndex="4" top="100">
+   <char position="topLeft" modifier="left_shift">G</char>
+   <char position="hidden">g</char>
+  </key>
+  <key width="80" left="850" height="80" fingerIndex="5" top="100">
+   <char position="topLeft" modifier="left_shift">C</char>
+   <char position="hidden">c</char>
+  </key>
+  <key width="80" left="950" height="80" fingerIndex="6" top="100">
+   <char position="topLeft" modifier="left_shift">H</char>
+   <char position="hidden">h</char>
+  </key>
+  <key width="80" left="1050" height="80" fingerIndex="7" top="100">
+   <char position="topLeft" modifier="left_shift">L</char>
+   <char position="hidden">l</char>
+  </key>
+  <key width="80" left="1150" height="80" fingerIndex="7" top="100">
+   <char position="topLeft" modifier="left_shift">^</char>
+   <char position="bottomLeft">`</char>
+  </key>
+  <key width="80" left="1250" height="80" fingerIndex="7" top="100">
+   <char position="topLeft" modifier="left_shift">*</char>
+   <char position="bottomLeft">+</char>
+  </key>
+  <key width="80" left="580" height="80" fingerIndex="3" top="200">
+   <char position="topLeft" modifier="right_shift">I</char>
+   <char position="hidden">i</char>
+  </key>
+  <key width="80" left="680" height="80" fingerIndex="4" top="200">
+   <char position="topLeft" modifier="left_shift">D</char>
+   <char position="hidden">d</char>
+  </key>
+  <key width="80" left="1180" height="80" fingerIndex="7" top="200">
+   <char position="topLeft" modifier="left_shift"> </char>
+   <char position="bottomLeft"> </char>
+  </key>
+  <key width="80" left="1280" height="80" fingerIndex="7" top="200">
+   <char position="topLeft" modifier="left_shift">Ç</char>
+   <char position="hidden">ç</char>
+  </key>
+  <key width="80" left="130" height="80" fingerIndex="0" top="300">
+   <char position="topLeft" modifier="right_shift">></char>
+   <char position="bottomLeft">&lt;</char>
+  </key>
+  <key width="80" left="230" height="80" fingerIndex="0" top="300">
+   <char position="topLeft" modifier="right_shift">_</char>
+   <char position="bottomLeft">-</char>
+  </key>
+  <key width="80" left="330" height="80" fingerIndex="1" top="300">
+   <char position="topLeft" modifier="right_shift">Q</char>
+   <char position="hidden">q</char>
+  </key>
+  <key width="80" left="430" height="80" fingerIndex="2" top="300">
+   <char position="topLeft" modifier="right_shift">J</char>
+   <char position="hidden">j</char>
+  </key>
+  <key width="80" left="530" height="80" fingerIndex="3" top="300">
+   <char position="topLeft" modifier="right_shift">K</char>
+   <char position="hidden">k</char>
+  </key>
+  <key width="80" left="630" height="80" fingerIndex="3" top="300">
+   <char position="topLeft" modifier="right_shift">X</char>
+   <char position="hidden">x</char>
+  </key>
+  <key width="80" left="730" height="80" fingerIndex="4" top="300">
+   <char position="topLeft" modifier="left_shift">B</char>
+   <char position="hidden">b</char>
+  </key>
+  <key width="80" left="830" height="80" fingerIndex="4" top="300">
+   <char position="topLeft" modifier="left_shift">M</char>
+   <char position="hidden">m</char>
+  </key>
+  <key width="80" left="930" height="80" fingerIndex="5" top="300">
+   <char position="topLeft" modifier="left_shift">W</char>
+   <char position="hidden">w</char>
+  </key>
+  <key width="80" left="1030" height="80" fingerIndex="6" top="300">
+   <char position="topLeft" modifier="left_shift">V</char>
+   <char position="hidden">v</char>
+  </key>
+  <key width="80" left="1130" height="80" fingerIndex="7" top="300">
+   <char position="topLeft" modifier="left_shift">Z</char>
+   <char position="hidden">z</char>
+  </key>
+  <specialKey width="130" left="0" height="80" type="tab" top="100"/>
+  <specialKey width="100" left="1380" height="180" type="return" top="100"/>
+  <specialKey width="250" modifierId="right_shift" left="1230" height="80" \
type="shift" top="300"/> +  <specialKey width="180" modifierId="altgr" left="1150" \
height="80" type="other" label="Alt Gr" top="400"/> +  <specialKey width="130" \
left="1350" height="80" type="other" label="Strg" top="400"/> +  <specialKey \
width="130" left="150" height="80" type="other" label="Alt" top="400"/> +  \
<specialKey width="130" left="0" height="80" type="other" label="Strg" top="400"/> +  \
<specialKey width="830" left="300" height="80" type="space" top="400"/> +  \
<specialKey width="110" modifierId="left_shift" left="0" height="80" type="shift" \
top="300"/> +  <specialKey width="160" left="0" height="80" type="capslock" \
top="200"/> +  <specialKey width="180" left="1300" height="80" type="backspace" \
top="0"/> + </keys>
 </keyboardLayout>
diff --git a/data/keyboardlayouts/es.xml b/data/keyboardlayouts/es.xml
index 7ceb8eb..17dc79c 100644
--- a/data/keyboardlayouts/es.xml
+++ b/data/keyboardlayouts/es.xml
@@ -3,7 +3,7 @@
   <id>{89d5d879-cc9c-44a4-a894-7750dc43dc85}</id>
   <title>Español</title>
   <name>es</name>
-  <width>1430</width>
+  <width>1480</width>
   <height>480</height>
   <keys>
     <key left="180" top="200" width="80" height="80" fingerIndex="0">
diff --git a/data/keyboardlayouts/hu.xml b/data/keyboardlayouts/hu.xml
index 3d64991..2a1f4a5 100644
--- a/data/keyboardlayouts/hu.xml
+++ b/data/keyboardlayouts/hu.xml
@@ -3,7 +3,7 @@
   <id>{8e5cf918-5593-4065-b296-6637ba08946e}</id>
   <title>Magyar</title>
   <name>hu</name>
-  <width>1430</width>
+  <width>1480</width>
   <height>480</height>
   <keys>
     <key left="180" top="200" width="80" height="80" fingerIndex="0">
diff --git a/data/keyboardlayouts/it.xml b/data/keyboardlayouts/it.xml
index 33a6eb4..ee56ead 100644
--- a/data/keyboardlayouts/it.xml
+++ b/data/keyboardlayouts/it.xml
@@ -3,7 +3,7 @@
   <id>{d4c6fa92-a41c-4064-a235-4e3daf428abe}</id>
   <title>Italiana</title>
   <name>it</name>
-  <width>1460</width>
+  <width>1480</width>
   <height>480</height>
   <keys>
     <key left="180" top="200" width="80" height="80" fingerIndex="0">
diff --git a/data/keyboardlayouts/latam.xml b/data/keyboardlayouts/latam.xml
index c92a145..d58a53c 100644
--- a/data/keyboardlayouts/latam.xml
+++ b/data/keyboardlayouts/latam.xml
@@ -3,7 +3,7 @@
   <id>{7c1842a3-3d8d-4cd9-ad75-2eee8bd7e231}</id>
   <title>Español (Latinoamarican)</title>
   <name>latam</name>
-  <width>1530</width>
+  <width>1480</width>
   <height>480</height>
   <keys>
     <key left="180" top="200" width="80" height="80" fingerIndex="0">
diff --git a/data/keyboardlayouts/tr.f.xml b/data/keyboardlayouts/tr.f.xml
index 1b91623..f16c52e 100644
--- a/data/keyboardlayouts/tr.f.xml
+++ b/data/keyboardlayouts/tr.f.xml
@@ -163,10 +163,6 @@
       <char position="topLeft" modifier="left_shift">W</char>
       <char position="hidden">w</char>
     </key>
-    <key left="1180" top="200" width="80" height="80" fingerIndex="7">
-      <char position="topLeft" modifier="left_shift">&#x15E;</char>
-      <char position="hidden">&#x15F;</char>
-    </key>
     <key left="130" top="300" width="80" height="80" fingerIndex="0">
       <char position="topLeft" modifier="right_shift">&gt;</char>
       <char position="bottomLeft">&lt;</char>
@@ -221,7 +217,7 @@
     <specialKey left="1150" top="400" width="130" height="80" type="other" \
                modifierId="altgr" label="Alt Gr"/>
     <specialKey left="1300" top="400" width="130" height="80" type="other" \
                label="Ctrl"/>
     <specialKey left="1300" top="0" width="130" height="80" type="backspace"/>
-    <specialKey left="1290" top="200" width="130" height="80" type="return"/>
+    <specialKey left="1280" top="200" width="150" height="80" type="return"/>
     <specialKey left="1230" top="300" width="200" height="80" type="shift" \
modifierId="right_shift"/>  </keys>
 </keyboardLayout>
diff --git a/data/keyboardlayouts/us.dvorak.xml b/data/keyboardlayouts/us.dvorak.xml
index 20ca65e..387d0b7 100644
--- a/data/keyboardlayouts/us.dvorak.xml
+++ b/data/keyboardlayouts/us.dvorak.xml
@@ -3,7 +3,7 @@
   <id>{82647f1d-cfaa-491e-ab41-6d6c86e4f5fd}</id>
   <title>English Dvorak (USA)</title>
   <name>us(dvorak)</name>
-  <width>1480</width>
+  <width>1430</width>
   <height>480</height>
   <keys>
     <key left="180" top="200" width="80" height="80" fingerIndex="0">


[prev in list] [next in list] [prev in thread] [next in thread] 

Configure | About | News | Add a list | Sponsored by KoreLogic