squeekboard-test-layout: correct dependencies and version for clap argument parsing

added librust-clap-dev to debian/control
squeekboard-test-layout: add argument parsing and some more output
2019-12-13 21:37:50 +01:00 · 2019-12-08 21:14:56 +01:00 · 2019-12-08 18:29:54 +01:00 · 2019-12-07 14:39:43 +00:00 · 2019-12-07 14:39:43 +00:00 · 2019-12-05 23:49:37 +00:00
207 changed files with 8852 additions and 24496 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -2,16 +2,55 @@ image: debian:buster

 stages:
  - build
+  - test
+
+.tags: &tags
+  tags:
+    - librem5

 before_script:
+  - apt-get -y update
+  - apt-get -y install wget ca-certificates gnupg
+  - echo "deb http://ci.puri.sm/ scratch librem5" > /etc/apt/sources.list.d/ci.list
+  - wget -O- https://ci.puri.sm/ci-repo.key | apt-key add -
  - apt-get -y update
  - apt-get -y build-dep .

 build_meson:
+  <<: *tags
  stage: build
-  tags:
-    - librem5
+  artifacts:
+    paths:
+      - _build
+    expire_in: 3h
  script:
    - meson . _build/ -Ddepdatadir=/usr/share
    - ninja -C _build install

+build_deb:
+    <<: *tags
+    stage: build
+    artifacts:
+      paths:
+        - "*.deb"
+    script:
+        - apt-get -y install devscripts
+        - debuild -i -us -uc -b
+        - cp ../*.deb .
+
+test_lintian:
+    <<: *tags
+    stage: test
+    dependencies:
+        - build_deb
+    script:
+        - apt-get -y install lintian
+        - lintian *.deb
+
+test:
+  <<: *tags
+  stage: test
+  needs:
+    - build_meson
+  script:
+    - ninja -C _build test
--- a/37
+++ b/37
@ -1,36 +1,5 @@
-eekboard is written by Daiki Ueno <ueno@unixuser.org>.  The following
-files contain code derived from other free software packages:
+squeekboard is written by Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm> on behlf of Purism, SPC.
+eekboard was written by Daiki Ueno <ueno@unixuser.org>

-eek/eek-keyboard-drawing.h
-eek/eek-keyboard-drawing.c
+For more details, see the debian/copyright file.

-  These files contain code derived from the libgnomekbd library.
-  Copyright (C) 2006 Sergey V. Udaltsov <svu@gnome.org>
-
-eek/eek-theme.h
-eek/eek-theme.c
-eek/eek-theme-context.h
-eek/eek-theme-context.c
-eek/eek-theme-node.h
-eek/eek-theme-node.c
-
-  These files contain code derived from gnome-shell.
-
-  Copyright 2008-2010 Red Hat, Inc.
-  Copyright 2009 Steve Frécinaux
-  Copyright 2009, 2010 Florian Müllner
-  Copyright 2010 Adel Gadllah
-  Copyright 2010 Giovanni Campagna
-  Copyright 2003-2004 Dodji Seketeli
-
-data/icons/8x8/Makefile.am
-data/icons/16x16/Makefile.am
-data/icons/22x22/Makefile.am
-data/icons/24x24/Makefile.am
-data/icons/32x32/Makefile.am
-data/icons/48x48/Makefile.am
-data/icons/scalable/Makefile.am
-
-  These files contain code derived from im-chooser.
-
-  Copyright (C) 2006-2008 Red Hat, Inc. All rights reserved.
--- a/Cargo.lock
+++ b/Cargo.lock
@ -0,0 +1,476 @@
+# 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 = "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 = "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 = "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"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "linked-hash-map"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+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"
+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 = "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"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+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)",
+ "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)",
+]
+
+[[package]]
+name = "serde"
+version = "1.0.101"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "serde_derive 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.101"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro2 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "serde_yaml"
+version = "0.8.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "dtoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)",
+ "yaml-rust 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "syn"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro2 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-xid 0.2.0 (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-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 = "winapi"
+version = "0.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "xkbcommon"
+version = "0.4.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)",
+ "memmap 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "yaml-rust"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[metadata]
+"checksum aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)" = "58fb5e95d83b38284460a5fda7d6470aa0b8844d283a0b614b8535e880800d2d"
+"checksum atk-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c7017e53393e713212aed7aea336b6553be4927f58c37070a56c2fe3d107e489"
+"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 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 syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "66850e97125af79138385e9b88339cbcd037e3f28ceab8c5ad98e64f0f1f80bf"
+"checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b"
+"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 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"
+"checksum xkbcommon 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fda0ea5f7ddabd51deeeda7799bee06274112f577da7dd3d954b8eda731b2fce"
+"checksum yaml-rust 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "65923dd1784f44da1d2c3dbbc5e822045628c590ba72123e1c73d3c230c4434d"
--- a/Cargo.toml
+++ b/Cargo.toml
@ -0,0 +1,39 @@
+[package]
+name = "rs"
+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.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"
+crate-type = ["staticlib", "rlib"]
--- a/HACKING.md
+++ b/HACKING.md
@ -0,0 +1,128 @@
+Hacking
+=======
+
+This document describes the standards for modifying and maintaining the *squeekboard* project.
+
+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][] file.
+
+Testing
+-------
+
+Most common testing is done in CI. Occasionally, and for each release, do perform manual tests to make sure that
+
+- the application draws correctly
+- it shows when relevant
+- it changes layouts
+- it changes views
+
+Testing with an application:
+
+```
+python3 tests/entry.py
+```
+
+Testing visibility:
+
+```
+$ busctl call --user sm.puri.OSK0 /sm/puri/OSK0 sm.puri.OSK0 SetVisible b true
+$ 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.
+
+```
+# define all available layouts. First one is currently selected.
+$ gsettings set org.gnome.desktop.input-sources sources "[('xkb', 'us'), ('xkb', 'de')]"
+```
+
+Coding
+------
+
+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
+-----------
+
+Squeekboard uses Rust & Cargo for some of its dependencies.
+
+Use the `cargo.sh` script for maintaining the Cargo part of the build. The script takes the usual Cargo commands, after the first 2 positionsl arguments: source directory, and output artifact. So, `cargo test` becomes:
+
+```
+cd build_dir
+sh /source_path/cargo.sh test
+```
+
+### Cargo dependencies
+
+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
+ninja test
+```
--- a/README.md
+++ b/README.md
@ -3,14 +3,18 @@

 *Squeekboard* is a virtual keyboard supporting Wayland, built primarily for the *Librem 5* phone.

+It squeaks because some Rust got inside.
+
 Features
 --------

 ### Present

 - GTK3
- Custom xml-defined keyboards
+- Custom yaml-defined keyboards
 - DBus interface to show and hide
+- Use Wayland input method protocol to show and hide
+- Use Wayland virtual keyboard protocol

 ### Temporarily dropped

@ -18,8 +22,6 @@ Features

 ### TODO

- Use Wayland virtual keyboard protocol
- Use Wayland text input protocol
 - Use Wayland input method protocol
 - Pick up DBus interface files from /usr/share

@ -33,36 +35,25 @@ See `.gitlab-ci.yml`.
 ### Build from git repo

 ```
-$ git clone https://source.puri.sm/Librem5/eekboard.git
-$ cd eekboard
+$ git clone https://source.puri.sm/Librem5/squeekboard.git
+$ cd squeekboard
 $ mkdir ../build
 $ meson ../build/
 $ cd ../build
+$ ninja test
 $ ninja install
 ```

-For development, alter the `meson` call:
-
-```
-$ meson ../build/ --prefix=../install
-```
-
-and don't skip `ninja install` before running. The last step is necessary in order to find the keyboard definition files.
-
 Running
 -------

 ```
-$ rootston
+$ phoc # if no compatible Wayland compositor is running yet
 $ cd ../build/
 $ src/squeekboard
 ```

-### Testing
+Developing
+----------

-```
-$ busctl call --user sm.puri.OSK0 /sm/puri/OSK0 sm.puri.OSK0 SetVisible b true
-$ busctl call --user sm.puri.OSK0 /sm/puri/OSK0 sm.puri.OSK0 SetVisible b false
-$ gsettings set org.gnome.desktop.input-sources sources "[('xkb', 'us'), ('xkb', 'ua')]"
-$ gsettings set org.gnome.desktop.input-sources current 1
-```
+See `HACKING.md`
--- a/bindings/vala/Eek-0.90.metadata
+++ b/bindings/vala/Eek-0.90.metadata
@ -1 +0,0 @@
-Eek cheader_filename="eek/eek.h"
--- a/bindings/vala/EekGtk-0.90.metadata
+++ b/bindings/vala/EekGtk-0.90.metadata
@ -1 +0,0 @@
-EekGtk cheader_filename="eek/eek-gtk.h"
--- a/bindings/vala/EekXkl-0.90.metadata
+++ b/bindings/vala/EekXkl-0.90.metadata
@ -1 +0,0 @@
-EekXkl cheader_filename="eek/eek-xkl.h"
--- a/bindings/vala/eek-0.90.deps
+++ b/bindings/vala/eek-0.90.deps
@ -1 +0,0 @@
-gio-2.0
--- a/bindings/vala/eek-gtk-0.90.deps
+++ b/bindings/vala/eek-gtk-0.90.deps
@ -1 +0,0 @@
-eek-0.90
--- a/bindings/vala/eek-xkl-0.90.deps
+++ b/bindings/vala/eek-xkl-0.90.deps
@ -1,2 +0,0 @@
-eek-0.90
-x11
--- a/cargo.sh
+++ b/cargo.sh
@ -0,0 +1,17 @@
+#!/bin/sh
+
+# This script manages Cargo operations
+# 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")"
+
+CARGO_TARGET_DIR="$(pwd)"
+export CARGO_TARGET_DIR
+
+cd "$SOURCE_DIR"
+cargo "$@"
+
--- 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/eekboard-autostart.desktop.in
+++ b/data/eekboard-autostart.desktop.in
@ -1,6 +0,0 @@
-[Desktop Entry]
-Name=Eekboard
-Exec=eekboard -f
-Type=Application
-#AutostartCondition=GSettings org.gnome.desktop.a11y.applications screen-keyboard-enabled
-X-GNOME-AutoRestart=true
--- a/data/eekboard-server.service.in
+++ b/data/eekboard-server.service.in
@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=org.fedorahosted.Eekboard
-Exec=@bindir@/eekboard-server
--- a/data/eekboard.desktop.in
+++ b/data/eekboard.desktop.in
@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Eekboard
-GenericName=Eekboard Virtual Keyboard
-Comment=Virtual Keyboard
-Exec=eekboard
-Icon=eekboard
-Terminal=false
-Type=Application
-Categories=GTK;Utility;
--- a/data/keyboards/de.yaml
+++ b/data/keyboards/de.yaml
@ -0,0 +1,89 @@
+# Maintained by: Mark Müller <markmueller86@gmail.com>
+---
+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: 99.67, height: 52 }
+    special:
+        bounds: { x: 0, y: 0, 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_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_eschars preferences         space        ! ? Return"
+    numbers:
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "@ # € % & - _ + ( )"
+        - "show_symbols   , \" ' : = < >  BackSpace"
+        - "show_letters show_eschars preferences         space        , . Return"
+    symbols:
+        - "~ ` ´ | · √ µ ÷ × ¶"
+        - "© ® £ $ ¥ ^ ° * { }"
+        - "show_numbers   \\ / § π τ [ ]  BackSpace"
+        - "show_letters show_eschars preferences         space        , . Return"
+    eschars:
+        - "ä è é ö ü Ä È É Ö Ü"
+        - "à â ê î ô À Â È Î Ô"
+        - "show_numbers  « » ç Ç æ œ ß  BackSpace"
+        - "show_letters show_eschars 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"
+        label: " "
+        text: " "
+    Return:
+        outline: "altline"
+        icon: "key-enter"
+        keysym: "Return"
--- a/data/keyboards/de_wide.yaml
+++ b/data/keyboards/de_wide.yaml
@ -0,0 +1,88 @@
+# Maintained by: Mark Müller <markmueller86@gmail.com>
+---
+bounds: { x: 0, y: 1, width: 540, height: 168 }
+
+outlines:
+    default:
+        bounds: { x: 0, y: 0, width: 48, 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: 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
@ -0,0 +1,198 @@
+# Greek layout created by Antonis Tsolomitis
+# 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 }
+
+views:
+    base:
+        - "; ς ε ρ τ υ θ ι ο π !"
+        - "α σ δ φ γ η ξ κ λ show_accented"
+        - "Shift_L ζ χ ψ ω β ν μ , BackSpace"
+        - "show_numbers preferences space period Return"
+    upper:
+        - ": EuroSign Ε Ρ Τ Υ Θ Ι Ο Π"
+        - "Α Σ Δ Φ Γ Η Ξ Κ Λ show_accented"
+        - "Shift_L Ζ Χ Ψ Ω Β Ν Μ · BackSpace"
+        - "show_numbers preferences space « » Return"
+    accented:
+        - "ά έ ή ί ό ύ ώ ϊ ϋ ΐ"
+        - "ΰ Ά Έ Ή Ί Ό Ύ Ώ Ϊ show_base"
+        - "Ϋ Ϗ ϐ ϑ ϕ ϖ ϗ – — BackSpace"
+        - "show_numbers preferences space quoteleft quoteright 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"
+    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"
+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: "ΑΒΓ"
+    show_symbols:
+        action:
+            set_view: "symbols"
+        outline: "altline"
+        label: "*/="
+    show_accented:
+        action:
+            locking:
+                lock_view: "accented"
+                unlock_view: "base"
+        outline: "altline"
+        label: "άΐ"
+    show_base:
+        action:
+            set_view: "base"
+        outline: "altline"
+        label: "αι"
+    period:
+        outline: "altline"
+        text: "."
+    space:
+        outline: spaceline
+        text: " "
+    Return:
+        outline: "wide"
+        icon: "key-enter"
+        keysym: "Return"
+    aring:
+        text: "å"
+    Aring:
+        text: "Å"
+    oslash:
+        text: "ø"
+    Oslash:
+        text: "Ø"
+    ae:
+        text: "æ"
+    AE:
+        text: "Æ"
+    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/es.yaml
+++ b/data/keyboards/es.yaml
@ -0,0 +1,94 @@
+---
+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 }
+
+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 show_eschars preferences         space        ? period 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 show_eschars preferences         space        ¿ period Return"
+    numbers:
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "@ # € % & - _ + ( )"
+        - "show_symbols   , \" ' colon ; ! = BackSpace"
+        - "show_letters show_eschars preferences         space        ? period Return"
+    symbols:
+        - "~ ` | · √ π τ ÷ × ¶"
+        - "© ® £ $ ¥ ^ ° * { }"
+        - "show_numbers   \\ / < > = [ ]  BackSpace"
+        - "show_letters show_eschars preferences         space        ? period Return"
+    eschars:
+        - "á é í ó ú Á É Í Ó Ú"
+        - "à è ì ò ù À È Ì Ò Ù"
+        - "show_numbers ü ç ï Ü Ç Ï ¡  BackSpace"
+        - "show_letters show_eschars 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: "default"
+        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: "áÁ"
+
+    period:
+        outline: "default"
+        text: "."
+    space:
+        outline: "spaceline"
+        text: " "
+    Return:
+        outline: "altline"
+        icon: "key-enter"
+        keysym: "Return"
+    colon:
+        text: ":"
+
--- a/data/keyboards/fi.yaml
+++ b/data/keyboards/fi.yaml
@ -0,0 +1,178 @@
+---
+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 }
+
+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"
+    aring:
+        text: "å"
+    Aring:
+        text: "Å"
+    ouml:
+        text: "ö"
+    Ouml:
+        text: "Ö"
+    auml:
+        text: "ä"
+    Auml:
+        text: "Ä"
+    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/geometry/compact.xml
+++ b/data/keyboards/geometry/compact.xml
@ -1,120 +0,0 @@
-<?xml version="1.0"?>
-<geometry version="0.90">
-  <bounds x="0" y="10.000000" width="426.0000" height="296.5853"/>
-  <section angle="0">
-    <row orientation="1">
-      <key keycode="24" name="AD01" oref="outline2" />
-      <key keycode="25" name="AD02" oref="outline2" />
-      <key keycode="26" name="AD03" oref="outline2" />
-      <key keycode="27" name="AD04" oref="outline2" />
-      <key keycode="28" name="AD05" oref="outline2" />
-      <key keycode="29" name="AD06" oref="outline2" />
-      <key keycode="30" name="AD07" oref="outline2" />
-      <key keycode="31" name="AD08" oref="outline2" />
-      <key keycode="32" name="AD09" oref="outline2" />
-      <key keycode="33" name="AD10" oref="outline2" />
-    </row>
-  </section>
-  <section angle="0">
-    <row orientation="1">
-      <key keycode="38" name="AC01" oref="outline2" />
-      <key keycode="39" name="AC02" oref="outline2" />
-      <key keycode="40" name="AC03" oref="outline2" />
-      <key keycode="41" name="AC04" oref="outline2" />
-      <key keycode="42" name="AC05" oref="outline2" />
-      <key keycode="43" name="AC06" oref="outline2" />
-      <key keycode="44" name="AC07" oref="outline2" />
-      <key keycode="45" name="AC08" oref="outline2" />
-      <key keycode="46" name="AC09" oref="outline2" />
-      <key keycode="47" name="AC10" oref="outline2" />
-    </row>
-  </section>
-  <section angle="0">
-    <row orientation="1">
-      <key keycode="50" name="LFSH" oref="altline" />
-      <key keycode="52" name="AB01" oref="outline2" />
-      <key keycode="53" name="AB02" oref="outline2" />
-      <key keycode="54" name="AB03" oref="outline2" />
-      <key keycode="55" name="AB04" oref="outline2" />
-      <key keycode="56" name="AB05" oref="outline2" />
-      <key keycode="57" name="AB06" oref="outline2" />
-      <key keycode="58" name="AB07" oref="outline2" />
-      <key keycode="22" name="BKSP" oref="altline" />
-    </row>
-  </section>
-  <section angle="0">
-    <row orientation="1">
-      <key keycode="0" name="ABC123" oref="altline" />
-      <key keycode="149" name="I149" oref="altline" />
-      <key keycode="65" name="SPCE" oref="spaceline" />
-      <key keycode="59" name="AB08" oref="outline2" />
-      <key keycode="36" name="RTRN" oref="outline7" />
-    </row>
-  </section>
-  <outline id="outline2" corner-radius="1.000000">
-    <point x="0.000000" y="0.000000"/>
-    <point x="37.46341" y="0.000000"/>
-    <point x="37.46341" y="52.44877"/>
-    <point x="0.000000" y="52.44877"/>
-  </outline>
-  <outline id="altline" corner-radius="1.000000">
-    <point x="0.000000" y="0.000000"/>
-    <point x="48.39024" y="0.000000"/>
-    <point x="48.39024" y="52.44877"/>
-    <point x="0.000000" y="52.44877"/>
-  </outline>
-  <outline id="outline4" corner-radius="1.000000">
-    <point x="0.000000" y="0.000000"/>
-    <point x="59.31707" y="0.000000"/>
-    <point x="59.31707" y="52.44877"/>
-    <point x="0.000000" y="52.44877"/>
-  </outline>
-  <outline id="outline5" corner-radius="1.000000">
-    <point x="0.000000" y="0.000000"/>
-    <point x="59.31707" y="0.000000"/>
-    <point x="59.31707" y="52.44877"/>
-    <point x="0.000000" y="52.44877"/>
-  </outline>
-  <outline id="outline6" corner-radius="1.000000">
-    <point x="0.000000" y="0.000000"/>
-    <point x="68.68292" y="0.000000"/>
-    <point x="68.68292" y="52.44877"/>
-    <point x="0.000000" y="52.44877"/>
-  </outline>
-  <outline id="outline7" corner-radius="1.000000">
-    <point x="0.000000" y="0.000000"/>
-    <point x="88.97561" y="0.000000"/>
-    <point x="88.97561" y="52.44877"/>
-    <point x="0.000000" y="52.44877"/>
-  </outline>
-  <outline id="outline8" corner-radius="1.000000">
-    <point x="0.000000" y="0.000000"/>
-    <point x="88.97561" y="0.000000"/>
-    <point x="88.97561" y="52.44877"/>
-    <point x="0.000000" y="52.44877"/>
-  </outline>
-  <outline id="outline9" corner-radius="1.000000">
-    <point x="0.000000" y="0.000000"/>
-    <point x="109.2682" y="0.000000"/>
-    <point x="109.2682" y="52.44877"/>
-    <point x="0.000000" y="52.44877"/>
-  </outline>
-  <outline id="outline10" corner-radius="1.000000">
-    <point x="0.000000" y="0.000000"/>
-    <point x="37.46341" y="0.000000"/>
-    <point x="37.46341" y="52.44877"/>
-    <point x="0.000000" y="52.44877"/>
-  </outline>
-  <outline id="outline13" corner-radius="1.000000">
-    <point x="0.000000" y="0.000000"/>
-    <point x="79.60975" y="0.000000"/>
-    <point x="79.60975" y="52.44877"/>
-    <point x="0.000000" y="52.44877"/>
-  </outline>
-  <outline id="spaceline" corner-radius="1.000000">
-    <point x="0.000000" y="0.000000"/>
-    <point x="150.5853" y="0.000000"/>
-    <point x="150.5853" y="52.44877"/>
-    <point x="0.000000" y="52.44877"/>
-  </outline>
-</geometry>
--- a/data/keyboards/geometry/extended.xml
+++ b/data/keyboards/geometry/extended.xml
@ -1,126 +0,0 @@
-<?xml version="1.0"?>
-<geometry version="0.90">
-  <bounds x="0" y="10.000000" width="426.0000" height="296.5853"/>
-  <!-- Keycodes correspond to those used in /usr/share/X11/xkb/keycodes/evdev.
-       For Squeekboard, the values have no connection to evdev. They are only
-       used as indices into the keymap sent to the compositor. They must have
-       values in the range from 8 to 255. -->
-  <section angle="0">
-    <row orientation="1">
-      <key keycode="24" name="AD01" oref="outline2" />
-      <key keycode="25" name="AD02" oref="outline2" />
-      <key keycode="26" name="AD03" oref="outline2" />
-      <key keycode="27" name="AD04" oref="outline2" />
-      <key keycode="28" name="AD05" oref="outline2" />
-      <key keycode="29" name="AD06" oref="outline2" />
-      <key keycode="30" name="AD07" oref="outline2" />
-      <key keycode="31" name="AD08" oref="outline2" />
-      <key keycode="32" name="AD09" oref="outline2" />
-      <key keycode="33" name="AD10" oref="outline2" />
-      <key keycode="34" name="AD11" oref="outline2" />
-    </row>
-  </section>
-  <section angle="0">
-    <row orientation="1">
-      <key keycode="38" name="AC01" oref="outline2" />
-      <key keycode="39" name="AC02" oref="outline2" />
-      <key keycode="40" name="AC03" oref="outline2" />
-      <key keycode="41" name="AC04" oref="outline2" />
-      <key keycode="42" name="AC05" oref="outline2" />
-      <key keycode="43" name="AC06" oref="outline2" />
-      <key keycode="44" name="AC07" oref="outline2" />
-      <key keycode="45" name="AC08" oref="outline2" />
-      <key keycode="46" name="AC09" oref="outline2" />
-      <key keycode="47" name="AC10" oref="outline2" />
-      <key keycode="48" name="AC11" oref="outline2" />
-    </row>
-  </section>
-  <section angle="0">
-    <row orientation="1">
-      <key keycode="50" name="LFSH" oref="altline" />
-      <key keycode="52" name="AB01" oref="outline2" />
-      <key keycode="53" name="AB02" oref="outline2" />
-      <key keycode="54" name="AB03" oref="outline2" />
-      <key keycode="55" name="AB04" oref="outline2" />
-      <key keycode="56" name="AB05" oref="outline2" />
-      <key keycode="57" name="AB06" oref="outline2" />
-      <key keycode="58" name="AB07" oref="outline2" />
-      <key keycode="22" name="BKSP" oref="altline" />
-    </row>
-  </section>
-  <section angle="0">
-    <row orientation="1">
-      <key keycode="0" name="ABC123" oref="altline" />
-      <key keycode="149" name="I149" oref="altline" />
-      <key keycode="65" name="SPCE" oref="spaceline" />
-      <key keycode="59" name="AB08" oref="outline2" />
-      <key keycode="36" name="RTRN" oref="outline7" />
-    </row>
-  </section>
-  <outline id="outline2" corner-radius="1.000000">
-    <point x="0.000000" y="0.000000"/>
-    <point x="32" y="0.000000"/>
-    <point x="32" y="52.44877"/>
-    <point x="0.000000" y="52.44877"/>
-  </outline>
-  <outline id="altline" corner-radius="1.000000">
-    <point x="0.000000" y="0.000000"/>
-    <point x="48.39024" y="0.000000"/>
-    <point x="48.39024" y="52.44877"/>
-    <point x="0.000000" y="52.44877"/>
-  </outline>
-  <outline id="outline4" corner-radius="1.000000">
-    <point x="0.000000" y="0.000000"/>
-    <point x="59.31707" y="0.000000"/>
-    <point x="59.31707" y="52.44877"/>
-    <point x="0.000000" y="52.44877"/>
-  </outline>
-  <outline id="outline5" corner-radius="1.000000">
-    <point x="0.000000" y="0.000000"/>
-    <point x="59.31707" y="0.000000"/>
-    <point x="59.31707" y="52.44877"/>
-    <point x="0.000000" y="52.44877"/>
-  </outline>
-  <outline id="outline6" corner-radius="1.000000">
-    <point x="0.000000" y="0.000000"/>
-    <point x="68.68292" y="0.000000"/>
-    <point x="68.68292" y="52.44877"/>
-    <point x="0.000000" y="52.44877"/>
-  </outline>
-  <outline id="outline7" corner-radius="1.000000">
-    <point x="0.000000" y="0.000000"/>
-    <point x="88.97561" y="0.000000"/>
-    <point x="88.97561" y="52.44877"/>
-    <point x="0.000000" y="52.44877"/>
-  </outline>
-  <outline id="outline8" corner-radius="1.000000">
-    <point x="0.000000" y="0.000000"/>
-    <point x="88.97561" y="0.000000"/>
-    <point x="88.97561" y="52.44877"/>
-    <point x="0.000000" y="52.44877"/>
-  </outline>
-  <outline id="outline9" corner-radius="1.000000">
-    <point x="0.000000" y="0.000000"/>
-    <point x="109.2682" y="0.000000"/>
-    <point x="109.2682" y="52.44877"/>
-    <point x="0.000000" y="52.44877"/>
-  </outline>
-  <outline id="outline10" corner-radius="1.000000">
-    <point x="0.000000" y="0.000000"/>
-    <point x="37.46341" y="0.000000"/>
-    <point x="37.46341" y="52.44877"/>
-    <point x="0.000000" y="52.44877"/>
-  </outline>
-  <outline id="outline13" corner-radius="1.000000">
-    <point x="0.000000" y="0.000000"/>
-    <point x="79.60975" y="0.000000"/>
-    <point x="79.60975" y="52.44877"/>
-    <point x="0.000000" y="52.44877"/>
-  </outline>
-  <outline id="spaceline" corner-radius="1.000000">
-    <point x="0.000000" y="0.000000"/>
-    <point x="150.5853" y="0.000000"/>
-    <point x="150.5853" y="52.44877"/>
-    <point x="0.000000" y="52.44877"/>
-  </outline>
-</geometry>
--- a/data/keyboards/geometry/numbers-keypad.xml
+++ b/data/keyboards/geometry/numbers-keypad.xml
@ -1,105 +0,0 @@
-<?xml version="1.0"?>
-<geometry version="0.90">
-  <bounds x="0" y="10.000000" width="426.0000" height="296.5853"/>
-  <section angle="0">
-    <row orientation="1">
-      <key keycode="24" name="AD01" oref="outline2" />
-      <key keycode="25" name="AD02" oref="outline2" />
-      <key keycode="26" name="AD03" oref="outline2" />
-      <key keycode="27" name="AD04" oref="outline2" />
-      <key keycode="28" name="AD05" oref="outline2" />
-    </row>
-  </section>
-  <section angle="0">
-    <row orientation="1">
-      <key keycode="38" name="AC01" oref="outline2" />
-      <key keycode="39" name="AC02" oref="outline2" />
-      <key keycode="40" name="AC03" oref="outline2" />
-      <key keycode="41" name="AC04" oref="outline2" />
-      <key keycode="42" name="AC05" oref="outline2" />
-    </row>
-  </section>
-  <section angle="0">
-    <row orientation="1">
-      <key keycode="52" name="AB01" oref="outline2" />
-      <key keycode="53" name="AB02" oref="outline2" />
-      <key keycode="54" name="AB03" oref="outline2" />
-      <key keycode="55" name="AB04" oref="outline2" />
-      <key keycode="56" name="AB05" oref="outline2" />
-    </row>
-  </section>
-  <section angle="0">
-    <row orientation="1">
-      <key keycode="22" name="BKSP" oref="altline" />
-      <key keycode="57" name="AB06" oref="outline2" />
-      <key keycode="65" name="SPCE" oref="spaceline" />
-      <key keycode="36" name="RTRN" oref="outline7" />
-    </row>
-  </section>
-  <outline id="outline2" corner-radius="1.000000">
-    <point x="0.000000" y="0.000000"/>
-    <point x="37.46341" y="0.000000"/>
-    <point x="37.46341" y="52.44877"/>
-    <point x="0.000000" y="52.44877"/>
-  </outline>
-  <outline id="altline" corner-radius="1.000000">
-    <point x="0.000000" y="0.000000"/>
-    <point x="48.39024" y="0.000000"/>
-    <point x="48.39024" y="52.44877"/>
-    <point x="0.000000" y="52.44877"/>
-  </outline>
-  <outline id="outline4" corner-radius="1.000000">
-    <point x="0.000000" y="0.000000"/>
-    <point x="59.31707" y="0.000000"/>
-    <point x="59.31707" y="52.44877"/>
-    <point x="0.000000" y="52.44877"/>
-  </outline>
-  <outline id="outline5" corner-radius="1.000000">
-    <point x="0.000000" y="0.000000"/>
-    <point x="59.31707" y="0.000000"/>
-    <point x="59.31707" y="52.44877"/>
-    <point x="0.000000" y="52.44877"/>
-  </outline>
-  <outline id="outline6" corner-radius="1.000000">
-    <point x="0.000000" y="0.000000"/>
-    <point x="68.68292" y="0.000000"/>
-    <point x="68.68292" y="52.44877"/>
-    <point x="0.000000" y="52.44877"/>
-  </outline>
-  <outline id="outline7" corner-radius="1.000000">
-    <point x="0.000000" y="0.000000"/>
-    <point x="88.97561" y="0.000000"/>
-    <point x="88.97561" y="52.44877"/>
-    <point x="0.000000" y="52.44877"/>
-  </outline>
-  <outline id="outline8" corner-radius="1.000000">
-    <point x="0.000000" y="0.000000"/>
-    <point x="88.97561" y="0.000000"/>
-    <point x="88.97561" y="52.44877"/>
-    <point x="0.000000" y="52.44877"/>
-  </outline>
-  <outline id="outline9" corner-radius="1.000000">
-    <point x="0.000000" y="0.000000"/>
-    <point x="109.2682" y="0.000000"/>
-    <point x="109.2682" y="52.44877"/>
-    <point x="0.000000" y="52.44877"/>
-  </outline>
-  <outline id="outline10" corner-radius="1.000000">
-    <point x="0.000000" y="0.000000"/>
-    <point x="37.46341" y="0.000000"/>
-    <point x="37.46341" y="52.44877"/>
-    <point x="0.000000" y="52.44877"/>
-  </outline>
-  <outline id="outline13" corner-radius="1.000000">
-    <point x="0.000000" y="0.000000"/>
-    <point x="79.60975" y="0.000000"/>
-    <point x="79.60975" y="52.44877"/>
-    <point x="0.000000" y="52.44877"/>
-  </outline>
-  <outline id="spaceline" corner-radius="1.000000">
-    <point x="0.000000" y="0.000000"/>
-    <point x="120.5853" y="0.000000"/>
-    <point x="120.5853" y="52.44877"/>
-    <point x="0.000000" y="52.44877"/>
-  </outline>
-</geometry>
--- a/data/keyboards/it.yaml
+++ b/data/keyboards/it.yaml
@ -0,0 +1,99 @@
+# 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 }
+
+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 show_eschars preferences         space        , period 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 show_eschars preferences         space        ? period Return"
+    numbers:
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "@ # € % & - _ + ( )"
+        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
+        - "show_letters show_eschars preferences         space        ? period Return"
+    symbols:
+        - "~ ` | · √ π τ ÷ × ¶"
+        - "© ® £ $ ¥ ^ ° * { }"
+        - "show_numbers   \\ / < > = [ ]  BackSpace"
+        - "show_letters show_eschars preferences         space        ? period Return"
+    eschars:
+        - "á é í ó ú Á É Í Ó Ú"
+        - "à è ì ò « » ù ! { }"
+        - "show_numbers   \\ / < > = [ ]  BackSpace"
+        - "show_letters show_eschars 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: "default"
+        icon: "keyboard-mode-symbolic"
+    show_numbers:
+        action:
+            set_view: "numbers"
+        outline: "altline"
+        label: "123"
+    show_numbers_from_symbols:
+        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:
+            set_view: "eschars"
+        outline: "altline"
+        label: "àè"
+    period:
+        outline: "default"
+        label: "."
+    space:
+        outline: "spaceline"
+        label: " "
+    Return:
+        outline: "altline"
+        icon: "key-enter"
+        keysym: "Return"
+    colon:
+        label: ":"
+    "\"":
+        keysym: "quotedbl"
--- a/data/keyboards/jp+kana.yaml
+++ b/data/keyboards/jp+kana.yaml
@ -0,0 +1,532 @@
+# Maintained by: Mark Müller <markmueller86@gmail.com>
+---
+bounds: { x: 0, y: 1, width: 360, height: 208 }
+
+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 }
+
+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/keyboards.xml
+++ b/data/keyboards/keyboards.xml
@ -1,97 +0,0 @@
-<?xml version="1.0"?>
-<keyboards version="0.90">
-  <keyboard id="ar" name="ar"
-	    geometry="compact" symbols="ar"
-	    longname="Arabic" language="ar"/>
-  <keyboard id="be" name="be"
-	    geometry="compact" symbols="be"
-	    longname="Belarusian" language="be"/>
-  <keyboard id="fa" name="fa"
-	    geometry="compact" symbols="fa"
-	    longname="Farsi (ISIRI 2901-1994)" language="fa"/>
-  <keyboard id="he" name="he"
-	    geometry="compact" symbols="he"
-	    longname="Hebrew" language="he"/>
-  <keyboard id="ja" name="ja"
-	    geometry="compact" symbols="ja-kana"
-	    longname="Japanese (Kana)" language="ja"/>
-  <keyboard id="kk" name="kk"
-	    geometry="compact" symbols="kk"
-	    longname="Kazakh" language="kk"/>
-  <keyboard id="ks" name="ks"
-	    geometry="compact" symbols="ks"
-	    longname="Kashmiri" language="ks"/>
-  <keyboard id="my" name="my"
-	    geometry="compact" symbols="my"
-	    longname="Myanmar" language="my"/>
-  <keyboard id="nb" name="nb"
-	    geometry="extended" symbols="nb"
-	    longname="Norwegian" language="nb"/>
-  <keyboard id="ru" name="ru"
-	    geometry="compact" symbols="us"
-	    longname="Russian" language="ru"/>
-  <keyboard id="th" name="th"
-	    geometry="compact" symbols="th"
-	    longname="Thai" language="th"/>
-  <keyboard id="ua" name="ua"
-	    geometry="compact" symbols="ua"
-	    longname="Ukrainian" language="ua"/>
-  <keyboard id="ug" name="ug"
-	    geometry="compact" symbols="ug"
-	    longname="Uyghur" language="ug"/>
-  <keyboard id="us" name="us"
-	    geometry="compact" symbols="us"
-	    longname="US" language="en"/>
-  <keyboard id="zh-bopomofo" name="zh-bopomofo"
-	    geometry="compact" symbols="zh-bopomofo"
-	    longname="Chinese (Bopomofo)" language="zh"/>
-  <!-- Indic Inscript keyboards converted from m17n-lib -->
-  <keyboard id="as-inscript" name="as-inscript"
-	    geometry="compact" symbols="as-inscript"
-	    longname="Assamese (Inscript)" language="as"/>
-  <keyboard id="bn-inscript" name="bn-inscript"
-	    geometry="compact" symbols="bn-inscript"
-	    longname="Bengali (Inscript)" language="bn"/>
-  <keyboard id="gu-inscript" name="gu-inscript"
-	    geometry="compact" symbols="gu-inscript"
-	    longname="Gujarati (Inscript)" language="gu"/>
-  <keyboard id="hi-inscript" name="hi-inscript"
-	    geometry="compact" symbols="hi-inscript"
-	    longname="Hindi (Inscript)" language="hi"/>
-  <keyboard id="kn-inscript" name="kn-inscript"
-	    geometry="compact" symbols="kn-inscript"
-	    longname="Kannada (Inscript)" language="kn"/>
-  <keyboard id="ks-inscript" name="ks-inscript"
-	    geometry="compact" symbols="ks-inscript"
-	    longname="Kashmiri Devanagari (Inscript)" language="ks"/>
-  <keyboard id="mai-inscript" name="mai-inscript"
-	    geometry="compact" symbols="mai-inscript"
-	    longname="Maithili (Inscript)" language="mai"/>
-  <keyboard id="ml-inscript" name="ml-inscript"
-	    geometry="compact" symbols="ml-inscript"
-	    longname="Malayalam (Inscript)" language="ml-inscript"/>
-  <keyboard id="mr-inscript" name="mr-inscript"
-	    geometry="compact" symbols="mr-inscript"
-	    longname="Marathi (Inscript)" language="mr"/>
-  <keyboard id="or-inscript" name="or-inscript"
-	    geometry="compact" symbols="or-inscript"
-	    longname="Oriya (Inscript)" language="or"/>
-  <keyboard id="pa-inscript" name="pa-inscript"
-	    geometry="compact" symbols="pa-inscript"
-	    longname="Punjabi (Inscript)" language="pa"/>
-  <keyboard id="sd-inscript" name="sd-inscript"
-	    geometry="compact" symbols="sd-inscript"
-	    longname="Sindhi (Inscript)" language="sd"/>
-  <keyboard id="ta-inscript" name="ta-inscript"
-	    geometry="compact" symbols="ta-inscript"
-	    longname="Tamil (Inscript)" language="ta"/>
-  <keyboard id="te-inscript" name="te-inscript"
-	    geometry="compact" symbols="te-inscript"
-	    longname="Telugu (Inscript)" language="te"/>
-
-  <!-- Common keyboards -->
-  <keyboard id="numbers" name="numbers"
-	    geometry="numbers-keypad" symbols="special/numbers"
-	    longname="Numeric keypad" language="all"/>
-
-</keyboards>
--- a/data/keyboards/keymaps/nb.xkb
+++ b/data/keyboards/keymaps/nb.xkb
@ -1,308 +0,0 @@
-xkb_keymap {
-
-    xkb_keycodes "squeekboard" {
-        minimum = 8;
-        maximum = 255;
-        <ESC>                = 9;
-        <AE01>               = 10;
-        <AE02>               = 11;
-        <AE03>               = 12;
-        <AE04>               = 13;
-        <AE05>               = 14;
-        <AE06>               = 15;
-        <AE07>               = 16;
-        <AE08>               = 17;
-        <AE09>               = 18;
-        <AE10>               = 19;
-        <AE11>               = 20;
-        <AE12>               = 21;
-        <BKSP>               = 22;
-        <TAB>                = 23;
-        <AD01>               = 24;
-        <AD02>               = 25;
-        <AD03>               = 26;
-        <AD04>               = 27;
-        <AD05>               = 28;
-        <AD06>               = 29;
-        <AD07>               = 30;
-        <AD08>               = 31;
-        <AD09>               = 32;
-        <AD10>               = 33;
-        <AD11>               = 34;
-        <AD12>               = 35;
-        <RTRN>               = 36;
-        <LCTL>               = 37;
-        <AC01>               = 38;
-        <AC02>               = 39;
-        <AC03>               = 40;
-        <AC04>               = 41;
-        <AC05>               = 42;
-        <AC06>               = 43;
-        <AC07>               = 44;
-        <AC08>               = 45;
-        <AC09>               = 46;
-        <AC10>               = 47;
-        <AC11>               = 48;
-        <TLDE>               = 49;
-        <LFSH>               = 50;
-        <BKSL>               = 51;
-        <AB01>               = 52;
-        <AB02>               = 53;
-        <AB03>               = 54;
-        <AB04>               = 55;
-        <AB05>               = 56;
-        <AB06>               = 57;
-        <AB07>               = 58;
-        <AB08>               = 59;
-        <AB09>               = 60;
-        <AB10>               = 61;
-        <RTSH>               = 62;
-        <KPMU>               = 63;
-        <LALT>               = 64;
-        <SPCE>               = 65;
-        <CAPS>               = 66;
-        <FK01>               = 67;
-        <FK02>               = 68;
-        <FK03>               = 69;
-        <FK04>               = 70;
-        <FK05>               = 71;
-        <FK06>               = 72;
-        <FK07>               = 73;
-        <FK08>               = 74;
-        <FK09>               = 75;
-        <FK10>               = 76;
-        <NMLK>               = 77;
-        <SCLK>               = 78;
-        <KP7>                = 79;
-        <KP8>                = 80;
-        <KP9>                = 81;
-        <KPSU>               = 82;
-        <KP4>                = 83;
-        <KP5>                = 84;
-        <KP6>                = 85;
-        <KPAD>               = 86;
-        <KP1>                = 87;
-        <KP2>                = 88;
-        <KP3>                = 89;
-        <KP0>                = 90;
-        <KPDL>               = 91;
-        <LVL3>               = 92;
-        <LSGT>               = 94;
-        <FK11>               = 95;
-        <FK12>               = 96;
-        <AB11>               = 97;
-        <KATA>               = 98;
-        <HIRA>               = 99;
-        <HENK>               = 100;
-        <HKTG>               = 101;
-        <MUHE>               = 102;
-        <JPCM>               = 103;
-        <KPEN>               = 104;
-        <RCTL>               = 105;
-        <KPDV>               = 106;
-        <PRSC>               = 107;
-        <RALT>               = 108;
-        <LNFD>               = 109;
-        <HOME>               = 110;
-        <UP>                 = 111;
-        <PGUP>               = 112;
-        <LEFT>               = 113;
-        <RGHT>               = 114;
-        <END>                = 115;
-        <DOWN>               = 116;
-        <PGDN>               = 117;
-        <INS>                = 118;
-        <DELE>               = 119;
-        <I120>               = 120;
-        <MUTE>               = 121;
-        <VOL->               = 122;
-        <VOL+>               = 123;
-        <POWR>               = 124;
-        <KPEQ>               = 125;
-        <I126>               = 126;
-        <PAUS>               = 127;
-        <I128>               = 128;
-        <I129>               = 129;
-        <HNGL>               = 130;
-        <HJCV>               = 131;
-        <AE13>               = 132;
-        <LWIN>               = 133;
-        <RWIN>               = 134;
-        <COMP>               = 135;
-        <STOP>               = 136;
-        <AGAI>               = 137;
-        <PROP>               = 138;
-        <UNDO>               = 139;
-        <FRNT>               = 140;
-        <COPY>               = 141;
-        <OPEN>               = 142;
-        <PAST>               = 143;
-        <FIND>               = 144;
-        <CUT>                = 145;
-        <HELP>               = 146;
-        <I147>               = 147;
-        <I148>               = 148;
-        <I149>               = 149;
-        <I150>               = 150;
-        <I151>               = 151;
-        <I152>               = 152;
-        <I153>               = 153;
-        <I154>               = 154;
-        <I155>               = 155;
-        <I156>               = 156;
-        <I157>               = 157;
-        <I158>               = 158;
-        <I159>               = 159;
-        <I160>               = 160;
-        <I161>               = 161;
-        <I162>               = 162;
-        <I163>               = 163;
-        <I164>               = 164;
-        <I165>               = 165;
-        <I166>               = 166;
-        <I167>               = 167;
-        <I168>               = 168;
-        <I169>               = 169;
-        <I170>               = 170;
-        <I171>               = 171;
-        <I172>               = 172;
-        <I173>               = 173;
-        <I174>               = 174;
-        <I175>               = 175;
-        <I176>               = 176;
-        <I177>               = 177;
-        <I178>               = 178;
-        <I179>               = 179;
-        <I180>               = 180;
-        <I181>               = 181;
-        <I182>               = 182;
-        <I183>               = 183;
-        <I184>               = 184;
-        <I185>               = 185;
-        <I186>               = 186;
-        <I187>               = 187;
-        <I188>               = 188;
-        <I189>               = 189;
-        <I190>               = 190;
-        <FK13>               = 191;
-        <FK14>               = 192;
-        <FK15>               = 193;
-        <FK16>               = 194;
-        <FK17>               = 195;
-        <FK18>               = 196;
-        <FK19>               = 197;
-        <FK20>               = 198;
-        <FK21>               = 199;
-        <FK22>               = 200;
-        <FK23>               = 201;
-        <FK24>               = 202;
-        <MDSW>               = 203;
-        <ALT>                = 204;
-        <META>               = 205;
-        <SUPR>               = 206;
-        <HYPR>               = 207;
-        <I208>               = 208;
-        <I209>               = 209;
-        <I210>               = 210;
-        <I211>               = 211;
-        <I212>               = 212;
-        <I213>               = 213;
-        <I214>               = 214;
-        <I215>               = 215;
-        <I216>               = 216;
-        <I217>               = 217;
-        <I218>               = 218;
-        <I219>               = 219;
-        <I220>               = 220;
-        <I221>               = 221;
-        <I222>               = 222;
-        <I223>               = 223;
-        <I224>               = 224;
-        <I225>               = 225;
-        <I226>               = 226;
-        <I227>               = 227;
-        <I228>               = 228;
-        <I229>               = 229;
-        <I230>               = 230;
-        <I231>               = 231;
-        <I232>               = 232;
-        <I233>               = 233;
-        <I234>               = 234;
-        <I235>               = 235;
-        <I236>               = 236;
-        <I237>               = 237;
-        <I238>               = 238;
-        <I239>               = 239;
-        <I240>               = 240;
-        <I241>               = 241;
-        <I242>               = 242;
-        <I243>               = 243;
-        <I244>               = 244;
-        <I245>               = 245;
-        <I246>               = 246;
-        <I247>               = 247;
-        <I248>               = 248;
-        <I249>               = 249;
-        <I250>               = 250;
-        <I251>               = 251;
-        <I252>               = 252;
-        <I253>               = 253;
-        <I254>               = 254;
-        <I255>               = 255;
-    };
-
-    xkb_symbols "squeekboard" {
-
-        name[Group1] = "Letters";
-        name[Group2] = "Numbers/Symbols";
-
-        key <AD01> { [ q, Q ], [ 1, asciitilde ] };
-        key <AD02> { [ w, W ], [ 2, quoteleft ] };
-        key <AD03> { [ e, E ], [ 3, bar ] };
-        key <AD04> { [ r, R ], [ 4, U00B7 ] };
-        key <AD05> { [ t, T ], [ 5, squareroot ] };
-        key <AD06> { [ y, Y ], [ 6, Greek_pi ] };
-        key <AD07> { [ u, U ], [ 7, division ] };
-        key <AD08> { [ i, I ], [ 8, multiply ] };
-        key <AD09> { [ o, O ], [ 9, paragraph ] };
-        key <AD10> { [ p, P ], [ 0, U25B3 ] };
-        key <AD11> { [ aring, Aring ], [ U00B1, U00A7 ] };
-        key <AC01> { [ a, A ], [ at, copyright ] };
-        key <AC02> { [ s, S ], [ numbersign, U00AE ] };
-        key <AC03> { [ d, D ], [ dollar, U00A3 ] };
-        key <AC04> { [ f, F ], [ percent, EuroSign ] };
-        key <AC05> { [ g, G ], [ ampersand, U00A5 ] };
-        key <AC06> { [ h, H ], [ minus, underscore ] };
-        key <AC07> { [ j, J ], [ plus, equal ] };
-        key <AC08> { [ k, K ], [ U00FC, asciicircum ] };
-        key <AC09> { [ l, L ], [ U00F6, degree ] };
-        key <AC10> { [ oslash, Oslash ], [ parenleft, braceleft ] };
-        key <AC11> { [ ae, AE ], [ parenright, braceright ] };
-        key <RTRN> { [ Return, Return ], [ Return, Return ] };
-        key <LFSH> { [ Shift_L, Shift_L ], [ Shift_L, Shift_L ] };
-        key <AB01> { [ z, Z ], [ comma, backslash ] };
-        key <AB02> { [ x, X ], [ quotedbl, slash ] };
-        key <AB03> { [ c, C ], [ quoteright, less ] };
-        key <AB04> { [ v, V ], [ colon, greater ] };
-        key <AB05> { [ b, B ], [ semicolon, equal ] };
-        key <AB06> { [ n, N ], [ exclam, bracketleft ] };
-        key <AB07> { [ m, M ], [ question, bracketright ] };
-        key <AB08> { [ period, period ], [ period, period ] };
-        key <I149> { [ preferences, preferences ], [ preferences, preferences ] };
-        key <SPCE> { [ space, space ], [ space, space ] };
-        key <BKSP> { [ BackSpace, BackSpace ], [ BackSpace, BackSpace ] };
-    };
-
-    xkb_types "squeekboard" {
-
-	type "TWO_LEVEL" {
-            modifiers = Shift;
-            map[Shift] = Level2;
-            level_name[Level1] = "Base";
-            level_name[Level2] = "Shift";
-	};
-    };
-
-    xkb_compatibility "squeekboard" {
-    };
-};
--- a/data/keyboards/keymaps/numbers.xkb
+++ b/data/keyboards/keymaps/numbers.xkb
@ -1,292 +0,0 @@
-xkb_keymap {
-
-    xkb_keycodes "squeekboard" {
-        minimum = 8;
-        maximum = 255;
-        <ESC>                = 9;
-        <AE01>               = 10;
-        <AE02>               = 11;
-        <AE03>               = 12;
-        <AE04>               = 13;
-        <AE05>               = 14;
-        <AE06>               = 15;
-        <AE07>               = 16;
-        <AE08>               = 17;
-        <AE09>               = 18;
-        <AE10>               = 19;
-        <AE11>               = 20;
-        <AE12>               = 21;
-        <BKSP>               = 22;
-        <TAB>                = 23;
-        <AD01>               = 24;
-        <AD02>               = 25;
-        <AD03>               = 26;
-        <AD04>               = 27;
-        <AD05>               = 28;
-        <AD06>               = 29;
-        <AD07>               = 30;
-        <AD08>               = 31;
-        <AD09>               = 32;
-        <AD10>               = 33;
-        <AD11>               = 34;
-        <AD12>               = 35;
-        <RTRN>               = 36;
-        <LCTL>               = 37;
-        <AC01>               = 38;
-        <AC02>               = 39;
-        <AC03>               = 40;
-        <AC04>               = 41;
-        <AC05>               = 42;
-        <AC06>               = 43;
-        <AC07>               = 44;
-        <AC08>               = 45;
-        <AC09>               = 46;
-        <AC10>               = 47;
-        <AC11>               = 48;
-        <TLDE>               = 49;
-        <LFSH>               = 50;
-        <BKSL>               = 51;
-        <AB01>               = 52;
-        <AB02>               = 53;
-        <AB03>               = 54;
-        <AB04>               = 55;
-        <AB05>               = 56;
-        <AB06>               = 57;
-        <AB07>               = 58;
-        <AB08>               = 59;
-        <AB09>               = 60;
-        <AB10>               = 61;
-        <RTSH>               = 62;
-        <KPMU>               = 63;
-        <LALT>               = 64;
-        <SPCE>               = 65;
-        <CAPS>               = 66;
-        <FK01>               = 67;
-        <FK02>               = 68;
-        <FK03>               = 69;
-        <FK04>               = 70;
-        <FK05>               = 71;
-        <FK06>               = 72;
-        <FK07>               = 73;
-        <FK08>               = 74;
-        <FK09>               = 75;
-        <FK10>               = 76;
-        <NMLK>               = 77;
-        <SCLK>               = 78;
-        <KP7>                = 79;
-        <KP8>                = 80;
-        <KP9>                = 81;
-        <KPSU>               = 82;
-        <KP4>                = 83;
-        <KP5>                = 84;
-        <KP6>                = 85;
-        <KPAD>               = 86;
-        <KP1>                = 87;
-        <KP2>                = 88;
-        <KP3>                = 89;
-        <KP0>                = 90;
-        <KPDL>               = 91;
-        <LVL3>               = 92;
-        <LSGT>               = 94;
-        <FK11>               = 95;
-        <FK12>               = 96;
-        <AB11>               = 97;
-        <KATA>               = 98;
-        <HIRA>               = 99;
-        <HENK>               = 100;
-        <HKTG>               = 101;
-        <MUHE>               = 102;
-        <JPCM>               = 103;
-        <KPEN>               = 104;
-        <RCTL>               = 105;
-        <KPDV>               = 106;
-        <PRSC>               = 107;
-        <RALT>               = 108;
-        <LNFD>               = 109;
-        <HOME>               = 110;
-        <UP>                 = 111;
-        <PGUP>               = 112;
-        <LEFT>               = 113;
-        <RGHT>               = 114;
-        <END>                = 115;
-        <DOWN>               = 116;
-        <PGDN>               = 117;
-        <INS>                = 118;
-        <DELE>               = 119;
-        <I120>               = 120;
-        <MUTE>               = 121;
-        <VOL->               = 122;
-        <VOL+>               = 123;
-        <POWR>               = 124;
-        <KPEQ>               = 125;
-        <I126>               = 126;
-        <PAUS>               = 127;
-        <I128>               = 128;
-        <I129>               = 129;
-        <HNGL>               = 130;
-        <HJCV>               = 131;
-        <AE13>               = 132;
-        <LWIN>               = 133;
-        <RWIN>               = 134;
-        <COMP>               = 135;
-        <STOP>               = 136;
-        <AGAI>               = 137;
-        <PROP>               = 138;
-        <UNDO>               = 139;
-        <FRNT>               = 140;
-        <COPY>               = 141;
-        <OPEN>               = 142;
-        <PAST>               = 143;
-        <FIND>               = 144;
-        <CUT>                = 145;
-        <HELP>               = 146;
-        <I147>               = 147;
-        <I148>               = 148;
-        <I149>               = 149;
-        <I150>               = 150;
-        <I151>               = 151;
-        <I152>               = 152;
-        <I153>               = 153;
-        <I154>               = 154;
-        <I155>               = 155;
-        <I156>               = 156;
-        <I157>               = 157;
-        <I158>               = 158;
-        <I159>               = 159;
-        <I160>               = 160;
-        <I161>               = 161;
-        <I162>               = 162;
-        <I163>               = 163;
-        <I164>               = 164;
-        <I165>               = 165;
-        <I166>               = 166;
-        <I167>               = 167;
-        <I168>               = 168;
-        <I169>               = 169;
-        <I170>               = 170;
-        <I171>               = 171;
-        <I172>               = 172;
-        <I173>               = 173;
-        <I174>               = 174;
-        <I175>               = 175;
-        <I176>               = 176;
-        <I177>               = 177;
-        <I178>               = 178;
-        <I179>               = 179;
-        <I180>               = 180;
-        <I181>               = 181;
-        <I182>               = 182;
-        <I183>               = 183;
-        <I184>               = 184;
-        <I185>               = 185;
-        <I186>               = 186;
-        <I187>               = 187;
-        <I188>               = 188;
-        <I189>               = 189;
-        <I190>               = 190;
-        <FK13>               = 191;
-        <FK14>               = 192;
-        <FK15>               = 193;
-        <FK16>               = 194;
-        <FK17>               = 195;
-        <FK18>               = 196;
-        <FK19>               = 197;
-        <FK20>               = 198;
-        <FK21>               = 199;
-        <FK22>               = 200;
-        <FK23>               = 201;
-        <FK24>               = 202;
-        <MDSW>               = 203;
-        <ALT>                = 204;
-        <META>               = 205;
-        <SUPR>               = 206;
-        <HYPR>               = 207;
-        <I208>               = 208;
-        <I209>               = 209;
-        <I210>               = 210;
-        <I211>               = 211;
-        <I212>               = 212;
-        <I213>               = 213;
-        <I214>               = 214;
-        <I215>               = 215;
-        <I216>               = 216;
-        <I217>               = 217;
-        <I218>               = 218;
-        <I219>               = 219;
-        <I220>               = 220;
-        <I221>               = 221;
-        <I222>               = 222;
-        <I223>               = 223;
-        <I224>               = 224;
-        <I225>               = 225;
-        <I226>               = 226;
-        <I227>               = 227;
-        <I228>               = 228;
-        <I229>               = 229;
-        <I230>               = 230;
-        <I231>               = 231;
-        <I232>               = 232;
-        <I233>               = 233;
-        <I234>               = 234;
-        <I235>               = 235;
-        <I236>               = 236;
-        <I237>               = 237;
-        <I238>               = 238;
-        <I239>               = 239;
-        <I240>               = 240;
-        <I241>               = 241;
-        <I242>               = 242;
-        <I243>               = 243;
-        <I244>               = 244;
-        <I245>               = 245;
-        <I246>               = 246;
-        <I247>               = 247;
-        <I248>               = 248;
-        <I249>               = 249;
-        <I250>               = 250;
-        <I251>               = 251;
-        <I252>               = 252;
-        <I253>               = 253;
-        <I254>               = 254;
-        <I255>               = 255;
-    };
-
-    xkb_symbols "squeekboard" {
-
-        name[Group1] = "Letters";
-        name[Group2] = "Numbers/Symbols";
-
-        key <AD01> { [ 1, 1 ], [ 1, 1 ] };
-        key <AD02> { [ 2, 2 ], [ 2, 2 ] };
-        key <AD03> { [ 3, 3 ], [ 3, 3 ] };
-        key <AD04> { [ parenleft, parenleft ], [ parenleft, parenleft ] };
-        key <AD05> { [ parenright, parenright ], [ parenright, parenright ] };
-        key <AC01> { [ 4, 4 ], [ 4, 4 ] };
-        key <AC02> { [ 5, 5 ], [ 5, 5 ] };
-        key <AC03> { [ 6, 6 ], [ 6, 6 ] };
-        key <AC04> { [ numbersign, numbersign ], [ numbersign, numbersign ] };
-        key <AC05> { [ asterisk, asterisk ], [ asterisk, asterisk ] };
-        key <AB01> { [ 7, 7 ], [ 7, 7 ] };
-        key <AB02> { [ 8, 8 ], [ 8, 8 ] };
-        key <AB03> { [ 9, 9 ], [ 9, 9 ] };
-        key <AB04> { [ plus, plus ], [ plus, plus ] };
-        key <AB05> { [ minus, minus ], [ minus, minus ] };
-        key <AB06> { [ 0, 0 ], [ 0, 0 ] };
-        key <RTRN> { [ Return, Return ], [ Return, Return ] };
-        key <SPCE> { [ space, space ], [ space, space ] };
-        key <BKSP> { [ BackSpace, BackSpace ], [ BackSpace, BackSpace ] };
-    };
-
-    xkb_types "squeekboard" {
-
-	type "TWO_LEVEL" {
-            modifiers = Shift;
-            map[Shift] = Level2;
-            level_name[Level1] = "Base";
-            level_name[Level2] = "Shift";
-	};
-    };
-
-    xkb_compatibility "squeekboard" {
-    };
-};
--- a/data/keyboards/keymaps/us.xkb
+++ b/data/keyboards/keymaps/us.xkb
@ -1,306 +0,0 @@
-xkb_keymap {
-
-    xkb_keycodes "squeekboard" {
-        minimum = 8;
-        maximum = 255;
-        <ESC>                = 9;
-        <AE01>               = 10;
-        <AE02>               = 11;
-        <AE03>               = 12;
-        <AE04>               = 13;
-        <AE05>               = 14;
-        <AE06>               = 15;
-        <AE07>               = 16;
-        <AE08>               = 17;
-        <AE09>               = 18;
-        <AE10>               = 19;
-        <AE11>               = 20;
-        <AE12>               = 21;
-        <BKSP>               = 22;
-        <TAB>                = 23;
-        <AD01>               = 24;
-        <AD02>               = 25;
-        <AD03>               = 26;
-        <AD04>               = 27;
-        <AD05>               = 28;
-        <AD06>               = 29;
-        <AD07>               = 30;
-        <AD08>               = 31;
-        <AD09>               = 32;
-        <AD10>               = 33;
-        <AD11>               = 34;
-        <AD12>               = 35;
-        <RTRN>               = 36;
-        <LCTL>               = 37;
-        <AC01>               = 38;
-        <AC02>               = 39;
-        <AC03>               = 40;
-        <AC04>               = 41;
-        <AC05>               = 42;
-        <AC06>               = 43;
-        <AC07>               = 44;
-        <AC08>               = 45;
-        <AC09>               = 46;
-        <AC10>               = 47;
-        <AC11>               = 48;
-        <TLDE>               = 49;
-        <LFSH>               = 50;
-        <BKSL>               = 51;
-        <AB01>               = 52;
-        <AB02>               = 53;
-        <AB03>               = 54;
-        <AB04>               = 55;
-        <AB05>               = 56;
-        <AB06>               = 57;
-        <AB07>               = 58;
-        <AB08>               = 59;
-        <AB09>               = 60;
-        <AB10>               = 61;
-        <RTSH>               = 62;
-        <KPMU>               = 63;
-        <LALT>               = 64;
-        <SPCE>               = 65;
-        <CAPS>               = 66;
-        <FK01>               = 67;
-        <FK02>               = 68;
-        <FK03>               = 69;
-        <FK04>               = 70;
-        <FK05>               = 71;
-        <FK06>               = 72;
-        <FK07>               = 73;
-        <FK08>               = 74;
-        <FK09>               = 75;
-        <FK10>               = 76;
-        <NMLK>               = 77;
-        <SCLK>               = 78;
-        <KP7>                = 79;
-        <KP8>                = 80;
-        <KP9>                = 81;
-        <KPSU>               = 82;
-        <KP4>                = 83;
-        <KP5>                = 84;
-        <KP6>                = 85;
-        <KPAD>               = 86;
-        <KP1>                = 87;
-        <KP2>                = 88;
-        <KP3>                = 89;
-        <KP0>                = 90;
-        <KPDL>               = 91;
-        <LVL3>               = 92;
-        <LSGT>               = 94;
-        <FK11>               = 95;
-        <FK12>               = 96;
-        <AB11>               = 97;
-        <KATA>               = 98;
-        <HIRA>               = 99;
-        <HENK>               = 100;
-        <HKTG>               = 101;
-        <MUHE>               = 102;
-        <JPCM>               = 103;
-        <KPEN>               = 104;
-        <RCTL>               = 105;
-        <KPDV>               = 106;
-        <PRSC>               = 107;
-        <RALT>               = 108;
-        <LNFD>               = 109;
-        <HOME>               = 110;
-        <UP>                 = 111;
-        <PGUP>               = 112;
-        <LEFT>               = 113;
-        <RGHT>               = 114;
-        <END>                = 115;
-        <DOWN>               = 116;
-        <PGDN>               = 117;
-        <INS>                = 118;
-        <DELE>               = 119;
-        <I120>               = 120;
-        <MUTE>               = 121;
-        <VOL->               = 122;
-        <VOL+>               = 123;
-        <POWR>               = 124;
-        <KPEQ>               = 125;
-        <I126>               = 126;
-        <PAUS>               = 127;
-        <I128>               = 128;
-        <I129>               = 129;
-        <HNGL>               = 130;
-        <HJCV>               = 131;
-        <AE13>               = 132;
-        <LWIN>               = 133;
-        <RWIN>               = 134;
-        <COMP>               = 135;
-        <STOP>               = 136;
-        <AGAI>               = 137;
-        <PROP>               = 138;
-        <UNDO>               = 139;
-        <FRNT>               = 140;
-        <COPY>               = 141;
-        <OPEN>               = 142;
-        <PAST>               = 143;
-        <FIND>               = 144;
-        <CUT>                = 145;
-        <HELP>               = 146;
-        <I147>               = 147;
-        <I148>               = 148;
-        <I149>               = 149;
-        <I150>               = 150;
-        <I151>               = 151;
-        <I152>               = 152;
-        <I153>               = 153;
-        <I154>               = 154;
-        <I155>               = 155;
-        <I156>               = 156;
-        <I157>               = 157;
-        <I158>               = 158;
-        <I159>               = 159;
-        <I160>               = 160;
-        <I161>               = 161;
-        <I162>               = 162;
-        <I163>               = 163;
-        <I164>               = 164;
-        <I165>               = 165;
-        <I166>               = 166;
-        <I167>               = 167;
-        <I168>               = 168;
-        <I169>               = 169;
-        <I170>               = 170;
-        <I171>               = 171;
-        <I172>               = 172;
-        <I173>               = 173;
-        <I174>               = 174;
-        <I175>               = 175;
-        <I176>               = 176;
-        <I177>               = 177;
-        <I178>               = 178;
-        <I179>               = 179;
-        <I180>               = 180;
-        <I181>               = 181;
-        <I182>               = 182;
-        <I183>               = 183;
-        <I184>               = 184;
-        <I185>               = 185;
-        <I186>               = 186;
-        <I187>               = 187;
-        <I188>               = 188;
-        <I189>               = 189;
-        <I190>               = 190;
-        <FK13>               = 191;
-        <FK14>               = 192;
-        <FK15>               = 193;
-        <FK16>               = 194;
-        <FK17>               = 195;
-        <FK18>               = 196;
-        <FK19>               = 197;
-        <FK20>               = 198;
-        <FK21>               = 199;
-        <FK22>               = 200;
-        <FK23>               = 201;
-        <FK24>               = 202;
-        <MDSW>               = 203;
-        <ALT>                = 204;
-        <META>               = 205;
-        <SUPR>               = 206;
-        <HYPR>               = 207;
-        <I208>               = 208;
-        <I209>               = 209;
-        <I210>               = 210;
-        <I211>               = 211;
-        <I212>               = 212;
-        <I213>               = 213;
-        <I214>               = 214;
-        <I215>               = 215;
-        <I216>               = 216;
-        <I217>               = 217;
-        <I218>               = 218;
-        <I219>               = 219;
-        <I220>               = 220;
-        <I221>               = 221;
-        <I222>               = 222;
-        <I223>               = 223;
-        <I224>               = 224;
-        <I225>               = 225;
-        <I226>               = 226;
-        <I227>               = 227;
-        <I228>               = 228;
-        <I229>               = 229;
-        <I230>               = 230;
-        <I231>               = 231;
-        <I232>               = 232;
-        <I233>               = 233;
-        <I234>               = 234;
-        <I235>               = 235;
-        <I236>               = 236;
-        <I237>               = 237;
-        <I238>               = 238;
-        <I239>               = 239;
-        <I240>               = 240;
-        <I241>               = 241;
-        <I242>               = 242;
-        <I243>               = 243;
-        <I244>               = 244;
-        <I245>               = 245;
-        <I246>               = 246;
-        <I247>               = 247;
-        <I248>               = 248;
-        <I249>               = 249;
-        <I250>               = 250;
-        <I251>               = 251;
-        <I252>               = 252;
-        <I253>               = 253;
-        <I254>               = 254;
-        <I255>               = 255;
-    };
-
-    xkb_symbols "squeekboard" {
-
-        name[Group1] = "Letters";
-        name[Group2] = "Numbers/Symbols";
-
-        key <AD01> { [ q, Q ], [ 1, asciitilde ] };
-        key <AD02> { [ w, W ], [ 2, quoteleft ] };
-        key <AD03> { [ e, E ], [ 3, bar ] };
-        key <AD04> { [ r, R ], [ 4, U00B7 ] };
-        key <AD05> { [ t, T ], [ 5, squareroot ] };
-        key <AD06> { [ y, Y ], [ 6, Greek_pi ] };
-        key <AD07> { [ u, U ], [ 7, division ] };
-        key <AD08> { [ i, I ], [ 8, multiply ] };
-        key <AD09> { [ o, O ], [ 9, paragraph ] };
-        key <AD10> { [ p, P ], [ 0, U25B3 ] };
-        key <AC01> { [ a, A ], [ at, copyright ] };
-        key <AC02> { [ s, S ], [ numbersign, U00AE ] };
-        key <AC03> { [ d, D ], [ dollar, U00A3 ] };
-        key <AC04> { [ f, F ], [ percent, EuroSign ] };
-        key <AC05> { [ g, G ], [ ampersand, U00A5 ] };
-        key <AC06> { [ h, H ], [ minus, asciicircum ] };
-        key <AC07> { [ j, J ], [ underscore, degree ] };
-        key <AC08> { [ k, K ], [ plus, equal ] };
-        key <AC09> { [ l, L ], [ parenleft, braceleft ] };
-        key <AC10> { [   ], [ parenright, braceright ] };
-        key <RTRN> { [ Return, Return ], [ Return, Return ] };
-        key <LFSH> { [ Shift_L, Shift_L ], [ Shift_L, Shift_L ] };
-        key <AB01> { [ z, Z ], [ comma, backslash ] };
-        key <AB02> { [ x, X ], [ quotedbl, slash ] };
-        key <AB03> { [ c, C ], [ quoteright, less ] };
-        key <AB04> { [ v, V ], [ colon, greater ] };
-        key <AB05> { [ b, B ], [ semicolon, equal ] };
-        key <AB06> { [ n, N ], [ exclam, bracketleft ] };
-        key <AB07> { [ m, M ], [ question, bracketright ] };
-        key <AB08> { [ period, period ], [ period, period ] };
-        key <I149> { [ preferences, preferences ], [ preferences, preferences ] };
-        key <SPCE> { [ space, space ], [ space, space ] };
-        key <BKSP> { [ BackSpace, BackSpace ], [ BackSpace, BackSpace ] };
-    };
-
-    xkb_types "squeekboard" {
-
-	type "TWO_LEVEL" {
-            modifiers = Shift;
-            map[Shift] = Level2;
-            level_name[Level1] = "Base";
-            level_name[Level2] = "Shift";
-	};
-    };
-
-    xkb_compatibility "squeekboard" {
-    };
-};
--- a/data/keyboards/no.yaml
+++ b/data/keyboards/no.yaml
@ -0,0 +1,106 @@
+---
+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 }
+
+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
@ -0,0 +1,45 @@
+---
+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 }
+
+views:
+    base:
+        - "1 2 3 parenleft parenright"
+        - "4 5 6 numbersign asterisk"
+        - "7 8 9 plus minus"
+        - "BackSpace 0 space Return"
+
+buttons:
+    BackSpace:
+        outline: "altline"
+        icon: "edit-clear-symbolic"
+        keysym: "BackSpace"
+    space:
+        outline: spaceline
+        text: " "
+    Return:
+        outline: outline7
+        icon: "key-enter"
+        keysym: "BackSpace"
+    asterisk:
+        text: "*"
+    numbersign:
+        text: "#"
+    minus:
+        text: "-"
+    plus:
+        text: "+"
+    parenleft:
+        text: "("
+    parenright:
+        text: ")"
+
--- a/data/keyboards/se.yaml
+++ b/data/keyboards/se.yaml
@ -0,0 +1,166 @@
+---
+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 }
+
+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/nb.xml
+++ b/data/keyboards/symbols/nb.xml
@ -1,204 +0,0 @@
-<?xml version='1.0' encoding='ASCII' standalone='yes'?>
-<symbols version="0.90">
-  <key name="AD01">
-    <symbol label="q">q</symbol>
-    <symbol label="Q">Q</symbol>
-    <symbol label="1">1</symbol>
-    <symbol label="~">asciitilde</symbol>
-  </key>
-  <key name="AD02">
-    <symbol label="w">w</symbol>
-    <symbol label="W">W</symbol>
-    <symbol label="2">2</symbol>
-    <symbol label="`">quoteleft</symbol>
-  </key>
-  <key name="AD03">
-    <symbol label="e">e</symbol>
-    <symbol label="E">E</symbol>
-    <symbol label="3">3</symbol>
-    <symbol label="|">bar</symbol>
-  </key>
-  <key name="AD04">
-    <symbol label="r">r</symbol>
-    <symbol label="R">R</symbol>
-    <symbol label="4">4</symbol>
-    <symbol label="&#183;">U00B7</symbol>
-  </key>
-  <key name="AD05">
-    <symbol label="t">t</symbol>
-    <symbol label="T">T</symbol>
-    <symbol label="5">5</symbol>
-    <symbol label="&#8730;">squareroot</symbol>
-  </key>
-  <key name="AD06">
-    <symbol label="y">y</symbol>
-    <symbol label="Y">Y</symbol>
-    <symbol label="6">6</symbol>
-    <symbol label="&#960;">Greek_pi</symbol>
-  </key>
-  <key name="AD07">
-    <symbol label="u">u</symbol>
-    <symbol label="U">U</symbol>
-    <symbol label="7">7</symbol>
-    <symbol label="&#247;">division</symbol>
-  </key>
-  <key name="AD08">
-    <symbol label="i">i</symbol>
-    <symbol label="I">I</symbol>
-    <symbol label="8">8</symbol>
-    <symbol label="&#215;">multiply</symbol>
-  </key>
-  <key name="AD09">
-    <symbol label="o">o</symbol>
-    <symbol label="O">O</symbol>
-    <symbol label="9">9</symbol>
-    <symbol label="&#182;">paragraph</symbol>
-  </key>
-  <key name="AD10">
-    <symbol label="p">p</symbol>
-    <symbol label="P">P</symbol>
-    <symbol label="0">0</symbol>
-    <symbol label="&#9651;">U25B3</symbol>
-  </key>
-  <key name="AD11">
-    <symbol keyval="229" label="&#229;">aring</symbol>
-    <symbol keyval="197" label="&#197;">Aring</symbol>
-    <symbol label="&#177;">U00B1</symbol>
-    <symbol label="&#167;">U00A7</symbol>
-  </key>
-  <key name="AC01">
-    <symbol label="a">a</symbol>
-    <symbol label="A">A</symbol>
-    <symbol label="@">at</symbol>
-    <symbol label="&#169;">copyright</symbol>
-  </key>
-  <key name="AC02">
-    <symbol label="s">s</symbol>
-    <symbol label="S">S</symbol>
-    <symbol label="#">numbersign</symbol>
-    <symbol label="&#174;">U00AE</symbol>
-  </key>
-  <key name="AC03">
-    <symbol label="d">d</symbol>
-    <symbol label="D">D</symbol>
-    <symbol label="$">dollar</symbol>
-    <symbol label="&#163;">U00A3</symbol>
-  </key>
-  <key name="AC04">
-    <symbol label="f">f</symbol>
-    <symbol label="F">F</symbol>
-    <symbol label="%">percent</symbol>
-    <symbol label="&#8364;">EuroSign</symbol>
-  </key>
-  <key name="AC05">
-    <symbol label="g">g</symbol>
-    <symbol label="G">G</symbol>
-    <symbol label="&amp;">ampersand</symbol>
-    <symbol label="&#165;">U00A5</symbol>
-  </key>
-  <key name="AC06">
-    <symbol label="h">h</symbol>
-    <symbol label="H">H</symbol>
-    <symbol label="-">minus</symbol>
-    <symbol label="_">underscore</symbol>
-  </key>
-  <key name="AC07">
-    <symbol label="j">j</symbol>
-    <symbol label="J">J</symbol>
-    <symbol label="+">plus</symbol>
-    <symbol label="=">equal</symbol>
-  </key>
-  <key name="AC08">
-    <symbol label="k">k</symbol>
-    <symbol label="K">K</symbol>
-    <symbol label="&#252;">U00FC</symbol>
-    <symbol label="^">asciicircum</symbol>
-  </key>
-  <key name="AC09">
-    <symbol label="l">l</symbol>
-    <symbol label="L">L</symbol>
-    <symbol label="&#246;">U00F6</symbol>
-    <symbol label="&#176;">degree</symbol>
-  </key>
-  <key name="AC10">
-    <symbol keyval="248" label="&#248;">oslash</symbol>
-    <symbol keyval="216" label="&#216;">Oslash</symbol>
-    <symbol label="(">parenleft</symbol>
-    <symbol label="{">braceleft</symbol>
-  </key>
-  <key name="AC11">
-    <symbol keyval="230" label="&#230;">ae</symbol>
-    <symbol keyval="198" label="&#198;">AE</symbol>
-    <symbol label=")">parenright</symbol>
-    <symbol label="}">braceright</symbol>
-  </key>
-  <key name="RTRN">
-    <symbol keyval="65293" icon="key-enter">Return</symbol>
-  </key>
-  <key name="LFSH">
-    <keysym keyval="65505" icon="key-shift">Shift_L</keysym>
-    <keysym keyval="65505" icon="key-shift">Shift_L</keysym>
-    <keysym keyval="65505" label="=/+">Shift_L</keysym>
-    <keysym keyval="65505" label="123">Shift_L</keysym>
-  </key>
-  <key name="AB01">
-    <symbol label="z">z</symbol>
-    <symbol label="Z">Z</symbol>
-    <symbol label=",">comma</symbol>
-    <symbol label="\">backslash</symbol>
-  </key>
-  <key name="AB02">
-    <symbol label="x">x</symbol>
-    <symbol label="X">X</symbol>
-    <symbol label="&quot;">quotedbl</symbol>
-    <symbol label="/">slash</symbol>
-  </key>
-  <key name="AB03">
-    <symbol label="c">c</symbol>
-    <symbol label="C">C</symbol>
-    <symbol label="'">quoteright</symbol>
-    <symbol label="&lt;">less</symbol>
-  </key>
-  <key name="AB04">
-    <symbol label="v">v</symbol>
-    <symbol label="V">V</symbol>
-    <symbol label=":">colon</symbol>
-    <symbol label="&gt;">greater</symbol>
-  </key>
-  <key name="AB05">
-    <symbol label="b">b</symbol>
-    <symbol label="B">B</symbol>
-    <symbol label=";">semicolon</symbol>
-    <symbol label="=">equal</symbol>
-  </key>
-  <key name="AB06">
-    <symbol label="n">n</symbol>
-    <symbol label="N">N</symbol>
-    <symbol label="!">exclam</symbol>
-    <symbol label="[">bracketleft</symbol>
-  </key>
-  <key name="AB07">
-    <symbol label="m">m</symbol>
-    <symbol label="M">M</symbol>
-    <symbol label="?">question</symbol>
-    <symbol label="]">bracketright</symbol>
-  </key>
-  <key name="AB08">
-    <symbol label=".">period</symbol>
-  </key>
-  <key name="ABC123">
-    <symbol label="123">show-numbers</symbol>
-    <symbol label="123">show-numbers</symbol>
-    <symbol label="ABC">show-letters</symbol>
-    <symbol label="ABC">show-letters</symbol>
-  </key>
-  <key name="I149">
-    <symbol icon="keyboard-mode-symbolic" tooltip="Setup">preferences</symbol>
-  </key>
-  <key name="SPCE">
-    <symbol label=" ">space</symbol>
-  </key>
-  <key name="BKSP">
-    <symbol keyval="65288" icon="edit-clear-symbolic">BackSpace</symbol>
-  </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/special/numbers.xml
+++ b/data/keyboards/symbols/special/numbers.xml
@ -1,60 +0,0 @@
-<?xml version='1.0' encoding='ASCII' standalone='yes'?>
-<symbols version="0.90">
-  <key name="AD01">
-    <symbol label="1">1</symbol>
-  </key>
-  <key name="AD02">
-    <symbol label="2">2</symbol>
-  </key>
-  <key name="AD03">
-    <symbol label="3">3</symbol>
-  </key>
-  <key name="AD04">
-    <symbol label="(">parenleft</symbol>
-  </key>
-  <key name="AD05">
-    <symbol label=")">parenright</symbol>
-  </key>
-  <key name="AC01">
-    <symbol label="4">4</symbol>
-  </key>
-  <key name="AC02">
-    <symbol label="5">5</symbol>
-  </key>
-  <key name="AC03">
-    <symbol label="6">6</symbol>
-  </key>
-  <key name="AC04">
-    <symbol label="#">numbersign</symbol>
-  </key>
-  <key name="AC05">
-    <symbol label="*">asterisk</symbol>
-  </key>
-  <key name="AB01">
-    <symbol label="7">7</symbol>
-  </key>
-  <key name="AB02">
-    <symbol label="8">8</symbol>
-  </key>
-  <key name="AB03">
-    <symbol label="9">9</symbol>
-  </key>
-  <key name="AB04">
-    <symbol label="+">plus</symbol>
-  </key>
-  <key name="AB05">
-    <symbol label="-">minus</symbol>
-  </key>
-  <key name="AB06">
-    <symbol label="0">0</symbol>
-  </key>
-  <key name="RTRN">
-    <symbol keyval="65293" icon="key-enter">Return</symbol>
-  </key>
-  <key name="SPCE">
-    <symbol label=" ">space</symbol>
-  </key>
-  <key name="BKSP">
-    <symbol keyval="65288" icon="edit-clear-symbolic">BackSpace</symbol>
-  </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/us.xml
+++ b/data/keyboards/symbols/us.xml
@ -1,192 +0,0 @@
-<?xml version='1.0' encoding='ASCII' standalone='yes'?>
-<symbols version="0.90">
-  <key name="AD01">
-    <symbol label="q">q</symbol>
-    <symbol label="Q">Q</symbol>
-    <symbol label="1">1</symbol>
-    <symbol label="~">asciitilde</symbol>
-  </key>
-  <key name="AD02">
-    <symbol label="w">w</symbol>
-    <symbol label="W">W</symbol>
-    <symbol label="2">2</symbol>
-    <symbol label="`">quoteleft</symbol>
-  </key>
-  <key name="AD03">
-    <symbol label="e">e</symbol>
-    <symbol label="E">E</symbol>
-    <symbol label="3">3</symbol>
-    <symbol label="|">bar</symbol>
-  </key>
-  <key name="AD04">
-    <symbol label="r">r</symbol>
-    <symbol label="R">R</symbol>
-    <symbol label="4">4</symbol>
-    <symbol label="&#183;">U00B7</symbol>
-  </key>
-  <key name="AD05">
-    <symbol label="t">t</symbol>
-    <symbol label="T">T</symbol>
-    <symbol label="5">5</symbol>
-    <symbol label="&#8730;">squareroot</symbol>
-  </key>
-  <key name="AD06">
-    <symbol label="y">y</symbol>
-    <symbol label="Y">Y</symbol>
-    <symbol label="6">6</symbol>
-    <symbol label="&#960;">Greek_pi</symbol>
-  </key>
-  <key name="AD07">
-    <symbol label="u">u</symbol>
-    <symbol label="U">U</symbol>
-    <symbol label="7">7</symbol>
-    <symbol label="&#247;">division</symbol>
-  </key>
-  <key name="AD08">
-    <symbol label="i">i</symbol>
-    <symbol label="I">I</symbol>
-    <symbol label="8">8</symbol>
-    <symbol label="&#215;">multiply</symbol>
-  </key>
-  <key name="AD09">
-    <symbol label="o">o</symbol>
-    <symbol label="O">O</symbol>
-    <symbol label="9">9</symbol>
-    <symbol label="&#182;">paragraph</symbol>
-  </key>
-  <key name="AD10">
-    <symbol label="p">p</symbol>
-    <symbol label="P">P</symbol>
-    <symbol label="0">0</symbol>
-    <symbol label="&#9651;">U25B3</symbol>
-  </key>
-  <key name="AC01">
-    <symbol label="a">a</symbol>
-    <symbol label="A">A</symbol>
-    <symbol label="@">at</symbol>
-    <symbol label="&#169;">copyright</symbol>
-  </key>
-  <key name="AC02">
-    <symbol label="s">s</symbol>
-    <symbol label="S">S</symbol>
-    <symbol label="#">numbersign</symbol>
-    <symbol label="&#174;">U00AE</symbol>
-  </key>
-  <key name="AC03">
-    <symbol label="d">d</symbol>
-    <symbol label="D">D</symbol>
-    <symbol label="$">dollar</symbol>
-    <symbol label="&#163;">U00A3</symbol>
-  </key>
-  <key name="AC04">
-    <symbol label="f">f</symbol>
-    <symbol label="F">F</symbol>
-    <symbol label="%">percent</symbol>
-    <symbol label="&#8364;">EuroSign</symbol>
-  </key>
-  <key name="AC05">
-    <symbol label="g">g</symbol>
-    <symbol label="G">G</symbol>
-    <symbol label="&amp;">ampersand</symbol>
-    <symbol label="&#165;">U00A5</symbol>
-  </key>
-  <key name="AC06">
-    <symbol label="h">h</symbol>
-    <symbol label="H">H</symbol>
-    <symbol label="-">minus</symbol>
-    <symbol label="^">asciicircum</symbol>
-  </key>
-  <key name="AC07">
-    <symbol label="j">j</symbol>
-    <symbol label="J">J</symbol>
-    <symbol label="_">underscore</symbol>
-    <symbol label="&#176;">degree</symbol>
-  </key>
-  <key name="AC08">
-    <symbol label="k">k</symbol>
-    <symbol label="K">K</symbol>
-    <symbol label="+">plus</symbol>
-    <symbol label="=">equal</symbol>
-  </key>
-  <key name="AC09">
-    <symbol label="l">l</symbol>
-    <symbol label="L">L</symbol>
-    <symbol label="(">parenleft</symbol>
-    <symbol label="{">braceleft</symbol>
-  </key>
-  <key name="AC10">
-    <symbol label=""></symbol>
-    <symbol label=""></symbol>
-    <symbol label=")">parenright</symbol>
-    <symbol label="}">braceright</symbol>
-  </key>
-  <key name="RTRN">
-    <symbol keyval="65293" icon="key-enter">Return</symbol>
-  </key>
-  <key name="LFSH">
-    <keysym keyval="65505" icon="key-shift">Shift_L</keysym>
-    <keysym keyval="65505" icon="key-shift">Shift_L</keysym>
-    <keysym keyval="65505" label="=/+">Shift_L</keysym>
-    <keysym keyval="65505" label="123">Shift_L</keysym>
-  </key>
-  <key name="AB01">
-    <symbol label="z">z</symbol>
-    <symbol label="Z">Z</symbol>
-    <symbol label=",">comma</symbol>
-    <symbol label="\">backslash</symbol>
-  </key>
-  <key name="AB02">
-    <symbol label="x">x</symbol>
-    <symbol label="X">X</symbol>
-    <symbol label="&quot;">quotedbl</symbol>
-    <symbol label="/">slash</symbol>
-  </key>
-  <key name="AB03">
-    <symbol label="c">c</symbol>
-    <symbol label="C">C</symbol>
-    <symbol label="'">quoteright</symbol>
-    <symbol label="&lt;">less</symbol>
-  </key>
-  <key name="AB04">
-    <symbol label="v">v</symbol>
-    <symbol label="V">V</symbol>
-    <symbol label=":">colon</symbol>
-    <symbol label="&gt;">greater</symbol>
-  </key>
-  <key name="AB05">
-    <symbol label="b">b</symbol>
-    <symbol label="B">B</symbol>
-    <symbol label=";">semicolon</symbol>
-    <symbol label="=">equal</symbol>
-  </key>
-  <key name="AB06">
-    <symbol label="n">n</symbol>
-    <symbol label="N">N</symbol>
-    <symbol label="!">exclam</symbol>
-    <symbol label="[">bracketleft</symbol>
-  </key>
-  <key name="AB07">
-    <symbol label="m">m</symbol>
-    <symbol label="M">M</symbol>
-    <symbol label="?">question</symbol>
-    <symbol label="]">bracketright</symbol>
-  </key>
-  <key name="AB08">
-    <symbol label=".">period</symbol>
-  </key>
-  <key name="ABC123">
-    <symbol label="123">show-numbers</symbol>
-    <symbol label="123">show-numbers</symbol>
-    <symbol label="ABC">show-letters</symbol>
-    <symbol label="ABC">show-letters</symbol>
-  </key>
-  <key name="I149">
-    <symbol label="&#9786;" icon="keyboard-mode-symbolic" tooltip="Setup">preferences</symbol>
-  </key>
-  <key name="SPCE">
-    <symbol label=" ">space</symbol>
-  </key>
-  <key name="BKSP">
-    <symbol keyval="65288" icon="edit-clear-symbolic">BackSpace</symbol>
-  </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
@ -0,0 +1,85 @@
+---
+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 }
+
+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"
+    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"
+    numbers:
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "@ # $ % & - _ + ( )"
+        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
+        - "show_letters preferences         space        period Return"
+    symbols:
+        - "~ ` | · √ π τ ÷ × ¶"
+        - "© ® £ € ¥ ^ ° * { }"
+        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
+        - "show_letters preferences         space        period 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: "wide"
+        label: "123"
+    show_numbers_from_symbols:
+        action:
+            set_view: "numbers"
+        outline: "altline"
+        label: "123"
+    show_letters:
+        action:
+            set_view: "base"
+        outline: "wide"
+        label: "ABC"
+    show_symbols:
+        action:
+            set_view: "symbols"
+        outline: "altline"
+        label: "*/="
+    period:
+        outline: "special"
+        text: "."
+    space:
+        outline: "spaceline"
+        text: " "
+    Return:
+        outline: "wide"
+        icon: "key-enter"
+        keysym: "Return"
+    colon:
+        text: ":"
--- a/data/keyboards/us_wide.yaml
+++ b/data/keyboards/us_wide.yaml
@ -0,0 +1,85 @@
+---
+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 }
+
+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   , \" ' colon ; ! ?  BackSpace"
+        - "show_letters preferences         space        . Return"
+    symbols:
+        - "~ ` | · √ π τ ÷ × ¶"
+        - "© ® £ € ¥ ^ ° * { }"
+        - "show_numbers_from_symbols   \\ / < > = [ ]  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: "wide"
+        label: "123"
+    show_numbers_from_symbols:
+        action:
+            set_view: "numbers"
+        outline: "altline"
+        label: "123"
+    show_letters:
+        action:
+            set_view: "base"
+        outline: "wide"
+        label: "ABC"
+    show_symbols:
+        action:
+            set_view: "symbols"
+        outline: "altline"
+        label: "*/="
+    ".":
+        outline: "special"
+        text: "."
+    space:
+        outline: "spaceline"
+        text: " "
+    Return:
+        outline: "wide"
+        icon: "key-enter"
+        keysym: "Return"
+    colon:
+        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,7 @@ Name=Squeekboard
 GenericName=Squeekboard Virtual Keyboard
 Comment=Virtual Keyboard
 Exec=squeekboard
