diff --git a/data/keyboards/jp-kana.xml b/data/keyboards/jp-kana.xml
index 3884c72b..c018fe99 100644
--- a/data/keyboards/jp-kana.xml
+++ b/data/keyboards/jp-kana.xml
@@ -1,8 +1,8 @@
- 0.000000,0.000000,640.000000,238.000000
+ 0.000000,0.000000,640.000000,296.585366
- 16.000000,16.000000,94.000000,202.000000
+ 16.000000,78.048780,94.000000,202.000000
0
5
@@ -12,6 +12,10 @@
5
0
+
+ 5
+ 0
+
4.000000,43.000000,80.000000,38.000000
outline2
@@ -35,27 +39,19 @@
- 4.000000,163.000000,57.000000,38.000000
+ 4.000000,162.341463,57.000000,38.000000
outline9
cycle-keyboard
- 517.000000,2.000000,80.000000,38.000000
+ 517.000000,44.000000,80.000000,38.000000
outline2
BackSpace
-
- 517.000000,44.000000,80.000000,38.000000
- outline2
-
- space
- space
-
-
517.000000,83.000000,80.000000,38.000000
outline2
@@ -70,6 +66,41 @@
Shift_R
+
+ 165.463415,162.341463,238.829268,37.463415
+ outline14
+
+ space
+
+
+
+ 407.414634,162.341463,48.390244,37.463415
+ outline10
+
+ Left
+
+
+
+ 458.926829,162.341463,48.390244,37.463415
+ outline10
+
+ Up
+
+
+
+ 508.878049,162.341463,48.390244,37.463415
+ outline10
+
+ Down
+
+
+
+ 560.390244,162.341463,48.390244,37.463415
+ outline10
+
+ Right
+
+
99.000000,16.000000,469.000000,202.000000
@@ -172,123 +203,99 @@
43.000000,4.000000,38.000000,38.000000
outline1
-
+
t
- T
t
- T
43.000000,43.000000,38.000000,38.000000
outline1
-
+
g
- G
g
- G
43.000000,82.000000,38.000000,38.000000
outline1
-
+
h
- H
h
- H
43.000000,121.000000,38.000000,38.000000
outline1
-
+
colon
- quotedbl
colon
- quotedbl
43.000000,160.000000,38.000000,38.000000
outline1
-
+
b
- B
b
- B
82.000000,4.000000,38.000000,38.000000
outline1
-
+
x
- X
x
- X
82.000000,43.000000,38.000000,38.000000
outline1
-
+
d
- D
d
- D
82.000000,82.000000,38.000000,38.000000
outline1
-
+
r
- R
r
- R
82.000000,121.000000,38.000000,38.000000
outline1
-
+
p
- P
p
- P
82.000000,160.000000,38.000000,38.000000
outline1
-
+
c
- C
c
- C
121.000000,4.000000,38.000000,38.000000
outline1
-
+
q
- Q
q
- Q
121.000000,43.000000,38.000000,38.000000
outline1
-
+
a
- A
a
- A
@@ -304,174 +311,140 @@
121.000000,121.000000,38.000000,38.000000
outline1
-
+
w
- W
w
- W
121.000000,160.000000,38.000000,38.000000
outline1
-
+
s
- S
s
- S
160.000000,4.000000,38.000000,38.000000
outline1
-
+
u
- U
u
- U
160.000000,43.000000,38.000000,38.000000
outline1
-
+
i
- I
i
- I
160.000000,82.000000,38.000000,38.000000
outline1
-
+
exclam
- 1
exclam
- 1
160.000000,121.000000,38.000000,38.000000
outline1
-
+
comma
-
comma
-
160.000000,160.000000,38.000000,38.000000
outline1
-
+
k
- K
k
- K
199.000000,4.000000,38.000000,38.000000
outline1
-
+
f
- F
f
- F
199.000000,43.000000,38.000000,38.000000
outline1
-
+
v
- V
v
- V
199.000000,82.000000,38.000000,38.000000
outline1
-
+
quotedbl
- at
quotedbl
- at
199.000000,121.000000,38.000000,38.000000
outline1
-
+
asciicircum
- plus
asciicircum
- plus
199.000000,160.000000,38.000000,38.000000
outline1
-
+
equal
- underscore
equal
- underscore
238.000000,4.000000,38.000000,38.000000
outline1
-
+
j
- J
j
- J
238.000000,43.000000,38.000000,38.000000
outline1
-
+
n
- N
n
- N
238.000000,82.000000,38.000000,38.000000
outline1
-
+
bracketright
-
bracketright
-
238.000000,121.000000,38.000000,38.000000
outline1
-
+
slash
-
slash
-
238.000000,160.000000,38.000000,38.000000
outline1
-
+
m
- M
m
- M
@@ -488,16 +461,6 @@
277.000000,43.000000,38.000000,38.000000
outline1
-
- 0
-
- 0
-
-
-
-
- 277.000000,82.000000,38.000000,38.000000
- outline1
8
parenleft
@@ -505,18 +468,8 @@
parenleft
-
- 277.000000,121.000000,38.000000,38.000000
- outline1
-
- 0
-
- 0
-
-
-
-
- 277.000000,160.000000,38.000000,38.000000
+
+ 277.000000,82.000000,38.000000,38.000000
outline1
9
@@ -525,127 +478,106 @@
parenright
-
316.000000,4.000000,38.000000,38.000000
outline1
-
+
o
- O
o
- O
316.000000,43.000000,38.000000,38.000000
outline1
-
+
l
- L
l
- L
316.000000,82.000000,38.000000,38.000000
outline1
-
+
period
-
period
-
316.000000,121.000000,38.000000,38.000000
outline1
-
+
semicolon
-
semicolon
-
316.000000,160.000000,38.000000,38.000000
outline1
-
+
backslash
-
backslash
-
355.000000,4.000000,38.000000,38.000000
outline1
-
+
0
-
0
-
355.000000,43.000000,38.000000,38.000000
outline1
-
-
-
-
-
-
-
+
+ asciitilde
+ asciitilde
+
+
355.000000,82.000000,38.000000,38.000000
outline1
-
- asciitilde
- question
- asciitilde
- question
+
+ y
+ y
355.000000,121.000000,38.000000,38.000000
outline1
-
braceleft
-
+ 0
braceleft
+ 0
355.000000,160.000000,38.000000,38.000000
outline1
- y
braceright
- y
+ 0
braceright
+ 0
394.000000,4.000000,38.000000,38.000000
outline1
-
+
at
-
at
-
394.000000,43.000000,38.000000,38.000000
outline1
-
+
bracketleft
-
bracketleft
-
@@ -667,9 +599,11 @@
394.000000,160.000000,38.000000,38.000000
outline1
-
+
greater
+ question
greater
+ question
@@ -751,5 +685,12 @@
80.000000,38.000000
0.000000,38.000000
+
+ 1.000000
+ 0.000000,0.000000
+ 238.829268,0.000000
+ 238.829268,37.463415
+ 0.000000,37.463415
+
diff --git a/data/keyboards/th.xml b/data/keyboards/th.xml
index f52a7bd0..4e0d7754 100644
--- a/data/keyboards/th.xml
+++ b/data/keyboards/th.xml
@@ -18,93 +18,85 @@
84.292683,1.560976,37.463415,37.463415
outline2
-
+
F1
- F9
124.878049,1.560976,37.463415,37.463415
outline2
-
+
F2
- F10
165.463415,1.560976,37.463415,37.463415
outline2
-
+
F3
- F11
206.048780,1.560976,37.463415,37.463415
outline2
-
+
F4
- F12
266.926829,1.560976,37.463415,37.463415
outline2
-
+
F5
- (null)
307.512195,1.560976,37.463415,37.463415
outline2
-
+
F6
- (null)
348.097561,1.560976,37.463415,37.463415
outline2
-
+
F7
- (null)
388.682927,1.560976,37.463415,37.463415
outline2
-
+
F8
- (null)
449.560976,1.560976,37.463415,37.463415
outline2
- Left
+ F9
490.146341,1.560976,37.463415,37.463415
outline2
- Up
+ F10
530.731707,1.560976,37.463415,37.463415
outline2
- Down
+ F11
571.317073,1.560976,37.463415,37.463415
outline2
- Right
+ F12
@@ -561,7 +553,7 @@
62.439024,162.341463,48.390244,37.463415
outline1
- Super_L
+ ISO_Level3_Shift
@@ -583,28 +575,28 @@
407.414634,162.341463,48.390244,37.463415
outline1
- ISO_Level3_Shift
+ Left
458.926829,162.341463,48.390244,37.463415
outline1
- Super_R
+ Up
508.878049,162.341463,48.390244,37.463415
outline1
- Menu
+ Down
560.390244,162.341463,48.390244,37.463415
outline1
- Control_R
+ Right
diff --git a/data/keyboards/us.xml b/data/keyboards/us.xml
index 863a6a69..1cfac3d7 100644
--- a/data/keyboards/us.xml
+++ b/data/keyboards/us.xml
@@ -18,93 +18,85 @@
84.292683,1.560976,37.463415,37.463415
outline2
-
+
F1
- F9
124.878049,1.560976,37.463415,37.463415
outline2
-
+
F2
- F10
165.463415,1.560976,37.463415,37.463415
outline2
-
+
F3
- F11
206.048780,1.560976,37.463415,37.463415
outline2
-
+
F4
- F12
266.926829,1.560976,37.463415,37.463415
outline2
-
+
F5
- (null)
307.512195,1.560976,37.463415,37.463415
outline2
-
+
F6
- (null)
348.097561,1.560976,37.463415,37.463415
outline2
-
+
F7
- (null)
388.682927,1.560976,37.463415,37.463415
outline2
-
+
F8
- (null)
449.560976,1.560976,37.463415,37.463415
outline2
- Left
+ F9
490.146341,1.560976,37.463415,37.463415
outline2
- Up
+ F10
530.731707,1.560976,37.463415,37.463415
outline2
- Down
+ F11
571.317073,1.560976,37.463415,37.463415
outline2
- Right
+ F12
@@ -174,9 +166,10 @@
206.048780,1.560976,37.463415,37.463415
outline2
-
+
5
percent
+ EuroSign
@@ -561,7 +554,7 @@
62.439024,162.341463,48.390244,37.463415
outline1
- Super_L
+ ISO_Level3_Shift
@@ -583,28 +576,28 @@
407.414634,162.341463,48.390244,37.463415
outline1
- ISO_Level3_Shift
+ Left
458.926829,162.341463,48.390244,37.463415
outline1
- Super_R
+ Up
508.878049,162.341463,48.390244,37.463415
outline1
- Menu
+ Down
560.390244,162.341463,48.390244,37.463415
outline1
- Control_R
+ Right