0.90.5 released.

Install eekboard.desktop.
Add --list option to eekboard-inscript.
2011-03-11 16:17:46 +09:00 · 2011-03-11 16:00:56 +09:00 · 2011-03-11 15:52:15 +09:00 · 2011-03-11 15:14:20 +09:00
290 changed files with 30519 additions and 15726 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,9 +1,76 @@
-.zanata-cache/
-_build
-TAGS
-tags
-vgdump
-*.swp
+*.la
+*.lo
+*.loT
+*.o
+*.so
 *~
-\#*#
-.\#*
+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-marshalers.[ch]
+eek/*.pc
+eek/*.gir
+eek/*.typelib
+eekboard/*.pc
+eekboard/*.gir
+eekboard/*.typelib
+tests/eek-simple-test
+tests/eek-xkb-test
+tests/eek-xml-test
+src/eekboard-server
+src/eekboard-client
+src/eekboard-system-client
+src/eekboard-xml
+docs/reference/eek/*.stamp
+docs/reference/eek/*.txt
+!/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
+bindings/vala/*.vapi
+py-compile
+
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -1,96 +0,0 @@
-image: debian:buster
-
-stages:
-  - build
-  - test
-
-.tags: &tags
-  tags:
-    - librem5
-
-before_script:
-  - apt-get -y update
-  - apt-get -y install wget ca-certificates gnupg
-  - echo "deb http://ci.puri.sm/ scratch librem5" > /etc/apt/sources.list.d/ci.list
-  - wget -O- https://ci.puri.sm/ci-repo.key | apt-key add -
-  - apt-get -y update
-
-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
-  stage: build
-  artifacts:
-    paths:
-      - _build
-    expire_in: 3h
-  script:
-    - apt-get -y build-dep .
-    - meson . _build/ -Ddepdatadir=/usr/share
-    - 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:arm64:
-    tags:
-        - librem5:arm64
-    allow_failure: true
-    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 .
-
-test_lintian:
-    <<: *tags
-    stage: test
-    dependencies:
-        - build_deb
-    script:
-        - apt-get -y install lintian
-        - lintian *.deb
-
-test:
-  <<: *tags
-  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,5 +1,36 @@
-squeekboard is written by Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm> on behlf of Purism, SPC.
-eekboard was written by Daiki Ueno <ueno@unixuser.org>
+eekboard is written by Daiki Ueno <ueno@unixuser.org>.  The following
+files contain code derived from other free software packages:

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

+  These files contain code derived from the libgnomekbd library.
+  Copyright (C) 2006 Sergey V. Udaltsov <svu@gnome.org>
+
+eek/eek-theme.h
+eek/eek-theme.c
+eek/eek-theme-context.h
+eek/eek-theme-context.c
+eek/eek-theme-node.h
+eek/eek-theme-node.c
+
+  These files contain code derived from gnome-shell.
+
+  Copyright 2008-2010 Red Hat, Inc.
+  Copyright 2009 Steve Frécinaux
+  Copyright 2009, 2010 Florian Müllner
+  Copyright 2010 Adel Gadllah
+  Copyright 2010 Giovanni Campagna
+  Copyright 2003-2004 Dodji Seketeli
+
+data/icons/8x8/Makefile.am
+data/icons/16x16/Makefile.am
+data/icons/22x22/Makefile.am
+data/icons/24x24/Makefile.am
+data/icons/32x32/Makefile.am
+data/icons/48x48/Makefile.am
+data/icons/scalable/Makefile.am
+
+  These files contain code derived from im-chooser.
+
+  Copyright (C) 2006-2008 Red Hat, Inc. All rights reserved.
--- a/Cargo.lock
+++ b/Cargo.lock
@ -1,506 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-[[package]]
-name = "aho-corasick"
-version = "0.7.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "memchr 2.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "atk-sys"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.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.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "cairo-rs"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "cairo-sys-rs 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "glib 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "cairo-sys-rs"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "glib 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
- "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "cc"
-version = "1.0.54"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "clap"
-version = "2.32.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "textwrap 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[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.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-rs 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-sys-rs 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gdk-pixbuf 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gdk-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gio 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "gio-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "glib 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
- "pango 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "gdk-pixbuf"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "gdk-pixbuf-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gio 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "gio-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "glib 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "gdk-pixbuf-sys"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "gio-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.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.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "cairo-sys-rs 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gdk-pixbuf-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gio-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
- "pango-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "gio"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "fragile 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gio-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "glib 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "gio-sys"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.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.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "glib-sys"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "libc 0.2.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.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.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.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-rs 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-sys-rs 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cc 1.0.54 (registry+https://github.com/rust-lang/crates.io-index)",
- "gdk 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gdk-pixbuf 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gdk-pixbuf-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gdk-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gio 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "gio-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "glib 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gtk-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
- "pango 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "gtk-sys"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "atk-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-sys-rs 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gdk-pixbuf-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gdk-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gio-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
- "pango-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "pkg-config 0.3.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 = "memchr"
-version = "2.3.3"
-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.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "glib 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.71 (registry+https://github.com/rust-lang/crates.io-index)",
- "pango-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "pango-sys"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.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.6"
-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.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "aho-corasick 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "memchr 2.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex-syntax 0.6.18 (registry+https://github.com/rust-lang/crates.io-index)",
- "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "utf8-ranges 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "regex-syntax"
-version = "0.6.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "rs"
-version = "0.1.0"
-dependencies = [
- "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-rs 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-sys-rs 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gdk 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gio 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "glib 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gtk 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gtk-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "maplit 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 1.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.111 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_yaml 0.8.12 (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.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.30 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "serde_yaml"
-version = "0.8.12"
-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.3 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "syn"
-version = "1.0.30"
-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.6 (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.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "thread_local"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "unicode-width"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "unicode-xid"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "utf8-ranges"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "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.3"
-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 aho-corasick 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)" = "8716408b8bc624ed7f65d223ddb9ac2d044c0547b6fa4b0d554f3a9540496ada"
-"checksum atk-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c7017e53393e713212aed7aea336b6553be4927f58c37070a56c2fe3d107e489"
-"checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12"
-"checksum cairo-rs 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "dd940f0d609699e343ef71c4af5f66423afbf30d666f796dabd8fd15229cf5b6"
-"checksum cairo-sys-rs 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d25596627380be4381247dba06c69ad05ca21b3b065bd9827e416882ac41dcd2"
-"checksum cc 1.0.54 (registry+https://github.com/rust-lang/crates.io-index)" = "7bbb73db36c1246e9034e307d0fba23f9a2e251faa47ade70c1bd252220c8311"
-"checksum clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b957d88f4b6a63b9d70d5f454ac8011819c6efa7727858f458ab71c756ce2d3e"
-"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.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bcc52c7244046df9d959df87289f1fc5cca23f9f850bab0c967963e2ecb83a96"
-"checksum gdk-pixbuf 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bc3aa730cb4df3de5d9fed59f43afdf9e5fb2d3d10bfcbd04cec031435ce87f5"
-"checksum gdk-pixbuf-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "08284f16ce4d909b10d785a763ba190e222d2c1557b29908bf0a661e27a8ac3b"
-"checksum gdk-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "108548ebf5329b551f2b97ab356908d14627905abb74b936c3372de1535aee81"
-"checksum gio 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "29a44b051990573448edc80b1995237f8b97b5734d2aec05105b9242aa10af11"
-"checksum gio-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6975ada29f7924dc1c90b30ed3b32d777805a275556c05e420da4fbdc22eb250"
-"checksum glib 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a333edf5b9f1411c246ef14e7881b087255f04c56dbef48c64a0cb039b4b340"
-"checksum glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3573351e846caed9f11207b275cd67bc07f0c2c94fb628e5d7c92ca056c7882d"
-"checksum gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "08475e4a08f27e6e2287005950114735ed61cec2cb8c1187682a5aec8c69b715"
-"checksum gtk 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "56a6b30f194f09a17bb7ffa95c3ecdb405abd3b75ff981f831b1f6d18fe115ff"
-"checksum gtk-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d487d333a4b87072e6bf9f2e55befa0ebef01b9496c2e263c0f4a1ff3d6c04b1"
-"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-"checksum libc 0.2.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 memchr 2.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400"
-"checksum memmap 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6585fd95e7bb50d6cc31e20d4cf9afb4e2ba16c5846fc76793f11218da9c475b"
-"checksum pango 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4c2cb169402a3eb1ba034a7cc7d95b8b1c106e9be5ba4be79a5a93dc1a2795f4"
-"checksum pango-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d6eb49268e69dd0c1da5d3001a61aac08e2e9d2bfbe4ae4b19b9963c998f6453"
-"checksum pkg-config 0.3.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.6 (registry+https://github.com/rust-lang/crates.io-index)" = "54a21852a652ad6f610c9510194f398ff6f8692e334fd1145fed931f7fbe44ea"
-"checksum regex 1.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "d9d8297cc20bbb6184f8b45ff61c8ee6a9ac56c156cec8e38c3e5084773c44ad"
-"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.12 (registry+https://github.com/rust-lang/crates.io-index)" = "16c7a592a1ec97c9c1c68d75b6e537dcbf60c7618e038e7841e00af1d9ccf0c4"
-"checksum syn 1.0.30 (registry+https://github.com/rust-lang/crates.io-index)" = "93a56fabc59dce20fe48b6c832cc249c713e7ed88fa28b0ee0a3bfcaae5fe4e2"
-"checksum textwrap 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "307686869c93e71f94da64286f9a9524c0f308a9e1c87a583de8e9c9039ad3f6"
-"checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b"
-"checksum unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479"
-"checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
-"checksum utf8-ranges 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b4ae116fef2b7fea257ed6440d3cfcff7f190865f170cdad00bb6465bf18ecba"
-"checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6"
-"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-"checksum xkbcommon 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fda0ea5f7ddabd51deeeda7799bee06274112f577da7dd3d954b8eda731b2fce"
-"checksum yaml-rust 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "65923dd1784f44da1d2c3dbbc5e822045628c590ba72123e1c73d3c230c4434d"
--- a/Cargo.toml
+++ b/Cargo.toml
@ -1,47 +0,0 @@
-[package]
-name = "rs"
-version = "0.1.0"
-
-[dependencies]
-bitflags = "1.0.*"
-clap = { version = "2.32.*", default-features = false }
-maplit = "1.0.*"
-regex = "1.1.*"
-serde = { version = "1.0.*", features = ["derive"] }
-serde_yaml = "0.8.*"
-xkbcommon = { version = "0.4.*", features = ["wayland"] }
-
-[dependencies.cairo-rs]
-version = "0.5.*"
-
-[dependencies.cairo-sys-rs]
-version = ""
-
-[dependencies.gdk]
-version = ""
-
-[dependencies.gio]
-version = ""
-features = ["v2_44"]
-
-[dependencies.glib]
-version = ""
-features = ["v2_44"]
-
-[dependencies.glib-sys]
-version = ""
-features = ["v2_44"]
-
-[dependencies.gtk]
-version = "0.5.*"
-features = ["v3_22"]
-
-[dependencies.gtk-sys]
-version = ""
-features = ["v3_22"]
-
-
-[lib]
-name = "rs"
-path = "src/lib.rs"
-crate-type = ["staticlib", "rlib"]
--- a/data/langs/de-DE.txt
+++ b/data/langs/de-DE.txt
--- a/Makefile.am
+++ b/Makefile.am
@ -0,0 +1,21 @@
+# 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/data/langs/ja-JP.txt
+++ b/data/langs/ja-JP.txt
--- a/65
+++ b/65
@ -0,0 +1,65 @@
+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.
+
+* How to build
+
+** Dependencies
+
+REQUIRED: GLib2, GTK, GConf2, PangoCairo, libxklavier, libcroco
+OPTIONAL: fakekey, CSPI, Clutter, Clutter-Gtk, Vala, gobject-introspection
+
+** 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
+
+* How to test
+
+eekboard currently includes 3 tools to implement your own virtual
+keyboard.
+
+** eekboard-server
+
+eekboard-server is a D-Bus server which is responsible for drawing
+interactive on-screen keyboards.  Since it has a D-Bus service
+activation entry, you will not need to start it manually, but you can
+do that with:
+
+  $ eekboard-server &
+
+** eekboard
+
+eekboard is a client of eekboard-server.  It listens desktop events
+(keyboard change, focus in/out, and keystroke) and generates key
+events when some keys are pressed on the on-screen keyboard.  It can
+be started with:
+
+  $ eekboard
+
+** eekboard-xml
+
+eekboard-xml is a tool to manipulate XML keyboard description used by
+eekboard-client tool and in the eekboard library.
+
+To dump the current system keyboard layout into an XML file:
+
+  $ eekboard-xml --dump > keyboard.xml
+
+You can display the dumped layout with:
+
+  $ eekboard-xml --load keyboard.xml
+
+* Documentation
+
+See file:docs/reference/eek/html/index.html
--- a/README.md
+++ b/README.md
@ -1,59 +0,0 @@
-*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`.
-
-### Build from git repo
-
-```
-$ git clone https://source.puri.sm/Librem5/squeekboard.git
-$ cd squeekboard
-$ mkdir ../build
-$ meson ../build/
-$ cd ../build
-$ ninja test
-$ ninja install
-```
-
-Running
-------
-
-```
-$ phoc # if no compatible Wayland compositor is running yet
-$ cd ../build/
-$ src/squeekboard
-```
-
-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
@ -0,0 +1 @@
+See https://github.com/ueno/eekboard/wiki/TODO
--- a/autogen.sh
+++ b/autogen.sh
@ -0,0 +1,25 @@
+#!/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
@ -0,0 +1,27 @@
+# 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 =
+
+if ENABLE_PYTHON
+SUBDIRS += python
+endif
+
+if ENABLE_VALA
+SUBDIRS += vala
+endif
--- a/bindings/python/Makefile.am
+++ b/bindings/python/Makefile.am
@ -0,0 +1,18 @@
+# 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
@ -0,0 +1,21 @@
+# 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/>.
+
+pkgpython_PYTHON = \
+	__init__.py \
+	eekboard.py \
+	context.py
--- a/bindings/python/eekboard/init.py
+++ b/bindings/python/eekboard/init.py
@ -0,0 +1,67 @@
+# 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 gi.repository import Eek, EekXkl, Gio
+
+from eekboard import Eekboard
+from context import Context
+
+Keyboard = Eek.Keyboard
+Section = Eek.Section
+Key = Eek.Key
+Symbol = Eek.Symbol
+Keysym = Eek.Keysym
+SymbolMatrix = Eek.SymbolMatrix
+
+MODIFIER_BEHAVIOR_NONE, \
+MODIFIER_BEHAVIOR_LOCK, \
+MODIFIER_BEHAVIOR_LATCH = \
+(Eek.ModifierBehavior.NONE,
+ Eek.ModifierBehavior.LOCK,
+ Eek.ModifierBehavior.LATCH)
+
+SymbolCategory = Eek.SymbolCategory
+
+CSW = 640
+CSH = 480
+
+def XmlKeyboard(path, modifier_behavior=MODIFIER_BEHAVIOR_NONE):
+    _file = Gio.file_new_for_path(path)
+    layout = Eek.XmlLayout.new(_file.read())
+    keyboard = Eek.Keyboard.new(layout, CSW, CSH)
+    keyboard.set_modifier_behavior(modifier_behavior)
+    keyboard.set_alt_gr_mask(Eek.ModifierType.MOD5_MASK)
+    return keyboard
+
+def XklKeyboard(modifier_behavior=MODIFIER_BEHAVIOR_NONE):
+    layout = EekXkl.Layout.new()
+    keyboard = Eek.Keyboard.new(layout, CSW, CSH)
+    keyboard.set_modifier_behavior(modifier_behavior)
+    return keyboard
+
+__all__ = ['Eekboard',
+           'Context',
+           'Keyboard',
+           'Section',
+           'Key',
+           'Symbol',
+           'Keysym',
+           'MODIFIER_BEHAVIOR_NONE',
+           'MODIFIER_BEHAVIOR_LOCK',
+           'MODIFIER_BEHAVIOR_LATCH',
+           'XmlKeyboard',
+           'XklKeyboard']
--- a/bindings/python/eekboard/context.py
+++ b/bindings/python/eekboard/context.py
@ -0,0 +1,100 @@
+# 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 gi.repository import Eekboard
+import gobject
+
+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_UINT,)),
+        'key-released': (
+            gobject.SIGNAL_RUN_LAST,
+            gobject.TYPE_NONE,
+            (gobject.TYPE_UINT,)),
+        'destroyed': (
+            gobject.SIGNAL_RUN_LAST,
+            gobject.TYPE_NONE,
+            ()),
+        }
+
+    __gproperties__ = {
+        'keyboard-visible': (bool, None, None, False, gobject.PARAM_READWRITE),
+        }
+
+    def __init__(self, giobject):
+        super(Context, self).__init__()
+        self.__properties = dict()
+        self.__giobject = giobject
+        self.__giobject.connect('enabled', lambda *args: self.emit('enabled'))
+        self.__giobject.connect('disabled', lambda *args: self.emit('disabled'))
+        self.__giobject.connect('key-pressed', lambda *args: self.emit('key-pressed', args[1]))
+        self.__giobject.connect('key-released', lambda *args: self.emit('key-released', args[1]))
+        self.__giobject.connect('destroyed', lambda *args: self.emit('destroyed'))
+        self.__giobject.connect('notify::keyboard-visible', self.__notify_keyboard_visible_cb)
+
+    def do_set_property(self, pspec, value):
+        self.__properties[pspec.name] = value
+
+    def do_get_property(self, pspec):
+        return self.__properties[pspec.name]
+
+    def __notify_keyboard_visible_cb(self, *args):
+        self.set_property('keyboard-visible',
+                          self.__giobject.get_property(args[1].name))
+        self.notify('keyboard-visible')
+
+    def get_giobject(self):
+        return self.__giobject
+
+    def add_keyboard(self, keyboard):
+        return self.__giobject.add_keyboard(keyboard, None)
+
+    def remove_keyboard(self, keyboard_id):
+        return self.__giobject.remove_keyboard(keyboard_id, None)
+        
+    def set_keyboard(self, keyboard_id):
+        self.__giobject.set_keyboard(keyboard_id, None)
+
+    def show_keyboard(self):
+        self.__giobject.show_keyboard(None)
+
+    def hide_keyboard(self):
+        self.__giobject.hide_keyboard(None)
+
+    def set_group(self, group):
+        self.__giobject.set_group(group, None)
+
+    def press_key(self, keycode):
+        self.__giobject.press_key(keycode, None)
+
+    def release_key(self, keycode):
+        self.__giobject.release_key(keycode, None)
+
+    def is_enabled(self):
+        return self.__giobject.is_enabled()
--- a/bindings/python/eekboard/eekboard.py
+++ b/bindings/python/eekboard/eekboard.py
@ -0,0 +1,49 @@
+# 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 gi.repository import Gio
+import gi.repository
+import gobject
+from context import Context
+
+class Eekboard(gobject.GObject):
+    __gtype_name__ = "PYEekboardEekboard"
+    __gsignals__ = {
+        'destroyed': (
+            gobject.SIGNAL_RUN_LAST,
+            gobject.TYPE_NONE,
+            ())
+        }
+
+    def __init__(self):
+        super(Eekboard, self).__init__()
+        self.__connection = Gio.bus_get_sync(Gio.BusType.SESSION, None)
+        self.__eekboard = gi.repository.Eekboard.Eekboard.new(self.__connection, None);
+        self.__eekboard.connect('destroyed', lambda *args: self.emit('destroyed'))
+
+    def create_context(self, client_name):
+        context = self.__eekboard.create_context(client_name, None)
+        return Context(context)
+
+    def push_context(self, context):
+        self.__eekboard.push_context(context.get_giobject(), None)
+
+    def pop_context(self):
+        self.__eekboard.pop_context(None)
+
+    def destroy_context(self, context):
+        self.__eekboard.destroy_context(context.get_giobject(), None)
--- a/bindings/vala/Makefile.am
+++ b/bindings/vala/Makefile.am
@ -0,0 +1,50 @@
+# 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
+
+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 --library eek-$(EEK_API_VERSION) \
+		eek-$(EEK_API_VERSION)/eek-$(EEK_API_VERSION).gi
+
+eek-clutter-$(EEK_API_VERSION).vapi: eek-$(EEK_API_VERSION).vapi
+	vapigen --vapidir=$(builddir) --library eek-clutter-$(EEK_API_VERSION) \
+		--pkg eek-$(EEK_API_VERSION) --pkg clutter-1.0 \
+		eek-clutter-$(EEK_API_VERSION)/eek-clutter-$(EEK_API_VERSION).gi
+
+eek-gtk-$(EEK_API_VERSION).vapi: eek-$(EEK_API_VERSION).vapi
+	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 --vapidir=$(builddir) --library eek-xkb-$(EEK_API_VERSION) \
+		--pkg eek-$(EEK_API_VERSION) \
+		eek-xkb-$(EEK_API_VERSION)/eek-xkb-$(EEK_API_VERSION).gi
+
+eek-xkl-$(EEK_API_VERSION).vapi: eek-xkb-$(EEK_API_VERSION).vapi
+	vapigen --vapidir=$(builddir) --library eek-xkl-$(EEK_API_VERSION) \
+		--pkg eek-$(EEK_API_VERSION) --pkg eek-xkb-$(EEK_API_VERSION) \
+		eek-xkl-$(EEK_API_VERSION)/eek-xkl-$(EEK_API_VERSION).gi
--- a/bindings/vala/eek-0.90/eek-0.90.files
+++ b/bindings/vala/eek-0.90/eek-0.90.files
@ -0,0 +1,9 @@
+include/eek-0.1/eek/eek-layout.h
+include/eek-0.1/eek/eek-element.h
+include/eek-0.1/eek/eek-container.h
+include/eek-0.1/eek/eek-keyboard.h
+include/eek-0.1/eek/eek-section.h
+include/eek-0.1/eek/eek-key.h
+include/eek-0.1/eek/eek-types.h
+include/eek-0.1/eek/eek-keysym.h
+lib/libeek.so
--- a/bindings/vala/eek-0.90/eek-0.90.gi
+++ b/bindings/vala/eek-0.90/eek-0.90.gi
@ -0,0 +1,680 @@
+<?xml version="1.0"?>
+<api version="1.0">
+	<namespace name="Eek">
+		<function name="keysym_get_category" symbol="eek_keysym_get_category">
+			<return-type type="EekKeysymCategory"/>
+			<parameters>
+				<parameter name="keysym" type="guint"/>
+			</parameters>
+		</function>
+		<function name="keysym_to_string" symbol="eek_keysym_to_string">
+			<return-type type="gchar*"/>
+			<parameters>
+				<parameter name="keysym" type="guint"/>
+			</parameters>
+		</function>
+		<callback name="EekCallback">
+			<return-type type="void"/>
+			<parameters>
+				<parameter name="element" type="EekElement*"/>
+				<parameter name="user_data" type="gpointer"/>
+			</parameters>
+		</callback>
+		<callback name="EekCompareFunc">
+			<return-type type="gint"/>
+			<parameters>
+				<parameter name="element" type="EekElement*"/>
+				<parameter name="user_data" type="gpointer"/>
+			</parameters>
+		</callback>
+		<boxed name="EekBounds" type-name="EekBounds" get-type="eek_bounds_get_type">
+			<field name="x" type="gdouble"/>
+			<field name="y" type="gdouble"/>
+			<field name="width" type="gdouble"/>
+			<field name="height" type="gdouble"/>
+		</boxed>
+		<boxed name="EekKeysymMatrix" type-name="EekKeysymMatrix" get-type="eek_keysym_matrix_get_type">
+			<field name="data" type="guint*"/>
+			<field name="num_groups" type="gint"/>
+			<field name="num_levels" type="gint"/>
+		</boxed>
+		<boxed name="EekOutline" type-name="EekOutline" get-type="eek_outline_get_type">
+			<field name="corner_radius" type="gdouble"/>
+			<field name="points" type="EekPoint*"/>
+			<field name="num_points" type="gint"/>
+		</boxed>
+		<boxed name="EekPoint" type-name="EekPoint" get-type="eek_point_get_type">
+			<field name="x" type="gdouble"/>
+			<field name="y" type="gdouble"/>
+		</boxed>
+		<enum name="EekKeysymCategory">
+			<member name="EEK_KEYSYM_CATEGORY_LETTER" value="0"/>
+			<member name="EEK_KEYSYM_CATEGORY_FUNCTION" value="1"/>
+			<member name="EEK_KEYSYM_CATEGORY_KEYNAME" value="2"/>
+			<member name="EEK_KEYSYM_CATEGORY_UNKNOWN" value="3"/>
+			<member name="EEK_KEYSYM_CATEGORY_LAST" value="3"/>
+		</enum>
+		<enum name="EekOrientation">
+			<member name="EEK_ORIENTATION_VERTICAL" value="0"/>
+			<member name="EEK_ORIENTATION_HORIZONTAL" value="1"/>
+			<member name="EEK_ORIENTATION_INVALID" value="-1"/>
+		</enum>
+		<object name="EekContainer" parent="EekElement" type-name="EekContainer" get-type="eek_container_get_type">
+			<method name="find" symbol="eek_container_find">
+				<return-type type="EekElement*"/>
+				<parameters>
+					<parameter name="container" type="EekContainer*"/>
+					<parameter name="func" type="EekCompareFunc"/>
+					<parameter name="user_data" type="gpointer"/>
+				</parameters>
+			</method>
+			<method name="find_by_position" symbol="eek_container_find_by_position">
+				<return-type type="EekElement*"/>
+				<parameters>
+					<parameter name="container" type="EekContainer*"/>
+					<parameter name="x" type="gdouble"/>
+					<parameter name="y" type="gdouble"/>
+				</parameters>
+			</method>
+			<method name="foreach_child" symbol="eek_container_foreach_child">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="container" type="EekContainer*"/>
+					<parameter name="callback" type="EekCallback"/>
+					<parameter name="user_data" type="gpointer"/>
+				</parameters>
+			</method>
+			<signal name="child-added" when="FIRST">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="self" type="EekContainer*"/>
+					<parameter name="element" type="EekElement*"/>
+				</parameters>
+			</signal>
+			<signal name="child-removed" when="FIRST">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="self" type="EekContainer*"/>
+					<parameter name="element" type="EekElement*"/>
+				</parameters>
+			</signal>
+			<vfunc name="add_child">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="self" type="EekContainer*"/>
+					<parameter name="element" type="EekElement*"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="find">
+				<return-type type="EekElement*"/>
+				<parameters>
+					<parameter name="self" type="EekContainer*"/>
+					<parameter name="func" type="EekCompareFunc"/>
+					<parameter name="user_data" type="gpointer"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="foreach_child">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="self" type="EekContainer*"/>
+					<parameter name="callback" type="EekCallback"/>
+					<parameter name="user_data" type="gpointer"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="remove_child">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="self" type="EekContainer*"/>
+					<parameter name="element" type="EekElement*"/>
+				</parameters>
+			</vfunc>
+		</object>
+		<object name="EekElement" parent="GInitiallyUnowned" type-name="EekElement" get-type="eek_element_get_type">
+			<method name="get_absolute_position" symbol="eek_element_get_absolute_position">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="element" type="EekElement*"/>
+					<parameter name="x" type="gdouble*"/>
+					<parameter name="y" type="gdouble*"/>
+				</parameters>
+			</method>
+			<method name="get_bounds" symbol="eek_element_get_bounds">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="element" type="EekElement*"/>
+					<parameter name="bounds" type="EekBounds*"/>
+				</parameters>
+			</method>
+			<method name="get_name" symbol="eek_element_get_name">
+				<return-type type="gchar*"/>
+				<parameters>
+					<parameter name="element" type="EekElement*"/>
+				</parameters>
+			</method>
+			<method name="get_parent" symbol="eek_element_get_parent">
+				<return-type type="EekElement*"/>
+				<parameters>
+					<parameter name="element" type="EekElement*"/>
+				</parameters>
+			</method>
+			<method name="set_bounds" symbol="eek_element_set_bounds">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="element" type="EekElement*"/>
+					<parameter name="bounds" type="EekBounds*"/>
+				</parameters>
+			</method>
+			<method name="set_name" symbol="eek_element_set_name">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="element" type="EekElement*"/>
+					<parameter name="name" type="gchar*"/>
+				</parameters>
+			</method>
+			<method name="set_parent" symbol="eek_element_set_parent">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="element" type="EekElement*"/>
+					<parameter name="parent" type="EekElement*"/>
+				</parameters>
+			</method>
+			<property name="bounds" type="EekBounds*" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="name" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+			<vfunc name="get_bounds">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="self" type="EekElement*"/>
+					<parameter name="bounds" type="EekBounds*"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="get_name">
+				<return-type type="gchar*"/>
+				<parameters>
+					<parameter name="self" type="EekElement*"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="get_parent">
+				<return-type type="EekElement*"/>
+				<parameters>
+					<parameter name="self" type="EekElement*"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="set_bounds">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="self" type="EekElement*"/>
+					<parameter name="bounds" type="EekBounds*"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="set_name">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="self" type="EekElement*"/>
+					<parameter name="name" type="gchar*"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="set_parent">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="self" type="EekElement*"/>
+					<parameter name="parent" type="EekElement*"/>
+				</parameters>
+			</vfunc>
+		</object>
+		<object name="EekKey" parent="EekElement" type-name="EekKey" get-type="eek_key_get_type">
+			<method name="get_index" symbol="eek_key_get_index">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="key" type="EekKey*"/>
+					<parameter name="column" type="gint*"/>
+					<parameter name="row" type="gint*"/>
+				</parameters>
+			</method>
+			<method name="get_keycode" symbol="eek_key_get_keycode">
+				<return-type type="guint"/>
+				<parameters>
+					<parameter name="key" type="EekKey*"/>
+				</parameters>
+			</method>
+			<method name="get_keysym" symbol="eek_key_get_keysym">
+				<return-type type="guint"/>
+				<parameters>
+					<parameter name="key" type="EekKey*"/>
+				</parameters>
+			</method>
+			<method name="get_keysym_index" symbol="eek_key_get_keysym_index">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="key" type="EekKey*"/>
+					<parameter name="group" type="gint*"/>
+					<parameter name="level" type="gint*"/>
+				</parameters>
+			</method>
+			<method name="get_keysyms" symbol="eek_key_get_keysyms">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="key" type="EekKey*"/>
+					<parameter name="keysyms" type="guint**"/>
+					<parameter name="num_groups" type="gint*"/>
+					<parameter name="num_levels" type="gint*"/>
+				</parameters>
+			</method>
+			<method name="get_outline" symbol="eek_key_get_outline">
+				<return-type type="EekOutline*"/>
+				<parameters>
+					<parameter name="key" type="EekKey*"/>
+				</parameters>
+			</method>
+			<method name="set_index" symbol="eek_key_set_index">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="key" type="EekKey*"/>
+					<parameter name="column" type="gint"/>
+					<parameter name="row" type="gint"/>
+				</parameters>
+			</method>
+			<method name="set_keycode" symbol="eek_key_set_keycode">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="key" type="EekKey*"/>
+					<parameter name="keycode" type="guint"/>
+				</parameters>
+			</method>
+			<method name="set_keysym_index" symbol="eek_key_set_keysym_index">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="key" type="EekKey*"/>
+					<parameter name="group" type="gint"/>
+					<parameter name="level" type="gint"/>
+				</parameters>
+			</method>
+			<method name="set_keysyms" symbol="eek_key_set_keysyms">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="key" type="EekKey*"/>
+					<parameter name="keysyms" type="guint*"/>
+					<parameter name="num_groups" type="gint"/>
+					<parameter name="num_levels" type="gint"/>
+				</parameters>
+			</method>
+			<method name="set_outline" symbol="eek_key_set_outline">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="key" type="EekKey*"/>
+					<parameter name="outline" type="EekOutline*"/>
+				</parameters>
+			</method>
+			<property name="column" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="group" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="keycode" type="guint" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="keysyms" type="EekKeysymMatrix*" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="level" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="outline" type="gpointer" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="row" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+			<signal name="pressed" when="FIRST">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="key" type="EekKey*"/>
+				</parameters>
+			</signal>
+			<signal name="released" when="FIRST">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="key" type="EekKey*"/>
+				</parameters>
+			</signal>
+			<vfunc name="get_index">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="self" type="EekKey*"/>
+					<parameter name="column" type="gint*"/>
+					<parameter name="row" type="gint*"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="get_keycode">
+				<return-type type="guint"/>
+				<parameters>
+					<parameter name="self" type="EekKey*"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="get_keysym">
+				<return-type type="guint"/>
+				<parameters>
+					<parameter name="self" type="EekKey*"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="get_keysym_index">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="self" type="EekKey*"/>
+					<parameter name="group" type="gint*"/>
+					<parameter name="level" type="gint*"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="get_keysyms">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="self" type="EekKey*"/>
+					<parameter name="keysyms" type="guint**"/>
+					<parameter name="num_groups" type="gint*"/>
+					<parameter name="num_levels" type="gint*"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="get_outline">
+				<return-type type="EekOutline*"/>
+				<parameters>
+					<parameter name="self" type="EekKey*"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="set_index">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="self" type="EekKey*"/>
+					<parameter name="column" type="gint"/>
+					<parameter name="row" type="gint"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="set_keycode">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="self" type="EekKey*"/>
+					<parameter name="keycode" type="guint"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="set_keysym_index">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="self" type="EekKey*"/>
+					<parameter name="group" type="gint"/>
+					<parameter name="level" type="gint"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="set_keysyms">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="self" type="EekKey*"/>
+					<parameter name="keysyms" type="guint*"/>
+					<parameter name="num_groups" type="gint"/>
+					<parameter name="num_levels" type="gint"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="set_outline">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="self" type="EekKey*"/>
+					<parameter name="outline" type="EekOutline*"/>
+				</parameters>
+			</vfunc>
+		</object>
+		<object name="EekKeyboard" parent="EekContainer" type-name="EekKeyboard" get-type="eek_keyboard_get_type">
+			<method name="create_section" symbol="eek_keyboard_create_section">
+				<return-type type="EekSection*"/>
+				<parameters>
+					<parameter name="keyboard" type="EekKeyboard*"/>
+				</parameters>
+			</method>
+			<method name="find_key_by_keycode" symbol="eek_keyboard_find_key_by_keycode">
+				<return-type type="EekKey*"/>
+				<parameters>
+					<parameter name="keyboard" type="EekKeyboard*"/>
+					<parameter name="keycode" type="guint"/>
+				</parameters>
+			</method>
+			<method name="get_keysym_index" symbol="eek_keyboard_get_keysym_index">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="keyboard" type="EekKeyboard*"/>
+					<parameter name="group" type="gint*"/>
+					<parameter name="level" type="gint*"/>
+				</parameters>
+			</method>
+			<method name="realize" symbol="eek_keyboard_realize">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="keyboard" type="EekKeyboard*"/>
+				</parameters>
+			</method>
+			<method name="set_keysym_index" symbol="eek_keyboard_set_keysym_index">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="keyboard" type="EekKeyboard*"/>
+					<parameter name="group" type="gint"/>
+					<parameter name="level" type="gint"/>
+				</parameters>
+			</method>
+			<method name="set_layout" symbol="eek_keyboard_set_layout">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="keyboard" type="EekKeyboard*"/>
+					<parameter name="layout" type="EekLayout*"/>
+				</parameters>
+			</method>
+			<property name="group" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="level" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+			<signal name="key-pressed" when="FIRST">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="object" type="EekKeyboard*"/>
+					<parameter name="p0" type="EekKey*"/>
+				</parameters>
+			</signal>
+			<signal name="key-released" when="FIRST">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="object" type="EekKeyboard*"/>
+					<parameter name="p0" type="EekKey*"/>
+				</parameters>
+			</signal>
+			<vfunc name="create_section">
+				<return-type type="EekSection*"/>
+				<parameters>
+					<parameter name="self" type="EekKeyboard*"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="find_key_by_keycode">
+				<return-type type="EekKey*"/>
+				<parameters>
+					<parameter name="self" type="EekKeyboard*"/>
+					<parameter name="keycode" type="guint"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="get_keysym_index">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="self" type="EekKeyboard*"/>
+					<parameter name="group" type="gint*"/>
+					<parameter name="level" type="gint*"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="realize">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="self" type="EekKeyboard*"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="set_keysym_index">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="self" type="EekKeyboard*"/>
+					<parameter name="group" type="gint"/>
+					<parameter name="level" type="gint"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="set_layout">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="self" type="EekKeyboard*"/>
+					<parameter name="layout" type="EekLayout*"/>
+				</parameters>
+			</vfunc>
+		</object>
+		<object name="EekSection" parent="EekContainer" type-name="EekSection" get-type="eek_section_get_type">
+			<method name="add_row" symbol="eek_section_add_row">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="section" type="EekSection*"/>
+					<parameter name="num_columns" type="gint"/>
+					<parameter name="orientation" type="EekOrientation"/>
+				</parameters>
+			</method>
+			<method name="create_key" symbol="eek_section_create_key">
+				<return-type type="EekKey*"/>
+				<parameters>
+					<parameter name="section" type="EekSection*"/>
+					<parameter name="column" type="gint"/>
+					<parameter name="row" type="gint"/>
+				</parameters>
+			</method>
+			<method name="find_key_by_keycode" symbol="eek_section_find_key_by_keycode">
+				<return-type type="EekKey*"/>
+				<parameters>
+					<parameter name="section" type="EekSection*"/>
+					<parameter name="keycode" type="guint"/>
+				</parameters>
+			</method>
+			<method name="get_angle" symbol="eek_section_get_angle">
+				<return-type type="gint"/>
+				<parameters>
+					<parameter name="section" type="EekSection*"/>
+				</parameters>
+			</method>
+			<method name="get_n_rows" symbol="eek_section_get_n_rows">
+				<return-type type="gint"/>
+				<parameters>
+					<parameter name="section" type="EekSection*"/>
+				</parameters>
+			</method>
+			<method name="get_row" symbol="eek_section_get_row">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="section" type="EekSection*"/>
+					<parameter name="index" type="gint"/>
+					<parameter name="num_columns" type="gint*"/>
+					<parameter name="orientation" type="EekOrientation*"/>
+				</parameters>
+			</method>
+			<method name="set_angle" symbol="eek_section_set_angle">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="section" type="EekSection*"/>
+					<parameter name="angle" type="gint"/>
+				</parameters>
+			</method>
+			<property name="angle" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+			<signal name="key-pressed" when="FIRST">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="object" type="EekSection*"/>
+					<parameter name="p0" type="EekKey*"/>
+				</parameters>
+			</signal>
+			<signal name="key-released" when="FIRST">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="object" type="EekSection*"/>
+					<parameter name="p0" type="EekKey*"/>
+				</parameters>
+			</signal>
+			<vfunc name="add_row">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="self" type="EekSection*"/>
+					<parameter name="num_columns" type="gint"/>
+					<parameter name="orientation" type="EekOrientation"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="create_key">
+				<return-type type="EekKey*"/>
+				<parameters>
+					<parameter name="self" type="EekSection*"/>
+					<parameter name="row" type="gint"/>
+					<parameter name="column" type="gint"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="find_key_by_keycode">
+				<return-type type="EekKey*"/>
+				<parameters>
+					<parameter name="self" type="EekSection*"/>
+					<parameter name="keycode" type="guint"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="get_angle">
+				<return-type type="gint"/>
+				<parameters>
+					<parameter name="self" type="EekSection*"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="get_n_rows">
+				<return-type type="gint"/>
+				<parameters>
+					<parameter name="self" type="EekSection*"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="get_row">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="self" type="EekSection*"/>
+					<parameter name="index" type="gint"/>
+					<parameter name="num_columns" type="gint*"/>
+					<parameter name="orientation" type="EekOrientation*"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="set_angle">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="self" type="EekSection*"/>
+					<parameter name="angle" type="gint"/>
+				</parameters>
+			</vfunc>
+		</object>
+		<interface name="EekLayout" type-name="EekLayout" get-type="eek_layout_get_type">
+			<method name="apply" symbol="eek_layout_apply">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="layout" type="EekLayout*"/>
+					<parameter name="keyboard" type="EekKeyboard*"/>
+				</parameters>
+			</method>
+			<method name="get_group" symbol="eek_layout_get_group">
+				<return-type type="gint"/>
+				<parameters>
+					<parameter name="layout" type="EekLayout*"/>
+				</parameters>
+			</method>
+			<signal name="changed" when="FIRST">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="self" type="EekLayout*"/>
+				</parameters>
+			</signal>
+			<signal name="group-changed" when="FIRST">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="self" type="EekLayout*"/>
+					<parameter name="group" type="gint"/>
+				</parameters>
+			</signal>
+			<vfunc name="apply">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="self" type="EekLayout*"/>
+					<parameter name="keyboard" type="EekKeyboard*"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="get_group">
+				<return-type type="gint"/>
+				<parameters>
+					<parameter name="self" type="EekLayout*"/>
+				</parameters>
+			</vfunc>
+		</interface>
+		<constant name="EEK_CONTAINER_H" type="int" value="1"/>
+		<constant name="EEK_ELEMENT_H" type="int" value="1"/>
+		<constant name="EEK_KEYBOARD_H" type="int" value="1"/>
+		<constant name="EEK_KEYSYM_H" type="int" value="1"/>
+		<constant name="EEK_KEY_H" type="int" value="1"/>
+		<constant name="EEK_LAYOUT_H" type="int" value="1"/>
+		<constant name="EEK_SECTION_H" type="int" value="1"/>
+		<constant name="EEK_TYPES_H" type="int" value="1"/>
+	</namespace>
+</api>
--- a/bindings/vala/eek-0.90/eek-0.90.metadata
+++ b/bindings/vala/eek-0.90/eek-0.90.metadata
@ -0,0 +1 @@
+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
@ -0,0 +1 @@
+Eek
--- a/bindings/vala/eek-clutter-0.90/eek-clutter-0.90.files
+++ b/bindings/vala/eek-clutter-0.90/eek-clutter-0.90.files
@ -0,0 +1,6 @@
+include/eek-0.1/eek/eek-clutter-keyboard.h
+include/eek-0.1/eek/eek-clutter-section.h
+include/eek-0.1/eek/eek-clutter-key.h
+include/eek-0.1/eek/eek-clutter-drawing-context.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
@ -0,0 +1,85 @@
+<?xml version="1.0"?>
+<api version="1.0">
+	<namespace name="EekClutter">
+		<object name="EekClutterDrawingContext" parent="GInitiallyUnowned" type-name="EekClutterDrawingContext" get-type="eek_clutter_drawing_context_get_type">
+			<method name="get_category_font" symbol="eek_clutter_drawing_context_get_category_font">
+				<return-type type="PangoFontDescription*"/>
+				<parameters>
+					<parameter name="context" type="EekClutterDrawingContext*"/>
+					<parameter name="category" type="EekKeysymCategory"/>
+				</parameters>
+			</method>
+			<method name="get_outline_texture" symbol="eek_clutter_drawing_context_get_outline_texture">
+				<return-type type="ClutterActor*"/>
+				<parameters>
+					<parameter name="context" type="EekClutterDrawingContext*"/>
+					<parameter name="outline" type="EekOutline*"/>
+				</parameters>
+			</method>
+			<constructor name="new" symbol="eek_clutter_drawing_context_new">
+				<return-type type="EekClutterDrawingContext*"/>
+			</constructor>
+			<method name="set_category_font" symbol="eek_clutter_drawing_context_set_category_font">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="context" type="EekClutterDrawingContext*"/>
+					<parameter name="category" type="EekKeysymCategory"/>
+					<parameter name="fonts" type="PangoFontDescription*"/>
+				</parameters>
+			</method>
+			<method name="set_outline_texture" symbol="eek_clutter_drawing_context_set_outline_texture">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="context" type="EekClutterDrawingContext*"/>
+					<parameter name="outline" type="EekOutline*"/>
+					<parameter name="texture" type="ClutterActor*"/>
+				</parameters>
+			</method>
+		</object>
+		<object name="EekClutterKey" parent="EekKey" type-name="EekClutterKey" get-type="eek_clutter_key_get_type">
+			<method name="get_actor" symbol="eek_clutter_key_get_actor">
+				<return-type type="ClutterActor*"/>
+				<parameters>
+					<parameter name="key" type="EekClutterKey*"/>
+				</parameters>
+			</method>
+			<constructor name="new" symbol="eek_clutter_key_new">
+				<return-type type="EekKey*"/>
+				<parameters>
+					<parameter name="context" type="EekClutterDrawingContext*"/>
+					<parameter name="column" type="gint"/>
+					<parameter name="row" type="gint"/>
+				</parameters>
+			</constructor>
+		</object>
+		<object name="EekClutterKeyboard" parent="EekKeyboard" type-name="EekClutterKeyboard" get-type="eek_clutter_keyboard_get_type">
+			<method name="get_actor" symbol="eek_clutter_keyboard_get_actor">
+				<return-type type="ClutterActor*"/>
+				<parameters>
+					<parameter name="keyboard" type="EekClutterKeyboard*"/>
+				</parameters>
+			</method>
+			<constructor name="new" symbol="eek_clutter_keyboard_new">
+				<return-type type="EekKeyboard*"/>
+			</constructor>
+		</object>
+		<object name="EekClutterSection" parent="EekSection" type-name="EekClutterSection" get-type="eek_clutter_section_get_type">
+			<method name="get_actor" symbol="eek_clutter_section_get_actor">
+				<return-type type="ClutterActor*"/>
+				<parameters>
+					<parameter name="section" type="EekClutterSection*"/>
+				</parameters>
+			</method>
+			<constructor name="new" symbol="eek_clutter_section_new">
+				<return-type type="EekSection*"/>
+				<parameters>
+					<parameter name="context" type="EekClutterDrawingContext*"/>
+				</parameters>
+			</constructor>
+		</object>
+		<constant name="EEK_CLUTTER_DRAWING_CONTEXT_H" type="int" value="1"/>
+		<constant name="EEK_CLUTTER_KEYBOARD_H" type="int" value="1"/>
+		<constant name="EEK_CLUTTER_KEY_H" type="int" value="1"/>
+		<constant name="EEK_CLUTTER_SECTION_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
@ -0,0 +1 @@
+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
@ -0,0 +1 @@
+EekClutter
--- a/bindings/vala/eek-gtk-0.90/eek-gtk-0.90.files
+++ b/bindings/vala/eek-gtk-0.90/eek-gtk-0.90.files
@ -0,0 +1,3 @@
+include/eek-0.1/eek/eek-gtk-keyboard.h
+include/eek-0.1/eek/eek-gtk.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
@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<api version="1.0">
+	<namespace name="EekGtk">
+		<object name="EekGtkKeyboard" parent="EekKeyboard" type-name="EekGtkKeyboard" get-type="eek_gtk_keyboard_get_type">
+			<method name="get_widget" symbol="eek_gtk_keyboard_get_widget">
+				<return-type type="GtkWidget*"/>
+				<parameters>
+					<parameter name="keyboard" type="EekGtkKeyboard*"/>
+				</parameters>
+			</method>
+			<constructor name="new" symbol="eek_gtk_keyboard_new">
+				<return-type type="EekKeyboard*"/>
+			</constructor>
+		</object>
+		<constant name="EEK_GTK_H" type="int" value="1"/>
+		<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
@ -0,0 +1 @@
+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
@ -0,0 +1 @@
+EekGtk
--- a/bindings/vala/eek-xkb-0.90/eek-xkb-0.90.files
+++ b/bindings/vala/eek-xkb-0.90/eek-xkb-0.90.files
@ -0,0 +1,2 @@
+include/eek-0.1/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
@ -0,0 +1,65 @@
+<?xml version="1.0"?>
+<api version="1.0">
+	<namespace name="EekXkb">
+		<object name="EekXkbLayout" parent="GInitiallyUnowned" type-name="EekXkbLayout" get-type="eek_xkb_layout_get_type">
+			<implements>
+				<interface name="EekLayout"/>
+			</implements>
+			<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_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
@ -0,0 +1 @@
+EekXkb cheader_filename="eek/eek-xkb.h"
--- a/bindings/vala/eek-xkb-0.90/eek-xkb-0.90.namespace
+++ b/bindings/vala/eek-xkb-0.90/eek-xkb-0.90.namespace
@ -0,0 +1 @@
+EekXkb
--- a/bindings/vala/eek-xkl-0.90/eek-xkl-0.90.files
+++ b/bindings/vala/eek-xkl-0.90/eek-xkl-0.90.files
@ -0,0 +1,3 @@
+include/eek-0.1/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
@ -0,0 +1,91 @@
+<?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">
+			<implements>
+				<interface name="EekLayout"/>
+			</implements>
+			<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_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
@ -0,0 +1 @@
+EekXkl cheader_filename="eek/eek-xkl.h"
--- a/bindings/vala/eek-xkl-0.90/eek-xkl-0.90.namespace
+++ b/bindings/vala/eek-xkl-0.90/eek-xkl-0.90.namespace
@ -0,0 +1 @@
+EekXkl
--- a/cargo.sh
+++ b/cargo.sh
@ -1,17 +0,0 @@
-#!/bin/sh
-
-# This script manages Cargo operations
-# while keeping the artifact directory within the build tree
-# instead of the source tree
-
-set -e
-
-SCRIPT_PATH="$(realpath "$0")"
-SOURCE_DIR="$(dirname "$SCRIPT_PATH")"
-
-CARGO_TARGET_DIR="$(pwd)"
-export CARGO_TARGET_DIR
-
-cd "$SOURCE_DIR"
-cargo "$@"
-
--- a/cargo_build.sh
+++ b/cargo_build.sh
@ -1,34 +0,0 @@
-#!/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
@ -0,0 +1,268 @@
+# 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], [0.90.5], [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: 2.0)])],
+  [case "$with_gtk" in
+     2.0|3.0) ;;
+     *) AC_MSG_ERROR([invalid gtk version specified]) ;;
+   esac],
+  [with_gtk=2.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.25.4], ,
+  [AC_MSG_ERROR([GLib2 not found])])
+PKG_CHECK_MODULES([GIO2], [gio-2.0], ,
+  [AC_MSG_ERROR([Gio2 not found])])
+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([GCONF2], [gconf-2.0], ,
+  [AC_MSG_ERROR([GConf 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 libfakekey to generate key events
+AC_MSG_CHECKING([whether you enable fakekey])
+AC_ARG_ENABLE(fakekey,
+              AS_HELP_STRING([--enable-fakekey=no/yes],
+                             [Enable fakekey default=yes]),,
+              enable_fakekey=yes)
+
+if test x$enable_fakekey = xyes; then
+  PKG_CHECK_MODULES([FAKEKEY], [libfakekey], ,
+    [AC_MSG_ERROR([fakekey not found])])
+  AC_DEFINE([HAVE_FAKEKEY], [1], [Define if fakekey is found])
+fi
+AM_CONDITIONAL(ENABLE_FAKEKEY, [test x$enable_fakekey = xyes])
+AC_MSG_RESULT($enable_fakekey)
+
+dnl use AT-SPI to capture focus/keystroke events
+AC_MSG_CHECKING([whether you enable AT-SPI event handling])
+AC_ARG_ENABLE(cspi,
+              AS_HELP_STRING([--enable-cspi=no/yes],
+                             [Enable AT-SPI event handling default=yes]),,
+              enable_cspi=yes)
+
+if test x$enable_cspi = xyes; then
+  PKG_CHECK_MODULES([CSPI], [cspi-1.0], ,
+    [AC_MSG_ERROR([AT-SPI C not found])])
+  AC_DEFINE([HAVE_CSPI], [1], [Define if CSPI is found])
+fi
+AC_MSG_RESULT($enable_cspi)
+AM_CONDITIONAL(ENABLE_CSPI, [test x$enable_cspi = xyes])
+
+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=yes)
+AC_MSG_RESULT($enable_python)
+AM_CONDITIONAL(ENABLE_PYTHON, [test x$enable_python = xyes])
+
+if test x"$enable_python" = x"yes"; then
+    # check python
+    AM_PATH_PYTHON([2.5])
+    AC_PATH_PROG(PYTHON_CONFIG, python$PYTHON_VERSION-config)
+    if test x"$PYTHON_CONFIG" = x""; then
+        AC_PATH_PROG(PYTHON_CONFIG, python-config)
+    fi
+    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)
+else
+    enable_python="no (disabled, use --enable-python to enable)"
+fi
+
+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=yes)
+AC_MSG_RESULT($enable_vala)
+AM_CONDITIONAL(ENABLE_VALA, [test x$enable_vala = xyes])
+
+dnl standalone application
+AC_MSG_CHECKING([whether you enable eekboard])
+AC_ARG_ENABLE(eekboard,
+              AS_HELP_STRING([--enable-eekboard=no/yes],
+                             [Build standalone application "ekboard" default=yes]),,
+              enable_eekboard=yes)
+AC_MSG_RESULT($enable_eekboard)
+AM_CONDITIONAL(ENABLE_EEKBOARD, [test x$enable_eekboard = 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=yes]),,
+              enable_clutter=no)
+AC_MSG_RESULT($enable_clutter)
+
+if test x$enable_clutter = xyes; then
+  PKG_CHECK_MODULES([CLUTTER], [clutter-1.0], ,
+    [AC_MSG_ERROR([Clutter not found -- install it or add --disable-clutter])])
+  AC_DEFINE([HAVE_CLUTTER], [1], [Define if Clutter is found])
+  have_clutter_gtk=0
+  need_swap_event_workaround=0
+  PKG_CHECK_MODULES([CLUTTER_GTK], [clutter-gtk-1.0], [have_clutter_gtk=1],
+    [PKG_CHECK_MODULES([CLUTTER_GTK], [clutter-gtk-0.10 clutter-x11-1.0],
+      [have_clutter_gtk=1; need_swap_event_workaround=1])])
+  AC_DEFINE_UNQUOTED([HAVE_CLUTTER_GTK], $have_clutter_gtk,
+    [Define if Clutter-Gtk is found])
+  AC_DEFINE_UNQUOTED([NEED_SWAP_EVENT_WORKAROUND], $need_swap_event_workaround,
+    [Define if GLX_INTEL_swap_event work around is needed])
+fi
+AM_CONDITIONAL(ENABLE_CLUTTER, [test x$enable_clutter = xyes])
+
+GTK_DOC_CHECK([1.14],[--flavour no-tmpl])
+
+dnl to re-generate eek/*-keysym-labels.txt
+AC_CHECK_PROGS([PYTHON], [python])
+
+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)
+
+GOBJECT_INTROSPECTION_CHECK([0.9.0])
+
+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/eekboard-inscript/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
+  Build vala binding        $enable_vala
+  Build document            $enable_gtk_doc
+])
--- a/data/Makefile.am
+++ b/data/Makefile.am
@ -0,0 +1,6 @@
+SUBDIRS = icons themes keyboards
+
+desktopdir = $(datadir)/applications
+desktop_in_files = eekboard.desktop.in
+dist_desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+@INTLTOOL_DESKTOP_RULE@
--- a/data/dbus/sm.puri.OSK0.xml
+++ b/data/dbus/sm.puri.OSK0.xml
@ -1,20 +0,0 @@
-<!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.desktop.in
+++ b/data/eekboard.desktop.in
@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Eekboard
+GenericName=Eekboard Virtual Keyboard
+Comment=Virtual Keyboard
+Exec=eekboard-desktop-client
+Icon=eekboard
+Terminal=false
+Type=Application
+Categories=GTK;Utility;
--- a/data/icons/16x16/Makefile.am
+++ b/data/icons/16x16/Makefile.am
@ -0,0 +1,16 @@
+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
@ -0,0 +1,16 @@
+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
@ -0,0 +1,16 @@
+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
@ -0,0 +1,16 @@
+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
@ -0,0 +1,16 @@
+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
@ -0,0 +1 @@
+SUBDIRS = 16x16 22x22 24x24 32x32 48x48 scalable
--- a/data/icons/key-enter.svg
+++ b/data/icons/key-enter.svg
@ -1,10 +0,0 @@
-<?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
@ -1,8 +0,0 @@
-<?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
@ -1,52 +0,0 @@
-<?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
@ -0,0 +1,14 @@
+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
@ -0,0 +1,2 @@
+keyboarddir = $(pkgdatadir)/keyboards
+dist_keyboard_DATA = us-qwerty.xml
--- a/data/keyboards/de.yaml
+++ b/data/keyboards/de.yaml
@ -1,82 +0,0 @@
-# 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
@ -1,81 +0,0 @@
-# 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
@ -1,98 +0,0 @@
---
-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
@ -1,80 +0,0 @@
---
-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
@ -1,87 +0,0 @@
---
-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/fi.yaml
+++ b/data/keyboards/fi.yaml
@ -1,171 +0,0 @@
---
-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
@ -1,89 +0,0 @@
---
-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/gr.yaml
+++ b/data/keyboards/gr.yaml
@ -1,191 +0,0 @@
-# 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/it.yaml
+++ b/data/keyboards/it.yaml
@ -1,92 +0,0 @@
-# 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        , 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_numbers_from_symbols:
-        action:
-            set_view: "numbers"
-        outline: "altline"
-        label: "123"
-    show_letters:
-        action:
-            set_view: "base"
-        outline: "altline"
-        label: "abc"
-    show_symbols:
-        action:
-            set_view: "symbols"
-        outline: "altline"
-        label: "*/="
-    show_eschars:
-        action:
-            set_view: "eschars"
-        outline: "altline"
-        label: "àè"
-    period:
-        outline: "default"
-        label: "."
-    space:
-        outline: "spaceline"
-        label: " "
-    Return:
-        outline: "altline"
-        icon: "key-enter"
-        keysym: "Return"
-    colon:
-        label: ":"
-    "\"":
-        keysym: "quotedbl"
--- a/data/keyboards/jp+kana.yaml
+++ b/data/keyboards/jp+kana.yaml
@ -1,525 +0,0 @@
-# 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/data/keyboards/jp+kana_wide.yaml
+++ b/data/keyboards/jp+kana_wide.yaml
@ -1,525 +0,0 @@
-# Maintained by: Mark Müller <markmueller86@gmail.com>
---
-outlines:
-    default: { width: 62, height: 42 }
-    default-wide: { width: 62, height: 42 }
-    altline: { width: 62, height: 42 }
-    wide: { width: 62, height: 42 }
-    special: { width: 62, height: 42 }
-
-views:
-    base: # hiragana
-        - "preferences _a ka sa BackSpace"
-        - "Left ta na ha Right"
-        - "カタカナ ma ya ra space"
-        - "switch2roman symbols wa punct Return"
-    _a:
-        - "preferences dummykey _a dummykey BackSpace"
-        - "あ い う え お"
-        - "ぁ ぃ ぅ ぇ ぉ" # 2 code points each
-        - "dummykey dummykey ゔ dummykey dummykey"
-    ka:
-        - "preferences dummykey ka dummykey BackSpace"
-        - "か き く け こ"
-        - "が ぎ ぐ げ ご"
-        - "ゕ dummykey dummykey ゖ dummykey"
-    sa:
-        - "preferences dummykey sa dummykey BackSpace"
-        - "さ し す せ そ"
-        - "ざ じ ず ぜ ぞ"
-    ta:
-        - "preferences dummykey ta dummykey BackSpace"
-        - "た ち つ て と"
-        - "だ ぢ づ で ど"
-        - "dummykey dummykey っ dummykey dummykey"
-    na:
-        - "preferences dummykey na dummykey BackSpace"
-        - "な に ぬ ね の"
-    ha:
-        - "preferences dummykey ha dummykey BackSpace"
-        - "は ひ ふ へ ほ"
-        - "ば び ぶ べ ぼ"
-        - "ぱ ぴ ぷ ぺ ぽ"
-    ma:
-        - "preferences dummykey ma dummykey BackSpace"
-        - "ま み む め も"
-    ya:
-        - "preferences dummykey ya dummykey BackSpace"
-        - "や dummykey ゆ dummykey よ"
-        - "ゃ dummykey ゅ dummykey ょ"
-    ra:
-        - "preferences dummykey ra dummykey BackSpace"
-        - "ら り る れ ろ"
-    wa:
-        - "preferences dummykey wa dummykey BackSpace"
-        - "わ ゐ dummykey ゑ を"
-        - "ゎ dummykey ん dummykey dummykey"
-    symbols:
-        - "preferences dummykey symbols dummykey BackSpace"
-        - "「 」 （ ） §"
-        - "【 】 ＜ ＞ ＝"
-        - "＋ ＊ ＆ ％ ＄ "
-    punct:
-        - "preferences dummykey punct dummykey BackSpace"
-        - "。 、 ？ ！ ー"
-
-        - "： ； ・ 〜 …"
-        - "♪ ” ’ ゙ ゚"
-        
-#a 	あア 	かカ 	さサ 	たタ 	なナ 	はハ 	まマ 	やヤ 	らラ 	わワ
-#i 	いイ 	きキ 	しシ 	ちチ 	にニ 	ひヒ 	みミ 	※      りリ 	ゐヰ
-#u 	うウ 	くク 	すス 	つツ 	ぬヌ 	ふフ 	むム 	ゆユ 	るル 	※
-#e 	えエ 	けケ 	せセ 	てテ 	ねネ 	へヘ 	めメ 	※      れレ 	ゑヱ
-#o 	おオ 	こコ 	そソ 	とト 	のノ 	ほホ 	もモ 	よヨ 	ろロ 	をヲ
-
-#      g       z       d       b       p      n
-#a 	が ガ 	ざ ザ 	だ ダ 	ば バ 	ぱ パ   ん ン
-#i 	ぎ ギ 	じ ジ 	ぢ ヂ 	び ビ 	ぴ ピ 
-#u 	ぐ グ 	ず ズ 	づ ヅ 	ぶ ブ 	ぷ プ 
-#e 	げ ゲ 	ぜ ゼ 	で デ 	べ ベ 	ぺ ペ 
-#o 	ご ゴ 	ぞ ゾ 	ど ド 	ぼ ボ 	ぽ ポ 
-
-    カタカナ: # katakana
-        - "preferences _A KA SA BackSpace"
-        - "Left TA NA HA Right"
-        - "ひらがな MA YA RA space"
-        - "switch2roman SYMBOLS WA PUNCT Return"
-    _A:
-        - "preferences DUMMYKEY _A DUMMYKEY BackSpace"
-        - "ア イ ウ エ オ"
-        - "ァ ィ ゥ ェ ォ"
-        - "DUMMYKEY DUMMYKEY ヴ DUMMYKEY DUMMYKEY"
-    KA:
-        - "preferences DUMMYKEY KA DUMMYKEY BackSpace"
-        - "カ キ ク ケ コ"
-        - "ガ ギ グ ゲ ゴ"
-        - "ヵ DUMMYKEY ㇰ ヶ DUMMYKEY"
-    SA:
-        - "preferences DUMMYKEY SA DUMMYKEY BackSpace"
-        - "サ シ ス セ ソ"
-        - "ザ ジ ズ ゼ ゾ"
-        - "DUMMYKEY ㇱ ㇲ DUMMYKEY DUMMYKEY"
-    TA:
-        - "preferences DUMMYKEY TA DUMMYKEY BackSpace"
-        - "タ チ ツ テ ト"
-        - "ダ ヂ ヅ デ ド"
-        - "DUMMYKEY DUMMYKEY ッ DUMMYKEY ㇳ"
-    NA: 
-        - "preferences DUMMYKEY NA DUMMYKEY BackSpace"
-        - "ナ ニ ヌ ネ ノ"
-        - "DUMMYKEY DUMMYKEY ㇴ DUMMYKEY DUMMYKEY"
-    HA:
-        - "preferences DUMMYKEY HA DUMMYKEY BackSpace"
-        - "ハ ヒ フ ヘ ホ"
-        - "バ ビ ブ ベ ボ"
-        - "パ ピ プ ペ ポ"
-    MA:
-        - "preferences DUMMYKEY MA DUMMYKEY BackSpace"
-        - "マ ミ ム メ モ"
-        - "DUMMYKEY DUMMYKEY ㇺ DUMMYKEY DUMMYKEY"
-    YA:
-        - "preferences DUMMYKEY YA DUMMYKEY BackSpace"
-        - "ヤ DUMMYKEY ユ DUMMYKEY ヨ"
-        - "ャ DUMMYKEY ュ DUMMYKEY ョ"
-    RA:
-        - "preferences DUMMYKEY RA DUMMYKEY BackSpace"
-        - "ラ リ ル レ ロ"
-        - "ㇻ ㇼ ㇽ ㇾ ㇿ"
-    WA:
-        - "preferences DUMMYKEY WA DUMMYKEY BackSpace"
-        - "ワ ヰ DUMMYKEY ヱ ヲ"
-        - "ヮ ヸ ン ヹ ヺ"
-    # numbers view
-    numbers:
-        - "preferences 1 2 3 BackSpace"
-        - "Left 4 5 6 Right"
-        - "roman 7 8 9 space"
-        - "switch2kana * 0 # Return"
-    # Roman alphabet view
-    roman:
-        - "preferences RSYM1 ABC DEF BackSpace"
-        - "Left GHI JKL MNO Right"
-        - "ひらがな PQRS TUV WXYZ space"
-        - "switch2num RSYM2 RSYM3 RSYM4 Return"
-    RSYM1:
-        - "preferences dummykey RSYM1 dummykey BackSpace"
-        - "@ # $ § :"
-        - "| € ¥ £ 1"
-    ABC:
-        - "preferences dummykey ABC dummykey BackSpace"
-        - "A B C Ä ç"
-        - "a b c ä 2"
-    DEF:
-        - "preferences dummykey DEF dummykey BackSpace"
-        - "D E F dummykey"
-        - "d e f 3"
-    GHI:
-        - "preferences dummykey GHI dummykey BackSpace"
-        - "G H I dummykey"
-        - "g h i 4"
-    JKL:
-        - "preferences dummykey JKL dummykey BackSpace"
-        - "J K L dummykey"
-        - "j k l 5"
-    MNO:
-        - "preferences dummykey MNO dummykey BackSpace"
-        - "M N O Ö dummykey"
-        - "m n o ö 6"
-    PQRS:
-        - "preferences dummykey PQRS dummykey BackSpace"
-        - "P Q R S ß"
-        - "p q r s 7"
-    TUV:
-        - "preferences dummykey TUV dummykey BackSpace"
-        - "T U V Ü dummykey"
-        - "t u v ü 8"
-    WXYZ:
-        - "preferences dummykey WXYZ dummykey BackSpace"
-        - "W X Y Z dummykey"
-        - "w x y z 9"
-    RSYM2:
-        - "preferences dummykey RSYM2 dummykey BackSpace"
-        - "( ) ' \" ~"
-        - "[ ] { } _"
-    RSYM3:
-        - "preferences dummykey RSYM3 dummykey BackSpace"
-        - "+ - * / ="
-        - "< > ^ ° 0"
-    RSYM4:
-        - "preferences dummykey RSYM4 dummykey BackSpace"
-        - ", . ? ! ;"
-        - "\\ ´ ` · ¶" 
-
-buttons:
-    # following 4 buttons use the corresponding xkb name as keysym
-    BackSpace:
-        outline: "wide"
-        icon: "edit-clear-symbolic"
-        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/data/keyboards/no.yaml
+++ b/data/keyboards/no.yaml
@ -1,99 +0,0 @@
---
-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/number.yaml
+++ b/data/keyboards/number.yaml
@ -1,39 +0,0 @@
---
-outlines:
-    default: { width: 37.46341, height: 52 }
-    altline: { width: 48.39024, height: 52 }
-    outline7: { width: 88.97561, height: 52 }
-    spaceline: { width: 120.5853, height: 52 }
-
-views:
-    base:
-        - "1 2 3 parenleft parenright"
-        - "4 5 6 numbersign asterisk"
-        - "7 8 9 plus minus"
-        - "BackSpace 0 space Return"
-
-buttons:
-    BackSpace:
-        outline: "altline"
-        icon: "edit-clear-symbolic"
-        action: erase
-    space:
-        outline: spaceline
-        text: " "
-    Return:
-        outline: outline7
-        icon: "key-enter"
-        keysym: "Return"
-    asterisk:
-        text: "*"
-    numbersign:
-        text: "#"
-    minus:
-        text: "-"
-    plus:
-        text: "+"
-    parenleft:
-        text: "("
-    parenright:
-        text: ")"
-
--- a/data/keyboards/pl.yaml
+++ b/data/keyboards/pl.yaml
@ -1,110 +0,0 @@
---
-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:
-        - "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        show_accents 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        show_upper_accents Return"
-    numbers:
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "@ # $ % & - _ + ( )"
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
-        - "show_letters preferences         space        period Return"
-    symbols:
-        - "~ ` | · √ π τ ÷ × ¶"
-        - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        period Return"
-    accents:
-        - "q w ę r t y u i ó p"
-        - "ą ś d f g h j k ł"
-        - "accents_show_upper   ż ź ć v b ń m  BackSpace"
-        - "show_numbers preferences         space        show_accents Return"
-    upper_accents:
-        - "Q W Ę R T Y U I Ó P"
-        - "Ą Ś D F G H J K Ł"
-        - "accents_show_upper   Ż Ź Ć V B Ń M  BackSpace"
-        - "show_numbers preferences         space        show_upper_accents Return"
-
-
-buttons:
-    Shift_L:
-        action:
-            locking:
-                lock_view: "upper"
-                unlock_view: "base"
-        outline: "altline"
-        icon: "key-shift"
-    accents_show_upper:
-        action:
-            locking:
-                lock_view: "upper_accents"
-                unlock_view: "accents"
-        outline: "altline"
-        icon: "key-shift"
-    BackSpace:
-        outline: "altline"
-        icon: "edit-clear-symbolic"
-        keysym: "BackSpace"
-    preferences:
-        action: "show_prefs"
-        outline: "special"
-        icon: "keyboard-mode-symbolic"
-    show_numbers:
-        action:
-            set_view: "numbers"
-        outline: "wide"
-        label: "123"
-    show_numbers_from_symbols:
-        action:
-            set_view: "numbers"
-        outline: "altline"
-        label: "123"
-    show_letters:
-        action:
-            set_view: "base"
-        outline: "wide"
-        label: "ABC"
-    show_symbols:
-        action:
-            set_view: "symbols"
-        outline: "altline"
-        label: "*/="
-    show_accents:
-        action:
-            locking:
-                lock_view: "accents"
-                unlock_view: "base"
-        outline: "altline"
-        label: "ąę"
-    show_upper_accents:
-        action:
-            locking:
-                lock_view: "upper_accents"
-                unlock_view: "upper"
-        outline: "altline"
-        label: "ĄĘ"
-    period:
-        outline: "altline"
-        text: "."
-    space:
-        outline: "spaceline"
-        text: " "
-    Return:
-        outline: "wide"
-        icon: "key-enter"
-        keysym: "Return"
-    colon:
-        text: ":"
--- a/data/keyboards/pl_wide.yaml
+++ b/data/keyboards/pl_wide.yaml
@ -1,102 +0,0 @@
---
-outlines:
-    default: { width: 54, height: 42 }
-    altline: { width: 81, height: 42 }
-    wide: { width: 100, height: 42 }
-    spaceline: { width: 206, height: 42 }
-    special: { width: 54, height: 42 }
-
-views:
-    base:
-        - "q w e r t y u i o p"
-        - "a s d f g h j k l"
-        - "Shift_L   z x c v b n m  BackSpace"
-        - "show_numbers preferences         space        show_accents 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        show_upper_accents Return"
-    numbers:
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "@ # $ % & - _ + ( )"
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
-        - "show_letters preferences         space        period Return"
-    symbols:
-        - "~ ` | · √ π τ ÷ × ¶"
-        - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        period Return"
-    accents:
-        - "q w ę r t y u i ó p"
-        - "ą ś d f g h j k ł"
-        - "Shift_L   ż ź ć v b ń m  BackSpace"
-        - "show_numbers preferences         space        show_accents Return"
-    upper_accents:
-        - "Q W Ę R T Y U I Ó P"
-        - "Ą Ś D F G H J K Ł"
-        - "Shift_L   Ż Ź Ć V B Ń M  BackSpace"
-        - "show_numbers preferences         space        show_upper_accents Return"
-
-buttons:
-    Shift_L:
-        action:
-            locking:
-                lock_view: "upper"
-                unlock_view: "base"
-        outline: "altline"
-        icon: "key-shift"
-    BackSpace:
-        outline: "altline"
-        icon: "edit-clear-symbolic"
-        keysym: "BackSpace"
-    preferences:
-        action: "show_prefs"
-        outline: "special"
-        icon: "keyboard-mode-symbolic"
-    show_numbers:
-        action:
-            set_view: "numbers"
-        outline: "wide"
-        label: "123"
-    show_numbers_from_symbols:
-        action:
-            set_view: "numbers"
-        outline: "altline"
-        label: "123"
-    show_letters:
-        action:
-            set_view: "base"
-        outline: "wide"
-        label: "ABC"
-    show_symbols:
-        action:
-            set_view: "symbols"
-        outline: "altline"
-        label: "*/="
-    show_accents:
-        action:
-            locking:
-                lock_view: "accents"
-                unlock_view: "base"
-        outline: "altline"
-        label: "ąę"
-    show_upper_accents:
-        action:
-            locking:
-                lock_view: "upper_accents"
-                unlock_view: "upper"
-        outline: "altline"
-        label: "ĄĘ"
-    period:
-        outline: "altline"
-        text: "."
-    space:
-        outline: "spaceline"
-        text: " "
-    Return:
-        outline: "wide"
-        icon: "key-enter"
-        keysym: "Return"
-    colon:
-        text: ":"
--- a/data/keyboards/ru.yaml
+++ b/data/keyboards/ru.yaml
@ -1,94 +0,0 @@
---
-outlines:
-    default: { width: 32, height: 52 }
-    altline: { width: 32, height: 52 }
-    wide: { width: 57, height: 52 }
-    narrow: { width: 26, height: 52 }
-    spaceline: { width: 107, height: 52 }
-    fill: { width: 159, height: 52 }
-    special: { width: 42, height: 52 }
-
-views:
-    base:
-        - "й ц у к е н г ш щ з х"
-        - "ф ы в а п р о л д ж э"
-        - "Shift_L  я ч с м и т ь б ю  BackSpace"
-        - "show_numbers preferences    ё  space  ъ  period Return"
-    upper:
-        - "Й Ц У К Е Н Г Ш Щ З Х"
-        - "Ф Ы В А П Р О Л Д Ж Э"
-        - "Shift_L   Я Ч С М И Т Ь Б Ю  BackSpace"
-        - "show_numbers preferences    Ё  space  Ъ  comma Return"
-    numbers:
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "@ # $ % & - _ + ( )"
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
-        - "show_letters preferences         space_fill   period Return"
-    symbols:
-        - "~ ` | · √ π τ ÷ × ¶"
-        - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space_fill   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: "123"
-    show_numbers_from_symbols:
-        action:
-            set_view: "numbers"
-        outline: "wide"
-        label: "123"
-    show_letters:
-        action:
-            set_view: "base"
-        outline: "wide"
-        label: "АБВ"
-    show_symbols:
-        action:
-            set_view: "symbols"
-        outline: "wide"
-        label: "*/="
-    period:
-        outline: "special"
-        text: "."
-    comma:
-        outline: "special"
-        text: ","
-    space:
-        outline: "spaceline"
-        text: " "
-    space_fill:
-        outline: "fill"
-        text: " "
-    Return:
-        outline: "wide"
-        icon: "key-enter"
-        keysym: "Return"
-    colon:
-        text: ":"
-    ё:
-        outline: "narrow"
-    Ё:
-        outline: "narrow"
-    ъ:
-        outline: "narrow"
-    Ъ:
-        outline: "narrow"
--- a/data/keyboards/se.yaml
+++ b/data/keyboards/se.yaml
@ -1,164 +0,0 @@
---
-outlines:
-    default: { width: 32, height: 52 }
-    altline: { width: 48.39024, height: 52 }
-    wide: { width: 64,  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        .    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_from_symbols   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: "special"
-        icon: "keyboard-mode-symbolic"
-    show_numbers:
-        outline: "wide"
-        action:
-            set_view: "numbers"
-        label: "123"
-    show_numbers_from_symbols:
-        action:
-            set_view: "numbers"
-        outline: altline
-        label: "123"
-    show_letters:
-        outline: "wide"
-        action:
-            set_view: "base"
-        label: "ABC"
-    show_symbols:
-        action:
-            set_view: "symbols"
-        outline: "altline"
-        label: "*/="
-    ".":
-        outline: "special"
-    space:
-        outline: spaceline
-        text: " "
-    Return:
-        outline: "wide"
-        icon: "key-enter"
-        keysym: "Return"
-    asterisk:
-        text: "*"
-    asciitilde:
-        text: "~"
-    quoteleft:
-        text: "`"
-    bar:
-        text: "|"
-    U00B7:
-        text: "·"
-    squareroot:
-        text: "√"
-    Greek_pi:
-        text: "π"
-    division:
-        text: "÷"
-    multiply:
-        text: "×"
-    paragraph:
-        text: "¶"
-    Greek_tau:
-        text: "τ"
-    copyright:
-        text: "©"
-    numbersign:
-        text: "#"
-    U00AE:
-        text: "®"
-    at:
-        text: "@"
-    dollar:
-        text: "$"
-    U00A3:
-        text: "£"
-    percent:
-        text: "%"
-    EuroSign:
-        text: "€"
-    ampersand:
-        text: "&"
-    U00A5:
-        text: "¥"
-    minus:
-        text: "-"
-    asciicircum:
-        text: "^"
-    underscore:
-        text: "_"
-    degree:
-        text: "°"
-    plus:
-        text: "+"
-    equal:
-        text: "="
-    parenleft:
-        text: "("
-    parenright:
-        text: ")"
-    braceleft:
-        text: "{"
-    braceright:
-        text: "}"
-    comma:
-        text: ","
-    backslash:
-        text: "\\"
-    slash:
-        text: "/"
-    quotedbl:
-        text: "\""
-    quoteright:
-        text: "'"
-    less:
-        text: "<"
-    greater:
-        text: ">"
-    colon:
-        text: ":"
-    semicolon:
-        text: ";"
-    exclam:
-        text: "!"
-    question:
-        text: "?"
-    bracketleft:
-        text: "["
-    bracketright:
-        text: "]"
--- a/data/keyboards/terminal.yaml
+++ b/data/keyboards/terminal.yaml
@ -1,159 +0,0 @@
---
-outlines:
-    default: { width: 35.33, height: 52 }
-    action:  { width: 59,    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:
-        - "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        show_actions 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        show_actions Return"
-    numbers:
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "* # $ / & - _ + ( )"
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
-        - "show_letters preferences         space        period Return"
-    symbols:
-        - "~ ` | · √ π τ ÷ × ¶"
-        - "© ® £ € ¥ ^ ° @ { }"
-        - "show_numbers_from_symbols   \\ % < > = [ ]  BackSpace"
-        - "show_letters preferences         space        period Return"
-    actions:
-        - "F1  F2  F3  F4  F5  F6"
-        - "F7  F8  F9  F10 F11 F12"
-        - "Esc Tab Del PgUp ↑ PgDn"
-        - "show_letters Home End ← ↓ →"
-
-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_actions:
-        action:
-            set_view: "actions"
-        outline: "altline"
-        label: ">_"
-    period:
-        outline: "altline"
-        text: "."
-    space:
-        outline: "spaceline"
-        text: " "
-    Return:
-        outline: "wide"
-        icon: "key-enter"
-        keysym: "Return"
-    colon:
-        text: ":"
-    F1:
-        outline: "action"
-        keysym: "F1"
-    F2:
-        outline: "action"
-        keysym: "F2"
-    F3:
-        outline: "action"
-        keysym: "F3"
-    F4:
-        outline: "action"
-        keysym: "F4"
-    F5:
-        outline: "action"
-        keysym: "F5"
-    F6:
-        outline: "action"
-        keysym: "F6"
-    F7:
-        outline: "action"
-        keysym: "F7"
-    F8:
-        outline: "action"
-        keysym: "F8"
-    F9:
-        outline: "action"
-        keysym: "F9"
-    F10:
-        outline: "action"
-        keysym: "F10"
-    F11:
-        outline: "action"
-        keysym: "F11"
-    F12:
-        outline: "action"
-        keysym: "F12"
-    Esc:
-        outline: "action"
-        keysym: "Escape"
-    Tab:
-        outline: "action"
-        keysym: "Tab"
-    Del:
-        outline: "action"
-        keysym: "Delete"
-    Home:
-        outline: "action"
-        keysym: "Home"
-    End:
-        outline: "action"
-        keysym: "End"
-    PgUp:
-        outline: "action"
-        keysym: "Page_Up"
-    PgDn:
-        outline: "action"
-        keysym: "Page_Down"
-    "↑":
-        outline: "action"
-        keysym: "Up"
-    "↓":
-        outline: "action"
-        keysym: "Down"
-    "←":
-        outline: "action"
-        keysym: "Left"
-    "→":
-        outline: "action"
-        keysym: "Right"
-
--- a/data/keyboards/us-qwerty.xml
+++ b/data/keyboards/us-qwerty.xml
@ -0,0 +1,707 @@
+<?xml version="1.0"?>
+<keyboard version="0.90">
+    <bounds>0.000000,0.000000,410.000000,190.000000</bounds>
+    <section name="Alpha">
+        <bounds>10.000000,50.000000,390.000000,129.000000</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="keycode105" name="RCTL" column="7" row="4">
+            <bounds>359.000000,104.000000,31.000000,24.000000</bounds>
+            <oref>outline10</oref>
+            <symbols groups="1" levels="1">
+                <keysym keyval="65508">Control_R</keysym>
+            </symbols>
+        </key>
+        <key id="keycode135" name="MENU" column="6" row="4">
+            <bounds>326.000000,104.000000,31.000000,24.000000</bounds>
+            <oref>outline10</oref>
+            <symbols groups="1" levels="1">
+                <keysym keyval="65383">Menu</keysym>
+            </symbols>
+        </key>
+        <key id="keycode134" name="RWIN" column="5" row="4">
+            <bounds>294.000000,104.000000,31.000000,24.000000</bounds>
+            <oref>outline10</oref>
+            <symbols groups="1" levels="1">
+                <keysym keyval="65516">Super_R</keysym>
+            </symbols>
+        </key>
+        <key id="keycode108" name="RALT" column="4" row="4">
+            <bounds>261.000000,104.000000,31.000000,24.000000</bounds>
+            <oref>outline10</oref>
+            <symbols groups="1" levels="1">
+                <keysym keyval="65027">ISO_Level3_Shift</keysym>
+            </symbols>
+        </key>
+        <key id="keycode65" name="SPCE" column="3" row="4">
+            <bounds>106.000000,104.000000,153.000000,24.000000</bounds>
+            <oref>outline11</oref>
+            <symbols groups="1" levels="1">
+                <keysym keyval="32">space</keysym>
+            </symbols>
+        </key>
+        <key id="keycode64" name="LALT" column="2" row="4">
+            <bounds>73.000000,104.000000,31.000000,24.000000</bounds>
+            <oref>outline10</oref>
+            <symbols groups="1" levels="2">
+                <keysym keyval="65513">Alt_L</keysym>
+                <keysym keyval="65511">Meta_L</keysym>
+            </symbols>
+        </key>
+        <key id="keycode133" name="LWIN" column="1" row="4">
+            <bounds>40.000000,104.000000,31.000000,24.000000</bounds>
+            <oref>outline10</oref>
+            <symbols groups="1" levels="1">
+                <keysym keyval="65515">Super_L</keysym>
+            </symbols>
+        </key>
+        <key id="keycode37" name="LCTL" column="0" row="4">
+            <bounds>2.000000,104.000000,36.000000,24.000000</bounds>
+            <oref>outline9</oref>
+            <symbols groups="1" levels="1">
+                <keysym keyval="65507">Control_L</keysym>
+            </symbols>
+        </key>
+        <key id="keycode62" name="RTSH" column="11" row="3">
+            <bounds>320.000000,78.000000,70.000000,24.000000</bounds>
+            <oref>outline8</oref>
+            <symbols groups="1" levels="1">
+                <keysym keyval="65506">Shift_R</keysym>
+            </symbols>
+        </key>
+        <key id="keycode61" name="AB10" column="10" row="3">
+            <bounds>294.000000,78.000000,24.000000,24.000000</bounds>
+            <oref>outline1</oref>
+            <symbols groups="1" levels="2">
+                <keysym keyval="47">slash</keysym>
+                <keysym keyval="63">question</keysym>
+            </symbols>
+        </key>
+        <key id="keycode60" name="AB09" column="9" row="3">
+            <bounds>268.000000,78.000000,24.000000,24.000000</bounds>
+            <oref>outline1</oref>
+            <symbols groups="1" levels="2">
+                <keysym keyval="46">period</keysym>
+                <keysym keyval="62">greater</keysym>
+            </symbols>
+        </key>
+        <key id="keycode59" name="AB08" column="8" row="3">
+            <bounds>242.000000,78.000000,24.000000,24.000000</bounds>
+            <oref>outline1</oref>
+            <symbols groups="1" levels="2">
+                <keysym keyval="44">comma</keysym>
+                <keysym keyval="60">less</keysym>
+            </symbols>
+        </key>
+        <key id="keycode58" name="AB07" column="7" row="3">
+            <bounds>216.000000,78.000000,24.000000,24.000000</bounds>
+            <oref>outline1</oref>
+            <symbols groups="1" levels="2">
+                <keysym keyval="109">m</keysym>
+                <keysym keyval="77">M</keysym>
+            </symbols>
+        </key>
+        <key id="keycode57" name="AB06" column="6" row="3">
+            <bounds>190.000000,78.000000,24.000000,24.000000</bounds>
+            <oref>outline1</oref>
+            <symbols groups="1" levels="2">
+                <keysym keyval="110">n</keysym>
+                <keysym keyval="78">N</keysym>
+            </symbols>
+        </key>
+        <key id="keycode56" name="AB05" column="5" row="3">
+            <bounds>164.000000,78.000000,24.000000,24.000000</bounds>
+            <oref>outline1</oref>
+            <symbols groups="1" levels="2">
+                <keysym keyval="98">b</keysym>
+                <keysym keyval="66">B</keysym>
+            </symbols>
+        </key>
+        <key id="keycode55" name="AB04" column="4" row="3">
+            <bounds>138.000000,78.000000,24.000000,24.000000</bounds>
+            <oref>outline1</oref>
+            <symbols groups="1" levels="2">
+                <keysym keyval="118">v</keysym>
+                <keysym keyval="86">V</keysym>
+            </symbols>
+        </key>
+        <key id="keycode54" name="AB03" column="3" row="3">
+            <bounds>113.000000,78.000000,24.000000,24.000000</bounds>
+            <oref>outline1</oref>
+            <symbols groups="1" levels="2">
+                <keysym keyval="99">c</keysym>
+                <keysym keyval="67">C</keysym>
+            </symbols>
+        </key>
+        <key id="keycode53" name="AB02" column="2" row="3">
+            <bounds>87.000000,78.000000,24.000000,24.000000</bounds>
+            <oref>outline1</oref>
+            <symbols groups="1" levels="2">
+                <keysym keyval="120">x</keysym>
+                <keysym keyval="88">X</keysym>
+            </symbols>
+        </key>
+        <key id="keycode52" name="AB01" column="1" row="3">
+            <bounds>61.000000,78.000000,24.000000,24.000000</bounds>
+            <oref>outline1</oref>
+            <symbols groups="1" levels="2">
+                <keysym keyval="122">z</keysym>
+                <keysym keyval="90">Z</keysym>
+            </symbols>
+        </key>
+        <key id="keycode50" name="LFSH" column="0" row="3">
+            <bounds>2.000000,78.000000,57.000000,24.000000</bounds>
+            <oref>outline7</oref>
+            <symbols groups="1" levels="1">
+                <keysym keyval="65505">Shift_L</keysym>
+            </symbols>
+        </key>
+        <key id="keycode36" name="RTRN" column="12" row="2">
+            <bounds>333.000000,53.000000,57.000000,24.000000</bounds>
+            <oref>outline6</oref>
+            <symbols groups="1" levels="1">
+                <keysym keyval="65293">Return</keysym>
+            </symbols>
+        </key>
+        <key id="keycode48" name="AC11" column="11" row="2">
+            <bounds>307.000000,53.000000,24.000000,24.000000</bounds>
+            <oref>outline1</oref>
+            <symbols groups="1" levels="2">
+                <keysym keyval="39">quoteright</keysym>
+                <keysym keyval="34">quotedbl</keysym>
+            </symbols>
+        </key>
+        <key id="keycode47" name="AC10" column="10" row="2">
+            <bounds>281.000000,53.000000,24.000000,24.000000</bounds>
+            <oref>outline1</oref>
+            <symbols groups="1" levels="2">
+                <keysym keyval="59">semicolon</keysym>
+                <keysym keyval="58">colon</keysym>
+            </symbols>
+        </key>
+        <key id="keycode46" name="AC09" column="9" row="2">
+            <bounds>256.000000,53.000000,24.000000,24.000000</bounds>
+            <oref>outline1</oref>
+            <symbols groups="1" levels="2">
+                <keysym keyval="108">l</keysym>
+                <keysym keyval="76">L</keysym>
+            </symbols>
+        </key>
+        <key id="keycode45" name="AC08" column="8" row="2">
+            <bounds>230.000000,53.000000,24.000000,24.000000</bounds>
+            <oref>outline1</oref>
+            <symbols groups="1" levels="2">
+                <keysym keyval="107">k</keysym>
+                <keysym keyval="75">K</keysym>
+            </symbols>
+        </key>
+        <key id="keycode44" name="AC07" column="7" row="2">
+            <bounds>204.000000,53.000000,24.000000,24.000000</bounds>
+            <oref>outline1</oref>
+            <symbols groups="1" levels="2">
+                <keysym keyval="106">j</keysym>
+                <keysym keyval="74">J</keysym>
+            </symbols>
+        </key>
+        <key id="keycode43" name="AC06" column="6" row="2">
+            <bounds>178.000000,53.000000,24.000000,24.000000</bounds>
+            <oref>outline1</oref>
+            <symbols groups="1" levels="2">
+                <keysym keyval="104">h</keysym>
+                <keysym keyval="72">H</keysym>
+            </symbols>
+        </key>
+        <key id="keycode42" name="AC05" column="5" row="2">
+            <bounds>152.000000,53.000000,24.000000,24.000000</bounds>
+            <oref>outline1</oref>
+            <symbols groups="1" levels="2">
+                <keysym keyval="103">g</keysym>
+                <keysym keyval="71">G</keysym>
+            </symbols>
+        </key>
+        <key id="keycode41" name="AC04" column="4" row="2">
+            <bounds>126.000000,53.000000,24.000000,24.000000</bounds>
+            <oref>outline1</oref>
+            <symbols groups="1" levels="2">
+                <keysym keyval="102">f</keysym>
+                <keysym keyval="70">F</keysym>
+            </symbols>
+        </key>
+        <key id="keycode40" name="AC03" column="3" row="2">
+            <bounds>100.000000,53.000000,24.000000,24.000000</bounds>
+            <oref>outline1</oref>
+            <symbols groups="1" levels="2">
+                <keysym keyval="100">d</keysym>
+                <keysym keyval="68">D</keysym>
+            </symbols>
+        </key>
+        <key id="keycode39" name="AC02" column="2" row="2">
+            <bounds>74.000000,53.000000,24.000000,24.000000</bounds>
+            <oref>outline1</oref>
+            <symbols groups="1" levels="2">
+                <keysym keyval="115">s</keysym>
+                <keysym keyval="83">S</keysym>
+            </symbols>
+        </key>
+        <key id="keycode38" name="AC01" column="1" row="2">
+            <bounds>49.000000,53.000000,24.000000,24.000000</bounds>
+            <oref>outline1</oref>
+            <symbols groups="1" levels="2">
+                <keysym keyval="97">a</keysym>
+                <keysym keyval="65">A</keysym>
+            </symbols>
+        </key>
+        <key id="keycode66" name="CAPS" column="0" row="2">
+            <bounds>2.000000,53.000000,44.000000,24.000000</bounds>
+            <oref>outline5</oref>
+            <symbols groups="1" levels="2">
+                <keysym keyval="65507">Control_L</keysym>
+                <keysym keyval="65507">Control_L</keysym>
+            </symbols>
+        </key>
+        <key id="keycode51" name="BKSL" column="13" row="1">
+            <bounds>352.000000,27.000000,38.000000,24.000000</bounds>
+            <oref>outline4</oref>
+            <symbols groups="1" levels="2">
+                <keysym keyval="92">backslash</keysym>
+                <keysym keyval="124">bar</keysym>
+            </symbols>
+        </key>
+        <key id="keycode35" name="AD12" column="12" row="1">
+            <bounds>326.000000,27.000000,24.000000,24.000000</bounds>
+            <oref>outline1</oref>
+            <symbols groups="1" levels="2">
+                <keysym keyval="93">bracketright</keysym>
+                <keysym keyval="125">braceright</keysym>
+            </symbols>
+        </key>
+        <key id="keycode34" name="AD11" column="11" row="1">
+            <bounds>300.000000,27.000000,24.000000,24.000000</bounds>
+            <oref>outline1</oref>
+            <symbols groups="1" levels="2">
+                <keysym keyval="91">bracketleft</keysym>
+                <keysym keyval="123">braceleft</keysym>
+            </symbols>
+        </key>
+        <key id="keycode33" name="AD10" column="10" row="1">
+            <bounds>275.000000,27.000000,24.000000,24.000000</bounds>
+            <oref>outline1</oref>
+            <symbols groups="1" levels="2">
+                <keysym keyval="112">p</keysym>
+                <keysym keyval="80">P</keysym>
+            </symbols>
+        </key>
+        <key id="keycode32" name="AD09" column="9" row="1">
+            <bounds>249.000000,27.000000,24.000000,24.000000</bounds>
+            <oref>outline1</oref>
+            <symbols groups="1" levels="2">
+                <keysym keyval="111">o</keysym>
+                <keysym keyval="79">O</keysym>
+            </symbols>
+        </key>
+        <key id="keycode31" name="AD08" column="8" row="1">
+            <bounds>223.000000,27.000000,24.000000,24.000000</bounds>
+            <oref>outline1</oref>
+            <symbols groups="1" levels="2">
+                <keysym keyval="105">i</keysym>
+                <keysym keyval="73">I</keysym>
+            </symbols>
+        </key>
+        <key id="keycode30" name="AD07" column="7" row="1">
+            <bounds>197.000000,27.000000,24.000000,24.000000</bounds>
+            <oref>outline1</oref>
+            <symbols groups="1" levels="2">
+                <keysym keyval="117">u</keysym>
+                <keysym keyval="85">U</keysym>
+            </symbols>
+        </key>
+        <key id="keycode29" name="AD06" column="6" row="1">
+            <bounds>171.000000,27.000000,24.000000,24.000000</bounds>
+            <oref>outline1</oref>
+            <symbols groups="1" levels="2">
+                <keysym keyval="121">y</keysym>
+                <keysym keyval="89">Y</keysym>
+            </symbols>
+        </key>
+        <key id="keycode28" name="AD05" column="5" row="1">
+            <bounds>145.000000,27.000000,24.000000,24.000000</bounds>
+            <oref>outline1</oref>
+            <symbols groups="1" levels="2">
+                <keysym keyval="116">t</keysym>
+                <keysym keyval="84">T</keysym>
+            </symbols>
+        </key>
+        <key id="keycode27" name="AD04" column="4" row="1">
+            <bounds>119.000000,27.000000,24.000000,24.000000</bounds>
+            <oref>outline1</oref>
+            <symbols groups="1" levels="2">
+                <keysym keyval="114">r</keysym>
+                <keysym keyval="82">R</keysym>
+            </symbols>
+        </key>
+        <key id="keycode26" name="AD03" column="3" row="1">
+            <bounds>93.000000,27.000000,24.000000,24.000000</bounds>
+            <oref>outline1</oref>
+            <symbols groups="1" levels="2">
+                <keysym keyval="101">e</keysym>
+                <keysym keyval="69">E</keysym>
+            </symbols>
+        </key>
+        <key id="keycode25" name="AD02" column="2" row="1">
+            <bounds>68.000000,27.000000,24.000000,24.000000</bounds>
+            <oref>outline1</oref>
+            <symbols groups="1" levels="2">
+                <keysym keyval="119">w</keysym>
+                <keysym keyval="87">W</keysym>
+            </symbols>
+        </key>
+        <key id="keycode24" name="AD01" column="1" row="1">
+            <bounds>42.000000,27.000000,24.000000,24.000000</bounds>
+            <oref>outline1</oref>
+            <symbols groups="1" levels="2">
+                <keysym keyval="113">q</keysym>
+                <keysym keyval="81">Q</keysym>
+            </symbols>
+        </key>
+        <key id="keycode23" name="TAB" column="0" row="1">
+            <bounds>2.000000,27.000000,38.000000,24.000000</bounds>
+            <oref>outline3</oref>
+            <symbols groups="1" levels="2">
+                <keysym keyval="65289">Tab</keysym>
+                <keysym keyval="65056">ISO_Left_Tab</keysym>
+            </symbols>
+        </key>
+        <key id="keycode22" name="BKSP" column="13" row="0">
+            <bounds>339.000000,1.000000,51.000000,24.000000</bounds>
+            <oref>outline2</oref>
+            <symbols groups="1" levels="1">
+                <keysym keyval="65288">BackSpace</keysym>
+            </symbols>
+        </key>
+        <key id="keycode21" name="AE12" column="12" row="0">
+            <bounds>313.000000,1.000000,24.000000,24.000000</bounds>
+            <oref>outline1</oref>
+            <symbols groups="1" levels="2">
+                <keysym keyval="61">equal</keysym>
+                <keysym keyval="43">plus</keysym>
+            </symbols>
+        </key>
+        <key id="keycode20" name="AE11" column="11" row="0">
+            <bounds>287.000000,1.000000,24.000000,24.000000</bounds>
+            <oref>outline1</oref>
+            <symbols groups="1" levels="2">
+                <keysym keyval="45">minus</keysym>
+                <keysym keyval="95">underscore</keysym>
+            </symbols>
+        </key>
+        <key id="keycode19" name="AE10" column="10" row="0">
+            <bounds>261.000000,1.000000,24.000000,24.000000</bounds>
+            <oref>outline1</oref>
+            <symbols groups="1" levels="2">
+                <keysym keyval="48">0</keysym>
+                <keysym keyval="41">parenright</keysym>
+            </symbols>
+        </key>
+        <key id="keycode18" name="AE09" column="9" row="0">
+            <bounds>235.000000,1.000000,24.000000,24.000000</bounds>
+            <oref>outline1</oref>
+            <symbols groups="1" levels="2">
+                <keysym keyval="57">9</keysym>
+                <keysym keyval="40">parenleft</keysym>
+            </symbols>
+        </key>
+        <key id="keycode17" name="AE08" column="8" row="0">
+            <bounds>209.000000,1.000000,24.000000,24.000000</bounds>
+            <oref>outline1</oref>
+            <symbols groups="1" levels="2">
+                <keysym keyval="56">8</keysym>
+                <keysym keyval="42">asterisk</keysym>
+            </symbols>
+        </key>
+        <key id="keycode16" name="AE07" column="7" row="0">
+            <bounds>183.000000,1.000000,24.000000,24.000000</bounds>
+            <oref>outline1</oref>
+            <symbols groups="1" levels="2">
+                <keysym keyval="55">7</keysym>
+                <keysym keyval="38">ampersand</keysym>
+            </symbols>
+        </key>
+        <key id="keycode15" name="AE06" column="6" row="0">
+            <bounds>157.000000,1.000000,24.000000,24.000000</bounds>
+            <oref>outline1</oref>
+            <symbols groups="1" levels="2">
+                <keysym keyval="54">6</keysym>
+                <keysym keyval="94">asciicircum</keysym>
+            </symbols>
+        </key>
+        <key id="keycode14" name="AE05" column="5" row="0">
+            <bounds>132.000000,1.000000,24.000000,24.000000</bounds>
+            <oref>outline1</oref>
+            <symbols groups="1" levels="2">
+                <keysym keyval="53">5</keysym>
+                <keysym keyval="37">percent</keysym>
+            </symbols>
+        </key>
+        <key id="keycode13" name="AE04" column="4" row="0">
+            <bounds>106.000000,1.000000,24.000000,24.000000</bounds>
+            <oref>outline1</oref>
+            <symbols groups="1" levels="2">
+                <keysym keyval="52">4</keysym>
+                <keysym keyval="36">dollar</keysym>
+            </symbols>
+        </key>
+        <key id="keycode12" name="AE03" column="3" row="0">
+            <bounds>80.000000,1.000000,24.000000,24.000000</bounds>
+            <oref>outline1</oref>
+            <symbols groups="1" levels="2">
+                <keysym keyval="51">3</keysym>
+                <keysym keyval="35">numbersign</keysym>
+            </symbols>
+        </key>
+        <key id="keycode11" name="AE02" column="2" row="0">
+            <bounds>54.000000,1.000000,24.000000,24.000000</bounds>
+            <oref>outline1</oref>
+            <symbols groups="1" levels="2">
+                <keysym keyval="50">2</keysym>
+                <keysym keyval="64">at</keysym>
+            </symbols>
+        </key>
+        <key id="keycode10" name="AE01" column="1" row="0">
+            <bounds>28.000000,1.000000,24.000000,24.000000</bounds>
+            <oref>outline1</oref>
+            <symbols groups="1" levels="2">
+                <keysym keyval="49">1</keysym>
+                <keysym keyval="33">exclam</keysym>
+            </symbols>
+        </key>
+        <key id="keycode49" name="TLDE" column="0" row="0">
+            <bounds>2.000000,1.000000,24.000000,24.000000</bounds>
+            <oref>outline1</oref>
+            <symbols groups="1" levels="2">
+                <keysym keyval="96">quoteleft</keysym>
+                <keysym keyval="126">asciitilde</keysym>
+            </symbols>
+        </key>
+    </section>
+    <section name="Function">
+        <bounds>10.000000,10.000000,410.000000,25.000000</bounds>
+        <angle>0</angle>
+        <row>
+            <columns>16</columns>
+            <orientation>1</orientation>
+        </row>
+        <key id="keycode96" name="FK12" column="12" row="0">
+            <bounds>366.000000,1.000000,24.000000,24.000000</bounds>
+            <oref>outline1</oref>
+            <symbols groups="1" levels="2">
+                <keysym keyval="65481">F12</keysym>
+                <keysym keyval="269024780">(null)</keysym>
+            </symbols>
+        </key>
+        <key id="keycode95" name="FK11" column="11" row="0">
+            <bounds>340.000000,1.000000,24.000000,24.000000</bounds>
+            <oref>outline1</oref>
+            <symbols groups="1" levels="2">
+                <keysym keyval="65480">F11</keysym>
+                <keysym keyval="269024779">(null)</keysym>
+            </symbols>
+        </key>
+        <key id="keycode76" name="FK10" column="10" row="0">
+            <bounds>314.000000,1.000000,24.000000,24.000000</bounds>
+            <oref>outline1</oref>
+            <symbols groups="1" levels="2">
+                <keysym keyval="65479">F10</keysym>
+                <keysym keyval="269024778">(null)</keysym>
+            </symbols>
+        </key>
+        <key id="keycode75" name="FK09" column="9" row="0">
+            <bounds>288.000000,1.000000,24.000000,24.000000</bounds>
+            <oref>outline1</oref>
+            <symbols groups="1" levels="2">
+                <keysym keyval="65478">F9</keysym>
+                <keysym keyval="269024777">(null)</keysym>
+            </symbols>
+        </key>
+        <key id="keycode74" name="FK08" column="8" row="0">
+            <bounds>249.000000,1.000000,24.000000,24.000000</bounds>
+            <oref>outline1</oref>
+            <symbols groups="1" levels="2">
+                <keysym keyval="65477">F8</keysym>
+                <keysym keyval="269024776">(null)</keysym>
+            </symbols>
+        </key>
+        <key id="keycode73" name="FK07" column="7" row="0">
+            <bounds>223.000000,1.000000,24.000000,24.000000</bounds>
+            <oref>outline1</oref>
+            <symbols groups="1" levels="2">
+                <keysym keyval="65476">F7</keysym>
+                <keysym keyval="269024775">(null)</keysym>
+            </symbols>
+        </key>
+        <key id="keycode72" name="FK06" column="6" row="0">
+            <bounds>197.000000,1.000000,24.000000,24.000000</bounds>
+            <oref>outline1</oref>
+            <symbols groups="1" levels="2">
+                <keysym keyval="65475">F6</keysym>
+                <keysym keyval="269024774">(null)</keysym>
+            </symbols>
+        </key>
+        <key id="keycode71" name="FK05" column="5" row="0">
+            <bounds>171.000000,1.000000,24.000000,24.000000</bounds>
+            <oref>outline1</oref>
+            <symbols groups="1" levels="2">
+                <keysym keyval="65474">F5</keysym>
+                <keysym keyval="269024773">(null)</keysym>
+            </symbols>
+        </key>
+        <key id="keycode70" name="FK04" column="4" row="0">
+            <bounds>132.000000,1.000000,24.000000,24.000000</bounds>
+            <oref>outline1</oref>
+            <symbols groups="1" levels="2">
+                <keysym keyval="65473">F4</keysym>
+                <keysym keyval="269024772">(null)</keysym>
+            </symbols>
+        </key>
+        <key id="keycode69" name="FK03" column="3" row="0">
+            <bounds>106.000000,1.000000,24.000000,24.000000</bounds>
+            <oref>outline1</oref>
+            <symbols groups="1" levels="2">
+                <keysym keyval="65472">F3</keysym>
+                <keysym keyval="269024771">(null)</keysym>
+            </symbols>
+        </key>
+        <key id="keycode68" name="FK02" column="2" row="0">
+            <bounds>80.000000,1.000000,24.000000,24.000000</bounds>
+            <oref>outline1</oref>
+            <symbols groups="1" levels="2">
+                <keysym keyval="65471">F2</keysym>
+                <keysym keyval="269024770">(null)</keysym>
+            </symbols>
+        </key>
+        <key id="keycode67" name="FK01" column="1" row="0">
+            <bounds>54.000000,1.000000,24.000000,24.000000</bounds>
+            <oref>outline1</oref>
+            <symbols groups="1" levels="2">
+                <keysym keyval="65470">F1</keysym>
+                <keysym keyval="269024769">(null)</keysym>
+            </symbols>
+        </key>
+        <key id="keycode9" name="ESC" column="0" row="0">
+            <bounds>2.000000,1.000000,24.000000,24.000000</bounds>
+            <oref>outline1</oref>
+            <symbols groups="1" levels="1">
+                <keysym keyval="65307">Escape</keysym>
+            </symbols>
+        </key>
+    </section>
+    <outline id="outline1">
+        <corner-radius>1.000000</corner-radius>
+        <point>0.000000,0.000000</point>
+        <point>24.000000,0.000000</point>
+        <point>24.000000,24.000000</point>
+        <point>0.000000,24.000000</point>
+    </outline>
+    <outline id="outline3">
+        <corner-radius>1.000000</corner-radius>
+        <point>0.000000,0.000000</point>
+        <point>38.000000,0.000000</point>
+        <point>38.000000,24.000000</point>
+        <point>0.000000,24.000000</point>
+    </outline>
+    <outline id="outline4">
+        <corner-radius>1.000000</corner-radius>
+        <point>0.000000,0.000000</point>
+        <point>38.000000,0.000000</point>
+        <point>38.000000,24.000000</point>
+        <point>0.000000,24.000000</point>
+    </outline>
+    <outline id="outline5">
+        <corner-radius>1.000000</corner-radius>
+        <point>0.000000,0.000000</point>
+        <point>44.000000,0.000000</point>
+        <point>44.000000,24.000000</point>
+        <point>0.000000,24.000000</point>
+    </outline>
+    <outline id="outline6">
+        <corner-radius>1.000000</corner-radius>
+        <point>0.000000,0.000000</point>
+        <point>57.000000,0.000000</point>
+        <point>57.000000,24.000000</point>
+        <point>0.000000,24.000000</point>
+    </outline>
+    <outline id="outline7">
+        <corner-radius>1.000000</corner-radius>
+        <point>0.000000,0.000000</point>
+        <point>57.000000,0.000000</point>
+        <point>57.000000,24.000000</point>
+        <point>0.000000,24.000000</point>
+    </outline>
+    <outline id="outline8">
+        <corner-radius>1.000000</corner-radius>
+        <point>0.000000,0.000000</point>
+        <point>70.000000,0.000000</point>
+        <point>70.000000,24.000000</point>
+        <point>0.000000,24.000000</point>
+    </outline>
+    <outline id="outline9">
+        <corner-radius>1.000000</corner-radius>
+        <point>0.000000,0.000000</point>
+        <point>36.000000,0.000000</point>
+        <point>36.000000,24.000000</point>
+        <point>0.000000,24.000000</point>
+    </outline>
+    <outline id="outline10">
+        <corner-radius>1.000000</corner-radius>
+        <point>0.000000,0.000000</point>
+        <point>31.000000,0.000000</point>
+        <point>31.000000,24.000000</point>
+        <point>0.000000,24.000000</point>
+    </outline>
+    <outline id="outline11">
+        <corner-radius>1.000000</corner-radius>
+        <point>0.000000,0.000000</point>
+        <point>153.000000,0.000000</point>
+        <point>153.000000,24.000000</point>
+        <point>0.000000,24.000000</point>
+    </outline>
+    <outline id="outline12">
+        <corner-radius>1.000000</corner-radius>
+        <point>0.000000,0.000000</point>
+        <point>24.000000,0.000000</point>
+        <point>24.000000,50.000000</point>
+        <point>0.000000,50.000000</point>
+    </outline>
+    <outline id="outline13">
+        <corner-radius>1.000000</corner-radius>
+        <point>0.000000,0.000000</point>
+        <point>50.000000,0.000000</point>
+        <point>50.000000,24.000000</point>
+        <point>0.000000,24.000000</point>
+    </outline>
+    <outline id="outline2">
+        <corner-radius>1.000000</corner-radius>
+        <point>0.000000,0.000000</point>
+        <point>51.000000,0.000000</point>
+        <point>51.000000,24.000000</point>
+        <point>0.000000,24.000000</point>
+    </outline>
+</keyboard>
--- a/data/keyboards/us.yaml
+++ b/data/keyboards/us.yaml
@ -1,78 +0,0 @@
---
-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        period Return"
-    upper:
-        - "Q W E R T Y U I O P"
-        - "A S D F G H J K L"
-        - "Shift_L   Z X C V B N M  BackSpace"
-        - "show_numbers preferences         space        period Return"
-    numbers:
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "@ # $ % & - _ + ( )"
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
-        - "show_letters preferences         space        period Return"
-    symbols:
-        - "~ ` | · √ π τ ÷ × ¶"
-        - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        period Return"
-
-buttons:
-    Shift_L:
-        action:
-            locking:
-                lock_view: "upper"
-                unlock_view: "base"
-        outline: "altline"
-        icon: "key-shift"
-    BackSpace:
-        outline: "altline"
-        icon: "edit-clear-symbolic"
-        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: "*/="
-    period:
-        outline: "special"
-        text: "."
-    space:
-        outline: "spaceline"
-        text: " "
-    Return:
-        outline: "wide"
-        icon: "key-enter"
-        keysym: "Return"
-    colon:
-        text: ":"
--- a/data/keyboards/us_wide.yaml
+++ b/data/keyboards/us_wide.yaml
@ -1,78 +0,0 @@
---
-outlines:
-    default: { width: 54, height: 42 }
-    altline: { width: 81, height: 42 }
-    wide: { width: 108, height: 42 }
-    spaceline: { width: 216, height: 42 }
-    special: { width: 54, height: 42 }
-
-views:
-    base:
-        - "q w e r t y u i o p"
-        - "a s d f g h j k l"
-        - "Shift_L   z x c v b n m  BackSpace"
-        - "show_numbers preferences         space        . Return"
-    upper:
-        - "Q W E R T Y U I O P"
-        - "A S D F G H J K L"
-        - "Shift_L   Z X C V B N M  BackSpace"
-        - "show_numbers preferences         space        . Return"
-    numbers:
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "@ # $ % & - _ + ( )"
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
-        - "show_letters preferences         space        . Return"
-    symbols:
-        - "~ ` | · √ π τ ÷ × ¶"
-        - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        . Return"
-
-buttons:
-    Shift_L:
-        action:
-            locking:
-                lock_view: "upper"
-                unlock_view: "base"
-        outline: "altline"
-        icon: "key-shift"
-    BackSpace:
-        outline: "altline"
-        icon: "edit-clear-symbolic"
-        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: "*/="
-    ".":
-        outline: "special"
-        text: "."
-    space:
-        outline: "spaceline"
-        text: " "
-    Return:
-        outline: "wide"
-        icon: "key-enter"
-        keysym: "Return"
-    colon:
-        text: ":"
--- a/data/langs/en-US.txt
+++ b/data/langs/en-US.txt
@ -1,2 +0,0 @@
-emoji Emoji
-terminal Terminal
--- a/data/langs/es-ES.txt
+++ b/data/langs/es-ES.txt
@ -1,7 +0,0 @@
-us Inglés (EE.UU.)
-de Alemán
-el Griego
-es Español
-it Italiano
-jp+kana Japonés (Kana)
-no Noruego
--- a/data/langs/pl-PL.txt
+++ b/data/langs/pl-PL.txt
@ -1,2 +0,0 @@
-emoji emoji
-terminal terminal
--- a/data/langs/ru-RU.txt
+++ b/data/langs/ru-RU.txt
@ -1,11 +0,0 @@
-de Немецкий
-es Испанский
-fi Финский
-gr Греческий
-it Итальянский
-no Норвежский
-pl Польский
-ru Русский
-se Шведский
-terminal Терминал
-us Английский (США)
--- a/data/meson.build
+++ b/data/meson.build
@ -1,26 +0,0 @@
-gnome = import('gnome')
-
-squeekboard_resources = gnome.compile_resources(
-   'squeekboard-resources',
-   'squeekboard.gresources.xml',
-
-   c_name: 'squeekboard',
-)
-
-desktopconf = configuration_data()
-desktopconf.set('bindir', bindir)
-
-desktop_file = 'sm.puri.Squeekboard.desktop'
-
-i18n.merge_file('desktop',
-    input: configure_file(
-      input: desktop_file + '.in.in',
-      output: desktop_file + '.in',
-      configuration: desktopconf
-    ),
-    output: desktop_file,
-    po_dir: '../po',
-    install: true,
-    install_dir: desktopdir,
-    type: 'desktop'
-)
--- a/data/popup.ui
+++ b/data/popup.ui
@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.1 -->
-<interface>
-  <requires lib="gtk+" version="3.16"/>
-  <object class="GtkPopoverMenu" id="main_menu">
-    <property name="can_focus">False</property>
-    <child>
-      <object class="GtkBox" id="box">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="orientation">vertical</property>
-      </object>
-      <packing>
-        <property name="submenu">main</property>
-        <property name="position">1</property>
-      </packing>
-    </child>
-  </object>
-</interface>
--- a/data/sm.puri.Squeekboard.desktop.in.in
+++ b/data/sm.puri.Squeekboard.desktop.in.in
@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Squeekboard
-GenericName=Squeekboard Virtual Keyboard
-Comment=Virtual Keyboard
-Exec=@bindir@/squeekboard
-Terminal=false
-Type=Application
-NoDisplay=true
-Categories=GTK;Utility;
--- a/data/squeekboard.gresources.xml
+++ b/data/squeekboard.gresources.xml
@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<gresources>
-  <gresource prefix="/sm/puri/squeekboard">
-   <file compressed="true">style.css</file>
-   <file compressed="true">style-Adwaita:dark.css</file>
-   <file compressed="true" preprocess="xml-stripblanks">popup.ui</file>
-   <file>icons/key-enter.svg</file>
-   <file>icons/key-shift.svg</file>
-   <file>icons/keyboard-mode-symbolic.svg</file>
-  </gresource>
-</gresources>
--- a/data/style-Adwaita:dark.css
+++ b/data/style-Adwaita:dark.css
@ -1,51 +0,0 @@
-sq_view {
-    background-color: rgba(0, 0, 0, 255);
-    color: #ffffff;
-    font-family: cantarell, sans-serif;
-    font-size: 25px;
-}
-
-sq_view sq_button {
-    color: #deddda;
-    background: #464448;
-    border-style: solid;
-    border-width: 1px;
-    border-color: #5e5c64;
-    border-radius: 3px;
-    margin: 4px 2px 4px 2px;
-}
-
-sq_view.wide sq_button {
-    margin: 1px 1px 1px 1px;
-}
-
-sq_button:active {
-    background: #747077;
-    border-color: #96949d;
-}
-
-sq_button.altline,
-sq_button.special,
-sq_button.wide {
-    background: #2b292f;
-    border-color: #3e3a44;
-}
-
-sq_button.locked {
-    background: #ffffff;
-    color: #2b292f;
-}
-
-sq_button.action {
-    font-size: 0.75em;
-}
-
-#Return {
-    background: #1c71d8;
-    border-color: #1a5fb4;
-}
-
-#Return:active {
-    background: #1c71d8;
-    border-color: #3584e4;
-}
--- a/data/style.css
+++ b/data/style.css
@ -1,54 +0,0 @@
-sq_view {
-    background-color: @theme_base_color; /*rgba(0, 0, 0, 255);*/
-    color: @theme_text_color; /*#ffffff;*/
-    font-family: cantarell, sans-serif;
-    font-size: 25px;
-}
-
-sq_view sq_button {
-    color: @theme_fg_color; /*#deddda;*/
-    background: mix(@theme_bg_color, @theme_base_color, -0.5); /* #464448; */
-    border-style: solid;
-    border-width: 1px;
-    border-color: @borders; /* #5e5c64;*/
-    border-radius: 3px;
-    margin: 4px 2px 4px 2px;
-}
-
-sq_view.wide sq_button {
-    margin: 1px 1px 1px 1px;
-}
-
-sq_button:active,
-sq_button.altline:active,
-sq_button.special:active,
-sq_button.wide:active {
-    background: mix(@theme_bg_color, @theme_selected_bg_color, 0.4);/* #747077; */
-    border-color: mix(@borders, @theme_selected_fg_color, 0.5);/* #96949d; */
-}
-
-sq_button.altline,
-sq_button.special,
-sq_button.wide {
-    background: mix(@theme_bg_color, @theme_base_color, 0.5); /*#2b292f;*/
-    border-color: @borders; /* #3e3a44; */
-}
-
-sq_button.locked {
-    background: @theme_fg_color; /*#ffffff;*/
-    color: @theme_bg_color; /*#2b292f;*/
-}
-
-sq_button.action {
-    font-size: 0.75em;
-}
-
-#Return {
-    background: @theme_selected_bg_color; /* #1c71d8; */
-    border-color: @borders; /*#1a5fb4;*/
-}
-
-#Return:active {
-    background: mix(@theme_selected_bg_color, @theme_bg_color, 0.4); /*#1c71d8;*/
-    border-color: @borders; /*#3584e4;*/
-}
--- a/data/themes/Makefile.am
+++ b/data/themes/Makefile.am
@ -0,0 +1,2 @@
+themedir = $(pkgdatadir)/themes
+dist_theme_DATA = default.css
--- a/data/themes/default.css
+++ b/data/themes/default.css
@ -0,0 +1,22 @@
+.keyboard {
+    background-color: rgba(0, 0, 0, 255);
+    color: #ffffff;
+    font-family: cantarell, sans-serif;
+}
+
+.key {
+    color: #ffffff;
+    background-gradient-direction: vertical;
+    background-gradient-start: rgba(0, 0, 0, 255);
+    background-gradient-end: rgba(64, 64, 64, 255);
+    border-width: 2px;
+    border-color: rgba(128, 128, 128, 255);
+    border-radius: 3px;
+}
+
+.key:active {
+    background-gradient-direction: vertical;
+    background-gradient-start: rgba(0, 0, 255, 255);
+    background-gradient-end: rgba(64, 64, 255, 255);
+    border-color: rgba(160, 160, 255, 255);
+}
--- a/dco.txt
+++ b/dco.txt
@ -1,39 +0,0 @@
-Developer Certificate of Origin
-Version 1.1
-
-Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
-1 Letterman Drive
-Suite D4700
-San Francisco, CA, 94129
-
-Everyone is permitted to copy and distribute verbatim copies of this
-license document, but changing it is not allowed.
-
-
-Developer's Certificate of Origin 1.1
-
-By making a contribution to this project, I certify that:
-
-(a) The contribution was created in whole or in part by me and I
-    have the right to submit it under the open source license
-    indicated in the file; or
-
-(b) The contribution is based upon previous work that, to the best
-    of my knowledge, is covered under an appropriate open source
-    license and I have the right under that license to submit that
-    work with modifications, whether created in whole or in part
-    by me, under the same open source license (unless I am
-    permitted to submit under a different license), as indicated
-    in the file; or
-
-(c) The contribution was provided directly to me by some other
-    person who certified (a), (b) or (c) and I have not modified
-    it.
-
-(d) I understand and agree that this project and the contribution
-    are public and that a record of the contribution (including all
-    personal information I submit with it, including my sign-off) is
-    maintained indefinitely and may be redistributed consistent with
-    this project or the open source license(s) involved.
-
-
--- a/debian/cargo/config
+++ b/debian/cargo/config
@ -1,12 +0,0 @@
-# When modifying this file, consider instead
-# to take advantage of the method that Cargo packagers use
-# to set up all the necessary stuff automatically:
-# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=907629#30
-
-[source.crates-io]
-registry = 'https://github.com/rust-lang/crates.io-index'
-replace-with = 'vendored-sources'
-
-[source.vendored-sources]
-directory = '/usr/share/cargo/registry'
-
--- a/debian/changelog
+++ b/debian/changelog
@ -1,315 +0,0 @@
-squeekboard (1.9.2) amber-phone; urgency=medium
-
-  [ Dorota Czaplejewicz ]
-  * keyboard: Remove unused code
-  * gsettings: Don't crash when unavailable
-  * dbus: Don't crash if can't make a connection
-  * gsettings: Don't crash on switching when unavailable
-  * layout: Split out choice to a struct on its own
-  * renderer: Simplify by dropping gobjectness
-  * levelkeyboard: Rearrange to make future conversion easier
-  * layout: Minor generalizations
-  * Remove unused code
-  * sizing: Create a standalone UI shape manager
-  * sizing: Ignore scaling factor for layout selection
-  * CI: Fix typo
-  * Update rust deps for release
-
-  [ Andreas Rönnquist ]
-  * Swedish keyboard, wide button switching between numbers, symbols and base
-  * More fixes of button sizes
-  * Folder is doc, not docs
-
-  [ uzanto ]
-  * Add new file
-  * Replace duplicated show_symbols by show_eschars and removed "Delete" button that it's doing nothing
-
-  [ Arnaud Ferraris ]
-  * keyboards: fr: fix keyboard layout
-  * keyboards: fr: make sure the layout fits the screen
-  * resources: include French keyboard layout
-  * keyboards: fr: improve consistency with other layouts
-  * keyboards: fr: improve diacritics layout
-  * tests: add french layout
-
-  [ Vlad ]
-  * Fresh Russian layout
-
-  [ Jordi Masip ]
-  * Removed unused dependency 'libcroco'
-
-  [ Florian Klink ]
-  * sm.puri.Squeekboard.desktop: make path to Exec= absolute
-
-  [ Ole Guldberg ]
-  * Danish keyboard layout
-  * Danish keyboard layout
-  * add test for danish layout
-
- -- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>  Mon, 01 Jun 2020 09:39:12 +0000
-
-squeekboard (1.9.1) amber-phone; urgency=medium
-
-  [ Dorota Czaplejewicz ]
-  * layout: Improve press handling
-  * settings: Handle empty settings
-  * Variant: Use proper pointer conversion between C and Rust
-  * meta: Add doap file
-  * modifiers: Support Control and Alt
-  * CI: Test that any bump to changelog has a corresponding tag
-  * docs: Add the guiding principle
-  * hacking: Move into docs/
-
-  [ &t ]
-  * Fix minor comment typos
-
-  [ Dorota Czaplejewicz ]
-  * cargo: Bump package versions before release
-
- -- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>  Sun, 08 Mar 2020 10:04:29 +0000
-
-squeekboard (1.9.0) amber-phone; urgency=medium
-
-  [ Dorota Czaplejewicz ]
-  * imservice: Add commit_string method
-  * submission: Handle submitting strings
-  * input_method: Use for erasing
-  * logging: Use in merged functions
-  * translations: Remove redundant ones
-  * translations: Translate builtin layouts
-  * greek: Rename to gr which is used by gnome settings
-
-  [ Sebastian Krzyszkowiak ]
-  * layouts: Add Polish layouts
-
-  [ Dorota Czaplejewicz ]
-  * locks: Draw based on current view
-  * locking: Lock keys statelessly
-  * layouts: Better accented uppercase in PL
-  * emoji: Add more choices
-  * row: Eliminate angle
-  * layout: Center views relative to each other and the layout bounds
-  * drawing: Generalized foreach_visible_button
-  * variant: Fix double-free
-  * variant: Fix leak
-  * keyboard_layout: Fix leak
-  * layout: Improve scoping of locked variable
-  * terminal: Make */ easier to reach
-
-  [ Sebastian Krzyszkowiak ]
-  * layouts: terminal: Use altline outline for dot key
-
-  [ Dorota Czaplejewicz ]
-  * text input: Disable erasing
-  * cargo: Update deps
-
- -- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>  Wed, 19 Feb 2020 14:32:39 +0000
-
-squeekboard (1.8.1) amber-phone; urgency=medium
-
-  [ Dorota Czaplejewicz ]
-  * action: Rename Level to View
-  * keyboard: Introduce a KeyCode type wrapping u32
-  * layout: Centralize handling key releases
-  * layout: Make handling presses uniform
-  * UI: Drop indirection for show/hide functions
-  * managers: Move visible flag to UI manager
-  * dbus_service: Remove unused function
-  * dbus: Remove unneeded gobjectness
-  * dbus: Rename handler from eekboard_service
-  * context: Moved keymap setting together with its generation
-  * key-emitter: Remove unused
-  * eekboard_context_service: Drop unused enable property
-  * services: Split out layout management from EekboardContextService
-  * submission: Move away from virtual-keyboard
-  * submission: Create a new wrapper over imservice
-  * imservice: Limited scope of unsafe
-  * EekGtkKeyboard: Use a direct reference to EekboardContext
-  * submission: Take over virtual_keyboard handling
-  * keyboard: Cleanups of unused code
-  * levelkeyboard: Drop unused manager references
-  * keyboard: Gather up keymap handling, drop layout
-  * submission: Remove wildcard reexport
-  * imservice: Rename commit_state to done to match protocol
-  * ci: Clean up `..` before it's searched for artifacts
-  * dbus: Log error on dbus exit
-  * logging: Try to improve common operations
-  * imservice: Return something more resembling an Error on failure
-  * logging: Unified to remove random eprint calls
-  * press_key: Use proper logging
-  * number: Fix keysym for Return
-  * build: Strip clap of optional features
-  * layouts: Fix segfault on switching to wide
-  * font: Use font from style context
-  * font: Only pass relevant data to label renderer
-
-  [ Sebastian Krzyszkowiak ]
-  * layout: terminal: Swap positions of preferences and actions button
-  * layout: terminal: Show actions button on all views
-  * layout: terminal: Replace actions button with period on symbols view
-
-  [ Dorota Czaplejewicz ]
-  * setup: Connect ui to the state manager
-  * debian: Add missing commas
-
-  [ David Boddie ]
-  * Tidy build file and docs
-  * Use pip to install recommonmark
-
- -- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>  Fri, 31 Jan 2020 09:59:12 +0000
-
-squeekboard (1.8.0) amber-phone; urgency=medium
-
-  [ Dorota Czaplejewicz ]
-  * translations: Use gnome-desktop's xkb info database for layout names
-  * translations: Make the code cleaner
-  * overlay: Add terminal
-  * eek-layout: Remove unused
-  * pre-release: Update deps
-
- -- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>  Tue, 14 Jan 2020 13:55:00 +0000
-
-squeekboard (1.7.0) amber-phone; urgency=medium
-
-  * New terminal layout appearing on terminal input hint
-
- -- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>  Wed, 08 Jan 2020 11:53:07 +0000
-
-squeekboard (1.7.0) amber-phone; urgency=medium
-
-  * New terminal layout appearing on terminal input hint
-
- -- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>  Wed, 08 Jan 2020 11:53:07 +0000
-
-squeekboard (1.6.0) amber-phone; urgency=medium
-
-  [ Dorota Czaplejewicz ]
-  * tools: Move entry.py
-  * build: Move building of squeekboard-test-layout to tools
-  * packaging: Install entty.py as squeekboard-entry
-  * Remove unused build dependencies
-  * Remove unused header generator
-  * logging: Move all facilities to one file
-  * logging: Described the design
-  * logging: Add described log levels
-  * popover: Install emoji layout
-  * popover: Show overlays as selected
-  * Fix old Rust woes
-  * emoji: Add a passable layout
-  * Fix g_ and stdlib allocation/free mismatches
-
- -- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>  Thu, 02 Jan 2020 12:02:50 +0000
- 
-squeekboard (1.5.0) amber-phone; urgency=medium
-
-  [ Dorota Czaplejewicz ]
-  * keycodes: Sort to eliminate runtime indeterminism
-  * switcher: Switch layout on menu item click
-  * Drop squeek_key
-  * renderer: Remove some unneeded vars
-  * renderer: Simplified outline rendering
-  * renderer: Drop row from button rendering
-  * renderer: Drop unused params
-  * renderer: Simplify surface rendering
-  * rendering: Simplify Cairo context usage, remove unneeded calls.
-  * rendering: Remove unneeded redraw after button release
-  * renderer: Remove unused locked key render function
-  * renderer: Simply cut off when painting outside bounds
-  * renderer: Render whole keyboard the same way as pressed buttons
-
-  [ Mark Müller ]
-  * layout: add German wide layout
-
-  [ Dorota Czaplejewicz ]
-  * renderer: Remove unused functions
-  * cleanup: Remove references to squeek_view
-  * cleanup: Unbox View and Row
-  * cleanup: Remove unused single frame draw
-  * positioning: Calculate sizes instead of storing, move position out of widgets
-  * positioning: Clean up unused code
-  * Fix old Rust woes
-
-  [ Mark Müller ]
-  * layout: add Japanese Kana wide layout
-
-  [ Dorota Czaplejewicz ]
-  * Entry test: Add Terminal input purpose
-  * readme: Add note about Cargo dependencies
-  * Create a library/UI module separation
-  * hacking: Add DCO and licensing requirement
-  * Fix internal .md link
-
-  [ Mark Müller ]
-  * squeekboard-test-layout: add argument parsing and some more output
-
-  [ Dorota Czaplejewicz ]
-  * Use clap in the lockfile
-  * parsing: Remove bounds which weren't used anyway
-  * layout: Respect margins
-  * CI: Build arm64 .deb
-
- -- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>  Mon, 23 Dec 2019 11:58:57 +0000
-
-squeekboard (1.4.0) amber-phone; urgency=medium
-
-  * "text" property in layouts
-  * Adjusts to user's color scheme
-
- -- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>  Mon, 02 Dec 2019 19:37:01 +0000
-
-squeekboard (1.3.2) amber-phone; urgency=medium
-
-  * Make sure all key presses get accepted by the compositor
-
- -- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>  Tue, 26 Nov 2019 15:36:27 +0000
-
-squeekboard (1.3.1) amber-phone; urgency=medium
-
-  * Update and fix layouts and languages
-  * Make tests less likely to fail
-
- -- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>  Wed, 20 Nov 2019 22:10:48 +0000
-
-squeekboard (1.3.0) amber-phone; urgency=medium
-
-  * Language selection popup
-  * Swedish and Finnish layouts
-
- -- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>  Sat, 16 Nov 2019 15:38:14 +0000
-
-squeekboard (1.2.2) amber-phone; urgency=medium
-
-  * Landscape mode
-
- -- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>  Wed, 30 Oct 2019 12:38:39 +0000
-
-squeekboard (1.2.1) amber-phone; urgency=medium
-
-  * Use different distribution
-
- -- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>  Tue, 08 Oct 2019 10:56:10 +0000
-
-squeekboard (1.2.0) unstable; urgency=medium
-
-  * Use Cargo-based dependencies
-
- -- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>  Tue, 24 Sep 2019 10:42:15 +0000
-
-squeekboard (1.1.0) unstable; urgency=medium
-
-  * Use new keyboard layout format
-
- -- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>  Mon, 02 Sep 2019 10:12:02 +0000
-
-
-squeekboard (1.0.10) unstable; urgency=medium
-
-  * Use a shared DBus definition
-
- -- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>  Tue, 02 Jul 2019 20:12:02 +0000
-
-squeekboard (1.0.9) unstable; urgency=medium
-
-  * Initial release.
-
- -- David Boddie <david.boddie@puri.sm>  Tue, 25 Jun 2019 19:33:00 +0200
--- a/debian/check_release.py
+++ b/debian/check_release.py
@ -1,10 +0,0 @@
-#!/usr/bin/env python3
-
-"""Checks tag before release.
-Feed it the first changelog line, and then all available tags.
-"""
-
-import re, sys
-tag = "v" + re.findall("\\((.*)\\)", input())[0]
-if tag not in map(str.strip, sys.stdin.readlines()):
-    raise Exception("Changelog's current version doesn't have a tag. Push the tag!")
--- a/debian/compat
+++ b/debian/compat
@ -1 +0,0 @@
-10
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Daiki Ueno	87a0540627	0.90.5 released.	2011-03-11 16:17:46 +09:00
Daiki Ueno	878a1c73fd	Install eekboard.desktop.	2011-03-11 16:00:56 +09:00
Daiki Ueno	b465cbc5de	Add --list option to eekboard-inscript.	2011-03-11 15:52:15 +09:00
Daiki Ueno	2622e4eb59	Add --keyboard option to eekboard.	2011-03-11 15:14:20 +09:00
				`@ -0,0 +1 @@`
				`See https://github.com/ueno/eekboard/wiki/TODO`
				`@ -0,0 +1 @@`
				`EekClutter cheader_filename="eek/eek-clutter.h"`
				`@ -0,0 +1 @@`
				`SUBDIRS = 16x16 22x22 24x24 32x32 48x48 scalable`