-Icon=squeekboard
 Terminal=false
 Type=Application
+NoDisplay=true
 Categories=GTK;Utility;
--- a/data/squeekboard.gresources.xml
+++ b/data/squeekboard.gresources.xml
@ -2,43 +2,8 @@
 <gresources>
  <gresource prefix="/sm/puri/squeekboard">
   <file compressed="true">style.css</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/geometry/compact.xml</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/geometry/extended.xml</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/geometry/numbers-keypad.xml</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/keyboards.xml</file>
-   <file compressed="true">keyboards/keymaps/nb.xkb</file>
-   <file compressed="true">keyboards/keymaps/us.xkb</file>
-   <file compressed="true">keyboards/keymaps/numbers.xkb</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/nb.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/us.xml</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/zh-bopomofo.xml</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/special/numbers.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,18 +1,49 @@
-.keyboard {
-    background-color: rgba(0, 0, 0, 255);
-    color: #ffffff;
+sq_view {
+    background-color: @theme_base_color; /*rgba(0, 0, 0, 255);*/
+    color: @theme_text_color; /*#ffffff;*/
    font-family: cantarell, sans-serif;
 }

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

-.key:active {
-    background: #1c71d8;
-    border-color: #3584e4;
+sq_view.wide sq_button {
+    margin: 1px 1px 1px 1px;
+}
+
+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: mix(@theme_bg_color, @theme_base_color, 0.5); /*#2b292f;*/
+    border-color: @borders; /* #3e3a44; */
+}
+
+sq_button.locked {
+    background: @theme_fg_color; /*#ffffff;*/
+    color: @theme_bg_color; /*#2b292f;*/
+}
+
+#Return {
+    background: @theme_selected_bg_color; /* #1c71d8; */
+    border-color: @borders; /*#1a5fb4;*/
+}
+
+#Return:active {
+    background: mix(@theme_selected_bg_color, @theme_bg_color, 0.4); /*#1c71d8;*/
+    border-color: @borders; /*#3584e4;*/
 }
