Added update to cursor when string is committed

Fixed surrounding text not getting updated
Can preedit_string get removed?
2020-10-13 23:39:27 +02:00 · 2020-10-13 22:43:36 +02:00 · 2020-10-13 22:24:54 +02:00 · 2020-10-12 12:45:13 +00:00 · 2020-10-12 10:51:23 +00:00 · 2020-10-12 10:51:23 +00:00
350 changed files with 16632 additions and 52736 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,84 +1,9 @@
-*.la
-*.lo
-*.loT
-*.o
-*.so
+.zanata-cache/
+_build
+TAGS
+tags
+vgdump
+*.swp
 *~
-*.pyc
-Makefile
-Makefile.in
-.deps
-.libs
-INSTALL
-aclocal.m4
-autom4te.cache
-compile
-config.guess
-config.h
-config.h.in
-config.log
-config.rpath
-config.status
-config.sub
-configure
-depcomp
-install-sh
-libtool
-ltmain.sh
-missing
-stamp-h1
-libkeyactor*.tar.*
-mkinstalldirs
-m4/*.m4
-gtk-doc.make
-eek/eek-special-keysym-entries.h
-eek/eek-unicode-keysym-entries.h
-eek/eek-xkeysym-keysym-entries.h
-eek/eek-enumtypes.[ch]
-eek/eek-marshalers.[ch]
-eek/*.pc
-eek/*.gir
-eek/*.typelib
-eekboard/*.pc
-eekboard/*.gir
-eekboard/*.typelib
-eekboard/eekboard-marshalers.[ch]
-tests/eek-simple-test
-tests/eek-xkb-test
-tests/eek-xml-test
-src/eekboard
-src/eekboard-server
-docs/reference/eek/*.stamp
-docs/reference/eek/*.txt
-docs/reference/eek/eek.types
-!/docs/reference/eek/eek-sections.txt
-docs/reference/eek/xml
-docs/reference/eek/html
-docs/reference/eek/eek.signals
-docs/reference/eek/eek.args
-docs/reference/eek/eek.hierarchy
-docs/reference/eek/eek.interfaces
-docs/reference/eek/eek.prerequisites
-docs/reference/eekboard/*.stamp
-docs/reference/eekboard/*.txt
-!/docs/reference/eekboard/eekboard-sections.txt
-docs/reference/eekboard/xml
-docs/reference/eekboard/html
-docs/reference/eekboard/eekboard.signals
-docs/reference/eekboard/eekboard.args
-docs/reference/eekboard/eekboard.hierarchy
-docs/reference/eekboard/eekboard.interfaces
-docs/reference/eekboard/eekboard.prerequisites
-po/*.gmo
-po/Makefile.in.in
-po/POTFILES
-po/stamp-it
-po/.intltool-merge-cache
-bindings/vala/*.vapi
-py-compile
-data/org.fedorahosted.eekboard.gschema.xml
-data/org.fedorahosted.eekboard.gschema.valid
-data/eekboard-server.service
-data/*.desktop
-examples/eekxml/eekxml
-
+\#*#
+.\#*
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -0,0 +1,149 @@
+image: debian:bullseye
+
+stages:
+  - build
+  - test
+
+.tags: &tags
+  tags:
+    - librem5
+
+before_script:
+  - apt-get -y update
+  - apt-get -y install wget ca-certificates gnupg
+  - echo "deb [trusted=yes] http://ci.puri.sm/ bullseyeci main" > /etc/apt/sources.list.d/ci.list
+  - wget -O- https://ci.puri.sm/ci-repo.key | apt-key add -
+  - apt-get -y update
+
+build_docs:
+  <<: *tags
+  stage: build
+  artifacts:
+    paths:
+      - _build
+  script:
+      - apt-get -y install python3-pip python3-sphinx
+      - pip3 install recommonmark
+      - ./doc/build.sh _build
+
+build_meson:
+  tags:
+    - librem5
+  stage: build
+  artifacts:
+    paths:
+      - _build
+    expire_in: 3h
+  script:
+    - apt-get -y build-dep .
+    - meson . _build/ -Ddepdatadir=/usr/share --werror
+    - ninja -C _build install
+
+build_deb:
+    tags:
+        - librem5
+    stage: build
+    artifacts:
+      paths:
+        - "*.deb"
+    script:
+        - rm -f ../*.deb
+        - apt-get -y build-dep .
+        - apt-get -y install devscripts
+        - debuild -i -us -uc -b
+        - cp ../*.deb .
+
+build_deb:amber:
+    image: pureos/amber
+    tags:
+        - librem5
+    stage: build
+    artifacts:
+      paths:
+        - "*.deb"
+    script:
+        - echo "deb http://ci.puri.sm/ scratch librem5" > /etc/apt/sources.list.d/ci.list
+        - apt-get -y update
+        - rm -f ../*.deb
+        - apt-get -y build-dep .
+        - apt-get -y install devscripts
+        - debuild -i -us -uc -b
+        - cp ../*.deb .
+
+build_deb:buster:
+    image: "debian:buster"
+    tags:
+        - librem5
+    stage: build
+    artifacts:
+      paths:
+        - "*.deb"
+    script:
+        - echo "deb http://ci.puri.sm/ scratch librem5" > /etc/apt/sources.list.d/ci.list
+        - apt-get -y update
+        - rm -f ../*.deb
+        - apt-get -y build-dep .
+        - apt-get -y install devscripts
+        - debuild -i -us -uc -b
+        - cp ../*.deb .
+
+
+build_deb:arm64:
+    tags:
+        - librem5:arm64
+    stage: build
+    artifacts:
+      paths:
+        - "*.deb"
+    script:
+        - rm -f ../*.deb
+        - apt-get -y build-dep .
+        - apt-get -y install devscripts
+        - debuild -i -us -uc -b
+        - cp ../*.deb .
+
+build_deb:arm64_buster:
+    image: "debian:buster"
+    tags:
+        - librem5:arm64
+    stage: build
+    artifacts:
+      paths:
+        - "*.deb"
+    script:
+        - echo "deb http://ci.puri.sm/ scratch librem5" > /etc/apt/sources.list.d/ci.list
+        - apt-get -y update
+        - rm -f ../*.deb
+        - apt-get -y build-dep .
+        - 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:
+    - librem5
+  stage: test
+  needs:
+    - build_meson
+  script:
+    - apt-get -y build-dep .
+    - ninja -C _build test
+
+check_release:
+  <<: *tags
+  stage: test
+  only:
+    refs:
+      - master
+  script:
+    - apt-get -y install git python3
+    - (head -n 1 ./debian/changelog && git tag) | ./debian/check_release.py
--- 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.deps
+++ b/Cargo.deps
@@ -0,0 +1,22 @@
+# Dependencies which change based on build flags
+bitflags = "1.2.*"
+clap = { version = "2.33.*", default-features = false }
+regex = { version = "1.3.*", default-features = false, features = ["std", "unicode-case"] }
+
+[dependencies.cairo-rs]
+version = "0.7.*"
+
+[dependencies.gdk]
+version = "0.11.*"
+
+[dependencies.gio]
+version = "0.7.*"
+features = ["v2_44"]
+
+[dependencies.glib]
+version = "0.8.*"
+features = ["v2_44"]
+
+[dependencies.gtk]
+version = "0.7.*"
+features = ["v3_22"]
--- a/Cargo.deps.legacy
+++ b/Cargo.deps.legacy
@@ -0,0 +1,22 @@
+# Dependencies which change based on build flags
+bitflags = "1.0.*"
+clap = { version = "2.32.*", default-features = false }
+regex = { version = "1.1.*", default-features = false, features = ['use_std'] }
+
+[dependencies.cairo-rs]
+version = "0.5.*"
+
+[dependencies.gdk]
+version = "0.9.*"
+
+[dependencies.gio]
+version = "0.5.*"
+features = ["v2_44"]
+
+[dependencies.glib]
+version = "0.6.*"
+features = ["v2_44"]
+
+[dependencies.gtk]
+version = "0.5.*"
+features = ["v3_22"]
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -0,0 +1,486 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "atk"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "atk-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "atk-sys"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "bitflags"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "cairo-rs"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cairo-sys-rs 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "cairo-sys-rs"
+version = "0.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "cc"
+version = "1.0.54"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "clap"
+version = "2.33.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "dtoa"
+version = "0.4.5"
+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.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cairo-rs 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cairo-sys-rs 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gdk-pixbuf 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gdk-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gio 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gio-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pango 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "gdk-pixbuf"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "gdk-pixbuf-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gio 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gio-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "gdk-pixbuf-sys"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "gio-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "gdk-sys"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cairo-sys-rs 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gdk-pixbuf-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gio-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pango-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "gio"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bitflags 1.2.1 (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.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gobject-sys 0.9.1 (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.71 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "gio-sys"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "glib"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gobject-sys 0.9.1 (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.71 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "glib-sys"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "gobject-sys"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "gtk"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "atk 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cairo-rs 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cairo-sys-rs 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc 1.0.54 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gdk 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gdk-pixbuf 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gdk-pixbuf-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gdk-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gio 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gio-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gtk-sys 0.9.2 (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.71 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pango 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pango-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "gtk-sys"
+version = "0.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "atk-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cairo-sys-rs 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gdk-pixbuf-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gdk-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gio-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pango-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.3.17 (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.71"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "linked-hash-map"
+version = "0.5.3"
+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 = "memmap"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "libc 0.2.71 (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.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gobject-sys 0.9.1 (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.71 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pango-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "pango-sys"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "pkg-config"
+version = "0.3.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.18"
+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.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro2 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "regex"
+version = "1.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "regex-syntax 0.6.18 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.6.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "rs"
+version = "0.1.0"
+dependencies = [
+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cairo-rs 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cairo-sys-rs 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "clap 2.33.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gdk 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gio 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gtk 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gtk-sys 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "maplit 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 1.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.111 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_yaml 0.8.13 (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.111"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "serde_derive 1.0.111 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.111"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro2 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.31 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "serde_yaml"
+version = "0.8.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "dtoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "linked-hash-map 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.111 (registry+https://github.com/rust-lang/crates.io-index)",
+ "yaml-rust 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "syn"
+version = "1.0.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro2 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.7 (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 = "textwrap"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "unicode-width"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "unicode-xid"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "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.71 (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.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "linked-hash-map 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[metadata]
+"checksum atk 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "86b7499272acf036bb5820c6e346bbfb5acc5dceb104bc2c4fd7e6e33dfcde6a"
+"checksum atk-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e552c1776737a4c80110d06b36d099f47c727335f9aaa5d942a72b6863a8ec6f"
+"checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
+"checksum cairo-rs 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e05db47de3b0f09a222fa4bba2eab957d920d4243962a86b2d77ab401e4a359c"
+"checksum cairo-sys-rs 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ff65ba02cac715be836f63429ab00a767d48336efc5497c5637afb53b4f14d63"
+"checksum cc 1.0.54 (registry+https://github.com/rust-lang/crates.io-index)" = "7bbb73db36c1246e9034e307d0fba23f9a2e251faa47ade70c1bd252220c8311"
+"checksum clap 2.33.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bdfa80d47f954d53a35a64987ca1422f495b8d6483c0fe9f7117b36c2a792129"
+"checksum dtoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "4358a9e11b9a09cf52383b451b49a169e8d797b68aa02301ff586d70d9661ea3"
+"checksum fragile 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "05f8140122fa0d5dcb9fc8627cfce2b37cc1500f752636d46ea28bc26785c2f9"
+"checksum gdk 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6243e995f41f3a61a31847e54cc719edce93dd9140c89dca3b9919be1cfe22d5"
+"checksum gdk-pixbuf 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9726408ee1bbada83094326a99b9c68fea275f9dbb515de242a69e72051f4fcc"
+"checksum gdk-pixbuf-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d8991b060a9e9161bafd09bf4a202e6fd404f5b4dd1a08d53a1e84256fb34ab0"
+"checksum gdk-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6adf679e91d1bff0c06860287f80403e7db54c2d2424dce0a470023b56c88fbb"
+"checksum gio 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6261b5d34c30c2d59f879e643704cf54cb44731f3a2038000b68790c03e360e3"
+"checksum gio-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4fad225242b9eae7ec8a063bb86974aca56885014672375e5775dc0ea3533911"
+"checksum glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "be27232841baa43e0fd5ae003f7941925735b2f733a336dc75f07b9eff415e7b"
+"checksum glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "95856f3802f446c05feffa5e24859fe6a183a7cb849c8449afc35c86b1e316e2"
+"checksum gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31d1a804f62034eccf370006ccaef3708a71c31d561fee88564abe71177553d9"
+"checksum gtk 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "709f1074259d4685b96133f92b75c7f35b504715b0fcdc96ec95de2607296a60"
+"checksum gtk-sys 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "53def660c7b48b00b510c81ef2d2fbd3c570f1527081d8d7947f471513e1a4c1"
+"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+"checksum libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)" = "9457b06509d27052635f90d6466700c65095fdf75409b3fbdd903e988b886f49"
+"checksum linked-hash-map 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8dd5a6d5999d9907cda8ed67bbd137d3af8085216c2ac62de5be860bd41f304a"
+"checksum maplit 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d"
+"checksum memmap 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6585fd95e7bb50d6cc31e20d4cf9afb4e2ba16c5846fc76793f11218da9c475b"
+"checksum pango 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "393fa071b144f8ffb83ede273758983cf414ca3c0b1d2a5a9ce325b3ba3dd786"
+"checksum pango-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "86b93d84907b3cf0819bff8f13598ba72843bee579d5ebc2502e4b0367b4be7d"
+"checksum pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)" = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677"
+"checksum proc-macro2 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)" = "beae6331a816b1f65d04c45b078fd8e6c93e8071771f41b8163255bbd8d7c8fa"
+"checksum quote 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37"
+"checksum regex 1.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "9c3780fcf44b193bc4d09f36d2a3c87b251da4a046c87795a0d35f4f927ad8e6"
+"checksum regex-syntax 0.6.18 (registry+https://github.com/rust-lang/crates.io-index)" = "26412eb97c6b088a6997e05f69403a802a92d520de2f8e63c2b65f9e0f47c4e8"
+"checksum serde 1.0.111 (registry+https://github.com/rust-lang/crates.io-index)" = "c9124df5b40cbd380080b2cc6ab894c040a3070d995f5c9dc77e18c34a8ae37d"
+"checksum serde_derive 1.0.111 (registry+https://github.com/rust-lang/crates.io-index)" = "3f2c3ac8e6ca1e9c80b8be1023940162bf81ae3cffbb1809474152f2ce1eb250"
+"checksum serde_yaml 0.8.13 (registry+https://github.com/rust-lang/crates.io-index)" = "ae3e2dd40a7cdc18ca80db804b7f461a39bb721160a85c9a1fa30134bf3c02a5"
+"checksum syn 1.0.31 (registry+https://github.com/rust-lang/crates.io-index)" = "b5304cfdf27365b7585c25d4af91b35016ed21ef88f17ced89c7093b43dba8b6"
+"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
+"checksum unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479"
+"checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
+"checksum 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.4 (registry+https://github.com/rust-lang/crates.io-index)" = "39f0c922f1a334134dc2f7a8b67dc5d25f0735263feec974345ff706bcf20b0d"
--- a/Cargo.toml.in
+++ b/Cargo.toml.in
@@ -0,0 +1,40 @@
+[package]
+name = "rs"
+version = "0.1.0"
+
+[lib]
+name = "rs"
+path = "@path@/src/lib.rs"
+crate-type = ["staticlib", "rlib"]
+
+# Cargo can't do autodiscovery if Cargo.toml is not in the root.
+[[bin]]
+name = "test_layout"
+path = "@path@/src/bin/test_layout.rs"
+
+[[example]]
+name = "test_layout"
+path = "@path@/examples/test_layout.rs"
+
+[features]
+gio_v0_5 = []
+gtk_v0_5 = []
+
+# Dependencies which don't change based on build flags
+[dependencies.cairo-sys-rs]
+version = ""
+
+[dependencies.glib-sys]
+version = ""
+features = ["v2_44"]
+
+[dependencies.gtk-sys]
+version = ""
+features = ["v3_22"]
+
+[dependencies]
+maplit = "1.0.*"
+serde = { version = "1.0.*", features = ["derive"] }
+serde_yaml = "0.8.*"
+xkbcommon = { version = "0.4.*", features = ["wayland"] }
+# Here is inserted the Cargo.deps file
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,21 +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
-
-ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = eek eekboard src tests bindings docs po data examples
-DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-introspection
--- a/35
+++ b/35
@@ -1,35 +0,0 @@
-eekboard - an easy to use virtual keyboard toolkit -*- outline -*-
-
-eekboard is a virtual keyboard software package, including a set of
-tools to implement desktop virtual keyboards.
-
-* Building
-
-** Dependencies
-
-REQUIRED: GLib2, GTK, PangoCairo, libxklavier, libcroco
-OPTIONAL: libXtst, at-spi2-core, IBus, Clutter, Clutter-Gtk, Python, Vala, gobject-introspection, libcanberra
-
-** Build from git repo
-
-  $ git clone git://github.com/ueno/eekboard.git
-  $ cd eekboard
-  $ ./autogen.sh --prefix=/usr --enable-gtk-doc
-  $ make
-  $ sudo make install
-
-** Build from tarball
-
-  $ ./configure --prefix=/usr
-  $ make
-  $ sudo make install
-
-* Running
-
-  $ eekboard
-  $ eekboard -f # show/hide automatically based on focus-in/focus-out events
-
-Even though eekboard -f watches a11y events by default, it currently
-works better with IBus.  To use IBus, do:
-
-  $ gsettings set org.fedorahosted.eekboard focus-listener 'ibus'
--- a/README.md
+++ b/README.md
@@ -0,0 +1,72 @@
+*squeekboard* - a Wayland virtual keyboard
+========================================
+
+*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 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
+
+- A settings interface
+
+### TODO
+
+- Use Wayland input method protocol
+- Pick up DBus interface files from /usr/share
+
+Building
+--------
+
+### Dependencies
+
+See `.gitlab-ci.yml` or run `apt-get build-dep .`
+
+### Build from git repo
+
+```bash
+$ git clone https://source.puri.sm/Librem5/squeekboard.git
+$ cd squeekboard
+$ mkdir _build
+$ meson _build/
+$ cd _build
+$ ninja
+```
+
+To run tests use `ninja test`. To install squeekboard run `ninja install`.
+
+Running
+-------
+
+```bash
+$ phoc # if no compatible Wayland compositor is running yet
+$ cd ../build/
+$ src/squeekboard
+```
+
+Squeekboard honors the gnome "screen-keyboard-enabled" setting. Either enable this through gnome-settings under accessibility or run:
+
+```bash
+$ gsettings set org.gnome.desktop.a11y.applications screen-keyboard-enabled true
+```
+
+To make the keyboard show you can use either an application that does so automatically, like a text editor or `python3 ./tests/entry.py`, or you can manually trigger it with:
+
+```bash
+busctl call --user sm.puri.OSK0 /sm/puri/OSK0 sm.puri.OSK0 SetVisible b true
+```
+
+Developing
+----------
+
+See [`doc/hacking.md`](doc/hacking.md) for this copy, or the [official documentation](https://developer.puri.sm/projects/squeekboard/) for the current release.
--- a/1
+++ b/1
@@ -1 +0,0 @@
-See https://github.com/ueno/eekboard/wiki/TODO
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,25 +0,0 @@
-#!/bin/sh
-# Run this to generate all the initial makefiles, etc.
-
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
-
-PKG_NAME="eekboard"
-
-(test -f $srcdir/configure.ac \
-  && test -f $srcdir/README ) || {
-    echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
-    echo " top-level $PKG_NAME directory"
-    exit 1
-}
-
-which gnome-autogen.sh || {
-    echo "You need to install gnome-common from the GNOME CVS"
-    exit 1
-}
-
-ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I m4"
-REQUIRED_AUTOMAKE_VERSION=1.10
-REQUIRED_AUTOCONF_VERSION=2.60
-
-. gnome-autogen.sh
--- a/bindings/Makefile.am
+++ b/bindings/Makefile.am
@@ -1,19 +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
-
-SUBDIRS = python vala
--- a/bindings/python/Makefile.am
+++ b/bindings/python/Makefile.am
@@ -1,18 +0,0 @@
-# Copyright (C) 2011 Daiki Ueno <ueno@unixuser.org>
-# Copyright (C) 2011 Red Hat, Inc.
-
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-
-# This program 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
-# General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see
-# <http://www.gnu.org/licenses/>.
-
-SUBDIRS = eekboard
--- a/bindings/python/eekboard/Makefile.am
+++ b/bindings/python/eekboard/Makefile.am
@@ -1,27 +0,0 @@
-# Copyright (C) 2011 Daiki Ueno <ueno@unixuser.org>
-# Copyright (C) 2011 Red Hat, Inc.
-
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-
-# This program 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
-# General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see
-# <http://www.gnu.org/licenses/>.
-
-if ENABLE_PYTHON
-pkgpython_PYTHON =				\
-	__init__.py				\
-	serializable.py				\
-	symbol.py				\
-	keysym.py				\
-	text.py					\
-	client.py				\
-	context.py
-endif
--- a/bindings/python/eekboard/init.py
+++ b/bindings/python/eekboard/init.py
@@ -1,23 +0,0 @@
-# Copyright (C) 2011 Daiki Ueno <ueno@unixuser.org>
-# Copyright (C) 2011 Red Hat, Inc.
-
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-
-# This program 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
-# General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see
-# <http://www.gnu.org/licenses/>.
-
-from symbol import *
-from keysym import *
-from text import *
-from serializable import *
-from client import *
-from context import *
--- a/bindings/python/eekboard/client.py
+++ b/bindings/python/eekboard/client.py
@@ -1,56 +0,0 @@
-# Copyright (C) 2011 Daiki Ueno <ueno@unixuser.org>
-# Copyright (C) 2011 Red Hat, Inc.
-
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-
-# This program 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
-# General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see
-# <http://www.gnu.org/licenses/>.
-
-import dbus
-import dbus.mainloop.glib
-import gobject
-from context import Context
-
-dbus.mainloop.glib.DBusGMainLoop(set_as_default = True)
-
-class Client(gobject.GObject):
-    __gtype_name__ = "PYEekboardClient"
-    __gsignals__ = {
-        'destroyed': (
-            gobject.SIGNAL_RUN_LAST,
-            gobject.TYPE_NONE,
-            ())
-        }
-
-    def __init__(self):
-        super(Client, self).__init__()
-        self.__bus = dbus.SessionBus()
-        _service = self.__bus.get_object("org.fedorahosted.Eekboard",
-                                         "/org/fedorahosted/Eekboard")
-        self.__service = dbus.Interface(_service, dbus_interface="org.fedorahosted.Eekboard")
-        self.__service.connect_to_signal("Destroyed", self.__destroyed_cb)
-
-    def __destroyed_cb(self):
-        self.emit("destroyed")
-
-    def create_context(self, client_name):
-        object_path = self.__service.CreateContext(client_name)
-        return Context(self.__bus, object_path)
-
-    def push_context(self, context):
-        self.__service.PushContext(context.object_path)
-
-    def pop_context(self):
-        self.__service.PopContext()
-
-    def destroy_context(self, context):
-        self.__service.DestroyContext(context.object_path)
--- a/bindings/python/eekboard/context.py
+++ b/bindings/python/eekboard/context.py
@@ -1,126 +0,0 @@
-# Copyright (C) 2011 Daiki Ueno <ueno@unixuser.org>
-# Copyright (C) 2011 Red Hat, Inc.
-
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-
-# This program 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
-# General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see
-# <http://www.gnu.org/licenses/>.
-
-import dbus
-import gobject
-import serializable
-
-class Context(gobject.GObject):
-    __gtype_name__ = "PYEekboardContext"
-    __gsignals__ = {
-        'enabled': (
-            gobject.SIGNAL_RUN_LAST,
-            gobject.TYPE_NONE,
-            ()),
-        'disabled': (
-            gobject.SIGNAL_RUN_LAST,
-            gobject.TYPE_NONE,
-            ()),
-        'key-pressed': (
-            gobject.SIGNAL_RUN_LAST,
-            gobject.TYPE_NONE,
-            (gobject.TYPE_STRING, gobject.TYPE_PYOBJECT, gobject.TYPE_UINT)),
-        'destroyed': (
-            gobject.SIGNAL_RUN_LAST,
-            gobject.TYPE_NONE,
-            ()),
-        }
-
-    __gproperties__ = {
-        'visible': (gobject.TYPE_BOOLEAN, 'Visible', 'Visible',
-                    False, gobject.PARAM_READWRITE),
-        'keyboard': (gobject.TYPE_UINT, 'Keyboard', 'Keyboard',
-                     0, gobject.G_MAXUINT, 0, gobject.PARAM_READWRITE),
-        'group': (gobject.TYPE_UINT, 'Group', 'Group',
-                  0, gobject.G_MAXUINT, 0, gobject.PARAM_READWRITE),
-        }
-
-    def __init__(self, bus, object_path):
-        super(Context, self).__init__()
-        self.__bus = bus
-        self.__object_path = object_path
-        self.__properties = {}
-        _context = self.__bus.get_object("org.fedorahosted.Eekboard",
-                                         object_path)
-        self.__context = dbus.Interface(_context, dbus_interface="org.fedorahosted.Eekboard.Context")
-
-        self.__context.connect_to_signal('Enabled', self.__enabled_cb)
-        self.__context.connect_to_signal('Disabled', self.__disabled_cb)
-        self.__context.connect_to_signal('KeyActivated', self.__key_pressed_cb)
-        self.__context.connect_to_signal('Destroyed', self.__destroyed_cb)
-        self.__context.connect_to_signal('VisibilityChanged', self.__visibility_changed_cb)
-        self.__context.connect_to_signal('KeyboardChanged', self.__keyboard_changed_cb)
-        self.__context.connect_to_signal('GroupChanged', self.__group_changed_cb)
-
-    object_path = property(lambda self: self.__object_path)
-
-    def __enabled_cb(self):
-        self.emit('enabled')
-
-    def __disabled_cb(self):
-        self.emit('disabled')
-
-    def __key_pressed_cb(self, *args):
-        keyname = args[0]
-        symbol = serializable.deserialize_object(args[1])
-        modifiers = args[2]
-        self.emit('key-pressed', keyname, symbol, modifiers)
-
-    def __visibility_changed_cb(self, *args):
-        self.set_property('visible', args[0])
-        self.notify('visible')
-
-    def __keyboard_changed_cb(self, *args):
-        self.set_property('keyboard', args[0])
-        self.notify('keyboard')
-
-    def __group_changed_cb(self, *args):
-        self.set_property('group', args[0])
-        self.notify('group')
-
-    def __destroyed_cb(self):
-        self.emit("destroyed")
-
-    def do_set_property(self, pspec, value):
-        self.__properties[pspec.name] = value
-
-    def do_get_property(self, pspec):
-        return self.__properties.get(pspec.name, pspec.default_value)
-
-    def add_keyboard(self, keyboard_type):
-        return self.__context.AddKeyboard(keyboard_type)
-
-    def remove_keyboard(self, keyboard_id):
-        return self.__context.RemoveKeyboard(keyboard_id)
-        
-    def set_keyboard(self, keyboard_id):
-        self.__context.SetKeyboard(keyboard_id)
-
-    def show_keyboard(self):
-        self.__context.ShowKeyboard()
-
-    def hide_keyboard(self):
-        self.__context.HideKeyboard()
-
-    def set_group(self, group):
-        self.__context.SetGroup(group)
-
-    def press_keycode(self, keycode):
-        self.__context.PressKeycode(keycode)
-
-    def release_keycode(self, keycode):
-        self.__context.ReleaseKeycode(keycode)
--- a/bindings/python/eekboard/keysym.py
+++ b/bindings/python/eekboard/keysym.py
@@ -1,35 +0,0 @@
-# Copyright (C) 2011 Daiki Ueno <ueno@unixuser.org>
-# Copyright (C) 2011 Red Hat, Inc.
-
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-
-# This program 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
-# General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see
-# <http://www.gnu.org/licenses/>.
-
-import symbol
-
-class Keysym(symbol.Symbol):
-    __gtype_name__ = "PYEekKeysym"
-    __NAME__ = "EekKeysym"
-
-    def __init__(self):
-        super(Keysym, self).__init__()
-
-    xkeysym = property(lambda self: self.__xkeysym)
-
-    def serialize(self, struct):
-        super(Keysym, self).serialize(struct)
-        struct.append(dbus.UInt32(self.__xkeysym))
-
-    def deserialize(self, struct):
-        super(Keysym, self).deserialize(struct)
-        self.__xkeysym = struct.pop(0)
--- a/bindings/python/eekboard/serializable.py
+++ b/bindings/python/eekboard/serializable.py
@@ -1,76 +0,0 @@
-# vim:set et sts=4 sw=4:
-#
-# ibus - The Input Bus
-#
-# Copyright (c) 2007-2010 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (c) 2007-2010 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 program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA  02111-1307  USA
-
-__all__ = (
-        "Serializable",
-        "serialize_object",
-        "deserialize_object",
-    )
-
-import dbus
-import gobject
-
-__serializable_name_dict = dict()
-
-def serializable_register(classobj):
-    # if not issubclass(classobj, Serializable):
-    #     raise "%s is not a sub-class of Serializable" % str(classobj)
-    __serializable_name_dict[classobj.__NAME__] = classobj
-
-def serialize_object(o):
-    if isinstance(o, Serializable):
-        l = [o.__NAME__]
-        o.serialize(l)
-        return dbus.Struct(l)
-    else:
-        return o
-
-def deserialize_object(v):
-    if isinstance(v, tuple):
-        struct = list(v)
-        type_name = struct.pop(0)
-        type_class = __serializable_name_dict[type_name]
-        o = type_class()
-        o.deserialize (struct)
-        return o
-    return v
-
-class SerializableMeta(gobject.GObjectMeta):
-    def __init__(cls, name, bases, dict_):
-        super(SerializableMeta, cls).__init__(name, bases, dict_)
-        if "__NAME__" in cls.__dict__:
-            serializable_register(cls)
-
-class Serializable(gobject.GObject):
-    __metaclass__ = SerializableMeta
-    __gtype_name__ = "PYEekSerializable"
-    __NAME__ = "EekSerializable"
-    def __init__(self):
-        super(Serializable, self).__init__()
-
-    def serialize(self, struct):
-        pass
-
-    def deserialize(self, struct):
-        pass
-
-__serializable_name_dict["EekSerializable"] = Serializable
--- a/bindings/python/eekboard/symbol.py
+++ b/bindings/python/eekboard/symbol.py
@@ -1,47 +0,0 @@
-# Copyright (C) 2011 Daiki Ueno <ueno@unixuser.org>
-# Copyright (C) 2011 Red Hat, Inc.
-
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-
-# This program 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
-# General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see
-# <http://www.gnu.org/licenses/>.
-
-import serializable
-
-class Symbol(serializable.Serializable):
-    __gtype_name__ = "PYEekSymbol"
-    __NAME__ = "EekSymbol"
-
-    def __init__(self):
-        super(Symbol, self).__init__()
-
-    name = property(lambda self: self.__name)
-    label = property(lambda self: self.__label)
-    category = property(lambda self: self.__category)
-    modifier_mask = property(lambda self: self.__modifier_mask)
-    icon_name = property(lambda self: self.__icon_name)
-
-    def serialize(self, struct):
-        super(Symbol, self).serialize(struct)
-        struct.append(dbus.String(self.__name))
-        struct.append(dbus.String(self.__label))
-        struct.append(dbus.UInt32(self.__category))
-        struct.append(dbus.UInt32(self.__modifier_mask))
-        struct.append(dbus.String(self.__icon_name))
-
-    def deserialize(self, struct):
-        super(Symbol, self).deserialize(struct)
-        self.__name = struct.pop(0)
-        self.__label = struct.pop(0)
-        self.__category = struct.pop(0)
-        self.__modifier_mask = struct.pop(0)
-        self.__icon_name = struct.pop(0)
--- a/bindings/python/eekboard/text.py
+++ b/bindings/python/eekboard/text.py
@@ -1,35 +0,0 @@
-# Copyright (C) 2011 Daiki Ueno <ueno@unixuser.org>
-# Copyright (C) 2011 Red Hat, Inc.
-
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-
-# This program 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
-# General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see
-# <http://www.gnu.org/licenses/>.
-
-import symbol
-
-class Text(symbol.Symbol):
-    __gtype_name__ = "PYEekText"
-    __NAME__ = "EekText"
-
-    def __init__(self):
-        super(Text, self).__init__()
-
-    text = property(lambda self: self.__text)
-
-    def serialize(self, struct):
-        super(Text, self).serialize(struct)
-        struct.append(dbus.String(self.__text))
-
-    def deserialize(self, struct):
-        super(Text, self).deserialize(struct)
-        self.__text = struct.pop(0)
--- a/bindings/vala/Makefile.am
+++ b/bindings/vala/Makefile.am
@@ -1,77 +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 ENABLE_VALA
-vapidir = $(datadir)/vala/vapi
-dist_vapi_DATA = \
-	eek-$(EEK_API_VERSION).vapi \
-	eek-clutter-$(EEK_API_VERSION).vapi \
-	eek-gtk-$(EEK_API_VERSION).vapi \
-	eek-xkb-$(EEK_API_VERSION).vapi \
-	eek-xkl-$(EEK_API_VERSION).vapi
-MAINTAINERCLEANFILES = $(dist_vapi_DATA)
-
-eek-$(EEK_API_VERSION).vapi:
-	$(VAPIGEN_V)$(VAPIGEN) \
-		--library eek-$(EEK_API_VERSION) \
-		--pkg gio-2.0 \
-		eek-$(EEK_API_VERSION)/eek-$(EEK_API_VERSION).gi
-
-eek-clutter-$(EEK_API_VERSION).vapi: eek-$(EEK_API_VERSION).vapi
-	$(VAPIGEN_V)$(VAPIGEN) --vapidir=$(builddir) \
-		--library eek-clutter-$(EEK_API_VERSION) \
-		--pkg eek-$(EEK_API_VERSION) \
-		--pkg clutter-1.0 \
-		--pkg gio-2.0 \
-		--pkg atk \
-		eek-clutter-$(EEK_API_VERSION)/eek-clutter-$(EEK_API_VERSION).gi
-
-eek-gtk-$(EEK_API_VERSION).vapi: eek-$(EEK_API_VERSION).vapi
-	$(VAPIGEN_V)$(VAPIGEN) --vapidir=$(builddir) \
-		--library eek-gtk-$(EEK_API_VERSION) \
-		--pkg eek-$(EEK_API_VERSION) \
-		--pkg gtk+-2.0 \
-		eek-gtk-$(EEK_API_VERSION)/eek-gtk-$(EEK_API_VERSION).gi
-
-eek-xkb-$(EEK_API_VERSION).vapi: eek-$(EEK_API_VERSION).vapi
-	$(VAPIGEN_V)$(VAPIGEN) --vapidir=$(builddir) \
-		--library eek-xkb-$(EEK_API_VERSION) \
-		--pkg eek-$(EEK_API_VERSION) \
-		--pkg gio-2.0 \
-		eek-xkb-$(EEK_API_VERSION)/eek-xkb-$(EEK_API_VERSION).gi
-
-eek-xkl-$(EEK_API_VERSION).vapi: eek-xkb-$(EEK_API_VERSION).vapi
-	$(VAPIGEN_V)$(VAPIGEN) --vapidir=$(builddir) \
-		--library eek-xkl-$(EEK_API_VERSION) \
-		--pkg eek-$(EEK_API_VERSION) \
-		--pkg eek-xkb-$(EEK_API_VERSION) --pkg gio-2.0 \
-		eek-xkl-$(EEK_API_VERSION)/eek-xkl-$(EEK_API_VERSION).gi
-
-eekboard-$(EEK_API_VERSION).vapi:
-	$(VAPIGEN_V)$(VAPIGEN) \
-		--library eekboard-$(EEK_API_VERSION) \
-		--pkg eek-$(EEK_API_VERSION) \
-		--pkg gio-2.0 \
-		eek-$(EEK_API_VERSION)/eek-$(EEK_API_VERSION).gi
-
-# set up the verbosity rules to avoid some build noise
-VAPIGEN_V = $(VAPIGEN_V_$(V))
-VAPIGEN_V_ = $(VAPIGEN_V_$(AM_DEFAULT_VERBOSITY))
-VAPIGEN_V_0 = @echo "  VAPIG " $@;
-endif
-
--- a/bindings/vala/eek-0.90/eek-0.90.defines
+++ b/bindings/vala/eek-0.90/eek-0.90.defines
@@ -1,2 +0,0 @@
-DEEK_COMPILATION=1
-
--- a/bindings/vala/eek-0.90/eek-0.90.files
+++ b/bindings/vala/eek-0.90/eek-0.90.files
@@ -1,16 +0,0 @@
-include/eek-0.90/eek/eek-container.h
-include/eek-0.90/eek/eek-element.h
-include/eek-0.90/eek/eek-enumtypes.h
-include/eek-0.90/eek/eek-keyboard.h
-include/eek-0.90/eek/eek-key.h
-include/eek-0.90/eek/eek-keysym.h
-include/eek-0.90/eek/eek-layout.h
-include/eek-0.90/eek/eek-section.h
-include/eek-0.90/eek/eek-serializable.h
-include/eek-0.90/eek/eek-symbol.h
-include/eek-0.90/eek/eek-symbol-matrix.h
-include/eek-0.90/eek/eek-theme.h
-include/eek-0.90/eek/eek-types.h
-include/eek-0.90/eek/eek-xml.h
-include/eek-0.90/eek/eek-xml-layout.h
-lib/libeek.so
--- a/bindings/vala/eek-0.90/eek-0.90.gi
+++ b/bindings/vala/eek-0.90/eek-0.90.gi
--- a/bindings/vala/eek-0.90/eek-0.90.metadata
+++ b/bindings/vala/eek-0.90/eek-0.90.metadata
@@ -1 +0,0 @@
-Eek cheader_filename="eek/eek.h"
--- a/bindings/vala/eek-0.90/eek-0.90.namespace
+++ b/bindings/vala/eek-0.90/eek-0.90.namespace
@@ -1 +0,0 @@
-Eek
--- a/bindings/vala/eek-clutter-0.90/eek-clutter-0.90.defines
+++ b/bindings/vala/eek-clutter-0.90/eek-clutter-0.90.defines
@@ -1,2 +0,0 @@
-DEEK_COMPILATION=1
-
--- a/bindings/vala/eek-clutter-0.90/eek-clutter-0.90.files
+++ b/bindings/vala/eek-clutter-0.90/eek-clutter-0.90.files
@@ -1,2 +0,0 @@
-include/eek-0.90/eek/eek-clutter-keyboard.h
-lib/libeek-clutter.so
--- a/bindings/vala/eek-clutter-0.90/eek-clutter-0.90.gi
+++ b/bindings/vala/eek-clutter-0.90/eek-clutter-0.90.gi
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<api version="1.0">
-	<namespace name="EekClutter">
-		<object name="EekClutterKeyboard" parent="ClutterGroup" type-name="EekClutterKeyboard" get-type="eek_clutter_keyboard_get_type">
-			<implements>
-				<interface name="ClutterScriptable"/>
-				<interface name="ClutterAnimatable"/>
-				<interface name="AtkImplementor"/>
-				<interface name="ClutterContainer"/>
-			</implements>
-			<constructor name="new" symbol="eek_clutter_keyboard_new">
-				<return-type type="ClutterActor*"/>
-				<parameters>
-					<parameter name="keyboard" type="EekKeyboard*"/>
-				</parameters>
-			</constructor>
-			<method name="set_theme" symbol="eek_clutter_keyboard_set_theme">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="keyboard" type="EekClutterKeyboard*"/>
-					<parameter name="theme" type="EekTheme*"/>
-				</parameters>
-			</method>
-			<property name="keyboard" type="EekKeyboard*" readable="0" writable="1" construct="0" construct-only="1"/>
-		</object>
-		<constant name="EEK_CLUTTER_KEYBOARD_H" type="int" value="1"/>
-	</namespace>
-</api>
--- a/bindings/vala/eek-clutter-0.90/eek-clutter-0.90.metadata
+++ b/bindings/vala/eek-clutter-0.90/eek-clutter-0.90.metadata
@@ -1 +0,0 @@
-EekClutter cheader_filename="eek/eek-clutter.h"
--- a/bindings/vala/eek-clutter-0.90/eek-clutter-0.90.namespace
+++ b/bindings/vala/eek-clutter-0.90/eek-clutter-0.90.namespace
@@ -1 +0,0 @@
-EekClutter
--- a/bindings/vala/eek-gtk-0.90/eek-gtk-0.90.defines
+++ b/bindings/vala/eek-gtk-0.90/eek-gtk-0.90.defines
@@ -1,2 +0,0 @@
-DEEK_COMPILATION=1
-
--- a/bindings/vala/eek-gtk-0.90/eek-gtk-0.90.files
+++ b/bindings/vala/eek-gtk-0.90/eek-gtk-0.90.files
@@ -1,2 +0,0 @@
-include/eek-0.90/eek/eek-gtk-keyboard.h
-lib/libeek-gtk.so
--- a/bindings/vala/eek-gtk-0.90/eek-gtk-0.90.gi
+++ b/bindings/vala/eek-gtk-0.90/eek-gtk-0.90.gi
@@ -1,26 +0,0 @@
-<?xml version="1.0"?>
-<api version="1.0">
-	<namespace name="EekGtk">
-		<object name="EekGtkKeyboard" parent="GtkDrawingArea" type-name="EekGtkKeyboard" get-type="eek_gtk_keyboard_get_type">
-			<implements>
-				<interface name="AtkImplementor"/>
-				<interface name="GtkBuildable"/>
-			</implements>
-			<constructor name="new" symbol="eek_gtk_keyboard_new">
-				<return-type type="GtkWidget*"/>
-				<parameters>
-					<parameter name="keyboard" type="EekKeyboard*"/>
-				</parameters>
-			</constructor>
-			<method name="set_theme" symbol="eek_gtk_keyboard_set_theme">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="keyboard" type="EekGtkKeyboard*"/>
-					<parameter name="theme" type="EekTheme*"/>
-				</parameters>
-			</method>
-			<property name="keyboard" type="EekKeyboard*" readable="0" writable="1" construct="0" construct-only="1"/>
-		</object>
-		<constant name="EEK_GTK_KEYBOARD_H" type="int" value="1"/>
-	</namespace>
-</api>
--- a/bindings/vala/eek-gtk-0.90/eek-gtk-0.90.metadata
+++ b/bindings/vala/eek-gtk-0.90/eek-gtk-0.90.metadata
@@ -1 +0,0 @@
-EekGtk cheader_filename="eek/eek-gtk.h"
--- a/bindings/vala/eek-gtk-0.90/eek-gtk-0.90.namespace
+++ b/bindings/vala/eek-gtk-0.90/eek-gtk-0.90.namespace
@@ -1 +0,0 @@
-EekGtk
--- a/bindings/vala/eek-xkb-0.90/eek-xkb-0.90.defines
+++ b/bindings/vala/eek-xkb-0.90/eek-xkb-0.90.defines
@@ -1,2 +0,0 @@
-DEEK_COMPILATION=1
-
--- a/bindings/vala/eek-xkb-0.90/eek-xkb-0.90.files
+++ b/bindings/vala/eek-xkb-0.90/eek-xkb-0.90.files
@@ -1,2 +0,0 @@
-include/eek-0.90/eek/eek-xkb-layout.h
-lib/libeek-xkb.so
--- a/bindings/vala/eek-xkb-0.90/eek-xkb-0.90.gi
+++ b/bindings/vala/eek-xkb-0.90/eek-xkb-0.90.gi
@@ -1,73 +0,0 @@
-<?xml version="1.0"?>
-<api version="1.0">
-	<namespace name="EekXkb">
-		<object name="EekXkbLayout" parent="EekLayout" type-name="EekXkbLayout" get-type="eek_xkb_layout_get_type">
-			<method name="get_geometry" symbol="eek_xkb_layout_get_geometry">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="layout" type="EekXkbLayout*"/>
-				</parameters>
-			</method>
-			<method name="get_keycodes" symbol="eek_xkb_layout_get_keycodes">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="layout" type="EekXkbLayout*"/>
-				</parameters>
-			</method>
-			<method name="get_symbols" symbol="eek_xkb_layout_get_symbols">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="layout" type="EekXkbLayout*"/>
-				</parameters>
-			</method>
-			<constructor name="new" symbol="eek_xkb_layout_new">
-				<return-type type="EekLayout*"/>
-			</constructor>
-			<method name="set_geometry" symbol="eek_xkb_layout_set_geometry">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="layout" type="EekXkbLayout*"/>
-					<parameter name="geometry" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="set_keycodes" symbol="eek_xkb_layout_set_keycodes">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="layout" type="EekXkbLayout*"/>
-					<parameter name="keycodes" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="set_names" symbol="eek_xkb_layout_set_names">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="layout" type="EekXkbLayout*"/>
-					<parameter name="names" type="XkbComponentNamesRec*"/>
-				</parameters>
-			</method>
-			<method name="set_names_full" symbol="eek_xkb_layout_set_names_full">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="layout" type="EekXkbLayout*"/>
-				</parameters>
-			</method>
-			<method name="set_names_full_valist" symbol="eek_xkb_layout_set_names_full_valist">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="layout" type="EekXkbLayout*"/>
-					<parameter name="var_args" type="va_list"/>
-				</parameters>
-			</method>
-			<method name="set_symbols" symbol="eek_xkb_layout_set_symbols">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="layout" type="EekXkbLayout*"/>
-					<parameter name="symbols" type="gchar*"/>
-				</parameters>
-			</method>
-			<property name="geometry" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="keycodes" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="symbols" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-		</object>
-		<constant name="EEK_XKB_LAYOUT_H" type="int" value="1"/>
-	</namespace>
-</api>
--- a/bindings/vala/eek-xkb-0.90/eek-xkb-0.90.metadata
+++ b/bindings/vala/eek-xkb-0.90/eek-xkb-0.90.metadata
@@ -1,2 +0,0 @@
-EekXkb cheader_filename="eek/eek-xkb.h"
-eek_xkb_layout_set_names hidden="1"
--- a/bindings/vala/eek-xkb-0.90/eek-xkb-0.90.namespace
+++ b/bindings/vala/eek-xkb-0.90/eek-xkb-0.90.namespace
@@ -1 +0,0 @@
-EekXkb
--- a/bindings/vala/eek-xkl-0.90/eek-xkl-0.90.defines
+++ b/bindings/vala/eek-xkl-0.90/eek-xkl-0.90.defines
@@ -1,2 +0,0 @@
-DEEK_COMPILATION=1
-
--- a/bindings/vala/eek-xkl-0.90/eek-xkl-0.90.files
+++ b/bindings/vala/eek-xkl-0.90/eek-xkl-0.90.files
@@ -1,2 +0,0 @@
-include/eek-0.90/eek/eek-xkl-layout.h
-lib/libeek-xkl.so
--- a/bindings/vala/eek-xkl-0.90/eek-xkl-0.90.gi
+++ b/bindings/vala/eek-xkl-0.90/eek-xkl-0.90.gi
@@ -1,105 +0,0 @@
-<?xml version="1.0"?>
-<api version="1.0">
-	<namespace name="EekXkl">
-		<object name="EekXklLayout" parent="EekXkbLayout" type-name="EekXklLayout" get-type="eek_xkl_layout_get_type">
-			<method name="disable_option" symbol="eek_xkl_layout_disable_option">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="layout" type="EekXklLayout*"/>
-					<parameter name="option" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="enable_option" symbol="eek_xkl_layout_enable_option">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="layout" type="EekXklLayout*"/>
-					<parameter name="option" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="get_layouts" symbol="eek_xkl_layout_get_layouts">
-				<return-type type="gchar**"/>
-				<parameters>
-					<parameter name="layout" type="EekXklLayout*"/>
-				</parameters>
-			</method>
-			<method name="get_model" symbol="eek_xkl_layout_get_model">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="layout" type="EekXklLayout*"/>
-				</parameters>
-			</method>
-			<method name="get_option" symbol="eek_xkl_layout_get_option">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="layout" type="EekXklLayout*"/>
-					<parameter name="option" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="get_options" symbol="eek_xkl_layout_get_options">
-				<return-type type="gchar**"/>
-				<parameters>
-					<parameter name="layout" type="EekXklLayout*"/>
-				</parameters>
-			</method>
-			<method name="get_variants" symbol="eek_xkl_layout_get_variants">
-				<return-type type="gchar**"/>
-				<parameters>
-					<parameter name="layout" type="EekXklLayout*"/>
-				</parameters>
-			</method>
-			<constructor name="new" symbol="eek_xkl_layout_new">
-				<return-type type="EekLayout*"/>
-			</constructor>
-			<method name="set_config" symbol="eek_xkl_layout_set_config">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="layout" type="EekXklLayout*"/>
-					<parameter name="config" type="XklConfigRec*"/>
-				</parameters>
-			</method>
-			<method name="set_config_full" symbol="eek_xkl_layout_set_config_full">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="layout" type="EekXklLayout*"/>
-					<parameter name="model" type="gchar*"/>
-					<parameter name="layouts" type="gchar**"/>
-					<parameter name="variants" type="gchar**"/>
-					<parameter name="options" type="gchar**"/>
-				</parameters>
-			</method>
-			<method name="set_layouts" symbol="eek_xkl_layout_set_layouts">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="layout" type="EekXklLayout*"/>
-					<parameter name="layouts" type="gchar**"/>
-				</parameters>
-			</method>
-			<method name="set_model" symbol="eek_xkl_layout_set_model">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="layout" type="EekXklLayout*"/>
-					<parameter name="model" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="set_options" symbol="eek_xkl_layout_set_options">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="layout" type="EekXklLayout*"/>
-					<parameter name="options" type="gchar**"/>
-				</parameters>
-			</method>
-			<method name="set_variants" symbol="eek_xkl_layout_set_variants">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="layout" type="EekXklLayout*"/>
-					<parameter name="variants" type="gchar**"/>
-				</parameters>
-			</method>
-			<property name="layouts" type="GStrv*" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="model" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="options" type="GStrv*" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="variants" type="GStrv*" readable="1" writable="1" construct="0" construct-only="0"/>
-		</object>
-		<constant name="EEK_XKL_LAYOUT_H" type="int" value="1"/>
-	</namespace>
-</api>
--- a/bindings/vala/eek-xkl-0.90/eek-xkl-0.90.metadata
+++ b/bindings/vala/eek-xkl-0.90/eek-xkl-0.90.metadata
@@ -1,2 +0,0 @@
-EekXkl cheader_filename="eek/eek-xkl.h"
-eek_xkl_layout_set_config hidden="1"
--- a/bindings/vala/eek-xkl-0.90/eek-xkl-0.90.namespace
+++ b/bindings/vala/eek-xkl-0.90/eek-xkl-0.90.namespace
@@ -1 +0,0 @@
-EekXkl
--- a/bindings/vala/eekboard-0.90/eekboard-0.90.defines
+++ b/bindings/vala/eekboard-0.90/eekboard-0.90.defines
@@ -1,2 +0,0 @@
-DEEKBOARD_COMPILATION
-
--- a/bindings/vala/eekboard-0.90/eekboard-0.90.files
+++ b/bindings/vala/eekboard-0.90/eekboard-0.90.files
@@ -1,2 +0,0 @@
-include/eekboard-0.90/eekboard
-lib/libeekboard.so
--- a/bindings/vala/eekboard-0.90/eekboard-0.90.gi
+++ b/bindings/vala/eekboard-0.90/eekboard-0.90.gi
@@ -1,340 +0,0 @@
-<?xml version="1.0"?>
-<api version="1.0">
-	<namespace name="Eekboard">
-		<function name="xkl_config_rec_from_string" symbol="eekboard_xkl_config_rec_from_string">
-			<return-type type="XklConfigRec*"/>
-			<parameters>
-				<parameter name="layouts" type="gchar*"/>
-			</parameters>
-		</function>
-		<function name="xkl_config_rec_to_string" symbol="eekboard_xkl_config_rec_to_string">
-			<return-type type="gchar*"/>
-			<parameters>
-				<parameter name="rec" type="XklConfigRec*"/>
-			</parameters>
-		</function>
-		<function name="xkl_list_layout_variants" symbol="eekboard_xkl_list_layout_variants">
-			<return-type type="GSList*"/>
-			<parameters>
-				<parameter name="registry" type="XklConfigRegistry*"/>
-				<parameter name="layout" type="gchar*"/>
-			</parameters>
-		</function>
-		<function name="xkl_list_layouts" symbol="eekboard_xkl_list_layouts">
-			<return-type type="GSList*"/>
-			<parameters>
-				<parameter name="registry" type="XklConfigRegistry*"/>
-			</parameters>
-		</function>
-		<function name="xkl_list_models" symbol="eekboard_xkl_list_models">
-			<return-type type="GSList*"/>
-			<parameters>
-				<parameter name="registry" type="XklConfigRegistry*"/>
-			</parameters>
-		</function>
-		<function name="xkl_list_option_groups" symbol="eekboard_xkl_list_option_groups">
-			<return-type type="GSList*"/>
-			<parameters>
-				<parameter name="registry" type="XklConfigRegistry*"/>
-			</parameters>
-		</function>
-		<function name="xkl_list_options" symbol="eekboard_xkl_list_options">
-			<return-type type="GSList*"/>
-			<parameters>
-				<parameter name="registry" type="XklConfigRegistry*"/>
-				<parameter name="group" type="gchar*"/>
-			</parameters>
-		</function>
-		<object name="EekboardClient" parent="GDBusProxy" type-name="EekboardClient" get-type="eekboard_client_get_type">
-			<implements>
-				<interface name="GInitable"/>
-				<interface name="GAsyncInitable"/>
-			</implements>
-			<method name="create_context" symbol="eekboard_client_create_context">
-				<return-type type="EekboardContext*"/>
-				<parameters>
-					<parameter name="eekboard" type="EekboardClient*"/>
-					<parameter name="client_name" type="gchar*"/>
-					<parameter name="cancellable" type="GCancellable*"/>
-				</parameters>
-			</method>
-			<method name="destroy_context" symbol="eekboard_client_destroy_context">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="eekboard" type="EekboardClient*"/>
-					<parameter name="context" type="EekboardContext*"/>
-					<parameter name="cancellable" type="GCancellable*"/>
-				</parameters>
-			</method>
-			<constructor name="new" symbol="eekboard_client_new">
-				<return-type type="EekboardClient*"/>
-				<parameters>
-					<parameter name="connection" type="GDBusConnection*"/>
-					<parameter name="cancellable" type="GCancellable*"/>
-				</parameters>
-			</constructor>
-			<method name="pop_context" symbol="eekboard_client_pop_context">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="eekboard" type="EekboardClient*"/>
-					<parameter name="cancellable" type="GCancellable*"/>
-				</parameters>
-			</method>
-			<method name="push_context" symbol="eekboard_client_push_context">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="eekboard" type="EekboardClient*"/>
-					<parameter name="context" type="EekboardContext*"/>
-					<parameter name="cancellable" type="GCancellable*"/>
-				</parameters>
-			</method>
-			<signal name="destroyed" when="LAST">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="EekboardClient*"/>
-				</parameters>
-			</signal>
-		</object>
-		<object name="EekboardContext" parent="GDBusProxy" type-name="EekboardContext" get-type="eekboard_context_get_type">
-			<implements>
-				<interface name="GInitable"/>
-				<interface name="GAsyncInitable"/>
-			</implements>
-			<method name="add_keyboard" symbol="eekboard_context_add_keyboard">
-				<return-type type="guint"/>
-				<parameters>
-					<parameter name="context" type="EekboardContext*"/>
-					<parameter name="keyboard" type="gchar*"/>
-					<parameter name="cancellable" type="GCancellable*"/>
-				</parameters>
-			</method>
-			<method name="get_group" symbol="eekboard_context_get_group">
-				<return-type type="gint"/>
-				<parameters>
-					<parameter name="context" type="EekboardContext*"/>
-					<parameter name="cancellable" type="GCancellable*"/>
-				</parameters>
-			</method>
-			<method name="hide_keyboard" symbol="eekboard_context_hide_keyboard">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="context" type="EekboardContext*"/>
-					<parameter name="cancellable" type="GCancellable*"/>
-				</parameters>
-			</method>
-			<method name="is_enabled" symbol="eekboard_context_is_enabled">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="context" type="EekboardContext*"/>
-				</parameters>
-			</method>
-			<method name="is_keyboard_visible" symbol="eekboard_context_is_keyboard_visible">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="context" type="EekboardContext*"/>
-				</parameters>
-			</method>
-			<constructor name="new" symbol="eekboard_context_new">
-				<return-type type="EekboardContext*"/>
-				<parameters>
-					<parameter name="connection" type="GDBusConnection*"/>
-					<parameter name="object_path" type="gchar*"/>
-					<parameter name="cancellable" type="GCancellable*"/>
-				</parameters>
-			</constructor>
-			<method name="press_keycode" symbol="eekboard_context_press_keycode">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="context" type="EekboardContext*"/>
-					<parameter name="keycode" type="guint"/>
-					<parameter name="cancellable" type="GCancellable*"/>
-				</parameters>
-			</method>
-			<method name="release_keycode" symbol="eekboard_context_release_keycode">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="context" type="EekboardContext*"/>
-					<parameter name="keycode" type="guint"/>
-					<parameter name="cancellable" type="GCancellable*"/>
-				</parameters>
-			</method>
-			<method name="remove_keyboard" symbol="eekboard_context_remove_keyboard">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="context" type="EekboardContext*"/>
-					<parameter name="keyboard_id" type="guint"/>
-					<parameter name="cancellable" type="GCancellable*"/>
-				</parameters>
-			</method>
-			<method name="set_enabled" symbol="eekboard_context_set_enabled">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="context" type="EekboardContext*"/>
-					<parameter name="enabled" type="gboolean"/>
-				</parameters>
-			</method>
-			<method name="set_fullscreen" symbol="eekboard_context_set_fullscreen">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="context" type="EekboardContext*"/>
-					<parameter name="fullscreen" type="gboolean"/>
-					<parameter name="cancellable" type="GCancellable*"/>
-				</parameters>
-			</method>
-			<method name="set_group" symbol="eekboard_context_set_group">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="context" type="EekboardContext*"/>
-					<parameter name="group" type="gint"/>
-					<parameter name="cancellable" type="GCancellable*"/>
-				</parameters>
-			</method>
-			<method name="set_keyboard" symbol="eekboard_context_set_keyboard">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="context" type="EekboardContext*"/>
-					<parameter name="keyboard_id" type="guint"/>
-					<parameter name="cancellable" type="GCancellable*"/>
-				</parameters>
-			</method>
-			<method name="show_keyboard" symbol="eekboard_context_show_keyboard">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="context" type="EekboardContext*"/>
-					<parameter name="cancellable" type="GCancellable*"/>
-				</parameters>
-			</method>
-			<property name="visible" type="gboolean" readable="1" writable="0" construct="0" construct-only="0"/>
-			<signal name="destroyed" when="LAST">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="EekboardContext*"/>
-				</parameters>
-			</signal>
-			<signal name="disabled" when="LAST">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="EekboardContext*"/>
-				</parameters>
-			</signal>
-			<signal name="enabled" when="LAST">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="EekboardContext*"/>
-				</parameters>
-			</signal>
-			<signal name="key-pressed" when="LAST">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="EekboardContext*"/>
-					<parameter name="keyname" type="char*"/>
-					<parameter name="symbol" type="GObject*"/>
-					<parameter name="modifiers" type="guint"/>
-				</parameters>
-			</signal>
-		</object>
-		<object name="EekboardContextService" parent="GObject" type-name="EekboardContextService" get-type="eekboard_context_service_get_type">
-			<method name="disable" symbol="eekboard_context_service_disable">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="context" type="EekboardContextService*"/>
-				</parameters>
-			</method>
-			<method name="enable" symbol="eekboard_context_service_enable">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="context" type="EekboardContextService*"/>
-				</parameters>
-			</method>
-			<method name="get_client_name" symbol="eekboard_context_service_get_client_name">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="context" type="EekboardContextService*"/>
-				</parameters>
-			</method>
-			<method name="get_fullscreen" symbol="eekboard_context_service_get_fullscreen">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="context" type="EekboardContextService*"/>
-				</parameters>
-			</method>
-			<method name="get_keyboard" symbol="eekboard_context_service_get_keyboard">
-				<return-type type="EekKeyboard*"/>
-				<parameters>
-					<parameter name="context" type="EekboardContextService*"/>
-				</parameters>
-			</method>
-			<property name="client-name" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="connection" type="GDBusConnection*" readable="1" writable="1" construct="1" construct-only="0"/>
-			<property name="fullscreen" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="keyboard" type="EekKeyboard*" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="object-path" type="char*" readable="1" writable="1" construct="1" construct-only="0"/>
-			<property name="visible" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-			<signal name="disabled" when="LAST">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="EekboardContextService*"/>
-				</parameters>
-			</signal>
-			<signal name="enabled" when="LAST">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="EekboardContextService*"/>
-				</parameters>
-			</signal>
-			<vfunc name="create_keyboard">
-				<return-type type="EekKeyboard*"/>
-				<parameters>
-					<parameter name="self" type="EekboardContextService*"/>
-					<parameter name="keyboard_type" type="gchar*"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="hide_keyboard">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="EekboardContextService*"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="show_keyboard">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="EekboardContextService*"/>
-				</parameters>
-			</vfunc>
-		</object>
-		<object name="EekboardService" parent="GObject" type-name="EekboardService" get-type="eekboard_service_get_type">
-			<constructor name="new" symbol="eekboard_service_new">
-				<return-type type="EekboardService*"/>
-				<parameters>
-					<parameter name="object_path" type="gchar*"/>
-					<parameter name="connection" type="GDBusConnection*"/>
-				</parameters>
-			</constructor>
-			<property name="connection" type="GDBusConnection*" readable="1" writable="1" construct="1" construct-only="0"/>
-			<property name="object-path" type="char*" readable="1" writable="1" construct="1" construct-only="0"/>
-			<signal name="destroyed" when="LAST">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="object" type="EekboardService*"/>
-				</parameters>
-			</signal>
-			<vfunc name="create_context">
-				<return-type type="EekboardContextService*"/>
-				<parameters>
-					<parameter name="self" type="EekboardService*"/>
-					<parameter name="client_name" type="gchar*"/>
-					<parameter name="object_path" type="gchar*"/>
-				</parameters>
-			</vfunc>
-		</object>
-		<constant name="EEKBOARD_CLIENT_H" type="int" value="1"/>
-		<constant name="EEKBOARD_CONTEXT_H" type="int" value="1"/>
-		<constant name="EEKBOARD_CONTEXT_SERVICE_H" type="int" value="1"/>
-		<constant name="EEKBOARD_CONTEXT_SERVICE_INTERFACE" type="char*" value="org.fedorahosted.Eekboard.Context"/>
-		<constant name="EEKBOARD_CONTEXT_SERVICE_PATH" type="char*" value="/org/fedorahosted/Eekboard/Context_%d"/>
-		<constant name="EEKBOARD_SERVICE_H" type="int" value="1"/>
-		<constant name="EEKBOARD_SERVICE_INTERFACE" type="char*" value="org.fedorahosted.Eekboard"/>
-		<constant name="EEKBOARD_SERVICE_PATH" type="char*" value="/org/fedorahosted/Eekboard"/>
-		<constant name="EEKBOARD_XKLUTIL_H" type="int" value="1"/>
-	</namespace>
-</api>
--- a/bindings/vala/eekboard-0.90/eekboard-0.90.metadata
+++ b/bindings/vala/eekboard-0.90/eekboard-0.90.metadata
@@ -1 +0,0 @@
-Eekboard cheader_filename="eekboard/eekboard.h"
--- a/bindings/vala/eekboard-0.90/eekboard-0.90.namespace
+++ b/bindings/vala/eekboard-0.90/eekboard-0.90.namespace
@@ -1 +0,0 @@
-Eekboard
--- a/cargo.sh
+++ b/cargo.sh
@@ -0,0 +1,22 @@
+#!/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"
+
+# the 'run" command takes arguments at the end,
+# so --manifest-path must not be last
+CMD="$1"
+shift
+cargo "$CMD" --manifest-path "$CARGO_TARGET_DIR"/Cargo.toml "$@"
+
--- 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/configure.ac
+++ b/configure.ac
@@ -1,369 +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
-
-AC_PREREQ(2.63)
-dnl AC_CONFIG_SRCDIR([configure.ac])
-AC_CONFIG_MACRO_DIR([m4])
-
-AC_INIT([eekboard], [1.0.4], [ueno@unixuser.org])
-
-dnl Init automake
-AM_INIT_AUTOMAKE
-AM_MAINTAINER_MODE([enable])
-AC_GNU_SOURCE
-
-dnl Support silent build
-m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
-
-dnl Check for programs
-AC_PROG_CC
-AM_PROG_CC_C_O
-AC_PROG_CC_STDC
-AC_PROG_INSTALL
-AC_PROG_CXX
-
-# define PACKAGE_VERSION_* variables
-AM_DISABLE_STATIC
-AC_ISC_POSIX
-AC_HEADER_STDC
-LT_INIT
-IT_PROG_INTLTOOL([0.35.0])
-
-AC_MSG_CHECKING([which gtk+ version to compile against])
-AC_ARG_WITH([gtk],
-  [AS_HELP_STRING([--with-gtk=2.0|3.0],[which gtk+ version to compile against (default: 3.0)])],
-  [case "$with_gtk" in
-     2.0|3.0) ;;
-     *) AC_MSG_ERROR([invalid gtk version specified]) ;;
-   esac],
-  [with_gtk=3.0])
-AC_MSG_RESULT([$with_gtk])
-
-case "$with_gtk" in
-  2.0) GTK_API_VERSION=2.0
-       GTK_REQUIRED=2.14.0
-       EEK_API_VERSION=0.90
-       EEK_API_MAJOR_VERSION=0
-       EEK_API_MINOR_VERSION=90
-       EEK_API_PC_VERSION=0.90
-       EEK_LIBRARY_SUFFIX="-$EEK_API_VERSION"
-       ;;
-  3.0) GTK_API_VERSION=3.0
-       GTK_REQUIRED=2.91.0
-       EEK_API_VERSION=0.90
-       EEK_API_MAJOR_VERSION=0
-       EEK_API_MINOR_VERSION=90
-       EEK_API_PC_VERSION=0.90
-       EEK_LIBRARY_SUFFIX="-$EEK_API_VERSION"
-       ;;
-esac
-
-AC_SUBST([GTK_API_VERSION])
-AC_SUBST([EEK_API_VERSION])
-AC_SUBST([EEK_API_MAJOR_VERSION])
-AC_SUBST([EEK_API_MINOR_VERSION])
-AC_SUBST([EEK_API_PC_VERSION])
-AC_SUBST([EEK_LIBRARY_SUFFIX])
-AC_SUBST([EEK_LIBRARY_SUFFIX_U],[AS_TR_SH([$EEK_LIBRARY_SUFFIX])])
-
-AM_CONDITIONAL([HAVE_GTK_2],[test "$with_gtk" = "2.0"])
-AM_CONDITIONAL([HAVE_GTK_3],[test "$with_gtk" = "3.0"])
-
-AM_PATH_GLIB_2_0
-PKG_CHECK_MODULES([GLIB2], [glib-2.0 >= 2.26.0], ,
-  [AC_MSG_ERROR([GLib2 not found])])
-PKG_CHECK_MODULES([GIO2], [gio-2.0], ,
-  [AC_MSG_ERROR([Gio2 not found])])
-GLIB_GSETTINGS
-
-PKG_CHECK_MODULES([PANGOCAIRO], [pangocairo], ,
-  [AC_MSG_ERROR([PangoCairo not found])])
-PKG_CHECK_MODULES([GTK], [
-  gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
-  gdk-$GTK_API_VERSION >= $GTK_REQUIRED], ,
-  [AC_MSG_ERROR([GTK not found])])
-PKG_CHECK_MODULES([XKB], [x11], ,
-  [AC_MSG_ERROR([XKB support not found])])
-PKG_CHECK_MODULES([LIBXKLAVIER], [libxklavier x11], ,
-  [AC_MSG_ERROR([Libxklavier not found])])
-PKG_CHECK_MODULES([LIBCROCO], [libcroco-0.6], ,
-  [AC_MSG_ERROR([libcroco not found])])
-
-dnl use XTest to generate key events
-AC_MSG_CHECKING([whether you enable XTest])
-AC_ARG_ENABLE(xtest,
-              AS_HELP_STRING([--enable-xtest=no/yes],
-                             [Enable XTest default=yes]),
-              enable_xtest=$enableval,
-              enable_xtest=yes)
-
-if test x$enable_xtest = xyes; then
-  PKG_CHECK_MODULES([XTEST], [xtst], , enable_xtest=no)
-  if test x$enable_xtest = xyes; then
-    AC_DEFINE([HAVE_XTEST], [1], [Define if XTest is found])
-  fi
-fi
-AM_CONDITIONAL(ENABLE_XTEST, [test x$enable_xtest = xyes])
-AC_MSG_RESULT($enable_xtest)
-
-dnl use X to mark the fullscreen window as dock
-AC_MSG_CHECKING([whether you enable X dock])
-AC_ARG_ENABLE(x-dock,
-              AS_HELP_STRING([--enable-x-dock=no/yes],
-                             [Enable X dock default=yes]),
-              enable_x_dock=$enableval,
-              enable_x_dock=yes)
-
-if test x$enable_x_dock = xyes; then
-  PKG_CHECK_MODULES([XDOCK], [x11], , enable_x_dock=no)
-  if test x$enable_x_dock = xyes; then
-    AC_DEFINE([HAVE_XDOCK], [1], [Define if X dock is found])
-  fi
-fi
-AM_CONDITIONAL(ENABLE_XDOCK, [test x$enable_x_dock = xyes])
-AC_MSG_RESULT($enable_x_dock)
-
-focus_listeners=""
-keystroke_listeners=""
-
-focus_listeners=""
-keystroke_listeners=""
-
-dnl use AT-SPI 2 to capture focus/keystroke events
-AC_MSG_CHECKING([whether you enable AT-SPI 2 event handling])
-AC_ARG_ENABLE(atspi,
-              AS_HELP_STRING([--enable-atspi=no/yes],
-                             [Enable AT-SPI 2 event handling default=yes]),
-              enable_atspi=$enableval,
-              enable_atspi=yes)
-
-if test x$enable_atspi = xyes; then
-  PKG_CHECK_MODULES([ATSPI2], [atspi-2 dbus-glib-1], , enable_atspi=no)
-  if test x$enable_atspi = xyes; then
-    AC_DEFINE([HAVE_ATSPI], [1], [Define if AT-SPI 2 is found])
-    focus_listeners="atspi $focus_listeners"
-    keystroke_listeners="atspi $keystroke_listeners"
-  fi
-fi
-AC_MSG_RESULT($enable_atspi)
-AM_CONDITIONAL(ENABLE_ATSPI, [test x$enable_atspi = xyes])
-
-dnl use IBus to capture focus events
-AC_MSG_CHECKING([whether you enable IBus focus tracking])
-AC_ARG_ENABLE(ibus,
-              AS_HELP_STRING([--enable-ibus=no/yes],
-                             [Enable IBus focus tracking default=yes]),
-              enable_ibus=$enableval,
-              enable_ibus=yes)
-
-if test x$enable_ibus = xyes; then
-  PKG_CHECK_MODULES([IBUS], [ibus-1.0 >= 1.3.99], , enable_ibus=no)
-  if test x$enable_ibus = xyes; then
-    AC_DEFINE([HAVE_IBUS], [1], [Define if IBus is found])
-    focus_listeners="ibus $focus_listeners"
-  fi
-fi
-AC_MSG_RESULT($enable_ibus)
-AM_CONDITIONAL(ENABLE_IBUS, [test x$enable_ibus = xyes])
-
-if test -n "$focus_listeners"; then
-  AC_DEFINE(ENABLE_FOCUS_LISTENER, [1], [Define if eekboard can follow focus changes])
-fi
-
-dnl Python language binding
-AC_MSG_CHECKING([whether you enable Python language support])
-AC_ARG_ENABLE(python,
-              AS_HELP_STRING([--enable-python=no/yes],
-                             [Enable Python language binding default=yes]),
-              enable_python=$enableval,
-              enable_python=yes)
-
-dnl check python unconditionally to re-generate
-dnl eek/*-keysym-labels.txt when maintainer-mode enabled
-AM_PATH_PYTHON([2.5], , enable_python=no)
-
-if test x"$enable_python" = x"yes"; then
-  if test x$enable_python = xyes; then
-    AC_PATH_PROGS(PYTHON_CONFIG, [python$PYTHON_VERSION-config python-config])
-    if test x"$PYTHON_CONFIG" != x""; then
-      PYTHON_CFLAGS=`$PYTHON_CONFIG --includes`
-      PYTHON_LIBS=`$PYTHON_CONFIG --libs`
-    else
-      PYTHON_CFLAGS=`$PYTHON $srcdir/python-config.py --includes`
-      PYTHON_LIBS=`$PYTHON $srcdir/python-config.py --libs`
-    fi
-    PYTHON_INCLUDES="$PYTHON_CFLAGS"
-    AC_SUBST(PYTHON_CFLAGS)
-    AC_SUBST(PYTHON_INCLUDES)
-    AC_SUBST(PYTHON_LIBS)
-  fi
-fi
-
-AC_MSG_RESULT($enable_python)
-AM_CONDITIONAL(ENABLE_PYTHON, [test x$enable_python = xyes])
-
-GOBJECT_INTROSPECTION_CHECK([0.9.0])
-
-dnl Vala langauge binding
-AC_MSG_CHECKING([whether you enable Vala language support])
-AC_ARG_ENABLE(vala,
-              AS_HELP_STRING([--enable-vala=no/yes],
-                             [Enable Vala language binding default=yes]),
-              enable_vala=$enableval,
-              enable_vala=yes)
-if test x$enable_vala = xyes; then
-  if test "x$INTROSPECTION_SCANNER" = x; then
-    enable_vala=no
-    AC_MSG_WARN([GObject-Introspection must be enabled for Vala bindings])
-  fi
-
-  AM_PROG_VALAC([0.10.0])
-  have_vala=yes
-
-  AC_PATH_PROG(VALAC, valac, valac)
-  AC_SUBST(VALAC)
-  AC_SUBST(VALAFLAGS)
-
-  AC_PATH_PROG([VAPIGEN], [vapigen], [false])
-
-  if test "x$VAPIGEN" = "xfalse"; then
-    enable_vala=no
-    AC_MSG_WARN([vapigen not found. Was vala compiled with --enable-vapigen?])
-  fi
-
-  AC_SUBST(VAPIGEN)
-fi
-AC_MSG_RESULT($enable_vala)
-AM_CONDITIONAL(ENABLE_VALA, [test x$enable_vala = xyes])
-
-dnl clutter
-AC_MSG_CHECKING([whether you enable clutter])
-AC_ARG_ENABLE(clutter,
-              AS_HELP_STRING([--enable-clutter=no/yes],
-                             [Enable clutter user interface default=no]),
-              enable_clutter=$enableval,
-              enable_clutter=no)
-
-if test x$enable_clutter = xyes; then
-  PKG_CHECK_MODULES([CLUTTER], [clutter-1.0], , enable_clutter=no)
-  if test x$enable_clutter = xyes; then
-    AC_DEFINE([HAVE_CLUTTER], [1], [Define if clutter is found])
-  fi
-fi
-AM_CONDITIONAL(ENABLE_CLUTTER, [test x$enable_clutter = xyes])
-AC_MSG_RESULT($enable_clutter)
-
-dnl clutter-gtk
-if test x$enable_clutter = xyes; then
-  AC_MSG_CHECKING([whether you enable clutter-gtk])
-  AC_ARG_ENABLE(clutter-gtk,
-                AS_HELP_STRING([--enable-clutter-gtk=no/yes],
-                               [Enable clutter user interface default=yes]),
-                enable_clutter_gtk=$enableval,
-                enable_clutter_gtk=yes)
-
-  if test x$enable_clutter_gtk = xyes; then
-    PKG_CHECK_MODULES([CLUTTER_GTK], [clutter-gtk-1.0], ,
-      enable_clutter_gtk=no)
-    if test x$enable_clutter_gtk = xyes; then
-      AC_DEFINE([HAVE_CLUTTER_GTK], [1], [Define if Clutter-Gtk is found])
-    fi
-  fi
-  AC_MSG_RESULT($enable_clutter_gtk)
-fi
-AM_CONDITIONAL(ENABLE_CLUTTER_GTK, [test x$enable_clutter_gtk = xyes])
-
-dnl libcanberra
-AC_MSG_CHECKING([whether you enable libcanberra])
-AC_ARG_ENABLE(libcanberra,
-              AS_HELP_STRING([--enable-libcanberra=no/yes],
-                             [Enable clutter user interface default=no]),
-              enable_libcanberra=$enableval,
-              enable_libcanberra=yes)
-
-if test x$enable_libcanberra = xyes; then
-  PKG_CHECK_MODULES([LIBCANBERRA], [libcanberra-gtk3], , enable_libcanberra=no)
-  if test x$enable_libcanberra = xyes; then
-    AC_DEFINE([HAVE_LIBCANBERRA], [1], [Define if libcanberra is found])
-  fi
-fi
-AM_CONDITIONAL(ENABLE_LIBCANBERRA, [test x$enable_libcanberra = xyes])
-AC_MSG_RESULT($enable_libcanberra)
-
-GTK_DOC_CHECK([1.14],[--flavour no-tmpl])
-
-dnl define GETTEXT_* variables
-GETTEXT_PACKAGE=$PACKAGE
-AC_SUBST(GETTEXT_PACKAGE)
-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Define to the read-only architecture-independent data directory.])
-AM_GLIB_GNU_GETTEXT
-AM_GLIB_DEFINE_LOCALEDIR(EEKBOARD_LOCALEDIR)
-
-AC_CONFIG_HEADERS([config.h])
-AC_CONFIG_FILES([Makefile
-eek/Makefile
-eekboard/Makefile
-src/Makefile
-tests/Makefile
-bindings/Makefile
-bindings/python/Makefile
-bindings/python/eekboard/Makefile
-bindings/vala/Makefile
-docs/Makefile
-docs/reference/Makefile
-docs/reference/eek/Makefile
-docs/reference/eekboard/Makefile
-po/Makefile.in
-data/Makefile
-data/icons/Makefile
-data/icons/16x16/Makefile
-data/icons/22x22/Makefile
-data/icons/24x24/Makefile
-data/icons/32x32/Makefile
-data/icons/48x48/Makefile
-data/icons/scalable/Makefile
-data/themes/Makefile
-data/keyboards/Makefile
-examples/Makefile
-examples/eekxml/Makefile
-examples/simple-client/Makefile
-eek/eek-${EEK_API_VERSION}.pc
-eek/eek-clutter-${EEK_API_VERSION}.pc
-eek/eek-gtk-${EEK_API_VERSION}.pc
-eek/eek-xkb-${EEK_API_VERSION}.pc
-eek/eek-xkl-${EEK_API_VERSION}.pc
-eekboard/eekboard-${EEK_API_VERSION}.pc])
-AC_OUTPUT
-AC_MSG_RESULT([
-Build options:
-  Version                   $VERSION
-  Install prefix            $prefix
-  Build shared libs         $enable_shared
-  Build static libs         $enable_static
-  CFLAGS                    $CFLAGS
-  GTK version               $with_gtk
-  Build Clutter UI          $enable_clutter
-  Build Vala binding        $enable_vala
-  Build Python binding      $enable_python
-  Sound support             $enable_libcanberra
-  Build document            $enable_gtk_doc
-  Focus listeners           $focus_listeners
-  Keystroke listeners       $keystroke_listeners
-])
-
-
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,34 +0,0 @@
-SUBDIRS = icons themes keyboards
-
-@GSETTINGS_RULES@
-@INTLTOOL_XML_NOMERGE_RULE@
-gsettings_schemas_in_files = org.fedorahosted.eekboard.gschema.xml.in
-gsettings_SCHEMAS = $(gsettings_schemas_in_files:.gschema.xml.in=.gschema.xml)
-
-servicedir       = $(datadir)/dbus-1/services
-service_in_files = eekboard-server.service.in
-service_DATA     = $(service_in_files:.service.in=.service)
-
-$(service_DATA): $(service_in_files) Makefile
-	$(AM_V_GEN) sed -e "s|\@bindir\@|$(bindir)|" $< > $@
-
-desktopdir = $(datadir)/applications
-desktop_in_files = eekboard.desktop.in
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-
-if ENABLE_ATSPI
-autostartdir	 = $(sysconfdir)/xdg/autostart
-autostart_in_files = eekboard-autostart.desktop.in
-autostart_DATA   = $(autostart_in_files:.desktop.in=.desktop)
-endif
-
-@INTLTOOL_DESKTOP_RULE@
-
-CLEANFILES = $(service_DATA) $(desktop_DATA) $(gsettings_SCHEMAS)
-EXTRA_DIST = $(service_in_files) $(desktop_in_files) $(gsettings_schemas_in_files)
-
-if ENABLE_ATSPI
-CLEANFILES += $(autostart_DATA)
-EXTRA_DIST += $(autostart_in_files)
-endif
-
--- a/data/dbus/sm.puri.OSK0.xml
+++ b/data/dbus/sm.puri.OSK0.xml
@@ -0,0 +1,20 @@
+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
+"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<node xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd">
+  <interface name="sm.puri.OSK0">
+    <method name="SetVisible">
+      <arg name="visible" type="b" direction="in"/>
+      <doc:doc><doc:description>
+        Switch keyboard visibility
+      </doc:description></doc:doc>
+    </method>
+    <method name="GetVisible">
+      <arg name="visible" type="b" direction="out"/>
+      <doc:doc><doc:description>
+        Get keyboard visibility
+      </doc:description></doc:doc>
+    </method>
+    <property name="Visible" type="b" access="read">
+    </property>
+  </interface>
+</node>
--- 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/icons/16x16/Makefile.am
+++ b/data/icons/16x16/Makefile.am
@@ -1,16 +0,0 @@
-size = 16x16
-
-icondir = $(datadir)/icons/hicolor/$(size)/apps
-dist_icon_DATA = eekboard.png
-
-gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
-
-install-data-hook:
-	@-if test -z "$(DESTDIR)"; then			\
-		echo "Updating Gtk icon cache.";	\
-		$(gtk_update_icon_cache);		\
-	else						\
-		echo "*** Icon cache not updated.  After install, run this:"; \
-		echo "***   $(gtk_update_icon_cache)";	\
-	fi
-
--- a/data/icons/16x16/eekboard.png
+++ b/data/icons/16x16/eekboard.png
--- a/data/icons/22x22/Makefile.am
+++ b/data/icons/22x22/Makefile.am
@@ -1,16 +0,0 @@
-size = 22x22
-
-icondir = $(datadir)/icons/hicolor/$(size)/apps
-dist_icon_DATA = eekboard.png
-
-gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
-
-install-data-hook:
-	@-if test -z "$(DESTDIR)"; then			\
-		echo "Updating Gtk icon cache.";	\
-		$(gtk_update_icon_cache);		\
-	else						\
-		echo "*** Icon cache not updated.  After install, run this:"; \
-		echo "***   $(gtk_update_icon_cache)";	\
-	fi
-
--- a/data/icons/22x22/eekboard.png
+++ b/data/icons/22x22/eekboard.png
--- a/data/icons/24x24/Makefile.am
+++ b/data/icons/24x24/Makefile.am
@@ -1,16 +0,0 @@
-size = 24x24
-
-icondir = $(datadir)/icons/hicolor/$(size)/apps
-dist_icon_DATA = eekboard.png
-
-gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
-
-install-data-hook:
-	@-if test -z "$(DESTDIR)"; then			\
-		echo "Updating Gtk icon cache.";	\
-		$(gtk_update_icon_cache);		\
-	else						\
-		echo "*** Icon cache not updated.  After install, run this:"; \
-		echo "***   $(gtk_update_icon_cache)";	\
-	fi
-
--- a/data/icons/24x24/eekboard.png
+++ b/data/icons/24x24/eekboard.png
--- a/data/icons/32x32/Makefile.am
+++ b/data/icons/32x32/Makefile.am
@@ -1,16 +0,0 @@
-size = 32x32
-
-icondir = $(datadir)/icons/hicolor/$(size)/apps
-dist_icon_DATA = eekboard.png
-
-gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
-
-install-data-hook:
-	@-if test -z "$(DESTDIR)"; then			\
-		echo "Updating Gtk icon cache.";	\
-		$(gtk_update_icon_cache);		\
-	else						\
-		echo "*** Icon cache not updated.  After install, run this:"; \
-		echo "***   $(gtk_update_icon_cache)";	\
-	fi
-
--- a/data/icons/32x32/eekboard.png
+++ b/data/icons/32x32/eekboard.png
--- a/data/icons/48x48/Makefile.am
+++ b/data/icons/48x48/Makefile.am
@@ -1,16 +0,0 @@
-size = 48x48
-
-icondir = $(datadir)/icons/hicolor/$(size)/apps
-dist_icon_DATA = eekboard.png
-
-gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
-
-install-data-hook:
-	@-if test -z "$(DESTDIR)"; then			\
-		echo "Updating Gtk icon cache.";	\
-		$(gtk_update_icon_cache);		\
-	else						\
-		echo "*** Icon cache not updated.  After install, run this:"; \
-		echo "***   $(gtk_update_icon_cache)";	\
-	fi
-
--- a/data/icons/48x48/eekboard.png
+++ b/data/icons/48x48/eekboard.png
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -1 +0,0 @@
-SUBDIRS = 16x16 22x22 24x24 32x32 48x48 scalable
--- a/data/icons/key-enter.svg
+++ b/data/icons/key-enter.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"
+     version="1.1" viewBox="0 0 24 24">
+   
+    <path d="M 24,1 L 24,10 C 24,15 20,17 17,17 L 7,17 L 10,20 L 10,23
+             L 7,23 L 0,15 L 7,7 L 10,7 L 10,10 L 7,13 L 17,13
+             C 19,13 20,12 20,10 L 20,1 Z"
+          stroke="none" fill="black" />
+</svg>
--- a/data/icons/key-shift.svg
+++ b/data/icons/key-shift.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"
+     version="1.1" viewBox="0 0 24 24">
+   
+    <path d="M 12,2 L 22,14 L 16,14 L 16,22 L 8,22 L 8,14 L 2,14 Z"
+          stroke="none" fill="black" />
+</svg>
--- a/data/icons/keyboard-mode-symbolic.svg
+++ b/data/icons/keyboard-mode-symbolic.svg
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   id="svg4043"
+   version="1.1"
+   viewBox="0 0 4.2333331 4.2333093"
+   height="4.2333093mm"
+   width="4.2333331mm">
+  <defs
+     id="defs4037" />
+  <metadata
+     id="metadata4040">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(-86.329776,-68.097636)"
+     id="layer1">
+    <g
+       style="stroke-width:1.00004983;fill:#2e3436;fill-opacity:1"
+       transform="matrix(0.99990029,0,0,1,-7.1823833,-1.8799927)"
+       id="g842">
+      <g
+         style="stroke-width:1.00004983;fill:#2e3436;fill-opacity:1"
+         id="g836">
+        <path
+           id="path5166"
+           d="m 95.636719,69.978516 c -1.165869,0 -2.115235,0.949365 -2.115235,2.115234 0,1.165869 0.949366,2.117188 2.115235,2.117188 1.165869,0 2.117187,-0.951319 2.117187,-2.117188 0,-1.165869 -0.951318,-2.115234 -2.117187,-2.115234 z m 0,0.529296 c 0.879886,0 1.58789,0.706052 1.58789,1.585938 0,0.879886 -0.708004,1.587891 -1.58789,1.587891 -0.879886,0 -1.585938,-0.708005 -1.585938,-1.587891 0,-0.879886 0.706052,-1.585937 1.585938,-1.585938 z"
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#2e3436;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.52919304;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+      </g>
+      <path
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#2e3436;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.26459652;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="m 95.636719,70.109375 c -0.144398,0 -0.27248,0.07793 -0.373047,0.189453 -0.100567,0.111521 -0.18209,0.261405 -0.25,0.439453 -0.135821,0.356096 -0.214844,0.830395 -0.214844,1.355469 0,0.525074 0.07902,1.001326 0.214844,1.357422 0.06791,0.178048 0.149433,0.327932 0.25,0.439453 0.100567,0.111521 0.228649,0.1875 0.373047,0.1875 0.144397,0 0.27248,-0.07598 0.373047,-0.1875 0.100566,-0.111521 0.182089,-0.261405 0.25,-0.439453 0.135821,-0.356096 0.216797,-0.832348 0.216796,-1.357422 0,-0.525074 -0.08097,-0.999373 -0.216796,-1.355469 -0.06791,-0.178048 -0.149434,-0.327932 -0.25,-0.439453 -0.100567,-0.111521 -0.22865,-0.189453 -0.373047,-0.189453 z m 0,0.265625 c 0.05067,0 0.109272,0.02564 0.177734,0.101562 0.06846,0.07592 0.139293,0.198356 0.199219,0.355469 0.119851,0.314227 0.197266,0.763915 0.197266,1.261719 0,0.497804 -0.07742,0.949446 -0.197266,1.263672 -0.05993,0.157113 -0.130756,0.279549 -0.199219,0.355469 -0.06846,0.07592 -0.12706,0.101562 -0.177734,0.101562 -0.05067,0 -0.107319,-0.02564 -0.175781,-0.101562 -0.06846,-0.07592 -0.139294,-0.198356 -0.199219,-0.355469 C 95.141867,73.043196 95.0625,72.591554 95.0625,72.09375 c 0,-0.497804 0.07937,-0.947492 0.199219,-1.261719 0.05993,-0.157113 0.130756,-0.279549 0.199219,-0.355469 C 95.5294,70.400643 95.586045,70.375 95.636719,70.375 Z"
+         id="circle5168" />
+      <path
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#2e3436;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.26459652;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="m 93.697266,71.962891 v 0.263671 h 3.96875 v -0.263671 z"
+         id="path5170" />
+    </g>
+  </g>
+</svg>
--- a/data/icons/scalable/Makefile.am
+++ b/data/icons/scalable/Makefile.am
@@ -1,14 +0,0 @@
-icondir = $(datadir)/icons/hicolor/scalable/apps
-dist_icon_DATA = eekboard.svg
-
-gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
-
-install-data-hook:
-	@-if test -z "$(DESTDIR)"; then			\
-		echo "Updating Gtk icon cache.";	\
-		$(gtk_update_icon_cache);		\
-	else						\
-		echo "*** Icon cache not updated.  After install, run this:"; \
-		echo "***   $(gtk_update_icon_cache)";	\
-	fi
-
--- a/data/icons/scalable/eekboard.svg
+++ b/data/icons/scalable/eekboard.svg
--- a/data/keyboards/Makefile.am
+++ b/data/keyboards/Makefile.am
@@ -1,32 +0,0 @@
-keyboarddir = $(pkgdatadir)/keyboards
-dist_keyboard_DATA =				\
-	ar.xml					\
-	be.xml					\
-	fa.xml					\
-	he.xml					\
-	jp-kana.xml				\
-	kk.xml					\
-	ks.xml					\
-	my.xml					\
-	ru.xml					\
-	th.xml					\
-	ua.xml					\
-	ug.xml					\
-	us.xml					\
-	zh-bopomofo.xml				\
-	$(inscript_keyboards)
-inscript_keyboards =				\
-	as-inscript.xml				\
-	bn-inscript.xml				\
-	gu-inscript.xml				\
-	hi-inscript.xml				\
-	kn-inscript.xml				\
-	ks-inscript.xml				\
-	mai-inscript.xml			\
-	ml-inscript.xml				\
-	mr-inscript.xml				\
-	or-inscript.xml				\
-	pa-inscript.xml				\
-	sd-inscript.xml				\
-	ta-inscript.xml				\
-	te-inscript.xml
--- a/data/keyboards/ar.xml
+++ b/data/keyboards/ar.xml
@@ -1,683 +0,0 @@
-<?xml version="1.0"?>
-<keyboard version="0.90">
-    <bounds>0.000000,0.000000,640.000000,296.585366</bounds>
-    <section>
-        <bounds>15.609756,15.609756,640.000000,39.024390</bounds>
-        <angle>0</angle>
-        <row>
-            <columns>16</columns>
-            <orientation>1</orientation>
-        </row>
-        <key id="keycode9" name="keycode9" column="0" row="0">
-            <bounds>3.121951,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="Escape" label="Esc" category="keyname" keyval="65307">Escape</keysym>
-            </symbols>
-        </key>
-        <key id="keycode67" name="keycode67" column="1" row="0">
-            <bounds>84.292683,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F1" label="F1" category="function" keyval="65470">F1</keysym>
-            </symbols>
-        </key>
-        <key id="keycode68" name="keycode68" column="2" row="0">
-            <bounds>124.878049,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F2" label="F2" category="function" keyval="65471">F2</keysym>
-            </symbols>
-        </key>
-        <key id="keycode69" name="keycode69" column="3" row="0">
-            <bounds>165.463415,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F3" label="F3" category="function" keyval="65472">F3</keysym>
-            </symbols>
-        </key>
-        <key id="keycode70" name="keycode70" column="4" row="0">
-            <bounds>206.048780,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F4" label="F4" category="function" keyval="65473">F4</keysym>
-            </symbols>
-        </key>
-        <key id="keycode71" name="keycode71" column="5" row="0">
-            <bounds>266.926829,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F5" label="F5" category="function" keyval="65474">F5</keysym>
-            </symbols>
-        </key>
-        <key id="keycode72" name="keycode72" column="6" row="0">
-            <bounds>307.512195,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F6" label="F6" category="function" keyval="65475">F6</keysym>
-            </symbols>
-        </key>
-        <key id="keycode73" name="keycode73" column="7" row="0">
-            <bounds>348.097561,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F7" label="F7" category="function" keyval="65476">F7</keysym>
-            </symbols>
-        </key>
-        <key id="keycode74" name="keycode74" column="8" row="0">
-            <bounds>388.682927,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F8" label="F8" category="function" keyval="65477">F8</keysym>
-            </symbols>
-        </key>
-        <key id="keycode75" name="keycode75" column="9" row="0">
-            <bounds>449.560976,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F9" label="F9" category="function" keyval="65478">F9</keysym>
-            </symbols>
-        </key>
-        <key id="keycode76" name="keycode76" column="10" row="0">
-            <bounds>490.146341,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F10" label="F10" category="function" keyval="65479">F10</keysym>
-            </symbols>
-        </key>
-        <key id="keycode95" name="keycode95" column="11" row="0">
-            <bounds>530.731707,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F11" label="F11" category="function" keyval="65480">F11</keysym>
-            </symbols>
-        </key>
-        <key id="keycode96" name="keycode96" column="12" row="0">
-            <bounds>571.317073,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F12" label="F12" category="function" keyval="65481">F12</keysym>
-            </symbols>
-        </key>
-    </section>
-    <section>
-        <bounds>15.609756,78.048780,608.780488,201.365854</bounds>
-        <angle>0</angle>
-        <row>
-            <columns>14</columns>
-            <orientation>1</orientation>
-        </row>
-        <row>
-            <columns>14</columns>
-            <orientation>1</orientation>
-        </row>
-        <row>
-            <columns>13</columns>
-            <orientation>1</orientation>
-        </row>
-        <row>
-            <columns>12</columns>
-            <orientation>1</orientation>
-        </row>
-        <row>
-            <columns>8</columns>
-            <orientation>1</orientation>
-        </row>
-        <key id="keycode49" name="keycode49" column="0" row="0">
-            <bounds>3.121951,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <keysym name="quoteleft" label="`" category="letter" keyval="96">quoteleft</keysym>
-                <text name="asciitilde" label="ّ" category="letter">ّ</text>
-            </symbols>
-        </key>
-        <key id="keycode10" name="keycode10" column="1" row="0">
-            <bounds>43.707317,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="1" label="١" category="letter">١</text>
-                <keysym name="exclam" label="!" category="letter" keyval="33">exclam</keysym>
-            </symbols>
-        </key>
-        <key id="keycode11" name="keycode11" column="2" row="0">
-            <bounds>84.292683,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="2" label="٢" category="letter">٢</text>
-                <keysym name="at" label="@" category="letter" keyval="64">at</keysym>
-            </symbols>
-        </key>
-        <key id="keycode12" name="keycode12" column="3" row="0">
-            <bounds>124.878049,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="3" label="٣" category="letter">٣</text>
-                <keysym name="numbersign" label="#" category="letter" keyval="35">numbersign</keysym>
-            </symbols>
-        </key>
-        <key id="keycode13" name="keycode13" column="4" row="0">
-            <bounds>165.463415,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="4" label="٤" category="letter">٤</text>
-                <keysym name="dollar" label="$" category="letter" keyval="36">dollar</keysym>
-            </symbols>
-        </key>
-        <key id="keycode14" name="keycode14" column="5" row="0">
-            <bounds>206.048780,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="3">
-                <text name="5" label="٥" category="letter">٥</text>
-                <keysym name="percent" label="%" category="letter" keyval="37">percent</keysym>
-                <keysym name="EuroSign" label="€" category="letter" keyval="8364">EuroSign</keysym>
-            </symbols>
-        </key>
-        <key id="keycode15" name="keycode15" column="6" row="0">
-            <bounds>245.073171,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="6" label="٦" category="letter">٦</text>
-                <keysym name="asciicircum" label="^" category="letter" keyval="94">asciicircum</keysym>
-            </symbols>
-        </key>
-        <key id="keycode16" name="keycode16" column="7" row="0">
-            <bounds>285.658537,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="7" label="٧" category="letter">٧</text>
-                <keysym name="ampersand" label="&amp;" category="letter" keyval="38">ampersand</keysym>
-            </symbols>
-        </key>
-        <key id="keycode17" name="keycode17" column="8" row="0">
-            <bounds>326.243902,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="8" label="٨" category="letter">٨</text>
-                <keysym name="asterisk" label="*" category="letter" keyval="42">asterisk</keysym>
-            </symbols>
-        </key>
-        <key id="keycode18" name="keycode18" column="9" row="0">
-            <bounds>366.829268,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="9" label="٩" category="letter">٩</text>
-                <text name="parenleft" label=")" category="letter">)</text>
-            </symbols>
-        </key>
-        <key id="keycode19" name="keycode19" column="10" row="0">
-            <bounds>407.414634,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="0" label="٠" category="letter">٠</text>
-                <text name="parenright" label="(" category="letter">(</text>
-            </symbols>
-        </key>
-        <key id="keycode20" name="keycode20" column="11" row="0">
-            <bounds>448.000000,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <keysym name="minus" label="-" category="letter" keyval="45">minus</keysym>
-                <keysym name="underscore" label="_" category="letter" keyval="95">underscore</keysym>
-            </symbols>
-        </key>
-        <key id="keycode21" name="keycode21" column="12" row="0">
-            <bounds>488.585366,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <keysym name="equal" label="=" category="letter" keyval="61">equal</keysym>
-                <keysym name="plus" label="+" category="letter" keyval="43">plus</keysym>
-            </symbols>
-        </key>
-        <key id="keycode22" name="keycode22" column="13" row="0">
-            <bounds>529.170732,1.560976,79.609756,37.463415</bounds>
-            <oref>outline4</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="BackSpace" label="←" category="keyname" keyval="65288">BackSpace</keysym>
-            </symbols>
-        </key>
-        <key id="keycode23" name="keycode23" column="0" row="1">
-            <bounds>3.121951,42.146341,59.317073,37.463415</bounds>
-            <oref>outline5</oref>
-            <symbols groups="1" levels="2">
-                <keysym name="Tab" label="⇥" category="keyname" keyval="65289">Tab</keysym>
-                <keysym name="ISO_Left_Tab" label="⇤" category="keyname" keyval="65056">ISO_Left_Tab</keysym>
-            </symbols>
-        </key>
-        <key id="keycode24" name="keycode24" column="1" row="1">
-            <bounds>65.560976,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="q" label="ض" category="letter">ض</text>
-                <text name="Q" label="َ" category="letter">َ</text>
-            </symbols>
-        </key>
-        <key id="keycode25" name="keycode25" column="2" row="1">
-            <bounds>106.146341,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="w" label="ص" category="letter">ص</text>
-                <text name="W" label="ً" category="letter">ً</text>
-            </symbols>
-        </key>
-        <key id="keycode26" name="keycode26" column="3" row="1">
-            <bounds>145.170732,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="e" label="ث" category="letter">ث</text>
-                <text name="E" label="ُ" category="letter">ُ</text>
-            </symbols>
-        </key>
-        <key id="keycode27" name="keycode27" column="4" row="1">
-            <bounds>185.756098,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="r" label="ق" category="letter">ق</text>
-                <text name="R" label="ٌ" category="letter">ٌ</text>
-            </symbols>
-        </key>
-        <key id="keycode28" name="keycode28" column="5" row="1">
-            <bounds>226.341463,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="t" label="ف" category="letter">ف</text>
-                <text name="T" label="لإ" category="letter">لإ</text>
-            </symbols>
-        </key>
-        <key id="keycode29" name="keycode29" column="6" row="1">
-            <bounds>266.926829,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="y" label="غ" category="letter">غ</text>
-                <text name="Y" label="إ" category="letter">إ</text>
-            </symbols>
-        </key>
-        <key id="keycode30" name="keycode30" column="7" row="1">
-            <bounds>307.512195,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="u" label="ع" category="letter">ع</text>
-                <text name="U" label="`" category="letter">`</text>
-            </symbols>
-        </key>
-        <key id="keycode31" name="keycode31" column="8" row="1">
-            <bounds>348.097561,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="i" label="ه" category="letter">ه</text>
-                <text name="I" label="÷" category="letter">÷</text>
-            </symbols>
-        </key>
-        <key id="keycode32" name="keycode32" column="9" row="1">
-            <bounds>388.682927,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="o" label="خ" category="letter">خ</text>
-                <text name="O" label="×" category="letter">×</text>
-            </symbols>
-        </key>
-        <key id="keycode33" name="keycode33" column="10" row="1">
-            <bounds>429.268293,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="p" label="ح" category="letter">ح</text>
-                <text name="P" label="؛" category="letter">؛</text>
-            </symbols>
-        </key>
-        <key id="keycode34" name="keycode34" column="11" row="1">
-            <bounds>468.292683,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="bracketleft" label="ج" category="letter">ج</text>
-                <text name="braceleft" label="&gt;" category="letter">&gt;</text>
-            </symbols>
-        </key>
-        <key id="keycode35" name="keycode35" column="12" row="1">
-            <bounds>508.878049,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="bracketright" label="د" category="letter">د</text>
-                <text name="braceright" label="&lt;" category="letter">&lt;</text>
-            </symbols>
-        </key>
-        <key id="keycode51" name="keycode51" column="13" row="1">
-            <bounds>549.463415,42.146341,59.317073,37.463415</bounds>
-            <oref>outline6</oref>
-            <symbols groups="1" levels="2">
-                <keysym name="backslash" label="\" category="letter" keyval="92">backslash</keysym>
-                <keysym name="bar" label="|" category="letter" keyval="124">bar</keysym>
-            </symbols>
-        </key>
-        <key id="keycode66" name="keycode66" column="0" row="2">
-            <bounds>3.121951,82.731707,68.682927,37.463415</bounds>
-            <oref>outline7</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="ISO_Level3_Shift" label="⇮" category="keyname" keyval="65027">ISO_Level3_Shift</keysym>
-            </symbols>
-        </key>
-        <key id="keycode38" name="keycode38" column="1" row="2">
-            <bounds>76.487805,82.731707,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="a" label="ش" category="letter">ش</text>
-                <text name="A" label="ِ" category="letter">ِ</text>
-            </symbols>
-        </key>
-        <key id="keycode39" name="keycode39" column="2" row="2">
-            <bounds>115.512195,82.731707,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="s" label="س" category="letter">س</text>
-                <text name="S" label="ٍ" category="letter">ٍ</text>
-            </symbols>
-        </key>
-        <key id="keycode40" name="keycode40" column="3" row="2">
-            <bounds>156.097561,82.731707,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="d" label="ي" category="letter">ي</text>
-                <text name="D" label="]" category="letter">]</text>
-            </symbols>
-        </key>
-        <key id="keycode41" name="keycode41" column="4" row="2">
-            <bounds>196.682927,82.731707,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="f" label="ب" category="letter">ب</text>
-                <text name="F" label="[" category="letter">[</text>
-            </symbols>
-        </key>
-        <key id="keycode42" name="keycode42" column="5" row="2">
-            <bounds>237.268293,82.731707,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="g" label="ل" category="letter">ل</text>
-                <text name="G" label="لأ" category="letter">لأ</text>
-            </symbols>
-        </key>
-        <key id="keycode43" name="keycode43" column="6" row="2">
-            <bounds>277.853659,82.731707,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="h" label="ا" category="letter">ا</text>
-                <text name="H" label="أ" category="letter">أ</text>
-            </symbols>
-        </key>
-        <key id="keycode44" name="keycode44" column="7" row="2">
-            <bounds>318.439024,82.731707,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="j" label="ت" category="letter">ت</text>
-                <text name="J" label="ـ" category="letter">ـ</text>
-            </symbols>
-        </key>
-        <key id="keycode45" name="keycode45" column="8" row="2">
-            <bounds>359.024390,82.731707,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="k" label="ن" category="letter">ن</text>
-                <text name="K" label="،" category="letter">،</text>
-            </symbols>
-        </key>
-        <key id="keycode46" name="keycode46" column="9" row="2">
-            <bounds>399.609756,82.731707,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="l" label="م" category="letter">م</text>
-                <text name="L" label="/" category="letter">/</text>
-            </symbols>
-        </key>
-        <key id="keycode47" name="keycode47" column="10" row="2">
-            <bounds>438.634146,82.731707,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="semicolon" label="ك" category="letter">ك</text>
-                <keysym name="colon" label=":" category="letter" keyval="58">colon</keysym>
-            </symbols>
-        </key>
-        <key id="keycode48" name="keycode48" column="11" row="2">
-            <bounds>479.219512,82.731707,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <keysym name="quoteright" label="&apos;" category="letter" keyval="39">quoteright</keysym>
-                <keysym name="quotedbl" label="&quot;" category="letter" keyval="34">quotedbl</keysym>
-            </symbols>
-        </key>
-        <key id="keycode36" name="keycode36" column="12" row="2">
-            <bounds>519.804878,82.731707,88.975610,37.463415</bounds>
-            <oref>outline8</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="Return" label="↵" category="keyname" keyval="65293">Return</keysym>
-            </symbols>
-        </key>
-        <key id="keycode50" name="keycode50" column="0" row="3">
-            <bounds>3.121951,121.756098,88.975610,37.463415</bounds>
-            <oref>outline9</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="Shift_L" label="⇧" category="keyname" keyval="65505">Shift_L</keysym>
-            </symbols>
-        </key>
-        <key id="keycode52" name="keycode52" column="1" row="3">
-            <bounds>95.219512,121.756098,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="z" label="ئ" category="letter">ئ</text>
-                <text name="Z" label="~" category="letter">~</text>
-            </symbols>
-        </key>
-        <key id="keycode53" name="keycode53" column="2" row="3">
-            <bounds>135.804878,121.756098,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="x" label="ء" category="letter">ء</text>
-                <text name="X" label="ْ" category="letter">ْ</text>
-            </symbols>
-        </key>
-        <key id="keycode54" name="keycode54" column="3" row="3">
-            <bounds>176.390244,121.756098,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="c" label="ؤ" category="letter">ؤ</text>
-                <text name="C" label="}" category="letter">}</text>
-            </symbols>
-        </key>
-        <key id="keycode55" name="keycode55" column="4" row="3">
-            <bounds>215.414634,121.756098,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="v" label="ر" category="letter">ر</text>
-                <text name="V" label="{" category="letter">{</text>
-            </symbols>
-        </key>
-        <key id="keycode56" name="keycode56" column="5" row="3">
-            <bounds>256.000000,121.756098,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="b" label="لا" category="letter">لا</text>
-                <text name="B" label="لآ" category="letter">لآ</text>
-            </symbols>
-        </key>
-        <key id="keycode57" name="keycode57" column="6" row="3">
-            <bounds>296.585366,121.756098,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="n" label="ى" category="letter">ى</text>
-                <text name="N" label="آ" category="letter">آ</text>
-            </symbols>
-        </key>
-        <key id="keycode58" name="keycode58" column="7" row="3">
-            <bounds>337.170732,121.756098,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="m" label="ة" category="letter">ة</text>
-                <text name="M" label="&apos;" category="letter">&apos;</text>
-            </symbols>
-        </key>
-        <key id="keycode59" name="keycode59" column="8" row="3">
-            <bounds>377.756098,121.756098,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="comma" label="و" category="letter">و</text>
-                <text name="less" label="," category="letter">,</text>
-            </symbols>
-        </key>
-        <key id="keycode60" name="keycode60" column="9" row="3">
-            <bounds>418.341463,121.756098,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="period" label="ز" category="letter">ز</text>
-                <text name="greater" label="." category="letter">.</text>
-            </symbols>
-        </key>
-        <key id="keycode61" name="keycode61" column="10" row="3">
-            <bounds>458.926829,121.756098,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="slash" label="ظ" category="letter">ظ</text>
-                <text name="question" label="؟" category="letter">؟</text>
-            </symbols>
-        </key>
-        <key id="keycode62" name="keycode62" column="11" row="3">
-            <bounds>499.512195,121.756098,109.268293,37.463415</bounds>
-            <oref>outline10</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="Shift_R" label="⇧" category="keyname" keyval="65506">Shift_R</keysym>
-            </symbols>
-        </key>
-        <key id="keycode37" name="keycode37" column="0" row="4">
-            <bounds>3.121951,162.341463,56.195122,37.463415</bounds>
-            <oref>outline1</oref>
-            <symbols groups="1" levels="2">
-                <symbol name="cycle-keyboard" icon="input-keyboard-symbolic" label="⌨" category="keyname">cycle-keyboard</symbol>
-                <symbol name="preferences" icon="preferences-system-symbolic" label="☺" category="keyname">preferences</symbol>
-            </symbols>
-        </key>
-        <key id="keycode133" name="keycode133" column="1" row="4">
-            <bounds>62.439024,162.341463,48.390244,37.463415</bounds>
-            <oref>outline2</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="Control_L" label="Ctrl" category="keyname" keyval="65507">Control_L</keysym>
-            </symbols>
-        </key>
-        <key id="keycode64" name="keycode64" column="2" row="4">
-            <bounds>113.951220,162.341463,48.390244,37.463415</bounds>
-            <oref>outline2</oref>
-            <symbols groups="1" levels="2">
-                <keysym name="Alt_L" label="Alt" category="keyname" keyval="65513">Alt_L</keysym>
-                <keysym name="Meta_L" label="Meta" category="keyname" keyval="65511">Meta_L</keysym>
-            </symbols>
-        </key>
-        <key id="keycode65" name="keycode65" column="3" row="4">
-            <bounds>165.463415,162.341463,238.829268,37.463415</bounds>
-            <oref>outline11</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="space" category="letter" keyval="32">space</keysym>
-            </symbols>
-        </key>
-        <key id="keycode108" name="keycode108" column="4" row="4">
-            <bounds>407.414634,162.341463,48.390244,37.463415</bounds>
-            <oref>outline2</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="Left" label="⇠" category="keyname" keyval="65361">Left</keysym>
-            </symbols>
-        </key>
-        <key id="keycode134" name="keycode134" column="5" row="4">
-            <bounds>458.926829,162.341463,48.390244,37.463415</bounds>
-            <oref>outline2</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="Up" label="⇡" category="keyname" keyval="65362">Up</keysym>
-            </symbols>
-        </key>
-        <key id="keycode135" name="keycode135" column="6" row="4">
-            <bounds>508.878049,162.341463,48.390244,37.463415</bounds>
-            <oref>outline2</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="Down" label="⇣" category="keyname" keyval="65364">Down</keysym>
-            </symbols>
-        </key>
-        <key id="keycode105" name="keycode105" column="7" row="4">
-            <bounds>560.390244,162.341463,48.390244,37.463415</bounds>
-            <oref>outline2</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="Right" label="⇢" category="keyname" keyval="65363">Right</keysym>
-            </symbols>
-        </key>
-    </section>
-    <outline id="outline1">
-        <corner-radius>1.000000</corner-radius>
-        <point>0.000000,0.000000</point>
-        <point>56.195122,0.000000</point>
-        <point>56.195122,37.463415</point>
-        <point>0.000000,37.463415</point>
-    </outline>
-    <outline id="outline3">
-        <corner-radius>1.000000</corner-radius>
-        <point>0.000000,0.000000</point>
-        <point>37.463415,0.000000</point>
-        <point>37.463415,37.463415</point>
-        <point>0.000000,37.463415</point>
-    </outline>
-    <outline id="outline4">
-        <corner-radius>1.000000</corner-radius>
-        <point>0.000000,0.000000</point>
-        <point>79.609756,0.000000</point>
-        <point>79.609756,37.463415</point>
-        <point>0.000000,37.463415</point>
-    </outline>
-    <outline id="outline5">
-        <corner-radius>1.000000</corner-radius>
-        <point>0.000000,0.000000</point>
-        <point>59.317073,0.000000</point>
-        <point>59.317073,37.463415</point>
-        <point>0.000000,37.463415</point>
-    </outline>
-    <outline id="outline6">
-        <corner-radius>1.000000</corner-radius>
-        <point>0.000000,0.000000</point>
-        <point>59.317073,0.000000</point>
-        <point>59.317073,37.463415</point>
-        <point>0.000000,37.463415</point>
-    </outline>
-    <outline id="outline7">
-        <corner-radius>1.000000</corner-radius>
-        <point>0.000000,0.000000</point>
-        <point>68.682927,0.000000</point>
-        <point>68.682927,37.463415</point>
-        <point>0.000000,37.463415</point>
-    </outline>
-    <outline id="outline8">
-        <corner-radius>1.000000</corner-radius>
-        <point>0.000000,0.000000</point>
-        <point>88.975610,0.000000</point>
-        <point>88.975610,37.463415</point>
-        <point>0.000000,37.463415</point>
-    </outline>
-    <outline id="outline9">
-        <corner-radius>1.000000</corner-radius>
-        <point>0.000000,0.000000</point>
-        <point>88.975610,0.000000</point>
-        <point>88.975610,37.463415</point>
-        <point>0.000000,37.463415</point>
-    </outline>
-    <outline id="outline10">
-        <corner-radius>1.000000</corner-radius>
-        <point>0.000000,0.000000</point>
-        <point>109.268293,0.000000</point>
-        <point>109.268293,37.463415</point>
-        <point>0.000000,37.463415</point>
-    </outline>
-    <outline id="outline11">
-        <corner-radius>1.000000</corner-radius>
-        <point>0.000000,0.000000</point>
-        <point>238.829268,0.000000</point>
-        <point>238.829268,37.463415</point>
-        <point>0.000000,37.463415</point>
-    </outline>
-    <outline id="outline2">
-        <corner-radius>1.000000</corner-radius>
-        <point>0.000000,0.000000</point>
-        <point>48.390244,0.000000</point>
-        <point>48.390244,37.463415</point>
-        <point>0.000000,37.463415</point>
-    </outline>
-</keyboard>
-
--- a/data/keyboards/as-inscript.xml
+++ b/data/keyboards/as-inscript.xml
@@ -1,683 +0,0 @@
-<?xml version="1.0"?>
-<keyboard version="0.90">
-    <bounds>0.000000,0.000000,640.000000,296.585366</bounds>
-    <section>
-        <bounds>15.609756,15.609756,640.000000,39.024390</bounds>
-        <angle>0</angle>
-        <row>
-            <columns>16</columns>
-            <orientation>1</orientation>
-        </row>
-        <key id="keycode9" name="keycode9" column="0" row="0">
-            <bounds>3.121951,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="Escape" label="Esc" category="keyname" keyval="65307">Escape</keysym>
-            </symbols>
-        </key>
-        <key id="keycode67" name="keycode67" column="1" row="0">
-            <bounds>84.292683,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F1" label="F1" category="function" keyval="65470">F1</keysym>
-            </symbols>
-        </key>
-        <key id="keycode68" name="keycode68" column="2" row="0">
-            <bounds>124.878049,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F2" label="F2" category="function" keyval="65471">F2</keysym>
-            </symbols>
-        </key>
-        <key id="keycode69" name="keycode69" column="3" row="0">
-            <bounds>165.463415,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F3" label="F3" category="function" keyval="65472">F3</keysym>
-            </symbols>
-        </key>
-        <key id="keycode70" name="keycode70" column="4" row="0">
-            <bounds>206.048780,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F4" label="F4" category="function" keyval="65473">F4</keysym>
-            </symbols>
-        </key>
-        <key id="keycode71" name="keycode71" column="5" row="0">
-            <bounds>266.926829,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F5" label="F5" category="function" keyval="65474">F5</keysym>
-            </symbols>
-        </key>
-        <key id="keycode72" name="keycode72" column="6" row="0">
-            <bounds>307.512195,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F6" label="F6" category="function" keyval="65475">F6</keysym>
-            </symbols>
-        </key>
-        <key id="keycode73" name="keycode73" column="7" row="0">
-            <bounds>348.097561,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F7" label="F7" category="function" keyval="65476">F7</keysym>
-            </symbols>
-        </key>
-        <key id="keycode74" name="keycode74" column="8" row="0">
-            <bounds>388.682927,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F8" label="F8" category="function" keyval="65477">F8</keysym>
-            </symbols>
-        </key>
-        <key id="keycode75" name="keycode75" column="9" row="0">
-            <bounds>449.560976,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F9" label="F9" category="function" keyval="65478">F9</keysym>
-            </symbols>
-        </key>
-        <key id="keycode76" name="keycode76" column="10" row="0">
-            <bounds>490.146341,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F10" label="F10" category="function" keyval="65479">F10</keysym>
-            </symbols>
-        </key>
-        <key id="keycode95" name="keycode95" column="11" row="0">
-            <bounds>530.731707,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F11" label="F11" category="function" keyval="65480">F11</keysym>
-            </symbols>
-        </key>
-        <key id="keycode96" name="keycode96" column="12" row="0">
-            <bounds>571.317073,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F12" label="F12" category="function" keyval="65481">F12</keysym>
-            </symbols>
-        </key>
-    </section>
-    <section>
-        <bounds>15.609756,78.048780,608.780488,201.365854</bounds>
-        <angle>0</angle>
-        <row>
-            <columns>14</columns>
-            <orientation>1</orientation>
-        </row>
-        <row>
-            <columns>14</columns>
-            <orientation>1</orientation>
-        </row>
-        <row>
-            <columns>13</columns>
-            <orientation>1</orientation>
-        </row>
-        <row>
-            <columns>12</columns>
-            <orientation>1</orientation>
-        </row>
-        <row>
-            <columns>8</columns>
-            <orientation>1</orientation>
-        </row>
-        <key id="keycode49" name="keycode49" column="0" row="0">
-            <bounds>3.121951,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <keysym name="quoteleft" label="`" category="letter" keyval="96">quoteleft</keysym>
-                <text name="asciitilde" label="~" category="letter">~</text>
-            </symbols>
-        </key>
-        <key id="keycode10" name="keycode10" column="1" row="0">
-            <bounds>43.707317,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="1" label="১" category="letter">১</text>
-                <text name="exclam" label="!" category="letter">!</text>
-            </symbols>
-        </key>
-        <key id="keycode11" name="keycode11" column="2" row="0">
-            <bounds>84.292683,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="2" label="২" category="letter">২</text>
-                <text name="at" label="@" category="letter">@</text>
-            </symbols>
-        </key>
-        <key id="keycode12" name="keycode12" column="3" row="0">
-            <bounds>124.878049,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="3" label="৩" category="letter">৩</text>
-                <text name="numbersign" label="্ৰ" category="letter">্ৰ</text>
-            </symbols>
-        </key>
-        <key id="keycode13" name="keycode13" column="4" row="0">
-            <bounds>165.463415,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="4" label="৪" category="letter">৪</text>
-                <text name="dollar" label="ৰ্" category="letter">ৰ্</text>
-            </symbols>
-        </key>
-        <key id="keycode14" name="keycode14" column="5" row="0">
-            <bounds>206.048780,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="3">
-                <text name="5" label="৫" category="letter">৫</text>
-                <text name="percent" label="জ্ঞ" category="letter">জ্ঞ</text>
-                <keysym name="EuroSign" label="€" category="letter" keyval="8364">EuroSign</keysym>
-            </symbols>
-        </key>
-        <key id="keycode15" name="keycode15" column="6" row="0">
-            <bounds>245.073171,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="6" label="৬" category="letter">৬</text>
-                <text name="asciicircum" label="ত্ৰ" category="letter">ত্ৰ</text>
-            </symbols>
-        </key>
-        <key id="keycode16" name="keycode16" column="7" row="0">
-            <bounds>285.658537,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="7" label="৭" category="letter">৭</text>
-                <text name="ampersand" label="ক্ষ" category="letter">ক্ষ</text>
-            </symbols>
-        </key>
-        <key id="keycode17" name="keycode17" column="8" row="0">
-            <bounds>326.243902,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="8" label="৮" category="letter">৮</text>
-                <text name="asterisk" label="শ্ৰ" category="letter">শ্ৰ</text>
-            </symbols>
-        </key>
-        <key id="keycode18" name="keycode18" column="9" row="0">
-            <bounds>366.829268,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="9" label="৯" category="letter">৯</text>
-                <text name="parenleft" label="(" category="letter">(</text>
-            </symbols>
-        </key>
-        <key id="keycode19" name="keycode19" column="10" row="0">
-            <bounds>407.414634,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="0" label="০" category="letter">০</text>
-                <text name="parenright" label=")" category="letter">)</text>
-            </symbols>
-        </key>
-        <key id="keycode20" name="keycode20" column="11" row="0">
-            <bounds>448.000000,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="minus" label="-" category="letter">-</text>
-                <text name="underscore" label="ঃ" category="letter">ঃ</text>
-            </symbols>
-        </key>
-        <key id="keycode21" name="keycode21" column="12" row="0">
-            <bounds>488.585366,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="equal" label="ৃ" category="letter">ৃ</text>
-                <text name="plus" label="ঋ" category="letter">ঋ</text>
-            </symbols>
-        </key>
-        <key id="keycode22" name="keycode22" column="13" row="0">
-            <bounds>529.170732,1.560976,79.609756,37.463415</bounds>
-            <oref>outline4</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="BackSpace" label="←" category="keyname" keyval="65288">BackSpace</keysym>
-            </symbols>
-        </key>
-        <key id="keycode23" name="keycode23" column="0" row="1">
-            <bounds>3.121951,42.146341,59.317073,37.463415</bounds>
-            <oref>outline5</oref>
-            <symbols groups="1" levels="2">
-                <keysym name="Tab" label="⇥" category="keyname" keyval="65289">Tab</keysym>
-                <keysym name="ISO_Left_Tab" label="⇤" category="keyname" keyval="65056">ISO_Left_Tab</keysym>
-            </symbols>
-        </key>
-        <key id="keycode24" name="keycode24" column="1" row="1">
-            <bounds>65.560976,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="q" label="ৌ" category="letter">ৌ</text>
-                <text name="Q" label="ঔ" category="letter">ঔ</text>
-            </symbols>
-        </key>
-        <key id="keycode25" name="keycode25" column="2" row="1">
-            <bounds>106.146341,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="w" label="ৈ" category="letter">ৈ</text>
-                <text name="W" label="ঐ" category="letter">ঐ</text>
-            </symbols>
-        </key>
-        <key id="keycode26" name="keycode26" column="3" row="1">
-            <bounds>145.170732,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="e" label="া" category="letter">া</text>
-                <text name="E" label="আ" category="letter">আ</text>
-            </symbols>
-        </key>
-        <key id="keycode27" name="keycode27" column="4" row="1">
-            <bounds>185.756098,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="r" label="ী" category="letter">ী</text>
-                <text name="R" label="ঈ" category="letter">ঈ</text>
-            </symbols>
-        </key>
-        <key id="keycode28" name="keycode28" column="5" row="1">
-            <bounds>226.341463,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="t" label="ূ" category="letter">ূ</text>
-                <text name="T" label="ঊ" category="letter">ঊ</text>
-            </symbols>
-        </key>
-        <key id="keycode29" name="keycode29" column="6" row="1">
-            <bounds>266.926829,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="y" label="ব" category="letter">ব</text>
-                <text name="Y" label="ভ" category="letter">ভ</text>
-            </symbols>
-        </key>
-        <key id="keycode30" name="keycode30" column="7" row="1">
-            <bounds>307.512195,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="u" label="হ" category="letter">হ</text>
-                <text name="U" label="ঙ" category="letter">ঙ</text>
-            </symbols>
-        </key>
-        <key id="keycode31" name="keycode31" column="8" row="1">
-            <bounds>348.097561,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="i" label="গ" category="letter">গ</text>
-                <text name="I" label="ঘ" category="letter">ঘ</text>
-            </symbols>
-        </key>
-        <key id="keycode32" name="keycode32" column="9" row="1">
-            <bounds>388.682927,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="o" label="দ" category="letter">দ</text>
-                <text name="O" label="ধ" category="letter">ধ</text>
-            </symbols>
-        </key>
-        <key id="keycode33" name="keycode33" column="10" row="1">
-            <bounds>429.268293,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="p" label="জ" category="letter">জ</text>
-                <text name="P" label="ঝ" category="letter">ঝ</text>
-            </symbols>
-        </key>
-        <key id="keycode34" name="keycode34" column="11" row="1">
-            <bounds>468.292683,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="bracketleft" label="ড" category="letter">ড</text>
-                <text name="braceleft" label="ঢ" category="letter">ঢ</text>
-            </symbols>
-        </key>
-        <key id="keycode35" name="keycode35" column="12" row="1">
-            <bounds>508.878049,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="bracketright" label="়" category="letter">়</text>
-                <text name="braceright" label="ঞ" category="letter">ঞ</text>
-            </symbols>
-        </key>
-        <key id="keycode51" name="keycode51" column="13" row="1">
-            <bounds>549.463415,42.146341,59.317073,37.463415</bounds>
-            <oref>outline6</oref>
-            <symbols groups="1" levels="2">
-                <text name="backslash" label="য" category="letter">য</text>
-                <text name="bar" label="|" category="letter">|</text>
-            </symbols>
-        </key>
-        <key id="keycode66" name="keycode66" column="0" row="2">
-            <bounds>3.121951,82.731707,68.682927,37.463415</bounds>
-            <oref>outline7</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="ISO_Level3_Shift" label="⇮" category="keyname" keyval="65027">ISO_Level3_Shift</keysym>
-            </symbols>
-        </key>
-        <key id="keycode38" name="keycode38" column="1" row="2">
-            <bounds>76.487805,82.731707,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="a" label="ো" category="letter">ো</text>
-                <text name="A" label="ও" category="letter">ও</text>
-            </symbols>
-        </key>
-        <key id="keycode39" name="keycode39" column="2" row="2">
-            <bounds>115.512195,82.731707,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="s" label="ে" category="letter">ে</text>
-                <text name="S" label="এ" category="letter">এ</text>
-            </symbols>
-        </key>
-        <key id="keycode40" name="keycode40" column="3" row="2">
-            <bounds>156.097561,82.731707,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="d" label="্" category="letter">্</text>
-                <text name="D" label="অ" category="letter">অ</text>
-            </symbols>
-        </key>
-        <key id="keycode41" name="keycode41" column="4" row="2">
-            <bounds>196.682927,82.731707,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="f" label="ি" category="letter">ি</text>
-                <text name="F" label="ই" category="letter">ই</text>
-            </symbols>
-        </key>
-        <key id="keycode42" name="keycode42" column="5" row="2">
-            <bounds>237.268293,82.731707,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="g" label="ু" category="letter">ু</text>
-                <text name="G" label="উ" category="letter">উ</text>
-            </symbols>
-        </key>
-        <key id="keycode43" name="keycode43" column="6" row="2">
-            <bounds>277.853659,82.731707,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="h" label="প" category="letter">প</text>
-                <text name="H" label="ফ" category="letter">ফ</text>
-            </symbols>
-        </key>
-        <key id="keycode44" name="keycode44" column="7" row="2">
-            <bounds>318.439024,82.731707,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="j" label="ৰ" category="letter">ৰ</text>
-                <text name="J" label="J" category="letter">J</text>
-            </symbols>
-        </key>
-        <key id="keycode45" name="keycode45" column="8" row="2">
-            <bounds>359.024390,82.731707,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="k" label="ক" category="letter">ক</text>
-                <text name="K" label="খ" category="letter">খ</text>
-            </symbols>
-        </key>
-        <key id="keycode46" name="keycode46" column="9" row="2">
-            <bounds>399.609756,82.731707,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="l" label="ত" category="letter">ত</text>
-                <text name="L" label="থ" category="letter">থ</text>
-            </symbols>
-        </key>
-        <key id="keycode47" name="keycode47" column="10" row="2">
-            <bounds>438.634146,82.731707,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="semicolon" label="চ" category="letter">চ</text>
-                <text name="colon" label="ছ" category="letter">ছ</text>
-            </symbols>
-        </key>
-        <key id="keycode48" name="keycode48" column="11" row="2">
-            <bounds>479.219512,82.731707,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <keysym name="quoteright" label="&apos;" category="letter" keyval="39">quoteright</keysym>
-                <text name="quotedbl" label="ঠ" category="letter">ঠ</text>
-            </symbols>
-        </key>
-        <key id="keycode36" name="keycode36" column="12" row="2">
-            <bounds>519.804878,82.731707,88.975610,37.463415</bounds>
-            <oref>outline8</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="Return" label="↵" category="keyname" keyval="65293">Return</keysym>
-            </symbols>
-        </key>
-        <key id="keycode50" name="keycode50" column="0" row="3">
-            <bounds>3.121951,121.756098,88.975610,37.463415</bounds>
-            <oref>outline9</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="Shift_L" label="⇧" category="keyname" keyval="65505">Shift_L</keysym>
-            </symbols>
-        </key>
-        <key id="keycode52" name="keycode52" column="1" row="3">
-            <bounds>95.219512,121.756098,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="z" label="ৎ" category="letter">ৎ</text>
-                <text name="Z" label="৺" category="letter">৺</text>
-            </symbols>
-        </key>
-        <key id="keycode53" name="keycode53" column="2" row="3">
-            <bounds>135.804878,121.756098,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="x" label="ং" category="letter">ং</text>
-                <text name="X" label="ঁ" category="letter">ঁ</text>
-            </symbols>
-        </key>
-        <key id="keycode54" name="keycode54" column="3" row="3">
-            <bounds>176.390244,121.756098,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="c" label="ম" category="letter">ম</text>
-                <text name="C" label="ণ" category="letter">ণ</text>
-            </symbols>
-        </key>
-        <key id="keycode55" name="keycode55" column="4" row="3">
-            <bounds>215.414634,121.756098,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="v" label="ন" category="letter">ন</text>
-                <text name="V" label="V" category="letter">V</text>
-            </symbols>
-        </key>
-        <key id="keycode56" name="keycode56" column="5" row="3">
-            <bounds>256.000000,121.756098,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="b" label="ৱ" category="letter">ৱ</text>
-                <text name="B" label="B" category="letter">B</text>
-            </symbols>
-        </key>
-        <key id="keycode57" name="keycode57" column="6" row="3">
-            <bounds>296.585366,121.756098,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="n" label="ল" category="letter">ল</text>
-                <text name="N" label="N" category="letter">N</text>
-            </symbols>
-        </key>
-        <key id="keycode58" name="keycode58" column="7" row="3">
-            <bounds>337.170732,121.756098,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="m" label="স" category="letter">স</text>
-                <text name="M" label="শ" category="letter">শ</text>
-            </symbols>
-        </key>
-        <key id="keycode59" name="keycode59" column="8" row="3">
-            <bounds>377.756098,121.756098,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="comma" label="," category="letter">,</text>
-                <text name="less" label="ষ" category="letter">ষ</text>
-            </symbols>
-        </key>
-        <key id="keycode60" name="keycode60" column="9" row="3">
-            <bounds>418.341463,121.756098,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="period" label="." category="letter">.</text>
-                <text name="greater" label="।" category="letter">।</text>
-            </symbols>
-        </key>
-        <key id="keycode61" name="keycode61" column="10" row="3">
-            <bounds>458.926829,121.756098,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="slash" label="য়" category="letter">য়</text>
-                <keysym name="question" label="?" category="letter" keyval="63">question</keysym>
-            </symbols>
-        </key>
-        <key id="keycode62" name="keycode62" column="11" row="3">
-            <bounds>499.512195,121.756098,109.268293,37.463415</bounds>
-            <oref>outline10</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="Shift_R" label="⇧" category="keyname" keyval="65506">Shift_R</keysym>
-            </symbols>
-        </key>
-        <key id="keycode37" name="keycode37" column="0" row="4">
-            <bounds>3.121951,162.341463,56.195122,37.463415</bounds>
-            <oref>outline1</oref>
-            <symbols groups="1" levels="2">
-                <symbol name="cycle-keyboard" icon="input-keyboard-symbolic" label="⌨" category="keyname">cycle-keyboard</symbol>
-                <symbol name="preferences" icon="preferences-system-symbolic" label="☺" category="keyname">preferences</symbol>
-            </symbols>
-        </key>
-        <key id="keycode133" name="keycode133" column="1" row="4">
-            <bounds>62.439024,162.341463,48.390244,37.463415</bounds>
-            <oref>outline2</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="Control_L" label="Ctrl" category="keyname" keyval="65507">Control_L</keysym>
-            </symbols>
-        </key>
-        <key id="keycode64" name="keycode64" column="2" row="4">
-            <bounds>113.951220,162.341463,48.390244,37.463415</bounds>
-            <oref>outline2</oref>
-            <symbols groups="1" levels="2">
-                <keysym name="Alt_L" label="Alt" category="keyname" keyval="65513">Alt_L</keysym>
-                <keysym name="Meta_L" label="Meta" category="keyname" keyval="65511">Meta_L</keysym>
-            </symbols>
-        </key>
-        <key id="keycode65" name="keycode65" column="3" row="4">
-            <bounds>165.463415,162.341463,238.829268,37.463415</bounds>
-            <oref>outline11</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="space" category="letter" keyval="32">space</keysym>
-            </symbols>
-        </key>
-        <key id="keycode108" name="keycode108" column="4" row="4">
-            <bounds>407.414634,162.341463,48.390244,37.463415</bounds>
-            <oref>outline2</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="Left" label="⇠" category="keyname" keyval="65361">Left</keysym>
-            </symbols>
-        </key>
-        <key id="keycode134" name="keycode134" column="5" row="4">
-            <bounds>458.926829,162.341463,48.390244,37.463415</bounds>
-            <oref>outline2</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="Up" label="⇡" category="keyname" keyval="65362">Up</keysym>
-            </symbols>
-        </key>
-        <key id="keycode135" name="keycode135" column="6" row="4">
-            <bounds>508.878049,162.341463,48.390244,37.463415</bounds>
-            <oref>outline2</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="Down" label="⇣" category="keyname" keyval="65364">Down</keysym>
-            </symbols>
-        </key>
-        <key id="keycode105" name="keycode105" column="7" row="4">
-            <bounds>560.390244,162.341463,48.390244,37.463415</bounds>
-            <oref>outline2</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="Right" label="⇢" category="keyname" keyval="65363">Right</keysym>
-            </symbols>
-        </key>
-    </section>
-    <outline id="outline1">
-        <corner-radius>1.000000</corner-radius>
-        <point>0.000000,0.000000</point>
-        <point>56.195122,0.000000</point>
-        <point>56.195122,37.463415</point>
-        <point>0.000000,37.463415</point>
-    </outline>
-    <outline id="outline3">
-        <corner-radius>1.000000</corner-radius>
-        <point>0.000000,0.000000</point>
-        <point>37.463415,0.000000</point>
-        <point>37.463415,37.463415</point>
-        <point>0.000000,37.463415</point>
-    </outline>
-    <outline id="outline4">
-        <corner-radius>1.000000</corner-radius>
-        <point>0.000000,0.000000</point>
-        <point>79.609756,0.000000</point>
-        <point>79.609756,37.463415</point>
-        <point>0.000000,37.463415</point>
-    </outline>
-    <outline id="outline5">
-        <corner-radius>1.000000</corner-radius>
-        <point>0.000000,0.000000</point>
-        <point>59.317073,0.000000</point>
-        <point>59.317073,37.463415</point>
-        <point>0.000000,37.463415</point>
-    </outline>
-    <outline id="outline6">
-        <corner-radius>1.000000</corner-radius>
-        <point>0.000000,0.000000</point>
-        <point>59.317073,0.000000</point>
-        <point>59.317073,37.463415</point>
-        <point>0.000000,37.463415</point>
-    </outline>
-    <outline id="outline7">
-        <corner-radius>1.000000</corner-radius>
-        <point>0.000000,0.000000</point>
-        <point>68.682927,0.000000</point>
-        <point>68.682927,37.463415</point>
-        <point>0.000000,37.463415</point>
-    </outline>
-    <outline id="outline8">
-        <corner-radius>1.000000</corner-radius>
-        <point>0.000000,0.000000</point>
-        <point>88.975610,0.000000</point>
-        <point>88.975610,37.463415</point>
-        <point>0.000000,37.463415</point>
-    </outline>
-    <outline id="outline9">
-        <corner-radius>1.000000</corner-radius>
-        <point>0.000000,0.000000</point>
-        <point>88.975610,0.000000</point>
-        <point>88.975610,37.463415</point>
-        <point>0.000000,37.463415</point>
-    </outline>
-    <outline id="outline10">
-        <corner-radius>1.000000</corner-radius>
-        <point>0.000000,0.000000</point>
-        <point>109.268293,0.000000</point>
-        <point>109.268293,37.463415</point>
-        <point>0.000000,37.463415</point>
-    </outline>
-    <outline id="outline11">
-        <corner-radius>1.000000</corner-radius>
-        <point>0.000000,0.000000</point>
-        <point>238.829268,0.000000</point>
-        <point>238.829268,37.463415</point>
-        <point>0.000000,37.463415</point>
-    </outline>
-    <outline id="outline2">
-        <corner-radius>1.000000</corner-radius>
-        <point>0.000000,0.000000</point>
-        <point>48.390244,0.000000</point>
-        <point>48.390244,37.463415</point>
-        <point>0.000000,37.463415</point>
-    </outline>
-</keyboard>
-
--- a/data/keyboards/be.xml
+++ b/data/keyboards/be.xml
@@ -1,683 +0,0 @@
-<?xml version="1.0"?>
-<keyboard version="0.90">
-    <bounds>0.000000,0.000000,640.000000,296.585366</bounds>
-    <section>
-        <bounds>15.609756,15.609756,640.000000,39.024390</bounds>
-        <angle>0</angle>
-        <row>
-            <columns>16</columns>
-            <orientation>1</orientation>
-        </row>
-        <key id="keycode9" name="keycode9" column="0" row="0">
-            <bounds>3.121951,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="Escape" label="Esc" category="keyname" keyval="65307">Escape</keysym>
-            </symbols>
-        </key>
-        <key id="keycode67" name="keycode67" column="1" row="0">
-            <bounds>84.292683,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F1" label="F1" category="function" keyval="65470">F1</keysym>
-            </symbols>
-        </key>
-        <key id="keycode68" name="keycode68" column="2" row="0">
-            <bounds>124.878049,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F2" label="F2" category="function" keyval="65471">F2</keysym>
-            </symbols>
-        </key>
-        <key id="keycode69" name="keycode69" column="3" row="0">
-            <bounds>165.463415,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F3" label="F3" category="function" keyval="65472">F3</keysym>
-            </symbols>
-        </key>
-        <key id="keycode70" name="keycode70" column="4" row="0">
-            <bounds>206.048780,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F4" label="F4" category="function" keyval="65473">F4</keysym>
-            </symbols>
-        </key>
-        <key id="keycode71" name="keycode71" column="5" row="0">
-            <bounds>266.926829,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F5" label="F5" category="function" keyval="65474">F5</keysym>
-            </symbols>
-        </key>
-        <key id="keycode72" name="keycode72" column="6" row="0">
-            <bounds>307.512195,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F6" label="F6" category="function" keyval="65475">F6</keysym>
-            </symbols>
-        </key>
-        <key id="keycode73" name="keycode73" column="7" row="0">
-            <bounds>348.097561,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F7" label="F7" category="function" keyval="65476">F7</keysym>
-            </symbols>
-        </key>
-        <key id="keycode74" name="keycode74" column="8" row="0">
-            <bounds>388.682927,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F8" label="F8" category="function" keyval="65477">F8</keysym>
-            </symbols>
-        </key>
-        <key id="keycode75" name="keycode75" column="9" row="0">
-            <bounds>449.560976,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F9" label="F9" category="function" keyval="65478">F9</keysym>
-            </symbols>
-        </key>
-        <key id="keycode76" name="keycode76" column="10" row="0">
-            <bounds>490.146341,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F10" label="F10" category="function" keyval="65479">F10</keysym>
-            </symbols>
-        </key>
-        <key id="keycode95" name="keycode95" column="11" row="0">
-            <bounds>530.731707,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F11" label="F11" category="function" keyval="65480">F11</keysym>
-            </symbols>
-        </key>
-        <key id="keycode96" name="keycode96" column="12" row="0">
-            <bounds>571.317073,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F12" label="F12" category="function" keyval="65481">F12</keysym>
-            </symbols>
-        </key>
-    </section>
-    <section>
-        <bounds>15.609756,78.048780,608.780488,201.365854</bounds>
-        <angle>0</angle>
-        <row>
-            <columns>14</columns>
-            <orientation>1</orientation>
-        </row>
-        <row>
-            <columns>14</columns>
-            <orientation>1</orientation>
-        </row>
-        <row>
-            <columns>13</columns>
-            <orientation>1</orientation>
-        </row>
-        <row>
-            <columns>12</columns>
-            <orientation>1</orientation>
-        </row>
-        <row>
-            <columns>8</columns>
-            <orientation>1</orientation>
-        </row>
-        <key id="keycode49" name="keycode49" column="0" row="0">
-            <bounds>3.121951,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <keysym name="quoteleft" label="`" category="letter" keyval="96">quoteleft</keysym>
-                <text name="asciitilde" label="Ё" category="letter">Ё</text>
-            </symbols>
-        </key>
-        <key id="keycode10" name="keycode10" column="1" row="0">
-            <bounds>43.707317,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <keysym name="1" label="1" category="letter" keyval="49">1</keysym>
-                <text name="exclam" label="!" category="letter">!</text>
-            </symbols>
-        </key>
-        <key id="keycode11" name="keycode11" column="2" row="0">
-            <bounds>84.292683,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <keysym name="2" label="2" category="letter" keyval="50">2</keysym>
-                <text name="at" label="&quot;" category="letter">&quot;</text>
-            </symbols>
-        </key>
-        <key id="keycode12" name="keycode12" column="3" row="0">
-            <bounds>124.878049,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <keysym name="3" label="3" category="letter" keyval="51">3</keysym>
-                <text name="numbersign" label="№" category="letter">№</text>
-            </symbols>
-        </key>
-        <key id="keycode13" name="keycode13" column="4" row="0">
-            <bounds>165.463415,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <keysym name="4" label="4" category="letter" keyval="52">4</keysym>
-                <text name="dollar" label=";" category="letter">;</text>
-            </symbols>
-        </key>
-        <key id="keycode14" name="keycode14" column="5" row="0">
-            <bounds>206.048780,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="3">
-                <keysym name="5" label="5" category="letter" keyval="53">5</keysym>
-                <text name="percent" label="%" category="letter">%</text>
-                <keysym name="EuroSign" label="€" category="letter" keyval="8364">EuroSign</keysym>
-            </symbols>
-        </key>
-        <key id="keycode15" name="keycode15" column="6" row="0">
-            <bounds>245.073171,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <keysym name="6" label="6" category="letter" keyval="54">6</keysym>
-                <text name="asciicircum" label=":" category="letter">:</text>
-            </symbols>
-        </key>
-        <key id="keycode16" name="keycode16" column="7" row="0">
-            <bounds>285.658537,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <keysym name="7" label="7" category="letter" keyval="55">7</keysym>
-                <text name="ampersand" label="?" category="letter">?</text>
-            </symbols>
-        </key>
-        <key id="keycode17" name="keycode17" column="8" row="0">
-            <bounds>326.243902,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <keysym name="8" label="8" category="letter" keyval="56">8</keysym>
-                <text name="asterisk" label="*" category="letter">*</text>
-            </symbols>
-        </key>
-        <key id="keycode18" name="keycode18" column="9" row="0">
-            <bounds>366.829268,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <keysym name="9" label="9" category="letter" keyval="57">9</keysym>
-                <text name="parenleft" label="(" category="letter">(</text>
-            </symbols>
-        </key>
-        <key id="keycode19" name="keycode19" column="10" row="0">
-            <bounds>407.414634,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <keysym name="0" label="0" category="letter" keyval="48">0</keysym>
-                <text name="parenright" label=")" category="letter">)</text>
-            </symbols>
-        </key>
-        <key id="keycode20" name="keycode20" column="11" row="0">
-            <bounds>448.000000,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <keysym name="minus" label="-" category="letter" keyval="45">minus</keysym>
-                <text name="underscore" label="_" category="letter">_</text>
-            </symbols>
-        </key>
-        <key id="keycode21" name="keycode21" column="12" row="0">
-            <bounds>488.585366,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <keysym name="equal" label="=" category="letter" keyval="61">equal</keysym>
-                <text name="plus" label="+" category="letter">+</text>
-            </symbols>
-        </key>
-        <key id="keycode22" name="keycode22" column="13" row="0">
-            <bounds>529.170732,1.560976,79.609756,37.463415</bounds>
-            <oref>outline4</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="BackSpace" label="←" category="keyname" keyval="65288">BackSpace</keysym>
-            </symbols>
-        </key>
-        <key id="keycode23" name="keycode23" column="0" row="1">
-            <bounds>3.121951,42.146341,59.317073,37.463415</bounds>
-            <oref>outline5</oref>
-            <symbols groups="1" levels="2">
-                <keysym name="Tab" label="⇥" category="keyname" keyval="65289">Tab</keysym>
-                <keysym name="ISO_Left_Tab" label="⇤" category="keyname" keyval="65056">ISO_Left_Tab</keysym>
-            </symbols>
-        </key>
-        <key id="keycode24" name="keycode24" column="1" row="1">
-            <bounds>65.560976,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="q" label="й" category="letter">й</text>
-                <text name="Q" label="Й" category="letter">Й</text>
-            </symbols>
-        </key>
-        <key id="keycode25" name="keycode25" column="2" row="1">
-            <bounds>106.146341,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="w" label="ц" category="letter">ц</text>
-                <text name="W" label="Ц" category="letter">Ц</text>
-            </symbols>
-        </key>
-        <key id="keycode26" name="keycode26" column="3" row="1">
-            <bounds>145.170732,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="e" label="у" category="letter">у</text>
-                <text name="E" label="У" category="letter">У</text>
-            </symbols>
-        </key>
-        <key id="keycode27" name="keycode27" column="4" row="1">
-            <bounds>185.756098,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="r" label="к" category="letter">к</text>
-                <text name="R" label="К" category="letter">К</text>
-            </symbols>
-        </key>
-        <key id="keycode28" name="keycode28" column="5" row="1">
-            <bounds>226.341463,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="t" label="е" category="letter">е</text>
-                <text name="T" label="Е" category="letter">Е</text>
-            </symbols>
-        </key>
-        <key id="keycode29" name="keycode29" column="6" row="1">
-            <bounds>266.926829,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="y" label="н" category="letter">н</text>
-                <text name="Y" label="Н" category="letter">Н</text>
-            </symbols>
-        </key>
-        <key id="keycode30" name="keycode30" column="7" row="1">
-            <bounds>307.512195,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="u" label="г" category="letter">г</text>
-                <text name="U" label="Г" category="letter">Г</text>
-            </symbols>
-        </key>
-        <key id="keycode31" name="keycode31" column="8" row="1">
-            <bounds>348.097561,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="i" label="ш" category="letter">ш</text>
-                <text name="I" label="Ш" category="letter">Ш</text>
-            </symbols>
-        </key>
-        <key id="keycode32" name="keycode32" column="9" row="1">
-            <bounds>388.682927,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="o" label="ў" category="letter">ў</text>
-                <text name="O" label="Ў" category="letter">Ў</text>
-            </symbols>
-        </key>
-        <key id="keycode33" name="keycode33" column="10" row="1">
-            <bounds>429.268293,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="p" label="з" category="letter">з</text>
-                <text name="P" label="З" category="letter">З</text>
-            </symbols>
-        </key>
-        <key id="keycode34" name="keycode34" column="11" row="1">
-            <bounds>468.292683,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="bracketleft" label="х" category="letter">х</text>
-                <text name="braceleft" label="Х" category="letter">Х</text>
-            </symbols>
-        </key>
-        <key id="keycode35" name="keycode35" column="12" row="1">
-            <bounds>508.878049,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="bracketright" label="&apos;" category="letter">&apos;</text>
-                <text name="braceright" label="&apos;" category="letter">&apos;</text>
-            </symbols>
-        </key>
-        <key id="keycode51" name="keycode51" column="13" row="1">
-            <bounds>549.463415,42.146341,59.317073,37.463415</bounds>
-            <oref>outline6</oref>
-            <symbols groups="1" levels="2">
-                <text name="backslash" label="\" category="letter">\</text>
-                <text name="bar" label="|" category="letter">|</text>
-            </symbols>
-        </key>
-        <key id="keycode66" name="keycode66" column="0" row="2">
-            <bounds>3.121951,82.731707,68.682927,37.463415</bounds>
-            <oref>outline7</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="ISO_Level3_Shift" label="⇮" category="keyname" keyval="65027">ISO_Level3_Shift</keysym>
-            </symbols>
-        </key>
-        <key id="keycode38" name="keycode38" column="1" row="2">
-            <bounds>76.487805,82.731707,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="a" label="ф" category="letter">ф</text>
-                <text name="A" label="Ф" category="letter">Ф</text>
-            </symbols>
-        </key>
-        <key id="keycode39" name="keycode39" column="2" row="2">
-            <bounds>115.512195,82.731707,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="s" label="ы" category="letter">ы</text>
-                <text name="S" label="Ы" category="letter">Ы</text>
-            </symbols>
-        </key>
-        <key id="keycode40" name="keycode40" column="3" row="2">
-            <bounds>156.097561,82.731707,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="d" label="в" category="letter">в</text>
-                <text name="D" label="В" category="letter">В</text>
-            </symbols>
-        </key>
-        <key id="keycode41" name="keycode41" column="4" row="2">
-            <bounds>196.682927,82.731707,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="f" label="а" category="letter">а</text>
-                <text name="F" label="А" category="letter">А</text>
-            </symbols>
-        </key>
-        <key id="keycode42" name="keycode42" column="5" row="2">
-            <bounds>237.268293,82.731707,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="g" label="п" category="letter">п</text>
-                <text name="G" label="П" category="letter">П</text>
-            </symbols>
-        </key>
-        <key id="keycode43" name="keycode43" column="6" row="2">
-            <bounds>277.853659,82.731707,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="h" label="р" category="letter">р</text>
-                <text name="H" label="Р" category="letter">Р</text>
-            </symbols>
-        </key>
-        <key id="keycode44" name="keycode44" column="7" row="2">
-            <bounds>318.439024,82.731707,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="j" label="о" category="letter">о</text>
-                <text name="J" label="О" category="letter">О</text>
-            </symbols>
-        </key>
-        <key id="keycode45" name="keycode45" column="8" row="2">
-            <bounds>359.024390,82.731707,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="k" label="л" category="letter">л</text>
-                <text name="K" label="Л" category="letter">Л</text>
-            </symbols>
-        </key>
-        <key id="keycode46" name="keycode46" column="9" row="2">
-            <bounds>399.609756,82.731707,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="l" label="д" category="letter">д</text>
-                <text name="L" label="Д" category="letter">Д</text>
-            </symbols>
-        </key>
-        <key id="keycode47" name="keycode47" column="10" row="2">
-            <bounds>438.634146,82.731707,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="semicolon" label="ж" category="letter">ж</text>
-                <text name="colon" label="Ж" category="letter">Ж</text>
-            </symbols>
-        </key>
-        <key id="keycode48" name="keycode48" column="11" row="2">
-            <bounds>479.219512,82.731707,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <keysym name="quoteright" label="&apos;" category="letter" keyval="39">quoteright</keysym>
-                <text name="quotedbl" label="Э" category="letter">Э</text>
-            </symbols>
-        </key>
-        <key id="keycode36" name="keycode36" column="12" row="2">
-            <bounds>519.804878,82.731707,88.975610,37.463415</bounds>
-            <oref>outline8</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="Return" label="↵" category="keyname" keyval="65293">Return</keysym>
-            </symbols>
-        </key>
-        <key id="keycode50" name="keycode50" column="0" row="3">
-            <bounds>3.121951,121.756098,88.975610,37.463415</bounds>
-            <oref>outline9</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="Shift_L" label="⇧" category="keyname" keyval="65505">Shift_L</keysym>
-            </symbols>
-        </key>
-        <key id="keycode52" name="keycode52" column="1" row="3">
-            <bounds>95.219512,121.756098,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="z" label="я" category="letter">я</text>
-                <text name="Z" label="Я" category="letter">Я</text>
-            </symbols>
-        </key>
-        <key id="keycode53" name="keycode53" column="2" row="3">
-            <bounds>135.804878,121.756098,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="x" label="ч" category="letter">ч</text>
-                <text name="X" label="Ч" category="letter">Ч</text>
-            </symbols>
-        </key>
-        <key id="keycode54" name="keycode54" column="3" row="3">
-            <bounds>176.390244,121.756098,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="c" label="с" category="letter">с</text>
-                <text name="C" label="С" category="letter">С</text>
-            </symbols>
-        </key>
-        <key id="keycode55" name="keycode55" column="4" row="3">
-            <bounds>215.414634,121.756098,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="v" label="м" category="letter">м</text>
-                <text name="V" label="М" category="letter">М</text>
-            </symbols>
-        </key>
-        <key id="keycode56" name="keycode56" column="5" row="3">
-            <bounds>256.000000,121.756098,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="b" label="і" category="letter">і</text>
-                <text name="B" label="І" category="letter">І</text>
-            </symbols>
-        </key>
-        <key id="keycode57" name="keycode57" column="6" row="3">
-            <bounds>296.585366,121.756098,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="n" label="т" category="letter">т</text>
-                <text name="N" label="Т" category="letter">Т</text>
-            </symbols>
-        </key>
-        <key id="keycode58" name="keycode58" column="7" row="3">
-            <bounds>337.170732,121.756098,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="m" label="ь" category="letter">ь</text>
-                <text name="M" label="Ь" category="letter">Ь</text>
-            </symbols>
-        </key>
-        <key id="keycode59" name="keycode59" column="8" row="3">
-            <bounds>377.756098,121.756098,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="comma" label="б" category="letter">б</text>
-                <text name="less" label="Б" category="letter">Б</text>
-            </symbols>
-        </key>
-        <key id="keycode60" name="keycode60" column="9" row="3">
-            <bounds>418.341463,121.756098,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="period" label="ю" category="letter">ю</text>
-                <text name="greater" label="Ю" category="letter">Ю</text>
-            </symbols>
-        </key>
-        <key id="keycode61" name="keycode61" column="10" row="3">
-            <bounds>458.926829,121.756098,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="slash" label="." category="letter">.</text>
-                <text name="question" label="," category="letter">,</text>
-            </symbols>
-        </key>
-        <key id="keycode62" name="keycode62" column="11" row="3">
-            <bounds>499.512195,121.756098,109.268293,37.463415</bounds>
-            <oref>outline10</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="Shift_R" label="⇧" category="keyname" keyval="65506">Shift_R</keysym>
-            </symbols>
-        </key>
-        <key id="keycode37" name="keycode37" column="0" row="4">
-            <bounds>3.121951,162.341463,56.195122,37.463415</bounds>
-            <oref>outline1</oref>
-            <symbols groups="1" levels="2">
-                <symbol name="cycle-keyboard" icon="input-keyboard-symbolic" label="⌨" category="keyname">cycle-keyboard</symbol>
-                <symbol name="preferences" icon="preferences-system-symbolic" label="☺" category="keyname">preferences</symbol>
-            </symbols>
-        </key>
-        <key id="keycode133" name="keycode133" column="1" row="4">
-            <bounds>62.439024,162.341463,48.390244,37.463415</bounds>
-            <oref>outline2</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="Control_L" label="Ctrl" category="keyname" keyval="65507">Control_L</keysym>
-            </symbols>
-        </key>
-        <key id="keycode64" name="keycode64" column="2" row="4">
-            <bounds>113.951220,162.341463,48.390244,37.463415</bounds>
-            <oref>outline2</oref>
-            <symbols groups="1" levels="2">
-                <keysym name="Alt_L" label="Alt" category="keyname" keyval="65513">Alt_L</keysym>
-                <keysym name="Meta_L" label="Meta" category="keyname" keyval="65511">Meta_L</keysym>
-            </symbols>
-        </key>
-        <key id="keycode65" name="keycode65" column="3" row="4">
-            <bounds>165.463415,162.341463,238.829268,37.463415</bounds>
-            <oref>outline11</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="space" category="letter" keyval="32">space</keysym>
-            </symbols>
-        </key>
-        <key id="keycode108" name="keycode108" column="4" row="4">
-            <bounds>407.414634,162.341463,48.390244,37.463415</bounds>
-            <oref>outline2</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="Left" label="⇠" category="keyname" keyval="65361">Left</keysym>
-            </symbols>
-        </key>
-        <key id="keycode134" name="keycode134" column="5" row="4">
-            <bounds>458.926829,162.341463,48.390244,37.463415</bounds>
-            <oref>outline2</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="Up" label="⇡" category="keyname" keyval="65362">Up</keysym>
-            </symbols>
-        </key>
-        <key id="keycode135" name="keycode135" column="6" row="4">
-            <bounds>508.878049,162.341463,48.390244,37.463415</bounds>
-            <oref>outline2</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="Down" label="⇣" category="keyname" keyval="65364">Down</keysym>
-            </symbols>
-        </key>
-        <key id="keycode105" name="keycode105" column="7" row="4">
-            <bounds>560.390244,162.341463,48.390244,37.463415</bounds>
-            <oref>outline2</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="Right" label="⇢" category="keyname" keyval="65363">Right</keysym>
-            </symbols>
-        </key>
-    </section>
-    <outline id="outline1">
-        <corner-radius>1.000000</corner-radius>
-        <point>0.000000,0.000000</point>
-        <point>56.195122,0.000000</point>
-        <point>56.195122,37.463415</point>
-        <point>0.000000,37.463415</point>
-    </outline>
-    <outline id="outline3">
-        <corner-radius>1.000000</corner-radius>
-        <point>0.000000,0.000000</point>
-        <point>37.463415,0.000000</point>
-        <point>37.463415,37.463415</point>
-        <point>0.000000,37.463415</point>
-    </outline>
-    <outline id="outline4">
-        <corner-radius>1.000000</corner-radius>
-        <point>0.000000,0.000000</point>
-        <point>79.609756,0.000000</point>
-        <point>79.609756,37.463415</point>
-        <point>0.000000,37.463415</point>
-    </outline>
-    <outline id="outline5">
-        <corner-radius>1.000000</corner-radius>
-        <point>0.000000,0.000000</point>
-        <point>59.317073,0.000000</point>
-        <point>59.317073,37.463415</point>
-        <point>0.000000,37.463415</point>
-    </outline>
-    <outline id="outline6">
-        <corner-radius>1.000000</corner-radius>
-        <point>0.000000,0.000000</point>
-        <point>59.317073,0.000000</point>
-        <point>59.317073,37.463415</point>
-        <point>0.000000,37.463415</point>
-    </outline>
-    <outline id="outline7">
-        <corner-radius>1.000000</corner-radius>
-        <point>0.000000,0.000000</point>
-        <point>68.682927,0.000000</point>
-        <point>68.682927,37.463415</point>
-        <point>0.000000,37.463415</point>
-    </outline>
-    <outline id="outline8">
-        <corner-radius>1.000000</corner-radius>
-        <point>0.000000,0.000000</point>
-        <point>88.975610,0.000000</point>
-        <point>88.975610,37.463415</point>
-        <point>0.000000,37.463415</point>
-    </outline>
-    <outline id="outline9">
-        <corner-radius>1.000000</corner-radius>
-        <point>0.000000,0.000000</point>
-        <point>88.975610,0.000000</point>
-        <point>88.975610,37.463415</point>
-        <point>0.000000,37.463415</point>
-    </outline>
-    <outline id="outline10">
-        <corner-radius>1.000000</corner-radius>
-        <point>0.000000,0.000000</point>
-        <point>109.268293,0.000000</point>
-        <point>109.268293,37.463415</point>
-        <point>0.000000,37.463415</point>
-    </outline>
-    <outline id="outline11">
-        <corner-radius>1.000000</corner-radius>
-        <point>0.000000,0.000000</point>
-        <point>238.829268,0.000000</point>
-        <point>238.829268,37.463415</point>
-        <point>0.000000,37.463415</point>
-    </outline>
-    <outline id="outline2">
-        <corner-radius>1.000000</corner-radius>
-        <point>0.000000,0.000000</point>
-        <point>48.390244,0.000000</point>
-        <point>48.390244,37.463415</point>
-        <point>0.000000,37.463415</point>
-    </outline>
-</keyboard>
-
--- a/data/keyboards/be.yaml
+++ b/data/keyboards/be.yaml
@@ -0,0 +1,89 @@
+---
+outlines:
+    default:   { width: 35.33, height: 52 }
+    altline:   { width: 52.67, height: 52 }
+    wide:      { width: 59,    height: 52 }
+    spaceline: { width: 140,   height: 52 }
+    special:   { width: 44,    height: 52 }
+
+views:
+    base:
+        - "a z e r t y u i o p"
+        - "q s d f g h j k l m"
+        - "Shift_L   w x c v b n .   BackSpace"
+        - "show_numbers preferences         space        show_eschars Return"
+    upper:
+        - "A Z E R T Y U I O P"
+        - "Q S D F G H J K L M"
+        - "Shift_L   W X C V B N ,  BackSpace"
+        - "show_numbers preferences         space        show_eschars Return"
+    numbers:
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "@ # € % & - _ + ( )"
+        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
+        - "show_letters preferences         space        show_eschars Return"
+    symbols:
+        - "~ ` | · √ π τ ÷ × ¶"
+        - "© ® £ $ ¥ ^ ° * { }"
+        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
+        - "show_letters preferences         space        show_eschars Return"
+    eschars:
+        - "à â ç é è ê î ô ù û"
+        - "À Â Ç É È Ê Î Ô Ù Û"
+        - "show_numbers_from_symbols  æ œ ä ë ï ö ü  BackSpace"
+        - "show_letters preferences         space        show_eschars Return"
+
+buttons:
+    Shift_L:
+        action:
+            locking:
+                lock_view: "upper"
+                unlock_view: "base"
+        outline: "altline"
+        icon: "key-shift"
+    BackSpace:
+        outline: "altline"
+        icon: "edit-clear-symbolic"
+        action: erase
+    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: "*/="
+    show_eschars:
+        action:
+            locking:
+                lock_view: "eschars"
+                unlock_view: "base"
+        outline: "altline"
+        label: "âÂ"
+    space:
+        outline: "spaceline"
+        text: " "
+    Return:
+        outline: "wide"
+        icon: "key-enter"
+        keysym: "Return"
+    colon:
+        text: ":"
+    "\"":
+        keysym: "quotedbl"
--- a/data/keyboards/be_wide.yaml
+++ b/data/keyboards/be_wide.yaml
@@ -0,0 +1,89 @@
+---
+outlines:
+    default:   { width: 54,  height: 42 }
+    altline:   { width: 81,  height: 42 }
+    wide:      { width: 100, height: 42 }
+    spaceline: { width: 205, height: 42 }
+    special:   { width: 54,  height: 42 }
+
+views:
+    base:
+        - "a z e r t y u i o p"
+        - "q s d f g h j k l m"
+        - "Shift_L   w x c v b n .   BackSpace"
+        - "show_numbers preferences         space        show_eschars Return"
+    upper:
+        - "A Z E R T Y U I O P"
+        - "Q S D F G H J K L M"
+        - "Shift_L   W X C V B N ,  BackSpace"
+        - "show_numbers preferences         space        show_eschars Return"
+    numbers:
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "@ # € % & - _ + ( )"
+        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
+        - "show_letters preferences         space        show_eschars Return"
+    symbols:
+        - "~ ` | · √ π τ ÷ × ¶"
+        - "© ® £ $ ¥ ^ ° * { }"
+        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
+        - "show_letters preferences         space        show_eschars Return"
+    eschars:
+        - "à â ç é è ê î ô ù û"
+        - "À Â Ç É È Ê Î Ô Ù Û"
+        - "show_numbers_from_symbols  æ œ ä ë ï ö ü  BackSpace"
+        - "show_letters preferences         space        show_eschars Return"
+
+buttons:
+    Shift_L:
+        action:
+            locking:
+                lock_view: "upper"
+                unlock_view: "base"
+        outline: "altline"
+        icon: "key-shift"
+    BackSpace:
+        outline: "altline"
+        icon: "edit-clear-symbolic"
+        action: erase
+    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: "*/="
+    show_eschars:
+        action:
+            locking:
+                lock_view: "eschars"
+                unlock_view: "base"
+        outline: "altline"
+        label: "âÂ"
+    space:
+        outline: "spaceline"
+        text: " "
+    Return:
+        outline: "wide"
+        icon: "key-enter"
+        keysym: "Return"
+    colon:
+        text: ":"
+    "\"":
+        keysym: "quotedbl"
--- a/data/keyboards/bn-inscript.xml
+++ b/data/keyboards/bn-inscript.xml
@@ -1,683 +0,0 @@
-<?xml version="1.0"?>
-<keyboard version="0.90">
-    <bounds>0.000000,0.000000,640.000000,296.585366</bounds>
-    <section>
-        <bounds>15.609756,15.609756,640.000000,39.024390</bounds>
-        <angle>0</angle>
-        <row>
-            <columns>16</columns>
-            <orientation>1</orientation>
-        </row>
-        <key id="keycode9" name="keycode9" column="0" row="0">
-            <bounds>3.121951,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="Escape" label="Esc" category="keyname" keyval="65307">Escape</keysym>
-            </symbols>
-        </key>
-        <key id="keycode67" name="keycode67" column="1" row="0">
-            <bounds>84.292683,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F1" label="F1" category="function" keyval="65470">F1</keysym>
-            </symbols>
-        </key>
-        <key id="keycode68" name="keycode68" column="2" row="0">
-            <bounds>124.878049,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F2" label="F2" category="function" keyval="65471">F2</keysym>
-            </symbols>
-        </key>
-        <key id="keycode69" name="keycode69" column="3" row="0">
-            <bounds>165.463415,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F3" label="F3" category="function" keyval="65472">F3</keysym>
-            </symbols>
-        </key>
-        <key id="keycode70" name="keycode70" column="4" row="0">
-            <bounds>206.048780,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F4" label="F4" category="function" keyval="65473">F4</keysym>
-            </symbols>
-        </key>
-        <key id="keycode71" name="keycode71" column="5" row="0">
-            <bounds>266.926829,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F5" label="F5" category="function" keyval="65474">F5</keysym>
-            </symbols>
-        </key>
-        <key id="keycode72" name="keycode72" column="6" row="0">
-            <bounds>307.512195,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F6" label="F6" category="function" keyval="65475">F6</keysym>
-            </symbols>
-        </key>
-        <key id="keycode73" name="keycode73" column="7" row="0">
-            <bounds>348.097561,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F7" label="F7" category="function" keyval="65476">F7</keysym>
-            </symbols>
-        </key>
-        <key id="keycode74" name="keycode74" column="8" row="0">
-            <bounds>388.682927,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F8" label="F8" category="function" keyval="65477">F8</keysym>
-            </symbols>
-        </key>
-        <key id="keycode75" name="keycode75" column="9" row="0">
-            <bounds>449.560976,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F9" label="F9" category="function" keyval="65478">F9</keysym>
-            </symbols>
-        </key>
-        <key id="keycode76" name="keycode76" column="10" row="0">
-            <bounds>490.146341,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F10" label="F10" category="function" keyval="65479">F10</keysym>
-            </symbols>
-        </key>
-        <key id="keycode95" name="keycode95" column="11" row="0">
-            <bounds>530.731707,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F11" label="F11" category="function" keyval="65480">F11</keysym>
-            </symbols>
-        </key>
-        <key id="keycode96" name="keycode96" column="12" row="0">
-            <bounds>571.317073,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F12" label="F12" category="function" keyval="65481">F12</keysym>
-            </symbols>
-        </key>
-    </section>
-    <section>
-        <bounds>15.609756,78.048780,608.780488,201.365854</bounds>
-        <angle>0</angle>
-        <row>
-            <columns>14</columns>
-            <orientation>1</orientation>
-        </row>
-        <row>
-            <columns>14</columns>
-            <orientation>1</orientation>
-        </row>
-        <row>
-            <columns>13</columns>
-            <orientation>1</orientation>
-        </row>
-        <row>
-            <columns>12</columns>
-            <orientation>1</orientation>
-        </row>
-        <row>
-            <columns>8</columns>
-            <orientation>1</orientation>
-        </row>
-        <key id="keycode49" name="keycode49" column="0" row="0">
-            <bounds>3.121951,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <keysym name="quoteleft" label="`" category="letter" keyval="96">quoteleft</keysym>
-                <text name="asciitilde" label="~" category="letter">~</text>
-            </symbols>
-        </key>
-        <key id="keycode10" name="keycode10" column="1" row="0">
-            <bounds>43.707317,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="1" label="১" category="letter">১</text>
-                <text name="exclam" label="!" category="letter">!</text>
-            </symbols>
-        </key>
-        <key id="keycode11" name="keycode11" column="2" row="0">
-            <bounds>84.292683,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="2" label="২" category="letter">২</text>
-                <text name="at" label="@" category="letter">@</text>
-            </symbols>
-        </key>
-        <key id="keycode12" name="keycode12" column="3" row="0">
-            <bounds>124.878049,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="3" label="৩" category="letter">৩</text>
-                <text name="numbersign" label="#" category="letter">#</text>
-            </symbols>
-        </key>
-        <key id="keycode13" name="keycode13" column="4" row="0">
-            <bounds>165.463415,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="4" label="৪" category="letter">৪</text>
-                <text name="dollar" label="$" category="letter">$</text>
-            </symbols>
-        </key>
-        <key id="keycode14" name="keycode14" column="5" row="0">
-            <bounds>206.048780,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="3">
-                <text name="5" label="৫" category="letter">৫</text>
-                <text name="percent" label="%" category="letter">%</text>
-                <keysym name="EuroSign" label="€" category="letter" keyval="8364">EuroSign</keysym>
-            </symbols>
-        </key>
-        <key id="keycode15" name="keycode15" column="6" row="0">
-            <bounds>245.073171,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="6" label="৬" category="letter">৬</text>
-                <text name="asciicircum" label="^" category="letter">^</text>
-            </symbols>
-        </key>
-        <key id="keycode16" name="keycode16" column="7" row="0">
-            <bounds>285.658537,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="7" label="৭" category="letter">৭</text>
-                <text name="ampersand" label="&amp;" category="letter">&amp;</text>
-            </symbols>
-        </key>
-        <key id="keycode17" name="keycode17" column="8" row="0">
-            <bounds>326.243902,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="8" label="৮" category="letter">৮</text>
-                <text name="asterisk" label="*" category="letter">*</text>
-            </symbols>
-        </key>
-        <key id="keycode18" name="keycode18" column="9" row="0">
-            <bounds>366.829268,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="9" label="৯" category="letter">৯</text>
-                <text name="parenleft" label="(" category="letter">(</text>
-            </symbols>
-        </key>
-        <key id="keycode19" name="keycode19" column="10" row="0">
-            <bounds>407.414634,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="0" label="০" category="letter">০</text>
-                <text name="parenright" label=")" category="letter">)</text>
-            </symbols>
-        </key>
-        <key id="keycode20" name="keycode20" column="11" row="0">
-            <bounds>448.000000,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="minus" label="-" category="letter">-</text>
-                <text name="underscore" label="ঃ" category="letter">ঃ</text>
-            </symbols>
-        </key>
-        <key id="keycode21" name="keycode21" column="12" row="0">
-            <bounds>488.585366,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="equal" label="ৃ" category="letter">ৃ</text>
-                <text name="plus" label="ঋ" category="letter">ঋ</text>
-            </symbols>
-        </key>
-        <key id="keycode22" name="keycode22" column="13" row="0">
-            <bounds>529.170732,1.560976,79.609756,37.463415</bounds>
-            <oref>outline4</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="BackSpace" label="←" category="keyname" keyval="65288">BackSpace</keysym>
-            </symbols>
-        </key>
-        <key id="keycode23" name="keycode23" column="0" row="1">
-            <bounds>3.121951,42.146341,59.317073,37.463415</bounds>
-            <oref>outline5</oref>
-            <symbols groups="1" levels="2">
-                <keysym name="Tab" label="⇥" category="keyname" keyval="65289">Tab</keysym>
-                <keysym name="ISO_Left_Tab" label="⇤" category="keyname" keyval="65056">ISO_Left_Tab</keysym>
-            </symbols>
-        </key>
-        <key id="keycode24" name="keycode24" column="1" row="1">
-            <bounds>65.560976,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="q" label="ৌ" category="letter">ৌ</text>
-                <text name="Q" label="ঔ" category="letter">ঔ</text>
-            </symbols>
-        </key>
-        <key id="keycode25" name="keycode25" column="2" row="1">
-            <bounds>106.146341,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="w" label="ৈ" category="letter">ৈ</text>
-                <text name="W" label="ঐ" category="letter">ঐ</text>
-            </symbols>
-        </key>
-        <key id="keycode26" name="keycode26" column="3" row="1">
-            <bounds>145.170732,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="e" label="া" category="letter">া</text>
-                <text name="E" label="আ" category="letter">আ</text>
-            </symbols>
-        </key>
-        <key id="keycode27" name="keycode27" column="4" row="1">
-            <bounds>185.756098,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="r" label="ী" category="letter">ী</text>
-                <text name="R" label="ঈ" category="letter">ঈ</text>
-            </symbols>
-        </key>
-        <key id="keycode28" name="keycode28" column="5" row="1">
-            <bounds>226.341463,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="t" label="ূ" category="letter">ূ</text>
-                <text name="T" label="ঊ" category="letter">ঊ</text>
-            </symbols>
-        </key>
-        <key id="keycode29" name="keycode29" column="6" row="1">
-            <bounds>266.926829,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="y" label="ব" category="letter">ব</text>
-                <text name="Y" label="ভ" category="letter">ভ</text>
-            </symbols>
-        </key>
-        <key id="keycode30" name="keycode30" column="7" row="1">
-            <bounds>307.512195,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="u" label="হ" category="letter">হ</text>
-                <text name="U" label="ঙ" category="letter">ঙ</text>
-            </symbols>
-        </key>
-        <key id="keycode31" name="keycode31" column="8" row="1">
-            <bounds>348.097561,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="i" label="গ" category="letter">গ</text>
-                <text name="I" label="ঘ" category="letter">ঘ</text>
-            </symbols>
-        </key>
-        <key id="keycode32" name="keycode32" column="9" row="1">
-            <bounds>388.682927,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="o" label="দ" category="letter">দ</text>
-                <text name="O" label="ধ" category="letter">ধ</text>
-            </symbols>
-        </key>
-        <key id="keycode33" name="keycode33" column="10" row="1">
-            <bounds>429.268293,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="p" label="জ" category="letter">জ</text>
-                <text name="P" label="ঝ" category="letter">ঝ</text>
-            </symbols>
-        </key>
-        <key id="keycode34" name="keycode34" column="11" row="1">
-            <bounds>468.292683,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="bracketleft" label="ড" category="letter">ড</text>
-                <text name="braceleft" label="ঢ" category="letter">ঢ</text>
-            </symbols>
-        </key>
-        <key id="keycode35" name="keycode35" column="12" row="1">
-            <bounds>508.878049,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="bracketright" label="়" category="letter">়</text>
-                <text name="braceright" label="ঞ" category="letter">ঞ</text>
-            </symbols>
-        </key>
-        <key id="keycode51" name="keycode51" column="13" row="1">
-            <bounds>549.463415,42.146341,59.317073,37.463415</bounds>
-            <oref>outline6</oref>
-            <symbols groups="1" levels="2">
-                <text name="backslash" label="\" category="letter">\</text>
-                <text name="bar" label="|" category="letter">|</text>
-            </symbols>
-        </key>
-        <key id="keycode66" name="keycode66" column="0" row="2">
-            <bounds>3.121951,82.731707,68.682927,37.463415</bounds>
-            <oref>outline7</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="ISO_Level3_Shift" label="⇮" category="keyname" keyval="65027">ISO_Level3_Shift</keysym>
-            </symbols>
-        </key>
-        <key id="keycode38" name="keycode38" column="1" row="2">
-            <bounds>76.487805,82.731707,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="a" label="ো" category="letter">ো</text>
-                <text name="A" label="ও" category="letter">ও</text>
-            </symbols>
-        </key>
-        <key id="keycode39" name="keycode39" column="2" row="2">
-            <bounds>115.512195,82.731707,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="s" label="ে" category="letter">ে</text>
-                <text name="S" label="এ" category="letter">এ</text>
-            </symbols>
-        </key>
-        <key id="keycode40" name="keycode40" column="3" row="2">
-            <bounds>156.097561,82.731707,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="d" label="্" category="letter">্</text>
-                <text name="D" label="অ" category="letter">অ</text>
-            </symbols>
-        </key>
-        <key id="keycode41" name="keycode41" column="4" row="2">
-            <bounds>196.682927,82.731707,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="f" label="ি" category="letter">ি</text>
-                <text name="F" label="ই" category="letter">ই</text>
-            </symbols>
-        </key>
-        <key id="keycode42" name="keycode42" column="5" row="2">
-            <bounds>237.268293,82.731707,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="g" label="ু" category="letter">ু</text>
-                <text name="G" label="উ" category="letter">উ</text>
-            </symbols>
-        </key>
-        <key id="keycode43" name="keycode43" column="6" row="2">
-            <bounds>277.853659,82.731707,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="h" label="প" category="letter">প</text>
-                <text name="H" label="ফ" category="letter">ফ</text>
-            </symbols>
-        </key>
-        <key id="keycode44" name="keycode44" column="7" row="2">
-            <bounds>318.439024,82.731707,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="j" label="র" category="letter">র</text>
-                <text name="J" label="J" category="letter">J</text>
-            </symbols>
-        </key>
-        <key id="keycode45" name="keycode45" column="8" row="2">
-            <bounds>359.024390,82.731707,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="k" label="ক" category="letter">ক</text>
-                <text name="K" label="খ" category="letter">খ</text>
-            </symbols>
-        </key>
-        <key id="keycode46" name="keycode46" column="9" row="2">
-            <bounds>399.609756,82.731707,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="l" label="ত" category="letter">ত</text>
-                <text name="L" label="থ" category="letter">থ</text>
-            </symbols>
-        </key>
-        <key id="keycode47" name="keycode47" column="10" row="2">
-            <bounds>438.634146,82.731707,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="semicolon" label="চ" category="letter">চ</text>
-                <text name="colon" label="ছ" category="letter">ছ</text>
-            </symbols>
-        </key>
-        <key id="keycode48" name="keycode48" column="11" row="2">
-            <bounds>479.219512,82.731707,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <keysym name="quoteright" label="&apos;" category="letter" keyval="39">quoteright</keysym>
-                <text name="quotedbl" label="ঠ" category="letter">ঠ</text>
-            </symbols>
-        </key>
-        <key id="keycode36" name="keycode36" column="12" row="2">
-            <bounds>519.804878,82.731707,88.975610,37.463415</bounds>
-            <oref>outline8</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="Return" label="↵" category="keyname" keyval="65293">Return</keysym>
-            </symbols>
-        </key>
-        <key id="keycode50" name="keycode50" column="0" row="3">
-            <bounds>3.121951,121.756098,88.975610,37.463415</bounds>
-            <oref>outline9</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="Shift_L" label="⇧" category="keyname" keyval="65505">Shift_L</keysym>
-            </symbols>
-        </key>
-        <key id="keycode52" name="keycode52" column="1" row="3">
-            <bounds>95.219512,121.756098,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="z" label="z" category="letter">z</text>
-                <text name="Z" label="Z" category="letter">Z</text>
-            </symbols>
-        </key>
-        <key id="keycode53" name="keycode53" column="2" row="3">
-            <bounds>135.804878,121.756098,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="x" label="ং" category="letter">ং</text>
-                <text name="X" label="ঁ" category="letter">ঁ</text>
-            </symbols>
-        </key>
-        <key id="keycode54" name="keycode54" column="3" row="3">
-            <bounds>176.390244,121.756098,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="c" label="ম" category="letter">ম</text>
-                <text name="C" label="ণ" category="letter">ণ</text>
-            </symbols>
-        </key>
-        <key id="keycode55" name="keycode55" column="4" row="3">
-            <bounds>215.414634,121.756098,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="v" label="ন" category="letter">ন</text>
-                <text name="V" label="V" category="letter">V</text>
-            </symbols>
-        </key>
-        <key id="keycode56" name="keycode56" column="5" row="3">
-            <bounds>256.000000,121.756098,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="b" label="ব" category="letter">ব</text>
-                <text name="B" label="B" category="letter">B</text>
-            </symbols>
-        </key>
-        <key id="keycode57" name="keycode57" column="6" row="3">
-            <bounds>296.585366,121.756098,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="n" label="ল" category="letter">ল</text>
-                <text name="N" label="N" category="letter">N</text>
-            </symbols>
-        </key>
-        <key id="keycode58" name="keycode58" column="7" row="3">
-            <bounds>337.170732,121.756098,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="m" label="স" category="letter">স</text>
-                <text name="M" label="শ" category="letter">শ</text>
-            </symbols>
-        </key>
-        <key id="keycode59" name="keycode59" column="8" row="3">
-            <bounds>377.756098,121.756098,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="comma" label="," category="letter">,</text>
-                <text name="less" label="ষ" category="letter">ষ</text>
-            </symbols>
-        </key>
-        <key id="keycode60" name="keycode60" column="9" row="3">
-            <bounds>418.341463,121.756098,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="period" label="." category="letter">.</text>
-                <text name="greater" label="।" category="letter">।</text>
-            </symbols>
-        </key>
-        <key id="keycode61" name="keycode61" column="10" row="3">
-            <bounds>458.926829,121.756098,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="slash" label="য়" category="letter">য়</text>
-                <text name="question" label="য" category="letter">য</text>
-            </symbols>
-        </key>
-        <key id="keycode62" name="keycode62" column="11" row="3">
-            <bounds>499.512195,121.756098,109.268293,37.463415</bounds>
-            <oref>outline10</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="Shift_R" label="⇧" category="keyname" keyval="65506">Shift_R</keysym>
-            </symbols>
-        </key>
-        <key id="keycode37" name="keycode37" column="0" row="4">
-            <bounds>3.121951,162.341463,56.195122,37.463415</bounds>
-            <oref>outline1</oref>
-            <symbols groups="1" levels="2">
-                <symbol name="cycle-keyboard" icon="input-keyboard-symbolic" label="⌨" category="keyname">cycle-keyboard</symbol>
-                <symbol name="preferences" icon="preferences-system-symbolic" label="☺" category="keyname">preferences</symbol>
-            </symbols>
-        </key>
-        <key id="keycode133" name="keycode133" column="1" row="4">
-            <bounds>62.439024,162.341463,48.390244,37.463415</bounds>
-            <oref>outline2</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="Control_L" label="Ctrl" category="keyname" keyval="65507">Control_L</keysym>
-            </symbols>
-        </key>
-        <key id="keycode64" name="keycode64" column="2" row="4">
-            <bounds>113.951220,162.341463,48.390244,37.463415</bounds>
-            <oref>outline2</oref>
-            <symbols groups="1" levels="2">
-                <keysym name="Alt_L" label="Alt" category="keyname" keyval="65513">Alt_L</keysym>
-                <keysym name="Meta_L" label="Meta" category="keyname" keyval="65511">Meta_L</keysym>
-            </symbols>
-        </key>
-        <key id="keycode65" name="keycode65" column="3" row="4">
-            <bounds>165.463415,162.341463,238.829268,37.463415</bounds>
-            <oref>outline11</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="space" category="letter" keyval="32">space</keysym>
-            </symbols>
-        </key>
-        <key id="keycode108" name="keycode108" column="4" row="4">
-            <bounds>407.414634,162.341463,48.390244,37.463415</bounds>
-            <oref>outline2</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="Left" label="⇠" category="keyname" keyval="65361">Left</keysym>
-            </symbols>
-        </key>
-        <key id="keycode134" name="keycode134" column="5" row="4">
-            <bounds>458.926829,162.341463,48.390244,37.463415</bounds>
-            <oref>outline2</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="Up" label="⇡" category="keyname" keyval="65362">Up</keysym>
-            </symbols>
-        </key>
-        <key id="keycode135" name="keycode135" column="6" row="4">
-            <bounds>508.878049,162.341463,48.390244,37.463415</bounds>
-            <oref>outline2</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="Down" label="⇣" category="keyname" keyval="65364">Down</keysym>
-            </symbols>
-        </key>
-        <key id="keycode105" name="keycode105" column="7" row="4">
-            <bounds>560.390244,162.341463,48.390244,37.463415</bounds>
-            <oref>outline2</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="Right" label="⇢" category="keyname" keyval="65363">Right</keysym>
-            </symbols>
-        </key>
-    </section>
-    <outline id="outline1">
-        <corner-radius>1.000000</corner-radius>
-        <point>0.000000,0.000000</point>
-        <point>56.195122,0.000000</point>
-        <point>56.195122,37.463415</point>
-        <point>0.000000,37.463415</point>
-    </outline>
-    <outline id="outline3">
-        <corner-radius>1.000000</corner-radius>
-        <point>0.000000,0.000000</point>
-        <point>37.463415,0.000000</point>
-        <point>37.463415,37.463415</point>
-        <point>0.000000,37.463415</point>
-    </outline>
-    <outline id="outline4">
-        <corner-radius>1.000000</corner-radius>
-        <point>0.000000,0.000000</point>
-        <point>79.609756,0.000000</point>
-        <point>79.609756,37.463415</point>
-        <point>0.000000,37.463415</point>
-    </outline>
-    <outline id="outline5">
-        <corner-radius>1.000000</corner-radius>
-        <point>0.000000,0.000000</point>
-        <point>59.317073,0.000000</point>
-        <point>59.317073,37.463415</point>
-        <point>0.000000,37.463415</point>
-    </outline>
-    <outline id="outline6">
-        <corner-radius>1.000000</corner-radius>
-        <point>0.000000,0.000000</point>
-        <point>59.317073,0.000000</point>
-        <point>59.317073,37.463415</point>
-        <point>0.000000,37.463415</point>
-    </outline>
-    <outline id="outline7">
-        <corner-radius>1.000000</corner-radius>
-        <point>0.000000,0.000000</point>
-        <point>68.682927,0.000000</point>
-        <point>68.682927,37.463415</point>
-        <point>0.000000,37.463415</point>
-    </outline>
-    <outline id="outline8">
-        <corner-radius>1.000000</corner-radius>
-        <point>0.000000,0.000000</point>
-        <point>88.975610,0.000000</point>
-        <point>88.975610,37.463415</point>
-        <point>0.000000,37.463415</point>
-    </outline>
-    <outline id="outline9">
-        <corner-radius>1.000000</corner-radius>
-        <point>0.000000,0.000000</point>
-        <point>88.975610,0.000000</point>
-        <point>88.975610,37.463415</point>
-        <point>0.000000,37.463415</point>
-    </outline>
-    <outline id="outline10">
-        <corner-radius>1.000000</corner-radius>
-        <point>0.000000,0.000000</point>
-        <point>109.268293,0.000000</point>
-        <point>109.268293,37.463415</point>
-        <point>0.000000,37.463415</point>
-    </outline>
-    <outline id="outline11">
-        <corner-radius>1.000000</corner-radius>
-        <point>0.000000,0.000000</point>
-        <point>238.829268,0.000000</point>
-        <point>238.829268,37.463415</point>
-        <point>0.000000,37.463415</point>
-    </outline>
-    <outline id="outline2">
-        <corner-radius>1.000000</corner-radius>
-        <point>0.000000,0.000000</point>
-        <point>48.390244,0.000000</point>
-        <point>48.390244,37.463415</point>
-        <point>0.000000,37.463415</point>
-    </outline>
-</keyboard>
-
--- a/data/keyboards/br.yaml
+++ b/data/keyboards/br.yaml
@@ -0,0 +1,78 @@
+---
+outlines:
+    default: { width: 35.33, height: 52 }
+    altline: { width: 52.67, height: 52 }
+    wide: { width: 62, height: 52 }
+    spaceline: { width: 142, height: 52 }
+    special: { width: 44, height: 52 }
+
+views:
+    base:
+        - "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     period Return"
+    numbers:
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "à À á Á ã Ã â Â é É"
+        - "show_symbols   ê Ê í Í ó Ó ô Ô"
+        - "show_letters        õ Õ ú Ú ü Ü period BackSpace"
+    symbols:
+        - "@ # $ % - + ÷ × = ≠"
+        - "( ) § & < > / * { }"
+        - "show_numbers_from_symbols     º \" ' colon ; ! ?  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"
+        action: erase
+    preferences:
+        action: show_prefs
+        outline: "special"
+        icon: "keyboard-mode-symbolic"
+    show_numbers:
+        action:
+            set_view: "numbers"
+        outline: "wide"
+        label: "1ã"
+    show_numbers_from_symbols:
+        action:
+            set_view: "numbers"
+        outline: "altline"
+        label: "1ã"
+    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/de.yaml
+++ b/data/keyboards/de.yaml
@@ -0,0 +1,82 @@
+# Maintained by: Mark Müller <markmueller86@gmail.com>
+---
+outlines:
+    default: { width: 35.33, height: 52 }
+    altline: { width: 52.67, height: 52 }
+    wide: { width: 62, height: 52 }
+    spaceline: { width: 99.67, height: 52 }
+    special: { width: 35.33, height: 52 }
+
+views:
+    base:
+        - "q w e r t z u i o p"
+        - "a s d f g h j k l"
+        - "Shift_L   y x c v b n m  BackSpace"
+        - "show_numbers show_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"
+        action: "erase"
+    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,81 @@
+# Maintained by: Mark Müller <markmueller86@gmail.com>
+---
+outlines:
+    default: { width: 48, height: 42 }
+    altline: { width: 81, height: 42 }
+    wide: { width: 108, height: 42 }
+    spaceline: { width: 216, height: 42 }
+    special: { width: 48, height: 42 }
+
+views:
+    base:
+        - "q w e r t z u i o p ü"
+        - "a s d f g h j k l ö ä"
+        - "Shift_L   y x c v b n m  BackSpace"
+        - "show_numbers preferences         space        , . Return"
+    upper:
+        - "Q W E R T Z U I O P Ü"
+        - "A S D F G H J K L Ö Ä"
+        - "Shift_L   Y X C V B N M  BackSpace"
+        - "show_numbers preferences         space        ! ? Return"
+    numbers:
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "@ # % & - _ + ( ) ß"
+        - "show_symbols   , \" ' : = < >  BackSpace"
+        - "show_letters preferences         space        , . Return"
+    symbols:
+        - "~ ` ´  · © ® ÷ × ¶"
+        - "€ £ $ ¥ ^ ° * { } |"
+        - "show_numbers   \\ / § π τ [ ]  BackSpace"
+        - "show_letters preferences         space        , . Return"
+    eschars:
+        - "ä è é ö ü Ä È É Ö Ü"
+        - "à â ê î ô À Â È Î Ô"
+        - "show_numbers  « » ç Ç æ œ ß  BackSpace"
+        - "show_letters preferences         space        „ “ Return"
+
+buttons:
+    Shift_L:
+        action:
+            locking:
+                lock_view: "upper"
+                unlock_view: "base"
+        outline: "altline"
+        icon: "key-shift"
+    BackSpace:
+        outline: "altline"
+        icon: "edit-clear-symbolic"
+        action: "erase"
+    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/dk.yaml
+++ b/data/keyboards/dk.yaml
@@ -0,0 +1,98 @@
+---
+outlines:
+    default: { width: 32, height: 52 }
+    altline: { width: 48.39024, height: 52 }
+    wide: { width: 62, height: 52 }
+    outline7: { width: 88.97561, height: 52 }
+    spaceline: { width: 150.5853, height: 52 }
+
+views:
+    base:
+        - "q w e r t y u i o p å"
+        - "a s d f g h j k l ø æ"
+        - "Shift_L   z x c v b n m  BackSpace"
+        - "show_numbers preferences         space        .    Return"
+    upper:
+        - "Q W E R T Y U I O P Å"
+        - "A S D F G H J K L Ø Æ"
+        - "Shift_L   Z X C V B N M  BackSpace"
+        - "show_numbers preferences         space        .    Return"
+    numbers:
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "@ # $ % & - _ + ( )"
+        - "show_symbols   , \" ' : ; ! ?  BackSpace"
+        - "show_letters preferences         space        .    Return"
+    symbols:
+        - "~ ` | U00B7 squareroot Greek_pi Greek_tau division multiply paragraph"
+        - "copyright U00AE U00A3 EuroSign U00A5 asciicircum degree * { }"
+        - "show_numbers   \\ / < > = [ ]  BackSpace"
+        - "show_letters preferences         space        .    Return"
+
+buttons:
+    Shift_L:
+        action:
+            locking:
+                lock_view: "upper"
+                unlock_view: "base"
+        outline: "altline"
+        icon: "key-shift"
+    BackSpace:
+        outline: "altline"
+        icon: "edit-clear-symbolic"
+        action: erase
+    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/emoji.yaml
+++ b/data/keyboards/emoji.yaml
@@ -0,0 +1,80 @@
+---
+outlines:
+    default: { width: 52, height: 52 }
+    altline: { width: 40, height: 52 }
+    narrow: { width: 22, height: 52 }
+
+views:
+    base:
+        - "😀 😁 😅 😂 😊 😇 🙃"
+        - "😍 😘 😋 😜 😎 🥳 😔"
+        - "😢 😭 😡 😱 🤔 😬 🙄"
+        - "preferences blank 1 2 3 4 5 6 blank BackSpace"
+    two:
+        - "🤩 🤨 🤓 😴 🤢 🤮 😈"
+        - "💩 🙌 👏 👍 👎 👌 👋"
+        - "💪 🖕 🙏 💋 🤦‍♀️ 🤷‍♀️ 💃"
+        - "preferences blank 1 2 3 4 5 6 blank BackSpace"
+    three:
+        - "🐶 🐱 🐯 🙈 🐴 🦄 🌳"
+        - "🍀 🌹 💫 ⭐️ ✨ 💥 🔥"
+        - "🌈 ☀️ 🌤 🌧 ⛄️ ☂️ 🌊"
+        - "preferences blank 1 2 3 4 5 6 blank BackSpace"
+    four:
+        - "🍎 🍓 🍑 🍍 🍆 🥑 🥦"
+        - "🍕 🎂 🍫 🍿 🍻 🍾 🍽"
+        - "⚽️ 🏀 🏓 🏆 🎹 🎸 🎯"
+        - "preferences blank 1 2 3 4 5 6 blank BackSpace"
+    five:
+        - "🚗 🚌 🚲 🚄 🚂 ✈️ 🛰"
+        - "🚀 🛸 🚁 🚦 🏝 🏔 ⛺️"
+        - "🏠 🏢 🏥 🏛 🛤 🌅 🎇"
+        - "preferences blank 1 2 3 4 5 6 blank BackSpace"
+    six:
+        - "⌚️ 📱 💻 🖥 🖨 🕹 ✉️"
+        - "📞 ☎️ ⏰ ⏳ 📈 📉 📌"
+        - "🎁 ❤️ 💕 💯 ✅ ❎ 📢"
+        - "preferences blank 1 2 3 4 5 6 blank BackSpace"
+
+buttons:
+    1:
+        action:
+            set_view: "base"
+        outline: "altline"
+        label: "1"
+    2:
+        action:
+            set_view: "two"
+        outline: "altline"
+        label: "2"
+    3:
+        action:
+            set_view: "three"
+        outline: "altline"
+        label: "3"
+    4:
+        action:
+            set_view: "four"
+        outline: "altline"
+        label: "4"
+    5:
+        action:
+            set_view: "five"
+        outline: "altline"
+        label: "5"
+    6:
+        action:
+            set_view: "six"
+        outline: "altline"
+        label: "6"
+    preferences:
+        action: "show_prefs"
+        outline: "altline"
+        icon: "keyboard-mode-symbolic"
+    BackSpace:
+        outline: "altline"
+        icon: "edit-clear-symbolic"
+        keysym: BackSpace
+    blank:
+        outline: "narrow"
+        text: ""
--- a/data/keyboards/es.yaml
+++ b/data/keyboards/es.yaml
@@ -0,0 +1,87 @@
+---
+outlines:
+    default: { width: 35.33, height: 52 }
+    altline: { width: 52.67, height: 52 }
+    wide: { width: 62, height: 52 }
+    spaceline: { width: 99.67, height: 52 }
+    special: { width: 44, height: 52 }
+
+views:
+    base:
+        - "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"
+        action: "erase"
+    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/fa.xml
+++ b/data/keyboards/fa.xml
@@ -1,683 +0,0 @@
-<?xml version="1.0"?>
-<keyboard version="0.90">
-    <bounds>0.000000,0.000000,640.000000,296.585366</bounds>
-    <section>
-        <bounds>15.609756,15.609756,640.000000,39.024390</bounds>
-        <angle>0</angle>
-        <row>
-            <columns>16</columns>
-            <orientation>1</orientation>
-        </row>
-        <key id="keycode9" name="keycode9" column="0" row="0">
-            <bounds>3.121951,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="Escape" label="Esc" category="keyname" keyval="65307">Escape</keysym>
-            </symbols>
-        </key>
-        <key id="keycode67" name="keycode67" column="1" row="0">
-            <bounds>84.292683,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F1" label="F1" category="function" keyval="65470">F1</keysym>
-            </symbols>
-        </key>
-        <key id="keycode68" name="keycode68" column="2" row="0">
-            <bounds>124.878049,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F2" label="F2" category="function" keyval="65471">F2</keysym>
-            </symbols>
-        </key>
-        <key id="keycode69" name="keycode69" column="3" row="0">
-            <bounds>165.463415,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F3" label="F3" category="function" keyval="65472">F3</keysym>
-            </symbols>
-        </key>
-        <key id="keycode70" name="keycode70" column="4" row="0">
-            <bounds>206.048780,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F4" label="F4" category="function" keyval="65473">F4</keysym>
-            </symbols>
-        </key>
-        <key id="keycode71" name="keycode71" column="5" row="0">
-            <bounds>266.926829,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F5" label="F5" category="function" keyval="65474">F5</keysym>
-            </symbols>
-        </key>
-        <key id="keycode72" name="keycode72" column="6" row="0">
-            <bounds>307.512195,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F6" label="F6" category="function" keyval="65475">F6</keysym>
-            </symbols>
-        </key>
-        <key id="keycode73" name="keycode73" column="7" row="0">
-            <bounds>348.097561,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F7" label="F7" category="function" keyval="65476">F7</keysym>
-            </symbols>
-        </key>
-        <key id="keycode74" name="keycode74" column="8" row="0">
-            <bounds>388.682927,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F8" label="F8" category="function" keyval="65477">F8</keysym>
-            </symbols>
-        </key>
-        <key id="keycode75" name="keycode75" column="9" row="0">
-            <bounds>449.560976,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F9" label="F9" category="function" keyval="65478">F9</keysym>
-            </symbols>
-        </key>
-        <key id="keycode76" name="keycode76" column="10" row="0">
-            <bounds>490.146341,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F10" label="F10" category="function" keyval="65479">F10</keysym>
-            </symbols>
-        </key>
-        <key id="keycode95" name="keycode95" column="11" row="0">
-            <bounds>530.731707,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F11" label="F11" category="function" keyval="65480">F11</keysym>
-            </symbols>
-        </key>
-        <key id="keycode96" name="keycode96" column="12" row="0">
-            <bounds>571.317073,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F12" label="F12" category="function" keyval="65481">F12</keysym>
-            </symbols>
-        </key>
-    </section>
-    <section>
-        <bounds>15.609756,78.048780,608.780488,201.365854</bounds>
-        <angle>0</angle>
-        <row>
-            <columns>14</columns>
-            <orientation>1</orientation>
-        </row>
-        <row>
-            <columns>14</columns>
-            <orientation>1</orientation>
-        </row>
-        <row>
-            <columns>13</columns>
-            <orientation>1</orientation>
-        </row>
-        <row>
-            <columns>12</columns>
-            <orientation>1</orientation>
-        </row>
-        <row>
-            <columns>8</columns>
-            <orientation>1</orientation>
-        </row>
-        <key id="keycode49" name="keycode49" column="0" row="0">
-            <bounds>3.121951,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <keysym name="quoteleft" label="`" category="letter" keyval="96">quoteleft</keysym>
-                <keysym name="asciitilde" label="~" category="letter" keyval="126">asciitilde</keysym>
-            </symbols>
-        </key>
-        <key id="keycode10" name="keycode10" column="1" row="0">
-            <bounds>43.707317,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="1" label="۱" category="letter">۱</text>
-                <keysym name="exclam" label="!" category="letter" keyval="33">exclam</keysym>
-            </symbols>
-        </key>
-        <key id="keycode11" name="keycode11" column="2" row="0">
-            <bounds>84.292683,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="2" label="۲" category="letter">۲</text>
-                <text name="at" label="٬" category="letter">٬</text>
-            </symbols>
-        </key>
-        <key id="keycode12" name="keycode12" column="3" row="0">
-            <bounds>124.878049,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="3" label="۳" category="letter">۳</text>
-                <text name="numbersign" label="٫" category="letter">٫</text>
-            </symbols>
-        </key>
-        <key id="keycode13" name="keycode13" column="4" row="0">
-            <bounds>165.463415,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="4" label="۴" category="letter">۴</text>
-                <keysym name="dollar" label="$" category="letter" keyval="36">dollar</keysym>
-            </symbols>
-        </key>
-        <key id="keycode14" name="keycode14" column="5" row="0">
-            <bounds>206.048780,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="3">
-                <text name="5" label="۵" category="letter">۵</text>
-                <text name="percent" label="٪" category="letter">٪</text>
-                <keysym name="EuroSign" label="€" category="letter" keyval="8364">EuroSign</keysym>
-            </symbols>
-        </key>
-        <key id="keycode15" name="keycode15" column="6" row="0">
-            <bounds>245.073171,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="6" label="۶" category="letter">۶</text>
-                <text name="asciicircum" label="×" category="letter">×</text>
-            </symbols>
-        </key>
-        <key id="keycode16" name="keycode16" column="7" row="0">
-            <bounds>285.658537,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="7" label="۷" category="letter">۷</text>
-                <text name="ampersand" label="،" category="letter">،</text>
-            </symbols>
-        </key>
-        <key id="keycode17" name="keycode17" column="8" row="0">
-            <bounds>326.243902,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="8" label="۸" category="letter">۸</text>
-                <keysym name="asterisk" label="*" category="letter" keyval="42">asterisk</keysym>
-            </symbols>
-        </key>
-        <key id="keycode18" name="keycode18" column="9" row="0">
-            <bounds>366.829268,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="9" label="۹" category="letter">۹</text>
-                <text name="parenleft" label=")" category="letter">)</text>
-            </symbols>
-        </key>
-        <key id="keycode19" name="keycode19" column="10" row="0">
-            <bounds>407.414634,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="0" label="۰" category="letter">۰</text>
-                <text name="parenright" label="(" category="letter">(</text>
-            </symbols>
-        </key>
-        <key id="keycode20" name="keycode20" column="11" row="0">
-            <bounds>448.000000,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <keysym name="minus" label="-" category="letter" keyval="45">minus</keysym>
-                <keysym name="underscore" label="_" category="letter" keyval="95">underscore</keysym>
-            </symbols>
-        </key>
-        <key id="keycode21" name="keycode21" column="12" row="0">
-            <bounds>488.585366,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <keysym name="equal" label="=" category="letter" keyval="61">equal</keysym>
-                <keysym name="plus" label="+" category="letter" keyval="43">plus</keysym>
-            </symbols>
-        </key>
-        <key id="keycode22" name="keycode22" column="13" row="0">
-            <bounds>529.170732,1.560976,79.609756,37.463415</bounds>
-            <oref>outline4</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="BackSpace" label="←" category="keyname" keyval="65288">BackSpace</keysym>
-            </symbols>
-        </key>
-        <key id="keycode23" name="keycode23" column="0" row="1">
-            <bounds>3.121951,42.146341,59.317073,37.463415</bounds>
-            <oref>outline5</oref>
-            <symbols groups="1" levels="2">
-                <keysym name="Tab" label="⇥" category="keyname" keyval="65289">Tab</keysym>
-                <keysym name="ISO_Left_Tab" label="⇤" category="keyname" keyval="65056">ISO_Left_Tab</keysym>
-            </symbols>
-        </key>
-        <key id="keycode24" name="keycode24" column="1" row="1">
-            <bounds>65.560976,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="q" label="ض" category="letter">ض</text>
-                <text name="Q" label="ْ" category="letter">ْ</text>
-            </symbols>
-        </key>
-        <key id="keycode25" name="keycode25" column="2" row="1">
-            <bounds>106.146341,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="w" label="ص" category="letter">ص</text>
-                <text name="W" label="ٌ" category="letter">ٌ</text>
-            </symbols>
-        </key>
-        <key id="keycode26" name="keycode26" column="3" row="1">
-            <bounds>145.170732,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="e" label="ث" category="letter">ث</text>
-                <text name="E" label="ٍ" category="letter">ٍ</text>
-            </symbols>
-        </key>
-        <key id="keycode27" name="keycode27" column="4" row="1">
-            <bounds>185.756098,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="r" label="ق" category="letter">ق</text>
-                <text name="R" label="ً" category="letter">ً</text>
-            </symbols>
-        </key>
-        <key id="keycode28" name="keycode28" column="5" row="1">
-            <bounds>226.341463,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="t" label="ف" category="letter">ف</text>
-                <text name="T" label="ُ" category="letter">ُ</text>
-            </symbols>
-        </key>
-        <key id="keycode29" name="keycode29" column="6" row="1">
-            <bounds>266.926829,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="y" label="غ" category="letter">غ</text>
-                <text name="Y" label="ِ" category="letter">ِ</text>
-            </symbols>
-        </key>
-        <key id="keycode30" name="keycode30" column="7" row="1">
-            <bounds>307.512195,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="u" label="ع" category="letter">ع</text>
-                <text name="U" label="َ" category="letter">َ</text>
-            </symbols>
-        </key>
-        <key id="keycode31" name="keycode31" column="8" row="1">
-            <bounds>348.097561,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="i" label="ه" category="letter">ه</text>
-                <text name="I" label="ّ" category="letter">ّ</text>
-            </symbols>
-        </key>
-        <key id="keycode32" name="keycode32" column="9" row="1">
-            <bounds>388.682927,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="o" label="خ" category="letter">خ</text>
-                <text name="O" label="]" category="letter">]</text>
-            </symbols>
-        </key>
-        <key id="keycode33" name="keycode33" column="10" row="1">
-            <bounds>429.268293,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="p" label="ح" category="letter">ح</text>
-                <text name="P" label="[" category="letter">[</text>
-            </symbols>
-        </key>
-        <key id="keycode34" name="keycode34" column="11" row="1">
-            <bounds>468.292683,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="bracketleft" label="ج" category="letter">ج</text>
-                <text name="braceleft" label="}" category="letter">}</text>
-            </symbols>
-        </key>
-        <key id="keycode35" name="keycode35" column="12" row="1">
-            <bounds>508.878049,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="bracketright" label="چ" category="letter">چ</text>
-                <text name="braceright" label="{" category="letter">{</text>
-            </symbols>
-        </key>
-        <key id="keycode51" name="keycode51" column="13" row="1">
-            <bounds>549.463415,42.146341,59.317073,37.463415</bounds>
-            <oref>outline6</oref>
-            <symbols groups="1" levels="2">
-                <keysym name="backslash" label="\" category="letter" keyval="92">backslash</keysym>
-                <keysym name="bar" label="|" category="letter" keyval="124">bar</keysym>
-            </symbols>
-        </key>
-        <key id="keycode66" name="keycode66" column="0" row="2">
-            <bounds>3.121951,82.731707,68.682927,37.463415</bounds>
-            <oref>outline7</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="ISO_Level3_Shift" label="⇮" category="keyname" keyval="65027">ISO_Level3_Shift</keysym>
-            </symbols>
-        </key>
-        <key id="keycode38" name="keycode38" column="1" row="2">
-            <bounds>76.487805,82.731707,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="a" label="ش" category="letter">ش</text>
-                <text name="A" label="ؤ" category="letter">ؤ</text>
-            </symbols>
-        </key>
-        <key id="keycode39" name="keycode39" column="2" row="2">
-            <bounds>115.512195,82.731707,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="s" label="س" category="letter">س</text>
-                <text name="S" label="ئ" category="letter">ئ</text>
-            </symbols>
-        </key>
-        <key id="keycode40" name="keycode40" column="3" row="2">
-            <bounds>156.097561,82.731707,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="d" label="ی" category="letter">ی</text>
-                <text name="D" label="ي" category="letter">ي</text>
-            </symbols>
-        </key>
-        <key id="keycode41" name="keycode41" column="4" row="2">
-            <bounds>196.682927,82.731707,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="f" label="ب" category="letter">ب</text>
-                <text name="F" label="إ" category="letter">إ</text>
-            </symbols>
-        </key>
-        <key id="keycode42" name="keycode42" column="5" row="2">
-            <bounds>237.268293,82.731707,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="g" label="ل" category="letter">ل</text>
-                <text name="G" label="أ" category="letter">أ</text>
-            </symbols>
-        </key>
-        <key id="keycode43" name="keycode43" column="6" row="2">
-            <bounds>277.853659,82.731707,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="h" label="ا" category="letter">ا</text>
-                <text name="H" label="آ" category="letter">آ</text>
-            </symbols>
-        </key>
-        <key id="keycode44" name="keycode44" column="7" row="2">
-            <bounds>318.439024,82.731707,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="j" label="ت" category="letter">ت</text>
-                <text name="J" label="ة" category="letter">ة</text>
-            </symbols>
-        </key>
-        <key id="keycode45" name="keycode45" column="8" row="2">
-            <bounds>359.024390,82.731707,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="k" label="ن" category="letter">ن</text>
-                <text name="K" label="»" category="letter">»</text>
-            </symbols>
-        </key>
-        <key id="keycode46" name="keycode46" column="9" row="2">
-            <bounds>399.609756,82.731707,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="l" label="م" category="letter">م</text>
-                <text name="L" label="«" category="letter">«</text>
-            </symbols>
-        </key>
-        <key id="keycode47" name="keycode47" column="10" row="2">
-            <bounds>438.634146,82.731707,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="semicolon" label="ک" category="letter">ک</text>
-                <keysym name="colon" label=":" category="letter" keyval="58">colon</keysym>
-            </symbols>
-        </key>
-        <key id="keycode48" name="keycode48" column="11" row="2">
-            <bounds>479.219512,82.731707,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <keysym name="quoteright" label="&apos;" category="letter" keyval="39">quoteright</keysym>
-                <text name="quotedbl" label="؛" category="letter">؛</text>
-            </symbols>
-        </key>
-        <key id="keycode36" name="keycode36" column="12" row="2">
-            <bounds>519.804878,82.731707,88.975610,37.463415</bounds>
-            <oref>outline8</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="Return" label="↵" category="keyname" keyval="65293">Return</keysym>
-            </symbols>
-        </key>
-        <key id="keycode50" name="keycode50" column="0" row="3">
-            <bounds>3.121951,121.756098,88.975610,37.463415</bounds>
-            <oref>outline9</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="Shift_L" label="⇧" category="keyname" keyval="65505">Shift_L</keysym>
-            </symbols>
-        </key>
-        <key id="keycode52" name="keycode52" column="1" row="3">
-            <bounds>95.219512,121.756098,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="z" label="ظ" category="letter">ظ</text>
-                <text name="Z" label="ك" category="letter">ك</text>
-            </symbols>
-        </key>
-        <key id="keycode53" name="keycode53" column="2" row="3">
-            <bounds>135.804878,121.756098,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="x" label="ط" category="letter">ط</text>
-                <keysym name="X" label="X" category="letter" keyval="88">X</keysym>
-            </symbols>
-        </key>
-        <key id="keycode54" name="keycode54" column="3" row="3">
-            <bounds>176.390244,121.756098,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="c" label="ز" category="letter">ز</text>
-                <text name="C" label="ژ" category="letter">ژ</text>
-            </symbols>
-        </key>
-        <key id="keycode55" name="keycode55" column="4" row="3">
-            <bounds>215.414634,121.756098,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="v" label="ر" category="letter">ر</text>
-                <keysym name="V" label="V" category="letter" keyval="86">V</keysym>
-            </symbols>
-        </key>
-        <key id="keycode56" name="keycode56" column="5" row="3">
-            <bounds>256.000000,121.756098,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="b" label="ذ" category="letter">ذ</text>
-                <text name="B" label="‌" category="letter">‌</text>
-            </symbols>
-        </key>
-        <key id="keycode57" name="keycode57" column="6" row="3">
-            <bounds>296.585366,121.756098,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="n" label="د" category="letter">د</text>
-                <text name="N" category="letter"></text>
-            </symbols>
-        </key>
-        <key id="keycode58" name="keycode58" column="7" row="3">
-            <bounds>337.170732,121.756098,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="m" label="پ" category="letter">پ</text>
-                <text name="M" label="ء" category="letter">ء</text>
-            </symbols>
-        </key>
-        <key id="keycode59" name="keycode59" column="8" row="3">
-            <bounds>377.756098,121.756098,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="comma" label="و" category="letter">و</text>
-                <text name="less" label="&gt;" category="letter">&gt;</text>
-            </symbols>
-        </key>
-        <key id="keycode60" name="keycode60" column="9" row="3">
-            <bounds>418.341463,121.756098,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <keysym name="period" label="." category="letter" keyval="46">period</keysym>
-                <text name="greater" label="&lt;" category="letter">&lt;</text>
-            </symbols>
-        </key>
-        <key id="keycode61" name="keycode61" column="10" row="3">
-            <bounds>458.926829,121.756098,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <keysym name="slash" label="/" category="letter" keyval="47">slash</keysym>
-                <text name="question" label="؟" category="letter">؟</text>
-            </symbols>
-        </key>
-        <key id="keycode62" name="keycode62" column="11" row="3">
-            <bounds>499.512195,121.756098,109.268293,37.463415</bounds>
-            <oref>outline10</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="Shift_R" label="⇧" category="keyname" keyval="65506">Shift_R</keysym>
-            </symbols>
-        </key>
-        <key id="keycode37" name="keycode37" column="0" row="4">
-            <bounds>3.121951,162.341463,56.195122,37.463415</bounds>
-            <oref>outline1</oref>
-            <symbols groups="1" levels="2">
-                <symbol name="cycle-keyboard" icon="input-keyboard-symbolic" label="⌨" category="keyname">cycle-keyboard</symbol>
-                <symbol name="preferences" icon="preferences-system-symbolic" label="☺" category="keyname">preferences</symbol>
-            </symbols>
-        </key>
-        <key id="keycode133" name="keycode133" column="1" row="4">
-            <bounds>62.439024,162.341463,48.390244,37.463415</bounds>
-            <oref>outline2</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="Control_L" label="Ctrl" category="keyname" keyval="65507">Control_L</keysym>
-            </symbols>
-        </key>
-        <key id="keycode64" name="keycode64" column="2" row="4">
-            <bounds>113.951220,162.341463,48.390244,37.463415</bounds>
-            <oref>outline2</oref>
-            <symbols groups="1" levels="2">
-                <keysym name="Alt_L" label="Alt" category="keyname" keyval="65513">Alt_L</keysym>
-                <keysym name="Meta_L" label="Meta" category="keyname" keyval="65511">Meta_L</keysym>
-            </symbols>
-        </key>
-        <key id="keycode65" name="keycode65" column="3" row="4">
-            <bounds>165.463415,162.341463,238.829268,37.463415</bounds>
-            <oref>outline11</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="space" category="letter" keyval="32">space</keysym>
-            </symbols>
-        </key>
-        <key id="keycode108" name="keycode108" column="4" row="4">
-            <bounds>407.414634,162.341463,48.390244,37.463415</bounds>
-            <oref>outline2</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="Left" label="⇠" category="keyname" keyval="65361">Left</keysym>
-            </symbols>
-        </key>
-        <key id="keycode134" name="keycode134" column="5" row="4">
-            <bounds>458.926829,162.341463,48.390244,37.463415</bounds>
-            <oref>outline2</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="Up" label="⇡" category="keyname" keyval="65362">Up</keysym>
-            </symbols>
-        </key>
-        <key id="keycode135" name="keycode135" column="6" row="4">
-            <bounds>508.878049,162.341463,48.390244,37.463415</bounds>
-            <oref>outline2</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="Down" label="⇣" category="keyname" keyval="65364">Down</keysym>
-            </symbols>
-        </key>
-        <key id="keycode105" name="keycode105" column="7" row="4">
-            <bounds>560.390244,162.341463,48.390244,37.463415</bounds>
-            <oref>outline2</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="Right" label="⇢" category="keyname" keyval="65363">Right</keysym>
-            </symbols>
-        </key>
-    </section>
-    <outline id="outline1">
-        <corner-radius>1.000000</corner-radius>
-        <point>0.000000,0.000000</point>
-        <point>56.195122,0.000000</point>
-        <point>56.195122,37.463415</point>
-        <point>0.000000,37.463415</point>
-    </outline>
-    <outline id="outline3">
-        <corner-radius>1.000000</corner-radius>
-        <point>0.000000,0.000000</point>
-        <point>37.463415,0.000000</point>
-        <point>37.463415,37.463415</point>
-        <point>0.000000,37.463415</point>
-    </outline>
-    <outline id="outline4">
-        <corner-radius>1.000000</corner-radius>
-        <point>0.000000,0.000000</point>
-        <point>79.609756,0.000000</point>
-        <point>79.609756,37.463415</point>
-        <point>0.000000,37.463415</point>
-    </outline>
-    <outline id="outline5">
-        <corner-radius>1.000000</corner-radius>
-        <point>0.000000,0.000000</point>
-        <point>59.317073,0.000000</point>
-        <point>59.317073,37.463415</point>
-        <point>0.000000,37.463415</point>
-    </outline>
-    <outline id="outline6">
-        <corner-radius>1.000000</corner-radius>
-        <point>0.000000,0.000000</point>
-        <point>59.317073,0.000000</point>
-        <point>59.317073,37.463415</point>
-        <point>0.000000,37.463415</point>
-    </outline>
-    <outline id="outline7">
-        <corner-radius>1.000000</corner-radius>
-        <point>0.000000,0.000000</point>
-        <point>68.682927,0.000000</point>
-        <point>68.682927,37.463415</point>
-        <point>0.000000,37.463415</point>
-    </outline>
-    <outline id="outline8">
-        <corner-radius>1.000000</corner-radius>
-        <point>0.000000,0.000000</point>
-        <point>88.975610,0.000000</point>
-        <point>88.975610,37.463415</point>
-        <point>0.000000,37.463415</point>
-    </outline>
-    <outline id="outline9">
-        <corner-radius>1.000000</corner-radius>
-        <point>0.000000,0.000000</point>
-        <point>88.975610,0.000000</point>
-        <point>88.975610,37.463415</point>
-        <point>0.000000,37.463415</point>
-    </outline>
-    <outline id="outline10">
-        <corner-radius>1.000000</corner-radius>
-        <point>0.000000,0.000000</point>
-        <point>109.268293,0.000000</point>
-        <point>109.268293,37.463415</point>
-        <point>0.000000,37.463415</point>
-    </outline>
-    <outline id="outline11">
-        <corner-radius>1.000000</corner-radius>
-        <point>0.000000,0.000000</point>
-        <point>238.829268,0.000000</point>
-        <point>238.829268,37.463415</point>
-        <point>0.000000,37.463415</point>
-    </outline>
-    <outline id="outline2">
-        <corner-radius>1.000000</corner-radius>
-        <point>0.000000,0.000000</point>
-        <point>48.390244,0.000000</point>
-        <point>48.390244,37.463415</point>
-        <point>0.000000,37.463415</point>
-    </outline>
-</keyboard>
-
--- a/data/keyboards/fi.yaml
+++ b/data/keyboards/fi.yaml
@@ -0,0 +1,171 @@
+---
+outlines:
+    default: { width: 32, height: 52 }
+    altline: { width: 48.39024, height: 52 }
+    wide: { width: 62, height: 52 }
+    outline7: { width: 88.97561, height: 52 }
+    spaceline: { width: 150.5853, height: 52 }
+
+views:
+    base:
+        - "q w e r t y u i o p å"
+        - "a s d f g h j k l ö ä"
+        - "Shift_L   z x c v b n m  BackSpace"
+        - "show_numbers preferences         space        .    Return"
+    upper:
+        - "Q W E R T Y U I O P Å"
+        - "A S D F G H J K L Ö Ä"
+        - "Shift_L   Z X C V B N M  BackSpace"
+        - "show_numbers preferences         space        .    Return"
+    numbers:
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "at numbersign dollar percent ampersand minus underscore plus parenleft parenright"
+        - "show_symbols   comma quotedbl quoteright colon semicolon exclam question  BackSpace"
+        - "show_letters preferences         space        .    Return"
+    symbols:
+        - "asciitilde quoteleft bar U00B7 squareroot Greek_pi Greek_tau division multiply paragraph"
+        - "copyright U00AE U00A3 EuroSign U00A5 asciicircum degree asterisk braceleft braceright"
+        - "show_numbers   backslash slash less greater equal bracketleft bracketright  BackSpace"
+        - "show_letters preferences         space        .    Return"
+
+buttons:
+    Shift_L:
+        action:
+            locking:
+                lock_view: "upper"
+                unlock_view: "base"
+        outline: "altline"
+        icon: "key-shift"
+    BackSpace:
+        outline: "altline"
+        icon: "edit-clear-symbolic"
+        action: "erase"
+    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/fr.yaml
+++ b/data/keyboards/fr.yaml
@@ -0,0 +1,89 @@
+---
+outlines:
+    default:   { width: 35.33, height: 52 }
+    altline:   { width: 52.67, height: 52 }
+    wide:      { width: 59,    height: 52 }
+    spaceline: { width: 140,   height: 52 }
+    special:   { width: 44,    height: 52 }
+
+views:
+    base:
+        - "a z e r t y u i o p"
+        - "q s d f g h j k l m"
+        - "Shift_L   w x c v b n .   BackSpace"
+        - "show_numbers preferences         space        show_eschars Return"
+    upper:
+        - "A Z E R T Y U I O P"
+        - "Q S D F G H J K L M"
+        - "Shift_L   W X C V B N ,  BackSpace"
+        - "show_numbers preferences         space        show_eschars Return"
+    numbers:
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "@ # € % & - _ + ( )"
+        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
+        - "show_letters preferences         space        show_eschars Return"
+    symbols:
+        - "~ ` | · √ π τ ÷ × ¶"
+        - "© ® £ $ ¥ ^ ° * { }"
+        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
+        - "show_letters preferences         space        show_eschars Return"
+    eschars:
+        - "à â ç é è ê î ô ù û"
+        - "À Â Ç É È Ê Î Ô Ù Û"
+        - "show_numbers_from_symbols  æ œ ä ë ï ö ü  BackSpace"
+        - "show_letters preferences         space        show_eschars Return"
+
+buttons:
+    Shift_L:
+        action:
+            locking:
+                lock_view: "upper"
+                unlock_view: "base"
+        outline: "altline"
+        icon: "key-shift"
+    BackSpace:
+        outline: "altline"
+        icon: "edit-clear-symbolic"
+        action: erase
+    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: "*/="
+    show_eschars:
+        action:
+            locking:
+                lock_view: "eschars"
+                unlock_view: "base"
+        outline: "altline"
+        label: "âÂ"
+    space:
+        outline: "spaceline"
+        text: " "
+    Return:
+        outline: "wide"
+        icon: "key-enter"
+        keysym: "Return"
+    colon:
+        text: ":"
+    "\"":
+        keysym: "quotedbl"
--- a/data/keyboards/fr_wide.yaml
+++ b/data/keyboards/fr_wide.yaml
@@ -0,0 +1,89 @@
+---
+outlines:
+    default:   { width: 54,  height: 42 }
+    altline:   { width: 81,  height: 42 }
+    wide:      { width: 100, height: 42 }
+    spaceline: { width: 205, height: 42 }
+    special:   { width: 54,  height: 42 }
+
+views:
+    base:
+        - "a z e r t y u i o p"
+        - "q s d f g h j k l m"
+        - "Shift_L   w x c v b n .   BackSpace"
+        - "show_numbers preferences         space        show_eschars Return"
+    upper:
+        - "A Z E R T Y U I O P"
+        - "Q S D F G H J K L M"
+        - "Shift_L   W X C V B N ,  BackSpace"
+        - "show_numbers preferences         space        show_eschars Return"
+    numbers:
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "@ # € % & - _ + ( )"
+        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
+        - "show_letters preferences         space        show_eschars Return"
+    symbols:
+        - "~ ` | · √ π τ ÷ × ¶"
+        - "© ® £ $ ¥ ^ ° * { }"
+        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
+        - "show_letters preferences         space        show_eschars Return"
+    eschars:
+        - "à â ç é è ê î ô ù û"
+        - "À Â Ç É È Ê Î Ô Ù Û"
+        - "show_numbers_from_symbols  æ œ ä ë ï ö ü  BackSpace"
+        - "show_letters preferences         space        show_eschars Return"
+
+buttons:
+    Shift_L:
+        action:
+            locking:
+                lock_view: "upper"
+                unlock_view: "base"
+        outline: "altline"
+        icon: "key-shift"
+    BackSpace:
+        outline: "altline"
+        icon: "edit-clear-symbolic"
+        action: erase
+    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: "*/="
+    show_eschars:
+        action:
+            locking:
+                lock_view: "eschars"
+                unlock_view: "base"
+        outline: "altline"
+        label: "âÂ"
+    space:
+        outline: "spaceline"
+        text: " "
+    Return:
+        outline: "wide"
+        icon: "key-enter"
+        keysym: "Return"
+    colon:
+        text: ":"
+    "\"":
+        keysym: "quotedbl"
--- a/data/keyboards/gr.yaml
+++ b/data/keyboards/gr.yaml
@@ -0,0 +1,191 @@
+# Greek layout created by Antonis Tsolomitis
+# University of the Aegean, Department of Mathematics, atsol@aegean.gr
+# Sep 2019
+---
+outlines:
+    default: { width: 32, height: 52 }
+    altline: { width: 48.39024, height: 52 }
+    wide: { width: 62, height: 52 }
+    outline7: { width: 88.97561, height: 52 }
+    spaceline: { width: 150.5853, height: 52 }
+
+views:
+    base:
+        - "; ς ε ρ τ υ θ ι ο π !"
+        - "α σ δ φ γ η ξ κ λ 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"
+        action: "erase"
+    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/gu-inscript.xml
+++ b/data/keyboards/gu-inscript.xml
@@ -1,683 +0,0 @@
-<?xml version="1.0"?>
-<keyboard version="0.90">
-    <bounds>0.000000,0.000000,640.000000,296.585366</bounds>
-    <section>
-        <bounds>15.609756,15.609756,640.000000,39.024390</bounds>
-        <angle>0</angle>
-        <row>
-            <columns>16</columns>
-            <orientation>1</orientation>
-        </row>
-        <key id="keycode9" name="keycode9" column="0" row="0">
-            <bounds>3.121951,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="Escape" label="Esc" category="keyname" keyval="65307">Escape</keysym>
-            </symbols>
-        </key>
-        <key id="keycode67" name="keycode67" column="1" row="0">
-            <bounds>84.292683,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F1" label="F1" category="function" keyval="65470">F1</keysym>
-            </symbols>
-        </key>
-        <key id="keycode68" name="keycode68" column="2" row="0">
-            <bounds>124.878049,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F2" label="F2" category="function" keyval="65471">F2</keysym>
-            </symbols>
-        </key>
-        <key id="keycode69" name="keycode69" column="3" row="0">
-            <bounds>165.463415,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F3" label="F3" category="function" keyval="65472">F3</keysym>
-            </symbols>
-        </key>
-        <key id="keycode70" name="keycode70" column="4" row="0">
-            <bounds>206.048780,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F4" label="F4" category="function" keyval="65473">F4</keysym>
-            </symbols>
-        </key>
-        <key id="keycode71" name="keycode71" column="5" row="0">
-            <bounds>266.926829,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F5" label="F5" category="function" keyval="65474">F5</keysym>
-            </symbols>
-        </key>
-        <key id="keycode72" name="keycode72" column="6" row="0">
-            <bounds>307.512195,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F6" label="F6" category="function" keyval="65475">F6</keysym>
-            </symbols>
-        </key>
-        <key id="keycode73" name="keycode73" column="7" row="0">
-            <bounds>348.097561,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F7" label="F7" category="function" keyval="65476">F7</keysym>
-            </symbols>
-        </key>
-        <key id="keycode74" name="keycode74" column="8" row="0">
-            <bounds>388.682927,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F8" label="F8" category="function" keyval="65477">F8</keysym>
-            </symbols>
-        </key>
-        <key id="keycode75" name="keycode75" column="9" row="0">
-            <bounds>449.560976,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F9" label="F9" category="function" keyval="65478">F9</keysym>
-            </symbols>
-        </key>
-        <key id="keycode76" name="keycode76" column="10" row="0">
-            <bounds>490.146341,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F10" label="F10" category="function" keyval="65479">F10</keysym>
-            </symbols>
-        </key>
-        <key id="keycode95" name="keycode95" column="11" row="0">
-            <bounds>530.731707,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F11" label="F11" category="function" keyval="65480">F11</keysym>
-            </symbols>
-        </key>
-        <key id="keycode96" name="keycode96" column="12" row="0">
-            <bounds>571.317073,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F12" label="F12" category="function" keyval="65481">F12</keysym>
-            </symbols>
-        </key>
-    </section>
-    <section>
-        <bounds>15.609756,78.048780,608.780488,201.365854</bounds>
-        <angle>0</angle>
-        <row>
-            <columns>14</columns>
-            <orientation>1</orientation>
-        </row>
-        <row>
-            <columns>14</columns>
-            <orientation>1</orientation>
-        </row>
-        <row>
-            <columns>13</columns>
-            <orientation>1</orientation>
-        </row>
-        <row>
-            <columns>12</columns>
-            <orientation>1</orientation>
-        </row>
-        <row>
-            <columns>8</columns>
-            <orientation>1</orientation>
-        </row>
-        <key id="keycode49" name="keycode49" column="0" row="0">
-            <bounds>3.121951,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <keysym name="quoteleft" label="`" category="letter" keyval="96">quoteleft</keysym>
-                <text name="asciitilde" label="~" category="letter">~</text>
-            </symbols>
-        </key>
-        <key id="keycode10" name="keycode10" column="1" row="0">
-            <bounds>43.707317,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="1" label="૧" category="letter">૧</text>
-                <text name="exclam" label="ઍ" category="letter">ઍ</text>
-            </symbols>
-        </key>
-        <key id="keycode11" name="keycode11" column="2" row="0">
-            <bounds>84.292683,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="2" label="૨" category="letter">૨</text>
-                <text name="at" label="ૅ" category="letter">ૅ</text>
-            </symbols>
-        </key>
-        <key id="keycode12" name="keycode12" column="3" row="0">
-            <bounds>124.878049,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="3" label="૩" category="letter">૩</text>
-                <text name="numbersign" label="ૠ" category="letter">ૠ</text>
-            </symbols>
-        </key>
-        <key id="keycode13" name="keycode13" column="4" row="0">
-            <bounds>165.463415,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="4" label="૪" category="letter">૪</text>
-                <text name="dollar" label="ૄ" category="letter">ૄ</text>
-            </symbols>
-        </key>
-        <key id="keycode14" name="keycode14" column="5" row="0">
-            <bounds>206.048780,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="3">
-                <text name="5" label="૫" category="letter">૫</text>
-                <text name="percent" label="જ્ઞ" category="letter">જ્ઞ</text>
-                <keysym name="EuroSign" label="€" category="letter" keyval="8364">EuroSign</keysym>
-            </symbols>
-        </key>
-        <key id="keycode15" name="keycode15" column="6" row="0">
-            <bounds>245.073171,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="6" label="૬" category="letter">૬</text>
-                <text name="asciicircum" label="ત્ર" category="letter">ત્ર</text>
-            </symbols>
-        </key>
-        <key id="keycode16" name="keycode16" column="7" row="0">
-            <bounds>285.658537,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="7" label="૭" category="letter">૭</text>
-                <text name="ampersand" label="ક્ષ" category="letter">ક્ષ</text>
-            </symbols>
-        </key>
-        <key id="keycode17" name="keycode17" column="8" row="0">
-            <bounds>326.243902,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="8" label="૮" category="letter">૮</text>
-                <text name="asterisk" label="શ્ર" category="letter">શ્ર</text>
-            </symbols>
-        </key>
-        <key id="keycode18" name="keycode18" column="9" row="0">
-            <bounds>366.829268,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="9" label="૯" category="letter">૯</text>
-                <text name="parenleft" label="(" category="letter">(</text>
-            </symbols>
-        </key>
-        <key id="keycode19" name="keycode19" column="10" row="0">
-            <bounds>407.414634,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="0" label="૦" category="letter">૦</text>
-                <text name="parenright" label=")" category="letter">)</text>
-            </symbols>
-        </key>
-        <key id="keycode20" name="keycode20" column="11" row="0">
-            <bounds>448.000000,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="minus" label="-" category="letter">-</text>
-                <text name="underscore" label="ઃ" category="letter">ઃ</text>
-            </symbols>
-        </key>
-        <key id="keycode21" name="keycode21" column="12" row="0">
-            <bounds>488.585366,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="equal" label="ૃ" category="letter">ૃ</text>
-                <text name="plus" label="ઋ" category="letter">ઋ</text>
-            </symbols>
-        </key>
-        <key id="keycode22" name="keycode22" column="13" row="0">
-            <bounds>529.170732,1.560976,79.609756,37.463415</bounds>
-            <oref>outline4</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="BackSpace" label="←" category="keyname" keyval="65288">BackSpace</keysym>
-            </symbols>
-        </key>
-        <key id="keycode23" name="keycode23" column="0" row="1">
-            <bounds>3.121951,42.146341,59.317073,37.463415</bounds>
-            <oref>outline5</oref>
-            <symbols groups="1" levels="2">
-                <keysym name="Tab" label="⇥" category="keyname" keyval="65289">Tab</keysym>
-                <keysym name="ISO_Left_Tab" label="⇤" category="keyname" keyval="65056">ISO_Left_Tab</keysym>
-            </symbols>
-        </key>
-        <key id="keycode24" name="keycode24" column="1" row="1">
-            <bounds>65.560976,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="q" label="ૌ" category="letter">ૌ</text>
-                <text name="Q" label="ઔ" category="letter">ઔ</text>
-            </symbols>
-        </key>
-        <key id="keycode25" name="keycode25" column="2" row="1">
-            <bounds>106.146341,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="w" label="ૈ" category="letter">ૈ</text>
-                <text name="W" label="ઐ" category="letter">ઐ</text>
-            </symbols>
-        </key>
-        <key id="keycode26" name="keycode26" column="3" row="1">
-            <bounds>145.170732,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="e" label="ા" category="letter">ા</text>
-                <text name="E" label="આ" category="letter">આ</text>
-            </symbols>
-        </key>
-        <key id="keycode27" name="keycode27" column="4" row="1">
-            <bounds>185.756098,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="r" label="ી" category="letter">ી</text>
-                <text name="R" label="ઈ" category="letter">ઈ</text>
-            </symbols>
-        </key>
-        <key id="keycode28" name="keycode28" column="5" row="1">
-            <bounds>226.341463,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="t" label="ૂ" category="letter">ૂ</text>
-                <text name="T" label="ઊ" category="letter">ઊ</text>
-            </symbols>
-        </key>
-        <key id="keycode29" name="keycode29" column="6" row="1">
-            <bounds>266.926829,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="y" label="બ" category="letter">બ</text>
-                <text name="Y" label="ભ" category="letter">ભ</text>
-            </symbols>
-        </key>
-        <key id="keycode30" name="keycode30" column="7" row="1">
-            <bounds>307.512195,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="u" label="હ" category="letter">હ</text>
-                <text name="U" label="ઙ" category="letter">ઙ</text>
-            </symbols>
-        </key>
-        <key id="keycode31" name="keycode31" column="8" row="1">
-            <bounds>348.097561,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="i" label="ગ" category="letter">ગ</text>
-                <text name="I" label="ઘ" category="letter">ઘ</text>
-            </symbols>
-        </key>
-        <key id="keycode32" name="keycode32" column="9" row="1">
-            <bounds>388.682927,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="o" label="દ" category="letter">દ</text>
-                <text name="O" label="ધ" category="letter">ધ</text>
-            </symbols>
-        </key>
-        <key id="keycode33" name="keycode33" column="10" row="1">
-            <bounds>429.268293,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="p" label="જ" category="letter">જ</text>
-                <text name="P" label="ઝ" category="letter">ઝ</text>
-            </symbols>
-        </key>
-        <key id="keycode34" name="keycode34" column="11" row="1">
-            <bounds>468.292683,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="bracketleft" label="ડ" category="letter">ડ</text>
-                <text name="braceleft" label="ઢ" category="letter">ઢ</text>
-            </symbols>
-        </key>
-        <key id="keycode35" name="keycode35" column="12" row="1">
-            <bounds>508.878049,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="bracketright" label="઼" category="letter">઼</text>
-                <text name="braceright" label="ઞ" category="letter">ઞ</text>
-            </symbols>
-        </key>
-        <key id="keycode51" name="keycode51" column="13" row="1">
-            <bounds>549.463415,42.146341,59.317073,37.463415</bounds>
-            <oref>outline6</oref>
-            <symbols groups="1" levels="2">
-                <text name="backslash" label="ૉ" category="letter">ૉ</text>
-                <text name="bar" label="ઑ" category="letter">ઑ</text>
-            </symbols>
-        </key>
-        <key id="keycode66" name="keycode66" column="0" row="2">
-            <bounds>3.121951,82.731707,68.682927,37.463415</bounds>
-            <oref>outline7</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="ISO_Level3_Shift" label="⇮" category="keyname" keyval="65027">ISO_Level3_Shift</keysym>
-            </symbols>
-        </key>
-        <key id="keycode38" name="keycode38" column="1" row="2">
-            <bounds>76.487805,82.731707,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="a" label="ો" category="letter">ો</text>
-                <text name="A" label="ઓ" category="letter">ઓ</text>
-            </symbols>
-        </key>
-        <key id="keycode39" name="keycode39" column="2" row="2">
-            <bounds>115.512195,82.731707,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="s" label="ે" category="letter">ે</text>
-                <text name="S" label="એ" category="letter">એ</text>
-            </symbols>
-        </key>
-        <key id="keycode40" name="keycode40" column="3" row="2">
-            <bounds>156.097561,82.731707,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="d" label="્" category="letter">્</text>
-                <text name="D" label="અ" category="letter">અ</text>
-            </symbols>
-        </key>
-        <key id="keycode41" name="keycode41" column="4" row="2">
-            <bounds>196.682927,82.731707,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="f" label="િ" category="letter">િ</text>
-                <text name="F" label="ઇ" category="letter">ઇ</text>
-            </symbols>
-        </key>
-        <key id="keycode42" name="keycode42" column="5" row="2">
-            <bounds>237.268293,82.731707,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="g" label="ુ" category="letter">ુ</text>
-                <text name="G" label="ઉ" category="letter">ઉ</text>
-            </symbols>
-        </key>
-        <key id="keycode43" name="keycode43" column="6" row="2">
-            <bounds>277.853659,82.731707,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="h" label="પ" category="letter">પ</text>
-                <text name="H" label="ફ" category="letter">ફ</text>
-            </symbols>
-        </key>
-        <key id="keycode44" name="keycode44" column="7" row="2">
-            <bounds>318.439024,82.731707,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="j" label="ર" category="letter">ર</text>
-                <text name="J" label="ઽ" category="letter">ઽ</text>
-            </symbols>
-        </key>
-        <key id="keycode45" name="keycode45" column="8" row="2">
-            <bounds>359.024390,82.731707,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="k" label="ક" category="letter">ક</text>
-                <text name="K" label="ખ" category="letter">ખ</text>
-            </symbols>
-        </key>
-        <key id="keycode46" name="keycode46" column="9" row="2">
-            <bounds>399.609756,82.731707,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="l" label="ત" category="letter">ત</text>
-                <text name="L" label="થ" category="letter">થ</text>
-            </symbols>
-        </key>
-        <key id="keycode47" name="keycode47" column="10" row="2">
-            <bounds>438.634146,82.731707,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="semicolon" label="ચ" category="letter">ચ</text>
-                <text name="colon" label="છ" category="letter">છ</text>
-            </symbols>
-        </key>
-        <key id="keycode48" name="keycode48" column="11" row="2">
-            <bounds>479.219512,82.731707,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <keysym name="quoteright" label="&apos;" category="letter" keyval="39">quoteright</keysym>
-                <text name="quotedbl" label="ઠ" category="letter">ઠ</text>
-            </symbols>
-        </key>
-        <key id="keycode36" name="keycode36" column="12" row="2">
-            <bounds>519.804878,82.731707,88.975610,37.463415</bounds>
-            <oref>outline8</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="Return" label="↵" category="keyname" keyval="65293">Return</keysym>
-            </symbols>
-        </key>
-        <key id="keycode50" name="keycode50" column="0" row="3">
-            <bounds>3.121951,121.756098,88.975610,37.463415</bounds>
-            <oref>outline9</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="Shift_L" label="⇧" category="keyname" keyval="65505">Shift_L</keysym>
-            </symbols>
-        </key>
-        <key id="keycode52" name="keycode52" column="1" row="3">
-            <bounds>95.219512,121.756098,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="z" label="૱" category="letter">૱</text>
-                <text name="Z" label="ૐ" category="letter">ૐ</text>
-            </symbols>
-        </key>
-        <key id="keycode53" name="keycode53" column="2" row="3">
-            <bounds>135.804878,121.756098,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="x" label="ં" category="letter">ં</text>
-                <text name="X" label="ઁ" category="letter">ઁ</text>
-            </symbols>
-        </key>
-        <key id="keycode54" name="keycode54" column="3" row="3">
-            <bounds>176.390244,121.756098,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="c" label="મ" category="letter">મ</text>
-                <text name="C" label="ણ" category="letter">ણ</text>
-            </symbols>
-        </key>
-        <key id="keycode55" name="keycode55" column="4" row="3">
-            <bounds>215.414634,121.756098,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="v" label="ન" category="letter">ન</text>
-                <text name="V" label="&quot;" category="letter">&quot;</text>
-            </symbols>
-        </key>
-        <key id="keycode56" name="keycode56" column="5" row="3">
-            <bounds>256.000000,121.756098,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="b" label="વ" category="letter">વ</text>
-                <text name="B" label="&apos;" category="letter">&apos;</text>
-            </symbols>
-        </key>
-        <key id="keycode57" name="keycode57" column="6" row="3">
-            <bounds>296.585366,121.756098,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="n" label="લ" category="letter">લ</text>
-                <text name="N" label="ળ" category="letter">ળ</text>
-            </symbols>
-        </key>
-        <key id="keycode58" name="keycode58" column="7" row="3">
-            <bounds>337.170732,121.756098,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="m" label="સ" category="letter">સ</text>
-                <text name="M" label="શ" category="letter">શ</text>
-            </symbols>
-        </key>
-        <key id="keycode59" name="keycode59" column="8" row="3">
-            <bounds>377.756098,121.756098,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="comma" label="," category="letter">,</text>
-                <text name="less" label="ષ" category="letter">ષ</text>
-            </symbols>
-        </key>
-        <key id="keycode60" name="keycode60" column="9" row="3">
-            <bounds>418.341463,121.756098,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="period" label="." category="letter">.</text>
-                <text name="greater" label="।" category="letter">।</text>
-            </symbols>
-        </key>
-        <key id="keycode61" name="keycode61" column="10" row="3">
-            <bounds>458.926829,121.756098,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="slash" label="ય" category="letter">ય</text>
-                <text name="question" label="?" category="letter">?</text>
-            </symbols>
-        </key>
-        <key id="keycode62" name="keycode62" column="11" row="3">
-            <bounds>499.512195,121.756098,109.268293,37.463415</bounds>
-            <oref>outline10</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="Shift_R" label="⇧" category="keyname" keyval="65506">Shift_R</keysym>
-            </symbols>
-        </key>
-        <key id="keycode37" name="keycode37" column="0" row="4">
-            <bounds>3.121951,162.341463,56.195122,37.463415</bounds>
-            <oref>outline1</oref>
-            <symbols groups="1" levels="2">
-                <symbol name="cycle-keyboard" icon="input-keyboard-symbolic" label="⌨" category="keyname">cycle-keyboard</symbol>
-                <symbol name="preferences" icon="preferences-system-symbolic" label="☺" category="keyname">preferences</symbol>
-            </symbols>
-        </key>
-        <key id="keycode133" name="keycode133" column="1" row="4">
-            <bounds>62.439024,162.341463,48.390244,37.463415</bounds>
-            <oref>outline2</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="Control_L" label="Ctrl" category="keyname" keyval="65507">Control_L</keysym>
-            </symbols>
-        </key>
-        <key id="keycode64" name="keycode64" column="2" row="4">
-            <bounds>113.951220,162.341463,48.390244,37.463415</bounds>
-            <oref>outline2</oref>
-            <symbols groups="1" levels="2">
-                <keysym name="Alt_L" label="Alt" category="keyname" keyval="65513">Alt_L</keysym>
-                <keysym name="Meta_L" label="Meta" category="keyname" keyval="65511">Meta_L</keysym>
-            </symbols>
-        </key>
-        <key id="keycode65" name="keycode65" column="3" row="4">
-            <bounds>165.463415,162.341463,238.829268,37.463415</bounds>
-            <oref>outline11</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="space" category="letter" keyval="32">space</keysym>
-            </symbols>
-        </key>
-        <key id="keycode108" name="keycode108" column="4" row="4">
-            <bounds>407.414634,162.341463,48.390244,37.463415</bounds>
-            <oref>outline2</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="Left" label="⇠" category="keyname" keyval="65361">Left</keysym>
-            </symbols>
-        </key>
-        <key id="keycode134" name="keycode134" column="5" row="4">
-            <bounds>458.926829,162.341463,48.390244,37.463415</bounds>
-            <oref>outline2</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="Up" label="⇡" category="keyname" keyval="65362">Up</keysym>
-            </symbols>
-        </key>
-        <key id="keycode135" name="keycode135" column="6" row="4">
-            <bounds>508.878049,162.341463,48.390244,37.463415</bounds>
-            <oref>outline2</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="Down" label="⇣" category="keyname" keyval="65364">Down</keysym>
-            </symbols>
-        </key>
-        <key id="keycode105" name="keycode105" column="7" row="4">
-            <bounds>560.390244,162.341463,48.390244,37.463415</bounds>
-            <oref>outline2</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="Right" label="⇢" category="keyname" keyval="65363">Right</keysym>
-            </symbols>
-        </key>
-    </section>
-    <outline id="outline1">
-        <corner-radius>1.000000</corner-radius>
-        <point>0.000000,0.000000</point>
-        <point>56.195122,0.000000</point>
-        <point>56.195122,37.463415</point>
-        <point>0.000000,37.463415</point>
-    </outline>
-    <outline id="outline3">
-        <corner-radius>1.000000</corner-radius>
-        <point>0.000000,0.000000</point>
-        <point>37.463415,0.000000</point>
-        <point>37.463415,37.463415</point>
-        <point>0.000000,37.463415</point>
-    </outline>
-    <outline id="outline4">
-        <corner-radius>1.000000</corner-radius>
-        <point>0.000000,0.000000</point>
-        <point>79.609756,0.000000</point>
-        <point>79.609756,37.463415</point>
-        <point>0.000000,37.463415</point>
-    </outline>
-    <outline id="outline5">
-        <corner-radius>1.000000</corner-radius>
-        <point>0.000000,0.000000</point>
-        <point>59.317073,0.000000</point>
-        <point>59.317073,37.463415</point>
-        <point>0.000000,37.463415</point>
-    </outline>
-    <outline id="outline6">
-        <corner-radius>1.000000</corner-radius>
-        <point>0.000000,0.000000</point>
-        <point>59.317073,0.000000</point>
-        <point>59.317073,37.463415</point>
-        <point>0.000000,37.463415</point>
-    </outline>
-    <outline id="outline7">
-        <corner-radius>1.000000</corner-radius>
-        <point>0.000000,0.000000</point>
-        <point>68.682927,0.000000</point>
-        <point>68.682927,37.463415</point>
-        <point>0.000000,37.463415</point>
-    </outline>
-    <outline id="outline8">
-        <corner-radius>1.000000</corner-radius>
-        <point>0.000000,0.000000</point>
-        <point>88.975610,0.000000</point>
-        <point>88.975610,37.463415</point>
-        <point>0.000000,37.463415</point>
-    </outline>
-    <outline id="outline9">
-        <corner-radius>1.000000</corner-radius>
-        <point>0.000000,0.000000</point>
-        <point>88.975610,0.000000</point>
-        <point>88.975610,37.463415</point>
-        <point>0.000000,37.463415</point>
-    </outline>
-    <outline id="outline10">
-        <corner-radius>1.000000</corner-radius>
-        <point>0.000000,0.000000</point>
-        <point>109.268293,0.000000</point>
-        <point>109.268293,37.463415</point>
-        <point>0.000000,37.463415</point>
-    </outline>
-    <outline id="outline11">
-        <corner-radius>1.000000</corner-radius>
-        <point>0.000000,0.000000</point>
-        <point>238.829268,0.000000</point>
-        <point>238.829268,37.463415</point>
-        <point>0.000000,37.463415</point>
-    </outline>
-    <outline id="outline2">
-        <corner-radius>1.000000</corner-radius>
-        <point>0.000000,0.000000</point>
-        <point>48.390244,0.000000</point>
-        <point>48.390244,37.463415</point>
-        <point>0.000000,37.463415</point>
-    </outline>
-</keyboard>
-
--- a/data/keyboards/he.xml
+++ b/data/keyboards/he.xml
@@ -1,683 +0,0 @@
-<?xml version="1.0"?>
-<keyboard version="0.90">
-    <bounds>0.000000,0.000000,640.000000,296.585366</bounds>
-    <section>
-        <bounds>15.609756,15.609756,640.000000,39.024390</bounds>
-        <angle>0</angle>
-        <row>
-            <columns>16</columns>
-            <orientation>1</orientation>
-        </row>
-        <key id="keycode9" name="keycode9" column="0" row="0">
-            <bounds>3.121951,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="Escape" label="Esc" category="keyname" keyval="65307">Escape</keysym>
-            </symbols>
-        </key>
-        <key id="keycode67" name="keycode67" column="1" row="0">
-            <bounds>84.292683,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F1" label="F1" category="function" keyval="65470">F1</keysym>
-            </symbols>
-        </key>
-        <key id="keycode68" name="keycode68" column="2" row="0">
-            <bounds>124.878049,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F2" label="F2" category="function" keyval="65471">F2</keysym>
-            </symbols>
-        </key>
-        <key id="keycode69" name="keycode69" column="3" row="0">
-            <bounds>165.463415,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F3" label="F3" category="function" keyval="65472">F3</keysym>
-            </symbols>
-        </key>
-        <key id="keycode70" name="keycode70" column="4" row="0">
-            <bounds>206.048780,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F4" label="F4" category="function" keyval="65473">F4</keysym>
-            </symbols>
-        </key>
-        <key id="keycode71" name="keycode71" column="5" row="0">
-            <bounds>266.926829,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F5" label="F5" category="function" keyval="65474">F5</keysym>
-            </symbols>
-        </key>
-        <key id="keycode72" name="keycode72" column="6" row="0">
-            <bounds>307.512195,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F6" label="F6" category="function" keyval="65475">F6</keysym>
-            </symbols>
-        </key>
-        <key id="keycode73" name="keycode73" column="7" row="0">
-            <bounds>348.097561,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F7" label="F7" category="function" keyval="65476">F7</keysym>
-            </symbols>
-        </key>
-        <key id="keycode74" name="keycode74" column="8" row="0">
-            <bounds>388.682927,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F8" label="F8" category="function" keyval="65477">F8</keysym>
-            </symbols>
-        </key>
-        <key id="keycode75" name="keycode75" column="9" row="0">
-            <bounds>449.560976,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F9" label="F9" category="function" keyval="65478">F9</keysym>
-            </symbols>
-        </key>
-        <key id="keycode76" name="keycode76" column="10" row="0">
-            <bounds>490.146341,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F10" label="F10" category="function" keyval="65479">F10</keysym>
-            </symbols>
-        </key>
-        <key id="keycode95" name="keycode95" column="11" row="0">
-            <bounds>530.731707,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F11" label="F11" category="function" keyval="65480">F11</keysym>
-            </symbols>
-        </key>
-        <key id="keycode96" name="keycode96" column="12" row="0">
-            <bounds>571.317073,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F12" label="F12" category="function" keyval="65481">F12</keysym>
-            </symbols>
-        </key>
-    </section>
-    <section>
-        <bounds>15.609756,78.048780,608.780488,201.365854</bounds>
-        <angle>0</angle>
-        <row>
-            <columns>14</columns>
-            <orientation>1</orientation>
-        </row>
-        <row>
-            <columns>14</columns>
-            <orientation>1</orientation>
-        </row>
-        <row>
-            <columns>13</columns>
-            <orientation>1</orientation>
-        </row>
-        <row>
-            <columns>12</columns>
-            <orientation>1</orientation>
-        </row>
-        <row>
-            <columns>8</columns>
-            <orientation>1</orientation>
-        </row>
-        <key id="keycode49" name="keycode49" column="0" row="0">
-            <bounds>3.121951,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <keysym name="quoteleft" label="`" category="letter" keyval="96">quoteleft</keysym>
-                <keysym name="asciitilde" label="~" category="letter" keyval="126">asciitilde</keysym>
-            </symbols>
-        </key>
-        <key id="keycode10" name="keycode10" column="1" row="0">
-            <bounds>43.707317,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <keysym name="1" label="1" category="letter" keyval="49">1</keysym>
-                <keysym name="exclam" label="!" category="letter" keyval="33">exclam</keysym>
-            </symbols>
-        </key>
-        <key id="keycode11" name="keycode11" column="2" row="0">
-            <bounds>84.292683,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <keysym name="2" label="2" category="letter" keyval="50">2</keysym>
-                <keysym name="at" label="@" category="letter" keyval="64">at</keysym>
-            </symbols>
-        </key>
-        <key id="keycode12" name="keycode12" column="3" row="0">
-            <bounds>124.878049,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <keysym name="3" label="3" category="letter" keyval="51">3</keysym>
-                <keysym name="numbersign" label="#" category="letter" keyval="35">numbersign</keysym>
-            </symbols>
-        </key>
-        <key id="keycode13" name="keycode13" column="4" row="0">
-            <bounds>165.463415,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <keysym name="4" label="4" category="letter" keyval="52">4</keysym>
-                <keysym name="dollar" label="$" category="letter" keyval="36">dollar</keysym>
-            </symbols>
-        </key>
-        <key id="keycode14" name="keycode14" column="5" row="0">
-            <bounds>206.048780,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="3">
-                <keysym name="5" label="5" category="letter" keyval="53">5</keysym>
-                <keysym name="percent" label="%" category="letter" keyval="37">percent</keysym>
-                <keysym name="EuroSign" label="€" category="letter" keyval="8364">EuroSign</keysym>
-            </symbols>
-        </key>
-        <key id="keycode15" name="keycode15" column="6" row="0">
-            <bounds>245.073171,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <keysym name="6" label="6" category="letter" keyval="54">6</keysym>
-                <keysym name="asciicircum" label="^" category="letter" keyval="94">asciicircum</keysym>
-            </symbols>
-        </key>
-        <key id="keycode16" name="keycode16" column="7" row="0">
-            <bounds>285.658537,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <keysym name="7" label="7" category="letter" keyval="55">7</keysym>
-                <keysym name="ampersand" label="&amp;" category="letter" keyval="38">ampersand</keysym>
-            </symbols>
-        </key>
-        <key id="keycode17" name="keycode17" column="8" row="0">
-            <bounds>326.243902,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <keysym name="8" label="8" category="letter" keyval="56">8</keysym>
-                <keysym name="asterisk" label="*" category="letter" keyval="42">asterisk</keysym>
-            </symbols>
-        </key>
-        <key id="keycode18" name="keycode18" column="9" row="0">
-            <bounds>366.829268,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <keysym name="9" label="9" category="letter" keyval="57">9</keysym>
-                <text name="parenleft" label=")" category="letter">)</text>
-            </symbols>
-        </key>
-        <key id="keycode19" name="keycode19" column="10" row="0">
-            <bounds>407.414634,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <keysym name="0" label="0" category="letter" keyval="48">0</keysym>
-                <text name="parenright" label="(" category="letter">(</text>
-            </symbols>
-        </key>
-        <key id="keycode20" name="keycode20" column="11" row="0">
-            <bounds>448.000000,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <keysym name="minus" label="-" category="letter" keyval="45">minus</keysym>
-                <keysym name="underscore" label="_" category="letter" keyval="95">underscore</keysym>
-            </symbols>
-        </key>
-        <key id="keycode21" name="keycode21" column="12" row="0">
-            <bounds>488.585366,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <keysym name="equal" label="=" category="letter" keyval="61">equal</keysym>
-                <keysym name="plus" label="+" category="letter" keyval="43">plus</keysym>
-            </symbols>
-        </key>
-        <key id="keycode22" name="keycode22" column="13" row="0">
-            <bounds>529.170732,1.560976,79.609756,37.463415</bounds>
-            <oref>outline4</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="BackSpace" label="←" category="keyname" keyval="65288">BackSpace</keysym>
-            </symbols>
-        </key>
-        <key id="keycode23" name="keycode23" column="0" row="1">
-            <bounds>3.121951,42.146341,59.317073,37.463415</bounds>
-            <oref>outline5</oref>
-            <symbols groups="1" levels="2">
-                <keysym name="Tab" label="⇥" category="keyname" keyval="65289">Tab</keysym>
-                <keysym name="ISO_Left_Tab" label="⇤" category="keyname" keyval="65056">ISO_Left_Tab</keysym>
-            </symbols>
-        </key>
-        <key id="keycode24" name="keycode24" column="1" row="1">
-            <bounds>65.560976,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="q" label="/" category="letter">/</text>
-                <keysym name="Q" label="Q" category="letter" keyval="81">Q</keysym>
-            </symbols>
-        </key>
-        <key id="keycode25" name="keycode25" column="2" row="1">
-            <bounds>106.146341,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="w" label="&apos;" category="letter">&apos;</text>
-                <keysym name="W" label="W" category="letter" keyval="87">W</keysym>
-            </symbols>
-        </key>
-        <key id="keycode26" name="keycode26" column="3" row="1">
-            <bounds>145.170732,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="e" label="ק" category="letter">ק</text>
-                <keysym name="E" label="E" category="letter" keyval="69">E</keysym>
-            </symbols>
-        </key>
-        <key id="keycode27" name="keycode27" column="4" row="1">
-            <bounds>185.756098,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="r" label="ר" category="letter">ר</text>
-                <keysym name="R" label="R" category="letter" keyval="82">R</keysym>
-            </symbols>
-        </key>
-        <key id="keycode28" name="keycode28" column="5" row="1">
-            <bounds>226.341463,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="t" label="א" category="letter">א</text>
-                <keysym name="T" label="T" category="letter" keyval="84">T</keysym>
-            </symbols>
-        </key>
-        <key id="keycode29" name="keycode29" column="6" row="1">
-            <bounds>266.926829,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="y" label="ט" category="letter">ט</text>
-                <keysym name="Y" label="Y" category="letter" keyval="89">Y</keysym>
-            </symbols>
-        </key>
-        <key id="keycode30" name="keycode30" column="7" row="1">
-            <bounds>307.512195,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="u" label="ו" category="letter">ו</text>
-                <keysym name="U" label="U" category="letter" keyval="85">U</keysym>
-            </symbols>
-        </key>
-        <key id="keycode31" name="keycode31" column="8" row="1">
-            <bounds>348.097561,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="i" label="ן" category="letter">ן</text>
-                <keysym name="I" label="I" category="letter" keyval="73">I</keysym>
-            </symbols>
-        </key>
-        <key id="keycode32" name="keycode32" column="9" row="1">
-            <bounds>388.682927,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="o" label="ם" category="letter">ם</text>
-                <keysym name="O" label="O" category="letter" keyval="79">O</keysym>
-            </symbols>
-        </key>
-        <key id="keycode33" name="keycode33" column="10" row="1">
-            <bounds>429.268293,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="p" label="פ" category="letter">פ</text>
-                <keysym name="P" label="P" category="letter" keyval="80">P</keysym>
-            </symbols>
-        </key>
-        <key id="keycode34" name="keycode34" column="11" row="1">
-            <bounds>468.292683,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="bracketleft" label="]" category="letter">]</text>
-                <text name="braceleft" label="}" category="letter">}</text>
-            </symbols>
-        </key>
-        <key id="keycode35" name="keycode35" column="12" row="1">
-            <bounds>508.878049,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="bracketright" label="[" category="letter">[</text>
-                <text name="braceright" label="{" category="letter">{</text>
-            </symbols>
-        </key>
-        <key id="keycode51" name="keycode51" column="13" row="1">
-            <bounds>549.463415,42.146341,59.317073,37.463415</bounds>
-            <oref>outline6</oref>
-            <symbols groups="1" levels="2">
-                <keysym name="backslash" label="\" category="letter" keyval="92">backslash</keysym>
-                <keysym name="bar" label="|" category="letter" keyval="124">bar</keysym>
-            </symbols>
-        </key>
-        <key id="keycode66" name="keycode66" column="0" row="2">
-            <bounds>3.121951,82.731707,68.682927,37.463415</bounds>
-            <oref>outline7</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="ISO_Level3_Shift" label="⇮" category="keyname" keyval="65027">ISO_Level3_Shift</keysym>
-            </symbols>
-        </key>
-        <key id="keycode38" name="keycode38" column="1" row="2">
-            <bounds>76.487805,82.731707,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="a" label="ש" category="letter">ש</text>
-                <keysym name="A" label="A" category="letter" keyval="65">A</keysym>
-            </symbols>
-        </key>
-        <key id="keycode39" name="keycode39" column="2" row="2">
-            <bounds>115.512195,82.731707,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="s" label="ד" category="letter">ד</text>
-                <keysym name="S" label="S" category="letter" keyval="83">S</keysym>
-            </symbols>
-        </key>
-        <key id="keycode40" name="keycode40" column="3" row="2">
-            <bounds>156.097561,82.731707,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="d" label="ג" category="letter">ג</text>
-                <keysym name="D" label="D" category="letter" keyval="68">D</keysym>
-            </symbols>
-        </key>
-        <key id="keycode41" name="keycode41" column="4" row="2">
-            <bounds>196.682927,82.731707,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="f" label="כ" category="letter">כ</text>
-                <keysym name="F" label="F" category="letter" keyval="70">F</keysym>
-            </symbols>
-        </key>
-        <key id="keycode42" name="keycode42" column="5" row="2">
-            <bounds>237.268293,82.731707,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="g" label="ע" category="letter">ע</text>
-                <keysym name="G" label="G" category="letter" keyval="71">G</keysym>
-            </symbols>
-        </key>
-        <key id="keycode43" name="keycode43" column="6" row="2">
-            <bounds>277.853659,82.731707,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="h" label="י" category="letter">י</text>
-                <keysym name="H" label="H" category="letter" keyval="72">H</keysym>
-            </symbols>
-        </key>
-        <key id="keycode44" name="keycode44" column="7" row="2">
-            <bounds>318.439024,82.731707,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="j" label="ח" category="letter">ח</text>
-                <keysym name="J" label="J" category="letter" keyval="74">J</keysym>
-            </symbols>
-        </key>
-        <key id="keycode45" name="keycode45" column="8" row="2">
-            <bounds>359.024390,82.731707,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="k" label="ל" category="letter">ל</text>
-                <keysym name="K" label="K" category="letter" keyval="75">K</keysym>
-            </symbols>
-        </key>
-        <key id="keycode46" name="keycode46" column="9" row="2">
-            <bounds>399.609756,82.731707,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="l" label="ך" category="letter">ך</text>
-                <keysym name="L" label="L" category="letter" keyval="76">L</keysym>
-            </symbols>
-        </key>
-        <key id="keycode47" name="keycode47" column="10" row="2">
-            <bounds>438.634146,82.731707,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="semicolon" label="ף" category="letter">ף</text>
-                <keysym name="colon" label=":" category="letter" keyval="58">colon</keysym>
-            </symbols>
-        </key>
-        <key id="keycode48" name="keycode48" column="11" row="2">
-            <bounds>479.219512,82.731707,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <keysym name="quoteright" label="&apos;" category="letter" keyval="39">quoteright</keysym>
-                <keysym name="quotedbl" label="&quot;" category="letter" keyval="34">quotedbl</keysym>
-            </symbols>
-        </key>
-        <key id="keycode36" name="keycode36" column="12" row="2">
-            <bounds>519.804878,82.731707,88.975610,37.463415</bounds>
-            <oref>outline8</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="Return" label="↵" category="keyname" keyval="65293">Return</keysym>
-            </symbols>
-        </key>
-        <key id="keycode50" name="keycode50" column="0" row="3">
-            <bounds>3.121951,121.756098,88.975610,37.463415</bounds>
-            <oref>outline9</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="Shift_L" label="⇧" category="keyname" keyval="65505">Shift_L</keysym>
-            </symbols>
-        </key>
-        <key id="keycode52" name="keycode52" column="1" row="3">
-            <bounds>95.219512,121.756098,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="z" label="ז" category="letter">ז</text>
-                <keysym name="Z" label="Z" category="letter" keyval="90">Z</keysym>
-            </symbols>
-        </key>
-        <key id="keycode53" name="keycode53" column="2" row="3">
-            <bounds>135.804878,121.756098,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="x" label="ס" category="letter">ס</text>
-                <keysym name="X" label="X" category="letter" keyval="88">X</keysym>
-            </symbols>
-        </key>
-        <key id="keycode54" name="keycode54" column="3" row="3">
-            <bounds>176.390244,121.756098,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="c" label="ב" category="letter">ב</text>
-                <keysym name="C" label="C" category="letter" keyval="67">C</keysym>
-            </symbols>
-        </key>
-        <key id="keycode55" name="keycode55" column="4" row="3">
-            <bounds>215.414634,121.756098,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="v" label="ה" category="letter">ה</text>
-                <keysym name="V" label="V" category="letter" keyval="86">V</keysym>
-            </symbols>
-        </key>
-        <key id="keycode56" name="keycode56" column="5" row="3">
-            <bounds>256.000000,121.756098,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="b" label="נ" category="letter">נ</text>
-                <keysym name="B" label="B" category="letter" keyval="66">B</keysym>
-            </symbols>
-        </key>
-        <key id="keycode57" name="keycode57" column="6" row="3">
-            <bounds>296.585366,121.756098,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="n" label="מ" category="letter">מ</text>
-                <keysym name="N" label="N" category="letter" keyval="78">N</keysym>
-            </symbols>
-        </key>
-        <key id="keycode58" name="keycode58" column="7" row="3">
-            <bounds>337.170732,121.756098,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="m" label="צ" category="letter">צ</text>
-                <keysym name="M" label="M" category="letter" keyval="77">M</keysym>
-            </symbols>
-        </key>
-        <key id="keycode59" name="keycode59" column="8" row="3">
-            <bounds>377.756098,121.756098,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="comma" label="ת" category="letter">ת</text>
-                <text name="less" label="&gt;" category="letter">&gt;</text>
-            </symbols>
-        </key>
-        <key id="keycode60" name="keycode60" column="9" row="3">
-            <bounds>418.341463,121.756098,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="period" label="ץ" category="letter">ץ</text>
-                <text name="greater" label="&lt;" category="letter">&lt;</text>
-            </symbols>
-        </key>
-        <key id="keycode61" name="keycode61" column="10" row="3">
-            <bounds>458.926829,121.756098,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="slash" label="." category="letter">.</text>
-                <keysym name="question" label="?" category="letter" keyval="63">question</keysym>
-            </symbols>
-        </key>
-        <key id="keycode62" name="keycode62" column="11" row="3">
-            <bounds>499.512195,121.756098,109.268293,37.463415</bounds>
-            <oref>outline10</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="Shift_R" label="⇧" category="keyname" keyval="65506">Shift_R</keysym>
-            </symbols>
-        </key>
-        <key id="keycode37" name="keycode37" column="0" row="4">
-            <bounds>3.121951,162.341463,56.195122,37.463415</bounds>
-            <oref>outline1</oref>
-            <symbols groups="1" levels="2">
-                <symbol name="cycle-keyboard" icon="input-keyboard-symbolic" label="⌨" category="keyname">cycle-keyboard</symbol>
-                <symbol name="preferences" icon="preferences-system-symbolic" label="☺" category="keyname">preferences</symbol>
-            </symbols>
-        </key>
-        <key id="keycode133" name="keycode133" column="1" row="4">
-            <bounds>62.439024,162.341463,48.390244,37.463415</bounds>
-            <oref>outline2</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="Control_L" label="Ctrl" category="keyname" keyval="65507">Control_L</keysym>
-            </symbols>
-        </key>
-        <key id="keycode64" name="keycode64" column="2" row="4">
-            <bounds>113.951220,162.341463,48.390244,37.463415</bounds>
-            <oref>outline2</oref>
-            <symbols groups="1" levels="2">
-                <keysym name="Alt_L" label="Alt" category="keyname" keyval="65513">Alt_L</keysym>
-                <keysym name="Meta_L" label="Meta" category="keyname" keyval="65511">Meta_L</keysym>
-            </symbols>
-        </key>
-        <key id="keycode65" name="keycode65" column="3" row="4">
-            <bounds>165.463415,162.341463,238.829268,37.463415</bounds>
-            <oref>outline11</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="space" category="letter" keyval="32">space</keysym>
-            </symbols>
-        </key>
-        <key id="keycode108" name="keycode108" column="4" row="4">
-            <bounds>407.414634,162.341463,48.390244,37.463415</bounds>
-            <oref>outline2</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="Left" label="⇠" category="keyname" keyval="65361">Left</keysym>
-            </symbols>
-        </key>
-        <key id="keycode134" name="keycode134" column="5" row="4">
-            <bounds>458.926829,162.341463,48.390244,37.463415</bounds>
-            <oref>outline2</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="Up" label="⇡" category="keyname" keyval="65362">Up</keysym>
-            </symbols>
-        </key>
-        <key id="keycode135" name="keycode135" column="6" row="4">
-            <bounds>508.878049,162.341463,48.390244,37.463415</bounds>
-            <oref>outline2</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="Down" label="⇣" category="keyname" keyval="65364">Down</keysym>
-            </symbols>
-        </key>
-        <key id="keycode105" name="keycode105" column="7" row="4">
-            <bounds>560.390244,162.341463,48.390244,37.463415</bounds>
-            <oref>outline2</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="Right" label="⇢" category="keyname" keyval="65363">Right</keysym>
-            </symbols>
-        </key>
-    </section>
-    <outline id="outline1">
-        <corner-radius>1.000000</corner-radius>
-        <point>0.000000,0.000000</point>
-        <point>56.195122,0.000000</point>
-        <point>56.195122,37.463415</point>
-        <point>0.000000,37.463415</point>
-    </outline>
-    <outline id="outline3">
-        <corner-radius>1.000000</corner-radius>
-        <point>0.000000,0.000000</point>
-        <point>37.463415,0.000000</point>
-        <point>37.463415,37.463415</point>
-        <point>0.000000,37.463415</point>
-    </outline>
-    <outline id="outline4">
-        <corner-radius>1.000000</corner-radius>
-        <point>0.000000,0.000000</point>
-        <point>79.609756,0.000000</point>
-        <point>79.609756,37.463415</point>
-        <point>0.000000,37.463415</point>
-    </outline>
-    <outline id="outline5">
-        <corner-radius>1.000000</corner-radius>
-        <point>0.000000,0.000000</point>
-        <point>59.317073,0.000000</point>
-        <point>59.317073,37.463415</point>
-        <point>0.000000,37.463415</point>
-    </outline>
-    <outline id="outline6">
-        <corner-radius>1.000000</corner-radius>
-        <point>0.000000,0.000000</point>
-        <point>59.317073,0.000000</point>
-        <point>59.317073,37.463415</point>
-        <point>0.000000,37.463415</point>
-    </outline>
-    <outline id="outline7">
-        <corner-radius>1.000000</corner-radius>
-        <point>0.000000,0.000000</point>
-        <point>68.682927,0.000000</point>
-        <point>68.682927,37.463415</point>
-        <point>0.000000,37.463415</point>
-    </outline>
-    <outline id="outline8">
-        <corner-radius>1.000000</corner-radius>
-        <point>0.000000,0.000000</point>
-        <point>88.975610,0.000000</point>
-        <point>88.975610,37.463415</point>
-        <point>0.000000,37.463415</point>
-    </outline>
-    <outline id="outline9">
-        <corner-radius>1.000000</corner-radius>
-        <point>0.000000,0.000000</point>
-        <point>88.975610,0.000000</point>
-        <point>88.975610,37.463415</point>
-        <point>0.000000,37.463415</point>
-    </outline>
-    <outline id="outline10">
-        <corner-radius>1.000000</corner-radius>
-        <point>0.000000,0.000000</point>
-        <point>109.268293,0.000000</point>
-        <point>109.268293,37.463415</point>
-        <point>0.000000,37.463415</point>
-    </outline>
-    <outline id="outline11">
-        <corner-radius>1.000000</corner-radius>
-        <point>0.000000,0.000000</point>
-        <point>238.829268,0.000000</point>
-        <point>238.829268,37.463415</point>
-        <point>0.000000,37.463415</point>
-    </outline>
-    <outline id="outline2">
-        <corner-radius>1.000000</corner-radius>
-        <point>0.000000,0.000000</point>
-        <point>48.390244,0.000000</point>
-        <point>48.390244,37.463415</point>
-        <point>0.000000,37.463415</point>
-    </outline>
-</keyboard>
-
--- a/data/keyboards/hi-inscript.xml
+++ b/data/keyboards/hi-inscript.xml
@@ -1,683 +0,0 @@
-<?xml version="1.0"?>
-<keyboard version="0.90">
-    <bounds>0.000000,0.000000,640.000000,296.585366</bounds>
-    <section>
-        <bounds>15.609756,15.609756,640.000000,39.024390</bounds>
-        <angle>0</angle>
-        <row>
-            <columns>16</columns>
-            <orientation>1</orientation>
-        </row>
-        <key id="keycode9" name="keycode9" column="0" row="0">
-            <bounds>3.121951,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="Escape" label="Esc" category="keyname" keyval="65307">Escape</keysym>
-            </symbols>
-        </key>
-        <key id="keycode67" name="keycode67" column="1" row="0">
-            <bounds>84.292683,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F1" label="F1" category="function" keyval="65470">F1</keysym>
-            </symbols>
-        </key>
-        <key id="keycode68" name="keycode68" column="2" row="0">
-            <bounds>124.878049,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F2" label="F2" category="function" keyval="65471">F2</keysym>
-            </symbols>
-        </key>
-        <key id="keycode69" name="keycode69" column="3" row="0">
-            <bounds>165.463415,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F3" label="F3" category="function" keyval="65472">F3</keysym>
-            </symbols>
-        </key>
-        <key id="keycode70" name="keycode70" column="4" row="0">
-            <bounds>206.048780,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F4" label="F4" category="function" keyval="65473">F4</keysym>
-            </symbols>
-        </key>
-        <key id="keycode71" name="keycode71" column="5" row="0">
-            <bounds>266.926829,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F5" label="F5" category="function" keyval="65474">F5</keysym>
-            </symbols>
-        </key>
-        <key id="keycode72" name="keycode72" column="6" row="0">
-            <bounds>307.512195,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F6" label="F6" category="function" keyval="65475">F6</keysym>
-            </symbols>
-        </key>
-        <key id="keycode73" name="keycode73" column="7" row="0">
-            <bounds>348.097561,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F7" label="F7" category="function" keyval="65476">F7</keysym>
-            </symbols>
-        </key>
-        <key id="keycode74" name="keycode74" column="8" row="0">
-            <bounds>388.682927,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F8" label="F8" category="function" keyval="65477">F8</keysym>
-            </symbols>
-        </key>
-        <key id="keycode75" name="keycode75" column="9" row="0">
-            <bounds>449.560976,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F9" label="F9" category="function" keyval="65478">F9</keysym>
-            </symbols>
-        </key>
-        <key id="keycode76" name="keycode76" column="10" row="0">
-            <bounds>490.146341,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F10" label="F10" category="function" keyval="65479">F10</keysym>
-            </symbols>
-        </key>
-        <key id="keycode95" name="keycode95" column="11" row="0">
-            <bounds>530.731707,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F11" label="F11" category="function" keyval="65480">F11</keysym>
-            </symbols>
-        </key>
-        <key id="keycode96" name="keycode96" column="12" row="0">
-            <bounds>571.317073,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="F12" label="F12" category="function" keyval="65481">F12</keysym>
-            </symbols>
-        </key>
-    </section>
-    <section>
-        <bounds>15.609756,78.048780,608.780488,201.365854</bounds>
-        <angle>0</angle>
-        <row>
-            <columns>14</columns>
-            <orientation>1</orientation>
-        </row>
-        <row>
-            <columns>14</columns>
-            <orientation>1</orientation>
-        </row>
-        <row>
-            <columns>13</columns>
-            <orientation>1</orientation>
-        </row>
-        <row>
-            <columns>12</columns>
-            <orientation>1</orientation>
-        </row>
-        <row>
-            <columns>8</columns>
-            <orientation>1</orientation>
-        </row>
-        <key id="keycode49" name="keycode49" column="0" row="0">
-            <bounds>3.121951,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <keysym name="quoteleft" label="`" category="letter" keyval="96">quoteleft</keysym>
-                <text name="asciitilde" label="ऒ" category="letter">ऒ</text>
-            </symbols>
-        </key>
-        <key id="keycode10" name="keycode10" column="1" row="0">
-            <bounds>43.707317,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="1" label="१" category="letter">१</text>
-                <text name="exclam" label="ऍ" category="letter">ऍ</text>
-            </symbols>
-        </key>
-        <key id="keycode11" name="keycode11" column="2" row="0">
-            <bounds>84.292683,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="2" label="२" category="letter">२</text>
-                <text name="at" label="ॅ" category="letter">ॅ</text>
-            </symbols>
-        </key>
-        <key id="keycode12" name="keycode12" column="3" row="0">
-            <bounds>124.878049,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="3" label="३" category="letter">३</text>
-                <text name="numbersign" label="#" category="letter">#</text>
-            </symbols>
-        </key>
-        <key id="keycode13" name="keycode13" column="4" row="0">
-            <bounds>165.463415,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="4" label="४" category="letter">४</text>
-                <text name="dollar" label="$" category="letter">$</text>
-            </symbols>
-        </key>
-        <key id="keycode14" name="keycode14" column="5" row="0">
-            <bounds>206.048780,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="3">
-                <text name="5" label="५" category="letter">५</text>
-                <text name="percent" label="ज्ञ" category="letter">ज्ञ</text>
-                <keysym name="EuroSign" label="€" category="letter" keyval="8364">EuroSign</keysym>
-            </symbols>
-        </key>
-        <key id="keycode15" name="keycode15" column="6" row="0">
-            <bounds>245.073171,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="6" label="६" category="letter">६</text>
-                <text name="asciicircum" label="त्र" category="letter">त्र</text>
-            </symbols>
-        </key>
-        <key id="keycode16" name="keycode16" column="7" row="0">
-            <bounds>285.658537,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="7" label="७" category="letter">७</text>
-                <text name="ampersand" label="क्ष" category="letter">क्ष</text>
-            </symbols>
-        </key>
-        <key id="keycode17" name="keycode17" column="8" row="0">
-            <bounds>326.243902,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="8" label="८" category="letter">८</text>
-                <text name="asterisk" label="श्र" category="letter">श्र</text>
-            </symbols>
-        </key>
-        <key id="keycode18" name="keycode18" column="9" row="0">
-            <bounds>366.829268,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="9" label="९" category="letter">९</text>
-                <text name="parenleft" label="(" category="letter">(</text>
-            </symbols>
-        </key>
-        <key id="keycode19" name="keycode19" column="10" row="0">
-            <bounds>407.414634,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="0" label="०" category="letter">०</text>
-                <text name="parenright" label=")" category="letter">)</text>
-            </symbols>
-        </key>
-        <key id="keycode20" name="keycode20" column="11" row="0">
-            <bounds>448.000000,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="minus" label="-" category="letter">-</text>
-                <text name="underscore" label="ः" category="letter">ः</text>
-            </symbols>
-        </key>
-        <key id="keycode21" name="keycode21" column="12" row="0">
-            <bounds>488.585366,1.560976,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="equal" label="ृ" category="letter">ृ</text>
-                <text name="plus" label="ऋ" category="letter">ऋ</text>
-            </symbols>
-        </key>
-        <key id="keycode22" name="keycode22" column="13" row="0">
-            <bounds>529.170732,1.560976,79.609756,37.463415</bounds>
-            <oref>outline4</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="BackSpace" label="←" category="keyname" keyval="65288">BackSpace</keysym>
-            </symbols>
-        </key>
-        <key id="keycode23" name="keycode23" column="0" row="1">
-            <bounds>3.121951,42.146341,59.317073,37.463415</bounds>
-            <oref>outline5</oref>
-            <symbols groups="1" levels="2">
-                <keysym name="Tab" label="⇥" category="keyname" keyval="65289">Tab</keysym>
-                <keysym name="ISO_Left_Tab" label="⇤" category="keyname" keyval="65056">ISO_Left_Tab</keysym>
-            </symbols>
-        </key>
-        <key id="keycode24" name="keycode24" column="1" row="1">
-            <bounds>65.560976,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="q" label="ौ" category="letter">ौ</text>
-                <text name="Q" label="औ" category="letter">औ</text>
-            </symbols>
-        </key>
-        <key id="keycode25" name="keycode25" column="2" row="1">
-            <bounds>106.146341,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="w" label="ै" category="letter">ै</text>
-                <text name="W" label="ऐ" category="letter">ऐ</text>
-            </symbols>
-        </key>
-        <key id="keycode26" name="keycode26" column="3" row="1">
-            <bounds>145.170732,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="e" label="ा" category="letter">ा</text>
-                <text name="E" label="आ" category="letter">आ</text>
-            </symbols>
-        </key>
-        <key id="keycode27" name="keycode27" column="4" row="1">
-            <bounds>185.756098,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="r" label="ी" category="letter">ी</text>
-                <text name="R" label="ई" category="letter">ई</text>
-            </symbols>
-        </key>
-        <key id="keycode28" name="keycode28" column="5" row="1">
-            <bounds>226.341463,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="t" label="ू" category="letter">ू</text>
-                <text name="T" label="ऊ" category="letter">ऊ</text>
-            </symbols>
-        </key>
-        <key id="keycode29" name="keycode29" column="6" row="1">
-            <bounds>266.926829,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="y" label="ब" category="letter">ब</text>
-                <text name="Y" label="भ" category="letter">भ</text>
-            </symbols>
-        </key>
-        <key id="keycode30" name="keycode30" column="7" row="1">
-            <bounds>307.512195,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="u" label="ह" category="letter">ह</text>
-                <text name="U" label="ङ" category="letter">ङ</text>
-            </symbols>
-        </key>
-        <key id="keycode31" name="keycode31" column="8" row="1">
-            <bounds>348.097561,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="i" label="ग" category="letter">ग</text>
-                <text name="I" label="घ" category="letter">घ</text>
-            </symbols>
-        </key>
-        <key id="keycode32" name="keycode32" column="9" row="1">
-            <bounds>388.682927,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="o" label="द" category="letter">द</text>
-                <text name="O" label="ध" category="letter">ध</text>
-            </symbols>
-        </key>
-        <key id="keycode33" name="keycode33" column="10" row="1">
-            <bounds>429.268293,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="p" label="ज" category="letter">ज</text>
-                <text name="P" label="झ" category="letter">झ</text>
-            </symbols>
-        </key>
-        <key id="keycode34" name="keycode34" column="11" row="1">
-            <bounds>468.292683,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="bracketleft" label="ड" category="letter">ड</text>
-                <text name="braceleft" label="ढ" category="letter">ढ</text>
-            </symbols>
-        </key>
-        <key id="keycode35" name="keycode35" column="12" row="1">
-            <bounds>508.878049,42.146341,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="bracketright" label="़" category="letter">़</text>
-                <text name="braceright" label="ञ" category="letter">ञ</text>
-            </symbols>
-        </key>
-        <key id="keycode51" name="keycode51" column="13" row="1">
-            <bounds>549.463415,42.146341,59.317073,37.463415</bounds>
-            <oref>outline6</oref>
-            <symbols groups="1" levels="2">
-                <text name="backslash" label="ॉ" category="letter">ॉ</text>
-                <text name="bar" label="ऑ" category="letter">ऑ</text>
-            </symbols>
-        </key>
-        <key id="keycode66" name="keycode66" column="0" row="2">
-            <bounds>3.121951,82.731707,68.682927,37.463415</bounds>
-            <oref>outline7</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="ISO_Level3_Shift" label="⇮" category="keyname" keyval="65027">ISO_Level3_Shift</keysym>
-            </symbols>
-        </key>
-        <key id="keycode38" name="keycode38" column="1" row="2">
-            <bounds>76.487805,82.731707,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="a" label="ो" category="letter">ो</text>
-                <text name="A" label="ओ" category="letter">ओ</text>
-            </symbols>
-        </key>
-        <key id="keycode39" name="keycode39" column="2" row="2">
-            <bounds>115.512195,82.731707,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="s" label="े" category="letter">े</text>
-                <text name="S" label="ए" category="letter">ए</text>
-            </symbols>
-        </key>
-        <key id="keycode40" name="keycode40" column="3" row="2">
-            <bounds>156.097561,82.731707,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="d" label="्‌" category="letter">्‌</text>
-                <text name="D" label="अ" category="letter">अ</text>
-            </symbols>
-        </key>
-        <key id="keycode41" name="keycode41" column="4" row="2">
-            <bounds>196.682927,82.731707,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="f" label="ि" category="letter">ि</text>
-                <text name="F" label="इ" category="letter">इ</text>
-            </symbols>
-        </key>
-        <key id="keycode42" name="keycode42" column="5" row="2">
-            <bounds>237.268293,82.731707,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="g" label="ु" category="letter">ु</text>
-                <text name="G" label="उ" category="letter">उ</text>
-            </symbols>
-        </key>
-        <key id="keycode43" name="keycode43" column="6" row="2">
-            <bounds>277.853659,82.731707,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="h" label="प" category="letter">प</text>
-                <text name="H" label="फ" category="letter">फ</text>
-            </symbols>
-        </key>
-        <key id="keycode44" name="keycode44" column="7" row="2">
-            <bounds>318.439024,82.731707,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="j" label="र" category="letter">र</text>
-                <text name="J" label="ऱ" category="letter">ऱ</text>
-            </symbols>
-        </key>
-        <key id="keycode45" name="keycode45" column="8" row="2">
-            <bounds>359.024390,82.731707,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="k" label="क" category="letter">क</text>
-                <text name="K" label="ख" category="letter">ख</text>
-            </symbols>
-        </key>
-        <key id="keycode46" name="keycode46" column="9" row="2">
-            <bounds>399.609756,82.731707,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="l" label="त" category="letter">त</text>
-                <text name="L" label="थ" category="letter">थ</text>
-            </symbols>
-        </key>
-        <key id="keycode47" name="keycode47" column="10" row="2">
-            <bounds>438.634146,82.731707,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="semicolon" label="च" category="letter">च</text>
-                <text name="colon" label="छ" category="letter">छ</text>
-            </symbols>
-        </key>
-        <key id="keycode48" name="keycode48" column="11" row="2">
-            <bounds>479.219512,82.731707,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <keysym name="quoteright" label="&apos;" category="letter" keyval="39">quoteright</keysym>
-                <text name="quotedbl" label="ठ" category="letter">ठ</text>
-            </symbols>
-        </key>
-        <key id="keycode36" name="keycode36" column="12" row="2">
-            <bounds>519.804878,82.731707,88.975610,37.463415</bounds>
-            <oref>outline8</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="Return" label="↵" category="keyname" keyval="65293">Return</keysym>
-            </symbols>
-        </key>
-        <key id="keycode50" name="keycode50" column="0" row="3">
-            <bounds>3.121951,121.756098,88.975610,37.463415</bounds>
-            <oref>outline9</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="Shift_L" label="⇧" category="keyname" keyval="65505">Shift_L</keysym>
-            </symbols>
-        </key>
-        <key id="keycode52" name="keycode52" column="1" row="3">
-            <bounds>95.219512,121.756098,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="z" label="ॆ" category="letter">ॆ</text>
-                <text name="Z" label="ऎ" category="letter">ऎ</text>
-            </symbols>
-        </key>
-        <key id="keycode53" name="keycode53" column="2" row="3">
-            <bounds>135.804878,121.756098,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="x" label="ं" category="letter">ं</text>
-                <text name="X" label="ँ" category="letter">ँ</text>
-            </symbols>
-        </key>
-        <key id="keycode54" name="keycode54" column="3" row="3">
-            <bounds>176.390244,121.756098,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="c" label="म" category="letter">म</text>
-                <text name="C" label="ण" category="letter">ण</text>
-            </symbols>
-        </key>
-        <key id="keycode55" name="keycode55" column="4" row="3">
-            <bounds>215.414634,121.756098,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="v" label="न" category="letter">न</text>
-                <text name="V" label="ऩ" category="letter">ऩ</text>
-            </symbols>
-        </key>
-        <key id="keycode56" name="keycode56" column="5" row="3">
-            <bounds>256.000000,121.756098,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="b" label="व" category="letter">व</text>
-                <text name="B" label="ऴ" category="letter">ऴ</text>
-            </symbols>
-        </key>
-        <key id="keycode57" name="keycode57" column="6" row="3">
-            <bounds>296.585366,121.756098,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="n" label="ल" category="letter">ल</text>
-                <text name="N" label="ळ" category="letter">ळ</text>
-            </symbols>
-        </key>
-        <key id="keycode58" name="keycode58" column="7" row="3">
-            <bounds>337.170732,121.756098,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="m" label="स" category="letter">स</text>
-                <text name="M" label="श" category="letter">श</text>
-            </symbols>
-        </key>
-        <key id="keycode59" name="keycode59" column="8" row="3">
-            <bounds>377.756098,121.756098,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="comma" label="," category="letter">,</text>
-                <text name="less" label="ष" category="letter">ष</text>
-            </symbols>
-        </key>
-        <key id="keycode60" name="keycode60" column="9" row="3">
-            <bounds>418.341463,121.756098,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="period" label="." category="letter">.</text>
-                <text name="greater" label="।" category="letter">।</text>
-            </symbols>
-        </key>
-        <key id="keycode61" name="keycode61" column="10" row="3">
-            <bounds>458.926829,121.756098,37.463415,37.463415</bounds>
-            <oref>outline3</oref>
-            <symbols groups="1" levels="2">
-                <text name="slash" label="य" category="letter">य</text>
-                <text name="question" label="य़" category="letter">य़</text>
-            </symbols>
-        </key>
-        <key id="keycode62" name="keycode62" column="11" row="3">
-            <bounds>499.512195,121.756098,109.268293,37.463415</bounds>
-            <oref>outline10</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="Shift_R" label="⇧" category="keyname" keyval="65506">Shift_R</keysym>
-            </symbols>
-        </key>
-        <key id="keycode37" name="keycode37" column="0" row="4">
-            <bounds>3.121951,162.341463,56.195122,37.463415</bounds>
-            <oref>outline1</oref>
-            <symbols groups="1" levels="2">
-                <symbol name="cycle-keyboard" icon="input-keyboard-symbolic" label="⌨" category="keyname">cycle-keyboard</symbol>
-                <symbol name="preferences" icon="preferences-system-symbolic" label="☺" category="keyname">preferences</symbol>
-            </symbols>
-        </key>
-        <key id="keycode133" name="keycode133" column="1" row="4">
-            <bounds>62.439024,162.341463,48.390244,37.463415</bounds>
-            <oref>outline2</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="Control_L" label="Ctrl" category="keyname" keyval="65507">Control_L</keysym>
-            </symbols>
-        </key>
-        <key id="keycode64" name="keycode64" column="2" row="4">
-            <bounds>113.951220,162.341463,48.390244,37.463415</bounds>
-            <oref>outline2</oref>
-            <symbols groups="1" levels="2">
-                <keysym name="Alt_L" label="Alt" category="keyname" keyval="65513">Alt_L</keysym>
-                <keysym name="Meta_L" label="Meta" category="keyname" keyval="65511">Meta_L</keysym>
-            </symbols>
-        </key>
-        <key id="keycode65" name="keycode65" column="3" row="4">
-            <bounds>165.463415,162.341463,238.829268,37.463415</bounds>
-            <oref>outline11</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="space" category="letter" keyval="32">space</keysym>
-            </symbols>
-        </key>
-        <key id="keycode108" name="keycode108" column="4" row="4">
-            <bounds>407.414634,162.341463,48.390244,37.463415</bounds>
-            <oref>outline2</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="Left" label="⇠" category="keyname" keyval="65361">Left</keysym>
-            </symbols>
-        </key>
-        <key id="keycode134" name="keycode134" column="5" row="4">
-            <bounds>458.926829,162.341463,48.390244,37.463415</bounds>
-            <oref>outline2</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="Up" label="⇡" category="keyname" keyval="65362">Up</keysym>
-            </symbols>
-        </key>
-        <key id="keycode135" name="keycode135" column="6" row="4">
-            <bounds>508.878049,162.341463,48.390244,37.463415</bounds>
-            <oref>outline2</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="Down" label="⇣" category="keyname" keyval="65364">Down</keysym>
-            </symbols>
-        </key>
-        <key id="keycode105" name="keycode105" column="7" row="4">
-            <bounds>560.390244,162.341463,48.390244,37.463415</bounds>
-            <oref>outline2</oref>
-            <symbols groups="1" levels="1">
-                <keysym name="Right" label="⇢" category="keyname" keyval="65363">Right</keysym>
-            </symbols>
-        </key>
-    </section>
-    <outline id="outline1">
-        <corner-radius>1.000000</corner-radius>
-        <point>0.000000,0.000000</point>
-        <point>56.195122,0.000000</point>
-        <point>56.195122,37.463415</point>
-        <point>0.000000,37.463415</point>
-    </outline>
-    <outline id="outline3">
-        <corner-radius>1.000000</corner-radius>
-        <point>0.000000,0.000000</point>
-        <point>37.463415,0.000000</point>
-        <point>37.463415,37.463415</point>
-        <point>0.000000,37.463415</point>
-    </outline>
-    <outline id="outline4">
-        <corner-radius>1.000000</corner-radius>
-        <point>0.000000,0.000000</point>
-        <point>79.609756,0.000000</point>
-        <point>79.609756,37.463415</point>
-        <point>0.000000,37.463415</point>
-    </outline>
-    <outline id="outline5">
-        <corner-radius>1.000000</corner-radius>
-        <point>0.000000,0.000000</point>
-        <point>59.317073,0.000000</point>
-        <point>59.317073,37.463415</point>
-        <point>0.000000,37.463415</point>
-    </outline>
-    <outline id="outline6">
-        <corner-radius>1.000000</corner-radius>
-        <point>0.000000,0.000000</point>
-        <point>59.317073,0.000000</point>
-        <point>59.317073,37.463415</point>
-        <point>0.000000,37.463415</point>
-    </outline>
-    <outline id="outline7">
-        <corner-radius>1.000000</corner-radius>
-        <point>0.000000,0.000000</point>
-        <point>68.682927,0.000000</point>
-        <point>68.682927,37.463415</point>
-        <point>0.000000,37.463415</point>
-    </outline>
-    <outline id="outline8">
-        <corner-radius>1.000000</corner-radius>
-        <point>0.000000,0.000000</point>
-        <point>88.975610,0.000000</point>
-        <point>88.975610,37.463415</point>
-        <point>0.000000,37.463415</point>
-    </outline>
-    <outline id="outline9">
-        <corner-radius>1.000000</corner-radius>
-        <point>0.000000,0.000000</point>
-        <point>88.975610,0.000000</point>
-        <point>88.975610,37.463415</point>
-        <point>0.000000,37.463415</point>
-    </outline>
-    <outline id="outline10">
-        <corner-radius>1.000000</corner-radius>
-        <point>0.000000,0.000000</point>
-        <point>109.268293,0.000000</point>
-        <point>109.268293,37.463415</point>
-        <point>0.000000,37.463415</point>
-    </outline>
-    <outline id="outline11">
-        <corner-radius>1.000000</corner-radius>
-        <point>0.000000,0.000000</point>
-        <point>238.829268,0.000000</point>
-        <point>238.829268,37.463415</point>
-        <point>0.000000,37.463415</point>
-    </outline>
-    <outline id="outline2">
-        <corner-radius>1.000000</corner-radius>
-        <point>0.000000,0.000000</point>
-        <point>48.390244,0.000000</point>
-        <point>48.390244,37.463415</point>
-        <point>0.000000,37.463415</point>
-    </outline>
-</keyboard>
-
--- a/data/keyboards/it.yaml
+++ b/data/keyboards/it.yaml
@@ -0,0 +1,90 @@
+# Italian layout created by Antonio Pandolfo
+# 03 october 2019
+---
+outlines:
+    default: { width: 35.33, height: 52 }
+    altline: { width: 52.67, height: 52 }
+    wide: { width: 62, height: 52 }
+    spaceline: { width: 99.67, height: 52 }
+    special: { width: 44, height: 52 }
+
+views:
+    base:
+        - "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        , . 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        ? . Return"
+    numbers:
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "@ # € % & - _ + ( )"
+        - "show_symbols   , \" ' colon ; ! ?  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"
+        action: "erase"
+    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: "àè"
+    space:
+        outline: "spaceline"
+        label: " "
+        text: " "
+    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,525 @@
+# Maintained by: Mark Müller <markmueller86@gmail.com>
+---
+outlines:
+    default: { width: 62, height: 52 }
+    default-wide: { width: 62, height: 52 }
+    altline: { width: 62, height: 52 }
+    wide: { width: 62, height: 52 }
+    special: { width: 62, height: 52 }
+
+views:
+    base: # hiragana
+        - "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"
+        action: erase
+    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/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`See https://github.com/ueno/eekboard/wiki/TODO`
				`@@ -1 +0,0 @@`
				`EekClutter cheader_filename="eek/eek-clutter.h"`
				`@@ -1 +0,0 @@`
				`Eekboard cheader_filename="eekboard/eekboard.h"`
				`@@ -1 +0,0 @@`
				`SUBDIRS = 16x16 22x22 24x24 32x32 48x48 scalable`