Release 1.6.0 "Specific impulse"

New emoji layout, `entry.py` becomes part of the -devel package under the name `squeekboard-entry`.
Merge branch 'type_fixes' into 'master'
2020-01-02 12:06:19 +00:00 · 2019-12-24 22:09:16 +00:00 · 2019-12-24 14:28:50 +00:00 · 2019-12-24 14:21:51 +00:00 · 2019-12-24 10:41:02 +00:00 · 2019-12-24 10:41:02 +00:00
119 changed files with 4652 additions and 7386 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -28,7 +28,22 @@ build_meson:
    - ninja -C _build install

 build_deb:
-    <<: *tags
+    tags:
+        - librem5
+    stage: build
+    artifacts:
+      paths:
+        - "*.deb"
+    script:
+        - apt-get -y install devscripts
+        - debuild -i -us -uc -b
+        - cp ../*.deb .
+
+build_deb_aarch64:
+    image: multiarch/debian-debootstrap:arm64-buster
+    tags:
+        - ARM64
+    allow_failure: true
    stage: build
    artifacts:
      paths:
--- a/Cargo.lock
+++ b/Cargo.lock
@ -1,15 +1,263 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
+[[package]]
+name = "aho-corasick"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "ansi_term"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "atk-sys"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "atty"
+version = "0.2.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "bitflags"
 version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"

+[[package]]
+name = "cairo-rs"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cairo-sys-rs 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "cairo-sys-rs"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "glib 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "cc"
+version = "1.0.45"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "clap"
+version = "2.32.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "strsim 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "textwrap 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "dtoa"
 version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"

+[[package]]
+name = "fragile"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "gdk"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cairo-rs 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cairo-sys-rs 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gdk-pixbuf 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gdk-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gio 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gio-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pango 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "gdk-pixbuf"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "gdk-pixbuf-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gio 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gio-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "gdk-pixbuf-sys"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "gio-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "gdk-sys"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cairo-sys-rs 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gdk-pixbuf-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gio-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pango-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "gio"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fragile 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gio-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "gio-sys"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "glib"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "glib-sys"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "gobject-sys"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "gtk"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cairo-rs 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cairo-sys-rs 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gdk 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gdk-pixbuf 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gdk-pixbuf-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gdk-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gio 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gio-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gtk-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pango 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "gtk-sys"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "atk-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cairo-sys-rs 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gdk-pixbuf-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gdk-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gio-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pango-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "lazy_static"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "libc"
 version = "0.2.62"
@ -25,6 +273,11 @@ name = "maplit"
 version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"

+[[package]]
+name = "memchr"
+version = "2.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "memmap"
 version = "0.7.0"
@ -34,6 +287,36 @@ dependencies = [
 "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

+[[package]]
+name = "pango"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pango-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "pango-sys"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "pkg-config"
+version = "0.3.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "proc-macro2"
 version = "1.0.4"
@ -50,12 +333,39 @@ dependencies = [
 "proc-macro2 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

+[[package]]
+name = "regex"
+version = "1.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "utf8-ranges 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.6.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "rs"
 version = "0.1.0"
 dependencies = [
 "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cairo-rs 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cairo-sys-rs 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gdk 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gio 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gtk 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gtk-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "maplit 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 1.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_yaml 0.8.9 (registry+https://github.com/rust-lang/crates.io-index)",
 "xkbcommon 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -90,6 +400,11 @@ dependencies = [
 "yaml-rust 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

+[[package]]
+name = "strsim"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "syn"
 version = "1.0.5"
@ -100,11 +415,42 @@ dependencies = [
 "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

+[[package]]
+name = "textwrap"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "thread_local"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "unicode-width"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "unicode-xid"
 version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"

+[[package]]
+name = "utf8-ranges"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "vec_map"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "winapi"
 version = "0.3.8"
@ -142,19 +488,52 @@ dependencies = [
 ]

 [metadata]
+"checksum aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)" = "58fb5e95d83b38284460a5fda7d6470aa0b8844d283a0b614b8535e880800d2d"
+"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
+"checksum atk-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c7017e53393e713212aed7aea336b6553be4927f58c37070a56c2fe3d107e489"
+"checksum atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1803c647a3ec87095e7ae7acfca019e98de5ec9a7d01343f611cf3152ed71a90"
 "checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12"
+"checksum cairo-rs 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "dd940f0d609699e343ef71c4af5f66423afbf30d666f796dabd8fd15229cf5b6"
+"checksum cairo-sys-rs 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d25596627380be4381247dba06c69ad05ca21b3b065bd9827e416882ac41dcd2"
+"checksum cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)" = "4fc9a35e1f4290eb9e5fc54ba6cf40671ed2a2514c3eeb2b2a908dda2ea5a1be"
+"checksum clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b957d88f4b6a63b9d70d5f454ac8011819c6efa7727858f458ab71c756ce2d3e"
 "checksum dtoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "ea57b42383d091c85abcc2706240b94ab2a8fa1fc81c10ff23c4de06e2a90b5e"
+"checksum fragile 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "05f8140122fa0d5dcb9fc8627cfce2b37cc1500f752636d46ea28bc26785c2f9"
+"checksum gdk 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bcc52c7244046df9d959df87289f1fc5cca23f9f850bab0c967963e2ecb83a96"
+"checksum gdk-pixbuf 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bc3aa730cb4df3de5d9fed59f43afdf9e5fb2d3d10bfcbd04cec031435ce87f5"
+"checksum gdk-pixbuf-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "08284f16ce4d909b10d785a763ba190e222d2c1557b29908bf0a661e27a8ac3b"
+"checksum gdk-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "108548ebf5329b551f2b97ab356908d14627905abb74b936c3372de1535aee81"
+"checksum gio 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "29a44b051990573448edc80b1995237f8b97b5734d2aec05105b9242aa10af11"
+"checksum gio-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6975ada29f7924dc1c90b30ed3b32d777805a275556c05e420da4fbdc22eb250"
+"checksum glib 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a333edf5b9f1411c246ef14e7881b087255f04c56dbef48c64a0cb039b4b340"
+"checksum glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3573351e846caed9f11207b275cd67bc07f0c2c94fb628e5d7c92ca056c7882d"
+"checksum gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "08475e4a08f27e6e2287005950114735ed61cec2cb8c1187682a5aec8c69b715"
+"checksum gtk 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "56a6b30f194f09a17bb7ffa95c3ecdb405abd3b75ff981f831b1f6d18fe115ff"
+"checksum gtk-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d487d333a4b87072e6bf9f2e55befa0ebef01b9496c2e263c0f4a1ff3d6c04b1"
+"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 "checksum libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)" = "34fcd2c08d2f832f376f4173a231990fa5aef4e99fb569867318a227ef4c06ba"
 "checksum linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ae91b68aebc4ddb91978b11a1b02ddd8602a05ec19002801c5666000e05e0f83"
 "checksum maplit 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d"
+"checksum memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e"
 "checksum memmap 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6585fd95e7bb50d6cc31e20d4cf9afb4e2ba16c5846fc76793f11218da9c475b"
+"checksum pango 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4c2cb169402a3eb1ba034a7cc7d95b8b1c106e9be5ba4be79a5a93dc1a2795f4"
+"checksum pango-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d6eb49268e69dd0c1da5d3001a61aac08e2e9d2bfbe4ae4b19b9963c998f6453"
+"checksum pkg-config 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)" = "72d5370d90f49f70bd033c3d75e87fc529fbfff9d6f7cccef07d6170079d91ea"
 "checksum proc-macro2 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "afdc77cc74ec70ed262262942ebb7dac3d479e9e5cfa2da1841c0806f6cdabcc"
 "checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe"
+"checksum regex 1.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "d9d8297cc20bbb6184f8b45ff61c8ee6a9ac56c156cec8e38c3e5084773c44ad"
+"checksum regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "11a7e20d1cce64ef2fed88b66d347f88bd9babb82845b2b858f3edbf59a4f716"
 "checksum serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)" = "9796c9b7ba2ffe7a9ce53c2287dfc48080f4b2b362fcc245a259b3a7201119dd"
 "checksum serde_derive 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)" = "4b133a43a1ecd55d4086bd5b4dc6c1751c68b1bfbeba7a5040442022c7e7c02e"
 "checksum serde_yaml 0.8.9 (registry+https://github.com/rust-lang/crates.io-index)" = "38b08a9a90e5260fe01c6480ec7c811606df6d3a660415808c3c3fa8ed95b582"
+"checksum strsim 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4f380125926a99e52bc279241539c018323fab05ad6368b56f93d9369ff550"
 "checksum syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "66850e97125af79138385e9b88339cbcd037e3f28ceab8c5ad98e64f0f1f80bf"
+"checksum textwrap 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "307686869c93e71f94da64286f9a9524c0f308a9e1c87a583de8e9c9039ad3f6"
+"checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b"
+"checksum unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479"
 "checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
+"checksum utf8-ranges 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b4ae116fef2b7fea257ed6440d3cfcff7f190865f170cdad00bb6465bf18ecba"
+"checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a"
 "checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6"
 "checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 "checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
--- a/Cargo.toml
+++ b/Cargo.toml
@ -4,11 +4,43 @@ version = "0.1.0"

 [dependencies]
 bitflags = "1.0.*"
+clap = "2.32.*"
 maplit = "1.0.*"
+regex = "1.1.*"
 serde = { version = "1.0.*", features = ["derive"] }
 serde_yaml = "0.8.*"
 xkbcommon = { version = "0.4.*", features = ["wayland"] }

+[dependencies.cairo-rs]
+version = "0.5.*"
+
+[dependencies.cairo-sys-rs]
+version = ""
+
+[dependencies.gdk]
+version = ""
+
+[dependencies.gio]
+version = ""
+features = ["v2_44"]
+
+[dependencies.glib]
+version = ""
+features = ["v2_44"]
+
+[dependencies.glib-sys]
+version = ""
+features = ["v2_44"]
+
+[dependencies.gtk]
+version = "0.5.*"
+features = ["v3_22"]
+
+[dependencies.gtk-sys]
+version = ""
+features = ["v3_22"]
+
+
 [lib]
 name = "rs"
 path = "src/lib.rs"
--- a/HACKING.md
+++ b/HACKING.md
@ -3,6 +3,30 @@ Hacking

 This document describes the standards for modifying and maintaining the *squeekboard* project.

+Sending patches
+---------------
+
+By submitting a change to this project, you agree to license it under the [GPL license version 3](./COPYING), or any later version. You also certify that your contribution fulfills the [Developer's Certificate of Origin 1.1](./dco.txt).
+
+Development environment
+-----------------------
+
+*Squeekboard* is regularly built and tested on [the develpment environment](https://developer.puri.sm/Librem5/Development_Environment.html).
+
+Recent Fedora releases are likely to be tested as well.
+
+### Dependencies
+
+On a Debian based system run
+
+```sh
+sudo apt-get -y install build-essential
+sudo apt-get -y build-dep .
+```
+
+For an explicit list of dependencies check the `Build-Depends` entry in the
+[`debian/control`](./debian/control) file.
+
 Testing
 -------

@ -11,12 +35,12 @@ Most common testing is done in CI. Occasionally, and for each release, do perfor
 - the application draws correctly
 - it shows when relevant
 - it changes layouts
- it changes levels
+- it changes views

 Testing with an application:

 ```
-python3 tests/entry.py
+python3 tools/entry.py
 ```

 Testing visibility:
@ -28,11 +52,80 @@ $ busctl call --user sm.puri.OSK0 /sm/puri/OSK0 sm.puri.OSK0 SetVisible b false

 Testing layouts:

+Layouts can be selected using the GNOME Settings application.
+
 ```
-$ gsettings set org.gnome.desktop.input-sources sources "[('xkb', 'us'), ('xkb', 'ua')]"
-$ gsettings set org.gnome.desktop.input-sources current 1
+# define all available layouts. First one is currently selected.
+$ gsettings set org.gnome.desktop.input-sources sources "[('xkb', 'us'), ('xkb', 'de')]"
 ```

+Coding
+------
+
+### Project structure
+
+Rust modules should be split into 2 categories: libraries, and user interface. They differ in the way they do error handling.
+
+Libraries should:
+
+- not panic due to external surprises, only due to internal inconsistencies
+- pass errors and surprises they can't handle to the callers instead
+- not silence errors and surprises
+
+User interface modules should:
+
+- try to provide safe values whenever they encounter an error
+- do the logging
+- give libraries the ability to report errors and surprises (e.g. via giving them loggers)
+
+### Style
+
+Code submitted should roughly match the style of surrounding code. Things that will *not* be accepted are ones that often lead to errors:
+
+- skipping brackets `{}` after every `if()`, `else`, and similar
+
+Bad example:
+
+```
+if (foo)
+  bar();
+```
+
+Good example:
+
+```
+if (foo) {
+  bar();
+}
+```
+
+- mixing tabs and spaces in the same block of code (or config)
+
+Strongly encouraged:
+
+- don't make lines too long. If it's longer than ~80 characters, it's probably unreadable already, and the code needs to be clarified;
+- put operators in the beginning of a continuation line
+
+Bad example:
+
+```
+foobar = verylongexpression +
+    anotherverylongexpression + 
+    yetanotherexpression;
+```
+
+Good example:
+
+```
+foobar = verylongexpression
+    + anotherverylongexpression
+    + yetanotherexpression;
+```
+
+- use `///` for documentation comments in front of definitions and `/*! ... */` for documentation comments in the beginning of modules (see [Rust doc-comments](https://doc.rust-lang.org/reference/comments.html#doc-comments))
+
+If in doubt, check [PEP8](https://github.com/rust-dev-tools/fmt-rfcs/blob/master/guide/guide.md), the [kernel coding style](https://www.kernel.org/doc/html/v4.10/process/coding-style.html), or the [Rust style guide](https://github.com/rust-dev-tools/fmt-rfcs/blob/master/guide/guide.md).
+
 Maintenance
 -----------

@ -42,17 +135,19 @@ Use the `cargo.sh` script for maintaining the Cargo part of the build. The scrip

 ```
 cd build_dir
-sh /source_path/cargo.sh '' test
+sh /source_path/cargo.sh test
 ```

 ### Cargo dependencies

+All Cargo dependencies must be selected in the version available in PureOS, and added to the file `debian/control`. Please check with https://software.pureos.net/search_pkg?term=librust .
+
 Dependencies must be specified in `Cargo.toml` with 2 numbers: "major.minor". Since bugfix version number is meant to not affect the interface, this allows for safe updates.

 `Cargo.lock` is used for remembering the revisions of all Rust dependencies. It should be updated often, preferably with each bugfix revision, and in a commit on its own:

 ```
 cd build_dir
-sh /source_path/cargo.sh '' update
+sh /source_path/cargo.sh update
 ninja test
 ```
--- a/cargo.sh
+++ b/cargo.sh
@ -11,14 +11,7 @@ SOURCE_DIR="$(dirname "$SCRIPT_PATH")"

 CARGO_TARGET_DIR="$(pwd)"
 export CARGO_TARGET_DIR
-if [ -n "${1}" ]; then
-    OUT_PATH="$(realpath "$1")"
-fi

 cd "$SOURCE_DIR"
-shift
 cargo "$@"

-if [ -n "${OUT_PATH}" ]; then
-    cp "${CARGO_TARGET_DIR}"/debug/librs.a "${OUT_PATH}"
-fi
--- a/cargo_build.sh
+++ b/cargo_build.sh
@ -0,0 +1,34 @@
+#!/bin/sh
+
+# This script manages Cargo builds
+# while keeping the artifact directory within the build tree
+# instead of the source tree
+
+set -e
+
+SCRIPT_PATH="$(realpath "$0")"
+SOURCE_DIR="$(dirname "$SCRIPT_PATH")"
+
+RELEASE=""
+BINARY_DIR="debug"
+if [ "${1}" = "--release" ]; then
+    shift
+    BINARY_DIR="release"
+    RELEASE="--release"
+fi
+
+if [ "${1}" = "--rename" ]; then
+    shift
+    FILENAME="${1}"
+    shift
+fi
+OUT_PATH="$(realpath "${1}")"
+shift
+OUT_BASENAME="$(basename "${OUT_PATH}")"
+FILENAME="${FILENAME:-"${OUT_BASENAME}"}"
+
+sh "$SOURCE_DIR"/cargo.sh build $RELEASE "$@"
+
+if [ -n "${OUT_PATH}" ]; then
+    cp -a ./"${BINARY_DIR}"/"${FILENAME}" "${OUT_PATH}"
+fi
--- a/data/keyboards/de.yaml
+++ b/data/keyboards/de.yaml
@ -1,46 +1,38 @@
-# German layout by Mark Müller
-# Version 2019101900
+# Maintained by: Mark Müller <markmueller86@gmail.com>
 ---
-bounds: { x: 0, y: 1, width: 360, height: 210 }
-
 outlines:
-    default:
-        bounds: { x: 0, y: 0, width: 35.33, height: 52 }
-    altline:
-        bounds: { x: 0, y: 0, width: 52.67, height: 52 }
-    wide:
-        bounds: { x: 0, y: 0, width: 62, height: 52 }
-    spaceline:
-        bounds: { x: 0, y: 0, width: 99.67, height: 52 }
-    special:
-        bounds: { x: 0, y: 0, width: 35.33, height: 52 }
+    default: { width: 35.33, height: 52 }
+    altline: { width: 52.67, height: 52 }
+    wide: { width: 62, height: 52 }
+    spaceline: { width: 99.67, height: 52 }
+    special: { width: 35.33, height: 52 }

 views:
    base:
        - "q w e r t z u i o p"
        - "a s d f g h j k l"
        - "Shift_L   y x c v b n m  BackSpace"
-        - "show_numbers show_dechars preferences         space        , period Return"
+        - "show_numbers show_eschars preferences         space        , . Return"
    upper:
        - "Q W E R T Z U I O P"
        - "A S D F G H J K L"
        - "Shift_L   Y X C V B N M  BackSpace"
-        - "show_numbers show_dechars preferences         space        ! ? Return"
+        - "show_numbers show_eschars preferences         space        ! ? Return"
    numbers:
        - "1 2 3 4 5 6 7 8 9 0"
        - "@ # € % & - _ + ( )"
-        - "show_symbols   , \" ' colon = < >  BackSpace"
-        - "show_letters show_dechars preferences         space        , period Return"
+        - "show_symbols   , \" ' : = < >  BackSpace"
+        - "show_letters show_eschars preferences         space        , . Return"
    symbols:
        - "~ ` ´ | · √ µ ÷ × ¶"
        - "© ® £ $ ¥ ^ ° * { }"
        - "show_numbers   \\ / § π τ [ ]  BackSpace"
-        - "show_letters show_dechars preferences         space        , period Return"
-    dechars:
+        - "show_letters show_eschars preferences         space        , . Return"
+    eschars:
        - "ä è é ö ü Ä È É Ö Ü"
        - "à â ê î ô À Â È Î Ô"
        - "show_numbers  « » ç Ç æ œ ß  BackSpace"
-        - "show_letters show_dechars preferences         space        „ “ Return"
+        - "show_letters show_eschars preferences         space        „ “ Return"

 buttons:
    Shift_L:
@ -53,6 +45,7 @@ buttons:
    BackSpace:
        outline: "altline"
        icon: "edit-clear-symbolic"
+        keysym: "BackSpace"
    preferences:
        action: "show_prefs"
        outline: "special"
@ -72,24 +65,18 @@ buttons:
            set_view: "symbols"
        outline: "altline"
        label: "*/="
-    show_dechars:
+    show_eschars:
        action:
            locking:
-                lock_view: "dechars"
+                lock_view: "eschars"
                unlock_view: "base"
        outline: "altline"
        label: "äÄ"
-
-    period:
-        outline: "default"
-        label: "."
    space:
        outline: "spaceline"
        label: " "
+        text: " "
    Return:
        outline: "altline"
        icon: "key-enter"
-    colon:
-        label: ":"
-    "\"":
-        keysym: "quotedbl"
+        keysym: "Return"
--- a/data/keyboards/de_wide.yaml
+++ b/data/keyboards/de_wide.yaml
@ -0,0 +1,81 @@
+# Maintained by: Mark Müller <markmueller86@gmail.com>
+---
+outlines:
+    default: { width: 48, height: 42 }
+    altline: { width: 81, height: 42 }
+    wide: { width: 108, height: 42 }
+    spaceline: { width: 216, height: 42 }
+    special: { width: 48, height: 42 }
+
+views:
+    base:
+        - "q w e r t z u i o p ü"
+        - "a s d f g h j k l ö ä"
+        - "Shift_L   y x c v b n m  BackSpace"
+        - "show_numbers preferences         space        , . Return"
+    upper:
+        - "Q W E R T Z U I O P Ü"
+        - "A S D F G H J K L Ö Ä"
+        - "Shift_L   Y X C V B N M  BackSpace"
+        - "show_numbers preferences         space        ! ? Return"
+    numbers:
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "@ # % & - _ + ( ) ß"
+        - "show_symbols   , \" ' : = < >  BackSpace"
+        - "show_letters preferences         space        , . Return"
+    symbols:
+        - "~ ` ´  · © ® ÷ × ¶"
+        - "€ £ $ ¥ ^ ° * { } |"
+        - "show_numbers   \\ / § π τ [ ]  BackSpace"
+        - "show_letters preferences         space        , . Return"
+    eschars:
+        - "ä è é ö ü Ä È É Ö Ü"
+        - "à â ê î ô À Â È Î Ô"
+        - "show_numbers  « » ç Ç æ œ ß  BackSpace"
+        - "show_letters preferences         space        „ “ Return"
+
+buttons:
+    Shift_L:
+        action:
+            locking:
+                lock_view: "upper"
+                unlock_view: "base"
+        outline: "altline"
+        icon: "key-shift"
+    BackSpace:
+        outline: "altline"
+        icon: "edit-clear-symbolic"
+        keysym: "BackSpace"
+    preferences:
+        action: "show_prefs"
+        outline: "special"
+        icon: "keyboard-mode-symbolic"
+    show_numbers:
+        action:
+            set_view: "numbers"
+        outline: "altline"
+        label: "123"
+    show_letters:
+        action:
+            set_view: "base"
+        outline: "altline"
+        label: "abc"
+    show_symbols:
+        action:
+            set_view: "symbols"
+        outline: "altline"
+        label: "*/="
+    show_eschars:
+        action:
+            locking:
+                lock_view: "eschars"
+                unlock_view: "base"
+        outline: "altline"
+        label: "äÄ"
+    space:
+        outline: "spaceline"
+        text: " "
+    Return:
+        outline: "altline"
+        icon: "key-enter"
+        keysym: "Return"
--- a/data/keyboards/el.yaml
+++ b/data/keyboards/el.yaml
@ -2,19 +2,12 @@
 # University of the Aegean, Department of Mathematics, atsol@aegean.gr
 # Sep 2019
 ---
-bounds: { x: 0, y: 0.33, width: 360, height: 210 }
-
 outlines:
-    default:
-        bounds: { x: 0, y: 0, width: 32, height: 52 }
-    altline:
-        bounds: { x: 0, y: 0, width: 48.39024, height: 52 }
-    wide:
-        bounds: { x: 0, y: 0, width: 62, height: 52 }
-    outline7:
-        bounds: { x: 0, y: 0, width: 88.97561, height: 52 }
-    spaceline:
-        bounds: { x: 0, y: 0, width: 150.5853, height: 52 }
+    default: { width: 32, height: 52 }
+    altline: { width: 48.39024, height: 52 }
+    wide: { width: 62, height: 52 }
+    outline7: { width: 88.97561, height: 52 }
+    spaceline: { width: 150.5853, height: 52 }

 views:
    base:
@ -53,6 +46,7 @@ buttons:
    BackSpace:
        outline: "altline"
        icon: "edit-clear-symbolic"
+        keysym: "BackSpace"
    preferences:
        action: "show_prefs"
        outline: "altline"
@ -86,111 +80,112 @@ buttons:
        label: "αι"
    period:
        outline: "altline"
-        label: "."
+        text: "."
    space:
        outline: spaceline
-        label: " "
+        text: " "
    Return:
        outline: "wide"
        icon: "key-enter"
+        keysym: "Return"
    aring:
-        label: "å"
+        text: "å"
    Aring:
-        label: "Å"
+        text: "Å"
    oslash:
-        label: "ø"
+        text: "ø"
    Oslash:
-        label: "Ø"
+        text: "Ø"
    ae:
-        label: "æ"
+        text: "æ"
    AE:
-        label: "Æ"
+        text: "Æ"
    asterisk:
-        label: "*"
+        text: "*"
    asciitilde:
-        label: "~"
+        text: "~"
    quoteleft:
-        label: "`"
+        text: "`"
    bar:
-        label: "|"
+        text: "|"
    U00B7:
-        label: "·"
+        text: "·"
    squareroot:
-        label: "√"
+        text: "√"
    Greek_pi:
-        label: "π"
+        text: "π"
    division:
-        label: "÷"
+        text: "÷"
    multiply:
-        label: "×"
+        text: "×"
    paragraph:
-        label: "¶"
+        text: "¶"
    Greek_tau:
-        label: "τ"
+        text: "τ"
    copyright:
-        label: "©"
+        text: "©"
    numbersign:
-        label: "#"
+        text: "#"
    U00AE:
-        label: "®"
+        text: "®"
    at:
-        label: "@"
+        text: "@"
    dollar:
-        label: "$"
+        text: "$"
    U00A3:
-        label: "£"
+        text: "£"
    percent:
-        label: "%"
+        text: "%"
    EuroSign:
-        label: "€"
+        text: "€"
    ampersand:
-        label: "&"
+        text: "&"
    U00A5:
-        label: "¥"
+        text: "¥"
    minus:
-        label: "-"
+        text: "-"
    asciicircum:
-        label: "^"
+        text: "^"
    underscore:
-        label: "_"
+        text: "_"
    degree:
-        label: "°"
+        text: "°"
    plus:
-        label: "+"
+        text: "+"
    equal:
-        label: "="
+        text: "="
    parenleft:
-        label: "("
+        text: "("
    parenright:
-        label: ")"
+        text: ")"
    braceleft:
-        label: "{"
+        text: "{"
    braceright:
-        label: "}"
+        text: "}"
    comma:
-        label: ","
+        text: ","
    backslash:
-        label: "\\"
+        text: "\\"
    slash:
-        label: "/"
+        text: "/"
    quotedbl:
-        label: "\""
+        text: "\""
    quoteright:
-        label: "'"
+        text: "'"
    less:
-        label: "<"
+        text: "<"
    greater:
-        label: ">"
+        text: ">"
    colon:
-        label: ":"
+        text: ":"
    semicolon:
-        label: ";"
+        text: ";"
    exclam:
-        label: "!"
+        text: "!"
    question:
-        label: "?"
+        text: "?"
    bracketleft:
-        label: "["
+        text: "["
    bracketright:
-        label: "]"
+        text: "]"

--- a/data/keyboards/emoji.yaml
+++ b/data/keyboards/emoji.yaml
@ -0,0 +1,16 @@
+---
+outlines:
+    default: { width: 52, height: 52 }
+    altline: { width: 52, height: 52 }
+
+views:
+    base:
+        - "😀 😁 😅 😂 😊 😇 🙃"
+        - "😍 😘 😋 😜 😎 🥳 😔"
+        - "😢 😭 😡 😱 🤔 😬 🙄"
+        - "preferences 🤨 🤓 😴 🤢 🤮 😈"
+buttons:
+    preferences:
+        action: "show_prefs"
+        outline: "altline"
+        icon: "keyboard-mode-symbolic"
--- a/data/keyboards/es.yaml
+++ b/data/keyboards/es.yaml
@ -1,17 +1,10 @@
 ---
-bounds: { x: 0, y: 1, width: 360, height: 210 }
-
 outlines:
-    default:
-        bounds: { x: 0, y: 0, width: 35.33, height: 52 }
-    altline:
-        bounds: { x: 0, y: 0, width: 52.67, height: 52 }
-    wide:
-        bounds: { x: 0, y: 0, width: 62, height: 52 }
-    spaceline:
-        bounds: { x: 0, y: 0, width: 99.67, height: 52 }
-    special:
-        bounds: { x: 0, y: 0, width: 44, height: 52 }
+    default: { width: 35.33, height: 52 }
+    altline: { width: 52.67, height: 52 }
+    wide: { width: 62, height: 52 }
+    spaceline: { width: 99.67, height: 52 }
+    special: { width: 44, height: 52 }

 views:
    base:
@ -51,6 +44,7 @@ buttons:
    BackSpace:
        outline: "altline"
        icon: "edit-clear-symbolic"
+        keysym: "BackSpace"
    preferences:
        action: "show_prefs"
        outline: "default"
@ -80,14 +74,14 @@ buttons:

    period:
        outline: "default"
-        label: "."
+        text: "."
    space:
        outline: "spaceline"
-        label: " "
+        text: " "
    Return:
        outline: "altline"
        icon: "key-enter"
+        keysym: "Return"
    colon:
-        label: ":"
-    "\"":
-        keysym: "quotedbl"
+        text: ":"
+
--- a/data/keyboards/fi.yaml
+++ b/data/keyboards/fi.yaml
@ -1,39 +1,32 @@
 ---
-bounds: { x: 0, y: 0.33, width: 360, height: 210 }
-
 outlines:
-    default:
-        bounds: { x: 0, y: 0, width: 32, height: 52 }
-    altline:
-        bounds: { x: 0, y: 0, width: 48.39024, height: 52 }
-    wide:
-        bounds: { x: 0, y: 0, width: 62, height: 52 }
-    outline7:
-        bounds: { x: 0, y: 0, width: 88.97561, height: 52 }
-    spaceline:
-        bounds: { x: 0, y: 0, width: 150.5853, height: 52 }
+    default: { width: 32, height: 52 }
+    altline: { width: 48.39024, height: 52 }
+    wide: { width: 62, height: 52 }
+    outline7: { width: 88.97561, height: 52 }
+    spaceline: { width: 150.5853, height: 52 }

 views:
    base:
-        - "q w e r t y u i o p aring"
-        - "a s d f g h j k l oslash ae"
+        - "q w e r t y u i o p å"
+        - "a s d f g h j k l ö ä"
        - "Shift_L   z x c v b n m  BackSpace"
-        - "show_numbers preferences         space        period    Return"
+        - "show_numbers preferences         space        .    Return"
    upper:
-        - "Q W E R T Y U I O P Aring"
-        - "A S D F G H J K L Oslash AE"
+        - "Q W E R T Y U I O P Å"
+        - "A S D F G H J K L Ö Ä"
        - "Shift_L   Z X C V B N M  BackSpace"
-        - "show_numbers preferences         space        period    Return"
+        - "show_numbers preferences         space        .    Return"
    numbers:
        - "1 2 3 4 5 6 7 8 9 0"
        - "at numbersign dollar percent ampersand minus underscore plus parenleft parenright"
        - "show_symbols   comma quotedbl quoteright colon semicolon exclam question  BackSpace"
-        - "show_letters preferences         space        period    Return"
+        - "show_letters preferences         space        .    Return"
    symbols:
        - "asciitilde quoteleft bar U00B7 squareroot Greek_pi Greek_tau division multiply paragraph"
        - "copyright U00AE U00A3 EuroSign U00A5 asciicircum degree asterisk braceleft braceright"
        - "show_numbers   backslash slash less greater equal bracketleft bracketright  BackSpace"
-        - "show_letters preferences         space        period    Return"
+        - "show_letters preferences         space        .    Return"

 buttons:
    Shift_L:
@ -46,6 +39,7 @@ buttons:
    BackSpace:
        outline: "altline"
        icon: "edit-clear-symbolic"
+        keysym: "BackSpace"
    preferences:
        action: "show_prefs"
        outline: "altline"
@ -65,113 +59,113 @@ buttons:
            set_view: "symbols"
        outline: "altline"
        label: "*/="
-    period:
+    ".":
        outline: altline
-        label: "."
    space:
        outline: spaceline
-        label: " "
+        text: " "
    Return:
        outline: "wide"
        icon: "key-enter"
+        keysym: "Return"
    aring:
-        label: "å"
+        text: "å"
    Aring:
-        label: "Å"
-    oslash:
-        label: "ø"
-    Oslash:
-        label: "Ø"
-    ae:
-        label: "æ"
-    AE:
-        label: "Æ"
+        text: "Å"
+    ouml:
+        text: "ö"
+    Ouml:
+        text: "Ö"
+    auml:
+        text: "ä"
+    Auml:
+        text: "Ä"
    asterisk:
-        label: "*"
+        text: "*"
    asciitilde:
-        label: "~"
+        text: "~"
    quoteleft:
-        label: "`"
+        text: "`"
    bar:
-        label: "|"
+        text: "|"
    U00B7:
-        label: "·"
+        text: "·"
    squareroot:
-        label: "√"
+        text: "√"
    Greek_pi:
-        label: "π"
+        text: "π"
    division:
-        label: "÷"
+        text: "÷"
    multiply:
-        label: "×"
+        text: "×"
    paragraph:
-        label: "¶"
+        text: "¶"
    Greek_tau:
-        label: "τ"
+        text: "τ"
    copyright:
-        label: "©"
+        text: "©"
    numbersign:
-        label: "#"
+        text: "#"
    U00AE:
-        label: "®"
+        text: "®"
    at:
-        label: "@"
+        text: "@"
    dollar:
-        label: "$"
+        text: "$"
    U00A3:
-        label: "£"
+        text: "£"
    percent:
-        label: "%"
+        text: "%"
    EuroSign:
-        label: "€"
+        text: "€"
    ampersand:
-        label: "&"
+        text: "&"
    U00A5:
-        label: "¥"
+        text: "¥"
    minus:
-        label: "-"
+        text: "-"
    asciicircum:
-        label: "^"
+        text: "^"
    underscore:
-        label: "_"
+        text: "_"
    degree:
-        label: "°"
+        text: "°"
    plus:
-        label: "+"
+        text: "+"
    equal:
-        label: "="
+        text: "="
    parenleft:
-        label: "("
+        text: "("
    parenright:
-        label: ")"
+        text: ")"
    braceleft:
-        label: "{"
+        text: "{"
    braceright:
-        label: "}"
+        text: "}"
    comma:
-        label: ","
+        text: ","
    backslash:
-        label: "\\"
+        text: "\\"
    slash:
-        label: "/"
+        text: "/"
    quotedbl:
-        label: "\""
+        text: "\""
    quoteright:
-        label: "'"
+        text: "'"
    less:
-        label: "<"
+        text: "<"
    greater:
-        label: ">"
+        text: ">"
    colon:
-        label: ":"
+        text: ":"
    semicolon:
-        label: ";"
+        text: ";"
    exclam:
-        label: "!"
+        text: "!"
    question:
-        label: "?"
+        text: "?"
    bracketleft:
-        label: "["
+        text: "["
    bracketright:
-        label: "]"
+        text: "]"

--- a/data/keyboards/it.yaml
+++ b/data/keyboards/it.yaml
@ -1,19 +1,12 @@
 # Italian layout created by Antonio Pandolfo
 # 03 october 2019
 ---
-bounds: { x: 0, y: 1, width: 360, height: 210 }
-
 outlines:
-    default:
-        bounds: { x: 0, y: 0, width: 35.33, height: 52 }
-    altline:
-        bounds: { x: 0, y: 0, width: 52.67, height: 52 }
-    wide:
-        bounds: { x: 0, y: 0, width: 62, height: 52 }
-    spaceline:
-        bounds: { x: 0, y: 0, width: 99.67, height: 52 }
-    special:
-        bounds: { x: 0, y: 0, width: 44, height: 52 }
+    default: { width: 35.33, height: 52 }
+    altline: { width: 52.67, height: 52 }
+    wide: { width: 62, height: 52 }
+    spaceline: { width: 99.67, height: 52 }
+    special: { width: 44, height: 52 }

 views:
    base:
@ -53,6 +46,7 @@ buttons:
    BackSpace:
        outline: "altline"
        icon: "edit-clear-symbolic"
+        keysym: "BackSpace"
    preferences:
        action: "show_prefs"
        outline: "default"
@ -91,6 +85,7 @@ buttons:
    Return:
        outline: "altline"
        icon: "key-enter"
+        keysym: "Return"
    colon:
        label: ":"
    "\"":
--- a/data/keyboards/jp+kana.yaml
+++ b/data/keyboards/jp+kana.yaml
@ -1,19 +1,11 @@
-# Japanese Kana layout by Mark Müller
-# Version 2019101900
+# Maintained by: Mark Müller <markmueller86@gmail.com>
 ---
-bounds: { x: 0, y: 1, width: 360, height: 210 }
-
 outlines:
-    default:
-        bounds: { x: 0, y: 0, width: 62, height: 52 }
-    default-wide:
-        bounds: { x: 0, y: 0, width: 62, height: 52 }
-    altline:
-        bounds: { x: 0, y: 0, width: 62, height: 52 }
-    wide:
-        bounds: { x: 0, y: 0, width: 62, height: 52 }
-    special:
-        bounds: { x: 0, y: 0, width: 62, height: 52 }
+    default: { width: 62, height: 52 }
+    default-wide: { width: 62, height: 52 }
+    altline: { width: 62, height: 52 }
+    wide: { width: 62, height: 52 }
+    special: { width: 62, height: 52 }

 views:
    base: # hiragana
@ -199,29 +191,33 @@ views:
        - "\\ ´ ` · ¶" 

 buttons:
-    # following 4 buttons are keysyms from libxkbcommon
+    # following 4 buttons use the corresponding xkb name as keysym
    BackSpace:
        outline: "wide"
        icon: "edit-clear-symbolic"
+        keysym: "BackSpace"
    Return:
        outline: "wide"
        icon: "key-enter"
+        keysym: "Return"
    Left:
        outline: "wide"
        label: "←"
+        keysym: "Left"
    Right:
        outline: "wide"
        label: "→"
+        keysym: "Right"
    # special button "preferences" is handled in the code
    preferences:
        action: "show_prefs"
        outline: "special"
        icon: "keyboard-mode-symbolic"
-    # space button (unicode)
+    # space button using text tag for ideographic space
    space:
        outline: "default-wide"
        label: "␣"
-        keysym: "U3000"
+        text: "　"
    # switch to number view
    numbers:
        action:
--- a/data/keyboards/jp+kana_wide.yaml
+++ b/data/keyboards/jp+kana_wide.yaml
@ -0,0 +1,525 @@
+# Maintained by: Mark Müller <markmueller86@gmail.com>
+---
+outlines:
+    default: { width: 62, height: 42 }
+    default-wide: { width: 62, height: 42 }
+    altline: { width: 62, height: 42 }
+    wide: { width: 62, height: 42 }
+    special: { width: 62, height: 42 }
+
+views:
+    base: # hiragana
+        - "preferences _a ka sa BackSpace"
+        - "Left ta na ha Right"
+        - "カタカナ ma ya ra space"
+        - "switch2roman symbols wa punct Return"
+    _a:
+        - "preferences dummykey _a dummykey BackSpace"
+        - "あ い う え お"
+        - "ぁ ぃ ぅ ぇ ぉ" # 2 code points each
+        - "dummykey dummykey ゔ dummykey dummykey"
+    ka:
+        - "preferences dummykey ka dummykey BackSpace"
+        - "か き く け こ"
+        - "が ぎ ぐ げ ご"
+        - "ゕ dummykey dummykey ゖ dummykey"
+    sa:
+        - "preferences dummykey sa dummykey BackSpace"
+        - "さ し す せ そ"
+        - "ざ じ ず ぜ ぞ"
+    ta:
+        - "preferences dummykey ta dummykey BackSpace"
+        - "た ち つ て と"
+        - "だ ぢ づ で ど"
+        - "dummykey dummykey っ dummykey dummykey"
+    na:
+        - "preferences dummykey na dummykey BackSpace"
+        - "な に ぬ ね の"
+    ha:
+        - "preferences dummykey ha dummykey BackSpace"
+        - "は ひ ふ へ ほ"
+        - "ば び ぶ べ ぼ"
+        - "ぱ ぴ ぷ ぺ ぽ"
+    ma:
+        - "preferences dummykey ma dummykey BackSpace"
+        - "ま み む め も"
+    ya:
+        - "preferences dummykey ya dummykey BackSpace"
+        - "や dummykey ゆ dummykey よ"
+        - "ゃ dummykey ゅ dummykey ょ"
+    ra:
+        - "preferences dummykey ra dummykey BackSpace"
+        - "ら り る れ ろ"
+    wa:
+        - "preferences dummykey wa dummykey BackSpace"
+        - "わ ゐ dummykey ゑ を"
+        - "ゎ dummykey ん dummykey dummykey"
+    symbols:
+        - "preferences dummykey symbols dummykey BackSpace"
+        - "「 」 （ ） §"
+        - "【 】 ＜ ＞ ＝"
+        - "＋ ＊ ＆ ％ ＄ "
+    punct:
+        - "preferences dummykey punct dummykey BackSpace"
+        - "。 、 ？ ！ ー"
+
+        - "： ； ・ 〜 …"
+        - "♪ ” ’ ゙ ゚"
+        
+#a 	あア 	かカ 	さサ 	たタ 	なナ 	はハ 	まマ 	やヤ 	らラ 	わワ
+#i 	いイ 	きキ 	しシ 	ちチ 	にニ 	ひヒ 	みミ 	※      りリ 	ゐヰ
+#u 	うウ 	くク 	すス 	つツ 	ぬヌ 	ふフ 	むム 	ゆユ 	るル 	※
+#e 	えエ 	けケ 	せセ 	てテ 	ねネ 	へヘ 	めメ 	※      れレ 	ゑヱ
+#o 	おオ 	こコ 	そソ 	とト 	のノ 	ほホ 	もモ 	よヨ 	ろロ 	をヲ
+
+#      g       z       d       b       p      n
+#a 	が ガ 	ざ ザ 	だ ダ 	ば バ 	ぱ パ   ん ン
+#i 	ぎ ギ 	じ ジ 	ぢ ヂ 	び ビ 	ぴ ピ 
+#u 	ぐ グ 	ず ズ 	づ ヅ 	ぶ ブ 	ぷ プ 
+#e 	げ ゲ 	ぜ ゼ 	で デ 	べ ベ 	ぺ ペ 
+#o 	ご ゴ 	ぞ ゾ 	ど ド 	ぼ ボ 	ぽ ポ 
+
+    カタカナ: # katakana
+        - "preferences _A KA SA BackSpace"
+        - "Left TA NA HA Right"
+        - "ひらがな MA YA RA space"
+        - "switch2roman SYMBOLS WA PUNCT Return"
+    _A:
+        - "preferences DUMMYKEY _A DUMMYKEY BackSpace"
+        - "ア イ ウ エ オ"
+        - "ァ ィ ゥ ェ ォ"
+        - "DUMMYKEY DUMMYKEY ヴ DUMMYKEY DUMMYKEY"
+    KA:
+        - "preferences DUMMYKEY KA DUMMYKEY BackSpace"
+        - "カ キ ク ケ コ"
+        - "ガ ギ グ ゲ ゴ"
+        - "ヵ DUMMYKEY ㇰ ヶ DUMMYKEY"
+    SA:
+        - "preferences DUMMYKEY SA DUMMYKEY BackSpace"
+        - "サ シ ス セ ソ"
+        - "ザ ジ ズ ゼ ゾ"
+        - "DUMMYKEY ㇱ ㇲ DUMMYKEY DUMMYKEY"
+    TA:
+        - "preferences DUMMYKEY TA DUMMYKEY BackSpace"
+        - "タ チ ツ テ ト"
+        - "ダ ヂ ヅ デ ド"
+        - "DUMMYKEY DUMMYKEY ッ DUMMYKEY ㇳ"
+    NA: 
+        - "preferences DUMMYKEY NA DUMMYKEY BackSpace"
+        - "ナ ニ ヌ ネ ノ"
+        - "DUMMYKEY DUMMYKEY ㇴ DUMMYKEY DUMMYKEY"
+    HA:
+        - "preferences DUMMYKEY HA DUMMYKEY BackSpace"
+        - "ハ ヒ フ ヘ ホ"
+        - "バ ビ ブ ベ ボ"
+        - "パ ピ プ ペ ポ"
+    MA:
+        - "preferences DUMMYKEY MA DUMMYKEY BackSpace"
+        - "マ ミ ム メ モ"
+        - "DUMMYKEY DUMMYKEY ㇺ DUMMYKEY DUMMYKEY"
+    YA:
+        - "preferences DUMMYKEY YA DUMMYKEY BackSpace"
+        - "ヤ DUMMYKEY ユ DUMMYKEY ヨ"
+        - "ャ DUMMYKEY ュ DUMMYKEY ョ"
+    RA:
+        - "preferences DUMMYKEY RA DUMMYKEY BackSpace"
+        - "ラ リ ル レ ロ"
+        - "ㇻ ㇼ ㇽ ㇾ ㇿ"
+    WA:
+        - "preferences DUMMYKEY WA DUMMYKEY BackSpace"
+        - "ワ ヰ DUMMYKEY ヱ ヲ"
+        - "ヮ ヸ ン ヹ ヺ"
+    # numbers view
+    numbers:
+        - "preferences 1 2 3 BackSpace"
+        - "Left 4 5 6 Right"
+        - "roman 7 8 9 space"
+        - "switch2kana * 0 # Return"
+    # Roman alphabet view
+    roman:
+        - "preferences RSYM1 ABC DEF BackSpace"
+        - "Left GHI JKL MNO Right"
+        - "ひらがな PQRS TUV WXYZ space"
+        - "switch2num RSYM2 RSYM3 RSYM4 Return"
+    RSYM1:
+        - "preferences dummykey RSYM1 dummykey BackSpace"
+        - "@ # $ § :"
+        - "| € ¥ £ 1"
+    ABC:
+        - "preferences dummykey ABC dummykey BackSpace"
+        - "A B C Ä ç"
+        - "a b c ä 2"
+    DEF:
+        - "preferences dummykey DEF dummykey BackSpace"
+        - "D E F dummykey"
+        - "d e f 3"
+    GHI:
+        - "preferences dummykey GHI dummykey BackSpace"
+        - "G H I dummykey"
+        - "g h i 4"
+    JKL:
+        - "preferences dummykey JKL dummykey BackSpace"
+        - "J K L dummykey"
+        - "j k l 5"
+    MNO:
+        - "preferences dummykey MNO dummykey BackSpace"
+        - "M N O Ö dummykey"
+        - "m n o ö 6"
+    PQRS:
+        - "preferences dummykey PQRS dummykey BackSpace"
+        - "P Q R S ß"
+        - "p q r s 7"
+    TUV:
+        - "preferences dummykey TUV dummykey BackSpace"
+        - "T U V Ü dummykey"
+        - "t u v ü 8"
+    WXYZ:
+        - "preferences dummykey WXYZ dummykey BackSpace"
+        - "W X Y Z dummykey"
+        - "w x y z 9"
+    RSYM2:
+        - "preferences dummykey RSYM2 dummykey BackSpace"
+        - "( ) ' \" ~"
+        - "[ ] { } _"
+    RSYM3:
+        - "preferences dummykey RSYM3 dummykey BackSpace"
+        - "+ - * / ="
+        - "< > ^ ° 0"
+    RSYM4:
+        - "preferences dummykey RSYM4 dummykey BackSpace"
+        - ", . ? ! ;"
+        - "\\ ´ ` · ¶" 
+
+buttons:
+    # following 4 buttons use the corresponding xkb name as keysym
+    BackSpace:
+        outline: "wide"
+        icon: "edit-clear-symbolic"
+        keysym: "BackSpace"
+    Return:
+        outline: "wide"
+        icon: "key-enter"
+        keysym: "Return"
+    Left:
+        outline: "wide"
+        label: "←"
+        keysym: "Left"
+    Right:
+        outline: "wide"
+        label: "→"
+        keysym: "Right"
+    # special button "preferences" is handled in the code
+    preferences:
+        action: "show_prefs"
+        outline: "special"
+        icon: "keyboard-mode-symbolic"
+    # space button using text tag for ideographic space
+    space:
+        outline: "default-wide"
+        label: "␣"
+        text: "　"
+    # switch to number view
+    numbers:
+        action:
+            set_view: "numbers"
+        outline: "wide"
+        label: "123"
+    # switch to latin characters
+    roman:
+        action:
+            set_view: "roman"
+        outline: "wide"
+        label: "ᴀʙᴄ"
+    # toggle button with 3 different states
+    switch2roman: # switch from kana to latin characters view
+        action:
+            set_view: "roman"
+        outline: "wide"
+        label: "あᴀ₁"
+    switch2num: # switch from latin characters to numbers view
+        action:
+            set_view: "numbers"
+        outline: "wide"
+        label: "ぁA₁"
+    switch2kana: # switch from numbers to hiragana view
+        action:
+            set_view: "base"
+        outline: "wide"
+        label: "ぁᴀ1"
+    # Buttons for katakana and symbols
+    ひらがな:
+        action:
+            set_view: "base"
+        outline: "wide"
+        label: "あさ"
+    _a:
+        action:
+            locking:
+                lock_view: "_a"
+                unlock_view: "base"
+        outline: "altline"
+        label: "あ"
+    ka:
+        action:
+            locking:
+                lock_view: "ka"
+                unlock_view: "base"
+        outline: "altline"
+        label: "か"
+    sa:
+        action:
+            locking:
+                lock_view: "sa"
+                unlock_view: "base"
+        outline: "altline"
+        label: "さ"
+    ta:
+        action:
+            locking:
+                lock_view: "ta"
+                unlock_view: "base"
+        outline: "altline"
+        label: "た"
+    na:
+        action:
+            locking:
+                lock_view: "na"
+                unlock_view: "base"
+        outline: "altline"
+        label: "な"
+    ha:
+        action:
+            locking:
+                lock_view: "ha"
+                unlock_view: "base"
+        outline: "altline"
+        label: "は"
+    ma:
+        action:
+            locking:
+                lock_view: "ma"
+                unlock_view: "base"
+        outline: "altline"
+        label: "ま"
+    ya:
+        action:
+            locking:
+                lock_view: "ya"
+                unlock_view: "base"
+        outline: "altline"
+        label: "や"
+    ra:
+        action:
+            locking:
+                lock_view: "ra"
+                unlock_view: "base"
+        outline: "altline"
+        label: "ら"
+    wa:
+        action:
+            locking:
+                lock_view: "wa"
+                unlock_view: "base"
+        outline: "altline"
+        label: "わ"
+    dummykey:
+        action:
+            set_view: "base"
+        outline: "altline"
+        label: ""
+    # buttons available on different views like symbols and punct should go
+    # back to their corresponding view
+    symbols:
+        action:
+            locking:
+                lock_view: "symbols"
+                unlock_view: "base"
+        outline: "altline"
+        label: "（）"
+    punct:
+        action:
+            locking:
+                lock_view: "punct"
+                unlock_view: "base"
+        outline: "altline"
+        label: "。"
+    # Buttons for katakana and symbols
+    カタカナ:
+        action:
+            set_view: "カタカナ"
+        outline: "wide"
+        label: "アサ"
+    _A:
+        action:
+            locking:
+                lock_view: "_A"
+                unlock_view: "カタカナ"
+        outline: "altline"
+        label: "ア"
+    KA:
+        action:
+            locking:
+                lock_view: "KA"
+                unlock_view: "カタカナ"
+        outline: "altline"
+        label: "カ"
+    SA:
+        action:
+            locking:
+                lock_view: "SA"
+                unlock_view: "カタカナ"
+        outline: "altline"
+        label: "サ"
+    TA:
+        action:
+            locking:
+                lock_view: "TA"
+                unlock_view: "カタカナ"
+        outline: "altline"
+        label: "タ"
+    NA:
+        action:
+            locking:
+                lock_view: "NA"
+                unlock_view: "カタカナ"
+        outline: "altline"
+        label: "ナ"
+    HA:
+        action:
+            locking:
+                lock_view: "HA"
+                unlock_view: "カタカナ"
+        outline: "altline"
+        label: "ハ"
+    MA:
+        action:
+            locking:
+                lock_view: "MA"
+                unlock_view: "カタカナ"
+        outline: "altline"
+        label: "マ"
+    YA:
+        action:
+            locking:
+                lock_view: "YA"
+                unlock_view: "カタカナ"
+        outline: "altline"
+        label: "ヤ"
+    RA:
+        action:
+            locking:
+                lock_view: "RA"
+                unlock_view: "カタカナ"
+        outline: "altline"
+        label: "ラ"
+    WA:
+        action:
+            locking:
+                lock_view: "WA"
+                unlock_view: "カタカナ"
+        outline: "altline"
+        label: "ワ"
+    DUMMYKEY:
+        action:
+            set_view: "カタカナ"
+        outline: "altline"
+        label: ""
+    SYMBOLS:
+        action:
+            locking:
+                lock_view: "symbols"
+                unlock_view: "カタカナ"
+        outline: "altline"
+        label: "（）"
+    PUNCT:
+        action:
+            locking:
+                lock_view: "punct"
+                unlock_view: "カタカナ"
+        outline: "altline"
+        label: "。"
+    # Buttons for Latin charachters
+    RSYM1:
+        action:
+            locking:
+                lock_view: "RSYM1"
+                unlock_view: "roman"
+        outline: "altline"
+        label: "@#"
+    ABC:
+        action:
+            locking:
+                lock_view: "ABC"
+                unlock_view: "roman"
+        outline: "altline"
+        label: "ᴀʙᴄ"
+    DEF:
+        action:
+            locking:
+                lock_view: "DEF"
+                unlock_view: "roman"
+        outline: "altline"
+        label: "ᴅᴇꜰ"
+    GHI:
+        action:
+            locking:
+                lock_view: "GHI"
+                unlock_view: "roman"
+        outline: "altline"
+        label: "ɢʜɪ"
+    JKL:
+        action:
+            locking:
+                lock_view: "JKL"
+                unlock_view: "roman"
+        outline: "altline"
+        label: "ᴊᴋʟ"
+    MNO:
+        action:
+            locking:
+                lock_view: "MNO"
+                unlock_view: "roman"
+        outline: "altline"
+        label: "ᴍɴᴏ"
+    PQRS:
+        action:
+            locking:
+                lock_view: "PQRS"
+                unlock_view: "roman"
+        outline: "altline"
+        label: "ᴘǫʀs"
+    TUV:
+        action:
+            locking:
+                lock_view: "TUV"
+                unlock_view: "roman"
+        outline: "altline"
+        label: "ᴛᴜᴠ"
+    WXYZ:
+        action:
+            locking:
+                lock_view: "WXYZ"
+                unlock_view: "roman"
+        outline: "altline"
+        label: "ᴡxʏᴢ"
+    RSYM2:
+        action:
+            locking:
+                lock_view: "RSYM2"
+                unlock_view: "roman"
+        outline: "altline"
+        label: "()"
+    RSYM3:
+        action:
+            locking:
+                lock_view: "RSYM3"
+                unlock_view: "roman"
+        outline: "altline"
+        label: "+-"
+    RSYM4:
+        action:
+            locking:
+                lock_view: "RSYM4"
+                unlock_view: "roman"
+        outline: "altline"
+        label: ",.?"
--- a/data/keyboards/no.yaml
+++ b/data/keyboards/no.yaml
@ -0,0 +1,99 @@
+---
+outlines:
+    default: { width: 32, height: 52 }
+    altline: { width: 48.39024, height: 52 }
+    wide: { width: 62, height: 52 }
+    outline7: { width: 88.97561, height: 52 }
+    spaceline: { width: 150.5853, height: 52 }
+
+views:
+    base:
+        - "q w e r t y u i o p å"
+        - "a s d f g h j k l ø æ"
+        - "Shift_L   z x c v b n m  BackSpace"
+        - "show_numbers preferences         space        .    Return"
+    upper:
+        - "Q W E R T Y U I O P Å"
+        - "A S D F G H J K L Ø Æ"
+        - "Shift_L   Z X C V B N M  BackSpace"
+        - "show_numbers preferences         space        .    Return"
+    numbers:
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "@ # $ % & - _ + ( )"
+        - "show_symbols   , \" ' : ; ! ?  BackSpace"
+        - "show_letters preferences         space        .    Return"
+    symbols:
+        - "~ ` | U00B7 squareroot Greek_pi Greek_tau division multiply paragraph"
+        - "copyright U00AE U00A3 EuroSign U00A5 asciicircum degree * { }"
+        - "show_numbers   \\ / < > = [ ]  BackSpace"
+        - "show_letters preferences         space        .    Return"
+
+buttons:
+    Shift_L:
+        action:
+            locking:
+                lock_view: "upper"
+                unlock_view: "base"
+        outline: "altline"
+        icon: "key-shift"
+    BackSpace:
+        outline: "altline"
+        icon: "edit-clear-symbolic"
+        keysym: "BackSpace"
+    preferences:
+        action: "show_prefs"
+        outline: "altline"
+        icon: "keyboard-mode-symbolic"
+    show_numbers:
+        action:
+            set_view: "numbers"
+        outline: "altline"
+        label: "123"
+    show_letters:
+        action:
+            set_view: "base"
+        outline: "altline"
+        label: "ABC"
+    show_symbols:
+        action:
+            set_view: "symbols"
+        outline: "altline"
+        label: "*/="
+    ".":
+        outline: altline
+    space:
+        outline: spaceline
+        text: " "
+    Return:
+        outline: "wide"
+        icon: "key-enter"
+        keysym: "Return"
+    U00B7:
+        text: "·"
+    squareroot:
+        text: "√"
+    Greek_pi:
+        text: "π"
+    division:
+        text: "÷"
+    multiply:
+        text: "×"
+    paragraph:
+        text: "¶"
+    Greek_tau:
+        text: "τ"
+    copyright:
+        text: "©"
+    U00AE:
+        text: "®"
+    U00A3:
+        text: "£"
+    EuroSign:
+        text: "€"
+    U00A5:
+        text: "¥"
+    asciicircum:
+        text: "^"
+    degree:
+        text: "°"
+
--- a/data/keyboards/number.yaml
+++ b/data/keyboards/number.yaml
@ -1,15 +1,9 @@
 ---
-bounds: { x: 0, y: 0.33, width: 360, height: 210 }
-
 outlines:
-    default:
-        bounds: { x: 0, y: 0, width: 37.46341, height: 52 }
-    altline:
-        bounds: { x: 0, y: 0, width: 48.39024, height: 52 }
-    outline7:
-        bounds: { x: 0, y: 0, width: 88.97561, height: 52 }
-    spaceline:
-        bounds: { x: 0, y: 0, width: 120.5853, height: 52 }
+    default: { width: 37.46341, height: 52 }
+    altline: { width: 48.39024, height: 52 }
+    outline7: { width: 88.97561, height: 52 }
+    spaceline: { width: 120.5853, height: 52 }

 views:
    base:
@ -22,22 +16,24 @@ buttons:
    BackSpace:
        outline: "altline"
        icon: "edit-clear-symbolic"
+        keysym: "BackSpace"
    space:
        outline: spaceline
-        label: " "
+        text: " "
    Return:
        outline: outline7
        icon: "key-enter"
+        keysym: "BackSpace"
    asterisk:
-        label: "*"
+        text: "*"
    numbersign:
-        label: "#"
+        text: "#"
    minus:
-        label: "-"
+        text: "-"
    plus:
-        label: "+"
+        text: "+"
    parenleft:
-        label: "("
+        text: "("
    parenright:
-        label: ")"
+        text: ")"

--- a/data/keyboards/se.yaml
+++ b/data/keyboards/se.yaml
@ -0,0 +1,159 @@
+---
+outlines:
+    default: { width: 32, height: 52 }
+    altline: { width: 48.39024, height: 52 }
+    wide: { width: 62, height: 52 }
+    outline7: { width: 88.97561, height: 52 }
+    spaceline: { width: 150.5853, height: 52 }
+
+views:
+    base:
+        - "q w e r t y u i o p å"
+        - "a s d f g h j k l ö ä"
+        - "Shift_L   z x c v b n m  BackSpace"
+        - "show_numbers preferences         space        .    Return"
+    upper:
+        - "Q W E R T Y U I O P Å"
+        - "A S D F G H J K L Ö Ä"
+        - "Shift_L   Z X C V B N M  BackSpace"
+        - "show_numbers preferences         space        .    Return"
+    numbers:
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "at numbersign dollar percent ampersand minus underscore plus parenleft parenright"
+        - "show_symbols   comma quotedbl quoteright colon semicolon exclam question  BackSpace"
+        - "show_letters preferences         space        .    Return"
+    symbols:
+        - "asciitilde quoteleft bar U00B7 squareroot Greek_pi Greek_tau division multiply paragraph"
+        - "copyright U00AE U00A3 EuroSign U00A5 asciicircum degree asterisk braceleft braceright"
+        - "show_numbers   backslash slash less greater equal bracketleft bracketright  BackSpace"
+        - "show_letters preferences         space        .    Return"
+
+buttons:
+    Shift_L:
+        action:
+            locking:
+                lock_view: "upper"
+                unlock_view: "base"
+        outline: "altline"
+        icon: "key-shift"
+    BackSpace:
+        outline: "altline"
+        icon: "edit-clear-symbolic"
+        keysym: "BackSpace"
+    preferences:
+        action: "show_prefs"
+        outline: "altline"
+        icon: "keyboard-mode-symbolic"
+    show_numbers:
+        action:
+            set_view: "numbers"
+        outline: "altline"
+        label: "123"
+    show_letters:
+        action:
+            set_view: "base"
+        outline: "altline"
+        label: "ABC"
+    show_symbols:
+        action:
+            set_view: "symbols"
+        outline: "altline"
+        label: "*/="
+    ".":
+        outline: altline
+    space:
+        outline: spaceline
+        text: " "
+    Return:
+        outline: "wide"
+        icon: "key-enter"
+        keysym: "Return"
+    asterisk:
+        text: "*"
+    asciitilde:
+        text: "~"
+    quoteleft:
+        text: "`"
+    bar:
+        text: "|"
+    U00B7:
+        text: "·"
+    squareroot:
+        text: "√"
+    Greek_pi:
+        text: "π"
+    division:
+        text: "÷"
+    multiply:
+        text: "×"
+    paragraph:
+        text: "¶"
+    Greek_tau:
+        text: "τ"
+    copyright:
+        text: "©"
+    numbersign:
+        text: "#"
+    U00AE:
+        text: "®"
+    at:
+        text: "@"
+    dollar:
+        text: "$"
+    U00A3:
+        text: "£"
+    percent:
+        text: "%"
+    EuroSign:
+        text: "€"
+    ampersand:
+        text: "&"
+    U00A5:
+        text: "¥"
+    minus:
+        text: "-"
+    asciicircum:
+        text: "^"
+    underscore:
+        text: "_"
+    degree:
+        text: "°"
+    plus:
+        text: "+"
+    equal:
+        text: "="
+    parenleft:
+        text: "("
+    parenright:
+        text: ")"
+    braceleft:
+        text: "{"
+    braceright:
+        text: "}"
+    comma:
+        text: ","
+    backslash:
+        text: "\\"
+    slash:
+        text: "/"
+    quotedbl:
+        text: "\""
+    quoteright:
+        text: "'"
+    less:
+        text: "<"
+    greater:
+        text: ">"
+    colon:
+        text: ":"
+    semicolon:
+        text: ";"
+    exclam:
+        text: "!"
+    question:
+        text: "?"
+    bracketleft:
+        text: "["
+    bracketright:
+        text: "]"
+
--- a/data/keyboards/symbols/ar.xml
+++ b/data/keyboards/symbols/ar.xml
@ -1,181 +0,0 @@
-<?xml version="1.0"?>
-<symbols version="0.90">
-  <include>us</include>
-  <key keycode="49" name="TLDE">
-    <keysym keyval="96">quoteleft</keysym>
-    <text category="letter">ّ</text>
-  </key>
-  <key keycode="10" name="AE01">
-    <text category="letter">١</text>
-    <keysym keyval="33">exclam</keysym>
-  </key>
-  <key keycode="11" name="AE02">
-    <text category="letter">٢</text>
-    <keysym keyval="64">at</keysym>
-  </key>
-  <key keycode="12" name="AE03">
-    <text category="letter">٣</text>
-    <keysym keyval="35">numbersign</keysym>
-  </key>
-  <key keycode="13" name="AE04">
-    <text category="letter">٤</text>
-    <keysym keyval="36">dollar</keysym>
-  </key>
-  <key keycode="14" name="AE05">
-    <text category="letter">٥</text>
-    <keysym keyval="37">percent</keysym>
-    <keysym keyval="8364">EuroSign</keysym>
-  </key>
-  <key keycode="15" name="AE06">
-    <text category="letter">٦</text>
-    <keysym keyval="94">asciicircum</keysym>
-  </key>
-  <key keycode="16" name="AE07">
-    <text category="letter">٧</text>
-    <keysym keyval="38">ampersand</keysym>
-  </key>
-  <key keycode="17" name="AE08">
-    <text category="letter">٨</text>
-    <keysym keyval="42">asterisk</keysym>
-  </key>
-  <key keycode="18" name="AE09">
-    <text category="letter">٩</text>
-    <text category="letter">)</text>
-  </key>
-  <key keycode="19" name="AE10">
-    <text category="letter">٠</text>
-    <text category="letter">(</text>
-  </key>
-  <key keycode="24" name="AD01">
-    <text category="letter">ض</text>
-    <text category="letter">َ</text>
-  </key>
-  <key keycode="25" name="AD02">
-    <text category="letter">ص</text>
-    <text category="letter">ً</text>
-  </key>
-  <key keycode="26" name="AD03">
-    <text category="letter">ث</text>
-    <text category="letter">ُ</text>
-  </key>
-  <key keycode="27" name="AD04">
-    <text category="letter">ق</text>
-    <text category="letter">ٌ</text>
-  </key>
-  <key keycode="28" name="AD05">
-    <text category="letter">ف</text>
-    <text category="letter">لإ</text>
-  </key>
-  <key keycode="29" name="AD06">
-    <text category="letter">غ</text>
-    <text category="letter">إ</text>
-  </key>
-  <key keycode="30" name="AD07">
-    <text category="letter">ع</text>
-    <text category="letter">`</text>
-  </key>
-  <key keycode="31" name="AD08">
-    <text category="letter">ه</text>
-    <text category="letter">÷</text>
-  </key>
-  <key keycode="32" name="AD09">
-    <text category="letter">خ</text>
-    <text category="letter">×</text>
-  </key>
-  <key keycode="33" name="AD10">
-    <text category="letter">ح</text>
-    <text category="letter">؛</text>
-  </key>
-  <key keycode="34" name="AD11">
-    <text category="letter">ج</text>
-    <text category="letter">&gt;</text>
-  </key>
-  <key keycode="35" name="AD12">
-    <text category="letter">د</text>
-    <text category="letter">&lt;</text>
-  </key>
-  <key keycode="38" name="AC01">
-    <text category="letter">ش</text>
-    <text category="letter">ِ</text>
-  </key>
-  <key keycode="39" name="AC02">
-    <text category="letter">س</text>
-    <text category="letter">ٍ</text>
-  </key>
-  <key keycode="40" name="AC03">
-    <text category="letter">ي</text>
-    <text category="letter">]</text>
-  </key>
-  <key keycode="41" name="AC04">
-    <text category="letter">ب</text>
-    <text category="letter">[</text>
-  </key>
-  <key keycode="42" name="AC05">
-    <text category="letter">ل</text>
-    <text category="letter">لأ</text>
-  </key>
-  <key keycode="43" name="AC06">
-    <text category="letter">ا</text>
-    <text category="letter">أ</text>
-  </key>
-  <key keycode="44" name="AC07">
-    <text category="letter">ت</text>
-    <text category="letter">ـ</text>
-  </key>
-  <key keycode="45" name="AC08">
-    <text category="letter">ن</text>
-    <text category="letter">،</text>
-  </key>
-  <key keycode="46" name="AC09">
-    <text category="letter">م</text>
-    <text category="letter">/</text>
-  </key>
-  <key keycode="47" name="AC10">
-    <text category="letter">ك</text>
-    <keysym keyval="58">colon</keysym>
-  </key>
-  <key keycode="48" name="AC11">
-    <keysym keyval="39">quoteright</keysym>
-    <keysym keyval="34">quotedbl</keysym>
-  </key>
-  <key keycode="52" name="AB01">
-    <text category="letter">ئ</text>
-    <text category="letter">~</text>
-  </key>
-  <key keycode="53" name="AB02">
-    <text category="letter">ء</text>
-    <text category="letter">ْ</text>
-  </key>
-  <key keycode="54" name="AB03">
-    <text category="letter">ؤ</text>
-    <text category="letter">}</text>
-  </key>
-  <key keycode="55" name="AB04">
-    <text category="letter">ر</text>
-    <text category="letter">{</text>
-  </key>
-  <key keycode="56" name="AB05">
-    <text category="letter">لا</text>
-    <text category="letter">لآ</text>
-  </key>
-  <key keycode="57" name="AB06">
-    <text category="letter">ى</text>
-    <text category="letter">آ</text>
-  </key>
-  <key keycode="58" name="AB07">
-    <text category="letter">ة</text>
-    <text category="letter">&apos;</text>
-  </key>
-  <key keycode="59" name="AB08">
-    <text category="letter">و</text>
-    <text category="letter">,</text>
-  </key>
-  <key keycode="60" name="AB09">
-    <text category="letter">ز</text>
-    <text category="letter">.</text>
-  </key>
-  <key keycode="61" name="AB10">
-    <text category="letter">ظ</text>
-    <text category="letter">؟</text>
-  </key>
-</symbols>
--- a/data/keyboards/symbols/as-inscript.xml
+++ b/data/keyboards/symbols/as-inscript.xml
@ -1,193 +0,0 @@
-<?xml version="1.0"?>
-<symbols version="0.90">
-  <include>us</include>
-  <key keycode="49" name="TLDE">
-    <keysym keyval="96">quoteleft</keysym>
-    <text category="letter">~</text>
-  </key>
-  <key keycode="10" name="AE01">
-    <text category="letter">১</text>
-    <text category="letter">!</text>
-  </key>
-  <key keycode="11" name="AE02">
-    <text category="letter">২</text>
-    <text category="letter">@</text>
-  </key>
-  <key keycode="12" name="AE03">
-    <text category="letter">৩</text>
-    <text category="letter">্ৰ</text>
-  </key>
-  <key keycode="13" name="AE04">
-    <text category="letter">৪</text>
-    <text category="letter">ৰ্</text>
-  </key>
-  <key keycode="14" name="AE05">
-    <text category="letter">৫</text>
-    <text category="letter">জ্ঞ</text>
-    <keysym keyval="8364">EuroSign</keysym>
-  </key>
-  <key keycode="15" name="AE06">
-    <text category="letter">৬</text>
-    <text category="letter">ত্ৰ</text>
-  </key>
-  <key keycode="16" name="AE07">
-    <text category="letter">৭</text>
-    <text category="letter">ক্ষ</text>
-  </key>
-  <key keycode="17" name="AE08">
-    <text category="letter">৮</text>
-    <text category="letter">শ্ৰ</text>
-  </key>
-  <key keycode="18" name="AE09">
-    <text category="letter">৯</text>
-    <text category="letter">(</text>
-  </key>
-  <key keycode="19" name="AE10">
-    <text category="letter">০</text>
-    <text category="letter">)</text>
-  </key>
-  <key keycode="20" name="AE11">
-    <text category="letter">-</text>
-    <text category="letter">ঃ</text>
-  </key>
-  <key keycode="21" name="AE12">
-    <text category="letter">ৃ</text>
-    <text category="letter">ঋ</text>
-  </key>
-  <key keycode="24" name="AD01">
-    <text category="letter">ৌ</text>
-    <text category="letter">ঔ</text>
-  </key>
-  <key keycode="25" name="AD02">
-    <text category="letter">ৈ</text>
-    <text category="letter">ঐ</text>
-  </key>
-  <key keycode="26" name="AD03">
-    <text category="letter">া</text>
-    <text category="letter">আ</text>
-  </key>
-  <key keycode="27" name="AD04">
-    <text category="letter">ী</text>
-    <text category="letter">ঈ</text>
-  </key>
-  <key keycode="28" name="AD05">
-    <text category="letter">ূ</text>
-    <text category="letter">ঊ</text>
-  </key>
-  <key keycode="29" name="AD06">
-    <text category="letter">ব</text>
-    <text category="letter">ভ</text>
-  </key>
-  <key keycode="30" name="AD07">
-    <text category="letter">হ</text>
-    <text category="letter">ঙ</text>
-  </key>
-  <key keycode="31" name="AD08">
-    <text category="letter">গ</text>
-    <text category="letter">ঘ</text>
-  </key>
-  <key keycode="32" name="AD09">
-    <text category="letter">দ</text>
-    <text category="letter">ধ</text>
-  </key>
-  <key keycode="33" name="AD10">
-    <text category="letter">জ</text>
-    <text category="letter">ঝ</text>
-  </key>
-  <key keycode="34" name="AD11">
-    <text category="letter">ড</text>
-    <text category="letter">ঢ</text>
-  </key>
-  <key keycode="35" name="AD12">
-    <text category="letter">়</text>
-    <text category="letter">ঞ</text>
-  </key>
-  <key keycode="51" name="BKSL">
-    <text category="letter">য</text>
-    <text category="letter">|</text>
-  </key>
-  <key keycode="38" name="AC01">
-    <text category="letter">ো</text>
-    <text category="letter">ও</text>
-  </key>
-  <key keycode="39" name="AC02">
-    <text category="letter">ে</text>
-    <text category="letter">এ</text>
-  </key>
-  <key keycode="40" name="AC03">
-    <text category="letter">্</text>
-    <text category="letter">অ</text>
-  </key>
-  <key keycode="41" name="AC04">
-    <text category="letter">ি</text>
-    <text category="letter">ই</text>
-  </key>
-  <key keycode="42" name="AC05">
-    <text category="letter">ু</text>
-    <text category="letter">উ</text>
-  </key>
-  <key keycode="43" name="AC06">
-    <text category="letter">প</text>
-    <text category="letter">ফ</text>
-  </key>
-  <key keycode="44" name="AC07">
-    <text category="letter">ৰ</text>
-    <text category="letter">J</text>
-  </key>
-  <key keycode="45" name="AC08">
-    <text category="letter">ক</text>
-    <text category="letter">খ</text>
-  </key>
-  <key keycode="46" name="AC09">
-    <text category="letter">ত</text>
-    <text category="letter">থ</text>
-  </key>
-  <key keycode="47" name="AC10">
-    <text category="letter">চ</text>
-    <text category="letter">ছ</text>
-  </key>
-  <key keycode="48" name="AC11">
-    <keysym keyval="39">quoteright</keysym>
-    <text category="letter">ঠ</text>
-  </key>
-  <key keycode="52" name="AB01">
-    <text category="letter">ৎ</text>
-    <text category="letter">৺</text>
-  </key>
-  <key keycode="53" name="AB02">
-    <text category="letter">ং</text>
-    <text category="letter">ঁ</text>
-  </key>
-  <key keycode="54" name="AB03">
-    <text category="letter">ম</text>
-    <text category="letter">ণ</text>
-  </key>
-  <key keycode="55" name="AB04">
-    <text category="letter">ন</text>
-    <text category="letter">V</text>
-  </key>
-  <key keycode="56" name="AB05">
-    <text category="letter">ৱ</text>
-    <text category="letter">B</text>
-  </key>
-  <key keycode="57" name="AB06">
-    <text category="letter">ল</text>
-    <text category="letter">N</text>
-  </key>
-  <key keycode="58" name="AB07">
-    <text category="letter">স</text>
-    <text category="letter">শ</text>
-  </key>
-  <key keycode="59" name="AB08">
-    <text category="letter">,</text>
-    <text category="letter">ষ</text>
-  </key>
-  <key keycode="60" name="AB09">
-    <text category="letter">.</text>
-    <text category="letter">।</text>
-  </key>
-  <key keycode="61" name="AB10">
-    <text category="letter">য়</text>
-    <keysym keyval="63">question</keysym>
-  </key>
-</symbols>
--- a/data/keyboards/symbols/be.xml
+++ b/data/keyboards/symbols/be.xml
@ -1,193 +0,0 @@
-<?xml version="1.0"?>
-<symbols version="0.90">
-  <include>us</include>
-  <key keycode="49" name="TLDE">
-    <keysym keyval="96">quoteleft</keysym>
-    <text category="letter">Ё</text>
-  </key>
-  <key keycode="10" name="AE01">
-    <keysym keyval="49">1</keysym>
-    <text category="letter">!</text>
-  </key>
-  <key keycode="11" name="AE02">
-    <keysym keyval="50">2</keysym>
-    <text category="letter">&quot;</text>
-  </key>
-  <key keycode="12" name="AE03">
-    <keysym keyval="51">3</keysym>
-    <text category="letter">№</text>
-  </key>
-  <key keycode="13" name="AE04">
-    <keysym keyval="52">4</keysym>
-    <text category="letter">;</text>
-  </key>
-  <key keycode="14" name="AE05">
-    <keysym keyval="53">5</keysym>
-    <text category="letter">%</text>
-    <keysym keyval="8364">EuroSign</keysym>
-  </key>
-  <key keycode="15" name="AE06">
-    <keysym keyval="54">6</keysym>
-    <text category="letter">:</text>
-  </key>
-  <key keycode="16" name="AE07">
-    <keysym keyval="55">7</keysym>
-    <text category="letter">?</text>
-  </key>
-  <key keycode="17" name="AE08">
-    <keysym keyval="56">8</keysym>
-    <text category="letter">*</text>
-  </key>
-  <key keycode="18" name="AE09">
-    <keysym keyval="57">9</keysym>
-    <text category="letter">(</text>
-  </key>
-  <key keycode="19" name="AE10">
-    <keysym keyval="48">0</keysym>
-    <text category="letter">)</text>
-  </key>
-  <key keycode="20" name="AE11">
-    <keysym keyval="45">minus</keysym>
-    <text category="letter">_</text>
-  </key>
-  <key keycode="21" name="AE12">
-    <keysym keyval="61">equal</keysym>
-    <text category="letter">+</text>
-  </key>
-  <key keycode="24" name="AD01">
-    <text category="letter">й</text>
-    <text category="letter">Й</text>
-  </key>
-  <key keycode="25" name="AD02">
-    <text category="letter">ц</text>
-    <text category="letter">Ц</text>
-  </key>
-  <key keycode="26" name="AD03">
-    <text category="letter">у</text>
-    <text category="letter">У</text>
-  </key>
-  <key keycode="27" name="AD04">
-    <text category="letter">к</text>
-    <text category="letter">К</text>
-  </key>
-  <key keycode="28" name="AD05">
-    <text category="letter">е</text>
-    <text category="letter">Е</text>
-  </key>
-  <key keycode="29" name="AD06">
-    <text category="letter">н</text>
-    <text category="letter">Н</text>
-  </key>
-  <key keycode="30" name="AD07">
-    <text category="letter">г</text>
-    <text category="letter">Г</text>
-  </key>
-  <key keycode="31" name="AD08">
-    <text category="letter">ш</text>
-    <text category="letter">Ш</text>
-  </key>
-  <key keycode="32" name="AD09">
-    <text category="letter">ў</text>
-    <text category="letter">Ў</text>
-  </key>
-  <key keycode="33" name="AD10">
-    <text category="letter">з</text>
-    <text category="letter">З</text>
-  </key>
-  <key keycode="34" name="AD11">
-    <text category="letter">х</text>
-    <text category="letter">Х</text>
-  </key>
-  <key keycode="35" name="AD12">
-    <text category="letter">&apos;</text>
-    <text category="letter">&apos;</text>
-  </key>
-  <key keycode="51" name="BKSL">
-    <text category="letter">\</text>
-    <text category="letter">|</text>
-  </key>
-  <key keycode="38" name="AC01">
-    <text category="letter">ф</text>
-    <text category="letter">Ф</text>
-  </key>
-  <key keycode="39" name="AC02">
-    <text category="letter">ы</text>
-    <text category="letter">Ы</text>
-  </key>
-  <key keycode="40" name="AC03">
-    <text category="letter">в</text>
-    <text category="letter">В</text>
-  </key>
-  <key keycode="41" name="AC04">
-    <text category="letter">а</text>
-    <text category="letter">А</text>
-  </key>
-  <key keycode="42" name="AC05">
-    <text category="letter">п</text>
-    <text category="letter">П</text>
-  </key>
-  <key keycode="43" name="AC06">
-    <text category="letter">р</text>
-    <text category="letter">Р</text>
-  </key>
-  <key keycode="44" name="AC07">
-    <text category="letter">о</text>
-    <text category="letter">О</text>
-  </key>
-  <key keycode="45" name="AC08">
-    <text category="letter">л</text>
-    <text category="letter">Л</text>
-  </key>
-  <key keycode="46" name="AC09">
-    <text category="letter">д</text>
-    <text category="letter">Д</text>
-  </key>
-  <key keycode="47" name="AC10">
-    <text category="letter">ж</text>
-    <text category="letter">Ж</text>
-  </key>
-  <key keycode="48" name="AC11">
-    <keysym keyval="39">quoteright</keysym>
-    <text category="letter">Э</text>
-  </key>
-  <key keycode="52" name="AB01">
-    <text category="letter">я</text>
-    <text category="letter">Я</text>
-  </key>
-  <key keycode="53" name="AB02">
-    <text category="letter">ч</text>
-    <text category="letter">Ч</text>
-  </key>
-  <key keycode="54" name="AB03">
-    <text category="letter">с</text>
-    <text category="letter">С</text>
-  </key>
-  <key keycode="55" name="AB04">
-    <text category="letter">м</text>
-    <text category="letter">М</text>
-  </key>
-  <key keycode="56" name="AB05">
-    <text category="letter">і</text>
-    <text category="letter">І</text>
-  </key>
-  <key keycode="57" name="AB06">
-    <text category="letter">т</text>
-    <text category="letter">Т</text>
-  </key>
-  <key keycode="58" name="AB07">
-    <text category="letter">ь</text>
-    <text category="letter">Ь</text>
-  </key>
-  <key keycode="59" name="AB08">
-    <text category="letter">б</text>
-    <text category="letter">Б</text>
-  </key>
-  <key keycode="60" name="AB09">
-    <text category="letter">ю</text>
-    <text category="letter">Ю</text>
-  </key>
-  <key keycode="61" name="AB10">
-    <text category="letter">.</text>
-    <text category="letter">,</text>
-  </key>
-</symbols>
--- a/data/keyboards/symbols/bn-inscript.xml
+++ b/data/keyboards/symbols/bn-inscript.xml
@ -1,193 +0,0 @@
-<?xml version="1.0"?>
-<symbols version="0.90">
-  <include>us</include>
-  <key keycode="49" name="TLDE">
-    <keysym keyval="96">quoteleft</keysym>
-    <text category="letter">~</text>
-  </key>
-  <key keycode="10" name="AE01">
-    <text category="letter">১</text>
-    <text category="letter">!</text>
-  </key>
-  <key keycode="11" name="AE02">
-    <text category="letter">২</text>
-    <text category="letter">@</text>
-  </key>
-  <key keycode="12" name="AE03">
-    <text category="letter">৩</text>
-    <text category="letter">#</text>
-  </key>
-  <key keycode="13" name="AE04">
-    <text category="letter">৪</text>
-    <text category="letter">$</text>
-  </key>
-  <key keycode="14" name="AE05">
-    <text category="letter">৫</text>
-    <text category="letter">%</text>
-    <keysym keyval="8364">EuroSign</keysym>
-  </key>
-  <key keycode="15" name="AE06">
-    <text category="letter">৬</text>
-    <text category="letter">^</text>
-  </key>
-  <key keycode="16" name="AE07">
-    <text category="letter">৭</text>
-    <text category="letter">&amp;</text>
-  </key>
-  <key keycode="17" name="AE08">
-    <text category="letter">৮</text>
-    <text category="letter">*</text>
-  </key>
-  <key keycode="18" name="AE09">
-    <text category="letter">৯</text>
-    <text category="letter">(</text>
-  </key>
-  <key keycode="19" name="AE10">
-    <text category="letter">০</text>
-    <text category="letter">)</text>
-  </key>
-  <key keycode="20" name="AE11">
-    <text category="letter">-</text>
-    <text category="letter">ঃ</text>
-  </key>
-  <key keycode="21" name="AE12">
-    <text category="letter">ৃ</text>
-    <text category="letter">ঋ</text>
-  </key>
-  <key keycode="24" name="AD01">
-    <text category="letter">ৌ</text>
-    <text category="letter">ঔ</text>
-  </key>
-  <key keycode="25" name="AD02">
-    <text category="letter">ৈ</text>
-    <text category="letter">ঐ</text>
-  </key>
-  <key keycode="26" name="AD03">
-    <text category="letter">া</text>
-    <text category="letter">আ</text>
-  </key>
-  <key keycode="27" name="AD04">
-    <text category="letter">ী</text>
-    <text category="letter">ঈ</text>
-  </key>
-  <key keycode="28" name="AD05">
-    <text category="letter">ূ</text>
-    <text category="letter">ঊ</text>
-  </key>
-  <key keycode="29" name="AD06">
-    <text category="letter">ব</text>
-    <text category="letter">ভ</text>
-  </key>
-  <key keycode="30" name="AD07">
-    <text category="letter">হ</text>
-    <text category="letter">ঙ</text>
-  </key>
-  <key keycode="31" name="AD08">
-    <text category="letter">গ</text>
-    <text category="letter">ঘ</text>
-  </key>
-  <key keycode="32" name="AD09">
-    <text category="letter">দ</text>
-    <text category="letter">ধ</text>
-  </key>
-  <key keycode="33" name="AD10">
-    <text category="letter">জ</text>
-    <text category="letter">ঝ</text>
-  </key>
-  <key keycode="34" name="AD11">
-    <text category="letter">ড</text>
-    <text category="letter">ঢ</text>
-  </key>
-  <key keycode="35" name="AD12">
-    <text category="letter">়</text>
-    <text category="letter">ঞ</text>
-  </key>
-  <key keycode="51" name="BKSL">
-    <text category="letter">\</text>
-    <text category="letter">|</text>
-  </key>
-  <key keycode="38" name="AC01">
-    <text category="letter">ো</text>
-    <text category="letter">ও</text>
-  </key>
-  <key keycode="39" name="AC02">
-    <text category="letter">ে</text>
-    <text category="letter">এ</text>
-  </key>
-  <key keycode="40" name="AC03">
-    <text category="letter">্</text>
-    <text category="letter">অ</text>
-  </key>
-  <key keycode="41" name="AC04">
-    <text category="letter">ি</text>
-    <text category="letter">ই</text>
-  </key>
-  <key keycode="42" name="AC05">
-    <text category="letter">ু</text>
-    <text category="letter">উ</text>
-  </key>
-  <key keycode="43" name="AC06">
-    <text category="letter">প</text>
-    <text category="letter">ফ</text>
-  </key>
-  <key keycode="44" name="AC07">
-    <text category="letter">র</text>
-    <text category="letter">J</text>
-  </key>
-  <key keycode="45" name="AC08">
-    <text category="letter">ক</text>
-    <text category="letter">খ</text>
-  </key>
-  <key keycode="46" name="AC09">
-    <text category="letter">ত</text>
-    <text category="letter">থ</text>
-  </key>
-  <key keycode="47" name="AC10">
-    <text category="letter">চ</text>
-    <text category="letter">ছ</text>
-  </key>
-  <key keycode="48" name="AC11">
-    <keysym keyval="39">quoteright</keysym>
-    <text category="letter">ঠ</text>
-  </key>
-  <key keycode="52" name="AB01">
-    <text category="letter">z</text>
-    <text category="letter">Z</text>
-  </key>
-  <key keycode="53" name="AB02">
-    <text category="letter">ং</text>
-    <text category="letter">ঁ</text>
-  </key>
-  <key keycode="54" name="AB03">
-    <text category="letter">ম</text>
-    <text category="letter">ণ</text>
-  </key>
-  <key keycode="55" name="AB04">
-    <text category="letter">ন</text>
-    <text category="letter">V</text>
-  </key>
-  <key keycode="56" name="AB05">
-    <text category="letter">ব</text>
-    <text category="letter">B</text>
-  </key>
-  <key keycode="57" name="AB06">
-    <text category="letter">ল</text>
-    <text category="letter">N</text>
-  </key>
-  <key keycode="58" name="AB07">
-    <text category="letter">স</text>
-    <text category="letter">শ</text>
-  </key>
-  <key keycode="59" name="AB08">
-    <text category="letter">,</text>
-    <text category="letter">ষ</text>
-  </key>
-  <key keycode="60" name="AB09">
-    <text category="letter">.</text>
-    <text category="letter">।</text>
-  </key>
-  <key keycode="61" name="AB10">
-    <text category="letter">য়</text>
-    <text category="letter">য</text>
-  </key>
-</symbols>
--- a/data/keyboards/symbols/fa.xml
+++ b/data/keyboards/symbols/fa.xml
@ -1,193 +0,0 @@
-<?xml version="1.0"?>
-<symbols version="0.90">
-  <include>us</include>
-  <key keycode="49" name="TLDE">
-    <keysym keyval="96">quoteleft</keysym>
-    <keysym keyval="126">asciitilde</keysym>
-  </key>
-  <key keycode="10" name="AE01">
-    <text category="letter">۱</text>
-    <keysym keyval="33">exclam</keysym>
-  </key>
-  <key keycode="11" name="AE02">
-    <text category="letter">۲</text>
-    <text category="letter">٬</text>
-  </key>
-  <key keycode="12" name="AE03">
-    <text category="letter">۳</text>
-    <text category="letter">٫</text>
-  </key>
-  <key keycode="13" name="AE04">
-    <text category="letter">۴</text>
-    <keysym keyval="36">dollar</keysym>
-  </key>
-  <key keycode="14" name="AE05">
-    <text category="letter">۵</text>
-    <text category="letter">٪</text>
-    <keysym keyval="8364">EuroSign</keysym>
-  </key>
-  <key keycode="15" name="AE06">
-    <text category="letter">۶</text>
-    <text category="letter">×</text>
-  </key>
-  <key keycode="16" name="AE07">
-    <text category="letter">۷</text>
-    <text category="letter">،</text>
-  </key>
-  <key keycode="17" name="AE08">
-    <text category="letter">۸</text>
-    <keysym keyval="42">asterisk</keysym>
-  </key>
-  <key keycode="18" name="AE09">
-    <text category="letter">۹</text>
-    <text category="letter">)</text>
-  </key>
-  <key keycode="19" name="AE10">
-    <text category="letter">۰</text>
-    <text category="letter">(</text>
-  </key>
-  <key keycode="20" name="AE11">
-    <keysym keyval="45">minus</keysym>
-    <keysym keyval="95">underscore</keysym>
-  </key>
-  <key keycode="21" name="AE12">
-    <keysym keyval="61">equal</keysym>
-    <keysym keyval="43">plus</keysym>
-  </key>
-  <key keycode="24" name="AD01">
-    <text category="letter">ض</text>
-    <text category="letter">ْ</text>
-  </key>
-  <key keycode="25" name="AD02">
-    <text category="letter">ص</text>
-    <text category="letter">ٌ</text>
-  </key>
-  <key keycode="26" name="AD03">
-    <text category="letter">ث</text>
-    <text category="letter">ٍ</text>
-  </key>
-  <key keycode="27" name="AD04">
-    <text category="letter">ق</text>
-    <text category="letter">ً</text>
-  </key>
-  <key keycode="28" name="AD05">
-    <text category="letter">ف</text>
-    <text category="letter">ُ</text>
-  </key>
-  <key keycode="29" name="AD06">
-    <text category="letter">غ</text>
-    <text category="letter">ِ</text>
-  </key>
-  <key keycode="30" name="AD07">
-    <text category="letter">ع</text>
-    <text category="letter">َ</text>
-  </key>
-  <key keycode="31" name="AD08">
-    <text category="letter">ه</text>
-    <text category="letter">ّ</text>
-  </key>
-  <key keycode="32" name="AD09">
-    <text category="letter">خ</text>
-    <text category="letter">]</text>
-  </key>
-  <key keycode="33" name="AD10">
-    <text category="letter">ح</text>
-    <text category="letter">[</text>
-  </key>
-  <key keycode="34" name="AD11">
-    <text category="letter">ج</text>
-    <text category="letter">}</text>
-  </key>
-  <key keycode="35" name="AD12">
-    <text category="letter">چ</text>
-    <text category="letter">{</text>
-  </key>
-  <key keycode="51" name="BKSL">
-    <keysym keyval="92">backslash</keysym>
-    <keysym keyval="124">bar</keysym>
-  </key>
-  <key keycode="38" name="AC01">
-    <text category="letter">ش</text>
-    <text category="letter">ؤ</text>
-  </key>
-  <key keycode="39" name="AC02">
-    <text category="letter">س</text>
-    <text category="letter">ئ</text>
-  </key>
-  <key keycode="40" name="AC03">
-    <text category="letter">ی</text>
-    <text category="letter">ي</text>
-  </key>
-  <key keycode="41" name="AC04">
-    <text category="letter">ب</text>
-    <text category="letter">إ</text>
-  </key>
-  <key keycode="42" name="AC05">
-    <text category="letter">ل</text>
-    <text category="letter">أ</text>
-  </key>
-  <key keycode="43" name="AC06">
-    <text category="letter">ا</text>
-    <text category="letter">آ</text>
-  </key>
-  <key keycode="44" name="AC07">
-    <text category="letter">ت</text>
-    <text category="letter">ة</text>
-  </key>
-  <key keycode="45" name="AC08">
-    <text category="letter">ن</text>
-    <text category="letter">»</text>
-  </key>
-  <key keycode="46" name="AC09">
-    <text category="letter">م</text>
-    <text category="letter">«</text>
-  </key>
-  <key keycode="47" name="AC10">
-    <text category="letter">ک</text>
-    <keysym keyval="58">colon</keysym>
-  </key>
-  <key keycode="48" name="AC11">
-    <keysym keyval="39">quoteright</keysym>
-    <text category="letter">؛</text>
-  </key>
-  <key keycode="52" name="AB01">
-    <text category="letter">ظ</text>
-    <text category="letter">ك</text>
-  </key>
-  <key keycode="53" name="AB02">
-    <text category="letter">ط</text>
-    <keysym keyval="88">X</keysym>
-  </key>
-  <key keycode="54" name="AB03">
-    <text category="letter">ز</text>
-    <text category="letter">ژ</text>
-  </key>
-  <key keycode="55" name="AB04">
-    <text category="letter">ر</text>
-    <keysym keyval="86">V</keysym>
-  </key>
-  <key keycode="56" name="AB05">
-    <text category="letter">ذ</text>
-    <text category="letter">‌</text>
-  </key>
-  <key keycode="57" name="AB06">
-    <text category="letter">د</text>
-    <text name="N" category="letter"></text>
-  </key>
-  <key keycode="58" name="AB07">
-    <text category="letter">پ</text>
-    <text category="letter">ء</text>
-  </key>
-  <key keycode="59" name="AB08">
-    <text category="letter">و</text>
-    <text category="letter">&gt;</text>
-  </key>
-  <key keycode="60" name="AB09">
-    <keysym keyval="46">period</keysym>
-    <text category="letter">&lt;</text>
-  </key>
-  <key keycode="61" name="AB10">
-    <keysym keyval="47">slash</keysym>
-    <text category="letter">؟</text>
-  </key>
-</symbols>
--- a/data/keyboards/symbols/gu-inscript.xml
+++ b/data/keyboards/symbols/gu-inscript.xml
@ -1,193 +0,0 @@
-<?xml version="1.0"?>
-<symbols version="0.90">
-  <include>us</include>
-  <key keycode="49" name="TLDE">
-    <keysym keyval="96">quoteleft</keysym>
-    <text category="letter">~</text>
-  </key>
-  <key keycode="10" name="AE01">
-    <text category="letter">૧</text>
-    <text category="letter">ઍ</text>
-  </key>
-  <key keycode="11" name="AE02">
-    <text category="letter">૨</text>
-    <text category="letter">ૅ</text>
-  </key>
-  <key keycode="12" name="AE03">
-    <text category="letter">૩</text>
-    <text category="letter">ૠ</text>
-  </key>
-  <key keycode="13" name="AE04">
-    <text category="letter">૪</text>
-    <text category="letter">ૄ</text>
-  </key>
-  <key keycode="14" name="AE05">
-    <text category="letter">૫</text>
-    <text category="letter">જ્ઞ</text>
-    <keysym keyval="8364">EuroSign</keysym>
-  </key>
-  <key keycode="15" name="AE06">
-    <text category="letter">૬</text>
-    <text category="letter">ત્ર</text>
-  </key>
-  <key keycode="16" name="AE07">
-    <text category="letter">૭</text>
-    <text category="letter">ક્ષ</text>
-  </key>
-  <key keycode="17" name="AE08">
-    <text category="letter">૮</text>
-    <text category="letter">શ્ર</text>
-  </key>
-  <key keycode="18" name="AE09">
-    <text category="letter">૯</text>
-    <text category="letter">(</text>
-  </key>
-  <key keycode="19" name="AE10">
-    <text category="letter">૦</text>
-    <text category="letter">)</text>
-  </key>
-  <key keycode="20" name="AE11">
-    <text category="letter">-</text>
-    <text category="letter">ઃ</text>
-  </key>
-  <key keycode="21" name="AE12">
-    <text category="letter">ૃ</text>
-    <text category="letter">ઋ</text>
-  </key>
-  <key keycode="24" name="AD01">
-    <text category="letter">ૌ</text>
-    <text category="letter">ઔ</text>
-  </key>
-  <key keycode="25" name="AD02">
-    <text category="letter">ૈ</text>
-    <text category="letter">ઐ</text>
-  </key>
-  <key keycode="26" name="AD03">
-    <text category="letter">ા</text>
-    <text category="letter">આ</text>
-  </key>
-  <key keycode="27" name="AD04">
-    <text category="letter">ી</text>
-    <text category="letter">ઈ</text>
-  </key>
-  <key keycode="28" name="AD05">
-    <text category="letter">ૂ</text>
-    <text category="letter">ઊ</text>
-  </key>
-  <key keycode="29" name="AD06">
-    <text category="letter">બ</text>
-    <text category="letter">ભ</text>
-  </key>
-  <key keycode="30" name="AD07">
-    <text category="letter">હ</text>
-    <text category="letter">ઙ</text>
-  </key>
-  <key keycode="31" name="AD08">
-    <text category="letter">ગ</text>
-    <text category="letter">ઘ</text>
-  </key>
-  <key keycode="32" name="AD09">
-    <text category="letter">દ</text>
-    <text category="letter">ધ</text>
-  </key>
-  <key keycode="33" name="AD10">
-    <text category="letter">જ</text>
-    <text category="letter">ઝ</text>
-  </key>
-  <key keycode="34" name="AD11">
-    <text category="letter">ડ</text>
-    <text category="letter">ઢ</text>
-  </key>
-  <key keycode="35" name="AD12">
-    <text category="letter">઼</text>
-    <text category="letter">ઞ</text>
-  </key>
-  <key keycode="51" name="BKSL">
-    <text category="letter">ૉ</text>
-    <text category="letter">ઑ</text>
-  </key>
-  <key keycode="38" name="AC01">
-    <text category="letter">ો</text>
-    <text category="letter">ઓ</text>
-  </key>
-  <key keycode="39" name="AC02">
-    <text category="letter">ે</text>
-    <text category="letter">એ</text>
-  </key>
-  <key keycode="40" name="AC03">
-    <text category="letter">્</text>
-    <text category="letter">અ</text>
-  </key>
-  <key keycode="41" name="AC04">
-    <text category="letter">િ</text>
-    <text category="letter">ઇ</text>
-  </key>
-  <key keycode="42" name="AC05">
-    <text category="letter">ુ</text>
-    <text category="letter">ઉ</text>
-  </key>
-  <key keycode="43" name="AC06">
-    <text category="letter">પ</text>
-    <text category="letter">ફ</text>
-  </key>
-  <key keycode="44" name="AC07">
-    <text category="letter">ર</text>
-    <text category="letter">ઽ</text>
-  </key>
-  <key keycode="45" name="AC08">
-    <text category="letter">ક</text>
-    <text category="letter">ખ</text>
-  </key>
-  <key keycode="46" name="AC09">
-    <text category="letter">ત</text>
-    <text category="letter">થ</text>
-  </key>
-  <key keycode="47" name="AC10">
-    <text category="letter">ચ</text>
-    <text category="letter">છ</text>
-  </key>
-  <key keycode="48" name="AC11">
-    <keysym keyval="39">quoteright</keysym>
-    <text category="letter">ઠ</text>
-  </key>
-  <key keycode="52" name="AB01">
-    <text category="letter">૱</text>
-    <text category="letter">ૐ</text>
-  </key>
-  <key keycode="53" name="AB02">
-    <text category="letter">ં</text>
-    <text category="letter">ઁ</text>
-  </key>
-  <key keycode="54" name="AB03">
-    <text category="letter">મ</text>
-    <text category="letter">ણ</text>
-  </key>
-  <key keycode="55" name="AB04">
-    <text category="letter">ન</text>
-    <text category="letter">&quot;</text>
-  </key>
-  <key keycode="56" name="AB05">
-    <text category="letter">વ</text>
-    <text category="letter">&apos;</text>
-  </key>
-  <key keycode="57" name="AB06">
-    <text category="letter">લ</text>
-    <text category="letter">ળ</text>
-  </key>
-  <key keycode="58" name="AB07">
-    <text category="letter">સ</text>
-    <text category="letter">શ</text>
-  </key>
-  <key keycode="59" name="AB08">
-    <text category="letter">,</text>
-    <text category="letter">ષ</text>
-  </key>
-  <key keycode="60" name="AB09">
-    <text category="letter">.</text>
-    <text category="letter">।</text>
-  </key>
-  <key keycode="61" name="AB10">
-    <text category="letter">ય</text>
-    <text category="letter">?</text>
-  </key>
-</symbols>
--- a/data/keyboards/symbols/he.xml
+++ b/data/keyboards/symbols/he.xml
@ -1,193 +0,0 @@
-<?xml version="1.0"?>
-<symbols version="0.90">
-  <include>us</include>
-  <key keycode="49" name="TLDE">
-    <keysym keyval="96">quoteleft</keysym>
-    <keysym keyval="126">asciitilde</keysym>
-  </key>
-  <key keycode="10" name="AE01">
-    <keysym keyval="49">1</keysym>
-    <keysym keyval="33">exclam</keysym>
-  </key>
-  <key keycode="11" name="AE02">
-    <keysym keyval="50">2</keysym>
-    <keysym keyval="64">at</keysym>
-  </key>
-  <key keycode="12" name="AE03">
-    <keysym keyval="51">3</keysym>
-    <keysym keyval="35">numbersign</keysym>
-  </key>
-  <key keycode="13" name="AE04">
-    <keysym keyval="52">4</keysym>
-    <keysym keyval="36">dollar</keysym>
-  </key>
-  <key keycode="14" name="AE05">
-    <keysym keyval="53">5</keysym>
-    <keysym keyval="37">percent</keysym>
-    <keysym keyval="8364">EuroSign</keysym>
-  </key>
-  <key keycode="15" name="AE06">
-    <keysym keyval="54">6</keysym>
-    <keysym keyval="94">asciicircum</keysym>
-  </key>
-  <key keycode="16" name="AE07">
-    <keysym keyval="55">7</keysym>
-    <keysym keyval="38">ampersand</keysym>
-  </key>
-  <key keycode="17" name="AE08">
-    <keysym keyval="56">8</keysym>
-    <keysym keyval="42">asterisk</keysym>
-  </key>
-  <key keycode="18" name="AE09">
-    <keysym keyval="57">9</keysym>
-    <text category="letter">)</text>
-  </key>
-  <key keycode="19" name="AE10">
-    <keysym keyval="48">0</keysym>
-    <text category="letter">(</text>
-  </key>
-  <key keycode="20" name="AE11">
-    <keysym keyval="45">minus</keysym>
-    <keysym keyval="95">underscore</keysym>
-  </key>
-  <key keycode="21" name="AE12">
-    <keysym keyval="61">equal</keysym>
-    <keysym keyval="43">plus</keysym>
-  </key>
-  <key keycode="24" name="AD01">
-    <text category="letter">/</text>
-    <keysym keyval="81">Q</keysym>
-  </key>
-  <key keycode="25" name="AD02">
-    <text category="letter">&apos;</text>
-    <keysym keyval="87">W</keysym>
-  </key>
-  <key keycode="26" name="AD03">
-    <text category="letter">ק</text>
-    <keysym keyval="69">E</keysym>
-  </key>
-  <key keycode="27" name="AD04">
-    <text category="letter">ר</text>
-    <keysym keyval="82">R</keysym>
-  </key>
-  <key keycode="28" name="AD05">
-    <text category="letter">א</text>
-    <keysym keyval="84">T</keysym>
-  </key>
-  <key keycode="29" name="AD06">
-    <text category="letter">ט</text>
-    <keysym keyval="89">Y</keysym>
-  </key>
-  <key keycode="30" name="AD07">
-    <text category="letter">ו</text>
-    <keysym keyval="85">U</keysym>
-  </key>
-  <key keycode="31" name="AD08">
-    <text category="letter">ן</text>
-    <keysym keyval="73">I</keysym>
-  </key>
-  <key keycode="32" name="AD09">
-    <text category="letter">ם</text>
-    <keysym keyval="79">O</keysym>
-  </key>
-  <key keycode="33" name="AD10">
-    <text category="letter">פ</text>
-    <keysym keyval="80">P</keysym>
-  </key>
-  <key keycode="34" name="AD11">
-    <text category="letter">]</text>
-    <text category="letter">}</text>
-  </key>
-  <key keycode="35" name="AD12">
-    <text category="letter">[</text>
-    <text category="letter">{</text>
-  </key>
-  <key keycode="51" name="BKSL">
-    <keysym keyval="92">backslash</keysym>
-    <keysym keyval="124">bar</keysym>
-  </key>
-  <key keycode="38" name="AC01">
-    <text category="letter">ש</text>
-    <keysym keyval="65">A</keysym>
-  </key>
-  <key keycode="39" name="AC02">
-    <text category="letter">ד</text>
-    <keysym keyval="83">S</keysym>
-  </key>
-  <key keycode="40" name="AC03">
-    <text category="letter">ג</text>
-    <keysym keyval="68">D</keysym>
-  </key>
-  <key keycode="41" name="AC04">
-    <text category="letter">כ</text>
-    <keysym keyval="70">F</keysym>
-  </key>
-  <key keycode="42" name="AC05">
-    <text category="letter">ע</text>
-    <keysym keyval="71">G</keysym>
-  </key>
-  <key keycode="43" name="AC06">
-    <text category="letter">י</text>
-    <keysym keyval="72">H</keysym>
-  </key>
-  <key keycode="44" name="AC07">
-    <text category="letter">ח</text>
-    <keysym keyval="74">J</keysym>
-  </key>
-  <key keycode="45" name="AC08">
-    <text category="letter">ל</text>
-    <keysym keyval="75">K</keysym>
-  </key>
-  <key keycode="46" name="AC09">
-    <text category="letter">ך</text>
-    <keysym keyval="76">L</keysym>
-  </key>
-  <key keycode="47" name="AC10">
-    <text category="letter">ף</text>
-    <keysym keyval="58">colon</keysym>
-  </key>
-  <key keycode="48" name="AC11">
-    <keysym keyval="39">quoteright</keysym>
-    <keysym keyval="34">quotedbl</keysym>
-  </key>
-  <key keycode="52" name="AB01">
-    <text category="letter">ז</text>
-    <keysym keyval="90">Z</keysym>
-  </key>
-  <key keycode="53" name="AB02">
-    <text category="letter">ס</text>
-    <keysym keyval="88">X</keysym>
-  </key>
-  <key keycode="54" name="AB03">
-    <text category="letter">ב</text>
-    <keysym keyval="67">C</keysym>
-  </key>
-  <key keycode="55" name="AB04">
-    <text category="letter">ה</text>
-    <keysym keyval="86">V</keysym>
-  </key>
-  <key keycode="56" name="AB05">
-    <text category="letter">נ</text>
-    <keysym keyval="66">B</keysym>
-  </key>
-  <key keycode="57" name="AB06">
-    <text category="letter">מ</text>
-    <keysym keyval="78">N</keysym>
-  </key>
-  <key keycode="58" name="AB07">
-    <text category="letter">צ</text>
-    <keysym keyval="77">M</keysym>
-  </key>
-  <key keycode="59" name="AB08">
-    <text category="letter">ת</text>
-    <text category="letter">&gt;</text>
-  </key>
-  <key keycode="60" name="AB09">
-    <text category="letter">ץ</text>
-    <text category="letter">&lt;</text>
-  </key>
-  <key keycode="61" name="AB10">
-    <text category="letter">.</text>
-    <keysym keyval="63">question</keysym>
-  </key>
-</symbols>
--- a/data/keyboards/symbols/hi-inscript.xml
+++ b/data/keyboards/symbols/hi-inscript.xml
@ -1,193 +0,0 @@
-<?xml version="1.0"?>
-<symbols version="0.90">
-  <include>us</include>
-  <key keycode="49" name="TLDE">
-    <keysym keyval="96">quoteleft</keysym>
-    <text category="letter">ऒ</text>
-  </key>
-  <key keycode="10" name="AE01">
-    <text category="letter">१</text>
-    <text category="letter">ऍ</text>
-  </key>
-  <key keycode="11" name="AE02">
-    <text category="letter">२</text>
-    <text category="letter">ॅ</text>
-  </key>
-  <key keycode="12" name="AE03">
-    <text category="letter">३</text>
-    <text category="letter">#</text>
-  </key>
-  <key keycode="13" name="AE04">
-    <text category="letter">४</text>
-    <text category="letter">$</text>
-  </key>
-  <key keycode="14" name="AE05">
-    <text category="letter">५</text>
-    <text category="letter">ज्ञ</text>
-    <keysym keyval="8364">EuroSign</keysym>
-  </key>
-  <key keycode="15" name="AE06">
-    <text category="letter">६</text>
-    <text category="letter">त्र</text>
-  </key>
-  <key keycode="16" name="AE07">
-    <text category="letter">७</text>
-    <text category="letter">क्ष</text>
-  </key>
-  <key keycode="17" name="AE08">
-    <text category="letter">८</text>
-    <text category="letter">श्र</text>
-  </key>
-  <key keycode="18" name="AE09">
-    <text category="letter">९</text>
-    <text category="letter">(</text>
-  </key>
-  <key keycode="19" name="AE10">
-    <text category="letter">०</text>
-    <text category="letter">)</text>
-  </key>
-  <key keycode="20" name="AE11">
-    <text category="letter">-</text>
-    <text category="letter">ः</text>
-  </key>
-  <key keycode="21" name="AE12">
-    <text category="letter">ृ</text>
-    <text category="letter">ऋ</text>
-  </key>
-  <key keycode="24" name="AD01">
-    <text category="letter">ौ</text>
-    <text category="letter">औ</text>
-  </key>
-  <key keycode="25" name="AD02">
-    <text category="letter">ै</text>
-    <text category="letter">ऐ</text>
-  </key>
-  <key keycode="26" name="AD03">
-    <text category="letter">ा</text>
-    <text category="letter">आ</text>
-  </key>
-  <key keycode="27" name="AD04">
-    <text category="letter">ी</text>
-    <text category="letter">ई</text>
-  </key>
-  <key keycode="28" name="AD05">
-    <text category="letter">ू</text>
-    <text category="letter">ऊ</text>
-  </key>
-  <key keycode="29" name="AD06">
-    <text category="letter">ब</text>
-    <text category="letter">भ</text>
-  </key>
-  <key keycode="30" name="AD07">
-    <text category="letter">ह</text>
-    <text category="letter">ङ</text>
-  </key>
-  <key keycode="31" name="AD08">
-    <text category="letter">ग</text>
-    <text category="letter">घ</text>
-  </key>
-  <key keycode="32" name="AD09">
-    <text category="letter">द</text>
-    <text category="letter">ध</text>
-  </key>
-  <key keycode="33" name="AD10">
-    <text category="letter">ज</text>
-    <text category="letter">झ</text>
-  </key>
-  <key keycode="34" name="AD11">
-    <text category="letter">ड</text>
-    <text category="letter">ढ</text>
-  </key>
-  <key keycode="35" name="AD12">
-    <text category="letter">़</text>
-    <text category="letter">ञ</text>
-  </key>
-  <key keycode="51" name="BKSL">
-    <text category="letter">ॉ</text>
-    <text category="letter">ऑ</text>
-  </key>
-  <key keycode="38" name="AC01">
-    <text category="letter">ो</text>
-    <text category="letter">ओ</text>
-  </key>
-  <key keycode="39" name="AC02">
-    <text category="letter">े</text>
-    <text category="letter">ए</text>
-  </key>
-  <key keycode="40" name="AC03">
-    <text category="letter">्‌</text>
-    <text category="letter">अ</text>
-  </key>
-  <key keycode="41" name="AC04">
-    <text category="letter">ि</text>
-    <text category="letter">इ</text>
-  </key>
-  <key keycode="42" name="AC05">
-    <text category="letter">ु</text>
-    <text category="letter">उ</text>
-  </key>
-  <key keycode="43" name="AC06">
-    <text category="letter">प</text>
-    <text category="letter">फ</text>
-  </key>
-  <key keycode="44" name="AC07">
-    <text category="letter">र</text>
-    <text category="letter">ऱ</text>
-  </key>
-  <key keycode="45" name="AC08">
-    <text category="letter">क</text>
-    <text category="letter">ख</text>
-  </key>
-  <key keycode="46" name="AC09">
-    <text category="letter">त</text>
-    <text category="letter">थ</text>
-  </key>
-  <key keycode="47" name="AC10">
-    <text category="letter">च</text>
-    <text category="letter">छ</text>
-  </key>
-  <key keycode="48" name="AC11">
-    <keysym keyval="39">quoteright</keysym>
-    <text category="letter">ठ</text>
-  </key>
-  <key keycode="52" name="AB01">
-    <text category="letter">ॆ</text>
-    <text category="letter">ऎ</text>
-  </key>
-  <key keycode="53" name="AB02">
-    <text category="letter">ं</text>
-    <text category="letter">ँ</text>
-  </key>
-  <key keycode="54" name="AB03">
-    <text category="letter">म</text>
-    <text category="letter">ण</text>
-  </key>
-  <key keycode="55" name="AB04">
-    <text category="letter">न</text>
-    <text category="letter">ऩ</text>
-  </key>
-  <key keycode="56" name="AB05">
-    <text category="letter">व</text>
-    <text category="letter">ऴ</text>
-  </key>
-  <key keycode="57" name="AB06">
-    <text category="letter">ल</text>
-    <text category="letter">ळ</text>
-  </key>
-  <key keycode="58" name="AB07">
-    <text category="letter">स</text>
-    <text category="letter">श</text>
-  </key>
-  <key keycode="59" name="AB08">
-    <text category="letter">,</text>
-    <text category="letter">ष</text>
-  </key>
-  <key keycode="60" name="AB09">
-    <text category="letter">.</text>
-    <text category="letter">।</text>
-  </key>
-  <key keycode="61" name="AB10">
-    <text category="letter">य</text>
-    <text category="letter">य़</text>
-  </key>
-</symbols>
--- a/data/keyboards/symbols/ja-kana.xml
+++ b/data/keyboards/symbols/ja-kana.xml
@ -1,154 +0,0 @@
-<?xml version="1.0"?>
-<symbols version="0.90">
-  <include>us</include>
-  <key keycode="49" name="TLDE">
-    <keysym keyval="1246">゛</keysym>
-    <keysym keyval="1247">゜</keysym>
-  </key>
-  <key keycode="10" name="AE01">
-    <keysym keyval="1223">ぬ</keysym>
-  </key>
-  <key keycode="11" name="AE02">
-    <keysym keyval="1228">ふ</keysym>
-  </key>
-  <key keycode="12" name="AE03">
-    <keysym keyval="1201">あ</keysym>
-    <keysym keyval="1191">ぁ</keysym>
-  </key>
-  <key keycode="13" name="AE04">
-    <keysym keyval="1203">う</keysym>
-    <keysym keyval="1193">ぅ</keysym>
-  </key>
-  <key keycode="14" name="AE05">
-    <keysym keyval="1204">え</keysym>
-    <keysym keyval="1194">ぇ</keysym>
-  </key>
-  <key keycode="15" name="AE06">
-    <keysym keyval="1205">お</keysym>
-    <keysym keyval="1195">ぉ</keysym>
-  </key>
-  <key keycode="16" name="AE07">
-    <keysym keyval="1236">や</keysym>
-    <keysym keyval="1196">ゃ</keysym>
-  </key>
-  <key keycode="17" name="AE08">
-    <keysym keyval="1237">ゆ</keysym>
-    <keysym keyval="1197">ゅ</keysym>
-  </key>
-  <key keycode="18" name="AE09">
-    <keysym keyval="1238">よ</keysym>
-    <keysym keyval="1198">ょ</keysym>
-  </key>
-  <key keycode="19" name="AE10">
-    <keysym keyval="1244">わ</keysym>
-    <keysym keyval="1190">を</keysym>
-  </key>
-  <key keycode="20" name="AE11">
-    <keysym keyval="1230">ほ</keysym>
-  </key>
-  <key keycode="21" name="AE12">
-    <keysym keyval="1229">へ</keysym>
-  </key>
-  <key keycode="24" name="AD01">
-    <keysym keyval="1216">た</keysym>
-  </key>
-  <key keycode="25" name="AD02">
-    <keysym keyval="1219">て</keysym>
-  </key>
-  <key keycode="26" name="AD03">
-    <keysym keyval="1202">い</keysym>
-    <keysym keyval="1192">ぃ</keysym>
-  </key>
-  <key keycode="27" name="AD04">
-    <keysym keyval="1213">す</keysym>
-  </key>
-  <key keycode="28" name="AD05">
-    <keysym keyval="1206">か</keysym>
-  </key>
-  <key keycode="29" name="AD06">
-    <keysym keyval="1245">ん</keysym>
-  </key>
-  <key keycode="30" name="AD07">
-    <keysym keyval="1221">な</keysym>
-  </key>
-  <key keycode="31" name="AD08">
-    <keysym keyval="1222">に</keysym>
-  </key>
-  <key keycode="32" name="AD09">
-    <keysym keyval="1239">ら</keysym>
-  </key>
-  <key keycode="33" name="AD10">
-    <keysym keyval="1214">せ</keysym>
-  </key>
-  <key keycode="34" name="AD11">
-    <keysym keyval="1233">む</keysym>
-  </key>
-  <key keycode="35" name="AD12">
-    <keysym keyval="1243">ろ</keysym>
-  </key>
-  <key keycode="38" name="AC01">
-    <keysym keyval="1217">ち</keysym>
-  </key>
-  <key keycode="39" name="AC02">
-    <keysym keyval="1220">と</keysym>
-  </key>
-  <key keycode="40" name="AC03">
-    <keysym keyval="1212">し</keysym>
-  </key>
-  <key keycode="41" name="AC04">
-    <keysym keyval="1226">は</keysym>
-  </key>
-  <key keycode="42" name="AC05">
-    <keysym keyval="1207">き</keysym>
-  </key>
-  <key keycode="43" name="AC06">
-    <keysym keyval="1208">く</keysym>
-  </key>
-  <key keycode="44" name="AC07">
-    <keysym keyval="1231">ま</keysym>
-  </key>
-  <key keycode="45" name="AC08">
-    <keysym keyval="1225">の</keysym>
-  </key>
-  <key keycode="46" name="AC09">
-    <keysym keyval="1240">り</keysym>
-  </key>
-  <key keycode="47" name="AC10">
-    <keysym keyval="1242">れ</keysym>
-  </key>
-  <key keycode="48" name="AC11">
-    <keysym keyval="1209">け</keysym>
-  </key>
-  <key keycode="52" name="AB01">
-    <keysym keyval="1218">つ</keysym>
-    <keysym keyval="1199">っ</keysym>
-  </key>
-  <key keycode="53" name="AB02">
-    <keysym keyval="1211">さ</keysym>
-  </key>
-  <key keycode="54" name="AB03">
-    <keysym keyval="1215">そ</keysym>
-  </key>
-  <key keycode="55" name="AB04">
-    <keysym keyval="1227">ひ</keysym>
-  </key>
-  <key keycode="56" name="AB05">
-    <keysym keyval="1210">こ</keysym>
-  </key>
-  <key keycode="57" name="AB06">
-    <keysym keyval="1232">み</keysym>
-  </key>
-  <key keycode="58" name="AB07">
-    <keysym keyval="1235">も</keysym>
-  </key>
-  <key keycode="59" name="AB08">
-    <keysym keyval="1224">ね</keysym>
-  </key>
-  <key keycode="60" name="AB09">
-    <keysym keyval="1241">る</keysym>
-  </key>
-  <key keycode="61" name="AB10">
-    <keysym keyval="1234">め</keysym>
-  </key>
-</symbols>
-
--- a/data/keyboards/symbols/kk.xml
+++ b/data/keyboards/symbols/kk.xml
@ -1,193 +0,0 @@
-<?xml version="1.0"?>
-<symbols version="0.90">
-  <include>us</include>
-  <key keycode="49" name="TLDE">
-    <keysym keyval="96">quoteleft</keysym>
-    <text category="letter">)</text>
-  </key>
-  <key keycode="10" name="AE01">
-    <text category="letter">&quot;</text>
-    <keysym keyval="33">exclam</keysym>
-  </key>
-  <key keycode="11" name="AE02">
-    <text category="letter">ә</text>
-    <text category="letter">Ә</text>
-  </key>
-  <key keycode="12" name="AE03">
-    <text category="letter">і</text>
-    <text category="letter">І</text>
-  </key>
-  <key keycode="13" name="AE04">
-    <text category="letter">ӊ</text>
-    <text category="letter">Ӊ</text>
-  </key>
-  <key keycode="14" name="AE05">
-    <text category="letter">ғ</text>
-    <text category="letter">Ғ</text>
-    <keysym keyval="8364">EuroSign</keysym>
-  </key>
-  <key keycode="15" name="AE06">
-    <text category="letter">,</text>
-    <text category="letter">;</text>
-  </key>
-  <key keycode="16" name="AE07">
-    <text category="letter">.</text>
-    <text category="letter">:</text>
-  </key>
-  <key keycode="17" name="AE08">
-    <text category="letter">ү</text>
-    <text category="letter">Ү</text>
-  </key>
-  <key keycode="18" name="AE09">
-    <text category="letter">ұ</text>
-    <text category="letter">Ұ</text>
-  </key>
-  <key keycode="19" name="AE10">
-    <text category="letter">қ</text>
-    <text category="letter">Қ</text>
-  </key>
-  <key keycode="20" name="AE11">
-    <text category="letter">ө</text>
-    <text category="letter">Ө</text>
-  </key>
-  <key keycode="21" name="AE12">
-    <text category="letter">һ</text>
-    <text category="letter">Һ</text>
-  </key>
-  <key keycode="24" name="AD01">
-    <text category="letter">й</text>
-    <text category="letter">Й</text>
-  </key>
-  <key keycode="25" name="AD02">
-    <text category="letter">ц</text>
-    <text category="letter">Ц</text>
-  </key>
-  <key keycode="26" name="AD03">
-    <text category="letter">у</text>
-    <text category="letter">У</text>
-  </key>
-  <key keycode="27" name="AD04">
-    <text category="letter">к</text>
-    <text category="letter">К</text>
-  </key>
-  <key keycode="28" name="AD05">
-    <text category="letter">е</text>
-    <text category="letter">Е</text>
-  </key>
-  <key keycode="29" name="AD06">
-    <text category="letter">н</text>
-    <text category="letter">Н</text>
-  </key>
-  <key keycode="30" name="AD07">
-    <text category="letter">г</text>
-    <text category="letter">Г</text>
-  </key>
-  <key keycode="31" name="AD08">
-    <text category="letter">ш</text>
-    <text category="letter">Ш</text>
-  </key>
-  <key keycode="32" name="AD09">
-    <text category="letter">щ</text>
-    <text category="letter">Щ</text>
-  </key>
-  <key keycode="33" name="AD10">
-    <text category="letter">з</text>
-    <text category="letter">З</text>
-  </key>
-  <key keycode="34" name="AD11">
-    <text category="letter">х</text>
-    <text category="letter">Х</text>
-  </key>
-  <key keycode="35" name="AD12">
-    <text category="letter">ъ</text>
-    <text category="letter">Ъ</text>
-  </key>
-  <key keycode="51" name="BKSL">
-    <keysym keyval="92">backslash</keysym>
-    <keysym keyval="124">bar</keysym>
-  </key>
-  <key keycode="38" name="AC01">
-    <text category="letter">ф</text>
-    <text category="letter">Ф</text>
-  </key>
-  <key keycode="39" name="AC02">
-    <text category="letter">ы</text>
-    <text category="letter">Ы</text>
-  </key>
-  <key keycode="40" name="AC03">
-    <text category="letter">в</text>
-    <text category="letter">В</text>
-  </key>
-  <key keycode="41" name="AC04">
-    <text category="letter">а</text>
-    <text category="letter">А</text>
-  </key>
-  <key keycode="42" name="AC05">
-    <text category="letter">п</text>
-    <text category="letter">П</text>
-  </key>
-  <key keycode="43" name="AC06">
-    <text category="letter">р</text>
-    <text category="letter">Р</text>
-  </key>
-  <key keycode="44" name="AC07">
-    <text category="letter">о</text>
-    <text category="letter">О</text>
-  </key>
-  <key keycode="45" name="AC08">
-    <text category="letter">л</text>
-    <text category="letter">Л</text>
-  </key>
-  <key keycode="46" name="AC09">
-    <text category="letter">д</text>
-    <text category="letter">Д</text>
-  </key>
-  <key keycode="47" name="AC10">
-    <text category="letter">ж</text>
-    <text category="letter">Ж</text>
-  </key>
-  <key keycode="48" name="AC11">
-    <keysym keyval="39">quoteright</keysym>
-    <text category="letter">Э</text>
-  </key>
-  <key keycode="52" name="AB01">
-    <text category="letter">я</text>
-    <text category="letter">Я</text>
-  </key>
-  <key keycode="53" name="AB02">
-    <text category="letter">ч</text>
-    <text category="letter">Ч</text>
-  </key>
-  <key keycode="54" name="AB03">
-    <text category="letter">с</text>
-    <text category="letter">С</text>
-  </key>
-  <key keycode="55" name="AB04">
-    <text category="letter">м</text>
-    <text category="letter">М</text>
-  </key>
-  <key keycode="56" name="AB05">
-    <text category="letter">и</text>
-    <text category="letter">И</text>
-  </key>
-  <key keycode="57" name="AB06">
-    <text category="letter">т</text>
-    <text category="letter">Т</text>
-  </key>
-  <key keycode="58" name="AB07">
-    <text category="letter">ь</text>
-    <text category="letter">Ь</text>
-  </key>
-  <key keycode="59" name="AB08">
-    <text category="letter">б</text>
-    <text category="letter">Б</text>
-  </key>
-  <key keycode="60" name="AB09">
-    <text category="letter">ю</text>
-    <text category="letter">Ю</text>
-  </key>
-  <key keycode="61" name="AB10">
-    <text category="letter">№</text>
-    <keysym keyval="63">question</keysym>
-  </key>
-</symbols>
--- a/data/keyboards/symbols/kn-inscript.xml
+++ b/data/keyboards/symbols/kn-inscript.xml
@ -1,193 +0,0 @@
-<?xml version="1.0"?>
-<symbols version="0.90">
-  <include>us</include>
-  <key keycode="49" name="TLDE">
-    <keysym keyval="96">quoteleft</keysym>
-    <text category="letter">ಒ</text>
-  </key>
-  <key keycode="10" name="AE01">
-    <text category="letter">೧</text>
-    <text category="letter">!</text>
-  </key>
-  <key keycode="11" name="AE02">
-    <text category="letter">೨</text>
-    <text category="letter">@</text>
-  </key>
-  <key keycode="12" name="AE03">
-    <text category="letter">೩</text>
-    <text category="letter">#</text>
-  </key>
-  <key keycode="13" name="AE04">
-    <text category="letter">೪</text>
-    <text category="letter">$</text>
-  </key>
-  <key keycode="14" name="AE05">
-    <text category="letter">೫</text>
-    <text category="letter">ಜ್ಞ</text>
-    <keysym keyval="8364">EuroSign</keysym>
-  </key>
-  <key keycode="15" name="AE06">
-    <text category="letter">೬</text>
-    <text category="letter">ತ್ರ</text>
-  </key>
-  <key keycode="16" name="AE07">
-    <text category="letter">೭</text>
-    <text category="letter">ಕ್ಷ</text>
-  </key>
-  <key keycode="17" name="AE08">
-    <text category="letter">೮</text>
-    <text category="letter">ಶ್ರ</text>
-  </key>
-  <key keycode="18" name="AE09">
-    <text category="letter">೯</text>
-    <text category="letter">(</text>
-  </key>
-  <key keycode="19" name="AE10">
-    <text category="letter">೦</text>
-    <text category="letter">)</text>
-  </key>
-  <key keycode="20" name="AE11">
-    <text category="letter">-</text>
-    <text category="letter">ಃ</text>
-  </key>
-  <key keycode="21" name="AE12">
-    <text category="letter">ೃ</text>
-    <text category="letter">ಋ</text>
-  </key>
-  <key keycode="24" name="AD01">
-    <text category="letter">ೌ</text>
-    <text category="letter">ಔ</text>
-  </key>
-  <key keycode="25" name="AD02">
-    <text category="letter">ೈ</text>
-    <text category="letter">ಐ</text>
-  </key>
-  <key keycode="26" name="AD03">
-    <text category="letter">ಾ</text>
-    <text category="letter">ಆ</text>
-  </key>
-  <key keycode="27" name="AD04">
-    <text category="letter">ೀ</text>
-    <text category="letter">ಈ</text>
-  </key>
-  <key keycode="28" name="AD05">
-    <text category="letter">ೂ</text>
-    <text category="letter">ಊ</text>
-  </key>
-  <key keycode="29" name="AD06">
-    <text category="letter">ಬ</text>
-    <text category="letter">ಭ</text>
-  </key>
-  <key keycode="30" name="AD07">
-    <text category="letter">ಹ</text>
-    <text category="letter">ಙ</text>
-  </key>
-  <key keycode="31" name="AD08">
-    <text category="letter">ಗ</text>
-    <text category="letter">ಘ</text>
-  </key>
-  <key keycode="32" name="AD09">
-    <text category="letter">ದ</text>
-    <text category="letter">ಧ</text>
-  </key>
-  <key keycode="33" name="AD10">
-    <text category="letter">ಜ</text>
-    <text category="letter">ಝ</text>
-  </key>
-  <key keycode="34" name="AD11">
-    <text category="letter">ಡ</text>
-    <text category="letter">ಢ</text>
-  </key>
-  <key keycode="35" name="AD12">
-    <text category="letter">]</text>
-    <text category="letter">ಞ</text>
-  </key>
-  <key keycode="51" name="BKSL">
-    <text category="letter">‍</text>
-    <text category="letter">|</text>
-  </key>
-  <key keycode="38" name="AC01">
-    <text category="letter">ೋ</text>
-    <text category="letter">ಓ</text>
-  </key>
-  <key keycode="39" name="AC02">
-    <text category="letter">ೇ</text>
-    <text category="letter">ಏ</text>
-  </key>
-  <key keycode="40" name="AC03">
-    <text category="letter">್</text>
-    <text category="letter">ಅ</text>
-  </key>
-  <key keycode="41" name="AC04">
-    <text category="letter">ಿ</text>
-    <text category="letter">ಇ</text>
-  </key>
-  <key keycode="42" name="AC05">
-    <text category="letter">ು</text>
-    <text category="letter">ಉ</text>
-  </key>
-  <key keycode="43" name="AC06">
-    <text category="letter">ಪ</text>
-    <text category="letter">ಫ</text>
-  </key>
-  <key keycode="44" name="AC07">
-    <text category="letter">ರ</text>
-    <text category="letter">ಱ</text>
-  </key>
-  <key keycode="45" name="AC08">
-    <text category="letter">ಕ</text>
-    <text category="letter">ಖ</text>
-  </key>
-  <key keycode="46" name="AC09">
-    <text category="letter">ತ</text>
-    <text category="letter">ಥ</text>
-  </key>
-  <key keycode="47" name="AC10">
-    <text category="letter">ಚ</text>
-    <text category="letter">ಛ</text>
-  </key>
-  <key keycode="48" name="AC11">
-    <keysym keyval="39">quoteright</keysym>
-    <text category="letter">ಠ</text>
-  </key>
-  <key keycode="52" name="AB01">
-    <text category="letter">ೆ</text>
-    <text category="letter">ಎ</text>
-  </key>
-  <key keycode="53" name="AB02">
-    <text category="letter">ಂ</text>
-    <text name="X" category="letter"></text>
-  </key>
-  <key keycode="54" name="AB03">
-    <text category="letter">ಮ</text>
-    <text category="letter">ಣ</text>
-  </key>
-  <key keycode="55" name="AB04">
-    <text category="letter">ನ</text>
-    <text category="letter">‌</text>
-  </key>
-  <key keycode="56" name="AB05">
-    <text category="letter">ವ</text>
-    <keysym keyval="66">B</keysym>
-  </key>
-  <key keycode="57" name="AB06">
-    <text category="letter">ಲ</text>
-    <text category="letter">ಳ</text>
-  </key>
-  <key keycode="58" name="AB07">
-    <text category="letter">ಸ</text>
-    <text category="letter">ಶ</text>
-  </key>
-  <key keycode="59" name="AB08">
-    <text category="letter">,</text>
-    <text category="letter">ಷ</text>
-  </key>
-  <key keycode="60" name="AB09">
-    <text category="letter">.</text>
-    <text category="letter">ಾ</text>
-  </key>
-  <key keycode="61" name="AB10">
-    <text category="letter">ಯ</text>
-    <keysym keyval="63">question</keysym>
-  </key>
-</symbols>
--- a/data/keyboards/symbols/ks-inscript.xml
+++ b/data/keyboards/symbols/ks-inscript.xml
@ -1,193 +0,0 @@
-<?xml version="1.0"?>
-<symbols version="0.90">
-  <include>us</include>
-  <key keycode="49" name="TLDE">
-    <keysym keyval="96">quoteleft</keysym>
-    <text category="letter">ऒ</text>
-  </key>
-  <key keycode="10" name="AE01">
-    <text category="letter">१</text>
-    <text category="letter">ऍ</text>
-  </key>
-  <key keycode="11" name="AE02">
-    <text category="letter">२</text>
-    <text category="letter">ॅ</text>
-  </key>
-  <key keycode="12" name="AE03">
-    <text category="letter">३</text>
-    <text category="letter">#</text>
-  </key>
-  <key keycode="13" name="AE04">
-    <text category="letter">४</text>
-    <text category="letter">$</text>
-  </key>
-  <key keycode="14" name="AE05">
-    <text category="letter">५</text>
-    <text category="letter">ज्ञ</text>
-    <keysym keyval="8364">EuroSign</keysym>
-  </key>
-  <key keycode="15" name="AE06">
-    <text category="letter">६</text>
-    <text category="letter">त्र</text>
-  </key>
-  <key keycode="16" name="AE07">
-    <text category="letter">७</text>
-    <text category="letter">क्ष</text>
-  </key>
-  <key keycode="17" name="AE08">
-    <text category="letter">८</text>
-    <text category="letter">श्र</text>
-  </key>
-  <key keycode="18" name="AE09">
-    <text category="letter">९</text>
-    <text category="letter">(</text>
-  </key>
-  <key keycode="19" name="AE10">
-    <text category="letter">०</text>
-    <text category="letter">)</text>
-  </key>
-  <key keycode="20" name="AE11">
-    <text category="letter">-</text>
-    <text category="letter">ः</text>
-  </key>
-  <key keycode="21" name="AE12">
-    <text category="letter">ृ</text>
-    <text category="letter">ऋ</text>
-  </key>
-  <key keycode="24" name="AD01">
-    <text category="letter">ौ</text>
-    <text category="letter">औ</text>
-  </key>
-  <key keycode="25" name="AD02">
-    <text category="letter">ै</text>
-    <text category="letter">ऐ</text>
-  </key>
-  <key keycode="26" name="AD03">
-    <text category="letter">ा</text>
-    <text category="letter">आ</text>
-  </key>
-  <key keycode="27" name="AD04">
-    <text category="letter">ी</text>
-    <text category="letter">ई</text>
-  </key>
-  <key keycode="28" name="AD05">
-    <text category="letter">ू</text>
-    <text category="letter">ऊ</text>
-  </key>
-  <key keycode="29" name="AD06">
-    <text category="letter">ॿ</text>
-    <text category="letter">भ</text>
-  </key>
-  <key keycode="30" name="AD07">
-    <text category="letter">ह</text>
-    <text category="letter">ङ</text>
-  </key>
-  <key keycode="31" name="AD08">
-    <text category="letter">ॻ</text>
-    <text category="letter">घ</text>
-  </key>
-  <key keycode="32" name="AD09">
-    <text category="letter">द</text>
-    <text category="letter">ध</text>
-  </key>
-  <key keycode="33" name="AD10">
-    <text category="letter">ॼ</text>
-    <text category="letter">झ</text>
-  </key>
-  <key keycode="34" name="AD11">
-    <text category="letter">ॾ</text>
-    <text category="letter">ढ</text>
-  </key>
-  <key keycode="35" name="AD12">
-    <text category="letter">़</text>
-    <text category="letter">ञ</text>
-  </key>
-  <key keycode="51" name="BKSL">
-    <text category="letter">ॉ</text>
-    <text category="letter">ऑ</text>
-  </key>
-  <key keycode="38" name="AC01">
-    <text category="letter">ो</text>
-    <text category="letter">ओ</text>
-  </key>
-  <key keycode="39" name="AC02">
-    <text category="letter">े</text>
-    <text category="letter">ए</text>
-  </key>
-  <key keycode="40" name="AC03">
-    <text category="letter">्‌</text>
-    <text category="letter">अ</text>
-  </key>
-  <key keycode="41" name="AC04">
-    <text category="letter">ि</text>
-    <text category="letter">इ</text>
-  </key>
-  <key keycode="42" name="AC05">
-    <keysym keyval="103">g</keysym>
-    <keysym keyval="71">G</keysym>
-  </key>
-  <key keycode="43" name="AC06">
-    <text category="letter">प</text>
-    <text category="letter">फ</text>
-  </key>
-  <key keycode="44" name="AC07">
-    <text category="letter">र</text>
-    <text category="letter">ऱ</text>
-  </key>
-  <key keycode="45" name="AC08">
-    <text category="letter">क</text>
-    <text category="letter">ख</text>
-  </key>
-  <key keycode="46" name="AC09">
-    <text category="letter">त</text>
-    <text category="letter">थ</text>
-  </key>
-  <key keycode="47" name="AC10">
-    <text category="letter">च</text>
-    <text category="letter">छ</text>
-  </key>
-  <key keycode="48" name="AC11">
-    <keysym keyval="39">quoteright</keysym>
-    <text category="letter">ठ</text>
-  </key>
-  <key keycode="52" name="AB01">
-    <text category="letter">ॆ</text>
-    <text category="letter">ऎ</text>
-  </key>
-  <key keycode="53" name="AB02">
-    <text category="letter">ं</text>
-    <text category="letter">ँ</text>
-  </key>
-  <key keycode="54" name="AB03">
-    <text category="letter">म</text>
-    <text category="letter">ण</text>
-  </key>
-  <key keycode="55" name="AB04">
-    <text category="letter">न</text>
-    <text category="letter">ऩ</text>
-  </key>
-  <key keycode="56" name="AB05">
-    <text category="letter">व</text>
-    <text category="letter">ऴ</text>
-  </key>
-  <key keycode="57" name="AB06">
-    <text category="letter">ल</text>
-    <text category="letter">ळ</text>
-  </key>
-  <key keycode="58" name="AB07">
-    <text category="letter">स</text>
-    <text category="letter">श</text>
-  </key>
-  <key keycode="59" name="AB08">
-    <text category="letter">,</text>
-    <text category="letter">ष</text>
-  </key>
-  <key keycode="60" name="AB09">
-    <text category="letter">.</text>
-    <text category="letter">।</text>
-  </key>
-  <key keycode="61" name="AB10">
-    <text category="letter">य</text>
-    <text category="letter">य़</text>
-  </key>
-</symbols>
--- a/data/keyboards/symbols/ks.xml
+++ b/data/keyboards/symbols/ks.xml
@ -1,193 +0,0 @@
-<?xml version="1.0"?>
-<symbols version="0.90">
-  <include>us</include>
-  <key keycode="49" name="TLDE">
-    <keysym keyval="96">quoteleft</keysym>
-    <text category="letter">ً</text>
-  </key>
-  <key keycode="10" name="AE01">
-    <text category="letter">۱</text>
-    <text category="letter">!</text>
-  </key>
-  <key keycode="11" name="AE02">
-    <text category="letter">۲</text>
-    <text category="letter">@</text>
-  </key>
-  <key keycode="12" name="AE03">
-    <text category="letter">۳</text>
-    <text category="letter">#</text>
-  </key>
-  <key keycode="13" name="AE04">
-    <text category="letter">۴</text>
-    <text category="letter">$</text>
-  </key>
-  <key keycode="14" name="AE05">
-    <text category="letter">۵</text>
-    <text category="letter">%</text>
-    <keysym keyval="8364">EuroSign</keysym>
-  </key>
-  <key keycode="15" name="AE06">
-    <text category="letter">۶</text>
-    <text category="letter">^</text>
-  </key>
-  <key keycode="16" name="AE07">
-    <text category="letter">۷</text>
-    <text category="letter">&amp;</text>
-  </key>
-  <key keycode="17" name="AE08">
-    <text category="letter">۸</text>
-    <text category="letter">*</text>
-  </key>
-  <key keycode="18" name="AE09">
-    <text category="letter">۹</text>
-    <text category="letter">)</text>
-  </key>
-  <key keycode="19" name="AE10">
-    <text category="letter">۰</text>
-    <text category="letter">(</text>
-  </key>
-  <key keycode="20" name="AE11">
-    <text category="letter">-</text>
-    <text category="letter">ّ</text>
-  </key>
-  <key keycode="21" name="AE12">
-    <text category="letter">=</text>
-    <text category="letter">+</text>
-  </key>
-  <key keycode="24" name="AD01">
-    <text category="letter">ق</text>
-    <text category="letter">ﷺ</text>
-  </key>
-  <key keycode="25" name="AD02">
-    <text category="letter">و</text>
-    <text category="letter">ؤ</text>
-  </key>
-  <key keycode="26" name="AD03">
-    <text category="letter">ع</text>
-    <text category="letter">ئ</text>
-  </key>
-  <key keycode="27" name="AD04">
-    <text category="letter">ر</text>
-    <text category="letter">ڑ</text>
-  </key>
-  <key keycode="28" name="AD05">
-    <text category="letter">ت</text>
-    <text category="letter">ٹ</text>
-  </key>
-  <key keycode="29" name="AD06">
-    <text category="letter">ے</text>
-    <text category="letter">؁</text>
-  </key>
-  <key keycode="30" name="AD07">
-    <text category="letter">ء</text>
-    <text category="letter">،</text>
-  </key>
-  <key keycode="31" name="AD08">
-    <text category="letter">ی</text>
-    <text category="letter">ۆ</text>
-  </key>
-  <key keycode="32" name="AD09">
-    <text category="letter">ہ</text>
-    <text category="letter">ۃ</text>
-  </key>
-  <key keycode="33" name="AD10">
-    <text category="letter">پ</text>
-    <text category="letter">إ</text>
-  </key>
-  <key keycode="34" name="AD11">
-    <text category="letter">]</text>
-    <text category="letter">ٰ</text>
-  </key>
-  <key keycode="35" name="AD12">
-    <text category="letter">[</text>
-    <text category="letter">ٰ</text>
-  </key>
-  <key keycode="51" name="BKSL">
-    <text category="letter">؎</text>
-    <text category="letter">أ</text>
-  </key>
-  <key keycode="38" name="AC01">
-    <text category="letter">ا</text>
-    <text category="letter">آ</text>
-  </key>
-  <key keycode="39" name="AC02">
-    <text category="letter">س</text>
-    <text category="letter">ش</text>
-  </key>
-  <key keycode="40" name="AC03">
-    <text category="letter">د</text>
-    <text category="letter">ڈ</text>
-  </key>
-  <key keycode="41" name="AC04">
-    <text category="letter">ف</text>
-    <text category="letter">ُ</text>
-  </key>
-  <key keycode="42" name="AC05">
-    <text category="letter">گ</text>
-    <text category="letter">غ</text>
-  </key>
-  <key keycode="43" name="AC06">
-    <text category="letter">ھ</text>
-    <text category="letter">ح</text>
-  </key>
-  <key keycode="44" name="AC07">
-    <text category="letter">ج</text>
-    <text category="letter">ژ</text>
-  </key>
-  <key keycode="45" name="AC08">
-    <text category="letter">ک</text>
-    <text category="letter">خ</text>
-  </key>
-  <key keycode="46" name="AC09">
-    <text category="letter">ل</text>
-    <text category="letter">ؓ</text>
-  </key>
-  <key keycode="47" name="AC10">
-    <text category="letter">؛</text>
-    <text category="letter">:</text>
-  </key>
-  <key keycode="48" name="AC11">
-    <keysym keyval="39">quoteright</keysym>
-    <text category="letter">&quot;</text>
-  </key>
-  <key keycode="52" name="AB01">
-    <text category="letter">ز</text>
-    <text category="letter">ذ</text>
-  </key>
-  <key keycode="53" name="AB02">
-    <text category="letter">ص</text>
-    <text category="letter">ض</text>
-  </key>
-  <key keycode="54" name="AB03">
-    <text category="letter">چ</text>
-    <text category="letter">ث</text>
-  </key>
-  <key keycode="55" name="AB04">
-    <text category="letter">ط</text>
-    <text category="letter">ظ</text>
-  </key>
-  <key keycode="56" name="AB05">
-    <text category="letter">ب</text>
-    <text category="letter">أ</text>
-  </key>
-  <key keycode="57" name="AB06">
-    <text category="letter">ن</text>
-    <text category="letter">ں</text>
-  </key>
-  <key keycode="58" name="AB07">
-    <text category="letter">م</text>
-    <text category="letter">ٔ</text>
-  </key>
-  <key keycode="59" name="AB08">
-    <text category="letter">،</text>
-    <text category="letter">ِ</text>
-  </key>
-  <key keycode="60" name="AB09">
-    <text category="letter">۔</text>
-    <text category="letter">َ</text>
-  </key>
-  <key keycode="61" name="AB10">
-    <text category="letter">/</text>
-    <text category="letter">؟</text>
-  </key>
-</symbols>
--- a/data/keyboards/symbols/mai-inscript.xml
+++ b/data/keyboards/symbols/mai-inscript.xml
@ -1,193 +0,0 @@
-<?xml version="1.0"?>
-<symbols version="0.90">
-  <include>us</include>
-  <key keycode="49" name="TLDE">
-    <keysym keyval="96">quoteleft</keysym>
-    <text category="letter">ऒ</text>
-  </key>
-  <key keycode="10" name="AE01">
-    <text category="letter">१</text>
-    <text category="letter">ऍ</text>
-  </key>
-  <key keycode="11" name="AE02">
-    <text category="letter">२</text>
-    <text category="letter">ॅ</text>
-  </key>
-  <key keycode="12" name="AE03">
-    <text category="letter">३</text>
-    <text category="letter">#</text>
-  </key>
-  <key keycode="13" name="AE04">
-    <text category="letter">४</text>
-    <text category="letter">$</text>
-  </key>
-  <key keycode="14" name="AE05">
-    <text category="letter">५</text>
-    <text category="letter">ज्ञ</text>
-    <keysym keyval="8364">EuroSign</keysym>
-  </key>
-  <key keycode="15" name="AE06">
-    <text category="letter">६</text>
-    <text category="letter">त्र</text>
-  </key>
-  <key keycode="16" name="AE07">
-    <text category="letter">७</text>
-    <text category="letter">क्ष</text>
-  </key>
-  <key keycode="17" name="AE08">
-    <text category="letter">८</text>
-    <text category="letter">श्र</text>
-  </key>
-  <key keycode="18" name="AE09">
-    <text category="letter">९</text>
-    <text category="letter">(</text>
-  </key>
-  <key keycode="19" name="AE10">
-    <text category="letter">०</text>
-    <text category="letter">)</text>
-  </key>
-  <key keycode="20" name="AE11">
-    <text category="letter">-</text>
-    <text category="letter">ः</text>
-  </key>
-  <key keycode="21" name="AE12">
-    <text category="letter">ृ</text>
-    <text category="letter">ऋ</text>
-  </key>
-  <key keycode="24" name="AD01">
-    <text category="letter">ौ</text>
-    <text category="letter">औ</text>
-  </key>
-  <key keycode="25" name="AD02">
-    <text category="letter">ै</text>
-    <text category="letter">ऐ</text>
-  </key>
-  <key keycode="26" name="AD03">
-    <text category="letter">ा</text>
-    <text category="letter">आ</text>
-  </key>
-  <key keycode="27" name="AD04">
-    <text category="letter">ी</text>
-    <text category="letter">ई</text>
-  </key>
-  <key keycode="28" name="AD05">
-    <text category="letter">ू</text>
-    <text category="letter">ऊ</text>
-  </key>
-  <key keycode="29" name="AD06">
-    <text category="letter">ब</text>
-    <text category="letter">भ</text>
-  </key>
-  <key keycode="30" name="AD07">
-    <text category="letter">ह</text>
-    <text category="letter">ङ</text>
-  </key>
-  <key keycode="31" name="AD08">
-    <text category="letter">ग</text>
-    <text category="letter">घ</text>
-  </key>
-  <key keycode="32" name="AD09">
-    <text category="letter">द</text>
-    <text category="letter">ध</text>
-  </key>
-  <key keycode="33" name="AD10">
-    <text category="letter">ज</text>
-    <text category="letter">झ</text>
-  </key>
-  <key keycode="34" name="AD11">
-    <text category="letter">ड</text>
-    <text category="letter">ढ</text>
-  </key>
-  <key keycode="35" name="AD12">
-    <text category="letter">़</text>
-    <text category="letter">ञ</text>
-  </key>
-  <key keycode="51" name="BKSL">
-    <text category="letter">ॉ</text>
-    <text category="letter">ऑ</text>
-  </key>
-  <key keycode="38" name="AC01">
-    <text category="letter">ो</text>
-    <text category="letter">ओ</text>
-  </key>
-  <key keycode="39" name="AC02">
-    <text category="letter">े</text>
-    <text category="letter">ए</text>
-  </key>
-  <key keycode="40" name="AC03">
-    <text category="letter">्‌</text>
-    <text category="letter">अ</text>
-  </key>
-  <key keycode="41" name="AC04">
-    <text category="letter">ि</text>
-    <text category="letter">इ</text>
-  </key>
-  <key keycode="42" name="AC05">
-    <text category="letter">ु</text>
-    <text category="letter">उ</text>
-  </key>
-  <key keycode="43" name="AC06">
-    <text category="letter">प</text>
-    <text category="letter">फ</text>
-  </key>
-  <key keycode="44" name="AC07">
-    <text category="letter">र</text>
-    <text category="letter">ऱ</text>
-  </key>
-  <key keycode="45" name="AC08">
-    <text category="letter">क</text>
-    <text category="letter">ख</text>
-  </key>
-  <key keycode="46" name="AC09">
-    <text category="letter">त</text>
-    <text category="letter">थ</text>
-  </key>
-  <key keycode="47" name="AC10">
-    <text category="letter">च</text>
-    <text category="letter">छ</text>
-  </key>
-  <key keycode="48" name="AC11">
-    <keysym keyval="39">quoteright</keysym>
-    <text category="letter">ठ</text>
-  </key>
-  <key keycode="52" name="AB01">
-    <text category="letter">ॆ</text>
-    <text category="letter">ऎ</text>
-  </key>
-  <key keycode="53" name="AB02">
-    <text category="letter">ं</text>
-    <text category="letter">ँ</text>
-  </key>
-  <key keycode="54" name="AB03">
-    <text category="letter">म</text>
-    <text category="letter">ण</text>
-  </key>
-  <key keycode="55" name="AB04">
-    <text category="letter">न</text>
-    <text category="letter">ऩ</text>
-  </key>
-  <key keycode="56" name="AB05">
-    <text category="letter">व</text>
-    <text category="letter">ऴ</text>
-  </key>
-  <key keycode="57" name="AB06">
-    <text category="letter">ल</text>
-    <text category="letter">ळ</text>
-  </key>
-  <key keycode="58" name="AB07">
-    <text category="letter">स</text>
-    <text category="letter">श</text>
-  </key>
-  <key keycode="59" name="AB08">
-    <text category="letter">,</text>
-    <text category="letter">ष</text>
-  </key>
-  <key keycode="60" name="AB09">
-    <text category="letter">.</text>
-    <text category="letter">।</text>
-  </key>
-  <key keycode="61" name="AB10">
-    <text category="letter">य</text>
-    <text category="letter">य़</text>
-  </key>
-</symbols>
--- a/data/keyboards/symbols/ml-inscript.xml
+++ b/data/keyboards/symbols/ml-inscript.xml
@ -1,193 +0,0 @@
-<?xml version="1.0"?>
-<symbols version="0.90">
-  <include>us</include>
-  <key keycode="49" name="TLDE">
-    <keysym keyval="96">quoteleft</keysym>
-    <text category="letter">ഒ</text>
-  </key>
-  <key keycode="10" name="AE01">
-    <text category="letter">൧</text>
-    <text category="letter">!</text>
-  </key>
-  <key keycode="11" name="AE02">
-    <text category="letter">൨</text>
-    <text category="letter">@</text>
-  </key>
-  <key keycode="12" name="AE03">
-    <text category="letter">൩</text>
-    <text category="letter">്ര</text>
-  </key>
-  <key keycode="13" name="AE04">
-    <text category="letter">൪</text>
-    <text category="letter">$</text>
-  </key>
-  <key keycode="14" name="AE05">
-    <text category="letter">൫</text>
-    <text category="letter">%</text>
-    <keysym keyval="8364">EuroSign</keysym>
-  </key>
-  <key keycode="15" name="AE06">
-    <text category="letter">൬</text>
-    <text category="letter">^</text>
-  </key>
-  <key keycode="16" name="AE07">
-    <text category="letter">൭</text>
-    <text category="letter">ക്ഷ</text>
-  </key>
-  <key keycode="17" name="AE08">
-    <text category="letter">൮</text>
-    <text category="letter">*</text>
-  </key>
-  <key keycode="18" name="AE09">
-    <text category="letter">൯</text>
-    <text category="letter">(</text>
-  </key>
-  <key keycode="19" name="AE10">
-    <text category="letter">൦</text>
-    <text category="letter">)</text>
-  </key>
-  <key keycode="20" name="AE11">
-    <text category="letter">-</text>
-    <text category="letter">ഃ</text>
-  </key>
-  <key keycode="21" name="AE12">
-    <text category="letter">ൃ</text>
-    <text category="letter">ഋ</text>
-  </key>
-  <key keycode="24" name="AD01">
-    <text category="letter">ൌ</text>
-    <text category="letter">ഔ</text>
-  </key>
-  <key keycode="25" name="AD02">
-    <text category="letter">ൈ</text>
-    <text category="letter">ഐ</text>
-  </key>
-  <key keycode="26" name="AD03">
-    <text category="letter">ാ</text>
-    <text category="letter">ആ</text>
-  </key>
-  <key keycode="27" name="AD04">
-    <text category="letter">ീ</text>
-    <text category="letter">ഈ</text>
-  </key>
-  <key keycode="28" name="AD05">
-    <text category="letter">ൂ</text>
-    <text category="letter">ഊ</text>
-  </key>
-  <key keycode="29" name="AD06">
-    <text category="letter">ബ</text>
-    <text category="letter">ഭ</text>
-  </key>
-  <key keycode="30" name="AD07">
-    <text category="letter">ഹ</text>
-    <text category="letter">ങ</text>
-  </key>
-  <key keycode="31" name="AD08">
-    <text category="letter">ഗ</text>
-    <text category="letter">ഘ</text>
-  </key>
-  <key keycode="32" name="AD09">
-    <text category="letter">ദ</text>
-    <text category="letter">ധ</text>
-  </key>
-  <key keycode="33" name="AD10">
-    <text category="letter">ജ</text>
-    <text category="letter">ഝ</text>
-  </key>
-  <key keycode="34" name="AD11">
-    <text category="letter">ഡ</text>
-    <text category="letter">ഢ</text>
-  </key>
-  <key keycode="35" name="AD12">
-    <text category="letter">‍</text>
-    <text category="letter">ഞ</text>
-  </key>
-  <key keycode="51" name="BKSL">
-    <text category="letter">‌</text>
-    <text category="letter">|</text>
-  </key>
-  <key keycode="38" name="AC01">
-    <text category="letter">ോ</text>
-    <text category="letter">ഓ</text>
-  </key>
-  <key keycode="39" name="AC02">
-    <text category="letter">േ</text>
-    <text category="letter">ഏ</text>
-  </key>
-  <key keycode="40" name="AC03">
-    <text category="letter">്</text>
-    <text category="letter">അ</text>
-  </key>
-  <key keycode="41" name="AC04">
-    <text category="letter">ി</text>
-    <text category="letter">ഇ</text>
-  </key>
-  <key keycode="42" name="AC05">
-    <text category="letter">ു</text>
-    <text category="letter">ഉ</text>
-  </key>
-  <key keycode="43" name="AC06">
-    <text category="letter">പ</text>
-    <text category="letter">ഫ</text>
-  </key>
-  <key keycode="44" name="AC07">
-    <text category="letter">ര</text>
-    <text category="letter">റ</text>
-  </key>
-  <key keycode="45" name="AC08">
-    <text category="letter">ക</text>
-    <text category="letter">ഖ</text>
-  </key>
-  <key keycode="46" name="AC09">
-    <text category="letter">ത</text>
-    <text category="letter">ഥ</text>
-  </key>
-  <key keycode="47" name="AC10">
-    <text category="letter">ച</text>
-    <text category="letter">ഛ</text>
-  </key>
-  <key keycode="48" name="AC11">
-    <keysym keyval="39">quoteright</keysym>
-    <text category="letter">ഠ</text>
-  </key>
-  <key keycode="52" name="AB01">
-    <text category="letter">െ</text>
-    <text category="letter">എ</text>
-  </key>
-  <key keycode="53" name="AB02">
-    <text category="letter">ം</text>
-    <text category="letter">X</text>
-  </key>
-  <key keycode="54" name="AB03">
-    <text category="letter">മ</text>
-    <text category="letter">ണ</text>
-  </key>
-  <key keycode="55" name="AB04">
-    <text category="letter">ന</text>
-    <text category="letter">V</text>
-  </key>
-  <key keycode="56" name="AB05">
-    <text category="letter">വ</text>
-    <text category="letter">ഴ</text>
-  </key>
-  <key keycode="57" name="AB06">
-    <text category="letter">ല</text>
-    <text category="letter">ള</text>
-  </key>
-  <key keycode="58" name="AB07">
-    <text category="letter">സ</text>
-    <text category="letter">ശ</text>
-  </key>
-  <key keycode="59" name="AB08">
-    <text category="letter">,</text>
-    <text category="letter">ഷ</text>
-  </key>
-  <key keycode="60" name="AB09">
-    <text category="letter">.</text>
-    <text category="letter">&gt;</text>
-  </key>
-  <key keycode="61" name="AB10">
-    <text category="letter">യ</text>
-    <keysym keyval="63">question</keysym>
-  </key>
-</symbols>
--- a/data/keyboards/symbols/mr-inscript.xml
+++ b/data/keyboards/symbols/mr-inscript.xml
@ -1,193 +0,0 @@
-<?xml version="1.0"?>
-<symbols version="0.90">
-  <include>us</include>
-  <key keycode="49" name="TLDE">
-    <keysym keyval="96">quoteleft</keysym>
-    <text category="letter">ऒ</text>
-  </key>
-  <key keycode="10" name="AE01">
-    <text category="letter">१</text>
-    <text category="letter">ऍ</text>
-  </key>
-  <key keycode="11" name="AE02">
-    <text category="letter">२</text>
-    <text category="letter">ॅ</text>
-  </key>
-  <key keycode="12" name="AE03">
-    <text category="letter">३</text>
-    <text category="letter">#</text>
-  </key>
-  <key keycode="13" name="AE04">
-    <text category="letter">४</text>
-    <text category="letter">$</text>
-  </key>
-  <key keycode="14" name="AE05">
-    <text category="letter">५</text>
-    <text category="letter">ज्ञ</text>
-    <keysym keyval="8364">EuroSign</keysym>
-  </key>
-  <key keycode="15" name="AE06">
-    <text category="letter">६</text>
-    <text category="letter">त्र</text>
-  </key>
-  <key keycode="16" name="AE07">
-    <text category="letter">७</text>
-    <text category="letter">क्ष</text>
-  </key>
-  <key keycode="17" name="AE08">
-    <text category="letter">८</text>
-    <text category="letter">श्र</text>
-  </key>
-  <key keycode="18" name="AE09">
-    <text category="letter">९</text>
-    <text category="letter">(</text>
-  </key>
-  <key keycode="19" name="AE10">
-    <text category="letter">०</text>
-    <text category="letter">)</text>
-  </key>
-  <key keycode="20" name="AE11">
-    <text category="letter">-</text>
-    <text category="letter">ः</text>
-  </key>
-  <key keycode="21" name="AE12">
-    <text category="letter">ृ</text>
-    <text category="letter">ऋ</text>
-  </key>
-  <key keycode="24" name="AD01">
-    <text category="letter">ौ</text>
-    <text category="letter">औ</text>
-  </key>
-  <key keycode="25" name="AD02">
-    <text category="letter">ै</text>
-    <text category="letter">ऐ</text>
-  </key>
-  <key keycode="26" name="AD03">
-    <text category="letter">ा</text>
-    <text category="letter">आ</text>
-  </key>
-  <key keycode="27" name="AD04">
-    <text category="letter">ी</text>
-    <text category="letter">ई</text>
-  </key>
-  <key keycode="28" name="AD05">
-    <text category="letter">ू</text>
-    <text category="letter">ऊ</text>
-  </key>
-  <key keycode="29" name="AD06">
-    <text category="letter">ब</text>
-    <text category="letter">भ</text>
-  </key>
-  <key keycode="30" name="AD07">
-    <text category="letter">ह</text>
-    <text category="letter">ङ</text>
-  </key>
-  <key keycode="31" name="AD08">
-    <text category="letter">ग</text>
-    <text category="letter">घ</text>
-  </key>
-  <key keycode="32" name="AD09">
-    <text category="letter">द</text>
-    <text category="letter">ध</text>
-  </key>
-  <key keycode="33" name="AD10">
-    <text category="letter">ज</text>
-    <text category="letter">झ</text>
-  </key>
-  <key keycode="34" name="AD11">
-    <text category="letter">ड</text>
-    <text category="letter">ढ</text>
-  </key>
-  <key keycode="35" name="AD12">
-    <text category="letter">़</text>
-    <text category="letter">ञ</text>
-  </key>
-  <key keycode="51" name="BKSL">
-    <text category="letter">ॉ</text>
-    <text category="letter">ऑ</text>
-  </key>
-  <key keycode="38" name="AC01">
-    <text category="letter">ो</text>
-    <text category="letter">ओ</text>
-  </key>
-  <key keycode="39" name="AC02">
-    <text category="letter">े</text>
-    <text category="letter">ए</text>
-  </key>
-  <key keycode="40" name="AC03">
-    <text category="letter">्</text>
-    <text category="letter">अ</text>
-  </key>
-  <key keycode="41" name="AC04">
-    <text category="letter">ि</text>
-    <text category="letter">इ</text>
-  </key>
-  <key keycode="42" name="AC05">
-    <text category="letter">ु</text>
-    <text category="letter">उ</text>
-  </key>
-  <key keycode="43" name="AC06">
-    <text category="letter">प</text>
-    <text category="letter">फ</text>
-  </key>
-  <key keycode="44" name="AC07">
-    <text category="letter">र</text>
-    <text category="letter">ऱ</text>
-  </key>
-  <key keycode="45" name="AC08">
-    <text category="letter">क</text>
-    <text category="letter">ख</text>
-  </key>
-  <key keycode="46" name="AC09">
-    <text category="letter">त</text>
-    <text category="letter">थ</text>
-  </key>
-  <key keycode="47" name="AC10">
-    <text category="letter">च</text>
-    <text category="letter">छ</text>
-  </key>
-  <key keycode="48" name="AC11">
-    <keysym keyval="39">quoteright</keysym>
-    <text category="letter">ठ</text>
-  </key>
-  <key keycode="52" name="AB01">
-    <text category="letter">ॆ</text>
-    <text category="letter">ऎ</text>
-  </key>
-  <key keycode="53" name="AB02">
-    <text category="letter">ं</text>
-    <text category="letter">ँ</text>
-  </key>
-  <key keycode="54" name="AB03">
-    <text category="letter">म</text>
-    <text category="letter">ण</text>
-  </key>
-  <key keycode="55" name="AB04">
-    <text category="letter">न</text>
-    <text category="letter">ऩ</text>
-  </key>
-  <key keycode="56" name="AB05">
-    <text category="letter">व</text>
-    <text category="letter">ऴ</text>
-  </key>
-  <key keycode="57" name="AB06">
-    <text category="letter">ल</text>
-    <text category="letter">ळ</text>
-  </key>
-  <key keycode="58" name="AB07">
-    <text category="letter">स</text>
-    <text category="letter">श</text>
-  </key>
-  <key keycode="59" name="AB08">
-    <text category="letter">,</text>
-    <text category="letter">ष</text>
-  </key>
-  <key keycode="60" name="AB09">
-    <text category="letter">.</text>
-    <text category="letter">।</text>
-  </key>
-  <key keycode="61" name="AB10">
-    <text category="letter">य</text>
-    <text category="letter">य़</text>
-  </key>
-</symbols>
--- a/data/keyboards/symbols/my.xml
+++ b/data/keyboards/symbols/my.xml
@ -1,193 +0,0 @@
-<?xml version="1.0"?>
-<symbols version="0.90">
-  <include>us</include>
-  <key keycode="49" name="TLDE">
-    <keysym keyval="96">quoteleft</keysym>
-    <keysym keyval="126">asciitilde</keysym>
-  </key>
-  <key keycode="10" name="AE01">
-    <text category="letter">၁</text>
-    <text category="letter">ဍ</text>
-  </key>
-  <key keycode="11" name="AE02">
-    <text category="letter">၂</text>
-    <keysym keyval="64">at</keysym>
-  </key>
-  <key keycode="12" name="AE03">
-    <text category="letter">၃</text>
-    <text category="letter">ဋ</text>
-  </key>
-  <key keycode="13" name="AE04">
-    <text category="letter">၄</text>
-    <keysym keyval="36">dollar</keysym>
-  </key>
-  <key keycode="14" name="AE05">
-    <text category="letter">၅</text>
-    <keysym keyval="37">percent</keysym>
-    <keysym keyval="8364">EuroSign</keysym>
-  </key>
-  <key keycode="15" name="AE06">
-    <text category="letter">၆</text>
-    <keysym keyval="94">asciicircum</keysym>
-  </key>
-  <key keycode="16" name="AE07">
-    <text category="letter">၇</text>
-    <text category="letter">ရ</text>
-  </key>
-  <key keycode="17" name="AE08">
-    <text category="letter">၈</text>
-    <text category="letter">ဂ</text>
-  </key>
-  <key keycode="18" name="AE09">
-    <text category="letter">၉</text>
-    <keysym keyval="40">parenleft</keysym>
-  </key>
-  <key keycode="19" name="AE10">
-    <text category="letter">၀</text>
-    <text category="letter">ဝ</text>
-  </key>
-  <key keycode="20" name="AE11">
-    <keysym keyval="45">minus</keysym>
-    <keysym keyval="95">underscore</keysym>
-  </key>
-  <key keycode="21" name="AE12">
-    <keysym keyval="61">equal</keysym>
-    <keysym keyval="43">plus</keysym>
-  </key>
-  <key keycode="24" name="AD01">
-    <text category="letter">ဆ</text>
-    <text category="letter">၍</text>
-  </key>
-  <key keycode="25" name="AD02">
-    <text category="letter">တ</text>
-    <keysym keyval="87">W</keysym>
-  </key>
-  <key keycode="26" name="AD03">
-    <text category="letter">န</text>
-    <keysym keyval="69">E</keysym>
-  </key>
-  <key keycode="27" name="AD04">
-    <text category="letter">မ</text>
-    <keysym keyval="82">R</keysym>
-  </key>
-  <key keycode="28" name="AD05">
-    <text category="letter">အ</text>
-    <keysym keyval="84">T</keysym>
-  </key>
-  <key keycode="29" name="AD06">
-    <text category="letter">ပ</text>
-    <keysym keyval="89">Y</keysym>
-  </key>
-  <key keycode="30" name="AD07">
-    <text category="letter">က</text>
-    <keysym keyval="85">U</keysym>
-  </key>
-  <key keycode="31" name="AD08">
-    <text category="letter">င</text>
-    <keysym keyval="73">I</keysym>
-  </key>
-  <key keycode="32" name="AD09">
-    <text category="letter">သ</text>
-    <text category="letter">ဥ</text>
-  </key>
-  <key keycode="33" name="AD10">
-    <text category="letter">စ</text>
-    <text category="letter">ဏ</text>
-  </key>
-  <key keycode="34" name="AD11">
-    <text category="letter">ဟ</text>
-    <text category="letter">ဎ</text>
-  </key>
-  <key keycode="35" name="AD12">
-    <text category="letter">ဉ</text>
-    <text category="letter">ဧ</text>
-  </key>
-  <key keycode="51" name="BKSL">
-    <text category="letter">၏</text>
-    <keysym keyval="124">bar</keysym>
-  </key>
-  <key keycode="38" name="AC01">
-    <text category="letter">ေ</text>
-    <text category="letter">ဗ</text>
-  </key>
-  <key keycode="39" name="AC02">
-    <text category="letter">္</text>
-    <text category="letter">္</text>
-  </key>
-  <key keycode="40" name="AC03">
-    <text category="letter">ိ</text>
-    <text category="letter">ီ</text>
-  </key>
-  <key keycode="41" name="AC04">
-    <text category="letter">္</text>
-    <text category="letter">‍</text>
-  </key>
-  <key keycode="42" name="AC05">
-    <text category="letter">‌</text>
-    <text category="letter">္</text>
-  </key>
-  <key keycode="43" name="AC06">
-    <text category="letter">့</text>
-    <text category="letter">ံ</text>
-  </key>
-  <key keycode="44" name="AC07">
-    <text category="letter">္</text>
-    <text category="letter">ဲ</text>
-  </key>
-  <key keycode="45" name="AC08">
-    <text category="letter">ု</text>
-    <keysym keyval="75">K</keysym>
-  </key>
-  <key keycode="46" name="AC09">
-    <text category="letter">ူ</text>
-    <keysym keyval="76">L</keysym>
-  </key>
-  <key keycode="47" name="AC10">
-    <text category="letter">း</text>
-    <keysym keyval="58">colon</keysym>
-  </key>
-  <key keycode="48" name="AC11">
-    <keysym keyval="39">quoteright</keysym>
-    <text category="letter">ဓ</text>
-  </key>
-  <key keycode="52" name="AB01">
-    <text category="letter">ဖ</text>
-    <text category="letter">ဇ</text>
-  </key>
-  <key keycode="53" name="AB02">
-    <text category="letter">ထ</text>
-    <text category="letter">ဌ</text>
-  </key>
-  <key keycode="54" name="AB03">
-    <text category="letter">ခ</text>
-    <text category="letter">ဃ</text>
-  </key>
-  <key keycode="55" name="AB04">
-    <text category="letter">လ</text>
-    <text category="letter">ဠ</text>
-  </key>
-  <key keycode="56" name="AB05">
-    <text category="letter">ဘ</text>
-    <keysym keyval="66">B</keysym>
-  </key>
-  <key keycode="57" name="AB06">
-    <text category="letter">ည</text>
-    <keysym keyval="78">N</keysym>
-  </key>
-  <key keycode="58" name="AB07">
-    <text category="letter">ာ</text>
-    <keysym keyval="77">M</keysym>
-  </key>
-  <key keycode="59" name="AB08">
-    <text category="letter">ယ</text>
-    <text category="letter">၍</text>
-  </key>
-  <key keycode="60" name="AB09">
-    <text category="letter">ဈ</text>
-    <text category="letter">ဤ</text>
-  </key>
-  <key keycode="61" name="AB10">
-    <text category="letter">။</text>
-    <keysym keyval="63">question</keysym>
-  </key>
-</symbols>
--- a/data/keyboards/symbols/or-inscript.xml
+++ b/data/keyboards/symbols/or-inscript.xml
@ -1,193 +0,0 @@
-<?xml version="1.0"?>
-<symbols version="0.90">
-  <include>us</include>
-  <key keycode="49" name="TLDE">
-    <keysym keyval="96">quoteleft</keysym>
-    <text category="letter">୰</text>
-  </key>
-  <key keycode="10" name="AE01">
-    <text category="letter">୧</text>
-    <text category="letter">!</text>
-  </key>
-  <key keycode="11" name="AE02">
-    <text category="letter">୨</text>
-    <text category="letter">@</text>
-  </key>
-  <key keycode="12" name="AE03">
-    <text category="letter">୩</text>
-    <text category="letter">୍ର</text>
-  </key>
-  <key keycode="13" name="AE04">
-    <text category="letter">୪</text>
-    <text category="letter">ର୍</text>
-  </key>
-  <key keycode="14" name="AE05">
-    <text category="letter">୫</text>
-    <text category="letter">ଜ୍ଞ</text>
-    <keysym keyval="8364">EuroSign</keysym>
-  </key>
-  <key keycode="15" name="AE06">
-    <text category="letter">୬</text>
-    <text category="letter">ତ୍ର</text>
-  </key>
-  <key keycode="16" name="AE07">
-    <text category="letter">୭</text>
-    <text category="letter">କ୍ଷ</text>
-  </key>
-  <key keycode="17" name="AE08">
-    <text category="letter">୮</text>
-    <text category="letter">ଶ୍ର</text>
-  </key>
-  <key keycode="18" name="AE09">
-    <text category="letter">୯</text>
-    <text category="letter">‍</text>
-  </key>
-  <key keycode="19" name="AE10">
-    <text category="letter">୦</text>
-    <text category="letter">‌</text>
-  </key>
-  <key keycode="20" name="AE11">
-    <text category="letter">-</text>
-    <text category="letter">ଃ</text>
-  </key>
-  <key keycode="21" name="AE12">
-    <text category="letter">ୃ</text>
-    <text category="letter">ଋ</text>
-  </key>
-  <key keycode="24" name="AD01">
-    <text category="letter">ୌ</text>
-    <text category="letter">ଔ</text>
-  </key>
-  <key keycode="25" name="AD02">
-    <text category="letter">ୈ</text>
-    <text category="letter">ଐ</text>
-  </key>
-  <key keycode="26" name="AD03">
-    <text category="letter">ା</text>
-    <text category="letter">ଆ</text>
-  </key>
-  <key keycode="27" name="AD04">
-    <text category="letter">ୀ</text>
-    <text category="letter">ଈ</text>
-  </key>
-  <key keycode="28" name="AD05">
-    <text category="letter">ୂ</text>
-    <text category="letter">ଊ</text>
-  </key>
-  <key keycode="29" name="AD06">
-    <text category="letter">ବ</text>
-    <text category="letter">ଭ</text>
-  </key>
-  <key keycode="30" name="AD07">
-    <text category="letter">ହ</text>
-    <text category="letter">ଙ</text>
-  </key>
-  <key keycode="31" name="AD08">
-    <text category="letter">ଗ</text>
-    <text category="letter">ଘ</text>
-  </key>
-  <key keycode="32" name="AD09">
-    <text category="letter">ଦ</text>
-    <text category="letter">ଧ</text>
-  </key>
-  <key keycode="33" name="AD10">
-    <text category="letter">ଜ</text>
-    <text category="letter">ଝ</text>
-  </key>
-  <key keycode="34" name="AD11">
-    <text category="letter">ଡ</text>
-    <text category="letter">ଢ</text>
-  </key>
-  <key keycode="35" name="AD12">
-    <text category="letter">଼</text>
-    <text category="letter">ଞ</text>
-  </key>
-  <key keycode="51" name="BKSL">
-    <text category="letter">\</text>
-    <text category="letter">|</text>
-  </key>
-  <key keycode="38" name="AC01">
-    <text category="letter">ୋ</text>
-    <text category="letter">ଓ</text>
-  </key>
-  <key keycode="39" name="AC02">
-    <text category="letter">େ</text>
-    <text category="letter">ଏ</text>
-  </key>
-  <key keycode="40" name="AC03">
-    <text category="letter">୍</text>
-    <text category="letter">ଅ</text>
-  </key>
-  <key keycode="41" name="AC04">
-    <text category="letter">ି</text>
-    <text category="letter">ଇ</text>
-  </key>
-  <key keycode="42" name="AC05">
-    <text category="letter">ୁ</text>
-    <text category="letter">ଉ</text>
-  </key>
-  <key keycode="43" name="AC06">
-    <text category="letter">ପ</text>
-    <text category="letter">ଫ</text>
-  </key>
-  <key keycode="44" name="AC07">
-    <text category="letter">ର</text>
-    <text category="letter">J</text>
-  </key>
-  <key keycode="45" name="AC08">
-    <text category="letter">କ</text>
-    <text category="letter">ଖ</text>
-  </key>
-  <key keycode="46" name="AC09">
-    <text category="letter">ତ</text>
-    <text category="letter">ଥ</text>
-  </key>
-  <key keycode="47" name="AC10">
-    <text category="letter">ଚ</text>
-    <text category="letter">ଛ</text>
-  </key>
-  <key keycode="48" name="AC11">
-    <keysym keyval="39">quoteright</keysym>
-    <text category="letter">ଠ</text>
-  </key>
-  <key keycode="52" name="AB01">
-    <text category="letter">z</text>
-    <text category="letter">Z</text>
-  </key>
-  <key keycode="53" name="AB02">
-    <text category="letter">ଂ</text>
-    <text category="letter">ଁ</text>
-  </key>
-  <key keycode="54" name="AB03">
-    <text category="letter">ମ</text>
-    <text category="letter">ଣ</text>
-  </key>
-  <key keycode="55" name="AB04">
-    <text category="letter">ନ</text>
-    <text category="letter">V</text>
-  </key>
-  <key keycode="56" name="AB05">
-    <text category="letter">ୱ</text>
-    <text category="letter">ଵ</text>
-  </key>
-  <key keycode="57" name="AB06">
-    <text category="letter">ଲ</text>
-    <text category="letter">ଳ</text>
-  </key>
-  <key keycode="58" name="AB07">
-    <text category="letter">ସ</text>
-    <text category="letter">ଶ</text>
-  </key>
-  <key keycode="59" name="AB08">
-    <text category="letter">,</text>
-    <text category="letter">ଷ</text>
-  </key>
-  <key keycode="60" name="AB09">
-    <text category="letter">.</text>
-    <text category="letter">।</text>
-  </key>
-  <key keycode="61" name="AB10">
-    <text category="letter">ୟ</text>
-    <text category="letter">ଯ</text>
-  </key>
-</symbols>
--- a/data/keyboards/symbols/pa-inscript.xml
+++ b/data/keyboards/symbols/pa-inscript.xml
@ -1,193 +0,0 @@
-<?xml version="1.0"?>
-<symbols version="0.90">
-  <include>us</include>
-  <key keycode="49" name="TLDE">
-    <keysym keyval="96">quoteleft</keysym>
-    <keysym keyval="126">asciitilde</keysym>
-  </key>
-  <key keycode="10" name="AE01">
-    <text category="letter">੧</text>
-    <keysym keyval="33">exclam</keysym>
-  </key>
-  <key keycode="11" name="AE02">
-    <text category="letter">੨</text>
-    <keysym keyval="64">at</keysym>
-  </key>
-  <key keycode="12" name="AE03">
-    <text category="letter">੩</text>
-    <keysym keyval="35">numbersign</keysym>
-  </key>
-  <key keycode="13" name="AE04">
-    <text category="letter">੪</text>
-    <keysym keyval="36">dollar</keysym>
-  </key>
-  <key keycode="14" name="AE05">
-    <text category="letter">੫</text>
-    <keysym keyval="37">percent</keysym>
-    <keysym keyval="8364">EuroSign</keysym>
-  </key>
-  <key keycode="15" name="AE06">
-    <text category="letter">੬</text>
-    <keysym keyval="94">asciicircum</keysym>
-  </key>
-  <key keycode="16" name="AE07">
-    <text category="letter">੭</text>
-    <keysym keyval="38">ampersand</keysym>
-  </key>
-  <key keycode="17" name="AE08">
-    <text category="letter">੮</text>
-    <keysym keyval="42">asterisk</keysym>
-  </key>
-  <key keycode="18" name="AE09">
-    <text category="letter">੯</text>
-    <keysym keyval="40">parenleft</keysym>
-  </key>
-  <key keycode="19" name="AE10">
-    <text category="letter">੦</text>
-    <keysym keyval="41">parenright</keysym>
-  </key>
-  <key keycode="20" name="AE11">
-    <text category="letter">-</text>
-    <text category="letter">_</text>
-  </key>
-  <key keycode="21" name="AE12">
-    <text category="letter">=</text>
-    <text category="letter">+</text>
-  </key>
-  <key keycode="24" name="AD01">
-    <text category="letter">ੌ</text>
-    <text category="letter">ਔ</text>
-  </key>
-  <key keycode="25" name="AD02">
-    <text category="letter">ੈ</text>
-    <text category="letter">ਐ</text>
-  </key>
-  <key keycode="26" name="AD03">
-    <text category="letter">ਾ</text>
-    <text category="letter">ਆ</text>
-  </key>
-  <key keycode="27" name="AD04">
-    <text category="letter">ੀ</text>
-    <text category="letter">ਈ</text>
-  </key>
-  <key keycode="28" name="AD05">
-    <text category="letter">ੂ</text>
-    <text category="letter">ਊ</text>
-  </key>
-  <key keycode="29" name="AD06">
-    <text category="letter">ਬ</text>
-    <text category="letter">ਭ</text>
-  </key>
-  <key keycode="30" name="AD07">
-    <text category="letter">ਹ</text>
-    <text category="letter">ਙ</text>
-  </key>
-  <key keycode="31" name="AD08">
-    <text category="letter">ਗ</text>
-    <text category="letter">ਘ</text>
-  </key>
-  <key keycode="32" name="AD09">
-    <text category="letter">ਦ</text>
-    <text category="letter">ਧ</text>
-  </key>
-  <key keycode="33" name="AD10">
-    <text category="letter">ਜ</text>
-    <text category="letter">ਝ</text>
-  </key>
-  <key keycode="34" name="AD11">
-    <text category="letter">ਡ</text>
-    <text category="letter">ਢ</text>
-  </key>
-  <key keycode="35" name="AD12">
-    <text category="letter">਼</text>
-    <text category="letter">ਞ</text>
-  </key>
-  <key keycode="51" name="BKSL">
-    <text category="letter">\</text>
-    <text category="letter">।</text>
-  </key>
-  <key keycode="38" name="AC01">
-    <text category="letter">ੋ</text>
-    <text category="letter">ਓ</text>
-  </key>
-  <key keycode="39" name="AC02">
-    <text category="letter">ੇ</text>
-    <text category="letter">ਏ</text>
-  </key>
-  <key keycode="40" name="AC03">
-    <text category="letter">੍</text>
-    <text category="letter">ਅ</text>
-  </key>
-  <key keycode="41" name="AC04">
-    <text category="letter">ਿ</text>
-    <text category="letter">ਇ</text>
-  </key>
-  <key keycode="42" name="AC05">
-    <text category="letter">ੁ</text>
-    <text category="letter">ਉ</text>
-  </key>
-  <key keycode="43" name="AC06">
-    <text category="letter">ਪ</text>
-    <text category="letter">ਫ</text>
-  </key>
-  <key keycode="44" name="AC07">
-    <text category="letter">ਰ</text>
-    <text category="letter">ੜ</text>
-  </key>
-  <key keycode="45" name="AC08">
-    <text category="letter">ਕ</text>
-    <text category="letter">ਖ</text>
-  </key>
-  <key keycode="46" name="AC09">
-    <text category="letter">ਤ</text>
-    <text category="letter">ਥ</text>
-  </key>
-  <key keycode="47" name="AC10">
-    <text category="letter">ਚ</text>
-    <text category="letter">ਛ</text>
-  </key>
-  <key keycode="48" name="AC11">
-    <keysym keyval="39">quoteright</keysym>
-    <text category="letter">ਠ</text>
-  </key>
-  <key keycode="52" name="AB01">
-    <text category="letter">ੰ</text>
-    <text category="letter">ੱ</text>
-  </key>
-  <key keycode="53" name="AB02">
-    <text category="letter">ਜ਼</text>
-    <text category="letter">ਫ਼</text>
-  </key>
-  <key keycode="54" name="AB03">
-    <text category="letter">ਮ</text>
-    <text category="letter">ਣ</text>
-  </key>
-  <key keycode="55" name="AB04">
-    <text category="letter">ਨ</text>
-    <text category="letter">ਂ</text>
-  </key>
-  <key keycode="56" name="AB05">
-    <text category="letter">ਵ</text>
-    <text category="letter">ਞ</text>
-  </key>
-  <key keycode="57" name="AB06">
-    <text category="letter">ਲ</text>
-    <text category="letter">ਲ਼</text>
-  </key>
-  <key keycode="58" name="AB07">
-    <text category="letter">ਸ</text>
-    <text category="letter">ਸ਼</text>
-  </key>
-  <key keycode="59" name="AB08">
-    <text category="letter">,</text>
-    <text category="letter">ੳ</text>
-  </key>
-  <key keycode="60" name="AB09">
-    <text category="letter">.</text>
-    <text category="letter">ੲ</text>
-  </key>
-  <key keycode="61" name="AB10">
-    <text category="letter">ਯ</text>
-    <text category="letter">?</text>
-  </key>
-</symbols>
--- a/data/keyboards/symbols/ru.xml
+++ b/data/keyboards/symbols/ru.xml
@ -1,193 +0,0 @@
-<?xml version="1.0"?>
-<symbols version="0.90">
-  <include>us</include>
-  <key keycode="49" name="TLDE">
-    <keysym keyval="96">quoteleft</keysym>
-    <text category="letter">Ё</text>
-  </key>
-  <key keycode="10" name="AE01">
-    <keysym keyval="49">1</keysym>
-    <text category="letter">!</text>
-  </key>
-  <key keycode="11" name="AE02">
-    <keysym keyval="50">2</keysym>
-    <text category="letter">&quot;</text>
-  </key>
-  <key keycode="12" name="AE03">
-    <keysym keyval="51">3</keysym>
-    <text category="letter">№</text>
-  </key>
-  <key keycode="13" name="AE04">
-    <keysym keyval="52">4</keysym>
-    <text category="letter">;</text>
-  </key>
-  <key keycode="14" name="AE05">
-    <keysym keyval="53">5</keysym>
-    <text category="letter">%</text>
-    <keysym keyval="8364">EuroSign</keysym>
-  </key>
-  <key keycode="15" name="AE06">
-    <keysym keyval="54">6</keysym>
-    <text category="letter">:</text>
-  </key>
-  <key keycode="16" name="AE07">
-    <keysym keyval="55">7</keysym>
-    <text category="letter">?</text>
-  </key>
-  <key keycode="17" name="AE08">
-    <keysym keyval="56">8</keysym>
-    <text category="letter">*</text>
-  </key>
-  <key keycode="18" name="AE09">
-    <keysym keyval="57">9</keysym>
-    <text category="letter">(</text>
-  </key>
-  <key keycode="19" name="AE10">
-    <keysym keyval="48">0</keysym>
-    <text category="letter">)</text>
-  </key>
-  <key keycode="20" name="AE11">
-    <keysym keyval="45">minus</keysym>
-    <text category="letter">_</text>
-  </key>
-  <key keycode="21" name="AE12">
-    <keysym keyval="61">equal</keysym>
-    <text category="letter">+</text>
-  </key>
-  <key keycode="24" name="AD01">
-    <text category="letter">й</text>
-    <text category="letter">Й</text>
-  </key>
-  <key keycode="25" name="AD02">
-    <text category="letter">ц</text>
-    <text category="letter">Ц</text>
-  </key>
-  <key keycode="26" name="AD03">
-    <text category="letter">у</text>
-    <text category="letter">У</text>
-  </key>
-  <key keycode="27" name="AD04">
-    <text category="letter">к</text>
-    <text category="letter">К</text>
-  </key>
-  <key keycode="28" name="AD05">
-    <text category="letter">е</text>
-    <text category="letter">Е</text>
-  </key>
-  <key keycode="29" name="AD06">
-    <text category="letter">н</text>
-    <text category="letter">Н</text>
-  </key>
-  <key keycode="30" name="AD07">
-    <text category="letter">г</text>
-    <text category="letter">Г</text>
-  </key>
-  <key keycode="31" name="AD08">
-    <text category="letter">ш</text>
-    <text category="letter">Ш</text>
-  </key>
-  <key keycode="32" name="AD09">
-    <text category="letter">щ</text>
-    <text category="letter">Щ</text>
-  </key>
-  <key keycode="33" name="AD10">
-    <text category="letter">з</text>
-    <text category="letter">З</text>
-  </key>
-  <key keycode="34" name="AD11">
-    <text category="letter">х</text>
-    <text category="letter">Х</text>
-  </key>
-  <key keycode="35" name="AD12">
-    <text category="letter">ъ</text>
-    <text category="letter">Ъ</text>
-  </key>
-  <key keycode="51" name="BKSL">
-    <text category="letter">\</text>
-    <text category="letter">|</text>
-  </key>
-  <key keycode="38" name="AC01">
-    <text category="letter">ф</text>
-    <text category="letter">Ф</text>
-  </key>
-  <key keycode="39" name="AC02">
-    <text category="letter">ы</text>
-    <text category="letter">Ы</text>
-  </key>
-  <key keycode="40" name="AC03">
-    <text category="letter">в</text>
-    <text category="letter">В</text>
-  </key>
-  <key keycode="41" name="AC04">
-    <text category="letter">а</text>
-    <text category="letter">А</text>
-  </key>
-  <key keycode="42" name="AC05">
-    <text category="letter">п</text>
-    <text category="letter">П</text>
-  </key>
-  <key keycode="43" name="AC06">
-    <text category="letter">р</text>
-    <text category="letter">Р</text>
-  </key>
-  <key keycode="44" name="AC07">
-    <text category="letter">о</text>
-    <text category="letter">О</text>
-  </key>
-  <key keycode="45" name="AC08">
-    <text category="letter">л</text>
-    <text category="letter">Л</text>
-  </key>
-  <key keycode="46" name="AC09">
-    <text category="letter">д</text>
-    <text category="letter">Д</text>
-  </key>
-  <key keycode="47" name="AC10">
-    <text category="letter">ж</text>
-    <text category="letter">Ж</text>
-  </key>
-  <key keycode="48" name="AC11">
-    <keysym keyval="39">quoteright</keysym>
-    <text category="letter">Э</text>
-  </key>
-  <key keycode="52" name="AB01">
-    <text category="letter">я</text>
-    <text category="letter">Я</text>
-  </key>
-  <key keycode="53" name="AB02">
-    <text category="letter">ч</text>
-    <text category="letter">Ч</text>
-  </key>
-  <key keycode="54" name="AB03">
-    <text category="letter">с</text>
-    <text category="letter">С</text>
-  </key>
-  <key keycode="55" name="AB04">
-    <text category="letter">м</text>
-    <text category="letter">М</text>
-  </key>
-  <key keycode="56" name="AB05">
-    <text category="letter">и</text>
-    <text category="letter">И</text>
-  </key>
-  <key keycode="57" name="AB06">
-    <text category="letter">т</text>
-    <text category="letter">Т</text>
-  </key>
-  <key keycode="58" name="AB07">
-    <text category="letter">ь</text>
-    <text category="letter">Ь</text>
-  </key>
-  <key keycode="59" name="AB08">
-    <text category="letter">б</text>
-    <text category="letter">Б</text>
-  </key>
-  <key keycode="60" name="AB09">
-    <text category="letter">ю</text>
-    <text category="letter">Ю</text>
-  </key>
-  <key keycode="61" name="AB10">
-    <text category="letter">.</text>
-    <text category="letter">,</text>
-  </key>
-</symbols>
--- a/data/keyboards/symbols/sd-inscript.xml
+++ b/data/keyboards/symbols/sd-inscript.xml
@ -1,193 +0,0 @@
-<?xml version="1.0"?>
-<symbols version="0.90">
-  <include>us</include>
-  <key keycode="49" name="TLDE">
-    <keysym keyval="96">quoteleft</keysym>
-    <text category="letter">ऒ</text>
-  </key>
-  <key keycode="10" name="AE01">
-    <text category="letter">१</text>
-    <text category="letter">ऍ</text>
-  </key>
-  <key keycode="11" name="AE02">
-    <text category="letter">२</text>
-    <text category="letter">ॅ</text>
-  </key>
-  <key keycode="12" name="AE03">
-    <text category="letter">३</text>
-    <text category="letter">#</text>
-  </key>
-  <key keycode="13" name="AE04">
-    <text category="letter">४</text>
-    <text category="letter">$</text>
-  </key>
-  <key keycode="14" name="AE05">
-    <text category="letter">५</text>
-    <text category="letter">ज्ञ</text>
-    <keysym keyval="8364">EuroSign</keysym>
-  </key>
-  <key keycode="15" name="AE06">
-    <text category="letter">६</text>
-    <text category="letter">त्र</text>
-  </key>
-  <key keycode="16" name="AE07">
-    <text category="letter">७</text>
-    <text category="letter">क्ष</text>
-  </key>
-  <key keycode="17" name="AE08">
-    <text category="letter">८</text>
-    <text category="letter">श्र</text>
-  </key>
-  <key keycode="18" name="AE09">
-    <text category="letter">९</text>
-    <text category="letter">(</text>
-  </key>
-  <key keycode="19" name="AE10">
-    <text category="letter">०</text>
-    <text category="letter">)</text>
-  </key>
-  <key keycode="20" name="AE11">
-    <text category="letter">-</text>
-    <text category="letter">ः</text>
-  </key>
-  <key keycode="21" name="AE12">
-    <text category="letter">ृ</text>
-    <text category="letter">ऋ</text>
-  </key>
-  <key keycode="24" name="AD01">
-    <text category="letter">ौ</text>
-    <text category="letter">औ</text>
-  </key>
-  <key keycode="25" name="AD02">
-    <text category="letter">ै</text>
-    <text category="letter">ऐ</text>
-  </key>
-  <key keycode="26" name="AD03">
-    <text category="letter">ा</text>
-    <text category="letter">आ</text>
-  </key>
-  <key keycode="27" name="AD04">
-    <text category="letter">ी</text>
-    <text category="letter">ई</text>
-  </key>
-  <key keycode="28" name="AD05">
-    <text category="letter">ू</text>
-    <text category="letter">ऊ</text>
-  </key>
-  <key keycode="29" name="AD06">
-    <text category="letter">ॿ</text>
-    <text category="letter">भ</text>
-  </key>
-  <key keycode="30" name="AD07">
-    <text category="letter">ह</text>
-    <text category="letter">ङ</text>
-  </key>
-  <key keycode="31" name="AD08">
-    <text category="letter">ॻ</text>
-    <text category="letter">घ</text>
-  </key>
-  <key keycode="32" name="AD09">
-    <text category="letter">द</text>
-    <text category="letter">ध</text>
-  </key>
-  <key keycode="33" name="AD10">
-    <text category="letter">ॼ</text>
-    <text category="letter">झ</text>
-  </key>
-  <key keycode="34" name="AD11">
-    <text category="letter">ॾ</text>
-    <text category="letter">ढ</text>
-  </key>
-  <key keycode="35" name="AD12">
-    <text category="letter">़</text>
-    <text category="letter">ञ</text>
-  </key>
-  <key keycode="51" name="BKSL">
-    <text category="letter">ॉ</text>
-    <text category="letter">ऑ</text>
-  </key>
-  <key keycode="38" name="AC01">
-    <text category="letter">ो</text>
-    <text category="letter">ओ</text>
-  </key>
-  <key keycode="39" name="AC02">
-    <text category="letter">े</text>
-    <text category="letter">ए</text>
-  </key>
-  <key keycode="40" name="AC03">
-    <text category="letter">्‌</text>
-    <text category="letter">अ</text>
-  </key>
-  <key keycode="41" name="AC04">
-    <text category="letter">ि</text>
-    <text category="letter">इ</text>
-  </key>
-  <key keycode="42" name="AC05">
-    <text category="letter">ु</text>
-    <text category="letter">उ</text>
-  </key>
-  <key keycode="43" name="AC06">
-    <text category="letter">प</text>
-    <text category="letter">फ</text>
-  </key>
-  <key keycode="44" name="AC07">
-    <text category="letter">र</text>
-    <text category="letter">ऱ</text>
-  </key>
-  <key keycode="45" name="AC08">
-    <text category="letter">क</text>
-    <text category="letter">ख</text>
-  </key>
-  <key keycode="46" name="AC09">
-    <text category="letter">त</text>
-    <text category="letter">थ</text>
-  </key>
-  <key keycode="47" name="AC10">
-    <text category="letter">च</text>
-    <text category="letter">छ</text>
-  </key>
-  <key keycode="48" name="AC11">
-    <keysym keyval="39">quoteright</keysym>
-    <text category="letter">ठ</text>
-  </key>
-  <key keycode="52" name="AB01">
-    <text category="letter">ॆ</text>
-    <text category="letter">ऎ</text>
-  </key>
-  <key keycode="53" name="AB02">
-    <text category="letter">ं</text>
-    <text category="letter">ँ</text>
-  </key>
-  <key keycode="54" name="AB03">
-    <text category="letter">म</text>
-    <text category="letter">ण</text>
-  </key>
-  <key keycode="55" name="AB04">
-    <text category="letter">न</text>
-    <text category="letter">ऩ</text>
-  </key>
-  <key keycode="56" name="AB05">
-    <text category="letter">व</text>
-    <text category="letter">ऴ</text>
-  </key>
-  <key keycode="57" name="AB06">
-    <text category="letter">ल</text>
-    <text category="letter">ळ</text>
-  </key>
-  <key keycode="58" name="AB07">
-    <text category="letter">स</text>
-    <text category="letter">श</text>
-  </key>
-  <key keycode="59" name="AB08">
-    <text category="letter">,</text>
-    <text category="letter">ष</text>
-  </key>
-  <key keycode="60" name="AB09">
-    <text category="letter">.</text>
-    <text category="letter">।</text>
-  </key>
-  <key keycode="61" name="AB10">
-    <text category="letter">य</text>
-    <text category="letter">य़</text>
-  </key>
-</symbols>
--- a/data/keyboards/symbols/ta-inscript.xml
+++ b/data/keyboards/symbols/ta-inscript.xml
@ -1,193 +0,0 @@
-<?xml version="1.0"?>
-<symbols version="0.90">
-  <include>us</include>
-  <key keycode="49" name="TLDE">
-    <keysym keyval="96">quoteleft</keysym>
-    <text category="letter">ஒ</text>
-  </key>
-  <key keycode="10" name="AE01">
-    <text category="letter">1</text>
-    <text category="letter">!</text>
-  </key>
-  <key keycode="11" name="AE02">
-    <text category="letter">2</text>
-    <text category="letter">@</text>
-  </key>
-  <key keycode="12" name="AE03">
-    <text category="letter">3</text>
-    <text category="letter">#</text>
-  </key>
-  <key keycode="13" name="AE04">
-    <text category="letter">4</text>
-    <text category="letter">$</text>
-  </key>
-  <key keycode="14" name="AE05">
-    <text category="letter">5</text>
-    <text category="letter">%</text>
-    <keysym keyval="8364">EuroSign</keysym>
-  </key>
-  <key keycode="15" name="AE06">
-    <text category="letter">6</text>
-    <text category="letter">^</text>
-  </key>
-  <key keycode="16" name="AE07">
-    <text category="letter">7</text>
-    <text category="letter">க்ஷ</text>
-  </key>
-  <key keycode="17" name="AE08">
-    <text category="letter">8</text>
-    <text category="letter">ஷ்ர</text>
-  </key>
-  <key keycode="18" name="AE09">
-    <text category="letter">9</text>
-    <text category="letter">(</text>
-  </key>
-  <key keycode="19" name="AE10">
-    <text category="letter">0</text>
-    <text category="letter">)</text>
-  </key>
-  <key keycode="20" name="AE11">
-    <text category="letter">-</text>
-    <text category="letter">ஃ</text>
-  </key>
-  <key keycode="21" name="AE12">
-    <text category="letter">=</text>
-    <text category="letter">+</text>
-  </key>
-  <key keycode="24" name="AD01">
-    <text category="letter">ௌ</text>
-    <text category="letter">ஔ</text>
-  </key>
-  <key keycode="25" name="AD02">
-    <text category="letter">ை</text>
-    <text category="letter">ஐ</text>
-  </key>
-  <key keycode="26" name="AD03">
-    <text category="letter">ா</text>
-    <text category="letter">ஆ</text>
-  </key>
-  <key keycode="27" name="AD04">
-    <text category="letter">ீ</text>
-    <text category="letter">ஈ</text>
-  </key>
-  <key keycode="28" name="AD05">
-    <text category="letter">ூ</text>
-    <text category="letter">ஊ</text>
-  </key>
-  <key keycode="29" name="AD06">
-    <text category="letter">y</text>
-    <text category="letter">Y</text>
-  </key>
-  <key keycode="30" name="AD07">
-    <text category="letter">ஹ</text>
-    <text category="letter">ங</text>
-  </key>
-  <key keycode="31" name="AD08">
-    <text category="letter">i</text>
-    <text category="letter">I</text>
-  </key>
-  <key keycode="32" name="AD09">
-    <text category="letter">o</text>
-    <text category="letter">O</text>
-  </key>
-  <key keycode="33" name="AD10">
-    <text category="letter">ஜ</text>
-    <text category="letter">P</text>
-  </key>
-  <key keycode="34" name="AD11">
-    <text category="letter">[</text>
-    <text category="letter">{</text>
-  </key>
-  <key keycode="35" name="AD12">
-    <text category="letter">]</text>
-    <text category="letter">ஞ</text>
-  </key>
-  <key keycode="51" name="BKSL">
-    <text category="letter">\</text>
-    <text category="letter">|</text>
-  </key>
-  <key keycode="38" name="AC01">
-    <text category="letter">ோ</text>
-    <text category="letter">ஓ</text>
-  </key>
-  <key keycode="39" name="AC02">
-    <text category="letter">ே</text>
-    <text category="letter">ஏ</text>
-  </key>
-  <key keycode="40" name="AC03">
-    <text category="letter">்</text>
-    <text category="letter">அ</text>
-  </key>
-  <key keycode="41" name="AC04">
-    <text category="letter">ி</text>
-    <text category="letter">இ</text>
-  </key>
-  <key keycode="42" name="AC05">
-    <text category="letter">ு</text>
-    <text category="letter">உ</text>
-  </key>
-  <key keycode="43" name="AC06">
-    <text category="letter">ப</text>
-    <text category="letter">H</text>
-  </key>
-  <key keycode="44" name="AC07">
-    <text category="letter">ர</text>
-    <text category="letter">ற</text>
-  </key>
-  <key keycode="45" name="AC08">
-    <text category="letter">க</text>
-    <text category="letter">K</text>
-  </key>
-  <key keycode="46" name="AC09">
-    <text category="letter">த</text>
-    <text category="letter">L</text>
-  </key>
-  <key keycode="47" name="AC10">
-    <text category="letter">ச</text>
-    <text category="letter">:</text>
-  </key>
-  <key keycode="48" name="AC11">
-    <keysym keyval="39">quoteright</keysym>
-    <text category="letter">&quot;</text>
-  </key>
-  <key keycode="52" name="AB01">
-    <text category="letter">ெ</text>
-    <text category="letter">எ</text>
-  </key>
-  <key keycode="53" name="AB02">
-    <text category="letter">x</text>
-    <text category="letter">X</text>
-  </key>
-  <key keycode="54" name="AB03">
-    <text category="letter">ம</text>
-    <text category="letter">ண</text>
-  </key>
-  <key keycode="55" name="AB04">
-    <text category="letter">ந</text>
-    <text category="letter">ன</text>
-  </key>
-  <key keycode="56" name="AB05">
-    <text category="letter">வ</text>
-    <text category="letter">ழ</text>
-  </key>
-  <key keycode="57" name="AB06">
-    <text category="letter">ல</text>
-    <text category="letter">ள</text>
-  </key>
-  <key keycode="58" name="AB07">
-    <text category="letter">ஸ</text>
-    <text category="letter">M</text>
-  </key>
-  <key keycode="59" name="AB08">
-    <text category="letter">,</text>
-    <text category="letter">ஷ</text>
-  </key>
-  <key keycode="60" name="AB09">
-    <text category="letter">.</text>
-    <text category="letter">&gt;</text>
-  </key>
-  <key keycode="61" name="AB10">
-    <text category="letter">ய</text>
-    <keysym keyval="63">question</keysym>
-  </key>
-</symbols>
--- a/data/keyboards/symbols/te-inscript.xml
+++ b/data/keyboards/symbols/te-inscript.xml
@ -1,194 +0,0 @@
-<?xml version="1.0"?>
-<symbols version="0.90">
-  <include>us</include>
-  <key keycode="49" name="TLDE">
-    <keysym keyval="96">quoteleft</keysym>
-    <text category="letter">ఒ</text>
-  </key>
-  <key keycode="10" name="AE01">
-    <text category="letter">౧</text>
-    <text category="letter">!</text>
-  </key>
-  <key keycode="11" name="AE02">
-    <text category="letter">౨</text>
-    <text category="letter">@</text>
-  </key>
-  <key keycode="12" name="AE03">
-    <text category="letter">౩</text>
-    <text category="letter">#</text>
-  </key>
-  <key keycode="13" name="AE04">
-    <text category="letter">౪</text>
-    <text category="letter">$</text>
-  </key>
-  <key keycode="14" name="AE05">
-    <text category="letter">౫</text>
-    <text category="letter">జ్ఞ</text>
-    <keysym keyval="8364">EuroSign</keysym>
-  </key>
-  <key keycode="15" name="AE06">
-    <text category="letter">౬</text>
-    <text category="letter">త్ర</text>
-  </key>
-  <key keycode="16" name="AE07">
-    <text category="letter">౭</text>
-    <text category="letter">క్ష</text>
-  </key>
-  <key keycode="17" name="AE08">
-    <text category="letter">౮</text>
-    <text category="letter">శ్ర</text>
-  </key>
-  <key keycode="18" name="AE09">
-    <text category="letter">౯</text>
-    <text category="letter">(</text>
-  </key>
-  <key keycode="19" name="AE10">
-    <text category="letter">౦</text>
-    <text category="letter">)</text>
-  </key>
-  <key keycode="20" name="AE11">
-    <text category="letter">-</text>
-    <text category="letter">_</text>
-  </key>
-  <key keycode="21" name="AE12">
-    <text category="letter">ృ</text>
-    <text category="letter">ఋ</text>
-  </key>
-  <key keycode="24" name="AD01">
-    <text category="letter">ౌ</text>
-    <text category="letter">ఔ</text>
-  </key>
-  <key keycode="25" name="AD02">
-    <text category="letter">ై</text>
-    <text category="letter">ఐ</text>
-  </key>
-  <key keycode="26" name="AD03">
-    <text category="letter">ా</text>
-    <text category="letter">ఆ</text>
-  </key>
-  <key keycode="27" name="AD04">
-    <text category="letter">ీ</text>
-    <text category="letter">ఈ</text>
-  </key>
-  <key keycode="28" name="AD05">
-    <text category="letter">ూ</text>
-    <text category="letter">ఊ</text>
-  </key>
-  <key keycode="29" name="AD06">
-    <text category="letter">బ</text>
-    <text category="letter">భ</text>
-  </key>
-  <key keycode="30" name="AD07">
-    <text category="letter">హ</text>
-    <text category="letter">ఙ</text>
-  </key>
-  <key keycode="31" name="AD08">
-    <text category="letter">గ</text>
-    <text category="letter">ఘ</text>
-  </key>
-  <key keycode="32" name="AD09">
-    <text category="letter">ద</text>
-    <text category="letter">ధ</text>
-  </key>
-  <key keycode="33" name="AD10">
-    <text category="letter">జ</text>
-    <text category="letter">ఝ</text>
-  </key>
-  <key keycode="34" name="AD11">
-    <text category="letter">డ</text>
-    <text category="letter">ఢ</text>
-  </key>
-  <key keycode="35" name="AD12">
-    <text category="letter">‍</text>
-    <text category="letter">ఞ</text>
-  </key>
-  <key keycode="51" name="BKSL">
-    <text category="letter">ౄ</text>
-    <text category="letter">ౠ</text>
-  </key>
-  <key keycode="38" name="AC01">
-    <text category="letter">ో</text>
-    <text category="letter">ఓ</text>
-  </key>
-  <key keycode="39" name="AC02">
-    <text category="letter">ే</text>
-    <text category="letter">ఏ</text>
-  </key>
-  <key keycode="40" name="AC03">
-    <text category="letter">్</text>
-    <text category="letter">అ</text>
-  </key>
-  <key keycode="41" name="AC04">
-    <text category="letter">ి</text>
-    <text category="letter">ఇ</text>
-  </key>
-  <key keycode="42" name="AC05">
-    <text category="letter">ు</text>
-    <text category="letter">ఉ</text>
-  </key>
-  <key keycode="43" name="AC06">
-    <text category="letter">ప</text>
-    <text category="letter">ఫ</text>
-  </key>
-  <key keycode="44" name="AC07">
-    <text category="letter">ర</text>
-    <text category="letter">ఱ</text>
-  </key>
-  <key keycode="45" name="AC08">
-    <text category="letter">క</text>
-    <text category="letter">ఖ</text>
-  </key>
-  <key keycode="46" name="AC09">
-    <text category="letter">త</text>
-    <text category="letter">థ</text>
-  </key>
-  <key keycode="47" name="AC10">
-    <text category="letter">చ</text>
-    <text category="letter">ఛ</text>
-  </key>
-  <key keycode="48" name="AC11">
-    <keysym keyval="39">quoteright</keysym>
-    <text category="letter">ఠ</text>
-  </key>
-  <key keycode="52" name="AB01">
-    <text category="letter">ె</text>
-    <text category="letter">ఎ</text>
-  </key>
-  <key keycode="53" name="AB02">
-    <text category="letter">ం</text>
-    <text category="letter">ఁ</text>
-  </key>
-  <key keycode="54" name="AB03">
-    <text category="letter">మ</text>
-    <text category="letter">ణ</text>
-  </key>
-  <key keycode="55" name="AB04">
-    <text category="letter">న</text>
-    <text category="letter">ః</text>
-  </key>
-  <key keycode="56" name="AB05">
-    <text category="letter">వ</text>
-    <text category="letter">‌</text>
-  </key>
-  <key keycode="57" name="AB06">
-    <text category="letter">ల</text>
-    <text category="letter">ళ</text>
-  </key>
-  <key keycode="58" name="AB07">
-    <text category="letter">స</text>
-    <text category="letter">శ</text>
-  </key>
-  <key keycode="59" name="AB08">
-    <text category="letter">,</text>
-    <text category="letter">ష</text>
-  </key>
-  <key keycode="60" name="AB09">
-    <text category="letter">.</text>
-    <text category="letter">&gt;</text>
-  </key>
-  <key keycode="61" name="AB10">
-    <text category="letter">య</text>
-    <text category="letter">?</text>
-  </key>
-</symbols>
-
--- a/data/keyboards/symbols/th.xml
+++ b/data/keyboards/symbols/th.xml
@ -1,192 +0,0 @@
-<?xml version="1.0"?>
-<symbols version="0.90">
-  <include>us</include>
-  <key keycode="49" name="TLDE">
-    <keysym keyval="95">underscore</keysym>
-    <keysym keyval="37">percent</keysym>
-  </key>
-  <key keycode="10" name="AE01">
-    <keysym keyval="3557">Thai_lakkhangyao</keysym>
-    <keysym keyval="43">plus</keysym>
-  </key>
-  <key keycode="11" name="AE02">
-    <keysym keyval="47">slash</keysym>
-    <keysym keyval="3569">Thai_leknung</keysym>
-  </key>
-  <key keycode="12" name="AE03">
-    <keysym keyval="45">minus</keysym>
-    <keysym keyval="3570">Thai_leksong</keysym>
-  </key>
-  <key keycode="13" name="AE04">
-    <keysym keyval="3520">Thai_phosamphao</keysym>
-    <keysym keyval="3571">Thai_leksam</keysym>
-  </key>
-  <key keycode="14" name="AE05">
-    <keysym keyval="3510">Thai_thothung</keysym>
-    <keysym keyval="3572">Thai_leksi</keysym>
-  </key>
-  <key keycode="15" name="AE06">
-    <keysym keyval="3544">Thai_sarau</keysym>
-    <keysym keyval="3545">Thai_sarauu</keysym>
-  </key>
-  <key keycode="16" name="AE07">
-    <keysym keyval="3542">Thai_saraue</keysym>
-    <keysym keyval="3551">Thai_baht</keysym>
-  </key>
-  <key keycode="17" name="AE08">
-    <keysym keyval="3492">Thai_khokhwai</keysym>
-    <keysym keyval="3573">Thai_lekha</keysym>
-  </key>
-  <key keycode="18" name="AE09">
-    <keysym keyval="3509">Thai_totao</keysym>
-    <keysym keyval="3574">Thai_lekhok</keysym>
-  </key>
-  <key keycode="19" name="AE10">
-    <keysym keyval="3496">Thai_chochan</keysym>
-    <keysym keyval="3575">Thai_lekchet</keysym>
-  </key>
-  <key keycode="20" name="AE11">
-    <keysym keyval="3490">Thai_khokhai</keysym>
-    <keysym keyval="3576">Thai_lekpaet</keysym>
-  </key>
-  <key keycode="21" name="AE12">
-    <keysym keyval="3498">Thai_chochang</keysym>
-    <keysym keyval="3577">Thai_lekkao</keysym>
-  </key>
-  <key keycode="24" name="AD01">
-    <keysym keyval="3558">Thai_maiyamok</keysym>
-    <keysym keyval="3568">Thai_leksun</keysym>
-  </key>
-  <key keycode="25" name="AD02">
-    <keysym keyval="3556">Thai_saraaimaimalai</keysym>
-    <keysym keyval="34">quotedbl</keysym>
-  </key>
-  <key keycode="26" name="AD03">
-    <keysym keyval="3539">Thai_saraam</keysym>
-    <keysym keyval="3502">Thai_dochada</keysym>
-  </key>
-  <key keycode="27" name="AD04">
-    <keysym keyval="3518">Thai_phophan</keysym>
-    <keysym keyval="3505">Thai_thonangmontho</keysym>
-  </key>
-  <key keycode="28" name="AD05">
-    <keysym keyval="3536">Thai_saraa</keysym>
-    <keysym keyval="3512">Thai_thothong</keysym>
-  </key>
-  <key keycode="29" name="AD06">
-    <keysym keyval="3537">Thai_maihanakat</keysym>
-    <keysym keyval="3565">Thai_nikhahit</keysym>
-  </key>
-  <key keycode="30" name="AD07">
-    <keysym keyval="3541">Thai_saraii</keysym>
-    <keysym keyval="3562">Thai_maitri</keysym>
-  </key>
-  <key keycode="31" name="AD08">
-    <keysym keyval="3523">Thai_rorua</keysym>
-    <keysym keyval="3507">Thai_nonen</keysym>
-  </key>
-  <key keycode="32" name="AD09">
-    <keysym keyval="3513">Thai_nonu</keysym>
-    <keysym keyval="3535">Thai_paiyannoi</keysym>
-  </key>
-  <key keycode="33" name="AD10">
-    <keysym keyval="3522">Thai_yoyak</keysym>
-    <keysym keyval="3501">Thai_yoying</keysym>
-  </key>
-  <key keycode="34" name="AD11">
-    <keysym keyval="3514">Thai_bobaimai</keysym>
-    <keysym keyval="3504">Thai_thothan</keysym>
-  </key>
-  <key keycode="35" name="AD12">
-    <keysym keyval="3525">Thai_loling</keysym>
-    <keysym keyval="44">comma</keysym>
-  </key>
-  <key keycode="51" name="BKSL">
-    <keysym keyval="3491">Thai_khokhuat</keysym>
-    <keysym keyval="3493">Thai_khokhon</keysym>
-  </key>
-  <key keycode="38" name="AC01">
-    <keysym keyval="3519">Thai_fofan</keysym>
-    <keysym keyval="3524">Thai_ru</keysym>
-  </key>
-  <key keycode="39" name="AC02">
-    <keysym keyval="3531">Thai_hohip</keysym>
-    <keysym keyval="3494">Thai_khorakhang</keysym>
-  </key>
-  <key keycode="40" name="AC03">
-    <keysym keyval="3489">Thai_kokai</keysym>
-    <keysym keyval="3503">Thai_topatak</keysym>
-  </key>
-  <key keycode="41" name="AC04">
-    <keysym keyval="3508">Thai_dodek</keysym>
-    <keysym keyval="3554">Thai_sarao</keysym>
-  </key>
-  <key keycode="42" name="AC05">
-    <keysym keyval="3552">Thai_sarae</keysym>
-    <keysym keyval="3500">Thai_chochoe</keysym>
-  </key>
-  <key keycode="43" name="AC06">
-    <keysym keyval="3561">Thai_maitho</keysym>
-    <keysym keyval="3559">Thai_maitaikhu</keysym>
-  </key>
-  <key keycode="44" name="AC07">
-    <keysym keyval="3560">Thai_maiek</keysym>
-    <keysym keyval="3563">Thai_maichattawa</keysym>
-  </key>
-  <key keycode="45" name="AC08">
-    <keysym keyval="3538">Thai_saraaa</keysym>
-    <keysym keyval="3529">Thai_sorusi</keysym>
-  </key>
-  <key keycode="46" name="AC09">
-    <keysym keyval="3530">Thai_sosua</keysym>
-    <keysym keyval="3528">Thai_sosala</keysym>
-  </key>
-  <key keycode="47" name="AC10">
-    <keysym keyval="3527">Thai_wowaen</keysym>
-    <keysym keyval="3499">Thai_soso</keysym>
-  </key>
-  <key keycode="48" name="AC11">
-    <keysym keyval="3495">Thai_ngongu</keysym>
-    <keysym keyval="46">period</keysym>
-  </key>
-  <key keycode="52" name="AB01">
-    <keysym keyval="3516">Thai_phophung</keysym>
-    <keysym keyval="40">parenleft</keysym>
-  </key>
-  <key keycode="53" name="AB02">
-    <keysym keyval="3515">Thai_popla</keysym>
-    <keysym keyval="41">parenright</keysym>
-  </key>
-  <key keycode="54" name="AB03">
-    <keysym keyval="3553">Thai_saraae</keysym>
-    <keysym keyval="3497">Thai_choching</keysym>
-  </key>
-  <key keycode="55" name="AB04">
-    <keysym keyval="3533">Thai_oang</keysym>
-    <keysym keyval="3534">Thai_honokhuk</keysym>
-  </key>
-  <key keycode="56" name="AB05">
-    <keysym keyval="3540">Thai_sarai</keysym>
-    <keysym keyval="3546">Thai_phinthu</keysym>
-  </key>
-  <key keycode="57" name="AB06">
-    <keysym keyval="3543">Thai_sarauee</keysym>
-    <keysym keyval="3564">Thai_thanthakhat</keysym>
-  </key>
-  <key keycode="58" name="AB07">
-    <keysym keyval="3511">Thai_thothahan</keysym>
-    <keysym keyval="63">question</keysym>
-  </key>
-  <key keycode="59" name="AB08">
-    <keysym keyval="3521">Thai_moma</keysym>
-    <keysym keyval="3506">Thai_thophuthao</keysym>
-  </key>
-  <key keycode="60" name="AB09">
-    <keysym keyval="3555">Thai_saraaimaimuan</keysym>
-    <keysym keyval="3532">Thai_lochula</keysym>
-  </key>
-  <key keycode="61" name="AB10">
-    <keysym keyval="3517">Thai_fofa</keysym>
-    <keysym keyval="3526">Thai_lu</keysym>
-  </key>
-</symbols>
--- a/data/keyboards/symbols/ua.xml
+++ b/data/keyboards/symbols/ua.xml
@ -1,193 +0,0 @@
-<?xml version="1.0"?>
-<symbols version="0.90">
-  <include>us</include>
-  <key keycode="49" name="TLDE">
-    <keysym keyval="96">quoteleft</keysym>
-    <text category="letter">Ґ</text>
-  </key>
-  <key keycode="10" name="AE01">
-    <keysym keyval="49">1</keysym>
-    <text category="letter">!</text>
-  </key>
-  <key keycode="11" name="AE02">
-    <keysym keyval="50">2</keysym>
-    <text category="letter">&quot;</text>
-  </key>
-  <key keycode="12" name="AE03">
-    <keysym keyval="51">3</keysym>
-    <text category="letter">№</text>
-  </key>
-  <key keycode="13" name="AE04">
-    <keysym keyval="52">4</keysym>
-    <text category="letter">;</text>
-  </key>
-  <key keycode="14" name="AE05">
-    <keysym keyval="53">5</keysym>
-    <text category="letter">%</text>
-    <keysym keyval="8364">EuroSign</keysym>
-  </key>
-  <key keycode="15" name="AE06">
-    <keysym keyval="54">6</keysym>
-    <text category="letter">:</text>
-  </key>
-  <key keycode="16" name="AE07">
-    <keysym keyval="55">7</keysym>
-    <text category="letter">?</text>
-  </key>
-  <key keycode="17" name="AE08">
-    <keysym keyval="56">8</keysym>
-    <text category="letter">*</text>
-  </key>
-  <key keycode="18" name="AE09">
-    <keysym keyval="57">9</keysym>
-    <text category="letter">(</text>
-  </key>
-  <key keycode="19" name="AE10">
-    <keysym keyval="48">0</keysym>
-    <text category="letter">)</text>
-  </key>
-  <key keycode="20" name="AE11">
-    <keysym keyval="45">minus</keysym>
-    <text category="letter">_</text>
-  </key>
-  <key keycode="21" name="AE12">
-    <keysym keyval="61">equal</keysym>
-    <text category="letter">+</text>
-  </key>
-  <key keycode="24" name="AD01">
-    <text category="letter">й</text>
-    <text category="letter">Й</text>
-  </key>
-  <key keycode="25" name="AD02">
-    <text category="letter">ц</text>
-    <text category="letter">Ц</text>
-  </key>
-  <key keycode="26" name="AD03">
-    <text category="letter">у</text>
-    <text category="letter">У</text>
-  </key>
-  <key keycode="27" name="AD04">
-    <text category="letter">к</text>
-    <text category="letter">К</text>
-  </key>
-  <key keycode="28" name="AD05">
-    <text category="letter">е</text>
-    <text category="letter">Е</text>
-  </key>
-  <key keycode="29" name="AD06">
-    <text category="letter">н</text>
-    <text category="letter">Н</text>
-  </key>
-  <key keycode="30" name="AD07">
-    <text category="letter">г</text>
-    <text category="letter">Г</text>
-  </key>
-  <key keycode="31" name="AD08">
-    <text category="letter">ш</text>
-    <text category="letter">Ш</text>
-  </key>
-  <key keycode="32" name="AD09">
-    <text category="letter">щ</text>
-    <text category="letter">Щ</text>
-  </key>
-  <key keycode="33" name="AD10">
-    <text category="letter">з</text>
-    <text category="letter">З</text>
-  </key>
-  <key keycode="34" name="AD11">
-    <text category="letter">х</text>
-    <text category="letter">Х</text>
-  </key>
-  <key keycode="35" name="AD12">
-    <text category="letter">ї</text>
-    <text category="letter">Ї</text>
-  </key>
-  <key keycode="51" name="BKSL">
-    <text category="letter">\</text>
-    <text category="letter">|</text>
-  </key>
-  <key keycode="38" name="AC01">
-    <text category="letter">ф</text>
-    <text category="letter">Ф</text>
-  </key>
-  <key keycode="39" name="AC02">
-    <text category="letter">і</text>
-    <text category="letter">І</text>
-  </key>
-  <key keycode="40" name="AC03">
-    <text category="letter">в</text>
-    <text category="letter">В</text>
-  </key>
-  <key keycode="41" name="AC04">
-    <text category="letter">а</text>
-    <text category="letter">А</text>
-  </key>
-  <key keycode="42" name="AC05">
-    <text category="letter">п</text>
-    <text category="letter">П</text>
-  </key>
-  <key keycode="43" name="AC06">
-    <text category="letter">р</text>
-    <text category="letter">Р</text>
-  </key>
-  <key keycode="44" name="AC07">
-    <text category="letter">о</text>
-    <text category="letter">О</text>
-  </key>
-  <key keycode="45" name="AC08">
-    <text category="letter">л</text>
-    <text category="letter">Л</text>
-  </key>
-  <key keycode="46" name="AC09">
-    <text category="letter">д</text>
-    <text category="letter">Д</text>
-  </key>
-  <key keycode="47" name="AC10">
-    <text category="letter">ж</text>
-    <text category="letter">Ж</text>
-  </key>
-  <key keycode="48" name="AC11">
-    <keysym keyval="39">quoteright</keysym>
-    <text category="letter">Є</text>
-  </key>
-  <key keycode="52" name="AB01">
-    <text category="letter">я</text>
-    <text category="letter">Я</text>
-  </key>
-  <key keycode="53" name="AB02">
-    <text category="letter">ч</text>
-    <text category="letter">Ч</text>
-  </key>
-  <key keycode="54" name="AB03">
-    <text category="letter">с</text>
-    <text category="letter">С</text>
-  </key>
-  <key keycode="55" name="AB04">
-    <text category="letter">м</text>
-    <text category="letter">М</text>
-  </key>
-  <key keycode="56" name="AB05">
-    <text category="letter">и</text>
-    <text category="letter">И</text>
-  </key>
-  <key keycode="57" name="AB06">
-    <text category="letter">т</text>
-    <text category="letter">Т</text>
-  </key>
-  <key keycode="58" name="AB07">
-    <text category="letter">ь</text>
-    <text category="letter">Ь</text>
-  </key>
-  <key keycode="59" name="AB08">
-    <text category="letter">б</text>
-    <text category="letter">Б</text>
-  </key>
-  <key keycode="60" name="AB09">
-    <text category="letter">ю</text>
-    <text category="letter">Ю</text>
-  </key>
-  <key keycode="61" name="AB10">
-    <text category="letter">.</text>
-    <text category="letter">,</text>
-  </key>
-</symbols>
--- a/data/keyboards/symbols/ug.xml
+++ b/data/keyboards/symbols/ug.xml
@ -1,193 +0,0 @@
-<?xml version="1.0"?>
-<symbols version="0.90">
-  <include>us</include>
-  <key keycode="49" name="TLDE">
-    <keysym keyval="96">quoteleft</keysym>
-    <keysym keyval="126">asciitilde</keysym>
-  </key>
-  <key keycode="10" name="AE01">
-    <keysym keyval="49">1</keysym>
-    <keysym keyval="33">exclam</keysym>
-  </key>
-  <key keycode="11" name="AE02">
-    <keysym keyval="50">2</keysym>
-    <keysym keyval="64">at</keysym>
-  </key>
-  <key keycode="12" name="AE03">
-    <keysym keyval="51">3</keysym>
-    <keysym keyval="35">numbersign</keysym>
-  </key>
-  <key keycode="13" name="AE04">
-    <keysym keyval="52">4</keysym>
-    <keysym keyval="36">dollar</keysym>
-  </key>
-  <key keycode="14" name="AE05">
-    <keysym keyval="53">5</keysym>
-    <keysym keyval="37">percent</keysym>
-    <keysym keyval="8364">EuroSign</keysym>
-  </key>
-  <key keycode="15" name="AE06">
-    <keysym keyval="54">6</keysym>
-    <keysym keyval="94">asciicircum</keysym>
-  </key>
-  <key keycode="16" name="AE07">
-    <keysym keyval="55">7</keysym>
-    <keysym keyval="38">ampersand</keysym>
-  </key>
-  <key keycode="17" name="AE08">
-    <keysym keyval="56">8</keysym>
-    <keysym keyval="42">asterisk</keysym>
-  </key>
-  <key keycode="18" name="AE09">
-    <keysym keyval="57">9</keysym>
-    <keysym keyval="40">parenleft</keysym>
-  </key>
-  <key keycode="19" name="AE10">
-    <keysym keyval="48">0</keysym>
-    <keysym keyval="41">parenright</keysym>
-  </key>
-  <key keycode="20" name="AE11">
-    <keysym keyval="45">minus</keysym>
-    <text category="letter">—</text>
-  </key>
-  <key keycode="21" name="AE12">
-    <keysym keyval="61">equal</keysym>
-    <keysym keyval="43">plus</keysym>
-  </key>
-  <key keycode="24" name="AD01">
-    <text category="letter">چ</text>
-    <text category="letter">چ</text>
-  </key>
-  <key keycode="25" name="AD02">
-    <text category="letter">ۋ</text>
-    <text category="letter">ۋ</text>
-  </key>
-  <key keycode="26" name="AD03">
-    <text category="letter">ې</text>
-    <text category="letter">ې</text>
-  </key>
-  <key keycode="27" name="AD04">
-    <text category="letter">ر</text>
-    <text category="letter">ر</text>
-  </key>
-  <key keycode="28" name="AD05">
-    <text category="letter">ت</text>
-    <text category="letter">ت</text>
-  </key>
-  <key keycode="29" name="AD06">
-    <text category="letter">ي</text>
-    <text category="letter">ي</text>
-  </key>
-  <key keycode="30" name="AD07">
-    <text category="letter">ۇ</text>
-    <text category="letter">ۇ</text>
-  </key>
-  <key keycode="31" name="AD08">
-    <text category="letter">ڭ</text>
-    <text category="letter">ڭ</text>
-  </key>
-  <key keycode="32" name="AD09">
-    <text category="letter">و</text>
-    <text category="letter">و</text>
-  </key>
-  <key keycode="33" name="AD10">
-    <text category="letter">پ</text>
-    <text category="letter">پ</text>
-  </key>
-  <key keycode="34" name="AD11">
-    <keysym keyval="91">bracketleft</keysym>
-    <text category="letter">«</text>
-  </key>
-  <key keycode="35" name="AD12">
-    <keysym keyval="93">bracketright</keysym>
-    <text category="letter">»</text>
-  </key>
-  <key keycode="51" name="BKSL">
-    <keysym keyval="92">backslash</keysym>
-    <keysym keyval="124">bar</keysym>
-  </key>
-  <key keycode="38" name="AC01">
-    <text category="letter">ھ</text>
-    <text category="letter">ھ</text>
-  </key>
-  <key keycode="39" name="AC02">
-    <text category="letter">س</text>
-    <text category="letter">س</text>
-  </key>
-  <key keycode="40" name="AC03">
-    <text category="letter">د</text>
-    <text category="letter">ژ</text>
-  </key>
-  <key keycode="41" name="AC04">
-    <text category="letter">ا</text>
-    <text category="letter">ف</text>
-  </key>
-  <key keycode="42" name="AC05">
-    <text category="letter">ە</text>
-    <text category="letter">گ</text>
-  </key>
-  <key keycode="43" name="AC06">
-    <text category="letter">ى</text>
-    <text category="letter">خ</text>
-  </key>
-  <key keycode="44" name="AC07">
-    <text category="letter">ق</text>
-    <text category="letter">ج</text>
-  </key>
-  <key keycode="45" name="AC08">
-    <text category="letter">ك</text>
-    <text category="letter">ۆ</text>
-  </key>
-  <key keycode="46" name="AC09">
-    <text category="letter">ل</text>
-    <text category="letter">ل</text>
-  </key>
-  <key keycode="47" name="AC10">
-    <text category="letter">؛</text>
-    <keysym keyval="58">colon</keysym>
-  </key>
-  <key keycode="48" name="AC11">
-    <keysym keyval="39">quoteright</keysym>
-    <keysym keyval="34">quotedbl</keysym>
-  </key>
-  <key keycode="52" name="AB01">
-    <text category="letter">ز</text>
-    <text category="letter">ز</text>
-  </key>
-  <key keycode="53" name="AB02">
-    <text category="letter">ش</text>
-    <text category="letter">ش</text>
-  </key>
-  <key keycode="54" name="AB03">
-    <text category="letter">غ</text>
-    <text category="letter">غ</text>
-  </key>
-  <key keycode="55" name="AB04">
-    <text category="letter">ۈ</text>
-    <text category="letter">ۈ</text>
-  </key>
-  <key keycode="56" name="AB05">
-    <text category="letter">ب</text>
-    <text category="letter">ب</text>
-  </key>
-  <key keycode="57" name="AB06">
-    <text category="letter">ن</text>
-    <text category="letter">ن</text>
-  </key>
-  <key keycode="58" name="AB07">
-    <text category="letter">م</text>
-    <text category="letter">م</text>
-  </key>
-  <key keycode="59" name="AB08">
-    <text category="letter">،</text>
-    <text category="letter">‹</text>
-  </key>
-  <key keycode="60" name="AB09">
-    <keysym keyval="46">period</keysym>
-    <text category="letter">›</text>
-  </key>
-  <key keycode="61" name="AB10">
-    <text category="letter">ئ</text>
-    <text category="letter">؟</text>
-  </key>
-</symbols>
--- a/data/keyboards/symbols/zh-bopomofo.xml
+++ b/data/keyboards/symbols/zh-bopomofo.xml
@ -1,193 +0,0 @@
-<?xml version="1.0"?>
-<symbols version="0.90">
-  <include>us</include>
-  <key keycode="49" name="TLDE">
-    <keysym keyval="96">quoteleft</keysym>
-    <keysym keyval="126">asciitilde</keysym>
-  </key>
-  <key keycode="10" name="AE01">
-    <text category="letter">ㄅ</text>
-    <keysym keyval="33">exclam</keysym>
-  </key>
-  <key keycode="11" name="AE02">
-    <text category="letter">ㄉ</text>
-    <keysym keyval="64">at</keysym>
-  </key>
-  <key keycode="12" name="AE03">
-    <text category="letter">ˇ</text>
-    <keysym keyval="35">numbersign</keysym>
-  </key>
-  <key keycode="13" name="AE04">
-    <text category="letter">ˋ</text>
-    <keysym keyval="36">dollar</keysym>
-  </key>
-  <key keycode="14" name="AE05">
-    <text category="letter">ㄓ</text>
-    <keysym keyval="37">percent</keysym>
-    <keysym keyval="8364">EuroSign</keysym>
-  </key>
-  <key keycode="15" name="AE06">
-    <text category="letter">ˊ</text>
-    <keysym keyval="94">asciicircum</keysym>
-  </key>
-  <key keycode="16" name="AE07">
-    <text category="letter">˙</text>
-    <keysym keyval="38">ampersand</keysym>
-  </key>
-  <key keycode="17" name="AE08">
-    <text category="letter">ㄚ</text>
-    <keysym keyval="42">asterisk</keysym>
-  </key>
-  <key keycode="18" name="AE09">
-    <text category="letter">ㄞ</text>
-    <keysym keyval="40">parenleft</keysym>
-  </key>
-  <key keycode="19" name="AE10">
-    <text category="letter">ㄢ</text>
-    <keysym keyval="41">parenright</keysym>
-  </key>
-  <key keycode="20" name="AE11">
-    <text category="letter">ㄦ</text>
-    <keysym keyval="95">underscore</keysym>
-  </key>
-  <key keycode="21" name="AE12">
-    <keysym keyval="61">equal</keysym>
-    <keysym keyval="43">plus</keysym>
-  </key>
-  <key keycode="24" name="AD01">
-    <text category="letter">ㄆ</text>
-    <keysym keyval="81">Q</keysym>
-  </key>
-  <key keycode="25" name="AD02">
-    <text category="letter">ㄊ</text>
-    <keysym keyval="87">W</keysym>
-  </key>
-  <key keycode="26" name="AD03">
-    <text category="letter">ㄍ</text>
-    <keysym keyval="69">E</keysym>
-  </key>
-  <key keycode="27" name="AD04">
-    <text category="letter">ㄐ</text>
-    <keysym keyval="82">R</keysym>
-  </key>
-  <key keycode="28" name="AD05">
-    <text category="letter">ㄔ</text>
-    <keysym keyval="84">T</keysym>
-  </key>
-  <key keycode="29" name="AD06">
-    <text category="letter">ㄗ</text>
-    <keysym keyval="89">Y</keysym>
-  </key>
-  <key keycode="30" name="AD07">
-    <text category="letter">ㄧ</text>
-    <keysym keyval="85">U</keysym>
-  </key>
-  <key keycode="31" name="AD08">
-    <text category="letter">ㄛ</text>
-    <keysym keyval="73">I</keysym>
-  </key>
-  <key keycode="32" name="AD09">
-    <text category="letter">ㄟ</text>
-    <keysym keyval="79">O</keysym>
-  </key>
-  <key keycode="33" name="AD10">
-    <text category="letter">ㄣ</text>
-    <keysym keyval="80">P</keysym>
-  </key>
-  <key keycode="34" name="AD11">
-    <keysym keyval="91">bracketleft</keysym>
-    <keysym keyval="123">braceleft</keysym>
-  </key>
-  <key keycode="35" name="AD12">
-    <keysym keyval="93">bracketright</keysym>
-    <keysym keyval="125">braceright</keysym>
-  </key>
-  <key keycode="51" name="BKSL">
-    <keysym keyval="92">backslash</keysym>
-    <keysym keyval="124">bar</keysym>
-  </key>
-  <key keycode="38" name="AC01">
-    <text category="letter">ㄇ</text>
-    <keysym keyval="65">A</keysym>
-  </key>
-  <key keycode="39" name="AC02">
-    <text category="letter">ㄋ</text>
-    <keysym keyval="83">S</keysym>
-  </key>
-  <key keycode="40" name="AC03">
-    <text category="letter">ㄎ</text>
-    <keysym keyval="68">D</keysym>
-  </key>
-  <key keycode="41" name="AC04">
-    <text category="letter">ㄑ</text>
-    <keysym keyval="70">F</keysym>
-  </key>
-  <key keycode="42" name="AC05">
-    <text category="letter">ㄕ</text>
-    <keysym keyval="71">G</keysym>
-  </key>
-  <key keycode="43" name="AC06">
-    <text category="letter">ㄘ</text>
-    <keysym keyval="72">H</keysym>
-  </key>
-  <key keycode="44" name="AC07">
-    <text category="letter">ㄨ</text>
-    <keysym keyval="74">J</keysym>
-  </key>
-  <key keycode="45" name="AC08">
-    <text category="letter">ㄜ</text>
-    <keysym keyval="75">K</keysym>
-  </key>
-  <key keycode="46" name="AC09">
-    <text category="letter">ㄠ</text>
-    <keysym keyval="76">L</keysym>
-  </key>
-  <key keycode="47" name="AC10">
-    <text category="letter">ㄤ</text>
-    <keysym keyval="58">colon</keysym>
-  </key>
-  <key keycode="48" name="AC11">
-    <keysym keyval="39">quoteright</keysym>
-    <keysym keyval="34">quotedbl</keysym>
-  </key>
-  <key keycode="52" name="AB01">
-    <text category="letter">ㄈ</text>
-    <keysym keyval="90">Z</keysym>
-  </key>
-  <key keycode="53" name="AB02">
-    <text category="letter">ㄌ</text>
-    <keysym keyval="88">X</keysym>
-  </key>
-  <key keycode="54" name="AB03">
-    <text category="letter">ㄏ</text>
-    <keysym keyval="67">C</keysym>
-  </key>
-  <key keycode="55" name="AB04">
-    <text category="letter">ㄒ</text>
-    <keysym keyval="86">V</keysym>
-  </key>
-  <key keycode="56" name="AB05">
-    <text category="letter">ㄖ</text>
-    <keysym keyval="66">B</keysym>
-  </key>
-  <key keycode="57" name="AB06">
-    <text category="letter">ㄙ</text>
-    <keysym keyval="78">N</keysym>
-  </key>
-  <key keycode="58" name="AB07">
-    <text category="letter">ㄩ</text>
-    <keysym keyval="77">M</keysym>
-  </key>
-  <key keycode="59" name="AB08">
-    <text category="letter">ㄝ</text>
-    <keysym keyval="60">less</keysym>
-  </key>
-  <key keycode="60" name="AB09">
-    <text category="letter">ㄡ</text>
-    <keysym keyval="62">greater</keysym>
-  </key>
-  <key keycode="61" name="AB10">
-    <text category="letter">ㄥ</text>
-    <keysym keyval="63">question</keysym>
-  </key>
-</symbols>
--- a/data/keyboards/us.yaml
+++ b/data/keyboards/us.yaml
@ -1,17 +1,10 @@
 ---
-bounds: { x: 0, y: 1, width: 360, height: 208 }
-
 outlines:
-    default:
-        bounds: { x: 0, y: 0, width: 35.33, height: 52 }
-    altline:
-        bounds: { x: 0, y: 0, width: 52.67, height: 52 }
-    wide:
-        bounds: { x: 0, y: 0, width: 62, height: 52 }
-    spaceline:
-        bounds: { x: 0, y: 0, width: 142, height: 52 }
-    special:
-        bounds: { x: 0, y: 0, width: 44, height: 52 }
+    default: { width: 35.33, height: 52 }
+    altline: { width: 52.67, height: 52 }
+    wide: { width: 62, height: 52 }
+    spaceline: { width: 142, height: 52 }
+    special: { width: 44, height: 52 }

 views:
    base:
@ -46,6 +39,7 @@ buttons:
    BackSpace:
        outline: "altline"
        icon: "edit-clear-symbolic"
+        keysym: "BackSpace"
    preferences:
        action: "show_prefs"
        outline: "special"
@ -72,14 +66,13 @@ buttons:
        label: "*/="
    period:
        outline: "special"
-        label: "."
+        text: "."
    space:
        outline: "spaceline"
-        label: " "
+        text: " "
    Return:
        outline: "wide"
        icon: "key-enter"
+        keysym: "Return"
    colon:
-        label: ":"
-    "\"":
-        keysym: "quotedbl"
+        text: ":"
--- a/data/keyboards/us_wide.yaml
+++ b/data/keyboards/us_wide.yaml
@ -1,39 +1,32 @@
 ---
-bounds: { x: 0, y: 1, width: 540, height: 168 }
-
 outlines:
-    default:
-        bounds: { x: 0, y: 0, width: 54, height: 42 }
-    altline:
-        bounds: { x: 0, y: 0, width: 81, height: 42 }
-    wide:
-        bounds: { x: 0, y: 0, width: 108, height: 42 }
-    spaceline:
-        bounds: { x: 0, y: 0, width: 216, height: 42 }
-    special:
-        bounds: { x: 0, y: 0, width: 54, height: 42 }
+    default: { width: 54, height: 42 }
+    altline: { width: 81, height: 42 }
+    wide: { width: 108, height: 42 }
+    spaceline: { width: 216, height: 42 }
+    special: { width: 54, height: 42 }

 views:
    base:
        - "q w e r t y u i o p"
        - "a s d f g h j k l"
        - "Shift_L   z x c v b n m  BackSpace"
-        - "show_numbers preferences         space        period Return"
+        - "show_numbers preferences         space        . Return"
    upper:
        - "Q W E R T Y U I O P"
        - "A S D F G H J K L"
        - "Shift_L   Z X C V B N M  BackSpace"
-        - "show_numbers preferences         space        period Return"
+        - "show_numbers preferences         space        . Return"
    numbers:
        - "1 2 3 4 5 6 7 8 9 0"
        - "@ # $ % & - _ + ( )"
        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
-        - "show_letters preferences         space        period Return"
+        - "show_letters preferences         space        . Return"
    symbols:
        - "~ ` | · √ π τ ÷ × ¶"
        - "© ® £ € ¥ ^ ° * { }"
        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        period Return"
+        - "show_letters preferences         space        . Return"

 buttons:
    Shift_L:
@ -46,6 +39,7 @@ buttons:
    BackSpace:
        outline: "altline"
        icon: "edit-clear-symbolic"
+        keysym: "BackSpace"
    preferences:
        action: "show_prefs"
        outline: "special"
@ -70,16 +64,15 @@ buttons:
            set_view: "symbols"
        outline: "altline"
        label: "*/="
-    period:
+    ".":
        outline: "special"
-        label: "."
+        text: "."
    space:
        outline: "spaceline"
-        label: " "
+        text: " "
    Return:
        outline: "wide"
        icon: "key-enter"
+        keysym: "Return"
    colon:
-        label: ":"
-    "\"":
-        keysym: "quotedbl"
+        text: ":"
--- a/data/langs/de-DE.txt
+++ b/data/langs/de-DE.txt
@ -0,0 +1,8 @@
+us Englisch (US)
+de Deutsch
+el Griechisch
+es Spanisch
+it Italienisch
+jp+kana Japanisch (Kana)
+no Norwegisch
+
--- a/data/langs/en-US.txt
+++ b/data/langs/en-US.txt
@ -0,0 +1,10 @@
+us English (US)
+de German
+el Greek
+es Spanish
+fi Finnish
+it Italian
+jp+kana Japanese (kana)
+no Norwegian
+se Swedish
+
--- a/data/langs/es-ES.txt
+++ b/data/langs/es-ES.txt
@ -0,0 +1,7 @@
+us Inglés (EE.UU.)
+de Alemán
+el Griego
+es Español
+it Italiano
+jp+kana Japonés (Kana)
+no Noruego
--- a/data/langs/ja-JP.txt
+++ b/data/langs/ja-JP.txt
@ -0,0 +1,8 @@
+us 英語 (US)
+de ドイツ語
+el ギリシャ語
+es スペイン語
+it イタリア語
+jp+kana 日本語 (かな)
+nb ノルウェー語
+
--- a/data/langs/pl-PL.txt
+++ b/data/langs/pl-PL.txt
@ -0,0 +1,9 @@
+us angielski (USA)
+de niemiecki
+el grecki
+es hiszpański
+fi fiński
+it włoski
+jp+kana japoński (kana)
+no norweski
+se szwedzki
--- a/data/popup.ui
+++ b/data/popup.ui
@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.22.1 -->
+<interface>
+  <requires lib="gtk+" version="3.16"/>
+  <object class="GtkPopoverMenu" id="main_menu">
+    <property name="can_focus">False</property>
+    <child>
+      <object class="GtkBox" id="box">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+      </object>
+      <packing>
+        <property name="submenu">main</property>
+        <property name="position">1</property>
+      </packing>
+    </child>
+  </object>
+</interface>
--- a/data/sm.puri.Squeekboard.desktop.in
+++ b/data/sm.puri.Squeekboard.desktop.in
@ -3,7 +3,6 @@ Name=Squeekboard
 GenericName=Squeekboard Virtual Keyboard
 Comment=Virtual Keyboard
 Exec=squeekboard
-Icon=squeekboard
 Terminal=false
 Type=Application
 NoDisplay=true
--- a/data/squeekboard.gresources.xml
+++ b/data/squeekboard.gresources.xml
@ -2,33 +2,8 @@
 <gresources>
  <gresource prefix="/sm/puri/squeekboard">
   <file compressed="true">style.css</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/ar.xml</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/as-inscript.xml</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/be.xml</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/bn-inscript.xml</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/fa.xml</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/gu-inscript.xml</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/he.xml</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/hi-inscript.xml</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/ja-kana.xml</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/kk.xml</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/kn-inscript.xml</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/ks-inscript.xml</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/ks.xml</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/mai-inscript.xml</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/ml-inscript.xml</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/mr-inscript.xml</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/my.xml</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/or-inscript.xml</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/pa-inscript.xml</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/ru.xml</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/sd-inscript.xml</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/ta-inscript.xml</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/te-inscript.xml</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/th.xml</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/ua.xml</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/ug.xml</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/zh-bopomofo.xml</file>
+   <file compressed="true">style-Adwaita:dark.css</file>
+   <file compressed="true" preprocess="xml-stripblanks">popup.ui</file>
   <file>icons/key-enter.svg</file>
   <file>icons/key-shift.svg</file>
   <file>icons/keyboard-mode-symbolic.svg</file>
--- a/data/style-Adwaita:dark.css
+++ b/data/style-Adwaita:dark.css
@ -0,0 +1,46 @@
+sq_view {
+    background-color: rgba(0, 0, 0, 255);
+    color: #ffffff;
+    font-family: cantarell, sans-serif;
+}
+
+sq_view sq_button {
+    color: #deddda;
+    background: #464448;
+    border-style: solid;
+    border-width: 1px;
+    border-color: #5e5c64;
+    border-radius: 3px;
+    margin: 4px 2px 4px 2px;
+}
+
+sq_view.wide sq_button {
+    margin: 1px 1px 1px 1px;
+}
+
+sq_button:active {
+    background: #747077;
+    border-color: #96949d;
+}
+
+sq_button.altline,
+sq_button.special,
+sq_button.wide {
+    background: #2b292f;
+    border-color: #3e3a44;
+}
+
+sq_button.locked {
+    background: #ffffff;
+    color: #2b292f;
+}
+
+#Return {
+    background: #1c71d8;
+    border-color: #1a5fb4;
+}
+
+#Return:active {
+    background: #1c71d8;
+    border-color: #3584e4;
+}
--- a/data/style.css
+++ b/data/style.css
@ -1,15 +1,15 @@
 sq_view {
-    background-color: rgba(0, 0, 0, 255);
-    color: #ffffff;
+    background-color: @theme_base_color; /*rgba(0, 0, 0, 255);*/
+    color: @theme_text_color; /*#ffffff;*/
    font-family: cantarell, sans-serif;
 }

 sq_view sq_button {
-    color: #deddda;
-    background: #464448;
+    color: @theme_fg_color; /*#deddda;*/
+    background: mix(@theme_bg_color, @theme_base_color, -0.5); /* #464448; */
    border-style: solid;
    border-width: 1px;
-    border-color: #5e5c64;
+    border-color: @borders; /* #5e5c64;*/
    border-radius: 3px;
    margin: 4px 2px 4px 2px;
 }
@ -18,29 +18,32 @@ sq_view.wide sq_button {
    margin: 1px 1px 1px 1px;
 }

-sq_button:active {
-    background: #747077;
-    border-color: #96949d;
+sq_button:active,
+sq_button.altline:active,
+sq_button.special:active,
+sq_button.wide:active {
+    background: mix(@theme_bg_color, @theme_selected_bg_color, 0.4);/* #747077; */
+    border-color: mix(@borders, @theme_selected_fg_color, 0.5);/* #96949d; */
 }

 sq_button.altline,
 sq_button.special,
 sq_button.wide {
-    background: #2b292f;
-    border-color: #3e3a44;
+    background: mix(@theme_bg_color, @theme_base_color, 0.5); /*#2b292f;*/
+    border-color: @borders; /* #3e3a44; */
 }

 sq_button.locked {
-    background: #ffffff;
-    color: #2b292f;
+    background: @theme_fg_color; /*#ffffff;*/
+    color: @theme_bg_color; /*#2b292f;*/
 }

 #Return {
-    background: #1c71d8;
-    border-color: #1a5fb4;
+    background: @theme_selected_bg_color; /* #1c71d8; */
+    border-color: @borders; /*#1a5fb4;*/
 }

 #Return:active {
-    background: #1c71d8;
-    border-color: #3584e4;
+    background: mix(@theme_selected_bg_color, @theme_bg_color, 0.4); /*#1c71d8;*/
+    border-color: @borders; /*#3584e4;*/
 }
--- a/dco.txt
+++ b/dco.txt
@ -0,0 +1,39 @@
+Developer Certificate of Origin
+Version 1.1
+
+Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
+1 Letterman Drive
+Suite D4700
+San Francisco, CA, 94129
+
+Everyone is permitted to copy and distribute verbatim copies of this
+license document, but changing it is not allowed.
+
+
+Developer's Certificate of Origin 1.1
+
+By making a contribution to this project, I certify that:
+
+(a) The contribution was created in whole or in part by me and I
+    have the right to submit it under the open source license
+    indicated in the file; or
+
+(b) The contribution is based upon previous work that, to the best
+    of my knowledge, is covered under an appropriate open source
+    license and I have the right under that license to submit that
+    work with modifications, whether created in whole or in part
+    by me, under the same open source license (unless I am
+    permitted to submit under a different license), as indicated
+    in the file; or
+
+(c) The contribution was provided directly to me by some other
+    person who certified (a), (b) or (c) and I have not modified
+    it.
+
+(d) I understand and agree that this project and the contribution
+    are public and that a record of the contribution (including all
+    personal information I submit with it, including my sign-off) is
+    maintained indefinitely and may be redistributed consistent with
+    this project or the open source license(s) involved.
+
+
--- a/debian/changelog
+++ b/debian/changelog
@ -1,3 +1,99 @@
+squeekboard (1.6.0) UNRELEASED; urgency=medium
+
+  [ Dorota Czaplejewicz ]
+  * tools: Move entry.py
+  * build: Move building of squeekboard-test-layout to tools
+  * packaging: Install entty.py as squeekboard-entry
+  * Remove unused build dependencies
+  * Remove unused header generator
+  * logging: Move all facilities to one file
+  * logging: Described the design
+  * logging: Add described log levels
+  * popover: Install emoji layout
+  * popover: Show overlays as selected
+  * Fix old Rust woes
+  * emoji: Add a passable layout
+  * Fix g_ and stdlib allocation/free mismatches
+
+ -- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>  Thu, 02 Jan 2020 12:02:50 +0000
+ 
+squeekboard (1.5.0) amber-phone; urgency=medium
+
+  [ Dorota Czaplejewicz ]
+  * keycodes: Sort to eliminate runtime indeterminism
+  * switcher: Switch layout on menu item click
+  * Drop squeek_key
+  * renderer: Remove some unneeded vars
+  * renderer: Simplified outline rendering
+  * renderer: Drop row from button rendering
+  * renderer: Drop unused params
+  * renderer: Simplify surface rendering
+  * rendering: Simplify Cairo context usage, remove unneeded calls.
+  * rendering: Remove unneeded redraw after button release
+  * renderer: Remove unused locked key render function
+  * renderer: Simply cut off when painting outside bounds
+  * renderer: Render whole keyboard the same way as pressed buttons
+
+  [ Mark Müller ]
+  * layout: add German wide layout
+
+  [ Dorota Czaplejewicz ]
+  * renderer: Remove unused functions
+  * cleanup: Remove references to squeek_view
+  * cleanup: Unbox View and Row
+  * cleanup: Remove unused single frame draw
+  * positioning: Calculate sizes instead of storing, move position out of widgets
+  * positioning: Clean up unused code
+  * Fix old Rust woes
+
+  [ Mark Müller ]
+  * layout: add Japanese Kana wide layout
+
+  [ Dorota Czaplejewicz ]
+  * Entry test: Add Terminal input purpose
+  * readme: Add note about Cargo dependencies
+  * Create a library/UI module separation
+  * hacking: Add DCO and licensing requirement
+  * Fix internal .md link
+
+  [ Mark Müller ]
+  * squeekboard-test-layout: add argument parsing and some more output
+
+  [ Dorota Czaplejewicz ]
+  * Use clap in the lockfile
+  * parsing: Remove bounds which weren't used anyway
+  * layout: Respect margins
+  * CI: Build arm64 .deb
+
+ -- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>  Mon, 23 Dec 2019 11:58:57 +0000
+
+squeekboard (1.4.0) amber-phone; urgency=medium
+
+  * "text" property in layouts
+  * Adjusts to user's color scheme
+
+ -- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>  Mon, 02 Dec 2019 19:37:01 +0000
+
+squeekboard (1.3.2) amber-phone; urgency=medium
+
+  * Make sure all key presses get accepted by the compositor
+
+ -- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>  Tue, 26 Nov 2019 15:36:27 +0000
+
+squeekboard (1.3.1) amber-phone; urgency=medium
+
+  * Update and fix layouts and languages
+  * Make tests less likely to fail
+
+ -- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>  Wed, 20 Nov 2019 22:10:48 +0000
+
+squeekboard (1.3.0) amber-phone; urgency=medium
+
+  * Language selection popup
+  * Swedish and Finnish layouts
+
+ -- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>  Sat, 16 Nov 2019 15:38:14 +0000
+
 squeekboard (1.2.2) amber-phone; urgency=medium

  * Landscape mode
--- a/debian/control
+++ b/debian/control
@ -12,23 +12,42 @@ Build-Depends:
 libgtk-3-dev,
 libcroco3-dev,
 librust-bitflags-1-dev (>= 1.0),
+ librust-clap-2+default-dev (>= 2.32),
+ librust-gio+v2-44-dev,
+ librust-glib+v2-44-dev,
+ librust-glib-sys-dev,
+ librust-gtk+v3-22-dev (>= 0.5),
+ librust-gtk-sys-dev,
 librust-maplit-1-dev (>= 1.0),
+ librust-regex-1-dev (>= 1.1),
 librust-serde-derive-1-dev (>= 1.0),
 librust-serde-yaml-0.8-dev (>= 0.8),
 librust-xkbcommon-0.4+wayland-dev (>= 0.4),
 libwayland-dev (>= 1.16),
 rustc,
 wayland-protocols (>= 1.14),
-# for running the tests
- xvfb,
- xauth,
 Standards-Version: 4.1.3
 Homepage: https://source.puri.sm/Librem5/squeekboard

 Package: squeekboard
 Architecture: linux-any
 Depends:
+# for the Adwaita-dark theme
+ gnome-themes-extra-data,
 ${shlibs:Depends}
 ${misc:Depends}
 Description: On-screen keyboard for Wayland
 Virtual keyboard supporting Wayland, built primarily for the Librem 5 phone.
+
+Package: squeekboard-devel
+Architecture: linux-any
+Depends:
+ python3,
+ python3-gi,
+ ${shlibs:Depends}
+ ${misc:Depends}
+Description: Resources for making Squeekboard layouts
+ Tools for creating and testing Squeekboard layouts:
+ .
+  * squeekboard-entry
+  * squeekboard-test-layout
--- a/debian/copyright
+++ b/debian/copyright
@ -8,6 +8,83 @@ Copyright: 2010-2011 Daiki Ueno <ueno@unixuser.org>
           2019 Purism SPC
 License: GPL-3+

+Files: cargo.sh
+Copyright: 2019 Bart Ribbers <bribbers@disroot.org>
+           2019 Purism SPC
+License: GPL-3+
+
+Files: data/style.css
+       data/squeekboard.gresources.xml
+       data/meson.build
+       src/meson.build
+       src/imservice.c
+Copyright: 2019 Purism SPC
+           2019 Squeekboard Contributors
+License: GPL-3+
+
+Files: data/keyboards/de.yaml
+Copyright: 2019 Mark Müller <markmueller86@gmail.com>
+License: GPL-3+
+
+Files: data/keyboards/el.yaml
+Copyright: 2019 Antonis Tsolomitis
+           2019 Purism SPC
+License: GPL-3+
+
+Files: data/keyboards/es.yaml
+Copyright: 2019 Purism SPC
+           2019 uzanto <miguejim@mailbox.org>
+License: GPL-3+
+
+Files: data/keyboards/fi.yaml
+Copyright: 2019 uzanto <miguejim@mailbox.org>
+License: GPL-3+
+
+Files: data/keyboards/it.yaml
+Copyright: 2019 Antonio Pandolfo <ant.pandolfo@gmail.com>
+           2019 Purism SPC
+License: GPL-3+
+
+Files: data/keyboards/ja+kana.yaml
+Copyright: 2019 Mark Müller <markmueller86@gmail.com>
+License: GPL-3+
+
+Files: data/keyboards/se.yaml
+Copyright: 2019 Andreas Rönnquist <andreas@ronnquist.net>
+           2019 Purism SPC
+License: GPL-3+
+
+Files: eek/eek-layout.h
+       eek/eek-layout.c
+       eek/eek-element.c
+       eek/eek-gtk-keyboard.c
+       eek/eek-gtk-keyboard.h
+       eek/eek.c
+       eek/eek-xml-layout.h
+       eek/eek-xml-layout.c
+       eek/eek-renderer.h
+       eek/eek-element.h
+       eek/eek-renderer.c
+       eekboard/eekboard-service.c
+       eekboard/eekboard-service.h
+Copyright: 2010-2011 Daiki Ueno <ueno@unixuser.org>
+           2010-2011 Red Hat, Inc.
+           2018-2019 Purism SPC
+           2019 Squeekboard Contributors
+License: GPL-3+
+
+Files: eek/eek-keyboard.c
+       eek/eek-types.h
+       eek/eek-types.c
+       eek/eek-keyboard.h
+       eek/eek.h
+       src/server-main.c
+       src/server-context-service.h
+Copyright: 2010-2011 Daiki Ueno <ueno@unixuser.org>
+           2010-2011 Red Hat, Inc.
+           2019 Purism SPC
+License: LGPL-2+
+
 Files: eek/layersurface.c
       src/wayland.c
       src/key-emitter.c
@ -21,39 +98,51 @@ Files: eekboard/keymap.c
 Copyright: 2000 Red Hat, Inc.
           2019 Purism, SPC
 License: LGPL-2+
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.

- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.         See the GNU
- Lesser General Public License for more details.
+Files: eekboard/eekboard-context-service.c
+Copyright: 2010-2011 Daiki Ueno <ueno@unixuser.org>
+           2010-2011 Red Hat, Inc.
+           2019 Purism, SPC
+           2019 David Heidelberg <david@ixit.cz>
+           2019 Piotr Tworek <tworaz@tworaz.net>
+           2019 Squeekboard Contributors
+License: GPL-3+

- You should have received a copy of the GNU Lesser General Public
- License along with this library. If not, see <http://www.gnu.org/licenses/>.
+Files: eekboard/eekboard-context-service.h
+Copyright: 2010-2011 Daiki Ueno <ueno@unixuser.org>
+           2010-2011 Red Hat, Inc.
+License: GPL-3+
+
+Files: po/POTFILES.skip
+       po/LINGUAS
+       po/ja.po
+       po/POTFILES.in
+Copyright: 2010-2011 Daiki Ueno <ueno@unixuser.org>
+License: LGPL-2+
+Comment:
+ Only the po/ja.po file contains a license, but these are all grouped together.

 Files: protocols/wlr-layer-shell-unstable-v1.xml
-Copytight: Copyright © 2017 Drew DeVault
+Copyright: 2017 Drew DeVault
 License: X11
- Permission to use, copy, modify, distribute, and sell this software and
- its documentation for any purpose is hereby granted without fee, provided
- that the above copyright notice appear in all copies and fthat both that
- copyright notice and this permission notice appear in supporting
- documentation, and that the name of the copyright holders not be used in
- advertising or publicity pertaining to distribution of the software
- without specific, written prior permission.  The copyright holders make
- no representations about the suitability of this software for any
- purpose.  It is provided "as is" without express or implied warranty.
- .
- THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
- SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
- FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
- SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
- RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
- CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+Files: src/resources.rs
+Copyright: 2019 Andreas Rönnquist <andreas@ronnquist.net>
+           2019 Mark Müller <markmueller86@gmail.com>
+           2019 Purism SPC
+License: GPL-3+
+
+Files: src/server-context-service.c
+Copyright: 2010-2011 Daiki Ueno <ueno@unixuser.org>
+           2010-2011 Red Hat, Inc.
+           2019 Purism SPC
+           2019 Squeekboard Contributors
+License: GPL-3+
+
+Files: tests/meson.build
+Copyright: 2019 Purism SPC
+           2019 Mark Müller <markmueller86@gmail.com>
+License: GPL-3+

 License: GPL-3+
 This package is free software; you can redistribute it and/or modify
@ -71,3 +160,36 @@ License: GPL-3+
 .
 On Debian systems, the complete text of the GNU General
 Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
+
+License: LGPL-2+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+ .
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.         See the GNU
+ Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library. If not, see <http://www.gnu.org/licenses/>.
+
+License: X11
+ Permission to use, copy, modify, distribute, and sell this software and
+ its documentation for any purpose is hereby granted without fee, provided
+ that the above copyright notice appear in all copies and that both that
+ copyright notice and this permission notice appear in supporting
+ documentation, and that the name of the copyright holders not be used in
+ advertising or publicity pertaining to distribution of the software
+ without specific, written prior permission.  The copyright holders make
+ no representations about the suitability of this software for any
+ purpose.  It is provided "as is" without express or implied warranty.
+ .
+ THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
+ SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
+ RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
+ CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
--- a/debian/squeekboard-devel.install
+++ b/debian/squeekboard-devel.install
@ -0,0 +1,2 @@
+usr/bin/squeekboard-test-layout /usr/bin
+usr/bin/squeekboard-entry /usr/bin
--- a/debian/squeekboard.install
+++ b/debian/squeekboard.install
@ -0,0 +1,2 @@
+tools/squeekboard-restyled usr/bin
+usr/bin/squeekboard /usr/bin
--- a/eek/eek-0.90.pc.in
+++ b/eek/eek-0.90.pc.in
@ -1,30 +0,0 @@
-# Copyright (C) 2010-2011 Daiki Ueno <ueno@unixuser.org>
-# Copyright (C) 2010-2011 Red Hat, Inc.
-
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public License
-# as published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
-
-# This library is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301 USA
-
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: EEK
-Description: A Library to Create Keyboard-like UI
-URL: http://fedorahosted.org/eekboard/
-Version: @VERSION@
-Requires: gobject-2.0 gio-2.0
-Libs: -L${libdir} -leek
-Cflags: -I${includedir}/eek-@EEK_API_VERSION@
--- a/eek/eek-enumtypes.c.template
+++ b/eek/eek-enumtypes.c.template
@ -1,36 +0,0 @@
-/*** BEGIN file-header ***/
-#include "eek.h"
-
-/*** END file-header ***/
-
-/*** BEGIN file-production ***/
-/* enumerations from "@filename@" */
-/*** END file-production ***/
-
-/*** BEGIN value-header ***/
-GType
-@enum_name@_get_type (void)
-{
-  static volatile gsize g_define_type_id__volatile = 0;
-
-  if (g_once_init_enter (&g_define_type_id__volatile))
-    {
-      static const G@Type@Value values[] = {
-/*** END value-header ***/
-
-/*** BEGIN value-production ***/
-        { @VALUENAME@, "@VALUENAME@", "@valuenick@" },
-/*** END value-production ***/
-
-/*** BEGIN value-tail ***/
-        { 0, NULL, NULL }
-      };
-      GType g_define_type_id =
-        g_@type@_register_static (g_intern_static_string ("@EnumName@"), values);
-      g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
-    }
-
-  return g_define_type_id__volatile;
-}
-
-/*** END value-tail ***/
--- a/eek/eek-enumtypes.h.template
+++ b/eek/eek-enumtypes.h.template
@ -1,29 +0,0 @@
-/*** BEGIN file-header ***/
-
-#if !defined(__EEK_H_INSIDE__) && !defined(EEK_COMPILATION)
-#error "Only <eek/eek.h> can be included directly."
-#endif
-
-#ifndef __EEK_ENUMTYPES_H__
-#define __EEK_ENUMTYPES_H__
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-/*** END file-header ***/
-
-/*** BEGIN file-production ***/
-
-/* enumerations from "@filename@" */
-/*** END file-production ***/
-
-/*** BEGIN value-header ***/
-GType @enum_name@_get_type (void) G_GNUC_CONST;
-#define @ENUMPREFIX@_TYPE_@ENUMSHORT@ (@enum_name@_get_type ())
-/*** END value-header ***/
-
-/*** BEGIN file-tail ***/
-G_END_DECLS
-
-#endif /* __EEK_ENUMTYPES_H__ */
-/*** END file-tail ***/
--- a/eek/eek-gtk-0.90.pc.in
+++ b/eek/eek-gtk-0.90.pc.in
@ -1,30 +0,0 @@
-# Copyright (C) 2010-2011 Daiki Ueno <ueno@unixuser.org>
-# Copyright (C) 2010-2011 Red Hat, Inc.
-
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public License
-# as published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
-
-# This library is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301 USA
-
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: libeek-gtk
-Description: A Library to Create Keyboard-like UI (GTK Support)
-URL: http://fedorahosted.org/eekboard/
-Version: @VERSION@
-Requires: eek-@EEK_API_VERSION@ gtk+-@GTK_API_VERSION@
-Libs: -L${libdir} -leek-gtk
-Cflags: -I${includedir}/eek-@EEK_API_VERSION@
--- a/eek/eek-gtk-keyboard.c
+++ b/eek/eek-gtk-keyboard.c
@ -54,17 +54,13 @@ enum {
 typedef struct _EekGtkKeyboardPrivate
 {
    EekRenderer *renderer;
-    LevelKeyboard *keyboard;
+    LevelKeyboard *keyboard; // unowned reference; it's kept in server-context (FIXME)

    GdkEventSequence *sequence; // unowned reference
 } EekGtkKeyboardPrivate;

 G_DEFINE_TYPE_WITH_PRIVATE (EekGtkKeyboard, eek_gtk_keyboard, GTK_TYPE_DRAWING_AREA)

-static void       render_pressed_button      (GtkWidget *widget, struct button_place *place);
-static void       render_released_button     (GtkWidget *widget,
-                                              const struct squeek_button *button);
-
 static void
 eek_gtk_keyboard_real_realize (GtkWidget      *self)
 {
@ -85,7 +81,7 @@ eek_gtk_keyboard_real_draw (GtkWidget *self,
                            cairo_t   *cr)
 {
    EekGtkKeyboardPrivate *priv =
-	    eek_gtk_keyboard_get_instance_private (EEK_GTK_KEYBOARD (self));
+        eek_gtk_keyboard_get_instance_private (EEK_GTK_KEYBOARD (self));
    GtkAllocation allocation;
    gtk_widget_get_allocation (self, &allocation);

@ -101,10 +97,7 @@ eek_gtk_keyboard_real_draw (GtkWidget *self,
                                       gtk_widget_get_scale_factor (self));
    }

-    // render the keyboard without any key activity (TODO: from a cached buffer)
    eek_renderer_render_keyboard (priv->renderer, cr);
-    // render only a few remaining changes
-    squeek_layout_draw_all_changed(priv->keyboard->layout, EEK_GTK_KEYBOARD(self));
    return FALSE;
 }

@ -113,7 +106,7 @@ eek_gtk_keyboard_real_size_allocate (GtkWidget     *self,
                                     GtkAllocation *allocation)
 {
    EekGtkKeyboardPrivate *priv =
-	    eek_gtk_keyboard_get_instance_private (EEK_GTK_KEYBOARD (self));
+        eek_gtk_keyboard_get_instance_private (EEK_GTK_KEYBOARD (self));

    if (priv->renderer)
        eek_renderer_set_allocation_size (priv->renderer,
@ -138,14 +131,17 @@ static void drag(EekGtkKeyboard *self,
 {
    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
    squeek_layout_drag(priv->keyboard->layout, priv->keyboard->manager->virtual_keyboard,
-                       x, y, eek_renderer_get_transformation(priv->renderer), time, self);
+                       x, y, eek_renderer_get_transformation(priv->renderer), time,
+                       priv->keyboard->manager, self);
 }

 static void release(EekGtkKeyboard *self, guint32 time)
 {
    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);

-    squeek_layout_release(priv->keyboard->layout, priv->keyboard->manager->virtual_keyboard, time, self);
+    squeek_layout_release(priv->keyboard->layout, priv->keyboard->manager->virtual_keyboard,
+                          eek_renderer_get_transformation(priv->renderer), time,
+                          priv->keyboard->manager, self);
 }

 static gboolean
@ -170,6 +166,18 @@ eek_gtk_keyboard_real_button_release_event (GtkWidget      *self,
    return TRUE;
 }

+static gboolean
+eek_gtk_keyboard_leave_event (GtkWidget      *self,
+                              GdkEventCrossing *event)
+{
+    if (event->type == GDK_LEAVE_NOTIFY) {
+        // TODO: can the event have different coords than the previous move event?
+        release(EEK_GTK_KEYBOARD(self), event->time);
+    }
+    return TRUE;
+}
+
+
 static gboolean
 eek_gtk_keyboard_real_motion_notify_event (GtkWidget      *self,
                                           GdkEventMotion *event)
@ -217,7 +225,7 @@ static void
 eek_gtk_keyboard_real_unmap (GtkWidget *self)
 {
    EekGtkKeyboardPrivate *priv =
-	    eek_gtk_keyboard_get_instance_private (EEK_GTK_KEYBOARD (self));
+        eek_gtk_keyboard_get_instance_private (EEK_GTK_KEYBOARD (self));

    if (priv->keyboard) {
        squeek_layout_release_all_only(
@ -234,6 +242,7 @@ eek_gtk_keyboard_set_property (GObject      *object,
                               const GValue *value,
                               GParamSpec   *pspec)
 {
+    (void)value;
    switch (prop_id) {
    default:
        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@ -279,6 +288,9 @@ eek_gtk_keyboard_class_init (EekGtkKeyboardClass *klass)
        eek_gtk_keyboard_real_button_release_event;
    widget_class->motion_notify_event =
        eek_gtk_keyboard_real_motion_notify_event;
+    widget_class->leave_notify_event =
+        eek_gtk_keyboard_leave_event;
+
    widget_class->touch_event = handle_touch_event;

    gobject_class->set_property = eek_gtk_keyboard_set_property;
@ -287,7 +299,9 @@ eek_gtk_keyboard_class_init (EekGtkKeyboardClass *klass)

 static void
 eek_gtk_keyboard_init (EekGtkKeyboard *self)
-{}
+{
+    (void)self;
+}

 /**
 * eek_gtk_keyboard_new:
@ -305,110 +319,7 @@ eek_gtk_keyboard_new (LevelKeyboard *keyboard)
    return GTK_WIDGET(ret);
 }

-static void
-render_pressed_button (GtkWidget *widget,
-                       struct button_place *place)
-{
-    EekGtkKeyboard        *self = EEK_GTK_KEYBOARD (widget);
+EekRenderer *eek_gtk_keyboard_get_renderer(EekGtkKeyboard *self) {
    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
-
-    GdkWindow         *window  = gtk_widget_get_window (widget);
-    cairo_region_t    *region  = gdk_window_get_clip_region (window);
-    GdkDrawingContext *context = gdk_window_begin_draw_frame (window, region);
-    cairo_t           *cr      = gdk_drawing_context_get_cairo_context (context);
-
-    eek_renderer_render_button (priv->renderer, cr, place, 1.0, TRUE);
-/*
-    eek_renderer_render_key (priv->renderer, cr, key, 1.5, TRUE);
-*/
-    gdk_window_end_draw_frame (window, context);
-
-    cairo_region_destroy (region);
-}
-
-void
-eek_gtk_render_locked_button (EekGtkKeyboard *self, struct button_place place)
-{
-    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
-
-    GdkWindow         *window  = gtk_widget_get_window (GTK_WIDGET(self));
-    cairo_region_t    *region  = gdk_window_get_clip_region (window);
-    GdkDrawingContext *context = gdk_window_begin_draw_frame (window, region);
-    cairo_t           *cr      = gdk_drawing_context_get_cairo_context (context);
-
-    eek_renderer_render_button (priv->renderer, cr, &place, 1.0, TRUE);
-
-    gdk_window_end_draw_frame (window, context);
-
-    cairo_region_destroy (region);
-}
-
-// TODO: does it really redraw the entire keyboard?
-static void
-render_released_button (GtkWidget *widget,
-                        const struct squeek_button *button)
-{
-    (void)button;
-    EekGtkKeyboard        *self = EEK_GTK_KEYBOARD (widget);
-    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
-
-    GdkWindow         *window  = gtk_widget_get_window (widget);
-    cairo_region_t    *region  = gdk_window_get_clip_region (window);
-    GdkDrawingContext *context = gdk_window_begin_draw_frame (window, region);
-    cairo_t           *cr      = gdk_drawing_context_get_cairo_context (context);
-
-    eek_renderer_render_keyboard (priv->renderer, cr);
-
-    gdk_window_end_draw_frame (window, context);
-
-    cairo_region_destroy (region);
-}
-
-void
-eek_gtk_on_button_pressed (struct button_place place,
-                   EekGtkKeyboard *self)
-{
-    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
-
-    /* renderer may have not been set yet if the widget is a popup */
-    if (!priv->renderer)
-        return;
-
-    if (!place.row) {
-        return;
-    }
-    render_pressed_button (GTK_WIDGET(self), &place);
-    gtk_widget_queue_draw (GTK_WIDGET(self));
-
-#if HAVE_LIBCANBERRA
-    ca_gtk_play_for_widget (widget, 0,
-                            CA_PROP_EVENT_ID, "button-pressed",
-                            CA_PROP_EVENT_DESCRIPTION, "virtual key pressed",
-                            CA_PROP_APPLICATION_ID, "org.fedorahosted.Eekboard",
-                            NULL);
-#endif
-}
-
-void
-eek_gtk_on_button_released (const struct squeek_button *button,
-                    struct squeek_view *view,
-                    EekGtkKeyboard *self)
-{
-    (void)view;
-    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
-
-    /* renderer may have not been set yet if the widget is a popup */
-    if (!priv->renderer)
-        return;
-
-    render_released_button (GTK_WIDGET(self), button);
-    gtk_widget_queue_draw (GTK_WIDGET(self));
-
-#if HAVE_LIBCANBERRA
-    ca_gtk_play_for_widget (widget, 0,
-                            CA_PROP_EVENT_ID, "button-released",
-                            CA_PROP_EVENT_DESCRIPTION, "virtual key pressed",
-                            CA_PROP_APPLICATION_ID, "org.fedorahosted.Eekboard",
-                            NULL);
-#endif
+    return priv->renderer;
 }
--- a/eek/eek-keyboard.c
+++ b/eek/eek-keyboard.c
@ -30,15 +30,14 @@
 #include "config.h"
 #include <glib/gprintf.h>

-#include "eek-enumtypes.h"
 #include "eekboard/eekboard-context-service.h"
 #include "eekboard/key-emitter.h"
 #include "keymap.h"
-#include "src/keyboard.h"
-
 #include "eek-keyboard.h"

 void level_keyboard_deinit(LevelKeyboard *self) {
+    xkb_keymap_unref(self->keymap);
+    close(self->keymap_fd);
    squeek_layout_free(self->layout);
 }

@ -57,8 +56,3 @@ LevelKeyboard *level_keyboard_new(EekboardContextService *manager, struct squeek
    keyboard->manager = manager;
    return keyboard;
 }
-
-struct squeek_view *level_keyboard_current(LevelKeyboard *keyboard)
-{
-    return squeek_layout_get_current_view(keyboard->layout);
-}
--- a/eek/eek-keyboard.h
+++ b/eek/eek-keyboard.h
@ -36,7 +36,7 @@ G_BEGIN_DECLS
 /// Keyboard state holder
 struct _LevelKeyboard {
    struct squeek_layout *layout; // owned
-    struct xkb_keymap *keymap;
+    struct xkb_keymap *keymap; // owned
    int keymap_fd; // keymap formatted as XKB string
    size_t keymap_len; // length of the data inside keymap_fd

@ -49,7 +49,6 @@ typedef struct _LevelKeyboard LevelKeyboard;
 gchar *             eek_keyboard_get_keymap
                                     (LevelKeyboard *keyboard);

-struct squeek_view *level_keyboard_current(LevelKeyboard *keyboard);
 LevelKeyboard *level_keyboard_new(EekboardContextService *manager, struct squeek_layout *layout);
 void level_keyboard_deinit(LevelKeyboard *self);
 void level_keyboard_free(LevelKeyboard *self);
--- a/eek/eek-renderer.c
+++ b/eek/eek-renderer.c
@ -26,6 +26,7 @@

 #include "eek-keyboard.h"
 #include "eek-renderer.h"
+#include "src/style.h"

 enum {
    PROP_0,
@ -35,141 +36,33 @@ enum {

 typedef struct _EekRendererPrivate
 {
-    LevelKeyboard *keyboard;
-    PangoContext *pcontext;
-    GtkCssProvider *css_provider;
-    GtkStyleContext *view_context;
+    LevelKeyboard *keyboard; // unowned
+    PangoContext *pcontext; // owned
+    GtkCssProvider *css_provider; // owned
+    GtkStyleContext *view_context; // owned
    GtkStyleContext *button_context; // TODO: maybe move a copy to each button

-    gdouble border_width;
+    gdouble border_width; // FIXME: border of what?

    gdouble allocation_width;
    gdouble allocation_height;
-    gdouble scale;
    gint scale_factor; /* the outputs scale factor */
-    gint origin_x;
-    gint origin_y;
+    struct transformation widget_to_layout;

-    PangoFontDescription *ascii_font;
-    PangoFontDescription *font;
-    // TODO: Drop those or transform into general button surface caches
-    GHashTable *outline_surface_cache;
-    GHashTable *active_outline_surface_cache;
-    GHashTable *icons;
-    cairo_surface_t *keyboard_surface;
+    PangoFontDescription *font; // owned reference

 } EekRendererPrivate;

 G_DEFINE_TYPE_WITH_PRIVATE (EekRenderer, eek_renderer, G_TYPE_OBJECT)

 /* eek-keyboard-drawing.c */
-static void eek_renderer_real_render_button_label (EekRenderer *self,
-                                                PangoLayout *layout,
+static void eek_renderer_render_button_label (EekRenderer *self, cairo_t *cr, GtkStyleContext *ctx,
                                                const struct squeek_button *button);

-static void invalidate                         (EekRenderer *renderer);
-static void render_button                         (EekRenderer *self,
-                                                cairo_t     *cr, EekBounds view_bounds, struct button_place *place,
+void eek_render_button                         (EekRenderer *self,
+                                                cairo_t     *cr, const struct squeek_button *button,
                                                gboolean     pressed, gboolean locked);

-struct _CreateKeyboardSurfaceCallbackData {
-    cairo_t *cr;
-    EekRenderer *renderer;
-    struct squeek_view *view;
-    struct squeek_row *row;
-};
-typedef struct _CreateKeyboardSurfaceCallbackData CreateKeyboardSurfaceCallbackData;
-
-static void
-create_keyboard_surface_button_callback (struct squeek_button *button,
-                                      gpointer    user_data)
-{
-    CreateKeyboardSurfaceCallbackData *data = user_data;
-    EekBounds bounds = squeek_button_get_bounds(button);
-
-    cairo_save (data->cr);
-
-    cairo_translate (data->cr, bounds.x, bounds.y);
-    cairo_rectangle (data->cr,
-                     0.0,
-                     0.0,
-                     bounds.width + 100,
-                     bounds.height + 100);
-    cairo_clip (data->cr);
-    struct button_place place = {
-        .row = data->row,
-        .button = button,
-    };
-    render_button (data->renderer, data->cr, squeek_view_get_bounds(data->view), &place, FALSE, FALSE);
-
-    cairo_restore (data->cr);
-}
-
-static void
-create_keyboard_surface_row_callback (struct squeek_row *row,
-                                          gpointer    user_data)
-{
-    CreateKeyboardSurfaceCallbackData *data = user_data;
-
-    EekBounds bounds = squeek_row_get_bounds(row);
-
-    cairo_save (data->cr);
-    cairo_translate (data->cr, bounds.x, bounds.y);
-
-    gint angle = squeek_row_get_angle (row);
-    cairo_rotate (data->cr, angle * G_PI / 180);
-
-    data->row = row;
-    squeek_row_foreach(row, create_keyboard_surface_button_callback, data);
-
-    cairo_restore (data->cr);
-}
-
-static void
-render_keyboard_surface (EekRenderer *renderer, struct squeek_view *view)
-{
-    EekRendererPrivate *priv = eek_renderer_get_instance_private (renderer);
-    EekColor foreground;
-
-    eek_renderer_get_foreground_color (priv->view_context, &foreground);
-
-    EekBounds bounds = squeek_view_get_bounds (level_keyboard_current(priv->keyboard));
-
-    CreateKeyboardSurfaceCallbackData data = {
-        .cr = cairo_create (priv->keyboard_surface),
-        .renderer = renderer,
-        .view = view,
-    };
-
-    /* Paint the background covering the entire widget area */
-    gtk_render_background (priv->view_context,
-                           data.cr,
-                           0, 0,
-                           priv->allocation_width, priv->allocation_height);
-    gtk_render_frame (priv->view_context,
-                      data.cr,
-                      0, 0,
-                      priv->allocation_width, priv->allocation_height);
-
-    cairo_save (data.cr);
-    cairo_scale (data.cr, priv->scale, priv->scale);
-    cairo_translate (data.cr, bounds.x, bounds.y);
-
-    cairo_set_source_rgba (data.cr,
-                           foreground.red,
-                           foreground.green,
-                           foreground.blue,
-                           foreground.alpha);
-
-    /* draw rows */
-    squeek_view_foreach(level_keyboard_current(priv->keyboard),
-                        create_keyboard_surface_row_callback,
-                        &data);
-    cairo_restore (data.cr);
-
-    cairo_destroy (data.cr);
-}
-
 static void
 render_outline (cairo_t     *cr,
                GtkStyleContext *ctx,
@ -194,50 +87,20 @@ render_outline (cairo_t     *cr,
 }

 static void render_button_in_context(EekRenderer *self,
-                                     gdouble scale,
                                     gint scale_factor,
                                     cairo_t     *cr,
                                     GtkStyleContext *ctx,
-                                     EekBounds view_bounds,
-                                     struct button_place *place,
-                                     gboolean active) {
-    cairo_surface_t *outline_surface = NULL;
-    PangoLayout *layout;
-    PangoRectangle extents = { 0, };
-    EekColor foreground;
-
-    /* render outline */
-    EekBounds bounds = squeek_button_get_bounds(place->button);
-
-    {
-        cairo_t *cr;
-
-        // Outline will be drawn on the outside of the button, so the
-        // surface needs to be bigger than the button
-        outline_surface =
-            cairo_image_surface_create (CAIRO_FORMAT_ARGB32,
-                                        (int)ceil(bounds.width) + 10,
-                                        (int)ceil(bounds.height) + 10);
-        cr = cairo_create (outline_surface);
-
-        /* blank background */
-        cairo_set_source_rgba (cr, 0.0, 0.0, 0.0, 0.0);
-        cairo_paint (cr);
-
-        cairo_save (cr);
-        eek_renderer_apply_transformation_for_button (cr, view_bounds, place, 1.0, FALSE);
-        render_outline (cr, ctx, bounds);
-        cairo_restore (cr);
-
-        cairo_destroy (cr);
-    }
-    cairo_set_source_surface (cr, outline_surface, 0.0, 0.0);
-    cairo_surface_destroy(outline_surface);
+                                     const struct squeek_button *button) {
+    /* blank background */
+    cairo_set_source_rgba (cr, 0.0, 0.0, 0.0, 0.0);
+    cairo_paint (cr);
+
+    EekBounds bounds = squeek_button_get_bounds(button);
+    render_outline (cr, ctx, bounds);
    cairo_paint (cr);

-    eek_renderer_get_foreground_color (ctx, &foreground);
    /* render icon (if any) */
-    const char *icon_name = squeek_button_get_icon_name(place->button);
+    const char *icon_name = squeek_button_get_icon_name(button);

    if (icon_name) {
        cairo_surface_t *icon_surface =
@ -253,10 +116,13 @@ static void render_button_in_context(EekRenderer *self,
            cairo_rectangle (cr, 0, 0, width, height);
            cairo_clip (cr);
            /* Draw the shape of the icon using the foreground color */
-            cairo_set_source_rgba (cr, foreground.red,
-                                       foreground.green,
-                                       foreground.blue,
-                                       foreground.alpha);
+            GdkRGBA color = {0};
+            gtk_style_context_get_color (ctx, GTK_STATE_FLAG_NORMAL, &color);
+
+            cairo_set_source_rgba (cr, color.red,
+                                       color.green,
+                                       color.blue,
+                                       color.alpha);
            cairo_mask_surface (cr, icon_surface, 0.0, 0.0);
            cairo_surface_destroy(icon_surface);
            cairo_fill (cr);
@ -264,32 +130,13 @@ static void render_button_in_context(EekRenderer *self,
            return;
        }
    }
-    /* render label */
-    layout = pango_cairo_create_layout (cr);
-    eek_renderer_real_render_button_label (self, layout, place->button);
-    pango_layout_get_extents (layout, NULL, &extents);
-
-    cairo_save (cr);
-    cairo_move_to
-        (cr,
-         (bounds.width - (double)extents.width / PANGO_SCALE) / 2,
-         (bounds.height - (double)extents.height / PANGO_SCALE) / 2);
-
-    cairo_set_source_rgba (cr,
-                           foreground.red,
-                           foreground.green,
-                           foreground.blue,
-                           foreground.alpha);
-    pango_cairo_show_layout (cr, layout);
-    cairo_restore (cr);
-    g_object_unref (layout);
+    eek_renderer_render_button_label (self, cr, ctx, button);
 }

-static void
-render_button (EekRenderer *self,
+void
+eek_render_button (EekRenderer *self,
            cairo_t     *cr,
-               EekBounds view_bounds,
-            struct button_place *place,
+            const struct squeek_button *button,
               gboolean     pressed,
               gboolean     locked)
 {
@ -300,7 +147,7 @@ render_button (EekRenderer *self,
       from the button's symbol. */
    g_autoptr (GtkWidgetPath) path = NULL;
    path = gtk_widget_path_copy (gtk_style_context_get_path (ctx));
-    const char *name = squeek_button_get_name(place->button);
+    const char *name = squeek_button_get_name(button);
    gtk_widget_path_iter_set_name (path, -1, name);

    /* Update the style context with the updated widget path. */
@ -309,13 +156,13 @@ render_button (EekRenderer *self,
       (pressed) or normal. */
    gtk_style_context_set_state(ctx,
        pressed ? GTK_STATE_FLAG_ACTIVE : GTK_STATE_FLAG_NORMAL);
-    const char *outline_name = squeek_button_get_outline_name(place->button);
+    const char *outline_name = squeek_button_get_outline_name(button);
    if (locked) {
        gtk_style_context_add_class(ctx, "locked");
    }
    gtk_style_context_add_class(ctx, outline_name);

-    render_button_in_context(self, priv->scale, priv->scale_factor, cr, ctx, view_bounds, place, pressed);
+    render_button_in_context(self, priv->scale_factor, cr, ctx, button);

    // Save and restore functions don't work if gtk_render_* was used in between
    gtk_style_context_set_state(ctx, GTK_STATE_FLAG_NORMAL);
@ -325,51 +172,11 @@ render_button (EekRenderer *self,
    }
 }

-/**
- * eek_renderer_apply_transformation_for_key:
- * @self: The renderer used to render the key
- * @cr: The Cairo rendering context used for rendering
- * @key: The key to be transformed
- * @scale: The factor used to scale the key bounds before rendering
- * @rotate: Whether to rotate the key by the angle defined for the key's
- *   in its section definition
- *
- *  Applies a transformation, consisting of scaling and rotation, to the
- *  current rendering context using the bounds for the given key. The scale
- *  factor is separate to the normal scale factor for the keyboard as a whole
- *  and is applied cumulatively. It is typically used to render larger than
- *  normal keys for popups.
-*/
-void
-eek_renderer_apply_transformation_for_button (cairo_t     *cr,
-                                              EekBounds view_bounds,
-                                           struct button_place *place,
-                                           gdouble      scale,
-                                           gboolean     rotate)
-{
-    EekBounds bounds, rotated_bounds;
-    gdouble s;
-
-    eek_renderer_get_button_bounds (view_bounds, place, &bounds, FALSE);
-    eek_renderer_get_button_bounds (view_bounds, place, &rotated_bounds, TRUE);
-
-    gint angle = squeek_row_get_angle (place->row);
-
-    cairo_scale (cr, scale, scale);
-    if (rotate) {
-        s = sin (angle * G_PI / 180);
-        if (s < 0)
-            cairo_translate (cr, 0, - bounds.width * s);
-        else
-            cairo_translate (cr, bounds.height * s, 0);
-        cairo_rotate (cr, angle * G_PI / 180);
-    }
-}
-
 static void
-eek_renderer_real_render_button_label (EekRenderer *self,
-                                    PangoLayout *layout,
-                                    const struct squeek_button *button)
+eek_renderer_render_button_label (EekRenderer *self,
+                                  cairo_t     *cr,
+                                  GtkStyleContext *ctx,
+                                  const struct squeek_button *button)
 {
    EekRendererPrivate *priv = eek_renderer_get_instance_private (self);

@ -385,16 +192,11 @@ eek_renderer_real_render_button_label (EekRenderer *self,

    if (!priv->font) {
        const PangoFontDescription *base_font;
-        gdouble ascii_size, size;
+        gdouble size;

        base_font = pango_context_get_font_description (priv->pcontext);
        // FIXME: Base font size on the same size unit used for button sizing,
        // and make the default about 1/3 of the current row height
-        ascii_size = 30000.0;
-        priv->ascii_font = pango_font_description_copy (base_font);
-        pango_font_description_set_size (priv->ascii_font,
-                                         (gint)round(ascii_size));
-
        size = 30000.0;
        priv->font = pango_font_description_copy (base_font);
        pango_font_description_set_size (priv->font, (gint)round(size * 0.6));
@ -407,6 +209,8 @@ eek_renderer_real_render_button_label (EekRenderer *self,
    font = pango_font_description_copy (priv->font);
    pango_font_description_set_size (font,
                                     (gint)round(pango_font_description_get_size (font) * scale));
+
+    PangoLayout *layout = pango_cairo_create_layout (cr);
    pango_layout_set_font_description (layout, font);
    pango_font_description_free (font);

@ -417,78 +221,51 @@ eek_renderer_real_render_button_label (EekRenderer *self,
    }
    pango_layout_set_width (layout,
                            PANGO_SCALE * bounds.width * scale);
-}

-/*
- * eek_renderer_real_render_key:
- * @self: The renderer used to render the key
- * @cr: The Cairo rendering context used for rendering
- * @key: The key to be transformed
- * @scale: The factor used to scale the key bounds before rendering
- * @rotate: Whether to rotate the key by the angle defined for the key's
- *   in its section definition
- *
- *   Renders a key separately from the normal keyboard rendering.
-*/
-static void
-eek_renderer_real_render_button (EekRenderer *self,
-                              cairo_t     *cr,
-                              struct button_place *place,
-                              gdouble      scale,
-                              gboolean     rotate)
-{
-    EekRendererPrivate *priv = eek_renderer_get_instance_private (self);
-    EekBounds bounds;
-
-    EekBounds view_bounds = squeek_view_get_bounds (level_keyboard_current(priv->keyboard));
-    eek_renderer_get_button_bounds (view_bounds, place, &bounds, rotate);
+    PangoRectangle extents = { 0, };
+    pango_layout_get_extents (layout, NULL, &extents);

    cairo_save (cr);
-    /* Because this function is called separately from the keyboard rendering
-       function, the transformation for the context needs to be set up */
-    cairo_translate (cr, priv->origin_x, priv->origin_y);
-    cairo_scale (cr, priv->scale, priv->scale);
-    cairo_translate (cr, bounds.x, bounds.y);
+    cairo_move_to
+        (cr,
+         (bounds.width - (double)extents.width / PANGO_SCALE) / 2,
+         (bounds.height - (double)extents.height / PANGO_SCALE) / 2);

-    eek_renderer_apply_transformation_for_button (cr, view_bounds, place, scale, rotate);
-    struct squeek_key *key = squeek_button_get_key(place->button);
-    render_button (
-                self, cr, view_bounds, place,
-                squeek_key_is_pressed(key) != 0,
-                squeek_key_is_locked (key) != 0
-    );
+    GdkRGBA color = {0};
+    gtk_style_context_get_color (ctx, GTK_STATE_FLAG_NORMAL, &color);
+
+    cairo_set_source_rgba (cr,
+                           color.red,
+                           color.green,
+                           color.blue,
+                           color.alpha);
+    pango_cairo_show_layout (cr, layout);
    cairo_restore (cr);
+    g_object_unref (layout);
 }

-static void
-eek_renderer_real_render_keyboard (EekRenderer *self,
+void
+eek_renderer_render_keyboard (EekRenderer *self,
                                   cairo_t     *cr)
 {
    EekRendererPrivate *priv = eek_renderer_get_instance_private (self);
-    cairo_pattern_t *source;

    g_return_if_fail (priv->keyboard);
    g_return_if_fail (priv->allocation_width > 0.0);
    g_return_if_fail (priv->allocation_height > 0.0);

-    cairo_save (cr);
+    /* Paint the background covering the entire widget area */
+    gtk_render_background (priv->view_context,
+                           cr,
+                           0, 0,
+                           priv->allocation_width, priv->allocation_height);

-    cairo_translate (cr, priv->origin_x, priv->origin_y);
-
-    if (priv->keyboard_surface)
-        cairo_surface_destroy (priv->keyboard_surface);
-
-    priv->keyboard_surface = cairo_surface_create_for_rectangle (
-        cairo_get_target (cr), 0, 0,
-        priv->allocation_width, priv->allocation_height);
-
-    render_keyboard_surface (self, squeek_layout_get_current_view(priv->keyboard->layout));
-
-    cairo_set_source_surface (cr, priv->keyboard_surface, 0.0, 0.0);
-    source = cairo_get_source (cr);
-    cairo_pattern_set_extend (source, CAIRO_EXTEND_PAD);
-    cairo_paint (cr);
+    cairo_save(cr);
+    cairo_translate (cr, priv->widget_to_layout.origin_x, priv->widget_to_layout.origin_y);
+    cairo_scale (cr, priv->widget_to_layout.scale, priv->widget_to_layout.scale);

+    squeek_draw_layout_base_view(priv->keyboard->layout, self, cr);
+    squeek_layout_draw_all_changed(priv->keyboard->layout, self, cr);
    cairo_restore (cr);
 }

@ -518,6 +295,7 @@ eek_renderer_get_property (GObject    *object,
                           GValue     *value,
                           GParamSpec *pspec)
 {
+    (void)value;
    switch (prop_id) {
    default:
        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@ -539,10 +317,7 @@ eek_renderer_dispose (GObject *object)
        priv->pcontext = NULL;
    }

-    g_clear_pointer (&priv->icons, g_hash_table_destroy);
-
-    /* this will release all allocated surfaces and font if any */
-    invalidate (EEK_RENDERER(object));
+    // this is where renderer-specific surfaces would be released

    G_OBJECT_CLASS (eek_renderer_parent_class)->dispose (object);
 }
@ -553,9 +328,9 @@ eek_renderer_finalize (GObject *object)
    EekRenderer        *self = EEK_RENDERER(object);
    EekRendererPrivate *priv = eek_renderer_get_instance_private (self);

-    g_hash_table_destroy (priv->outline_surface_cache);
-    g_hash_table_destroy (priv->active_outline_surface_cache);
-    pango_font_description_free (priv->ascii_font);
+    g_object_unref(priv->css_provider);
+    g_object_unref(priv->view_context);
+    g_object_unref(priv->button_context);
    pango_font_description_free (priv->font);
    G_OBJECT_CLASS (eek_renderer_parent_class)->finalize (object);
 }
@ -566,9 +341,6 @@ eek_renderer_class_init (EekRendererClass *klass)
    GObjectClass      *gobject_class = G_OBJECT_CLASS (klass);
    GParamSpec        *pspec;

-    klass->render_button = eek_renderer_real_render_button;
-    klass->render_keyboard = eek_renderer_real_render_keyboard;
-
    gobject_class->set_property = eek_renderer_set_property;
    gobject_class->get_property = eek_renderer_get_property;
    gobject_class->dispose = eek_renderer_dispose;
@ -621,50 +393,14 @@ eek_renderer_init (EekRenderer *self)
    priv->border_width = 1.0;
    priv->allocation_width = 0.0;
    priv->allocation_height = 0.0;
-    priv->scale = 1.0;
    priv->scale_factor = 1;
    priv->font = NULL;
-    priv->outline_surface_cache =
-        g_hash_table_new_full (g_direct_hash,
-                               g_direct_equal,
-                               NULL,
-                               (GDestroyNotify)cairo_surface_destroy);
-    priv->active_outline_surface_cache =
-        g_hash_table_new_full (g_direct_hash,
-                               g_direct_equal,
-                               NULL,
-                               (GDestroyNotify)cairo_surface_destroy);
-    priv->keyboard_surface = NULL;

    GtkIconTheme *theme = gtk_icon_theme_get_default ();

    gtk_icon_theme_add_resource_path (theme, "/sm/puri/squeekboard/icons");
-    priv->icons = g_hash_table_new_full (g_str_hash,
-                                         g_str_equal,
-                                         g_free,
-                                         (GDestroyNotify)cairo_surface_destroy);

-    /* Create a default CSS provider and load a style sheet */
-    priv->css_provider = gtk_css_provider_new ();
-    gtk_css_provider_load_from_resource (priv->css_provider,
-        "/sm/puri/squeekboard/style.css");
-}
-
-static void
-invalidate (EekRenderer *renderer)
-{
-    EekRendererPrivate *priv = eek_renderer_get_instance_private (renderer);
-
-    if (priv->outline_surface_cache)
-        g_hash_table_remove_all (priv->outline_surface_cache);
-
-    if (priv->active_outline_surface_cache)
-        g_hash_table_remove_all (priv->active_outline_surface_cache);
-
-    if (priv->keyboard_surface) {
-        cairo_surface_destroy (priv->keyboard_surface);
-        priv->keyboard_surface = NULL;
-    }
+    priv->css_provider = squeek_load_style();
 }

 EekRenderer *
@ -690,7 +426,6 @@ eek_renderer_new (LevelKeyboard  *keyboard,
    gtk_style_context_add_provider (priv->view_context,
        GTK_STYLE_PROVIDER(priv->css_provider),
        GTK_STYLE_PROVIDER_PRIORITY_USER);
-    printf("view: %s\n", gtk_style_context_to_string(priv->view_context, GTK_STYLE_CONTEXT_PRINT_SHOW_STYLE));

    /* Create a style context for the buttons */
    path = gtk_widget_path_new();
@ -715,8 +450,6 @@ eek_renderer_set_allocation_size (EekRenderer *renderer,
                                  gdouble      width,
                                  gdouble      height)
 {
-    gdouble scale;
-
    g_return_if_fail (EEK_IS_RENDERER(renderer));
    g_return_if_fail (width > 0.0 && height > 0.0);

@ -725,99 +458,11 @@ eek_renderer_set_allocation_size (EekRenderer *renderer,
    priv->allocation_width = width;
    priv->allocation_height = height;

-    /* Calculate a scale factor to use when rendering the keyboard into the
-       available space. */
-    EekBounds bounds = squeek_view_get_bounds (level_keyboard_current(priv->keyboard));
+    priv->widget_to_layout = squeek_layout_calculate_transformation(
+                priv->keyboard->layout,
+                priv->allocation_width, priv->allocation_height);

-    gdouble w = (bounds.x * 2) + bounds.width;
-    gdouble h = (bounds.y * 2) + bounds.height;
-
-    scale = MIN(width / w, height / h);
-
-    priv->scale = scale;
-    /* Set the rendering offset in widget coordinates to center the keyboard */
-    priv->origin_x = (gint)floor((width - (scale * w)) / 2);
-    priv->origin_y = (gint)floor((height - (scale * h)) / 2);
-    invalidate (renderer);
-}
-
-void
-eek_renderer_get_size (EekRenderer *renderer,
-                       gdouble     *width,
-                       gdouble     *height)
-{
-    g_return_if_fail (EEK_IS_RENDERER(renderer));
-
-    EekRendererPrivate *priv = eek_renderer_get_instance_private (renderer);
-
-    EekBounds bounds = squeek_view_get_bounds (level_keyboard_current(priv->keyboard));
-    if (width)
-        *width = bounds.width;
-    if (height)
-        *height = bounds.height;
-}
-
-void
-eek_renderer_get_button_bounds (EekBounds view_bounds,
-                                struct button_place *place,
-                             EekBounds   *bounds,
-                             gboolean     rotate)
-{
-    gint angle = 0;
-    EekPoint points[4], min, max;
-
-    g_return_if_fail (place);
-    g_return_if_fail (bounds != NULL);
-
-    EekBounds button_bounds = squeek_button_get_bounds(place->button);
-    EekBounds row_bounds = squeek_row_get_bounds (place->row);
-
-    if (!rotate) {
-        button_bounds.x += view_bounds.x + row_bounds.x;
-        button_bounds.y += view_bounds.y + row_bounds.y;
-        *bounds = button_bounds;
-        return;
-    }
-    points[0].x = button_bounds.x;
-    points[0].y = button_bounds.y;
-    points[1].x = points[0].x + button_bounds.width;
-    points[1].y = points[0].y;
-    points[2].x = points[1].x;
-    points[2].y = points[1].y + button_bounds.height;
-    points[3].x = points[0].x;
-    points[3].y = points[2].y;
-
-    if (rotate) {
-        angle = squeek_row_get_angle (place->row);
-    }
-
-    min = points[2];
-    max = points[0];
-    for (unsigned i = 0; i < G_N_ELEMENTS(points); i++) {
-        eek_point_rotate (&points[i], angle);
-        if (points[i].x < min.x)
-            min.x = points[i].x;
-        if (points[i].x > max.x)
-            max.x = points[i].x;
-        if (points[i].y < min.y)
-            min.y = points[i].y;
-        if (points[i].y > max.y)
-            max.y = points[i].y;
-    }
-    bounds->x = view_bounds.x + row_bounds.x + min.x;
-    bounds->y = view_bounds.y + row_bounds.y + min.y;
-    bounds->width = (max.x - min.x);
-    bounds->height = (max.y - min.y);
-}
-
-gdouble
-eek_renderer_get_scale (EekRenderer *renderer)
-{
-    g_return_val_if_fail (EEK_IS_RENDERER(renderer), 0);
-
-    EekRendererPrivate *priv = eek_renderer_get_instance_private (renderer);
-
-    return priv->scale;
+    // This is where size-dependent surfaces would be released
 }

 void
@ -829,16 +474,6 @@ eek_renderer_set_scale_factor (EekRenderer *renderer, gint scale)
    priv->scale_factor = scale;
 }

-PangoLayout *
-eek_renderer_create_pango_layout (EekRenderer  *renderer)
-{
-    g_return_val_if_fail (EEK_IS_RENDERER(renderer), NULL);
-
-    EekRendererPrivate *priv = eek_renderer_get_instance_private (renderer);
-
-    return pango_layout_new (priv->pcontext);
-}
-
 cairo_surface_t *
 eek_renderer_get_icon_surface (const gchar *icon_name,
                               gint size,
@ -863,102 +498,11 @@ eek_renderer_get_icon_surface (const gchar *icon_name,
    return surface;
 }

-void
-eek_renderer_render_button (EekRenderer *renderer,
-                         cairo_t     *cr,
-                         struct button_place *place,
-                         gdouble      scale,
-                         gboolean     rotate)
-{
-    g_return_if_fail (EEK_IS_RENDERER(renderer));
-    g_return_if_fail (place);
-    g_return_if_fail (scale >= 0.0);
-
-    EEK_RENDERER_GET_CLASS(renderer)->
-        render_button (renderer, cr, place, scale, rotate);
-}
-
-void
-eek_renderer_render_keyboard (EekRenderer *renderer,
-                              cairo_t     *cr)
-{
-    g_return_if_fail (EEK_IS_RENDERER(renderer));
-    EEK_RENDERER_GET_CLASS(renderer)->render_keyboard (renderer, cr);
-}
-
-void
-eek_renderer_get_foreground_color (GtkStyleContext *context,
-                                   EekColor    *color)
-{
-    g_return_if_fail (color);
-
-    GtkStateFlags flags = GTK_STATE_FLAG_NORMAL;
-    GdkRGBA gcolor;
-
-    gtk_style_context_get_color (context, flags, &gcolor);
-    color->red = gcolor.red;
-    color->green = gcolor.green;
-    color->blue = gcolor.blue;
-    color->alpha = gcolor.alpha;
-}
-
-static gboolean
-sign (EekPoint *p1, EekPoint *p2, EekPoint *p3)
-{
-    // FIXME: what is this actually checking?
-    return (p1->x - p3->x) * (p2->y - p3->y) -
-        (p2->x - p3->x) * (p1->y - p3->y);
-}
-
-uint32_t
-eek_are_bounds_inside (EekBounds bounds, EekPoint point, EekPoint origin, int32_t angle)
-{
-    EekPoint points[4];
-    gboolean b1, b2, b3;
-
-    points[0].x = bounds.x;
-    points[0].y = bounds.y;
-    points[1].x = points[0].x + bounds.width;
-    points[1].y = points[0].y;
-    points[2].x = points[1].x;
-    points[2].y = points[1].y + bounds.height;
-    points[3].x = points[0].x;
-    points[3].y = points[2].y;
-
-    for (unsigned i = 0; i < G_N_ELEMENTS(points); i++) {
-        eek_point_rotate (&points[i], angle);
-        points[i].x += origin.x;
-        points[i].y += origin.y;
-    }
-
-    b1 = sign (&point, &points[0], &points[1]) < 0.0;
-    b2 = sign (&point, &points[1], &points[2]) < 0.0;
-    b3 = sign (&point, &points[2], &points[0]) < 0.0;
-
-    if (b1 == b2 && b2 == b3) {
-        return 1;
-    }
-
-    b1 = sign (&point, &points[2], &points[3]) < 0.0;
-    b2 = sign (&point, &points[3], &points[0]) < 0.0;
-    b3 = sign (&point, &points[0], &points[2]) < 0.0;
-
-    if (b1 == b2 && b2 == b3) {
-        return 1;
-    }
-    return 0;
-}
-
 struct transformation
 eek_renderer_get_transformation (EekRenderer *renderer) {
    struct transformation failed = {0};
    g_return_val_if_fail (EEK_IS_RENDERER(renderer), failed);

    EekRendererPrivate *priv = eek_renderer_get_instance_private (renderer);
-    struct transformation ret = {
-        .origin_x = priv->origin_x,
-        .origin_y = priv->origin_y,
-        .scale = priv->scale,
-    };
-    return ret;
+    return priv->widget_to_layout;
 }
--- a/eek/eek-renderer.h
+++ b/eek/eek-renderer.h
@ -25,7 +25,6 @@
 #include <pango/pangocairo.h>

 #include "eek-types.h"
-#include "src/layout.h"

 G_BEGIN_DECLS

@ -36,15 +35,6 @@ struct _EekRendererClass
 {
    GObjectClass parent_class;

-    void             (* render_button)         (EekRenderer *self,
-                                             cairo_t     *cr,
-                                             struct button_place *place,
-                                             gdouble      scale,
-                                             gboolean     rotate);
-
-    void             (* render_keyboard)    (EekRenderer *self,
-                                             cairo_t     *cr);
-
    cairo_surface_t *(* get_icon_surface)   (EekRenderer *self,
                                             const gchar *icon_name,
                                             gint         size,
@ -62,26 +52,9 @@ void             eek_renderer_set_allocation_size
                                               (EekRenderer     *renderer,
                                                gdouble          width,
                                                gdouble          height);
-void             eek_renderer_get_size         (EekRenderer     *renderer,
-                                                gdouble         *width,
-                                                gdouble         *height);
-void             eek_renderer_get_button_bounds   (EekBounds view_bounds,
-                                                struct button_place *button,
-                                                EekBounds       *bounds,
-                                                gboolean         rotate);
-
-gdouble          eek_renderer_get_scale        (EekRenderer     *renderer);
 void             eek_renderer_set_scale_factor (EekRenderer     *renderer,
                                                gint             scale);

-PangoLayout     *eek_renderer_create_pango_layout
-                                               (EekRenderer     *renderer);
-void             eek_renderer_render_button       (EekRenderer     *renderer,
-                                                cairo_t         *cr,
-                                                struct button_place *place,
-                                                gdouble          scale,
-                                                gboolean         rotate);
-
 cairo_surface_t *eek_renderer_get_icon_surface(const gchar     *icon_name,
                                                gint             size,
                                                gint             scale);
@ -89,24 +62,6 @@ cairo_surface_t *eek_renderer_get_icon_surface(const gchar     *icon_name,
 void             eek_renderer_render_keyboard  (EekRenderer     *renderer,
                                                cairo_t         *cr);

-void             eek_renderer_set_default_foreground_color
-                                               (EekRenderer     *renderer,
-                                                const EekColor  *color);
-void             eek_renderer_set_default_background_color
-                                               (EekRenderer     *renderer,
-                                                const EekColor  *color);
-void             eek_renderer_get_foreground_color
-                                               (GtkStyleContext *context,
-                                                EekColor        *color);
-void             eek_renderer_set_border_width (EekRenderer     *renderer,
-                                                gdouble          border_width);
-void             eek_renderer_apply_transformation_for_button
-                                               (cairo_t         *cr,
-                                                EekBounds view_bounds,
-                                                struct button_place *place,
-                                                gdouble          scale,
-                                                gboolean         rotate);
-
 struct transformation
 eek_renderer_get_transformation (EekRenderer *renderer);

--- a/eek/eek-types.c
+++ b/eek/eek-types.c
@ -72,35 +72,3 @@ eek_bounds_free (EekBounds *bounds)
 {
    g_slice_free (EekBounds, bounds);
 }
-
-/* EekColor */
-G_DEFINE_BOXED_TYPE(EekColor, eek_color, eek_color_copy, eek_color_free);
-
-EekColor *
-eek_color_copy (const EekColor *color)
-{
-    return g_slice_dup (EekColor, color);
-}
-
-void
-eek_color_free (EekColor *color)
-{
-    g_slice_free (EekColor, color);
-}
-
-EekColor *
-eek_color_new (gdouble red,
-               gdouble green,
-               gdouble blue,
-               gdouble alpha)
-{
-    EekColor *color;
-
-    color = g_slice_new (EekColor);
-    color->red = red;
-    color->green = green;
-    color->blue = blue;
-    color->alpha = alpha;
-
-    return color;
-}
--- a/eek/eek-types.h
+++ b/eek/eek-types.h
@ -34,10 +34,8 @@ G_BEGIN_DECLS

 #define EEK_TYPE_POINT (eek_point_get_type ())
 #define EEK_TYPE_BOUNDS (eek_bounds_get_type ())
-#define EEK_TYPE_COLOR (eek_color_get_type ())

 typedef struct _EekBounds EekBounds;
-typedef struct _EekColor EekColor;

 typedef struct _EekboardContextService EekboardContextService;
 typedef struct _LevelKeyboard LevelKeyboard;
@ -85,37 +83,19 @@ GType      eek_bounds_get_type (void) G_GNUC_CONST;
 EekBounds *eek_bounds_copy     (const EekBounds *bounds);
 void       eek_bounds_free     (EekBounds       *bounds);

-/**
- * EekColor:
- * @red: red component of color, between 0.0 and 1.0
- * @green: green component of color, between 0.0 and 1.0
- * @blue: blue component of color, between 0.0 and 1.0
- * @alpha: alpha component of color, between 0.0 and 1.0
- *
- * Color used for drawing.
- */
-struct _EekColor
-{
-    /*< public >*/
-    gdouble red;
-    gdouble green;
-    gdouble blue;
-    gdouble alpha;
-};
-
-GType     eek_color_get_type (void) G_GNUC_CONST;
-
-EekColor *eek_color_new      (gdouble         red,
-                              gdouble         green,
-                              gdouble         blue,
-                              gdouble         alpha);
-EekColor *eek_color_copy     (const EekColor *color);
-void      eek_color_free     (EekColor       *color);
-
 struct transformation {
    gdouble origin_x;
    gdouble origin_y;
    gdouble scale;
 };
+
+struct squeek_button;
+struct squeek_row;
+
+/// Represents the path to the button within a view
+struct button_place {
+    const struct squeek_row *row;
+    const struct squeek_button *button;
+};
 G_END_DECLS
 #endif  /* EEK_TYPES_H */
--- a/eek/eek-xml-layout.c
+++ b/eek/eek-xml-layout.c
@ -24,7 +24,6 @@
 #include "config.h"

 #include "eek-keyboard.h"
-#include "src/keyboard.h"
 #include "src/layout.h"

 #include "eek-xml-layout.h"
@ -35,6 +34,5 @@ eek_xml_layout_real_create_keyboard (const char *keyboard_type,
                                     enum squeek_arrangement_kind t)
 {
    struct squeek_layout *layout = squeek_load_layout(keyboard_type, t);
-    squeek_layout_place_contents(layout);
    return level_keyboard_new(manager, layout);
 }
--- a/eek/meson.build
+++ b/eek/meson.build
@ -1,8 +0,0 @@
-gnome = import('gnome')
-
-enum_headers = [
-  'eek-types.h',
-]
-
-enums = gnome.mkenums_simple('eek-enumtypes', sources: enum_headers)
-
--- a/eekboard/eekboard-0.90.pc.in
+++ b/eekboard/eekboard-0.90.pc.in
@ -1,30 +0,0 @@
-# Copyright (C) 2010-2011 Daiki Ueno <ueno@unixuser.org>
-# Copyright (C) 2010-2011 Red Hat, Inc.
-
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public License
-# as published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
-
-# This library is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301 USA
-
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: Eekboard
-Description: A Library to Create Keyboard-like UI
-URL: http://ueno.github.com/eekboard/
-Version: @VERSION@
-Requires: eek-@EEK_API_VERSION@
-Libs: -L${libdir} -leekboard
-Cflags: -I${includedir}/eekboard-@EEK_API_VERSION@
--- a/eekboard/eekboard-context-service.c
+++ b/eekboard/eekboard-context-service.c
@ -71,6 +71,8 @@ struct _EekboardContextServicePrivate {
    LevelKeyboard *keyboard; // currently used keyboard
    GHashTable *keyboard_hash; // a table of available keyboards, per layout

+    char *overlay;
+
    GSettings *settings;
    uint32_t hint;
    uint32_t purpose;
@ -130,7 +132,6 @@ eekboard_context_service_real_create_keyboard (EekboardContextService *self,
    }
    strncpy(ptr, keymap_str, keyboard->keymap_len);
    munmap(ptr, keyboard->keymap_len);
-
    return keyboard;
 }

@ -208,36 +209,24 @@ static void
 settings_get_layout(GSettings *settings, char **type, char **layout)
 {
    GVariant *inputs = g_settings_get_value(settings, "sources");
-    guint32 index;
-    g_settings_get(settings, "current", "u", &index);
-
-    GVariantIter *iter;
-    g_variant_get(inputs, "a(ss)", &iter);
-
-    for (unsigned i = 0;
-         g_variant_iter_loop(iter, "(ss)", type, layout);
-         i++) {
-        if (i == index) {
-            //printf("Found layout %s %s\n", *type, *layout);
-            break;
-        }
-    }
-    g_variant_iter_free(iter);
-    g_variant_unref(inputs);
+    // current layout is always first
+    g_variant_get_child(inputs, 0, "(ss)", type, layout);
 }

 void
 eekboard_context_service_update_layout(EekboardContextService *context, enum squeek_arrangement_kind t)
 {
-    g_autofree gchar *keyboard_type = NULL;
    g_autofree gchar *keyboard_layout = NULL;
-    settings_get_layout(context->priv->settings, &keyboard_type, &keyboard_layout);
-
-    if (!keyboard_type) {
-        keyboard_type = g_strdup("us");
+    if (context->priv->overlay) {
+        keyboard_layout = g_strdup(context->priv->overlay);
+    } else {
+        g_autofree gchar *keyboard_type = NULL;
+        settings_get_layout(context->priv->settings,
+                            &keyboard_type, &keyboard_layout);
    }
+
    if (!keyboard_layout) {
-        keyboard_layout = g_strdup("undefined");
+        keyboard_layout = g_strdup("us");
    }

    EekboardContextServicePrivate *priv = EEKBOARD_CONTEXT_SERVICE_GET_PRIVATE(context);
@ -252,23 +241,17 @@ eekboard_context_service_update_layout(EekboardContextService *context, enum squ
    }

    // generic part follows
-    static guint keyboard_id = 0;
-    LevelKeyboard *keyboard = g_hash_table_lookup(context->priv->keyboard_hash,
-                                                GUINT_TO_POINTER(keyboard_id));
-    // create a keyboard
-    if (!keyboard) {
-        keyboard = eekboard_context_service_real_create_keyboard(context, keyboard_layout, t);
-
-        g_hash_table_insert (context->priv->keyboard_hash,
-                             GUINT_TO_POINTER(keyboard_id),
-                             keyboard);
-        keyboard->id = keyboard_id;
-        keyboard_id++;
-    }
+    LevelKeyboard *keyboard = eekboard_context_service_real_create_keyboard(context, keyboard_layout, t);
    // set as current
+    LevelKeyboard *previous_keyboard = context->priv->keyboard;
    context->priv->keyboard = keyboard;

    g_object_notify (G_OBJECT(context), "keyboard");
+
+    // replacing the keyboard above will cause the previous keyboard to get destroyed from the UI side (eek_gtk_keyboard_dispose)
+    if (previous_keyboard) {
+        level_keyboard_free(previous_keyboard);
+    }
 }

 static void update_layout_and_type(EekboardContextService *context) {
@ -283,6 +266,8 @@ settings_handle_layout_changed(GSettings *s,
    (void)keys;
    (void)n_keys;
    EekboardContextService *context = user_data;
+    g_free(context->priv->overlay);
+    context->priv->overlay = NULL;
    update_layout_and_type(context);
    return TRUE;
 }
@ -412,6 +397,8 @@ eekboard_context_service_init (EekboardContextService *self)
        g_warning ("Could not connect to gsettings updates, layout"
                   " changing unavailable");
    }
+
+    self->priv->overlay = NULL;
 }

 /**
@ -484,6 +471,7 @@ eekboard_context_service_destroy (EekboardContextService *context)
    if (context->priv->enabled) {
        eekboard_context_service_disable (context);
    }
+    g_free(context->priv->overlay);
    g_signal_emit (context, signals[DESTROYED], 0);
 }

@ -519,3 +507,14 @@ void eekboard_context_service_set_hint_purpose(EekboardContextService *context,
        update_layout_and_type(context);
    }
 }
+
+void
+eekboard_context_service_set_overlay(EekboardContextService *context, const char* name) {
+    context->priv->overlay = g_strdup(name);
+    update_layout_and_type(context);
+}
+
+const char*
+eekboard_context_service_get_overlay(EekboardContextService *context) {
+    return context->priv->overlay;
+}
--- a/examples/test_layout.rs
+++ b/examples/test_layout.rs
@ -1,52 +1,10 @@
 extern crate rs;
-extern crate xkbcommon;

+use rs::tests::check_builtin_layout;
 use std::env;

-use rs::data::{ Layout, LoadError };
-
-use xkbcommon::xkb;
-
-
-fn check_layout(name: &str) {
-    let layout = Layout::from_resource(name)
-        .and_then(|layout| layout.build().map_err(LoadError::BadKeyMap))
-        .expect("layout broken");
-    
-    let context = xkb::Context::new(xkb::CONTEXT_NO_FLAGS);
-    
-    let keymap_str = layout.keymap_str
-        .clone()
-        .into_string().expect("Failed to decode keymap string");
-    
-    let keymap = xkb::Keymap::new_from_string(
-        &context,
-        keymap_str.clone(),
-        xkb::KEYMAP_FORMAT_TEXT_V1,
-        xkb::KEYMAP_COMPILE_NO_FLAGS,
-    ).expect("Failed to create keymap");
-
-    let state = xkb::State::new(&keymap);
-    
-    // "Press" each button with keysyms
-    for view in layout.views.values() {
-        for row in &view.rows {
-            for button in &row.buttons {
-                let keystate = button.state.borrow();
-                for keycode in &keystate.keycodes {
-                    match state.key_get_one_sym(*keycode) {
-                        xkb::KEY_NoSymbol => {
-                            eprintln!("{}", keymap_str);
-                            panic!("Keysym {} on key {:?} can't be resolved", keycode, button.name);
-                        },
-                        _ => {},
-                    }
-                }
-            }
-        }
-    }
-}
-
 fn main() -> () {
-    check_layout(env::args().nth(1).expect("No argument given").as_str());
+    check_builtin_layout(
+        env::args().nth(1).expect("No argument given").as_str()
+    );
 }
--- a/meson.build
+++ b/meson.build
@ -1,7 +1,7 @@
 project(
    'squeekboard',
    'c', 'rust',
-    version: '1.2.2',
+    version: '1.6.0',
    license: 'GPLv3',
    meson_version: '>=0.51.0',
    default_options: [
@ -33,8 +33,14 @@ endif
 if get_option('buildtype') != 'plain'
    add_project_arguments('-fstack-protector-strong', language: 'c')
 endif
+if get_option('buildtype') == 'release'
+    cargo_build_flags = ['--release'] # for artifacts
+else
+    cargo_build_flags = []
+endif

 prefix = get_option('prefix')
+bindir = join_paths(prefix, get_option('bindir'))
 datadir = join_paths(prefix, get_option('datadir'))
 pkgdatadir = join_paths(datadir, meson.project_name())
 if get_option('depdatadir') == ''
@ -54,12 +60,12 @@ summary = [
 ]
 message('\n'.join(summary))

-cargo = find_program('cargo')
+dep_cargo = find_program('cargo')
 cargo_script = find_program('cargo.sh')
+cargo_build = find_program('cargo_build.sh')

 subdir('data')
 subdir('protocols')
-subdir('eek')
 subdir('src')
-subdir('po')
+subdir('tools')
 subdir('tests')
--- a/po/LINGUAS
+++ b/po/LINGUAS
@ -1,2 +0,0 @@
-ja
-
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@ -1,8 +0,0 @@
-eekboard/eekboard-context-service.c
-eekboard/eekboard-service.c
-src/server-service.c
-src/server-context-service.c
-src/server-main.c
-src/client.c
-src/client-main.c
-[type: gettext/glade]src/preferences-dialog.ui
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@ -1,7 +0,0 @@
-eek/eek-element.c
-eek/eek-container.c
-eek/eek-key.c
-eek/eek-keyboard.c
-eek/eek-section.c
-eekboard/eekboard-client.c
-eekboard/eekboard-context.c
--- a/po/ja.po
+++ b/po/ja.po
@ -1,95 +0,0 @@
-# Japanese translations for eekboard package
-# eekboard パッケージに対する英訳.
-# Copyright (C) 2010-2011 Daiki Ueno <ueno@unixuser.org>
-# This file is distributed under the same license as the eekboard package.
-# Daiki Ueno <ueno@unixuser.org>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: eekboard 0.90.2\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-25 13:13+0900\n"
-"PO-Revision-Date: 2011-02-25 13:14+0900\n"
-"Last-Translator: Daiki Ueno <ueno@unixuser.org>\n"
-"Language-Team: Japanese\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: ../src/server-context.c:216
-msgid "Keyboard"
-msgstr "キーボード"
-
-#: ../src/client-main.c:41 ../src/desktop-client-main.c:41
-msgid "Connect to the system bus"
-msgstr "システムバスに接続"
-
-#: ../src/client-main.c:43 ../src/desktop-client-main.c:43
-msgid "Connect to the session bus"
-msgstr "セッションバスに接続"
-
-#: ../src/client-main.c:45 ../src/desktop-client-main.c:45
-msgid "Connect to the given D-Bus address"
-msgstr "与えられた D-Bus アドレスに接続"
-
-#: ../src/client-main.c:47
-msgid "Upload keyboard description from an XML file"
-msgstr "XML ファイルから読み込んだキーボード記述をアップロード"
-
-#: ../src/client-main.c:49
-msgid "Set group of the keyboard"
-msgstr "キーボードのグループを設定"
-
-#: ../src/client-main.c:51
-msgid "Show keyboard"
-msgstr "キーボードを表示"
-
-#: ../src/client-main.c:53
-msgid "Hide keyboard"
-msgstr "キーボードを隠す"
-
-#: ../src/client-main.c:55
-msgid "Press key"
-msgstr "キーを押す"
-
-#: ../src/client-main.c:57
-msgid "Release key"
-msgstr "キーを離す"
-
-#: ../src/client-main.c:59
-msgid "Listen events"
-msgstr "イベントの通知を受ける"
-
-#: ../src/desktop-client-main.c:48
-msgid "Listen focus change events with AT-SPI"
-msgstr "AT-SPI によるフォーカス変更イベントの通知を受ける"
-
-#: ../src/desktop-client-main.c:50
-msgid "Listen keystroke events with AT-SPI"
-msgstr "AT-SPI による打鍵イベントの通知を受ける"
-
-#: ../src/xml-main.c:46
-msgid "Show the keyboard loaded from an XML file"
-msgstr "XML ファイルから読み込んだキーボードを表示"
-
-#: ../src/xml-main.c:48
-msgid "Output the current layout into an XML file"
-msgstr "現在のレイアウトを XML ファイルに出力"
-
-#: ../src/xml-main.c:50
-msgid "List configuration items for given spec"
-msgstr "与えられたスペックのための設定項目を一覧"
-
-#: ../src/xml-main.c:52
-msgid "Specify model"
-msgstr "モデルを指定"
-
-#: ../src/xml-main.c:54
-msgid "Specify layouts"
-msgstr "レイアウトを指定"
-
-#: ../src/xml-main.c:56
-msgid "Specify options"
-msgstr "オプションを指定"
--- a/po/meson.build
+++ b/po/meson.build
@ -1,9 +0,0 @@
-i18n.gettext('squeekboard',
-    preset: 'glib',
-    args: [
-        '--copyright-holder=Purism SPC',
-        '--package-name=Squeekboard',
-        '--package-version=' + meson.project_version(),
-        '--msgid-bugs-address=dorota.czaplejewicz@puri.sm'
-    ]
-)
--- a/src/action.rs
+++ b/src/action.rs
@ -36,4 +36,5 @@ pub enum Action {
        /// The key events this symbol submits when submitting text is not possible
        keys: Vec<KeySym>,
    },
+    ShowPreferences,
 }
--- a/src/bin/test_layout.rs
+++ b/src/bin/test_layout.rs
@ -0,0 +1,16 @@
+#[macro_use]
+extern crate clap;
+extern crate rs;
+
+use rs::tests::check_layout_file;
+
+fn main() -> () {
+    let matches = clap_app!(test_layout =>
+        (name: "squeekboard-test-layout")
+        (about: "Test keyboard layout for errors. Returns OK or an error message containing further information.")
+        (@arg INPUT: +required "Yaml keyboard layout file to test")
+    ).get_matches();
+    if check_layout_file(matches.value_of("INPUT").unwrap()) == () {
+        println!("Test result: OK");
+    }
+}
--- a/src/data.rs
+++ b/src/data.rs
@ -1,5 +1,7 @@
 /**! The parsing of the data files for layouts */

+// TODO: find a nice way to make sure non-positive sizes don't break layouts
+
 use std::cell::RefCell;
 use std::collections::{ HashMap, HashSet };
 use std::env;
@ -17,18 +19,19 @@ use ::keyboard::{
    KeyState, PressType,
    generate_keymap, generate_keycodes, FormattingError
 };
+use ::layout;
 use ::layout::ArrangementKind;
+use ::logging::PrintWarnings;
 use ::resources;
 use ::util::c::as_str;
 use ::util::hash_map_map;
 use ::xdg;

 // traits, derives
+use serde::Deserialize;
 use std::io::BufReader;
 use std::iter::FromIterator;
-
-use serde::Deserialize;
-
+use ::logging::WarningHandler;

 /// Gathers stuff defined in C or called by C
 pub mod c {
@ -154,18 +157,19 @@ fn list_layout_sources(
 fn load_layout_data(source: DataSource)
    -> Result<::layout::LayoutData, LoadError>
 {
+    let handler = PrintWarnings{};
    match source {
        DataSource::File(path) => {
            Layout::from_file(path.clone())
                .map_err(LoadError::BadData)
                .and_then(|layout|
-                    layout.build().map_err(LoadError::BadKeyMap)
+                    layout.build(handler).0.map_err(LoadError::BadKeyMap)
                )
        },
        DataSource::Resource(name) => {
            Layout::from_resource(&name)
                .and_then(|layout|
-                    layout.build().map_err(LoadError::BadKeyMap)
+                    layout.build(handler).0.map_err(LoadError::BadKeyMap)
                )
        },
    }
@ -206,41 +210,47 @@ fn load_layout_data_with_fallback(
 #[derive(Debug, Deserialize, PartialEq)]
 #[serde(deny_unknown_fields)]
 pub struct Layout {
-    bounds: Bounds,
+    #[serde(default)]
+    margins: Margins,
    views: HashMap<String, Vec<ButtonIds>>,
    #[serde(default)] 
    buttons: HashMap<String, ButtonMeta>,
    outlines: HashMap<String, Outline>
 }

-#[derive(Debug, Clone, Deserialize, PartialEq)]
+#[derive(Debug, Clone, Deserialize, PartialEq, Default)]
 #[serde(deny_unknown_fields)]
-struct Bounds {
-    x: f64,
-    y: f64,
-    width: f64,
-    height: f64,
+struct Margins {
+    top: f64,
+    bottom: f64,
+    side: f64,
 }

 /// Buttons are embedded in a single string
 type ButtonIds = String;

+/// All info about a single button
+/// Buttons can have multiple instances though.
 #[derive(Debug, Default, Deserialize, PartialEq)]
 #[serde(deny_unknown_fields)]
 struct ButtonMeta {
-    /// Action other than keysym (conflicts with keysym)
+    /// Special action to perform on activation. Conflicts with keysym, text.
    action: Option<Action>,
-    /// The name of the outline. If not present, will be "default"
-    outline: Option<String>,
-    /// FIXME: start using it
+    /// The name of the XKB keysym to emit on activation.
+    /// Conflicts with action, text
    keysym: Option<String>,
-    /// If not present, will be derived from the button ID
+    /// The text to submit on activation. Will be derived from ID if not present
+    /// Conflicts with action, keysym
+    text: Option<String>,
+    /// If not present, will be derived from text or the button ID
    label: Option<String>,
    /// Conflicts with label
    icon: Option<String>,
+    /// The name of the outline. If not present, will be "default"
+    outline: Option<String>,
 }

-#[derive(Debug, Deserialize, PartialEq)]
+#[derive(Debug, Deserialize, PartialEq, Clone)]
 #[serde(deny_unknown_fields)]
 enum Action {
    #[serde(rename="locking")]
@ -254,7 +264,8 @@ enum Action {
 #[derive(Debug, Clone, Deserialize, PartialEq)]
 #[serde(deny_unknown_fields)]
 struct Outline {
-    bounds: Bounds,
+    width: f64,
+    height: f64,
 }

 /// Errors encountered loading the layout into yaml
@ -288,6 +299,20 @@ impl From<io::Error> for Error {
    }
 }

+pub fn add_offsets<'a, I: 'a, T, F: 'a>(iterator: I, get_size: F)
+    -> impl Iterator<Item=(f64, T)> + 'a
+    where I: Iterator<Item=T>,
+        F: Fn(&T) -> f64,
+{
+    let mut offset = 0.0;
+    iterator.map(move |item| {
+        let size = get_size(&item);
+        let value = (offset, item);
+        offset += size;
+        value
+    })
+}
+
 impl Layout {
    pub fn from_resource(name: &str) -> Result<Layout, LoadError> {
        let data = resources::get_keyboard(name)
@ -296,7 +321,7 @@ impl Layout {
                    .map_err(LoadError::BadResource)
    }

-    fn from_file(path: PathBuf) -> Result<Layout, Error> {
+    pub fn from_file(path: PathBuf) -> Result<Layout, Error> {
        let infile = BufReader::new(
            fs::OpenOptions::new()
                .read(true)
@ -305,8 +330,8 @@ impl Layout {
        serde_yaml::from_reader(infile).map_err(Error::Yaml)
    }

-    pub fn build(self)
-        -> Result<::layout::LayoutData, FormattingError>
+    pub fn build<H: WarningHandler>(self, mut warning_handler: H)
+        -> (Result<::layout::LayoutData, FormattingError>, H)
    {
        let button_names = self.views.values()
            .flat_map(|rows| {
@ -323,7 +348,8 @@ impl Layout {
                create_action(
                    &self.buttons,
                    name,
-                    self.views.keys().collect()
+                    self.views.keys().collect(),
+                    &mut warning_handler,
                )
            )}).collect();

@ -368,13 +394,15 @@ impl Layout {
            )
        });

-        let button_states
-            = HashMap::<String, KeyState>::from_iter(
-                button_states
-            );
+        let button_states = HashMap::<String, KeyState>::from_iter(
+            button_states
+        );

        // TODO: generate from symbols
-        let keymap_str = generate_keymap(&button_states)?;
+        let keymap_str = match generate_keymap(&button_states) {
+            Err(e) => { return (Err(e), warning_handler) },
+            Ok(v) => v,
+        };

        let button_states_cache = hash_map_map(
            button_states,
@ -385,148 +413,186 @@ impl Layout {
        );

        let views = HashMap::from_iter(
-            self.views.iter().map(|(name, view)| {(
-                name.clone(),
-                Box::new(::layout::View {
-                    bounds: ::layout::c::Bounds {
-                        x: self.bounds.x,
-                        y: self.bounds.y,
-                        width: self.bounds.width,
-                        height: self.bounds.height,
-                    },
-                    rows: view.iter().map(|row| {
-                        Box::new(::layout::Row {
-                            angle: 0,
-                            bounds: None,
-                            buttons: row.split_ascii_whitespace().map(|name| {
-                                Box::new(create_button(
-                                    &self.buttons,
-                                    &self.outlines,
-                                    name,
-                                    button_states_cache.get(name.into())
-                                        .expect("Button state not created")
-                                        .clone()
-                                ))
-                            }).collect(),
-                        })
-                    }).collect(),
-                })
-            )})
+            self.views.iter().map(|(name, view)| {
+                let rows = view.iter().map(|row| {
+                    let buttons = row.split_ascii_whitespace()
+                        .map(|name| {
+                            Box::new(create_button(
+                                &self.buttons,
+                                &self.outlines,
+                                name,
+                                button_states_cache.get(name.into())
+                                    .expect("Button state not created")
+                                    .clone(),
+                                &mut warning_handler,
+                            ))
+                        });
+                    ::layout::Row {
+                        angle: 0,
+                        buttons: add_offsets(
+                            buttons,
+                            |button| button.size.width,
+                        ).collect()
+                    }
+                });
+                let rows = add_offsets(rows, |row| row.get_height())
+                    .collect();
+                (
+                    name.clone(),
+                    layout::View::new(rows)
+                )
+            })
        );

-        Ok(::layout::LayoutData {
-            views: views,
-            keymap_str: {
-                CString::new(keymap_str)
-                    .expect("Invalid keymap string generated")
-            },
-        })
+        (
+            Ok(::layout::LayoutData {
+                views: views,
+                keymap_str: {
+                    CString::new(keymap_str)
+                        .expect("Invalid keymap string generated")
+                },
+                // FIXME: use a dedicated field
+                margins: layout::Margins {
+                    top: self.margins.top,
+                    left: self.margins.side,
+                    bottom: self.margins.bottom,
+                    right: self.margins.side,
+                },
+            }),
+            warning_handler,
+        )
    }
 }

-fn create_action(
+fn create_action<H: WarningHandler>(
    button_info: &HashMap<String, ButtonMeta>,
    name: &str,
    view_names: Vec<&String>,
+    warning_handler: &mut H,
 ) -> ::action::Action {
    let default_meta = ButtonMeta::default();
    let symbol_meta = button_info.get(name)
        .unwrap_or(&default_meta);
-    
-    fn filter_view_name(
-        button_name: &str,
-        view_name: String,
-        view_names: &Vec<&String>
-    ) -> String {
-        if view_names.contains(&&view_name) {
-            view_name
-        } else {
-            eprintln!(
-                "Button {} switches to missing view {}",
-                button_name,
-                view_name
-            );
-            "base".into()
-        }
-    }
-    
+
    fn keysym_valid(name: &str) -> bool {
        xkb::keysym_from_name(name, xkb::KEYSYM_NO_FLAGS) != xkb::KEY_NoSymbol
    }
    
-    let keysyms = match &symbol_meta.action {
-        // Non-submit action
-        Some(_) => Vec::new(),
-        // Submit action
-        None => match &symbol_meta.keysym {
-            // Keysym given explicitly
-            Some(keysym) => vec!(match keysym_valid(keysym.as_str()) {
-                true => keysym.clone(),
-                false => {
-                    eprintln!("Keysym name invalid: {}", keysym);
-                    "space".into() // placeholder
-                },
-            }),
-            // Keysyms left open to derive
-            // TODO: when button name is meant diretly as xkb keysym name,
-            // mark it so, e.g. with a "#"
-            None => match keysym_valid(name) {
-                // Button name is actually a valid xkb name
-                true => vec!(String::from(name)),
-                // Button name is not a valid xkb name,
-                // so assume it's a literal string to be submitted
-                false => {
-                    if name.chars().count() == 0 {
-                        // A name read from yaml with no valid Unicode.
-                        // Highly improbable, but let's be safe.
-                        eprintln!("Key {} doesn't have any characters", name);
-                        vec!("space".into()) // placeholder
-                    } else {
-                        name.chars().map(|codepoint| {
-                            let codepoint_string = codepoint.to_string();
-                            match keysym_valid(codepoint_string.as_str()) {
-                                true => codepoint_string,
-                                false => format!("U{:04X}", codepoint as u32),
-                            }
-                        }).collect()
-                    }
-                },
-            },
-        },
+    enum SubmitData {
+        Action(Action),
+        Text(String),
+        Keysym(String),
    };
    
-    match &symbol_meta.action {
-        Some(Action::SetView(view_name)) => ::action::Action::SetLevel(
-            filter_view_name(name, view_name.clone(), &view_names)
+    let submission = match (
+        &symbol_meta.action,
+        &symbol_meta.keysym,
+        &symbol_meta.text
+    ) {
+        (Some(action), None, None) => SubmitData::Action(action.clone()),
+        (None, Some(keysym), None) => SubmitData::Keysym(keysym.clone()),
+        (None, None, Some(text)) => SubmitData::Text(text.clone()),
+        (None, None, None) => SubmitData::Text(name.into()),
+        _ => {
+            warning_handler.handle(&format!(
+                "Button {} has more than one of (action, keysym, text)",
+                name
+            ));
+            SubmitData::Text("".into())
+        },
+    };
+
+    fn filter_view_name<H: WarningHandler>(
+        button_name: &str,
+        view_name: String,
+        view_names: &Vec<&String>,
+        warning_handler: &mut H,
+    ) -> String {
+        if view_names.contains(&&view_name) {
+            view_name
+        } else {
+            warning_handler.handle(&format!("Button {} switches to missing view {}",
+                button_name,
+                view_name,
+            ));
+            "base".into()
+        }
+    }
+
+    match submission {
+        SubmitData::Action(
+            Action::SetView(view_name)
+        ) => ::action::Action::SetLevel(
+            filter_view_name(
+                name, view_name.clone(), &view_names,
+                warning_handler,
+            )
        ),
-        Some(Action::Locking {
+        SubmitData::Action(Action::Locking {
            lock_view, unlock_view
        }) => ::action::Action::LockLevel {
-            lock: filter_view_name(name, lock_view.clone(), &view_names),
+            lock: filter_view_name(
+                name,
+                lock_view.clone(),
+                &view_names,
+                warning_handler,
+            ),
            unlock: filter_view_name(
                name,
                unlock_view.clone(),
-                &view_names
+                &view_names,
+                warning_handler,
            ),
        },
-        Some(Action::ShowPrefs) => ::action::Action::Submit {
+        SubmitData::Action(
+            Action::ShowPrefs
+        ) => ::action::Action::ShowPreferences,
+        SubmitData::Keysym(keysym) => ::action::Action::Submit {
            text: None,
-            keys: Vec::new(),
-        },
-        None => ::action::Action::Submit {
-            text: None,
-            keys: keysyms.into_iter().map(::action::KeySym).collect(),
+            keys: vec!(::action::KeySym(
+                match keysym_valid(keysym.as_str()) {
+                    true => keysym.clone(),
+                    false => {
+                        warning_handler.handle(&format!(
+                            "Keysym name invalid: {}",
+                            keysym,
+                        ));
+                        "space".into() // placeholder
+                    },
+                }
+            )),
        },
+        SubmitData::Text(text) => ::action::Action::Submit {
+            text: {
+                CString::new(text.clone())
+                    .map_err(|e| {
+                        warning_handler.handle(&format!(
+                            "Text {} contains problems: {:?}",
+                            text,
+                            e
+                        ));
+                        e
+                    }).ok()
+            },
+            keys: text.chars().map(|codepoint| {
+                let codepoint_string = codepoint.to_string();
+                ::action::KeySym(match keysym_valid(codepoint_string.as_str()) {
+                    true => codepoint_string,
+                    false => format!("U{:04X}", codepoint as u32),
+                })
+            }).collect(),
+        }
    }
 }

 /// TODO: Since this will receive user-provided data,
 /// all .expect() on them should be turned into soft fails
-fn create_button(
+fn create_button<H: WarningHandler>(
    button_info: &HashMap<String, ButtonMeta>,
    outlines: &HashMap<String, Outline>,
    name: &str,
    state: Rc<RefCell<KeyState>>,
+    warning_handler: &mut H,
 ) -> ::layout::Button {
    let cname = CString::new(name.clone())
        .expect("Bad name");
@ -542,6 +608,18 @@ fn create_button(
    } else if let Some(icon) = &button_meta.icon {
        ::layout::Label::IconName(CString::new(icon.as_str())
            .expect("Bad icon"))
+    } else if let Some(text) = &button_meta.text {
+        ::layout::Label::Text(
+            CString::new(text.as_str())
+                .unwrap_or_else(|e| {
+                    warning_handler.handle(&format!(
+                        "Text {} is invalid: {}",
+                        text,
+                        e,
+                    ));
+                    CString::new("").unwrap()
+                })
+        )
    } else {
        ::layout::Label::Text(cname.clone())
    };
@ -551,7 +629,7 @@ fn create_button(
            if outlines.contains_key(outline) {
                outline.clone()
            } else {
-                eprintln!("Outline named {} does not exist! Using default for button {}", outline, name);
+                warning_handler.handle(&format!("Outline named {} does not exist! Using default for button {}", outline, name));
                "default".into()
            }
        }
@ -561,21 +639,19 @@ fn create_button(
    let outline = outlines.get(&outline_name)
        .map(|outline| (*outline).clone())
        .unwrap_or_else(|| {
-            eprintln!("No default outline defied Using 1x1!");
-            Outline {
-                bounds: Bounds { x: 0f64, y: 0f64, width: 1f64, height: 1f64 },
-            }
+            warning_handler.handle(
+                &format!("No default outline defined! Using 1x1!")
+            );
+            Outline { width: 1f64, height: 1f64 }
        });

-    ::layout::Button {
+    layout::Button {
        name: cname,
        outline_name: CString::new(outline_name).expect("Bad outline"),
        // TODO: do layout before creating buttons
-        bounds: ::layout::c::Bounds {
-            x: outline.bounds.x,
-            y: outline.bounds.y,
-            width: outline.bounds.width,
-            height: outline.bounds.height,
+        size: layout::Size {
+            width: outline.width,
+            height: outline.height,
        },
        label: label,
        state: state,
@ -587,13 +663,14 @@ mod tests {
    use super::*;
    
    use std::error::Error as ErrorTrait;
+    use ::logging::PanicWarn;

    #[test]
    fn test_parse_path() {
        assert_eq!(
            Layout::from_file(PathBuf::from("tests/layout.yaml")).unwrap(),
            Layout {
-                bounds: Bounds { x: 0f64, y: 0f64, width: 0f64, height: 0f64 },
+                margins: Margins { top: 0f64, bottom: 0f64, side: 0f64 },
                views: hashmap!(
                    "base".into() => vec!("test".into()),
                ),
@ -602,16 +679,13 @@ mod tests {
                        icon: None,
                        keysym: None,
                        action: None,
+                        text: None,
                        label: Some("test".into()),
                        outline: None,
                    }
                },
                outlines: hashmap!{
-                    "default".into() => Outline {
-                        bounds: Bounds {
-                            x: 0f64, y: 0f64, width: 0f64, height: 0f64
-                        }, 
-                    }
+                    "default".into() => Outline { width: 0f64, height: 0f64 }, 
                },
            }
        );
@ -659,12 +733,12 @@ mod tests {
    fn test_layout_punctuation() {
        let out = Layout::from_file(PathBuf::from("tests/layout_key1.yaml"))
            .unwrap()
-            .build()
+            .build(PanicWarn).0
            .unwrap();
        assert_eq!(
            out.views["base"]
-                .rows[0]
-                .buttons[0]
+                .get_rows()[0].1
+                .buttons[0].1
                .label,
            ::layout::Label::Text(CString::new("test").unwrap())
        );
@ -674,12 +748,12 @@ mod tests {
    fn test_layout_unicode() {
        let out = Layout::from_file(PathBuf::from("tests/layout_key2.yaml"))
            .unwrap()
-            .build()
+            .build(PanicWarn).0
            .unwrap();
        assert_eq!(
            out.views["base"]
-                .rows[0]
-                .buttons[0]
+                .get_rows()[0].1
+                .buttons[0].1
                .label,
            ::layout::Label::Text(CString::new("test").unwrap())
        );
@ -690,12 +764,12 @@ mod tests {
    fn test_layout_unicode_multi() {
        let out = Layout::from_file(PathBuf::from("tests/layout_key3.yaml"))
            .unwrap()
-            .build()
+            .build(PanicWarn).0
            .unwrap();
        assert_eq!(
            out.views["base"]
-                .rows[0]
-                .buttons[0]
+                .get_rows()[0].1
+                .buttons[0].1
                .state.borrow()
                .keycodes.len(),
            2
@ -705,7 +779,7 @@ mod tests {
    #[test]
    fn parsing_fallback() {
        assert!(Layout::from_resource(FALLBACK_LAYOUT_NAME)
-            .and_then(|layout| layout.build().map_err(LoadError::BadKeyMap))
+            .map(|layout| layout.build(PanicWarn).0.unwrap())
            .is_ok()
        );
    }
@ -745,17 +819,36 @@ mod tests {
                    ".".into() => ButtonMeta {
                        icon: None,
                        keysym: None,
+                        text: None,
                        action: None,
                        label: Some("test".into()),
                        outline: None,
                    }
                },
                ".",
-                Vec::new()
+                Vec::new(),
+                &mut PanicWarn,
            ),
            ::action::Action::Submit {
-                text: None,
+                text: Some(CString::new(".").unwrap()),
                keys: vec!(::action::KeySym("U002E".into())),
+            },
+        );
+    }
+
+    #[test]
+    fn test_layout_margins() {
+        let out = Layout::from_file(PathBuf::from("tests/layout_margins.yaml"))
+            .unwrap()
+            .build(PanicWarn).0
+            .unwrap();
+        assert_eq!(
+            out.margins,
+            layout::Margins {
+                top: 1.0,
+                bottom: 3.0,
+                left: 2.0,
+                right: 2.0,
            }
        );
    }
--- a/src/drawing.rs
+++ b/src/drawing.rs
@ -0,0 +1,120 @@
+/*! Drawing the UI */
+
+use cairo;
+use std::cell::RefCell;
+
+use ::keyboard;
+use ::layout::{ Button, Layout };
+use ::layout::c::{ EekGtkKeyboard, Point };
+
+use glib::translate::FromGlibPtrNone;
+use gtk::WidgetExt;
+
+mod c {
+    use super::*;
+
+    use cairo_sys;
+    use std::os::raw::c_void;
+    
+    // This is constructed only in C, no need for warnings
+    #[allow(dead_code)]
+    #[repr(transparent)]
+    #[derive(Clone, Copy)]
+    pub struct EekRenderer(*const c_void);
+
+    #[no_mangle]
+    extern "C" {
+        // Button and View inside CButtonPlace are safe to pass to C
+        // as long as they don't outlive the call
+        // and nothing dereferences them
+        #[allow(improper_ctypes)]
+        pub fn eek_render_button(
+            renderer: EekRenderer,
+            cr: *mut cairo_sys::cairo_t,
+            button: *const Button,
+            pressed: u64,
+            locked: u64,
+        );
+    }
+
+    #[no_mangle]
+    pub extern "C"
+    fn squeek_layout_draw_all_changed(
+        layout: *mut Layout,
+        renderer: EekRenderer,
+        cr: *mut cairo_sys::cairo_t,
+    ) {
+        let layout = unsafe { &mut *layout };
+        let cr = unsafe { cairo::Context::from_raw_none(cr) };
+
+        let view = layout.get_current_view();
+        for (row_offset, row) in &view.get_rows() {
+            for (x_offset, button) in &row.buttons {
+                let state = RefCell::borrow(&button.state).clone();
+                if state.pressed == keyboard::PressType::Pressed || state.locked {
+                    render_button_at_position(
+                        renderer, &cr,
+                        row_offset + Point { x: *x_offset, y: 0.0 },
+                        button.as_ref(),
+                        state.pressed, state.locked,
+                    );
+                }
+            }
+        }
+    }
+    
+    #[no_mangle]
+    pub extern "C"
+    fn squeek_draw_layout_base_view(
+        layout: *mut Layout,
+        renderer: EekRenderer,
+        cr: *mut cairo_sys::cairo_t,
+    ) {
+        let layout = unsafe { &mut *layout };
+        let cr = unsafe { cairo::Context::from_raw_none(cr) };
+        let view = layout.get_current_view();
+        for (row_offset, row) in &view.get_rows() {
+            for (x_offset, button) in &row.buttons {
+                render_button_at_position(
+                    renderer, &cr,
+                    row_offset + Point { x: *x_offset, y: 0.0 },
+                    button.as_ref(),
+                    keyboard::PressType::Released, false,
+                );
+            }
+        }
+    }
+}
+
+/// Renders a button at a position (button's own bounds ignored)
+pub fn render_button_at_position(
+    renderer: c::EekRenderer,
+    cr: &cairo::Context,
+    position: Point,
+    button: &Button,
+    pressed: keyboard::PressType,
+    locked: bool,
+) {
+    cr.save();
+    cr.translate(position.x, position.y);
+    cr.rectangle(
+        0.0, 0.0,
+        button.size.width, button.size.height
+    );
+    cr.clip();
+    unsafe {
+        c::eek_render_button(
+            renderer,
+            cairo::Context::to_raw_none(&cr),
+            button as *const Button,
+            pressed as u64,
+            locked as u64,
+        )
+    };
+    cr.restore();
+}
+
+pub fn queue_redraw(keyboard: EekGtkKeyboard) {
+    let widget = unsafe { gtk::Widget::from_glib_none(keyboard.0) };
+    widget.queue_draw();
+}
--- a/src/keyboard.h
+++ b/src/keyboard.h
@ -1,12 +0,0 @@
-#ifndef __KEYBOARD_H
-#define __KEYBOARD_H
-
-#include "inttypes.h"
-#include "stdbool.h"
-#include "virtual-keyboard-unstable-v1-client-protocol.h"
-
-struct squeek_key;
-
-uint32_t squeek_key_is_pressed(struct squeek_key *key);
-uint32_t squeek_key_is_locked(struct squeek_key *key);
-#endif
--- a/src/keyboard.rs
+++ b/src/keyboard.rs
@ -10,32 +10,8 @@ use ::action::Action;

 use std::io::Write;
 use std::iter::{ FromIterator, IntoIterator };
-use ::util::CloneOwned;

-/// Gathers stuff defined in C or called by C
-pub mod c {
-    use super::*;
-    use ::util::c;
-
-    pub type CKeyState = c::Wrapped<KeyState>;
-
-    // The following defined in Rust. TODO: wrap naked pointers to Rust data inside RefCells to prevent multiple writers
-
-    #[no_mangle]
-    pub extern "C"
-    fn squeek_key_is_pressed(key: CKeyState) -> u32 {
-        //let key = unsafe { Rc::from_raw(key.0) };
-        return key.clone_owned().pressed as u32;
-    }
-
-    #[no_mangle]
-    pub extern "C"
-    fn squeek_key_is_locked(key: CKeyState) -> u32 {
-        return key.clone_owned().locked as u32;
-    }
-}
-
-#[derive(Debug, Clone, Copy)]
+#[derive(Debug, Clone, Copy, PartialEq)]
 pub enum PressType {
    Released = 0,
    Pressed = 1,
@ -51,14 +27,26 @@ pub struct KeyState {
    pub action: Action,
 }

-/// Generates a mapping where each key gets a keycode, starting from 8
+/// Sorts an iterator by converting it to a Vector and back
+fn sorted<'a, I: Iterator<Item=&'a str>>(
+    iter: I
+) -> impl Iterator<Item=&'a str> {
+    let mut v: Vec<&'a str> = iter.collect();
+    v.sort();
+    v.into_iter()
+}
+
+/// Generates a mapping where each key gets a keycode, starting from ~~8~~
+/// HACK: starting from 9, because 8 results in keycode 0,
+/// which the compositor likes to discard
 pub fn generate_keycodes<'a, C: IntoIterator<Item=&'a str>>(
    key_names: C
 ) -> HashMap<String, u32> {
    HashMap::from_iter(
-        key_names.into_iter()
+        // sort to remove a source of indeterminism in keycode assignment
+        sorted(key_names.into_iter())
            .map(|name| String::from(name))
-            .zip(8..)
+            .zip(9..)
    )
 }

--- a/src/layout.h
+++ b/src/layout.h
@ -5,8 +5,8 @@
 #include <glib.h>
 #include "eek/eek-element.h"
 #include "eek/eek-gtk-keyboard.h"
+#include "eek/eek-renderer.h"
 #include "eek/eek-types.h"
-#include "src/keyboard.h"
 #include "virtual-keyboard-unstable-v1-client-protocol.h"

 enum squeek_arrangement_kind {
@ -14,55 +14,30 @@ enum squeek_arrangement_kind {
    ARRANGEMENT_KIND_WIDE = 1,
 };

-struct squeek_button;
-struct squeek_row;
-struct squeek_view;
 struct squeek_layout;

-/// Represents the path to the button within a view
-struct button_place {
-    const struct squeek_row *row;
-    const struct squeek_button *button;
-};
-
-int32_t squeek_row_get_angle(const struct squeek_row*);
-
-EekBounds squeek_row_get_bounds(const struct squeek_row*);
-
-typedef void (*ButtonCallback) (struct squeek_button *button, gpointer user_data);
-void squeek_row_foreach(struct squeek_row*,
-                            ButtonCallback   callback,
-                            gpointer      user_data);
-
 EekBounds squeek_button_get_bounds(const struct squeek_button*);
 const char *squeek_button_get_label(const struct squeek_button*);
 const char *squeek_button_get_icon_name(const struct squeek_button*);
 const char *squeek_button_get_name(const struct squeek_button*);
 const char *squeek_button_get_outline_name(const struct squeek_button*);

-struct squeek_key *squeek_button_get_key(const struct squeek_button*);
-uint32_t *squeek_button_has_key(const struct squeek_button* button,
-                                const struct squeek_key *key);
 void squeek_button_print(const struct squeek_button* button);

-
-EekBounds squeek_view_get_bounds(const struct squeek_view*);
-
-typedef void (*RowCallback) (struct squeek_row *row, gpointer user_data);
-void squeek_view_foreach(struct squeek_view*,
-                            RowCallback   callback,
-                            gpointer      user_data);
-
-void
-squeek_layout_place_contents(struct squeek_layout*);
-struct squeek_view *squeek_layout_get_current_view(struct squeek_layout*);
+struct transformation squeek_layout_calculate_transformation(
+        const struct squeek_layout *layout,
+        double allocation_width, double allocation_size);

 struct squeek_layout *squeek_load_layout(const char *name, uint32_t type);
 const char *squeek_layout_get_keymap(const struct squeek_layout*);
 enum squeek_arrangement_kind squeek_layout_get_kind(const struct squeek_layout *);
 void squeek_layout_free(struct squeek_layout*);

-void squeek_layout_release(struct squeek_layout *layout, struct zwp_virtual_keyboard_v1 *virtual_keyboard, uint32_t timestamp, EekGtkKeyboard *ui_keyboard);
+void squeek_layout_release(struct squeek_layout *layout, struct zwp_virtual_keyboard_v1 *virtual_keyboard,
+                           struct transformation widget_to_layout,
+                           uint32_t timestamp,
+                           EekboardContextService *manager,
+                           EekGtkKeyboard *ui_keyboard);
 void squeek_layout_release_all_only(struct squeek_layout *layout, struct zwp_virtual_keyboard_v1 *virtual_keyboard, uint32_t timestamp);
 void squeek_layout_depress(struct squeek_layout *layout, struct zwp_virtual_keyboard_v1 *virtual_keyboard,
                           double x_widget, double y_widget,
@ -71,6 +46,8 @@ void squeek_layout_depress(struct squeek_layout *layout, struct zwp_virtual_keyb
 void squeek_layout_drag(struct squeek_layout *layout, struct zwp_virtual_keyboard_v1 *virtual_keyboard,
                        double x_widget, double y_widget,
                        struct transformation widget_to_layout,
-                        uint32_t timestamp, EekGtkKeyboard *ui_keyboard);
-void squeek_layout_draw_all_changed(struct squeek_layout *layout, EekGtkKeyboard *ui_keyboard);
+                        uint32_t timestamp, EekboardContextService *manager,
+                        EekGtkKeyboard *ui_keyboard);
+void squeek_layout_draw_all_changed(struct squeek_layout *layout, EekRenderer* renderer, cairo_t     *cr);
+void squeek_draw_layout_base_view(struct squeek_layout *layout, EekRenderer* renderer, cairo_t     *cr);
 #endif
--- a/src/layout.rs
+++ b/src/layout.rs
--- a/src/lib.rs
+++ b/src/lib.rs
@ -1,19 +1,36 @@
 #[macro_use]
 extern crate bitflags;
+extern crate cairo;
+extern crate cairo_sys;
+extern crate gdk;
+extern crate gio;
+extern crate glib;
+extern crate glib_sys;
+extern crate gtk;
+extern crate gtk_sys;
 #[allow(unused_imports)]
 #[macro_use] // only for tests
 extern crate maplit;
+extern crate regex;
 extern crate serde;
 extern crate xkbcommon;

 mod action;
 pub mod data;
+mod drawing;
 pub mod float_ord;
 pub mod imservice;
 mod keyboard;
 mod layout;
+mod locale;
+mod locale_config;
+mod logging;
+mod manager;
 mod outputs;
+mod popover;
 mod resources;
 mod submission;
-mod util;
+mod style;
+pub mod tests;
+pub mod util;
 mod xdg;
--- a/src/locale.rs
+++ b/src/locale.rs
@ -0,0 +1,42 @@
+/*! Locale-specific functions */
+
+use std::cmp;
+use std::ffi::CString;
+
+mod c {
+    use std::os::raw::c_char;
+
+    #[allow(non_camel_case_types)]
+    pub type c_int = i32;
+
+    #[no_mangle]
+    extern "C" {
+        // from libc
+        pub fn strcoll(cs: *const c_char, ct: *const c_char) -> c_int;
+    }
+}
+
+#[derive(Clone, Debug, PartialEq)]
+pub struct Translation<'a>(pub &'a str);
+
+fn cstring_safe(s: &str) -> CString {
+    CString::new(s)
+        .unwrap_or(CString::new("").unwrap())
+}
+
+pub fn compare_current_locale(a: &str, b: &str) -> cmp::Ordering {
+    let a = cstring_safe(a);
+    let b = cstring_safe(b);
+    let a = a.as_ptr();
+    let b = b.as_ptr();
+    let result = unsafe { c::strcoll(a, b) };
+    if result == 0 {
+        cmp::Ordering::Equal
+    } else if result > 0 {
+        cmp::Ordering::Greater
+    } else if result < 0 {
+        cmp::Ordering::Less
+    } else {
+        unreachable!()
+    }
+}
--- a/src/locale_config.rs
+++ b/src/locale_config.rs
@ -0,0 +1,541 @@
+/*! Locale detection and management.
+ * Based on https://github.com/rust-locale/locale_config
+ * 
+ * Ready for deletion/replacement once Debian starts packaging this,
+ * although this version doesn't need lazy_static.
+ * 
+ * Copyright (c) 2016–2019 Jan Hudec <bulb@ucw.cz>
+   Copyright (c) 2016 A.J. Gardner <aaron.j.gardner@gmail.com>
+   Copyright (c) 2019, Bastien Orivel <eijebong@bananium.fr>
+   Copyright (c) 2019, Igor Gnatenko <i.gnatenko.brain@gmail.com>
+   Copyright (c) 2019, Sophie Tauchert <999eagle@999eagle.moe>
+ */
+
+use regex::Regex;
+use std::borrow::Cow;
+use std::env;
+
+/// Errors that may be returned by `locale_config`.
+#[derive(Copy,Clone,Debug,PartialEq,Eq)]
+pub enum Error {
+    /// Provided definition was not well formed.
+    ///
+    /// This is returned when provided configuration string does not match even the rather loose
+    /// definition for language range from [RFC4647] or the composition format used by `Locale`.
+    ///
+    /// [RFC4647]: https://www.rfc-editor.org/rfc/rfc4647.txt
+    NotWellFormed,
+    /// Placeholder for adding more errors in future. **Do not match!**.
+    __NonExhaustive,
+}
+
+impl ::std::fmt::Display for Error {
+    fn fmt(&self, out: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
+        use ::std::error::Error;
+        out.write_str(self.description())
+    }
+}
+
+impl ::std::error::Error for Error {
+    fn description(&self) -> &str {
+        match self {
+            &Error::NotWellFormed => "Language tag is not well-formed.",
+            // this is exception: here we do want exhaustive match so we don't publish version with
+            // missing descriptions by mistake.
+            &Error::__NonExhaustive => panic!("Placeholder error must not be instantiated!"),
+        }
+    }
+}
+
+/// Convenience Result alias.
+type Result<T> = ::std::result::Result<T, Error>;
+
+/// Iterator over `LanguageRange`s for specific category in a `Locale`
+///
+/// Returns `LanguageRange`s in the `Locale` that are applicable to provided category. The tags
+/// are returned in order of preference, which means the category-specific ones first and then
+/// the generic ones.
+///
+/// The iterator is guaranteed to return at least one value.
+pub struct TagsFor<'a, 'c> {
+    src: &'a str,
+    tags: std::str::Split<'a, &'static str>,
+    category: Option<&'c str>,
+}
+
+impl<'a, 'c> Iterator for TagsFor<'a, 'c> {
+    type Item = LanguageRange<'a>;
+    fn next(&mut self) -> Option<Self::Item> {
+        if let Some(cat) = self.category {
+            while let Some(s) = self.tags.next() {
+                if s.starts_with(cat) && s[cat.len()..].starts_with("=") {
+                    return Some(
+                        LanguageRange { language: Cow::Borrowed(&s[cat.len()+1..]) });
+                }
+            }
+            self.category = None;
+            self.tags = self.src.split(",");
+        }
+        while let Some(s) = self.tags.next() {
+            if s.find('=').is_none() {
+                return Some(
+                    LanguageRange{ language: Cow::Borrowed(s) });
+            }
+        }
+        return None;
+    }
+}
+
+/// Language and culture identifier.
+///
+/// This object holds a [RFC4647] extended language range.
+///
+/// The internal data may be owned or shared from object with lifetime `'a`. The lifetime can be
+/// extended using the `into_static()` method, which internally clones the data as needed.
+///
+/// # Syntax
+///
+/// The range is composed of `-`-separated alphanumeric subtags, possibly replaced by `*`s. It
+/// might be empty.
+///
+/// In agreement with [RFC4647], this object only requires that the tag matches:
+///
+/// ```ebnf
+/// language_tag = (alpha{1,8} | "*")
+///                ("-" (alphanum{1,8} | "*"))*
+/// ```
+///
+/// The exact interpretation is up to the downstream localization provider, but it expected that
+/// it will be matched against a normalized [RFC5646] language tag, which has the structure:
+///
+/// ```ebnf
+/// language_tag    = language
+///                   ("-" script)?
+///                   ("-" region)?
+///                   ("-" variant)*
+///                   ("-" extension)*
+///                   ("-" private)?
+///
+/// language        = alpha{2,3} ("-" alpha{3}){0,3}
+///
+/// script          = aplha{4}
+///
+/// region          = alpha{2}
+///                 | digit{3}
+///
+/// variant         = alphanum{5,8}
+///                 | digit alphanum{3}
+///
+/// extension       = [0-9a-wyz] ("-" alphanum{2,8})+
+///
+/// private         = "x" ("-" alphanum{1,8})+
+/// ```
+///
+///  * `language` is an [ISO639] 2-letter or, where not defined, 3-letter code. A code for
+///     macro-language might be followed by code of specific dialect.
+///  * `script` is an [ISO15924] 4-letter code.
+///  * `region` is either an [ISO3166] 2-letter code or, for areas other than countries, [UN M.49]
+///    3-digit numeric code.
+///  * `variant` is a string indicating variant of the language.
+///  * `extension` and `private` define additional options. The private part has same structure as
+///    the Unicode [`-u-` extension][u_ext]. Available options are documented for the facets that
+///    use them.
+///
+/// The values obtained by inspecting the system are normalized according to those rules.
+///
+/// The content will be case-normalized as recommended in [RFC5646] §2.1.1, namely:
+///
+///  * `language` is written in lowercase,
+///  * `script` is written with first capital,
+///  * `country` is written in uppercase and
+///  * all other subtags are written in lowercase.
+///
+/// When detecting system configuration, additional options that may be generated under the
+/// [`-u-` extension][u_ext] currently are:
+///
+/// * `cf` — Currency format (`account` for parenthesized negative values, `standard` for minus
+///   sign).
+/// * `fw` — First day of week (`mon` to `sun`).
+/// * `hc` — Hour cycle (`h12` for 1–12, `h23` for 0–23).
+/// * `ms` — Measurement system (`metric` or `ussystem`).
+/// * `nu` — Numbering system—only decimal systems are currently used.
+/// * `va` — Variant when locale is specified in Unix format and the tag after `@` does not
+///   correspond to any variant defined in [Language subtag registry].
+///
+/// And under the `-x-` extension, following options are defined:
+///
+/// * `df` — Date format:
+///
+///     * `iso`: Short date should be in ISO format of `yyyy-MM-dd`.
+///
+///     For example `-df-iso`.
+///
+/// * `dm` — Decimal separator for monetary:
+///
+///     Followed by one or more Unicode codepoints in hexadecimal. For example `-dm-002d` means to
+///     use comma.
+///
+/// * `ds` — Decimal separator for numbers:
+///
+///     Followed by one or more Unicode codepoints in hexadecimal. For example `-ds-002d` means to
+///     use comma.
+///
+/// * `gm` — Group (thousand) separator for monetary:
+///
+///     Followed by one or more Unicode codepoints in hexadecimal. For example `-dm-00a0` means to
+///     use non-breaking space.
+///
+/// * `gs` — Group (thousand) separator for numbers:
+///
+///     Followed by one or more Unicode codepoints in hexadecimal. For example `-ds-00a0` means to
+///     use non-breaking space.
+///
+/// * `ls` — List separator:
+///
+///     Followed by one or more Unicode codepoints in hexadecimal. For example, `-ds-003b` means to
+///     use a semicolon.
+///
+/// [RFC5646]: https://www.rfc-editor.org/rfc/rfc5646.txt
+/// [RFC4647]: https://www.rfc-editor.org/rfc/rfc4647.txt
+/// [ISO639]: https://en.wikipedia.org/wiki/ISO_639
+/// [ISO15924]: https://en.wikipedia.org/wiki/ISO_15924
+/// [ISO3166]: https://en.wikipedia.org/wiki/ISO_3166
+/// [UN M.49]: https://en.wikipedia.org/wiki/UN_M.49
+/// [u_ext]: http://www.unicode.org/reports/tr35/#u_Extension
+/// [Language subtag registry]: https://www.iana.org/assignments/language-subtag-registry/language-subtag-registry
+#[derive(Clone,Debug,Eq,Hash,PartialEq)]
+pub struct LanguageRange<'a> {
+    language: Cow<'a, str>
+}
+
+impl<'a> LanguageRange<'a> {
+    /// Return LanguageRange for the invariant locale.
+    ///
+    /// Invariant language is identified simply by empty string.
+    pub fn invariant() -> LanguageRange<'static> {
+        LanguageRange { language: Cow::Borrowed("") }
+    }
+
+    /// Create language tag from Unix/Linux/GNU locale tag.
+    ///
+    /// Unix locale tags have the form
+    ///
+    /// > *language* [ `_` *region* ] [ `.` *encoding* ] [ `@` *variant* ]
+    ///
+    /// The *language* and *region* have the same format as RFC5646. *Encoding* is not relevant
+    /// here, since Rust always uses Utf-8. That leaves *variant*, which is unfortunately rather
+    /// free-form. So this function will translate known variants to corresponding RFC5646 subtags
+    /// and represent anything else with Unicode POSIX variant (`-u-va-`) extension.
+    ///
+    /// Note: This function is public here for benefit of applications that may come across this
+    /// kind of tags from other sources than system configuration.
+    pub fn from_unix(s: &str) -> Result<LanguageRange<'static>> {
+        let unix_tag_regex = Regex::new(r"(?ix) ^
+            (?P<language> [[:alpha:]]{2,3} )
+            (?: _  (?P<region> [[:alpha:]]{2} | [[:digit:]]{3} ))?
+            (?: \. (?P<encoding> [0-9a-zA-Z-]{1,20} ))?
+            (?: @  (?P<variant> [[:alnum:]]{1,20} ))?
+        $ ").unwrap();
+        
+        let unix_invariant_regex = Regex::new(r"(?ix) ^
+            (?: c | posix )
+            (?: \. (?: [0-9a-zA-Z-]{1,20} ))?
+        $ ").unwrap();
+        
+        if let Some(caps) = unix_tag_regex.captures(s) {
+            let src_variant = caps.name("variant").map(|m| m.as_str()).unwrap_or("").to_ascii_lowercase();
+            let mut res = caps.name("language").map(|m| m.as_str()).unwrap().to_ascii_lowercase();
+            let region = caps.name("region").map(|m| m.as_str()).unwrap_or("");
+            let mut script = "";
+            let mut variant = "";
+            let mut uvariant = "";
+            match src_variant.as_ref() {
+            // Variants seen in the wild in GNU LibC (via http://lh.2xlibre.net/) or in Debian
+            // GNU/Linux Stretch system. Treatment of things not found in RFC5646 subtag registry
+            // (http://www.iana.org/assignments/language-subtag-registry/language-subtag-registry)
+            // or CLDR according to notes at https://wiki.openoffice.org/wiki/LocaleMapping.
+            // Dialects:
+                // aa_ER@saaho - NOTE: Can't be found under that name in RFC5646 subtag registry,
+                // but there is language Saho with code ssy, which is likely that thing.
+                "saaho" if res == "aa" => res = String::from("ssy"),
+            // Scripts:
+                // @arabic
+                "arabic" => script = "Arab",
+                // @cyrillic
+                "cyrl" => script = "Cyrl",
+                "cyrillic" => script = "Cyrl",
+                // @devanagari
+                "devanagari" => script = "Deva",
+                // @hebrew
+                "hebrew" => script = "Hebr",
+                // tt@iqtelif
+                // Neither RFC5646 subtag registry nor CLDR knows anything about this, but as best
+                // as I can tell it is Tatar name for Latin (default is Cyrillic).
+                "iqtelif" => script = "Latn",
+                // @Latn
+                "latn" => script = "Latn",
+                // @latin
+                "latin" => script = "Latn",
+                // en@shaw
+                "shaw" => script = "Shaw",
+            // Variants:
+                // sr@ijekavianlatin
+                "ijekavianlatin" => {
+                    script = "Latn";
+                    variant = "ijekavsk";
+                },
+                // sr@ije
+                "ije" => variant = "ijekavsk",
+                // sr@ijekavian
+                "ijekavian" => variant = "ijekavsk",
+                // ca@valencia
+                "valencia" => variant = "valencia",
+            // Currencies:
+                // @euro - NOTE: We follow suite of Java and Openoffice and ignore it, because it
+                // is default for all locales where it sometimes appears now, and because we use
+                // explicit currency in monetary formatting anyway.
+                "euro" => {},
+            // Collation:
+                // gez@abegede - NOTE: This is collation, but CLDR does not have any code for it,
+                // so we for the moment leave it fall through as -u-va- instead of -u-co-.
+            // Anything else:
+                // en@boldquot, en@quot, en@piglatin - just randomish stuff
+                // @cjknarrow - beware, it's gonna end up as -u-va-cjknarro due to lenght limit
+                s if s.len() <= 8 => uvariant = &*s,
+                s => uvariant = &s[0..8], // the subtags are limited to 8 chars, but some are longer
+            };
+            if script != "" {
+                res.push('-');
+                res.push_str(script);
+            }
+            if region != "" {
+                res.push('-');
+                res.push_str(&*region.to_ascii_uppercase());
+            }
+            if variant != "" {
+                res.push('-');
+                res.push_str(variant);
+            }
+            if uvariant != "" {
+                res.push_str("-u-va-");
+                res.push_str(uvariant);
+            }
+            return Ok(LanguageRange {
+                language: Cow::Owned(res)
+            });
+        } else if unix_invariant_regex.is_match(s) {
+            return Ok(LanguageRange::invariant())
+        } else {
+            return Err(Error::NotWellFormed);
+        }
+    }
+}
+
+impl<'a> AsRef<str> for LanguageRange<'a> {
+    fn as_ref(&self) -> &str {
+        self.language.as_ref()
+    }
+}
+
+/// Locale configuration.
+///
+/// Users may accept several languages in some order of preference and may want to use rules from
+/// different culture for some particular aspect of the program behaviour, and operating systems
+/// allow them to specify this (to various extent).
+///
+/// The `Locale` objects represent the user configuration. They contain:
+///
+///  - The primary `LanguageRange`.
+///  - Optional category-specific overrides.
+///  - Optional fallbacks in case data (usually translations) for the primary language are not
+///    available.
+///
+/// The set of categories is open-ended. The `locale` crate uses five well-known categories
+/// `messages`, `numeric`, `time`, `collate` and `monetary`, but some systems define additional
+/// ones (GNU Linux has additionally `paper`, `name`, `address`, `telephone` and `measurement`) and
+/// these are provided in the user default `Locale` and other libraries can use them.
+///
+/// `Locale` is represented by a `,`-separated sequence of tags in `LanguageRange` syntax, where
+/// all except the first one may be preceded by category name and `=` sign.
+///
+/// The first tag indicates the default locale, the tags prefixed by category names indicate
+/// _overrides_ for those categories and the remaining tags indicate fallbacks.
+///
+/// Note that a syntactically valid value of HTTP `Accept-Language` header is a valid `Locale`. Not
+/// the other way around though due to the presence of category selectors.
+// TODO: Interning
+#[derive(Clone,Debug,Eq,Hash,PartialEq)]
+pub struct Locale {
+    // TODO: Intern the string for performance reasons
+    // XXX: Store pre-split to LanguageTags?
+    inner: String,
+}
+
+impl Locale {
+    /// Construct invariant locale.
+    ///
+    /// Invariant locale is represented simply with empty string.
+    pub fn invariant() -> Locale {
+        Locale::from(LanguageRange::invariant())
+    }
+
+    /// Append fallback language tag.
+    ///
+    /// Adds fallback to the end of the list.
+    pub fn add(&mut self, tag: &LanguageRange) {
+        for i in self.inner.split(',') {
+            if i == tag.as_ref() {
+                return; // don't add duplicates
+            }
+        }
+        self.inner.push_str(",");
+        self.inner.push_str(tag.as_ref());
+    }
+
+    /// Append category override.
+    ///
+    /// Appending new override for a category that already has one will not replace the existing
+    /// override. This might change in future.
+    pub fn add_category(&mut self, category: &str, tag: &LanguageRange) {
+        if self.inner.split(',').next().unwrap() == tag.as_ref() {
+            return; // don't add useless override equal to the primary tag
+        }
+        for i in self.inner.split(',') {
+            if i.starts_with(category) &&
+                    i[category.len()..].starts_with("=") &&
+                    &i[category.len() + 1..] == tag.as_ref() {
+                return; // don't add duplicates
+            }
+        }
+        self.inner.push_str(",");
+        self.inner.push_str(category);
+        self.inner.push_str("=");
+        self.inner.push_str(tag.as_ref());
+    }
+
+    /// Iterate over `LanguageRange`s in this `Locale` applicable to given category.
+    ///
+    /// Returns `LanguageRange`s in the `Locale` that are applicable to provided category. The tags
+    /// are returned in order of preference, which means the category-specific ones first and then
+    /// the generic ones.
+    ///
+    /// The iterator is guaranteed to return at least one value.
+    pub fn tags_for<'a, 'c>(&'a self, category: &'c str) -> TagsFor<'a, 'c> {
+        let mut tags = self.inner.split(",");
+        while let Some(s) = tags.clone().next() {
+            if s.starts_with(category) && s[category.len()..].starts_with("=") {
+                return TagsFor {
+                    src: self.inner.as_ref(),
+                    tags: tags,
+                    category: Some(category),
+                };
+            }
+            tags.next();
+        }
+        return TagsFor {
+            src: self.inner.as_ref(),
+            tags: self.inner.split(","),
+            category: None,
+        };
+    }
+}
+
+/// Locale is specified by a string tag. This is the way to access it.
+// FIXME: Do we want to provide the full string representation? We would have it as single string
+// then.
+impl AsRef<str> for Locale {
+    fn as_ref(&self) -> &str {
+        self.inner.as_ref()
+    }
+}
+
+impl<'a> From<LanguageRange<'a>> for Locale {
+    fn from(t: LanguageRange<'a>) -> Locale {
+        Locale {
+            inner: t.language.into_owned(),
+        }
+    }
+}
+
+fn tag(s: &str) -> Result<LanguageRange> {
+    LanguageRange::from_unix(s)
+}
+
+// TODO: Read /etc/locale.alias
+fn tag_inv(s: &str) -> LanguageRange {
+    tag(s).unwrap_or(LanguageRange::invariant())
+}
+
+pub fn system_locale() -> Option<Locale> {
+    // LC_ALL overrides everything
+    if let Ok(all) = env::var("LC_ALL") {
+        if let Ok(t) = tag(all.as_ref()) {
+            return Some(Locale::from(t));
+        }
+    }
+    // LANG is default
+    let mut loc =
+        if let Ok(lang) = env::var("LANG") {
+            Locale::from(tag_inv(lang.as_ref()))
+        } else {
+            Locale::invariant()
+        };
+    // category overrides
+    for &(cat, var) in [
+        ("ctype",       "LC_CTYPE"),
+        ("numeric",     "LC_NUMERIC"),
+        ("time",        "LC_TIME"),
+        ("collate",     "LC_COLLATE"),
+        ("monetary",    "LC_MONETARY"),
+        ("messages",    "LC_MESSAGES"),
+        ("paper",       "LC_PAPER"),
+        ("name",        "LC_NAME"),
+        ("address",     "LC_ADDRESS"),
+        ("telephone",   "LC_TELEPHONE"),
+        ("measurement", "LC_MEASUREMENT"),
+    ].iter() {
+        if let Ok(val) = env::var(var) {
+            if let Ok(tag) = tag(val.as_ref())
+            {
+                loc.add_category(cat, &tag);
+            }
+        }
+    }
+    // LANGUAGE defines fallbacks
+    if let Ok(langs) = env::var("LANGUAGE") {
+        for i in langs.split(':') {
+            if i != "" {
+                if let Ok(tag) = tag(i) {
+                    loc.add(&tag);
+                }
+            }
+        }
+    }
+    if loc.as_ref() != "" {
+        return Some(loc);
+    } else {
+        return None;
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use super::LanguageRange;
+
+    #[test]
+    fn unix_tags() {
+        assert_eq!("cs-CZ", LanguageRange::from_unix("cs_CZ.UTF-8").unwrap().as_ref());
+        assert_eq!("sr-RS-ijekavsk", LanguageRange::from_unix("sr_RS@ijekavian").unwrap().as_ref());
+        assert_eq!("sr-Latn-ijekavsk", LanguageRange::from_unix("sr.UTF-8@ijekavianlatin").unwrap().as_ref());
+        assert_eq!("en-Arab", LanguageRange::from_unix("en@arabic").unwrap().as_ref());
+        assert_eq!("en-Arab", LanguageRange::from_unix("en.UTF-8@arabic").unwrap().as_ref());
+        assert_eq!("de-DE", LanguageRange::from_unix("DE_de.UTF-8@euro").unwrap().as_ref());
+        assert_eq!("ssy-ER", LanguageRange::from_unix("aa_ER@saaho").unwrap().as_ref());
+        assert!(LanguageRange::from_unix("foo_BAR").is_err());
+        assert!(LanguageRange::from_unix("en@arabic.UTF-8").is_err());
+        assert_eq!("", LanguageRange::from_unix("C").unwrap().as_ref());
+        assert_eq!("", LanguageRange::from_unix("C.UTF-8").unwrap().as_ref());
+        assert_eq!("", LanguageRange::from_unix("C.ISO-8859-1").unwrap().as_ref());
+        assert_eq!("", LanguageRange::from_unix("POSIX").unwrap().as_ref());
+    }
+}
--- a/src/logging.rs
+++ b/src/logging.rs
@ -0,0 +1,110 @@
+/*! Logging library.
+ * 
+ * This is probably the only part of squeekboard
+ * that should be doing any direct printing.
+ * 
+ * There are several approaches to logging,
+ * in the order of increasing flexibility and/or purity:
+ * 
+ * 1. `println!` directly
+ * 
+ *   It can't be easily replaced by a different solution
+ * 
+ * 2. simple `log!` macro
+ * 
+ *   Replacing the destination at runtime other than globally would be awkward,
+ *   so no easy way to suppress errors for things that don't matter,
+ *   but formatting is still easy.
+ * 
+ * 3. logging to a mutable destination type
+ * 
+ *   Can be easily replaced, but logging `Result` types,
+ *   which should be done by calling a method on the result,
+ *   can't be formatted directly.
+ *   Cannot be parallelized.
+ * 
+ * 4. logging to an immutable destination type
+ * 
+ *   Same as above, except it can be parallelized.
+ *   It seems more difficult to pass the logger around,
+ *   but this may be a solved problem from the area of functional programming.
+ * 
+ * This library generally aims at the approach in 3.
+ * */
+
+use std::error::Error;
+
+/// Levels are not in order.
+pub enum Level {
+    // Levels for reporting violated constraints
+    /// The program violated a self-imposed constraint,
+    /// ended up in an inconsistent state, and cannot recover.
+    /// Handlers must not actually panic. (should they?)
+    Panic,
+    /// The program violated a self-imposed constraint,
+    /// ended up in an inconsistent state, but some state can be recovered.
+    Bug,
+    /// Invalid data given by an external source,
+    /// some state of the program must be dropped.
+    Error,
+    // Still violated constraints, but harmless
+    /// Invalid data given by an external source, parts of data are ignored.
+    /// No previous program state needs to be dropped.
+    Warning,
+    /// External source not in an expected state,
+    /// but not violating any protocols (including no relevant protocol).
+    Surprise,
+    // Informational
+    /// A change in internal state that results in a change of behaviour
+    /// that a user can observe, and a tinkerer might find useful.
+    /// E.g. selection of external sources, like loading user's UI files,
+    /// language switch, overrides.
+    Info,
+    /// Information useful for application developer only.
+    /// Should be limited to information gotten from external sources,
+    /// and more tricky parts of internal state.
+    Debug,
+}
+
+/// Sugar for logging errors in results.
+/// Approach 2.
+pub trait Warn {
+    type Value;
+    fn ok_warn(self, msg: &str) -> Option<Self::Value>;
+}
+
+impl<T, E: Error> Warn for Result<T, E> {
+    type Value = T;
+    fn ok_warn(self, msg: &str) -> Option<T> {
+        self.map_err(|e| {
+            eprintln!("{}: {}", msg, e);
+            e
+        }).ok()
+    }
+}
+
+/// A mutable handler for text warnings.
+/// Approach 3.
+pub trait WarningHandler {
+    /// Handle a warning
+    fn handle(&mut self, warning: &str);
+}
+
+/// Prints warnings to stderr
+pub struct PrintWarnings;
+
+impl WarningHandler for PrintWarnings {
+    fn handle(&mut self, warning: &str) {
+        eprintln!("{}", warning);
+    }
+}
+
+/// Warning handler that will panic at any warning.
+/// Don't use except in tests
+pub struct PanicWarn;
+
+impl WarningHandler for PanicWarn {
+    fn handle(&mut self, warning: &str) {
+        panic!("{}", warning);
+    }
+}
--- a/src/manager.rs
+++ b/src/manager.rs
@ -0,0 +1,34 @@
+/*! Procedures relating to the management of the switching of layouts */
+use ::util;
+
+pub mod c {
+    use std::os::raw::{c_char, c_void};
+
+    /// EekboardContextService*
+    #[repr(transparent)]
+    #[derive(Clone, Copy)]
+    pub struct Manager(*const c_void);
+    
+    #[no_mangle]
+    extern "C" {
+        pub fn eekboard_context_service_set_overlay(
+            manager: Manager,
+            name: *const c_char,
+        );
+
+        pub fn eekboard_context_service_get_overlay(
+            manager: Manager,
+        ) -> *const c_char;
+    }
+}
+
+/// Returns the overlay name.
+/// The result lifetime is "as long as the C copy lives"
+pub fn get_overlay(manager: c::Manager) -> Option<String> {
+    let raw_str = unsafe {
+        c::eekboard_context_service_get_overlay(manager)
+    };
+    // this string is generated from Rust, should never be invalid
+    util::c::as_str(&raw_str).unwrap()
+        .map(String::from)
+}
--- a/src/meson.build
+++ b/src/meson.build
@ -25,7 +25,6 @@ sources = [
  '../eek/eek-xml-layout.c',
  '../eek/layersurface.c',
  dbus_src,
-  enums,
  '../eekboard/key-emitter.c',
  '../eekboard/eekboard-context-service.c',
  '../eekboard/eekboard-service.c',
@ -58,7 +57,7 @@ rslibs = custom_target(
    output: ['librs.a'],
    install: false,
    console: true,
-    command: [cargo_script, '@OUTPUT@', 'build']
+    command: [cargo_build] + cargo_build_flags + ['@OUTPUT@', '--lib']
 )

 build_rstests = custom_target(
@ -72,14 +71,16 @@ build_rstests = custom_target(
    output: ['src'],
    install: false,
    console: true,
-    command: [cargo_script, '', 'build', '--tests'],
+    command: [cargo_script, 'test', '--no-run'],
    depends: rslibs, # no point building tests if the code itself fails
 )

 test(
    'rstest',
    cargo_script,
-    args: ['', 'test'],
+    args: ['test'],
+    # this is a whole Carg-based test suite, let it run for a while
+    timeout: 900,
    depends: build_rstests,
 )

@ -109,3 +110,4 @@ squeekboard = executable('squeekboard',
    '-DEEKBOARD_COMPILATION=1',
    '-DEEK_COMPILATION=1'],
 )
+
--- a/src/popover.h
+++ b/src/popover.h
@ -0,0 +1,9 @@
+#ifndef POPOVER_H__
+#define POPOVER_H__
+
+#include <gtk/gtk.h>
+#include "eek/eek-keyboard.h"
+
+void squeek_popover_show(GtkWidget*, struct button_place);
+
+#endif
--- a/Show More
+++ b/Show More