--- a/debian/cargo/config
+++ b/debian/cargo/config
@ -0,0 +1,12 @@
+# When modifying this file, consider instead
+# to take advantage of the method that Cargo packagers use
+# to set up all the necessary stuff automatically:
+# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=907629#30
+
+[source.crates-io]
+registry = 'https://github.com/rust-lang/crates.io-index'
+replace-with = 'vendored-sources'
+
+[source.vendored-sources]
+directory = '/usr/share/cargo/registry'
+
--- a/debian/changelog
+++ b/debian/changelog
@ -1,3 +1,55 @@
+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
+
+ -- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>  Wed, 30 Oct 2019 12:38:39 +0000
+
+squeekboard (1.2.1) amber-phone; urgency=medium
+
+  * Use different distribution
+
+ -- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>  Tue, 08 Oct 2019 10:56:10 +0000
+
+squeekboard (1.2.0) unstable; urgency=medium
+
+  * Use Cargo-based dependencies
+
+ -- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>  Tue, 24 Sep 2019 10:42:15 +0000
+
+squeekboard (1.1.0) unstable; urgency=medium
+
+  * Use new keyboard layout format
+
+ -- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>  Mon, 02 Sep 2019 10:12:02 +0000
+
+
 squeekboard (1.0.10) unstable; urgency=medium

  * Use a shared DBus definition
--- a/debian/control
+++ b/debian/control
@ -3,22 +3,51 @@ Section: x11
 Priority: optional
 Maintainer: Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>
 Build-Depends:
+ cargo,
 debhelper (>= 10),
- meson (>=0.43.0),
+ meson (>=0.51.0),
+ ninja-build,
 pkg-config,
 libglib2.0-dev,
 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)
+ 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:
+ ${shlibs:Depends}
+ ${misc:Depends}
+Description: Resources for making Squeekboard layouts
+ Tools for creating Squeekboard layouts:
+ .
+  * squeekboard-test-layout
--- a/debian/copyright
+++ b/debian/copyright
@ -1,6 +1,6 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: evscript
-Source: https://source.puri.sm/david.boddie/evscript
+Upstream-Name: squeekboard
+Source: https://source.puri.sm/Librem5/squeekboard

 Files: *
 Copyright: 2010-2011 Daiki Ueno <ueno@unixuser.org>
@ -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/rules
+++ b/debian/rules
@ -1,8 +1,15 @@
 #!/usr/bin/make -f

+export CARGO_HOME = $(CURDIR)/debian/cargo
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all

 %:
 	dh $@ --builddirectory=_build --buildsystem=meson

+# The Debian version of linked-hash-map doesn't provide any hash,
+# causing Cargo to refuse to build with a crates.io copy
+build-arch:
+	rm Cargo.lock
+	dh $@ --builddirectory=_build --buildsystem=meson
+
 override_dh_autoreconf:
--- a/debian/squeekboard-devel.install
+++ b/debian/squeekboard-devel.install
@ -0,0 +1 @@
+usr/bin/squeekboard-test-layout /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/debian/squeekboard.lintian-overrides
+++ b/debian/squeekboard.lintian-overrides
@ -0,0 +1,2 @@
+# yaml-rust 0.4.3 shares some roots with libyaml, including the string which lintian checks, creating a false positive
+squeekboard binary: embedded-library usr/bin/squeekboard: libyaml
--- a/docs/reference/eek/eek-docs.sgml
+++ b/docs/reference/eek/eek-docs.sgml
@ -1,83 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
-[
-  <!ENTITY % local.common.attrib "xmlns:xi  CDATA  #FIXED 'http://www.w3.org/2003/XInclude'">
-]>
-<book id="index">
-  <bookinfo>
-    <title>libeek Reference Manual</title>
-    <releaseinfo>
-      for libeek 0.90.0.
-    </releaseinfo>
-    <copyright>
-      <year>2010-2011</year>
-      <holder>Daiki Ueno</holder>
-    </copyright>
-
-    <copyright>
-      <year>2010-2011</year>
-      <holder>Red Hat, Inc.</holder>
-    </copyright>
-
-    <legalnotice>
-      <para>
-	Permission is granted to copy, distribute and/or modify this
-	document under the terms of the GNU Free Documentation License,
-	Version 1.3 or any later version published by the Free Software
-	Foundation; with no Invariant Sections, no Front-Cover Texts and
-	no Back-Cover Texts.  A copy of the license is included in the
-	section entitled "GNU Free Documentation License".
-      </para>
-    </legalnotice>
-  </bookinfo>
-
-  <xi:include href="xml/eek-overview.xml"/>
-  <part id="apireference">
-    <title>API Manual</title>
-    <chapter>
-      <title>Base Classes, Interfaces, and Utilities</title>
-      <xi:include href="xml/eek.xml"/>
-      <xi:include href="xml/eek-serializable.xml"/>
-      <xi:include href="xml/eek-element.xml"/>
-      <xi:include href="xml/eek-container.xml"/>
-      <xi:include href="xml/eek-keyboard.xml"/>
-      <xi:include href="xml/eek-section.xml"/>
-      <xi:include href="xml/eek-key.xml"/>
-      <xi:include href="xml/eek-symbol.xml"/>
-      <xi:include href="xml/eek-keysym.xml"/>
-      <xi:include href="xml/eek-text.xml"/>
-      <xi:include href="xml/eek-layout.xml"/>
-      <xi:include href="xml/eek-types.xml"/>
-    </chapter>
-    <chapter>
-      <title>GTK Adapter</title>
-      <xi:include href="xml/eek-gtk-keyboard.xml"/>
-    </chapter>
-    <chapter>
-      <title>Clutter Adapter</title>
-      <xi:include href="xml/eek-clutter-keyboard.xml"/>
-    </chapter>
-    <chapter>
-      <title>Libxklavier Layout Engine</title>
-      <xi:include href="xml/eek-xkl-layout.xml"/>
-    </chapter>
-    <chapter>
-      <title>XKB Layout Engine</title>
-      <xi:include href="xml/eek-xkb-layout.xml"/>
-    </chapter>
-    <chapter>
-      <title>XML Layout Engine</title>
-      <xi:include href="xml/eek-xml-layout.xml"/>
-      <xi:include href="xml/eek-xml.xml"/>
-    </chapter>
-    <chapter id="object-tree">
-      <title>Object Hierarchy</title>
-      <xi:include href="xml/tree_index.sgml"/>
-    </chapter>
-    <index id="api-index-full">
-      <title>API Index</title>
-      <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>
-    </index>
-  </part>
-</book>
--- a/docs/reference/eek/eek-overview.xml
+++ b/docs/reference/eek/eek-overview.xml
@ -1,70 +0,0 @@
-<part id="eek-overview">
-  <title>Usage Overview</title>
-  <partintro>
-
-    <para>libeek is a library to create keyboard-like user interface.
-    Since it is designed as simple as possible, it provides only two
-    kind of objects.  One is <emphasis>keyboard element</emphasis>
-    (objects derived from #EekElement) and another is
-    <emphasis>keyboard layout engine</emphasis> (objects which
-    implements the #EekLayout interface).</para>
-
-    <para>A keyboard element represents either a keyboard
-    (#EekKeyboard), a section (#EekSection), or a key (#EekKey).  Each
-    element implements the Builder design pattern so that it can map
-    itself to different UI widgets (#ClutterActor, #GtkDrawingArea,
-    aso).</para>
-
-    <para>A layout engine arranges keyboard elements using information
-    from external configuration mechanisms (libxklavier, XKB,
-    matchbox-keyboard layouts in XML, aso)</para>
-
-    <para>Here is a sample code which demonstrates (1) keyboard
-    elements are arranged with the system keyboard layout using
-    libxklavier and (2) keyboard elements are mapped into
-    #ClutterActor:</para>
-    <informalexample>
-      <programlisting>
-EekLayout *layout;
-EekKeyboard *keyboard;
-ClutterActor *actor;
-
-/* Create a layout engine based on libxklavier configuration. */
-layout = eek_xkl_layout_new ();
-
-/* Create a keyboard from the given layout. */
-keyboard = eek_keyboard_new (layout, initial_width, initial_height);
-
-/* Create a ClutterActor. */
-actor = eek_clutter_keyboard_new (eekboard->keyboard);
-
-/* Add the actor to a stage. */
-clutter_group_add (CLUTTER_GROUP(stage), actor);
-      </programlisting>
-    </informalexample>
-
-    <para>libeek currently supports GTK+ and Clutter as UI toolkits.
-    To create a keyboard-like #GtkWidget instead of #ClutterActor,
-    replace eek_clutter_keyboard_new() with eek_gtk_keyboard_new().
-    Similarly, if you want to use XKB configuration directly (without
-    libxklavier), you will only need to replace eek_xkl_layout_new ()
-    with eek_xkb_layout_new().</para>
-
-    <para>In the above example, a keyboard is represented as a tree of
-    #EekElement -- #EekKeyboard contains one or more #EekSection's and
-    #EekSection contains one or more #EekKey's.  Each element may emit
-    events when user pushes the corresponding UI widget.</para>
-    <para>
-      Here is another sample code which demonstrates logical events on
-      #EekElement:
-    </para>
-    <informalexample>
-      <programlisting>
-/* Find a key element in the logical keyboard. */
-EekKey *key = eek_keyboard_find_key_by_keycode (keyboard, 0x38);
-g_signal_connect (key, "pressed", on_a_pressed);
-      </programlisting>
-    </informalexample>
-    <para>When user pushed a widget which looks like "a" key (i.e. keycode 0x38), on_a_pressed will be called.</para>
-  </partintro>
-</part>
--- a/docs/reference/eek/eek-sections.txt
+++ b/docs/reference/eek/eek-sections.txt
@ -1,544 +0,0 @@
-<SECTION>
-<FILE>eek</FILE>
-eek_init
-</SECTION>
-
-<SECTION>
-<FILE>eek-clutter</FILE>
-
-</SECTION>
-
-<SECTION>
-<FILE>eek-clutter-key</FILE>
-<TITLE>EekClutterKey</TITLE>
-EekClutterKey
-EekClutterKeyClass
-eek_clutter_key_new
-<SUBSECTION Standard>
-EEK_CLUTTER_KEY
-EEK_CLUTTER_KEY_CLASS
-EEK_CLUTTER_KEY_GET_CLASS
-EEK_IS_CLUTTER_KEY
-EEK_IS_CLUTTER_KEY_CLASS
-EEK_TYPE_CLUTTER_KEY
-EekClutterKeyPrivate
-eek_clutter_key_get_type
-</SECTION>
-
-<SECTION>
-<FILE>eek-clutter-keyboard</FILE>
-<TITLE>EekClutterKeyboard</TITLE>
-EekClutterKeyboard
-EekClutterKeyboardClass
-eek_clutter_keyboard_new
-eek_clutter_keyboard_set_theme
-<SUBSECTION Standard>
-EEK_CLUTTER_KEYBOARD
-EEK_CLUTTER_KEYBOARD_CLASS
-EEK_CLUTTER_KEYBOARD_GET_CLASS
-EEK_IS_CLUTTER_KEYBOARD
-EEK_IS_CLUTTER_KEYBOARD_CLASS
-EEK_TYPE_CLUTTER_KEYBOARD
-EekClutterKeyboardPrivate
-eek_clutter_keyboard_get_type
-</SECTION>
-
-<SECTION>
-<FILE>eek-clutter-renderer</FILE>
-<TITLE>EekClutterRenderer</TITLE>
-EekClutterRenderer
-EekClutterRendererClass
-eek_clutter_renderer_new
-eek_clutter_renderer_render_key
-<SUBSECTION Standard>
-EEK_CLUTTER_RENDERER
-EEK_CLUTTER_RENDERER_CLASS
-EEK_CLUTTER_RENDERER_GET_CLASS
-EEK_IS_CLUTTER_RENDERER
-EEK_IS_CLUTTER_RENDERER_CLASS
-EEK_TYPE_CLUTTER_RENDERER
-EekClutterRendererPrivate
-eek_clutter_renderer_get_type
-</SECTION>
-
-<SECTION>
-<FILE>eek-clutter-section</FILE>
-<TITLE>EekClutterSection</TITLE>
-EekClutterSection
-EekClutterSectionClass
-eek_clutter_section_new
-<SUBSECTION Standard>
-EEK_CLUTTER_SECTION
-EEK_CLUTTER_SECTION_CLASS
-EEK_CLUTTER_SECTION_GET_CLASS
-EEK_IS_CLUTTER_SECTION
-EEK_IS_CLUTTER_SECTION_CLASS
-EEK_TYPE_CLUTTER_SECTION
-EekClutterSectionPrivate
-eek_clutter_section_get_type
-</SECTION>
-
-<SECTION>
-<FILE>eek-container</FILE>
-<TITLE>EekContainer</TITLE>
-EekCallback
-EekCompareFunc
-EekContainer
-EekContainerClass
-eek_container_add_child
-eek_container_find
-eek_container_foreach_child
-<SUBSECTION Standard>
-EEK_CONTAINER
-EEK_CONTAINER_CLASS
-EEK_CONTAINER_GET_CLASS
-EEK_IS_CONTAINER
-EEK_IS_CONTAINER_CLASS
-EEK_TYPE_CONTAINER
-EekContainerPrivate
-eek_container_get_type
-</SECTION>
-
-<SECTION>
-<FILE>eek-element</FILE>
-<TITLE>EekElement</TITLE>
-EekElement
-EekElementClass
-eek_element_get_absolute_position
-eek_element_get_bounds
-eek_element_get_group
-eek_element_get_level
-eek_element_get_name
-eek_element_get_parent
-eek_element_get_symbol_index
-eek_element_set_bounds
-eek_element_set_group
-eek_element_set_level
-eek_element_set_name
-eek_element_set_parent
-eek_element_set_position
-eek_element_set_size
-eek_element_set_symbol_index
-<SUBSECTION Standard>
-EEK_ELEMENT
-EEK_ELEMENT_CLASS
-EEK_ELEMENT_GET_CLASS
-EEK_IS_ELEMENT
-EEK_IS_ELEMENT_CLASS
-EEK_TYPE_ELEMENT
-EekElementPrivate
-eek_element_get_type
-</SECTION>
-
-<SECTION>
-<FILE>eek-gtk</FILE>
-
-</SECTION>
-
-<SECTION>
-<FILE>eek-gtk-keyboard</FILE>
-<TITLE>EekGtkKeyboard</TITLE>
-EekGtkKeyboard
-EekGtkKeyboardClass
-eek_gtk_keyboard_new
-eek_gtk_keyboard_set_theme
-<SUBSECTION Standard>
-EEK_GTK_KEYBOARD
-EEK_GTK_KEYBOARD_CLASS
-EEK_GTK_KEYBOARD_GET_CLASS
-EEK_IS_GTK_KEYBOARD
-EEK_IS_GTK_KEYBOARD_CLASS
-EEK_TYPE_GTK_KEYBOARD
-EekGtkKeyboardPrivate
-eek_gtk_keyboard_get_type
-</SECTION>
-
-<SECTION>
-<FILE>eek-key</FILE>
-<TITLE>EekKey</TITLE>
-EekKey
-EekKeyClass
-eek_key_get_index
-eek_key_get_keycode
-eek_key_get_oref
-eek_key_get_symbol
-eek_key_get_symbol_at_index
-eek_key_get_symbol_matrix
-eek_key_get_symbol_with_fallback
-eek_key_is_locked
-eek_key_is_pressed
-eek_key_set_index
-eek_key_set_keycode
-eek_key_set_oref
-eek_key_set_symbol_matrix
-<SUBSECTION Standard>
-EEK_IS_KEY
-EEK_IS_KEY_CLASS
-EEK_KEY
-EEK_KEY_CLASS
-EEK_KEY_GET_CLASS
-EEK_TYPE_KEY
-EekKeyPrivate
-eek_key_get_type
-</SECTION>
-
-<SECTION>
-<FILE>eek-keyboard</FILE>
-<TITLE>EekKeyboard</TITLE>
-EekKeyboard
-EekKeyboardClass
-EekModifierKey
-eek_keyboard_add_outline
-eek_keyboard_create_section
-eek_keyboard_find_key_by_keycode
-eek_keyboard_get_alt_gr_mask
-eek_keyboard_get_group
-eek_keyboard_get_layout
-eek_keyboard_get_level
-eek_keyboard_get_locked_keys
-eek_keyboard_get_modifier_behavior
-eek_keyboard_get_modifiers
-eek_keyboard_get_num_lock_mask
-eek_keyboard_get_outline
-eek_keyboard_get_pressed_keys
-eek_keyboard_get_size
-eek_keyboard_get_symbol_index
-eek_keyboard_new
-eek_keyboard_set_alt_gr_mask
-eek_keyboard_set_group
-eek_keyboard_set_level
-eek_keyboard_set_modifier_behavior
-eek_keyboard_set_modifiers
-eek_keyboard_set_num_lock_mask
-eek_keyboard_set_size
-eek_keyboard_set_symbol_index
-<SUBSECTION Standard>
-EEK_IS_KEYBOARD
-EEK_IS_KEYBOARD_CLASS
-EEK_KEYBOARD
-EEK_KEYBOARD_CLASS
-EEK_KEYBOARD_GET_CLASS
-EEK_TYPE_KEYBOARD
-EekKeyboardPrivate
-eek_keyboard_get_type
-</SECTION>
-
-<SECTION>
-<FILE>eek-keysym</FILE>
-<TITLE>EekKeysym</TITLE>
-EekKeysym
-EekKeysymClass
-eek_keysym_get_xkeysym
-eek_keysym_new
-eek_keysym_new_from_name
-eek_keysym_new_with_modifier
-<SUBSECTION Standard>
-EEK_INVALID_KEYSYM
-EEK_IS_KEYSYM
-EEK_IS_KEYSYM_CLASS
-EEK_KEYSYM
-EEK_KEYSYM_CLASS
-EEK_KEYSYM_GET_CLASS
-EEK_TYPE_KEYSYM
-EekKeysymPrivate
-eek_keysym_get_type
-</SECTION>
-
-<SECTION>
-<FILE>eek-layout</FILE>
-<TITLE>EekLayout</TITLE>
-EekLayout
-EekLayoutClass
-<SUBSECTION Standard>
-EEK_IS_LAYOUT
-EEK_IS_LAYOUT_CLASS
-EEK_LAYOUT
-EEK_LAYOUT_CLASS
-EEK_LAYOUT_GET_CLASS
-EEK_TYPE_LAYOUT
-eek_layout_get_type
-</SECTION>
-
-<SECTION>
-<FILE>eek-marshalers</FILE>
-
-</SECTION>
-
-<SECTION>
-<FILE>eek-section</FILE>
-<TITLE>EekSection</TITLE>
-EekSection
-EekSectionClass
-eek_section_add_row
-eek_section_create_key
-eek_section_find_key_by_keycode
-eek_section_get_angle
-eek_section_get_n_rows
-eek_section_get_row
-eek_section_set_angle
-<SUBSECTION Standard>
-EEK_IS_SECTION
-EEK_IS_SECTION_CLASS
-EEK_SECTION
-EEK_SECTION_CLASS
-EEK_SECTION_GET_CLASS
-EEK_TYPE_SECTION
-EekSectionPrivate
-eek_section_get_type
-</SECTION>
-
-<SECTION>
-<FILE>eek-serializable</FILE>
-<TITLE>EekSerializable</TITLE>
-EekSerializableIface
-eek_serializable_deserialize
-eek_serializable_serialize
-<SUBSECTION Standard>
-EEK_IS_SERIALIZABLE
-EEK_SERIALIZABLE
-EEK_SERIALIZABLE_GET_IFACE
-EEK_TYPE_SERIALIZABLE
-eek_serializable_get_type
-</SECTION>
-
-<SECTION>
-<FILE>eek-special-keysym-entries</FILE>
-
-</SECTION>
-
-<SECTION>
-<FILE>eek-symbol</FILE>
-<TITLE>EekSymbol</TITLE>
-EekSymbol
-EekSymbolCategory
-EekSymbolClass
-eek_symbol_category_from_name
-eek_symbol_category_get_name
-eek_symbol_get_category
-eek_symbol_get_icon_name
-eek_symbol_get_label
-eek_symbol_get_modifier_mask
-eek_symbol_get_name
-eek_symbol_is_modifier
-eek_symbol_new
-eek_symbol_set_category
-eek_symbol_set_icon_name
-eek_symbol_set_label
-eek_symbol_set_modifier_mask
-eek_symbol_set_name
-<SUBSECTION Standard>
-EEK_IS_SYMBOL
-EEK_IS_SYMBOL_CLASS
-EEK_SYMBOL
-EEK_SYMBOL_CLASS
-EEK_SYMBOL_GET_CLASS
-EEK_TYPE_SYMBOL
-EekSymbolPrivate
-eek_symbol_get_type
-</SECTION>
-
-<SECTION>
-<FILE>eek-symbol-matrix</FILE>
-EekSymbolMatrix
-eek_symbol_matrix_copy
-eek_symbol_matrix_free
-eek_symbol_matrix_get_symbol
-eek_symbol_matrix_new
-eek_symbol_matrix_set_symbol
-<SUBSECTION Standard>
-EEK_TYPE_SYMBOL_MATRIX
-eek_symbol_matrix_get_type
-</SECTION>
-
-<SECTION>
-<FILE>eek-text</FILE>
-<TITLE>EekText</TITLE>
-EekText
-EekTextClass
-eek_text_get_text
-eek_text_new
-<SUBSECTION Standard>
-EEK_IS_TEXT
-EEK_IS_TEXT_CLASS
-EEK_TEXT
-EEK_TEXT_CLASS
-EEK_TEXT_GET_CLASS
-EEK_TYPE_TEXT
-EekTextPrivate
-eek_text_get_type
-</SECTION>
-
-<SECTION>
-<FILE>eek-theme-context</FILE>
-EekThemeContextClass
-eek_theme_context_get_font
-eek_theme_context_get_resolution
-eek_theme_context_get_root_node
-eek_theme_context_get_theme
-eek_theme_context_new
-eek_theme_context_set_default_resolution
-eek_theme_context_set_font
-eek_theme_context_set_resolution
-eek_theme_context_set_theme
-<SUBSECTION Standard>
-EEK_IS_THEME_CONTEXT
-EEK_IS_THEME_CONTEXT_CLASS
-EEK_THEME_CONTEXT
-EEK_THEME_CONTEXT_CLASS
-EEK_THEME_CONTEXT_GET_CLASS
-EEK_TYPE_THEME_CONTEXT
-eek_theme_context_get_type
-</SECTION>
-
-<SECTION>
-<FILE>eek-theme-private</FILE>
-
-</SECTION>
-
-<SECTION>
-<FILE>eek-types</FILE>
-EEK_INVALID_KEYCODE
-EekBounds
-EekColor
-EekContainer
-EekElement
-EekGradientType
-EekKey
-EekKeyboard
-EekKeysym
-EekModifierBehavior
-EekModifierType
-EekOrientation
-EekOutline
-EekPoint
-EekSection
-EekSymbol
-EekSymbolMatrix
-EekText
-EekTheme
-EekThemeContext
-EekThemeNode
-I_
-eek_bounds_copy
-eek_bounds_free
-eek_bounds_long_side
-eek_color_copy
-eek_color_free
-eek_color_new
-eek_outline_copy
-eek_outline_free
-eek_point_copy
-eek_point_free
-eek_point_rotate
-<SUBSECTION Standard>
-EEK_TYPE_BOUNDS
-EEK_TYPE_COLOR
-EEK_TYPE_OUTLINE
-EEK_TYPE_POINT
-eek_bounds_get_type
-eek_color_get_type
-eek_outline_get_type
-eek_point_get_type
-</SECTION>
-
-<SECTION>
-<FILE>eek-unicode-keysym-entries</FILE>
-
-</SECTION>
-
-<SECTION>
-<FILE>eek-xkb</FILE>
-
-</SECTION>
-
-<SECTION>
-<FILE>eek-xkb-layout</FILE>
-<TITLE>EekXkbLayout</TITLE>
-EekXkbLayout
-EekXkbLayoutClass
-eek_xkb_layout_get_geometry
-eek_xkb_layout_get_keycodes
-eek_xkb_layout_get_symbols
-eek_xkb_layout_new
-eek_xkb_layout_set_geometry
-eek_xkb_layout_set_keycodes
-eek_xkb_layout_set_names
-eek_xkb_layout_set_names_full
-eek_xkb_layout_set_names_full_valist
-eek_xkb_layout_set_symbols
-<SUBSECTION Standard>
-EEK_IS_XKB_LAYOUT
-EEK_IS_XKB_LAYOUT_CLASS
-EEK_TYPE_XKB_LAYOUT
-EEK_XKB_LAYOUT
-EEK_XKB_LAYOUT_CLASS
-EEK_XKB_LAYOUT_GET_CLASS
-EekXkbLayoutPrivate
-eek_xkb_layout_get_type
-</SECTION>
-
-<SECTION>
-<FILE>eek-xkeysym-keysym-entries</FILE>
-
-</SECTION>
-
-<SECTION>
-<FILE>eek-xkl</FILE>
-
-</SECTION>
-
-<SECTION>
-<FILE>eek-xkl-layout</FILE>
-<TITLE>EekXklLayout</TITLE>
-EekXklLayout
-EekXklLayoutClass
-eek_xkl_layout_disable_option
-eek_xkl_layout_enable_option
-eek_xkl_layout_get_layouts
-eek_xkl_layout_get_model
-eek_xkl_layout_get_option
-eek_xkl_layout_get_options
-eek_xkl_layout_get_variants
-eek_xkl_layout_new
-eek_xkl_layout_set_config
-eek_xkl_layout_set_config_full
-eek_xkl_layout_set_layouts
-eek_xkl_layout_set_model
-eek_xkl_layout_set_options
-eek_xkl_layout_set_variants
-<SUBSECTION Standard>
-EEK_IS_XKL_LAYOUT
-EEK_IS_XKL_LAYOUT_CLASS
-EEK_TYPE_XKL_LAYOUT
-EEK_XKL_LAYOUT
-EEK_XKL_LAYOUT_CLASS
-EEK_XKL_LAYOUT_GET_CLASS
-EekXklLayoutPrivate
-eek_xkl_layout_get_type
-</SECTION>
-
-<SECTION>
-<FILE>eek-xml</FILE>
-EEK_XML_SCHEMA_VERSION
-eek_keyboard_output
-</SECTION>
-
-<SECTION>
-<FILE>eek-xml-layout</FILE>
-<TITLE>EekXmlLayout</TITLE>
-EekXmlLayout
-EekXmlLayoutClass
-eek_xml_layout_get_source
-eek_xml_layout_new
-eek_xml_layout_set_source
-<SUBSECTION Standard>
-EEK_IS_XML_LAYOUT
-EEK_IS_XML_LAYOUT_CLASS
-EEK_TYPE_XML_LAYOUT
-EEK_XML_LAYOUT
-EEK_XML_LAYOUT_CLASS
-EEK_XML_LAYOUT_GET_CLASS
-EekXmlLayoutPrivate
-eek_xml_layout_get_type
-</SECTION>
-
--- a/docs/reference/eekboard/eekboard-docs.sgml
+++ b/docs/reference/eekboard/eekboard-docs.sgml
@ -1,56 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
-[
-  <!ENTITY % local.common.attrib "xmlns:xi  CDATA  #FIXED 'http://www.w3.org/2003/XInclude'">
-]>
-<book id="index">
-  <bookinfo>
-    <title>eekboard Reference Manual</title>
-    <releaseinfo>
-      for eekboard 0.90.0.
-    </releaseinfo>
-    <copyright>
-      <year>2011</year>
-      <holder>Daiki Ueno</holder>
-    </copyright>
-
-    <copyright>
-      <year>2011</year>
-      <holder>Red Hat, Inc.</holder>
-    </copyright>
-
-    <legalnotice>
-      <para>
-	Permission is granted to copy, distribute and/or modify this
-	document under the terms of the GNU Free Documentation License,
-	Version 1.3 or any later version published by the Free Software
-	Foundation; with no Invariant Sections, no Front-Cover Texts and
-	no Back-Cover Texts.  A copy of the license is included in the
-	section entitled "GNU Free Documentation License".
-      </para>
-    </legalnotice>
-  </bookinfo>
-
-  <part id="apireference">
-    <title>API Manual</title>
-    <chapter>
-      <title>Client interface to eekboard-server</title>
-      <xi:include href="xml/eekboard-client.xml"/>
-      <xi:include href="xml/eekboard-context.xml"/>
-    </chapter>
-    <chapter>
-      <title>Server interface to implement custom eekboard-server</title>
-      <xi:include href="xml/eekboard-service.xml"/>
-      <xi:include href="xml/eekboard-context-service.xml"/>
-    </chapter>
-    <chapter id="object-tree">
-      <title>Object Hierarchy</title>
-      <xi:include href="xml/tree_index.sgml"/>
-    </chapter>
-    <index id="api-index-full">
-      <title>API Index</title>
-      <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>
-    </index>
-  </part>
-</book>
--- a/docs/reference/eekboard/eekboard-sections.txt
+++ b/docs/reference/eekboard/eekboard-sections.txt
@ -1,104 +0,0 @@
-<SECTION>
-<FILE>eekboard-client</FILE>
-<TITLE>EekboardClient</TITLE>
-EekboardClient
-EekboardClientClass
-eekboard_client_new
-eekboard_client_create_context
-eekboard_client_push_context
-eekboard_client_pop_context
-eekboard_client_destroy_context
-EekboardClientPrivate
-<SUBSECTION Standard>
-EEKBOARD_CLIENT
-EEKBOARD_IS_CLIENT
-EEKBOARD_TYPE_CLIENT
-eekboard_client_get_type
-EEKBOARD_CLIENT_CLASS
-EEKBOARD_IS_CLIENT_CLASS
-EEKBOARD_CLIENT_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>eekboard-service</FILE>
-<TITLE>EekboardService</TITLE>
-EEKBOARD_SERVICE_PATH
-EEKBOARD_SERVICE_INTERFACE
-EekboardService
-EekboardServiceClass
-eekboard_service_new
-EekboardServicePrivate
-<SUBSECTION Standard>
-EEKBOARD_SERVICE
-EEKBOARD_IS_SERVICE
-EEKBOARD_TYPE_SERVICE
-eekboard_service_get_type
-EEKBOARD_SERVICE_CLASS
-EEKBOARD_IS_SERVICE_CLASS
-EEKBOARD_SERVICE_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>eekboard-context</FILE>
-<TITLE>EekboardContext</TITLE>
-EekboardContext
-EekboardContextClass
-eekboard_context_new
-eekboard_context_add_keyboard
-eekboard_context_remove_keyboard
-eekboard_context_set_keyboard
-eekboard_context_show_keyboard
-eekboard_context_hide_keyboard
-eekboard_context_set_group
-eekboard_context_get_group
-eekboard_context_press_keycode
-eekboard_context_release_keycode
-eekboard_context_is_keyboard_visible
-eekboard_context_set_enabled
-eekboard_context_is_enabled
-eekboard_context_set_fullscreen
-EekboardContextPrivate
-<SUBSECTION Standard>
-EEKBOARD_CONTEXT
-EEKBOARD_IS_CONTEXT
-EEKBOARD_TYPE_CONTEXT
-eekboard_context_get_type
-EEKBOARD_CONTEXT_CLASS
-EEKBOARD_IS_CONTEXT_CLASS
-EEKBOARD_CONTEXT_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>eekboard-context-service</FILE>
-<TITLE>EekboardContextService</TITLE>
-EEKBOARD_CONTEXT_SERVICE_PATH
-EEKBOARD_CONTEXT_SERVICE_INTERFACE
-EekboardContextService
-EekboardContextServiceClass
-eekboard_context_service_enable
-eekboard_context_service_disable
-eekboard_context_service_get_keyboard
-eekboard_context_service_get_fullscreen
-eekboard_context_service_get_client_name
-EekboardContextServicePrivate
-<SUBSECTION Standard>
-EEKBOARD_CONTEXT_SERVICE
-EEKBOARD_IS_CONTEXT_SERVICE
-EEKBOARD_TYPE_CONTEXT_SERVICE
-eekboard_context_service_get_type
-EEKBOARD_CONTEXT_SERVICE_CLASS
-EEKBOARD_IS_CONTEXT_SERVICE_CLASS
-EEKBOARD_CONTEXT_SERVICE_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>eekboard-xklutil</FILE>
-eekboard_xkl_config_rec_from_string
-eekboard_xkl_config_rec_to_string
-eekboard_xkl_list_models
-eekboard_xkl_list_layouts
-eekboard_xkl_list_option_groups
-eekboard_xkl_list_layout_variants
-eekboard_xkl_list_options
-</SECTION>
-
--- a/docs/reference/eekboard/eekboard.types
+++ b/docs/reference/eekboard/eekboard.types
@ -1,4 +0,0 @@
-eekboard_client_get_type
-eekboard_context_get_type
-eekboard_context_service_get_type
-eekboard_service_get_type
--- 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-container.c
+++ b/eek/eek-container.c
@ -1,232 +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
- */
-
-/**
- * SECTION:eek-container
- * @short_description: Base class of a keyboard container
- *
- * The #EekContainerClass class represents a keyboard container, which
- * shall be used to implement #EekKeyboard and #EekSection.
- */
-
-#include "config.h"
-
-#include "eek-container.h"
-
-enum {
-    CHILD_ADDED,
-    CHILD_REMOVED,
-    LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0, };
-
-typedef struct _EekContainerPrivate
-{
-    GList *head;
-    GList *last;
-} EekContainerPrivate;
-
-G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (EekContainer, eek_container, EEK_TYPE_ELEMENT)
-
-static void
-eek_container_real_add_child (EekContainer *self,
-                              EekElement   *child)
-{
-    EekContainerPrivate *priv = eek_container_get_instance_private (self);
-
-    g_return_if_fail (EEK_IS_ELEMENT(child));
-    g_object_ref (child);
-
-    if (!priv->head) {
-        priv->head = priv->last = g_list_prepend (priv->head, child);
-    } else {
-        priv->last->next = g_list_prepend (priv->last->next, child);
-        priv->last = priv->last->next;
-    }
-    eek_element_set_parent (child, EEK_ELEMENT(self));
-    g_signal_emit (self, signals[CHILD_ADDED], 0, child);
-}
-
-static void
-eek_container_real_remove_child (EekContainer *self,
-                                 EekElement   *child)
-{
-    EekContainerPrivate *priv = eek_container_get_instance_private (self);
-    GList *head;
-
-    g_return_if_fail (EEK_IS_ELEMENT(child));
-    head = g_list_find (priv->head, child);
-    g_return_if_fail (head);
-    g_object_unref (child);
-    if (head == priv->last)
-        priv->last = g_list_previous (priv->last);
-    priv->head = g_list_remove_link (priv->head, head);
-    eek_element_set_parent (child, NULL);
-    g_signal_emit (self, signals[CHILD_REMOVED], 0, child);
-}
-
-static void
-eek_container_real_foreach_child (EekContainer *self,
-                                  EekCallback   callback,
-                                  gpointer      user_data)
-{
-    EekContainerPrivate *priv = eek_container_get_instance_private (self);
-    GList *head;
-
-    for (head = priv->head; head; head = g_list_next (head))
-        (*callback) (EEK_ELEMENT(head->data), user_data);
-}
-
-static EekElement *
-eek_container_real_find (EekContainer *self,
-                         EekCompareFunc func,
-                         gpointer user_data)
-{
-    EekContainerPrivate *priv = eek_container_get_instance_private (self);
-    GList *head;
-
-    head = g_list_find_custom (priv->head, user_data, (GCompareFunc)func);
-    if (head)
-        return head->data;
-    return NULL;
-}
-
-static void
-eek_container_dispose (GObject *object)
-{
-    EekContainer        *self = EEK_CONTAINER (object);
-    EekContainerPrivate *priv = eek_container_get_instance_private (self);
-    GList *head;
-
-    for (head = priv->head; head; head = priv->head) {
-        g_object_unref (head->data);
-        priv->head = g_list_next (head);
-        g_list_free1 (head);
-    }
-    G_OBJECT_CLASS(eek_container_parent_class)->dispose (object);
-}
-
-static void
-eek_container_class_init (EekContainerClass *klass)
-{
-    GObjectClass      *gobject_class = G_OBJECT_CLASS (klass);
-
-    klass->add_child = eek_container_real_add_child;
-    klass->remove_child = eek_container_real_remove_child;
-    klass->foreach_child = eek_container_real_foreach_child;
-    klass->find = eek_container_real_find;
-
-    /* signals */
-    klass->child_added = NULL;
-    klass->child_removed = NULL;
-
-    gobject_class->dispose = eek_container_dispose;
-
-    /**
-     * EekContainer::child-added:
-     * @container: an #EekContainer
-     * @element: an #EekElement
-     *
-     * The ::child-added signal is emitted each time an element is
-     * added to @container.
-     */
-    signals[CHILD_ADDED] =
-        g_signal_new (I_("child-added"),
-                      G_TYPE_FROM_CLASS(gobject_class),
-                      G_SIGNAL_RUN_FIRST,
-                      G_STRUCT_OFFSET(EekContainerClass, child_added),
-                      NULL, NULL,
-                      g_cclosure_marshal_VOID__OBJECT,
-                      G_TYPE_NONE, 1,
-                      EEK_TYPE_ELEMENT);
-
-    /**
-     * EekContainer::child-removed:
-     * @container: an #EekContainer
-     * @element: an #EekElement
-     *
-     * The ::child-removed signal is emitted each time an element is
-     * removed from @container.
-     */
-    signals[CHILD_REMOVED] =
-        g_signal_new (I_("child-removed"),
-                      G_TYPE_FROM_CLASS(gobject_class),
-                      G_SIGNAL_RUN_FIRST,
-                      G_STRUCT_OFFSET(EekContainerClass, child_removed),
-                      NULL,
-                      NULL,
-                      g_cclosure_marshal_VOID__OBJECT,
-                      G_TYPE_NONE, 1,
-                      EEK_TYPE_ELEMENT);
-}
-
-static void
-eek_container_init (EekContainer *self)
-{
-    /* void */
-}
-
-/**
- * eek_container_foreach_child:
- * @container: an #EekContainer
- * @callback: (scope call): an #EekCallback
- * @user_data: additional data passed to @callback
- *
- * Enumerate children of @container and run @callback with each child.
- */
-void
-eek_container_foreach_child (EekContainer *container,
-                             EekCallback   callback,
-                             gpointer      user_data)
-{
-    g_return_if_fail (EEK_IS_CONTAINER(container));
-    EEK_CONTAINER_GET_CLASS(container)->foreach_child (container,
-                                                       callback,
-                                                       user_data);
-}
-
-/**
- * eek_container_find:
- * @container: an #EekContainer
- * @func: function to be used to compare two children
- * @user_data: additional data passed to @func
- *
- * Find a child which matches the criteria supplied as @func, in @container.
- * Returns: an #EekElement or NULL on failure
- */
-EekElement *
-eek_container_find (EekContainer  *container,
-                    EekCompareFunc func,
-                    gpointer       user_data)
-{
-    g_return_val_if_fail (EEK_IS_CONTAINER(container), NULL);
-    return EEK_CONTAINER_GET_CLASS(container)->find (container,
-                                                     func,
-                                                     user_data);
-}
-
-void
-eek_container_add_child (EekContainer *container, EekElement *element)
-{
-    g_return_if_fail (EEK_IS_CONTAINER(container));
-    g_return_if_fail (EEK_IS_ELEMENT(element));
-    return EEK_CONTAINER_GET_CLASS(container)->add_child (container, element);
-}
--- a/eek/eek-container.h
+++ b/eek/eek-container.h
@ -1,94 +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
- */
-
-#if !defined(__EEK_H_INSIDE__) && !defined(EEK_COMPILATION)
-#error "Only <eek/eek.h> can be included directly."
-#endif
-
-#ifndef EEK_CONTAINER_H
-#define EEK_CONTAINER_H 1
-
-#include "eek-element.h"
-
-G_BEGIN_DECLS
-
-#define EEK_TYPE_CONTAINER (eek_container_get_type())
-G_DECLARE_DERIVABLE_TYPE (EekContainer, eek_container, EEK, CONTAINER, EekElement)
-
-/**
- * EekCallback:
- * @element: an #EekElement
- * @user_data: user-supplied data
- *
- * The type of the callback function used for iterating over the
- * children of a container, see eek_container_foreach_child().
- */
-typedef void (*EekCallback) (EekElement *element, gpointer user_data);
-typedef gint (*EekCompareFunc) (EekElement *element, gpointer user_data);
-
-/**
- * EekContainerClass:
- * @foreach_child: virtual function for iterating over the container's children
- * @find: virtual function for looking up a child
- * @child_added: class handler for #EekContainer::child-added
- * @child_removed: class handler for #EekContainer::child-added
- */
-struct _EekContainerClass
-{
-    /*< private >*/
-    EekElementClass parent_class;
-
-    void        (* add_child)      (EekContainer      *self,
-                                    EekElement        *element);
-
-    void        (* remove_child)   (EekContainer      *self,
-                                    EekElement        *element);
-
-    /*< public >*/
-    void        (* foreach_child)  (EekContainer      *self,
-                                    EekCallback        callback,
-                                    gpointer           user_data);
-    EekElement *(* find)           (EekContainer      *self,
-                                    EekCompareFunc     func,
-                                    gpointer           data);
-
-    /* signals */
-    void        (* child_added)    (EekContainer      *self,
-                                    EekElement        *element);
-    void        (* child_removed)  (EekContainer      *self,
-                                    EekElement        *element);
-    /*< private >*/
-    /* padding */
-    gpointer pdummy[24];
-};
-
-GType       eek_container_get_type      (void) G_GNUC_CONST;
-
-void        eek_container_foreach_child (EekContainer  *container,
-                                         EekCallback    callback,
-                                         gpointer       user_data);
-EekElement *eek_container_find          (EekContainer  *container,
-                                         EekCompareFunc func,
-                                         gpointer       user_data);
-void        eek_container_add_child     (EekContainer  *container,
-                                         EekElement    *element);
-
-G_END_DECLS
-#endif  /* EEK_CONTAINER_H */
--- a/eek/eek-element.c
+++ b/eek/eek-element.c
@ -31,51 +31,23 @@
 #include <string.h>

 #include "eek-element.h"
-#include "eek-container.h"
-#include "eek-marshalers.h"

 enum {
    PROP_0,
-    PROP_NAME,
    PROP_BOUNDS,
-    PROP_GROUP,
-    PROP_LEVEL,
    PROP_LAST
 };

-enum {
-    SYMBOL_INDEX_CHANGED,
-    LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0, };
-
 typedef struct _EekElementPrivate
 {
-    gchar *name;
    EekBounds bounds;
-    EekElement *parent;
-    gint group;
-    gint level;
 } EekElementPrivate;

 G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (EekElement, eek_element, G_TYPE_OBJECT)

-static void
-eek_element_real_symbol_index_changed (EekElement *self,
-                                       gint        group,
-                                       gint        level)
-{
-    // g_debug ("symbol-index-changed");
-}
-
 static void
 eek_element_finalize (GObject *object)
 {
-    EekElement        *self = EEK_ELEMENT (object);
-    EekElementPrivate *priv = eek_element_get_instance_private (self);
-
-    g_free (priv->name);
    G_OBJECT_CLASS (eek_element_parent_class)->finalize (object);
 }

@ -88,18 +60,9 @@ eek_element_set_property (GObject      *object,
    EekElement *element = EEK_ELEMENT(object);

    switch (prop_id) {
-    case PROP_NAME:
-        eek_element_set_name (element,
-                              g_value_dup_string (value));
-        break;
    case PROP_BOUNDS:
        eek_element_set_bounds (element, g_value_get_boxed (value));
        break;
-    case PROP_GROUP:
-        eek_element_set_group (element, g_value_get_int (value));
-        break;
-    case PROP_LEVEL:
-        eek_element_set_level (element, g_value_get_int (value));
    default:
        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
        break;
@ -116,19 +79,10 @@ eek_element_get_property (GObject    *object,
    EekBounds bounds;

    switch (prop_id) {
-    case PROP_NAME:
-        g_value_set_string (value, eek_element_get_name (element));
-        break;
    case PROP_BOUNDS:
        eek_element_get_bounds (element, &bounds);
        g_value_set_boxed (value, &bounds);
        break;
-    case PROP_GROUP:
-        g_value_set_int (value, eek_element_get_group (element));
-        break;
-    case PROP_LEVEL:
-        g_value_set_int (value, eek_element_get_level (element));
-        break;
    default:
        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
        break;
@ -142,26 +96,10 @@ eek_element_class_init (EekElementClass *klass)
    GParamSpec        *pspec;

    /* signals */
-    klass->symbol_index_changed = eek_element_real_symbol_index_changed;
-
    gobject_class->set_property = eek_element_set_property;
    gobject_class->get_property = eek_element_get_property;
    gobject_class->finalize     = eek_element_finalize;

-    /**
-     * EekElement:name:
-     *
-     * The name of #EekElement.
-     */
-    pspec = g_param_spec_string ("name",
-                                 "Name",
-                                 "Name",
-                                 NULL,
-                                 G_PARAM_READWRITE);
-    g_object_class_install_property (gobject_class,
-                                     PROP_NAME,
-                                     pspec);
-
    /**
     * EekElement:bounds:
     *
@ -175,149 +113,12 @@ eek_element_class_init (EekElementClass *klass)
    g_object_class_install_property (gobject_class,
                                     PROP_BOUNDS,
                                     pspec);
-
-    /**
-     * EekElement:group:
-     *
-     * The group value of the symbol index of #EekElement.
-     */
-    pspec = g_param_spec_int ("group",
-                              "Group",
-                              "Group value of the symbol index",
-                              -1, G_MAXINT, -1,
-                              G_PARAM_READWRITE);
-    g_object_class_install_property (gobject_class,
-                                     PROP_GROUP,
-                                     pspec);
-
-    /**
-     * EekElement:level:
-     *
-     * The level value of the symbol index of #EekElement.
-     */
-    pspec = g_param_spec_int ("level",
-                              "Level",
-                              "Level value of the symbol index",
-                              -1, G_MAXINT, -1,
-                              G_PARAM_READWRITE);
-    g_object_class_install_property (gobject_class,
-                                     PROP_LEVEL,
-                                     pspec);
-
-    /**
-     * EekElement::symbol-index-changed:
-     * @element: an #EekElement
-     * @group: row index of the symbol matrix of keys on @element
-     * @level: column index of the symbol matrix of keys on @element
-     *
-     * The ::symbol-index-changed signal is emitted each time the
-     * global configuration of group/level index changes.
-     */
-    signals[SYMBOL_INDEX_CHANGED] =
-        g_signal_new (I_("symbol-index-changed"),
-                      G_TYPE_FROM_CLASS(gobject_class),
-                      G_SIGNAL_RUN_LAST,
-                      G_STRUCT_OFFSET(EekElementClass, symbol_index_changed),
-                      NULL,
-                      NULL,
-                      _eek_marshal_VOID__INT_INT,
-                      G_TYPE_NONE,
-                      2,
-                      G_TYPE_INT,
-                      G_TYPE_INT);
 }

 static void
 eek_element_init (EekElement *self)
 {
-    EekElementPrivate *priv = eek_element_get_instance_private (self);
-
-    priv->group = -1;
-    priv->level = -1;
-}
-
-/**
- * eek_element_set_parent:
- * @element: an #EekElement
- * @parent: (allow-none): an #EekElement or %NULL
- *
- * Set the parent of @element to @parent.
- */
-void
-eek_element_set_parent (EekElement *element,
-                        EekElement *parent)
-{
-    g_return_if_fail (EEK_IS_ELEMENT(element));
-    g_return_if_fail (parent == NULL || EEK_IS_ELEMENT(parent));
-
-    EekElementPrivate *priv = eek_element_get_instance_private (element);
-
-    if (priv->parent == parent)
-        return;
-
-    if (priv->parent != NULL) {
-        /* release self-reference acquired when setting parent */
-        g_object_unref (element);
-    }
-
-    if (parent != NULL) {
-        g_object_ref (element);
-    }
-
-    priv->parent = parent;
-}
-
-/**
- * eek_element_get_parent:
- * @element: an #EekElement
- *
- * Get the parent of @element.
- * Returns: an #EekElement if the parent is set
- */
-EekElement *
-eek_element_get_parent (EekElement *element)
-{
-    g_return_val_if_fail (EEK_IS_ELEMENT(element), NULL);
-
-    EekElementPrivate *priv = eek_element_get_instance_private (element);
-
-    return priv->parent;
-}
-
-/**
- * eek_element_set_name:
- * @element: an #EekElement
- * @name: name of @element
- *
- * Set the name of @element to @name.
- */
-void
-eek_element_set_name (EekElement  *element,
-                      const gchar *name)
-{
-    g_return_if_fail (EEK_IS_ELEMENT(element));
-
-    EekElementPrivate *priv = eek_element_get_instance_private (element);
-
-    g_free (priv->name);
-    priv->name = g_strdup (name);
-}
-
-/**
- * eek_element_get_name:
- * @element: an #EekElement
- *
- * Get the name of @element.
- * Returns: the name of @element or NULL when the name is not set
- */
-const gchar *
-eek_element_get_name (EekElement  *element)
-{
-    g_return_val_if_fail (EEK_IS_ELEMENT(element), NULL);
-
-    EekElementPrivate *priv = eek_element_get_instance_private (element);
-
-    return priv->name;
+    (void)self;
 }

 /**
@ -360,211 +161,3 @@ eek_element_get_bounds (EekElement  *element,

    memcpy (bounds, &priv->bounds, sizeof(EekBounds));
 }
-
-/**
- * eek_element_get_absolute_position:
- * @element: an #EekElement
- * @x: pointer where the X coordinate of @element will be stored
- * @y: pointer where the Y coordinate of @element will be stored
- *
- * Compute the absolute position of @element.
- */
-void
-eek_element_get_absolute_position (EekElement *element,
-                                   gdouble    *x,
-                                   gdouble    *y)
-{
-    EekBounds bounds;
-    gdouble ax = 0.0, ay = 0.0;
-
-    do {
-        eek_element_get_bounds (element, &bounds);
-        ax += bounds.x;
-        ay += bounds.y;
-    } while ((element = eek_element_get_parent (element)) != NULL);
-    *x = ax;
-    *y = ay;
-}
-
-/**
- * eek_element_set_position:
- * @element: an #EekElement
- * @x: X coordinate of top left corner
- * @y: Y coordinate of top left corner
- *
- * Set the relative position of @element.
- */
-void
-eek_element_set_position (EekElement *element,
-                          gdouble     x,
-                          gdouble     y)
-{
-    EekBounds bounds;
-
-    eek_element_get_bounds (element, &bounds);
-    bounds.x = x;
-    bounds.y = y;
-    eek_element_set_bounds (element, &bounds);
-}
-
-/**
- * eek_element_set_size:
- * @element: an #EekElement
- * @width: width of @element
- * @height: height of @element
- *
- * Set the size of @element.
- */
-void
-eek_element_set_size (EekElement  *element,
-                      gdouble      width,
-                      gdouble      height)
-{
-    EekBounds bounds;
-
-    eek_element_get_bounds (element, &bounds);
-    bounds.width = width;
-    bounds.height = height;
-    eek_element_set_bounds (element, &bounds);
-}
-
-/**
- * eek_element_set_symbol_index:
- * @element: an #EekElement
- * @group: row index of the symbol matrix
- * @level: column index of the symbol matrix
- *
- * Set the default index of the symbol matrices of @element.  The
- * setting affects the child, if child does not have the index set, as
- * well as this element.  To unset, pass -1 as group/level.
- */
-void
-eek_element_set_symbol_index (EekElement *element,
-                              gint        group,
-                              gint        level)
-{
-    gboolean emit_signal;
-
-    g_return_if_fail (EEK_IS_ELEMENT(element));
-
-    emit_signal = group != eek_element_get_group (element) ||
-        level != eek_element_get_level (element);
-
-    eek_element_set_group (element, group);
-    eek_element_set_level (element, level);
-
-    if (emit_signal)
-        g_signal_emit (element, signals[SYMBOL_INDEX_CHANGED], 0, group, level);
-}
-
-/**
- * eek_element_get_symbol_index:
- * @element: an #EekElement
- * @group: a pointer where the group value of the symbol index will be stored
- * @level: a pointer where the level value of the symbol index will be stored
- *
- * Get the default index of the symbol matrices of @element.
- * If the index is not set, -1 will be returned.
- */
-void
-eek_element_get_symbol_index (EekElement *element,
-                              gint       *group,
-                              gint       *level)
-{
-    g_return_if_fail (EEK_IS_ELEMENT(element));
-    g_return_if_fail (group != NULL || level != NULL);
-    if (group != NULL)
-        *group = eek_element_get_group (element);
-    if (level != NULL)
-        *level = eek_element_get_level (element);
-}
-
-/**
- * eek_element_set_group:
- * @element: an #EekElement
- * @group: group index of @element
- *
- * Set the group value of the default symbol index of @element.  To
- * unset, pass -1 as @group.
- *
- * See also: eek_element_set_symbol_index()
- */
-void
-eek_element_set_group (EekElement *element,
-                       gint        group)
-{
-    g_return_if_fail (EEK_IS_ELEMENT(element));
-
-    EekElementPrivate *priv = eek_element_get_instance_private (element);
-
-    if (priv->group != group) {
-        priv->group = group;
-        g_object_notify (G_OBJECT(element), "group");
-        g_signal_emit (element, signals[SYMBOL_INDEX_CHANGED], 0,
-                       group, priv->level);
-    }
-}
-
-/**
- * eek_element_set_level:
- * @element: an #EekElement
- * @level: level index of @element
- *
- * Set the level value of the default symbol index of @element.  To
- * unset, pass -1 as @level.
- *
- * See also: eek_element_set_symbol_index()
- */
-void
-eek_element_set_level (EekElement *element,
-                       gint        level)
-{
-    g_return_if_fail (EEK_IS_ELEMENT(element));
-
-    EekElementPrivate *priv = eek_element_get_instance_private (element);
-
-    if (priv->level != level) {
-        priv->level = level;
-        g_object_notify (G_OBJECT(element), "level");
-        g_signal_emit (element, signals[SYMBOL_INDEX_CHANGED], 0,
-                       priv->group, level);
-    }
-}
-
-/**
- * eek_element_get_group:
- * @element: an #EekElement
- *
- * Return the group value of the default symbol index of @element.
- * If the value is not set, -1 will be returned.
- *
- * See also: eek_element_get_symbol_index()
- */
-gint
-eek_element_get_group (EekElement *element)
-{
-    g_return_val_if_fail (EEK_IS_ELEMENT(element), -1);
-
-    EekElementPrivate *priv = eek_element_get_instance_private (element);
-
-    return priv->group;
-}
-
-/**
- * eek_element_get_level:
- * @element: an #EekElement
- *
- * Return the level value of the default symbol index of @element.
- * If the value is not set, -1 will be returned.
- *
- * See also: eek_element_get_symbol_index()
- */
-gint
-eek_element_get_level (EekElement *element)
-{
-    g_return_val_if_fail (EEK_IS_ELEMENT(element), -1);
-
-    EekElementPrivate *priv = eek_element_get_instance_private (element);
-
-    return priv->level;
-}
--- a/eek/eek-element.h
+++ b/eek/eek-element.h
@ -36,18 +36,10 @@ struct _EekElementClass
 {
    /*< private >*/
    GObjectClass parent_class;
-
-    /* signals */
-    void                  (* symbol_index_changed) (EekElement  *self,
-                                                    gint         group,
-                                                    gint         level);
 };

 GType        eek_element_get_type              (void) G_GNUC_CONST;

-void         eek_element_set_parent            (EekElement  *element,
-                                                EekElement  *parent);
-EekElement  *eek_element_get_parent            (EekElement  *element);
 void         eek_element_set_name              (EekElement  *element,
                                                const gchar *name);

@ -59,29 +51,5 @@ void         eek_element_set_bounds            (EekElement  *element,
 void         eek_element_get_bounds            (EekElement  *element,
                                                EekBounds   *bounds);

-void         eek_element_set_position          (EekElement  *element,
-                                                gdouble      x,
-                                                gdouble      y);
-void         eek_element_set_size              (EekElement  *element,
-                                                gdouble      width,
-                                                gdouble      height);
-
-void         eek_element_get_absolute_position (EekElement  *element,
-                                                gdouble     *x,
-                                                gdouble     *y);
-
-void         eek_element_set_symbol_index      (EekElement  *element,
-                                                gint         group,
-                                                gint         level);
-void         eek_element_get_symbol_index      (EekElement  *element,
-                                                gint        *group,
-                                                gint        *level);
-void         eek_element_set_group             (EekElement  *element,
-                                                gint         group);
-void         eek_element_set_level             (EekElement  *element,
-                                                gint         level);
-gint         eek_element_get_group             (EekElement  *element);
-gint         eek_element_get_level             (EekElement  *element);
-
 G_END_DECLS
 #endif  /* EEK_ELEMENT_H */
--- 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
@ -32,16 +32,16 @@
 #include <math.h>
 #include <string.h>

-#include "eek-gtk-keyboard.h"
 #include "eek-renderer.h"
 #include "eek-keyboard.h"
-#include "eek-section.h"
-#include "eek-key.h"
-#include "eek-symbol.h"
+
+#include "eek-gtk-keyboard.h"
+
+#include "eekboard/eekboard-context-service.h"
+#include "src/layout.h"

 enum {
    PROP_0,
-    PROP_KEYBOARD,
    PROP_LAST
 };

@ -54,34 +54,16 @@ enum {
 typedef struct _EekGtkKeyboardPrivate
 {
    EekRenderer *renderer;
-    EekKeyboard *keyboard;
-    EekTheme *theme;
+    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       on_key_pressed          (EekKey      *key,
-                                           EekGtkKeyboard *self);
-static void       on_key_released         (EekKey      *key,
-                                           EekGtkKeyboard *self);
-static void       on_key_locked          (EekKeyboard *keyboard,
-                                           EekKey      *key,
-                                           gpointer     user_data);
-static void       on_key_unlocked         (EekKeyboard *keyboard,
-                                           EekKey      *key,
-                                           gpointer     user_data);
-static void       on_symbol_index_changed (EekKeyboard *keyboard,
-                                           gint         group,
-                                           gint         level,
-                                           gpointer     user_data);
-static void       render_pressed_key      (GtkWidget   *widget,
-                                           EekKey      *key);
-static void       render_locked_key       (GtkWidget   *widget,
-                                           EekKey      *key);
-static void       render_released_key     (GtkWidget   *widget,
-                                           EekKey      *key);
+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)
@ -92,7 +74,8 @@ eek_gtk_keyboard_real_realize (GtkWidget      *self)
                           GDK_KEY_RELEASE_MASK |
                           GDK_BUTTON_PRESS_MASK |
                           GDK_BUTTON_RELEASE_MASK |
-                           GDK_BUTTON_MOTION_MASK);
+                           GDK_BUTTON_MOTION_MASK |
+                           GDK_TOUCH_MASK);

    GTK_WIDGET_CLASS (eek_gtk_keyboard_parent_class)->realize (self);
 }
@ -104,17 +87,12 @@ eek_gtk_keyboard_real_draw (GtkWidget *self,
    EekGtkKeyboardPrivate *priv =
 	    eek_gtk_keyboard_get_instance_private (EEK_GTK_KEYBOARD (self));
    GtkAllocation allocation;
-    GList *list, *head;
-
    gtk_widget_get_allocation (self, &allocation);

    if (!priv->renderer) {
-        PangoContext *pcontext;
+        PangoContext *pcontext = gtk_widget_get_pango_context (self);

-        pcontext = gtk_widget_get_pango_context (self);
        priv->renderer = eek_renderer_new (priv->keyboard, pcontext);
-        if (priv->theme)
-            eek_renderer_set_theme (priv->renderer, priv->theme);

        eek_renderer_set_allocation_size (priv->renderer,
                                          allocation.width,
@ -123,22 +101,10 @@ 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);
-
-    /* redraw pressed key */
-    list = eek_keyboard_get_pressed_keys (priv->keyboard);
-    for (head = list; head; head = g_list_next (head)) {
-        render_pressed_key (self, head->data);
-    }
-    g_list_free (list);
-
-    /* redraw locked key */
-    list = eek_keyboard_get_locked_keys (priv->keyboard);
-    for (head = list; head; head = g_list_next (head)) {
-        render_locked_key (self, ((EekModifierKey *)head->data)->key);
-    }
-    g_list_free (list);
-
+    // render only a few remaining changes
+    squeek_layout_draw_all_changed(priv->keyboard->layout, EEK_GTK_KEYBOARD(self));
    return FALSE;
 }

@ -159,52 +125,27 @@ eek_gtk_keyboard_real_size_allocate (GtkWidget     *self,
 }

 static void depress(EekGtkKeyboard *self,
-                    gdouble x, gdouble y, guint32 time) {
+                    gdouble x, gdouble y, guint32 time)
+{
    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
-    EekKey *key = eek_renderer_find_key_by_position (priv->renderer, x, y);
-    if (key) {
-        eek_keyboard_press_key(priv->keyboard, key, time);
-        on_key_pressed(key, self);
-    }
+
+    squeek_layout_depress(priv->keyboard->layout, priv->keyboard->manager->virtual_keyboard,
+                          x, y, eek_renderer_get_transformation(priv->renderer), time, self);
 }

 static void drag(EekGtkKeyboard *self,
-                 gdouble x, gdouble y, guint32 time) {
+                 gdouble x, gdouble y, guint32 time)
+{
    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
-    EekKey *key = eek_renderer_find_key_by_position (priv->renderer, x, y);
-
-    if (key) {
-        GList *list, *head;
-        gboolean found = FALSE;
-
-        list = eek_keyboard_get_pressed_keys (priv->keyboard);
-        for (head = list; head; head = g_list_next (head)) {
-            if (head->data == key)
-                found = TRUE;
-            else {
-                eek_keyboard_release_key(priv->keyboard, EEK_KEY(head->data), time);
-                on_key_released(key, self);
-            }
-        }
-        g_list_free (list);
-
-        if (!found) {
-            eek_keyboard_press_key(priv->keyboard, key, time);
-            on_key_pressed(key, self);
-        }
-    }
+    squeek_layout_drag(priv->keyboard->layout, priv->keyboard->manager->virtual_keyboard,
+                       x, y, eek_renderer_get_transformation(priv->renderer), time, self);
 }

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

-    GList *list = eek_keyboard_get_pressed_keys (priv->keyboard);
-    for (GList *head = list; head; head = g_list_next (head)) {
-        EekKey *key = EEK_KEY(head->data);
-        eek_keyboard_release_key(priv->keyboard, key, time);
-        on_key_released(key, self);
-    }
-    g_list_free (list);
+    squeek_layout_release(priv->keyboard->layout, priv->keyboard->manager->virtual_keyboard, eek_renderer_get_transformation(priv->renderer), time, self);
 }

 static gboolean
@ -217,6 +158,8 @@ eek_gtk_keyboard_real_button_press_event (GtkWidget      *self,
    return TRUE;
 }

+
+
 // TODO: this belongs more in gtk_keyboard, with a way to find out which key to re-render
 static gboolean
 eek_gtk_keyboard_real_button_release_event (GtkWidget      *self,
@ -229,6 +172,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)
@ -247,27 +202,27 @@ handle_touch_event (GtkWidget     *widget,
    EekGtkKeyboard        *self = EEK_GTK_KEYBOARD (widget);
    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);

+    /* For each new touch, release the previous one and record the new event
+       sequence. */
    if (event->type == GDK_TOUCH_BEGIN) {
-        if (priv->sequence) {
-            // Ignore second and following touch points
-            return FALSE;
-        }
+        release(self, event->time);
        priv->sequence = event->sequence;
        depress(self, event->x, event->y, event->time);
        return TRUE;
    }

-    if (priv->sequence != event->sequence) {
-        return FALSE;
-    }
-
-    if (event->type == GDK_TOUCH_UPDATE) {
+    /* Only allow the latest touch point to be dragged. */
+    if (event->type == GDK_TOUCH_UPDATE && event->sequence == priv->sequence) {
        drag(self, event->x, event->y, event->time);
    }
-    if (event->type == GDK_TOUCH_END || event->type == GDK_TOUCH_CANCEL) {
+    else if (event->type == GDK_TOUCH_END || event->type == GDK_TOUCH_CANCEL) {
        // TODO: can the event have different coords than the previous update event?
-        release(self, event->time);
-        priv->sequence = NULL;
+        /* Only respond to the release of the latest touch point. Previous
+           touches have already been released. */
+        if (event->sequence == priv->sequence) {
+            release(self, event->time);
+            priv->sequence = NULL;
+        }
    }
    return TRUE;
 }
@ -279,86 +234,21 @@ eek_gtk_keyboard_real_unmap (GtkWidget *self)
 	    eek_gtk_keyboard_get_instance_private (EEK_GTK_KEYBOARD (self));

    if (priv->keyboard) {
-        GList *list, *head;
-
-        /* Make a copy of HEAD before sending "released" signal on
-           elements, so that the default handler of
-           EekKeyboard::key-released signal can remove elements from its
-           internal copy */
-        list = eek_keyboard_get_pressed_keys (priv->keyboard);
-        for (head = list; head; head = g_list_next (head)) {
-            g_log("squeek", G_LOG_LEVEL_DEBUG, "emit EekKey released");
-            g_signal_emit_by_name (head->data, "released");
-        }
-        g_list_free (list);
+        squeek_layout_release_all_only(
+            priv->keyboard->layout, priv->keyboard->manager->virtual_keyboard,
+            gdk_event_get_time(NULL));
    }

    GTK_WIDGET_CLASS (eek_gtk_keyboard_parent_class)->unmap (self);
 }

-static gboolean
-eek_gtk_keyboard_real_query_tooltip (GtkWidget  *widget,
-                                     gint        x,
-                                     gint        y,
-                                     gboolean    keyboard_tooltip,
-                                     GtkTooltip *tooltip)
-{
-    EekGtkKeyboard        *self = EEK_GTK_KEYBOARD (widget);
-    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
-
-    EekKey *key;
-
-    key = eek_renderer_find_key_by_position (priv->renderer,
-                                             (gdouble)x,
-                                             (gdouble)y);
-    if (key) {
-        EekSymbol *symbol = eek_key_get_symbol (key);
-        const gchar *text = eek_symbol_get_tooltip (symbol);
-        if (text) {
-            gtk_tooltip_set_text (tooltip, text);
-            return TRUE;
-        }
-    }
-    return FALSE;
-}
-
-static void
-eek_gtk_keyboard_set_keyboard (EekGtkKeyboard *self,
-                               EekKeyboard    *keyboard)
-{
-    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
-
-    if (priv->keyboard == keyboard)
-        return;
-
-    if (priv->keyboard) {
-        g_signal_handlers_disconnect_by_data(priv->keyboard, self);
-        g_object_unref (priv->keyboard);
-    }
-
-    priv->keyboard = g_object_ref (keyboard);
-
-    g_signal_connect (priv->keyboard, "key-locked",
-                      G_CALLBACK(on_key_locked), self);
-    g_signal_connect (priv->keyboard, "key-unlocked",
-                      G_CALLBACK(on_key_unlocked), self);
-    g_signal_connect (priv->keyboard, "symbol-index-changed",
-                      G_CALLBACK(on_symbol_index_changed), self);
-}
-
 static void
 eek_gtk_keyboard_set_property (GObject      *object,
                               guint         prop_id,
                               const GValue *value,
                               GParamSpec   *pspec)
 {
-    EekKeyboard *keyboard;
-
    switch (prop_id) {
-    case PROP_KEYBOARD:
-        keyboard = g_value_get_object (value);
-        eek_gtk_keyboard_set_keyboard (EEK_GTK_KEYBOARD(object), keyboard);
-        break;
    default:
        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
        break;
@ -374,28 +264,16 @@ eek_gtk_keyboard_dispose (GObject *object)
    if (priv->renderer) {
        g_object_unref (priv->renderer);
        priv->renderer = NULL;
+        priv->renderer = NULL;
    }

    if (priv->keyboard) {
-        GList *list, *head;
-
-        g_signal_handlers_disconnect_by_data(priv->keyboard, self);
-        list = eek_keyboard_get_pressed_keys (priv->keyboard);
-        for (head = list; head; head = g_list_next (head)) {
-            g_log("squeek", G_LOG_LEVEL_DEBUG, "emit EekKey pressed");
-            g_signal_emit_by_name (head->data, "released", priv->keyboard);
-        }
-        g_list_free (list);
-
-        g_object_unref (priv->keyboard);
+        squeek_layout_release_all_only(
+            priv->keyboard->layout, priv->keyboard->manager->virtual_keyboard,
+            gdk_event_get_time(NULL));
        priv->keyboard = NULL;
    }

-    if (priv->theme) {
-        g_object_unref (priv->theme);
-        priv->theme = NULL;
-    }
-
    G_OBJECT_CLASS (eek_gtk_keyboard_parent_class)->dispose (object);
 }

@ -404,7 +282,6 @@ eek_gtk_keyboard_class_init (EekGtkKeyboardClass *klass)
 {
    GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
    GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-    GParamSpec *pspec;

    widget_class->realize = eek_gtk_keyboard_real_realize;
    widget_class->unmap = eek_gtk_keyboard_real_unmap;
@ -416,28 +293,18 @@ 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->query_tooltip =
-        eek_gtk_keyboard_real_query_tooltip;
+    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;
    gobject_class->dispose = eek_gtk_keyboard_dispose;
-
-    pspec = g_param_spec_object ("keyboard",
-                                 "Keyboard",
-                                 "Keyboard",
-                                 EEK_TYPE_KEYBOARD,
-                                 G_PARAM_CONSTRUCT_ONLY | G_PARAM_WRITABLE);
-    g_object_class_install_property (gobject_class,
-                                     PROP_KEYBOARD,
-                                     pspec);
 }

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

 /**
 * eek_gtk_keyboard_new:
@ -447,104 +314,66 @@ eek_gtk_keyboard_init (EekGtkKeyboard *self)
 * Returns: a #GtkWidget
 */
 GtkWidget *
-eek_gtk_keyboard_new (EekKeyboard *keyboard)
+eek_gtk_keyboard_new (LevelKeyboard *keyboard)
 {
-    return g_object_new (EEK_TYPE_GTK_KEYBOARD, "keyboard", keyboard, NULL);
+    EekGtkKeyboard *ret = EEK_GTK_KEYBOARD(g_object_new (EEK_TYPE_GTK_KEYBOARD, NULL));
+    EekGtkKeyboardPrivate *priv = (EekGtkKeyboardPrivate*)eek_gtk_keyboard_get_instance_private (ret);
+    priv->keyboard = keyboard;
+    return GTK_WIDGET(ret);
 }

 static void
-magnify_bounds (GtkWidget *self,
-                EekBounds *bounds,
-                EekBounds *large_bounds,
-                gdouble    scale)
-{
-    GtkAllocation allocation;
-    gdouble x, y;
-
-    g_assert (scale >= 1.0);
-
-    gtk_widget_get_allocation (self, &allocation);
-
-    large_bounds->width = bounds->width * scale;
-    large_bounds->height = bounds->height * scale;
-
-    x = bounds->x - (large_bounds->width - bounds->width) / 2;
-    y = bounds->y - large_bounds->height;
-
-    large_bounds->x = CLAMP(x, 0, allocation.width - large_bounds->width);
-    large_bounds->y = CLAMP(y, 0, allocation.height - large_bounds->height);
-}
-
-static void
-render_pressed_key (GtkWidget *widget,
-                    EekKey    *key)
+render_pressed_button (GtkWidget *widget,
+                       struct button_place *place)
 {
    EekGtkKeyboard        *self = EEK_GTK_KEYBOARD (widget);
    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
-    EekBounds bounds, large_bounds;

    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_get_key_bounds (priv->renderer, key, &bounds, TRUE);
-    magnify_bounds (widget, &bounds, &large_bounds, 1.5);
-
-    cairo_save (cr);
-    cairo_translate (cr, bounds.x, bounds.y);
-    eek_renderer_render_key (priv->renderer, cr, key, 1.0, TRUE);
-    cairo_restore (cr);
+    eek_renderer_render_button (priv->renderer, cr, place, 1.0, TRUE);
 /*
-    cairo_save (cr);
-    cairo_translate (cr, large_bounds.x, large_bounds.y);
    eek_renderer_render_key (priv->renderer, cr, key, 1.5, TRUE);
-    cairo_restore (cr);
 */
    gdk_window_end_draw_frame (window, context);

    cairo_region_destroy (region);
 }

-static void
-render_locked_key (GtkWidget *widget,
-                   EekKey    *key)
+void
+eek_gtk_render_locked_button (EekGtkKeyboard *self, struct button_place place)
 {
-    EekGtkKeyboard        *self = EEK_GTK_KEYBOARD (widget);
    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
-    EekBounds bounds;

-    GdkWindow         *window  = gtk_widget_get_window (widget);
+    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_get_key_bounds (priv->renderer, key, &bounds, TRUE);
-
-    cairo_translate (cr, bounds.x, bounds.y);
-    eek_renderer_render_key (priv->renderer, cr, key, 1.0, TRUE);
+    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_key (GtkWidget *widget,
-                     EekKey    *key)
+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);
-    EekBounds bounds, large_bounds;

    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_get_key_bounds (priv->renderer, key, &bounds, TRUE);
-    magnify_bounds (widget, &bounds, &large_bounds, 1.5);
-
    eek_renderer_render_keyboard (priv->renderer, cr);

    gdk_window_end_draw_frame (window, context);
@ -552,9 +381,9 @@ render_released_key (GtkWidget *widget,
    cairo_region_destroy (region);
 }

-static void
-on_key_pressed (EekKey      *key,
-                EekGtkKeyboard *self)
+void
+eek_gtk_on_button_pressed (struct button_place place,
+                   EekGtkKeyboard *self)
 {
    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);

@ -562,7 +391,10 @@ on_key_pressed (EekKey      *key,
    if (!priv->renderer)
        return;

-    render_pressed_key (GTK_WIDGET(self), key);
+    if (!place.row) {
+        return;
+    }
+    render_pressed_button (GTK_WIDGET(self), &place);
    gtk_widget_queue_draw (GTK_WIDGET(self));

 #if HAVE_LIBCANBERRA
@ -574,17 +406,19 @@ on_key_pressed (EekKey      *key,
 #endif
 }

-static void
-on_key_released (EekKey      *key,
-                 EekGtkKeyboard *self)
+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_key (GTK_WIDGET(self), key);
+    render_released_button (GTK_WIDGET(self), button);
    gtk_widget_queue_draw (GTK_WIDGET(self));

 #if HAVE_LIBCANBERRA
@ -595,57 +429,3 @@ on_key_released (EekKey      *key,
                            NULL);
 #endif
 }
-
-static void
-on_key_locked (EekKeyboard *keyboard,
-               EekKey      *key,
-               gpointer     user_data)
-{
-    GtkWidget *widget = user_data;
-    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (user_data);
-
-    /* renderer may have not been set yet if the widget is a popup */
-    if (!priv->renderer)
-        return;
-
-    render_locked_key (widget, key);
-    gtk_widget_queue_draw (widget);
-}
-
-static void
-on_key_unlocked (EekKeyboard *keyboard,
-                 EekKey      *key,
-                 gpointer     user_data)
-{
-    GtkWidget *widget = user_data;
-    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (user_data);
-
-    /* renderer may have not been set yet if the widget is a popup */
-    if (!priv->renderer)
-        return;
-
-    render_released_key (widget, key);
-    gtk_widget_queue_draw (GTK_WIDGET(widget));
-}
-
-static void
-on_symbol_index_changed (EekKeyboard *keyboard,
-                         gint         group,
-                         gint         level,
-                         gpointer     user_data)
-{
-    GtkWidget *widget = user_data;
-
-    gtk_widget_queue_draw (widget);
-}
-
-void
-eek_gtk_keyboard_set_theme (EekGtkKeyboard *keyboard,
-                            EekTheme       *theme)
-{
-    g_return_if_fail (EEK_IS_GTK_KEYBOARD(keyboard));
-    g_return_if_fail (EEK_IS_THEME(theme));
-
-    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (keyboard);
-    priv->theme = g_object_ref (theme);
-}
--- a/eek/eek-gtk-keyboard.h
+++ b/eek/eek-gtk-keyboard.h
@ -28,7 +28,7 @@
 #include <glib.h>
 #include <gtk/gtk.h>

-#include "eek-keyboard.h"
+typedef struct _LevelKeyboard LevelKeyboard; // including causes weird bugs

 G_BEGIN_DECLS
 #define EEK_TYPE_GTK_KEYBOARD (eek_gtk_keyboard_get_type())
@ -45,9 +45,7 @@ struct _EekGtkKeyboardClass
 };

 GType      eek_gtk_keyboard_get_type  (void) G_GNUC_CONST;
-GtkWidget *eek_gtk_keyboard_new       (EekKeyboard    *keyboard);
-void       eek_gtk_keyboard_set_theme (EekGtkKeyboard *keyboard,
-                                       EekTheme       *theme);
+GtkWidget *eek_gtk_keyboard_new       (LevelKeyboard *keyboard);

 G_END_DECLS
 #endif  /* EEK_GTK_KEYBOARD_H */
--- a/Show More
+++ b/Show More