Release 1.8.1 "Corona"

- Landscape layout doesn't crash - CSS font is actually taken into account - Failed start due to dbus is now communicated - Better log messages - Fixed Enter in numbers layout - More consistent terminal layout - Proper font sizes in terminal layout
2020-01-31 10:08:59 +00:00
127 changed files with 1992 additions and 7471 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -1,4 +1,4 @@
-image: debian:bullseye
+image: debian:buster

 stages:
  - build
@ -11,7 +11,7 @@ stages:
 before_script:
  - apt-get -y update
  - apt-get -y install wget ca-certificates gnupg
-  - echo "deb [trusted=yes] http://ci.puri.sm/ bullseyeci main" > /etc/apt/sources.list.d/ci.list
+  - 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

@ -27,8 +27,7 @@ build_docs:
      - ./doc/build.sh _build

 build_meson:
-  tags:
-    - librem5
+  <<: *tags
  stage: build
  artifacts:
    paths:
@ -36,7 +35,7 @@ build_meson:
    expire_in: 3h
  script:
    - apt-get -y build-dep .
-    - meson . _build/ -Ddepdatadir=/usr/share --werror
+    - meson . _build/ -Ddepdatadir=/usr/share
    - ninja -C _build install

 build_deb:
@ -53,44 +52,10 @@ build_deb:
        - debuild -i -us -uc -b
        - cp ../*.deb .

-build_deb:amber:
-    image: pureos/amber
-    tags:
-        - librem5
-    stage: build
-    artifacts:
-      paths:
-        - "*.deb"
-    script:
-        - echo "deb http://ci.puri.sm/ scratch librem5" > /etc/apt/sources.list.d/ci.list
-        - apt-get -y update
-        - rm -f ../*.deb
-        - apt-get -y build-dep .
-        - apt-get -y install devscripts
-        - debuild -i -us -uc -b
-        - cp ../*.deb .
-
-build_deb:buster:
-    image: "debian:buster"
-    tags:
-        - librem5
-    stage: build
-    artifacts:
-      paths:
-        - "*.deb"
-    script:
-        - echo "deb http://ci.puri.sm/ scratch librem5" > /etc/apt/sources.list.d/ci.list
-        - apt-get -y update
-        - rm -f ../*.deb
-        - apt-get -y build-dep .
-        - apt-get -y install devscripts
-        - debuild -i -us -uc -b
-        - cp ../*.deb .
-
-
 build_deb:arm64:
    tags:
        - librem5:arm64
+    allow_failure: true
    stage: build
    artifacts:
      paths:
@ -102,23 +67,6 @@ build_deb:arm64:
        - debuild -i -us -uc -b
        - cp ../*.deb .

-build_deb:arm64_buster:
-    image: "debian:buster"
-    tags:
-        - librem5:arm64
-    stage: build
-    artifacts:
-      paths:
-        - "*.deb"
-    script:
-        - echo "deb http://ci.puri.sm/ scratch librem5" > /etc/apt/sources.list.d/ci.list
-        - apt-get -y update
-        - rm -f ../*.deb
-        - apt-get -y build-dep .
-        - apt-get -y install devscripts
-        - debuild -i -us -uc -b
-        - cp ../*.deb .
-
 test_lintian:
    <<: *tags
    stage: test
@ -129,24 +77,10 @@ test_lintian:
        - lintian *.deb

 test:
-  tags:
-    - librem5
+  <<: *tags
  stage: test
  needs:
    - build_meson
  script:
    - apt-get -y build-dep .
-    - apt-get -y install clang-tidy
    - ninja -C _build test
-    - cd _build
-    - clang-tidy --checks=-clang-diagnostic-missing-braces,readability-braces-around-statements, --warnings-as-errors=readability-braces-around-statements -extra-arg=-Wno-unknown-warning-option ../src/*.c ../eek/*.c ../eekboard/*.c
-
-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/Cargo.deps
+++ b/Cargo.deps
@ -1,22 +0,0 @@
-# Dependencies which change based on build flags
-bitflags = "1.2.*"
-clap = { version = "2.33.*", default-features = false }
-regex = { version = "1.3.*", default-features = false, features = ["std", "unicode-case"] }
-
-[dependencies.cairo-rs]
-version = "0.7.*"
-
-[dependencies.gdk]
-version = "0.11.*"
-
-[dependencies.gio]
-version = "0.7.*"
-features = ["v2_44"]
-
-[dependencies.glib]
-version = "0.8.*"
-features = ["v2_44"]
-
-[dependencies.gtk]
-version = "0.7.*"
-features = ["v3_22"]
--- a/Cargo.deps.legacy
+++ b/Cargo.deps.legacy
@ -1,22 +0,0 @@
-# Dependencies which change based on build flags
-bitflags = "1.0.*"
-clap = { version = "2.32.*", default-features = false }
-regex = { version = "1.1.*", default-features = false, features = ['use_std'] }
-
-[dependencies.cairo-rs]
-version = "0.5.*"
-
-[dependencies.gdk]
-version = "0.9.*"
-
-[dependencies.gio]
-version = "0.5.*"
-features = ["v2_44"]
-
-[dependencies.glib]
-version = "0.6.*"
-features = ["v2_44"]
-
-[dependencies.gtk]
-version = "0.5.*"
-features = ["v3_22"]
--- a/Cargo.lock
+++ b/Cargo.lock
@ -1,484 +1,506 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
 [[package]]
-name = "atk"
-version = "0.7.0"
+name = "aho-corasick"
+version = "0.7.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86b7499272acf036bb5820c6e346bbfb5acc5dceb104bc2c4fd7e6e33dfcde6a"
 dependencies = [
- "atk-sys",
- "bitflags",
- "glib",
- "glib-sys",
- "gobject-sys",
- "libc",
+ "memchr 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "atk-sys"
-version = "0.9.1"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e552c1776737a4c80110d06b36d099f47c727335f9aaa5d942a72b6863a8ec6f"
 dependencies = [
- "glib-sys",
- "gobject-sys",
- "libc",
- "pkg-config",
+ "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.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "bitflags"
-version = "1.2.1"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"

 [[package]]
 name = "cairo-rs"
-version = "0.7.1"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e05db47de3b0f09a222fa4bba2eab957d920d4243962a86b2d77ab401e4a359c"
 dependencies = [
- "bitflags",
- "cairo-sys-rs",
- "glib",
- "glib-sys",
- "gobject-sys",
- "libc",
+ "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.66 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "cairo-sys-rs"
-version = "0.9.2"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff65ba02cac715be836f63429ab00a767d48336efc5497c5637afb53b4f14d63"
 dependencies = [
- "glib-sys",
- "libc",
- "pkg-config",
+ "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.66 (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.66"
+version = "1.0.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c0496836a84f8d0495758516b8621a622beb77c0fed418570e50764093ced48"

 [[package]]
 name = "clap"
-version = "2.33.3"
+version = "2.32.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002"
 dependencies = [
- "bitflags",
- "textwrap",
- "unicode-width",
+ "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.7"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88d7ed2934d741c6b37e33e3832298e8850b53fd2d2bea03873375596c7cea4e"

 [[package]]
 name = "fragile"
 version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05f8140122fa0d5dcb9fc8627cfce2b37cc1500f752636d46ea28bc26785c2f9"

 [[package]]
 name = "gdk"
-version = "0.11.0"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6243e995f41f3a61a31847e54cc719edce93dd9140c89dca3b9919be1cfe22d5"
 dependencies = [
- "bitflags",
- "cairo-rs",
- "cairo-sys-rs",
- "gdk-pixbuf",
- "gdk-sys",
- "gio",
- "gio-sys",
- "glib",
- "glib-sys",
- "gobject-sys",
- "libc",
- "pango",
+ "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.66 (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.7.0"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9726408ee1bbada83094326a99b9c68fea275f9dbb515de242a69e72051f4fcc"
 dependencies = [
- "gdk-pixbuf-sys",
- "gio",
- "gio-sys",
- "glib",
- "glib-sys",
- "gobject-sys",
- "libc",
+ "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.66 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "gdk-pixbuf-sys"
-version = "0.9.1"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8991b060a9e9161bafd09bf4a202e6fd404f5b4dd1a08d53a1e84256fb34ab0"
 dependencies = [
- "gio-sys",
- "glib-sys",
- "gobject-sys",
- "libc",
- "pkg-config",
+ "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.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "gdk-sys"
-version = "0.9.1"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6adf679e91d1bff0c06860287f80403e7db54c2d2424dce0a470023b56c88fbb"
 dependencies = [
- "cairo-sys-rs",
- "gdk-pixbuf-sys",
- "gio-sys",
- "glib-sys",
- "gobject-sys",
- "libc",
- "pango-sys",
- "pkg-config",
+ "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.66 (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.7.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6261b5d34c30c2d59f879e643704cf54cb44731f3a2038000b68790c03e360e3"
 dependencies = [
- "bitflags",
- "fragile",
- "gio-sys",
- "glib",
- "glib-sys",
- "gobject-sys",
- "lazy_static",
- "libc",
+ "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.66 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "gio-sys"
-version = "0.9.1"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fad225242b9eae7ec8a063bb86974aca56885014672375e5775dc0ea3533911"
 dependencies = [
- "glib-sys",
- "gobject-sys",
- "libc",
- "pkg-config",
+ "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.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "glib"
-version = "0.8.2"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be27232841baa43e0fd5ae003f7941925735b2f733a336dc75f07b9eff415e7b"
 dependencies = [
- "bitflags",
- "glib-sys",
- "gobject-sys",
- "lazy_static",
- "libc",
+ "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.66 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "glib-sys"
-version = "0.9.1"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95856f3802f446c05feffa5e24859fe6a183a7cb849c8449afc35c86b1e316e2"
 dependencies = [
- "libc",
- "pkg-config",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "gobject-sys"
-version = "0.9.1"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31d1a804f62034eccf370006ccaef3708a71c31d561fee88564abe71177553d9"
 dependencies = [
- "glib-sys",
- "libc",
- "pkg-config",
+ "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "gtk"
-version = "0.7.0"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "709f1074259d4685b96133f92b75c7f35b504715b0fcdc96ec95de2607296a60"
 dependencies = [
- "atk",
- "bitflags",
- "cairo-rs",
- "cairo-sys-rs",
- "cc",
- "gdk",
- "gdk-pixbuf",
- "gdk-pixbuf-sys",
- "gdk-sys",
- "gio",
- "gio-sys",
- "glib",
- "glib-sys",
- "gobject-sys",
- "gtk-sys",
- "lazy_static",
- "libc",
- "pango",
- "pango-sys",
+ "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.50 (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.66 (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.9.2"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53def660c7b48b00b510c81ef2d2fbd3c570f1527081d8d7947f471513e1a4c1"
 dependencies = [
- "atk-sys",
- "cairo-sys-rs",
- "gdk-pixbuf-sys",
- "gdk-sys",
- "gio-sys",
- "glib-sys",
- "gobject-sys",
- "libc",
- "pango-sys",
- "pkg-config",
+ "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.66 (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"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"

 [[package]]
 name = "libc"
-version = "0.2.82"
+version = "0.2.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89203f3fba0a3795506acaad8ebce3c80c0af93f994d5a1d7a0b1eeb23271929"

 [[package]]
 name = "linked-hash-map"
-version = "0.5.4"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3"

 [[package]]
 name = "maplit"
 version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d"
+
+[[package]]
+name = "memchr"
+version = "2.3.0"
+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"
-checksum = "6585fd95e7bb50d6cc31e20d4cf9afb4e2ba16c5846fc76793f11218da9c475b"
 dependencies = [
- "libc",
- "winapi",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "pango"
-version = "0.7.0"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "393fa071b144f8ffb83ede273758983cf414ca3c0b1d2a5a9ce325b3ba3dd786"
 dependencies = [
- "bitflags",
- "glib",
- "glib-sys",
- "gobject-sys",
- "lazy_static",
- "libc",
- "pango-sys",
+ "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.66 (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.9.1"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86b93d84907b3cf0819bff8f13598ba72843bee579d5ebc2502e4b0367b4be7d"
 dependencies = [
- "glib-sys",
- "gobject-sys",
- "libc",
- "pkg-config",
+ "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.66 (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.19"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c"

 [[package]]
 name = "proc-macro2"
-version = "1.0.24"
+version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71"
 dependencies = [
- "unicode-xid",
+ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "quote"
-version = "1.0.8"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "991431c3519a3f36861882da93630ce66b52918dcf1b8e2fd66b397fc96f28df"
 dependencies = [
- "proc-macro2",
+ "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "regex"
-version = "1.3.9"
+version = "1.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c3780fcf44b193bc4d09f36d2a3c87b251da4a046c87795a0d35f4f927ad8e6"
 dependencies = [
- "regex-syntax",
+ "aho-corasick 0.7.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memchr 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex-syntax 0.6.14 (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.22"
+version = "0.6.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5eb417147ba9860a96cfe72a0b93bf88fee1744b5636ec99ab20c1aa9376581"

 [[package]]
 name = "rs"
 version = "0.1.0"
 dependencies = [
- "bitflags",
- "cairo-rs",
- "cairo-sys-rs",
- "clap",
- "gdk",
- "gio",
- "glib",
- "glib-sys",
- "gtk",
- "gtk-sys",
- "maplit",
- "regex",
- "serde",
- "serde_yaml",
- "xkbcommon",
+ "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.104 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_yaml 0.8.11 (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.118"
+version = "1.0.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06c64263859d87aa2eb554587e2d23183398d617427327cf2b3d0ed8c69e4800"
 dependencies = [
- "serde_derive",
+ "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "serde_derive"
-version = "1.0.118"
+version = "1.0.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c84d3526699cd55261af4b941e4e725444df67aa4f9e6a3564f18030d12672df"
 dependencies = [
- "proc-macro2",
- "quote",
- "syn",
+ "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "serde_yaml"
-version = "0.8.15"
+version = "0.8.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "971be8f6e4d4a47163b405a3df70d14359186f9ab0f3a3ec37df144ca1ce089f"
 dependencies = [
- "dtoa",
- "linked-hash-map",
- "serde",
- "yaml-rust",
+ "dtoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.104 (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.58"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc60a3d73ea6594cd712d830cc1f0390fd71542d8c8cd24e70cc54cdfd5e05d5"
 dependencies = [
- "proc-macro2",
- "quote",
- "unicode-xid",
+ "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "textwrap"
-version = "0.11.0"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
 dependencies = [
- "unicode-width",
+ "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.8"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3"

 [[package]]
 name = "unicode-xid"
-version = "0.2.1"
+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"
-checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"

 [[package]]
 name = "winapi"
-version = "0.3.9"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
 dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
+ "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"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"

 [[package]]
 name = "winapi-x86_64-pc-windows-gnu"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"

 [[package]]
 name = "xkbcommon"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fda0ea5f7ddabd51deeeda7799bee06274112f577da7dd3d954b8eda731b2fce"
 dependencies = [
- "libc",
- "memmap",
+ "libc 0.2.66 (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.5"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85"
 dependencies = [
- "linked-hash-map",
+ "linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
+
+[metadata]
+"checksum aho-corasick 0.7.7 (registry+https://github.com/rust-lang/crates.io-index)" = "5f56c476256dc249def911d6f7580b5fc7e875895b5d7ee88f5d602208035744"
+"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.50 (registry+https://github.com/rust-lang/crates.io-index)" = "95e28fa049fda1c330bcf9d723be7663a899c4679724b34c81e9f5a326aab8cd"
+"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.66 (registry+https://github.com/rust-lang/crates.io-index)" = "d515b1f41455adea1313a4a2ac8a8a477634fbae63cc6100e3aebb207ce61558"
+"checksum linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ae91b68aebc4ddb91978b11a1b02ddd8602a05ec19002801c5666000e05e0f83"
+"checksum maplit 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d"
+"checksum memchr 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3197e20c7edb283f87c071ddfc7a2cca8f8e0b888c242959846a6fce03c72223"
+"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.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3acb317c6ff86a4e579dfa00fc5e6cca91ecbb4e7eb2df0468805b674eb88548"
+"checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe"
+"checksum regex 1.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "d9d8297cc20bbb6184f8b45ff61c8ee6a9ac56c156cec8e38c3e5084773c44ad"
+"checksum regex-syntax 0.6.14 (registry+https://github.com/rust-lang/crates.io-index)" = "b28dfe3fe9badec5dbf0a79a9cccad2cfc2ab5484bdb3e44cbd1ae8b3ba2be06"
+"checksum serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "414115f25f818d7dfccec8ee535d76949ae78584fc4f79a6f45a904bf8ab4449"
+"checksum serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "128f9e303a5a29922045a830221b8f78ec74a5f544944f3d5984f8ec3895ef64"
+"checksum serde_yaml 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)" = "691b17f19fc1ec9d94ec0b5864859290dff279dbd7b03f017afda54eb36c3c35"
+"checksum syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)" = "af6f3550d8dff9ef7dc34d384ac6f107e5d31c8f57d9f28e0081503f547ac8f5"
+"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.in
+++ b/Cargo.toml.in
@ -2,40 +2,46 @@
 name = "rs"
 version = "0.1.0"

-[lib]
-name = "rs"
-path = "@path@/src/lib.rs"
-crate-type = ["staticlib", "rlib"]
+[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"] }

-# Cargo can't do autodiscovery if Cargo.toml is not in the root.
-[[bin]]
-name = "test_layout"
-path = "@path@/src/bin/test_layout.rs"
+[dependencies.cairo-rs]
+version = "0.5.*"

-[[example]]
-name = "test_layout"
-path = "@path@/examples/test_layout.rs"
-
-[features]
-gio_v0_5 = []
-gtk_v0_5 = []
-rustc_less_1_36 = []
-
-# Dependencies which don't change based on build flags
 [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"]

-[dependencies]
-maplit = "1.0.*"
-serde = { version = "1.0.*", features = ["derive"] }
-serde_yaml = "0.8.*"
-xkbcommon = { version = "0.4.*", features = ["wayland"] }
-# Here is inserted the Cargo.deps file
+
+[lib]
+name = "rs"
+path = "src/lib.rs"
+crate-type = ["staticlib", "rlib"]
--- a/doc/hacking.md
+++ b/doc/hacking.md
@ -3,47 +3,15 @@ Hacking

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

-Principles
----------
-
-The project was built upon some guiding principles, which should be respected primarily by the maintainers, but also by contributors to avoid needlessly rejected changes.
-
-The overarching principle of *squeekboard* is to empower users.
-
-Software is primarily meant to solve problems of its users. Often in the quest to make software better, a hard distinction is made between the developer, who becomes the creator, and the user, who takes the role of the consumer, without direct influence on the software they use.
-This project aims to give users the power to make the software work for them by blurring the lines between users and developers.
-
-Notwithstanding its current state, *squeekboard* must be structured in a way that provides users a gradual way to gain more experience and power to adjust it. It must be easy, in order of importance:
-
- to use the software,
- to modify its resources,
- to change its behavior,
- to contribute upstream.
-
-To give an idea of what it means in practice, those are some examples of what has been important for *squeekboard* so far:
-
- being quick and usable,
- allowing local overrides of resources and config,
- storing resources and config as editable, standard files,
- having complete, up to date documentation of interfaces,
- having an easy process of sending contributions,
- adapting to to user's settings and constrains without overriding them,
- avoiding compiling whenever possible,
- making it easy to build,
- having code that is [simple and obvious](https://www.python.org/dev/peps/pep-0020/),
- having an easy process of testing and accepting contributions.
-
-You may notice that they are ordered roughly from "user-focused" to "maintainer-focused". While good properties are desired, sometimes they conflict, and maintainers should give additional weight to those benefiting the user compared to those benefiting regular contributors.
-
 Sending patches
 ---------------

-By submitting a change to this project, you agree to license it under the [GPL license version 3](https://source.puri.sm/Librem5/squeekboard/blob/master/COPYING), or any later version. You also certify that your contribution fulfills the [Developer's Certificate of Origin 1.1](https://source.puri.sm/Librem5/squeekboard/blob/master/dco.txt).
+By submitting a change to this project, you agree to license it under the [GPL license version 3](./COPYING), or any later version. You also certify that your contribution fulfills the [Developer's Certificate of Origin 1.1](./dco.txt).

 Development environment
 -----------------------

-*Squeekboard* is regularly built and tested on [the development environment](https://developer.puri.sm/Librem5/Development_Environment.html).
+*Squeekboard* is regularly built and tested on [the develpment environment](https://developer.puri.sm/Librem5/Development_Environment.html).

 Recent Fedora releases are likely to be tested as well.

@ -56,7 +24,8 @@ sudo apt-get -y install build-essential
 sudo apt-get -y build-dep .
 ```

-For an explicit list of dependencies check the `Build-Depends` entry in the [`debian/control`](https://source.puri.sm/Librem5/squeekboard/blob/master/debian/control) file.
+For an explicit list of dependencies check the `Build-Depends` entry in the
+[`debian/control`](./debian/control) file.

 Testing
 -------
@ -113,7 +82,7 @@ User interface modules should:

 Code submitted should roughly match the style of surrounding code. Things that will *not* be accepted are ones that often lead to errors:

- skipping brackets `{}` after every `if()`, `else`, and similar ([SCI CERT C: EXP19-C](https://wiki.sei.cmu.edu/confluence/display/c/EXP19-C.+Use+braces+for+the+body+of+an+if%2C+for%2C+or+while+statement))
+- skipping brackets `{}` after every `if()`, `else`, and similar

 Bad example:

@ -162,7 +131,7 @@ Maintenance

 Squeekboard uses Rust & Cargo for some of its dependencies.

-Use the `cargo.sh` script for maintaining the Cargo part of the build. The script takes the usual Cargo commands, after the first 2 positional arguments: source directory, and output artifact. So, `cargo test` becomes:
+Use the `cargo.sh` script for maintaining the Cargo part of the build. The script takes the usual Cargo commands, after the first 2 positionsl arguments: source directory, and output artifact. So, `cargo test` becomes:

 ```
 cd build_dir
@ -175,14 +144,10 @@ All Cargo dependencies must be selected in the version available in PureOS, and

 Dependencies must be specified in `Cargo.toml` with 2 numbers: "major.minor". Since bugfix version number is meant to not affect the interface, this allows for safe updates.

-`Cargo.lock` is used for remembering the revisions of all Rust dependencies. It must correspond to the default dependency configuration: without flags to use older or newer versions of dependencies. It should be updated often, preferably with each bugfix revision, and in a commit on its own:
+`Cargo.lock` is used for remembering the revisions of all Rust dependencies. It should be updated often, preferably with each bugfix revision, and in a commit on its own:

 ```
 cd build_dir
-ninja ./Cargo.toml
 sh /source_path/cargo.sh update
 ninja test
-cp ./Cargo.lock /source_path/
 ```
-
-Since version 1.9.3, `Cargo.lock` is not actually used by the build system, due to `Cargo.toml` being generated at every build.
--- a/README.md
+++ b/README.md
@ -30,43 +30,30 @@ Building

 ### Dependencies

-See `.gitlab-ci.yml` or run `apt-get build-dep .`
+See `.gitlab-ci.yml`.

 ### Build from git repo

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

-To run tests use `ninja test`. To install squeekboard run `ninja install`.
-
 Running
 -------

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

-Squeekboard honors the gnome "screen-keyboard-enabled" setting. Either enable this through gnome-settings under accessibility or run:
-
-```bash
-$ gsettings set org.gnome.desktop.a11y.applications screen-keyboard-enabled true
-```
-
-To make the keyboard show you can use either an application that does so automatically, like a text editor or `python3 ./tests/entry.py`, or you can manually trigger it with:
-
-```bash
-busctl call --user sm.puri.OSK0 /sm/puri/OSK0 sm.puri.OSK0 SetVisible b true
-```
-
 Developing
 ----------

-See [`doc/hacking.md`](doc/hacking.md) for this copy, or the [official documentation](https://developer.puri.sm/projects/squeekboard/) for the current release.
+See `HACKING.md`
--- a/cargo.sh
+++ b/cargo.sh
@ -13,10 +13,5 @@ CARGO_TARGET_DIR="$(pwd)"
 export CARGO_TARGET_DIR

 cd "$SOURCE_DIR"
-
-# the 'run" command takes arguments at the end,
-# so --manifest-path must not be last
-CMD="$1"
-shift
-cargo "$CMD" --manifest-path "$CARGO_TARGET_DIR"/Cargo.toml "$@"
+cargo "$@"

--- a/cargo_build.py
+++ b/cargo_build.py
@ -1,49 +0,0 @@
-#!/usr/bin/env python3
-
-"""This script manages Cargo builds
-while keeping the artifact directory within the build tree
-instead of the source tree.
-"""
-
-from pathlib import Path
-import shlex
-import subprocess
-import sys
-
-source_dir = Path(__file__).absolute().parent
-
-args = sys.argv[1:]
-binary_dir = "debug"
-
-if '--release' in args:
-    binary_dir = "release"
-
-# The file produced by Cargo will have a special name
-try:
-    i = args.index('--rename')
-except ValueError:
-    filename = None
-else:
-    args.pop(i)
-    filename = args.pop(i)
-
-# The target destination of the produced file is a positional argument
-out_path = [arg for arg in args if not arg.startswith('--')]
-if out_path:
-    out_path = out_path[0]
-    i = args.index(out_path)
-    args.pop(i)    
-
-subprocess.run(['sh', "{}/cargo.sh".format(shlex.quote(source_dir.as_posix())), 'build']
-    + args,
-    check=True)
-
-if out_path:
-    out_path = Path(out_path).absolute()
-    out_basename = out_path.name
-    filename = filename or out_basename
-    subprocess.run(['cp', '-a',
-        './{}/{}'.format(shlex.quote(binary_dir), shlex.quote(filename)),
-        out_path],
-        check=True)
-
--- a/cargo_build.sh
+++ b/cargo_build.sh
@ -0,0 +1,34 @@
+#!/bin/sh
+
+# This script manages Cargo builds
+# while keeping the artifact directory within the build tree
+# instead of the source tree
+
+set -e
+
+SCRIPT_PATH="$(realpath "$0")"
+SOURCE_DIR="$(dirname "$SCRIPT_PATH")"
+
+RELEASE=""
+BINARY_DIR="debug"
+if [ "${1}" = "--release" ]; then
+    shift
+    BINARY_DIR="release"
+    RELEASE="--release"
+fi
+
+if [ "${1}" = "--rename" ]; then
+    shift
+    FILENAME="${1}"
+    shift
+fi
+OUT_PATH="$(realpath "${1}")"
+shift
+OUT_BASENAME="$(basename "${OUT_PATH}")"
+FILENAME="${FILENAME:-"${OUT_BASENAME}"}"
+
+sh "$SOURCE_DIR"/cargo.sh build $RELEASE "$@"
+
+if [ -n "${OUT_PATH}" ]; then
+    cp -a ./"${BINARY_DIR}"/"${FILENAME}" "${OUT_PATH}"
+fi
--- a/data/keyboards/be.yaml
+++ b/data/keyboards/be.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/be_wide.yaml
+++ b/data/keyboards/be_wide.yaml
@ -1,89 +0,0 @@
---
-outlines:
-    default:   { width: 54,  height: 42 }
-    altline:   { width: 81,  height: 42 }
-    wide:      { width: 100, height: 42 }
-    spaceline: { width: 205, height: 42 }
-    special:   { width: 54,  height: 42 }
-
-views:
-    base:
-        - "a z e r t y u i o p"
-        - "q s d f g h j k l m"
-        - "Shift_L   w x c v b n .   BackSpace"
-        - "show_numbers preferences         space        show_eschars Return"
-    upper:
-        - "A Z E R T Y U I O P"
-        - "Q S D F G H J K L M"
-        - "Shift_L   W X C V B N ,  BackSpace"
-        - "show_numbers preferences         space        show_eschars Return"
-    numbers:
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "@ # € % & - _ + ( )"
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
-        - "show_letters preferences         space        show_eschars Return"
-    symbols:
-        - "~ ` | · √ π τ ÷ × ¶"
-        - "© ® £ $ ¥ ^ ° * { }"
-        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        show_eschars Return"
-    eschars:
-        - "à â ç é è ê î ô ù û"
-        - "À Â Ç É È Ê Î Ô Ù Û"
-        - "show_numbers_from_symbols  æ œ ä ë ï ö ü  BackSpace"
-        - "show_letters preferences         space        show_eschars Return"
-
-buttons:
-    Shift_L:
-        action:
-            locking:
-                lock_view: "upper"
-                unlock_view: "base"
-        outline: "altline"
-        icon: "key-shift"
-    BackSpace:
-        outline: "altline"
-        icon: "edit-clear-symbolic"
-        action: erase
-    preferences:
-        action: "show_prefs"
-        outline: "special"
-        icon: "keyboard-mode-symbolic"
-    show_numbers:
-        action:
-            set_view: "numbers"
-        outline: "wide"
-        label: "123"
-    show_numbers_from_symbols:
-        action:
-            set_view: "numbers"
-        outline: "altline"
-        label: "123"
-    show_letters:
-        action:
-            set_view: "base"
-        outline: "wide"
-        label: "abc"
-    show_symbols:
-        action:
-            set_view: "symbols"
-        outline: "altline"
-        label: "*/="
-    show_eschars:
-        action:
-            locking:
-                lock_view: "eschars"
-                unlock_view: "base"
-        outline: "altline"
-        label: "âÂ"
-    space:
-        outline: "spaceline"
-        text: " "
-    Return:
-        outline: "wide"
-        icon: "key-enter"
-        keysym: "Return"
-    colon:
-        text: ":"
-    "\"":
-        keysym: "quotedbl"
--- a/data/keyboards/bg.yaml
+++ b/data/keyboards/bg.yaml
@ -1,78 +0,0 @@
---
-outlines:
-    default: { width: 32.72, height: 52 }
-    altline: { width: 47, height: 52 }
-    wide: { width: 49.09, height: 52 }
-    spaceline: { width: 185, height: 52 }
-    special: { width: 44, height: 52 }
-
-views:
-    base:
-        - "я в е р т ъ у и о п ю"
-        - "а с д ф г х й к л ш щ"
-        - "Shift_L з ь ц ж б н м ч BackSpace"
-        - "show_numbers preferences         space   .    Return"
-    upper:
-        - "Я В Е Р Т Ъ У И О П Ю"
-        - "А С Д Ф Г Х Й К Л Ш Щ"
-        - "Shift_L З Ь Ц Ж Б Н М Ч 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: "*/="
-    space:
-        outline: "spaceline"
-        text: " "
-    Return:
-        outline: "wide"
-        icon: "key-enter"
-        keysym: "Return"
-    colon:
-        text: ":"
-    "\"":
-        keysym: "quotedbl"
--- a/data/keyboards/br.yaml
+++ b/data/keyboards/br.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     , Return"
-    upper:
-        - "Q W E R T Y U I O P"
-        - "A S D F G H J K L Ç"
-        - "Shift_L   Z X C V B N M  BackSpace"
-        - "show_numbers preferences         space     period Return"
-    numbers:
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "à À á Á ã Ã â Â é É"
-        - "show_symbols   ê Ê í Í ó Ó ô Ô"
-        - "show_letters        õ Õ ú Ú ü Ü period BackSpace"
-    symbols:
-        - "@ # $ % - + ÷ × = ≠"
-        - "( ) § & < > / * { }"
-        - "show_numbers_from_symbols     º \" ' colon ; ! ?  BackSpace"
-        - "show_letters preferences         space        period Return"
-
-buttons:
-    Shift_L:
-        action:
-            locking:
-                lock_view: "upper"
-                unlock_view: "base"
-        outline: "altline"
-        icon: "key-shift"
-    BackSpace:
-        outline: "altline"
-        icon: "edit-clear-symbolic"
-        action: erase
-    preferences:
-        action: show_prefs
-        outline: "special"
-        icon: "keyboard-mode-symbolic"
-    show_numbers:
-        action:
-            set_view: "numbers"
-        outline: "wide"
-        label: "1ã"
-    show_numbers_from_symbols:
-        action:
-            set_view: "numbers"
-        outline: "altline"
-        label: "1ã"
-    show_letters:
-        action:
-            set_view: "base"
-        outline: "wide"
-        label: "ABC"
-    show_symbols:
-        action:
-            set_view: "symbols"
-        outline: "altline"
-        label: "*/="
-    period:
-        outline: "special"
-        text: "."
-    space:
-        outline: "spaceline"
-        text: " "
-    Return:
-        outline: "wide"
-        icon: "key-enter"
-        keysym: "Return"
-    colon:
-        text: ":"
--- a/data/keyboards/cz+qwerty.yaml
+++ b/data/keyboards/cz+qwerty.yaml
@ -1,106 +0,0 @@
---
-outlines:
-    default: { width: 35.33, height: 52 }
-    altline: { width: 52.67, height: 52 }
-    wide: { width: 52.67, height: 52 }
-    spaceline: { width: 106, height: 52 }
-    special: { width: 35.33, 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 show_accents    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 show_upper_accents    space    ! ? Return"
-    numbers:
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "@ # $ % & - _ + ( )"
-        - "show_symbols    , \" ' colon ; ! ?    BackSpace"
-        - "show_letters preferences show_accents    space    , . Return"
-    symbols:
-        - "~ ` | · √ π τ ÷ × ¶"
-        - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers_from_symbols    \\ / < > = [ ]    BackSpace"
-        - "show_letters preferences show_accents    space    , . Return"
-    accents:
-        - "ä ě é ř ť ý ů í ó ö"
-        - "á š ď ë ŕ ú ü ô ľ"
-        - "accents_Shift_L    ž ß č ç ñ ň ĺ    BackSpace"
-        - "show_letters preferences show_accents    space    , . Return"
-    upper_accents:
-        - "Ä Ě É Ř Ť Ý Ů Í Ó Ö"
-        - "Á Š Ď Ë Ŕ Ú Ü Ô Ľ"
-        - "accents_Shift_L    Ž ẞ Č Ç Ñ Ň Ĺ    BackSpace"
-        - "show_letters preferences show_upper_accents    space    , . Return"
-
-buttons:
-    Shift_L:
-        action:
-            locking:
-                lock_view: "upper"
-                unlock_view: "base"
-        outline: "altline"
-        icon: "key-shift"
-    accents_Shift_L:
-        action:
-            locking:
-                lock_view: "upper_accents"
-                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_accents:
-        action:
-            locking:
-                lock_view: "accents"
-                unlock_view: "base"
-        outline: "special"
-        label: "á"
-    show_upper_accents:
-        action:
-            locking:
-                lock_view: "upper_accents"
-                unlock_view: "base"
-        outline: "special"
-        label: "Á"
-    space:
-        outline: "spaceline"
-        text: " "
-    Return:
-        outline: "wide"
-        icon: "key-enter"
-        keysym: "Return"
-    colon:
-        text: ":"
--- a/data/keyboards/cz+qwerty_wide.yaml
+++ b/data/keyboards/cz+qwerty_wide.yaml
@ -1,106 +0,0 @@
---
-outlines:
-    default: { width: 54, height: 42 }
-    altline: { width: 81, height: 42 }
-    wide: { width: 81, height: 42 }
-    spaceline: { width: 162, 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 show_accents    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 show_upper_accents    space    ! ? Return"
-    numbers:
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "@ # $ % & - _ + ( )"
-        - "show_symbols    , \" ' colon ; ! ?    BackSpace"
-        - "show_letters preferences show_accents    space    , . Return"
-    symbols:
-        - "~ ` | · √ π τ ÷ × ¶"
-        - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers_from_symbols    \\ / < > = [ ]    BackSpace"
-        - "show_letters preferences show_accents    space    , . Return"
-    accents:
-        - "ä ě é ř ť ý ů í ó ö"
-        - "á š ď ë ŕ ú ü ô ľ"
-        - "accents_Shift_L    ž ß č ç ñ ň ĺ    BackSpace"
-        - "show_letters preferences show_accents    space    , . Return"
-    upper_accents:
-        - "Ä Ě É Ř Ť Ý Ů Í Ó Ö"
-        - "Á Š Ď Ë Ŕ Ú Ü Ô Ľ"
-        - "accents_Shift_L    Ž ẞ Č Ç Ñ Ň Ĺ    BackSpace"
-        - "show_letters preferences show_upper_accents    space    , . Return"
-
-buttons:
-    Shift_L:
-        action:
-            locking:
-                lock_view: "upper"
-                unlock_view: "base"
-        outline: "altline"
-        icon: "key-shift"
-    accents_Shift_L:
-        action:
-            locking:
-                lock_view: "upper_accents"
-                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_accents:
-        action:
-            locking:
-                lock_view: "accents"
-                unlock_view: "base"
-        outline: "special"
-        label: "á"
-    show_upper_accents:
-        action:
-            locking:
-                lock_view: "upper_accents"
-                unlock_view: "base"
-        outline: "special"
-        label: "Á"
-    space:
-        outline: "spaceline"
-        text: " "
-    Return:
-        outline: "wide"
-        icon: "key-enter"
-        keysym: "Return"
-    colon:
-        text: ":"
--- a/data/keyboards/cz.yaml
+++ b/data/keyboards/cz.yaml
@ -1,106 +0,0 @@
---
-outlines:
-    default: { width: 35.33, height: 52 }
-    altline: { width: 52.67, height: 52 }
-    wide: { width: 52.67, height: 52 }
-    spaceline: { width: 106, 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 preferences show_accents    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 show_upper_accents    space    ! ? Return"
-    numbers:
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "@ # $ % & - _ + ( )"
-        - "show_symbols    , \" ' colon ; ! ?    BackSpace"
-        - "show_letters preferences show_accents    space    , . Return"
-    symbols:
-        - "~ ` | · √ π τ ÷ × ¶"
-        - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers_from_symbols    \\ / < > = [ ]    BackSpace"
-        - "show_letters preferences show_accents    space    , . Return"
-    accents:
-        - "ä ě é ř ť ž ů í ó ö"
-        - "á š ď ë ŕ ú ü ô ľ"
-        - "accents_Shift_L    ý ß č ç ñ ň ĺ    BackSpace"
-        - "show_letters preferences show_accents    space    , . Return"
-    upper_accents:
-        - "Ä Ě É Ř Ť Ž Ů Í Ó Ö"
-        - "Á Š Ď Ë Ŕ Ú Ü Ô Ľ"
-        - "accents_Shift_L    Ý ẞ Č Ç Ñ Ň Ĺ    BackSpace"
-        - "show_letters preferences show_upper_accents    space    , . Return"
-
-buttons:
-    Shift_L:
-        action:
-            locking:
-                lock_view: "upper"
-                unlock_view: "base"
-        outline: "altline"
-        icon: "key-shift"
-    accents_Shift_L:
-        action:
-            locking:
-                lock_view: "upper_accents"
-                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_accents:
-        action:
-            locking:
-                lock_view: "accents"
-                unlock_view: "base"
-        outline: "special"
-        label: "á"
-    show_upper_accents:
-        action:
-            locking:
-                lock_view: "upper_accents"
-                unlock_view: "base"
-        outline: "special"
-        label: "Á"
-    space:
-        outline: "spaceline"
-        text: " "
-    Return:
-        outline: "wide"
-        icon: "key-enter"
-        keysym: "Return"
-    colon:
-        text: ":"
--- a/data/keyboards/cz_wide.yaml
+++ b/data/keyboards/cz_wide.yaml
@ -1,106 +0,0 @@
---
-outlines:
-    default: { width: 54, height: 42 }
-    altline: { width: 81, height: 42 }
-    wide: { width: 81, height: 42 }
-    spaceline: { width: 162, height: 42 }
-    special: { width: 54, 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 show_accents    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 show_upper_accents    space    ! ? Return"
-    numbers:
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "@ # $ % & - _ + ( )"
-        - "show_symbols    , \" ' colon ; ! ?    BackSpace"
-        - "show_letters preferences show_accents    space    , . Return"
-    symbols:
-        - "~ ` | · √ π τ ÷ × ¶"
-        - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers_from_symbols    \\ / < > = [ ]    BackSpace"
-        - "show_letters preferences show_accents    space    , . Return"
-    accents:
-        - "ä ě é ř ť ž ů í ó ö"
-        - "á š ď ë ŕ ú ü ô ľ"
-        - "accents_Shift_L    ý ß č ç ñ ň ĺ    BackSpace"
-        - "show_letters preferences show_accents    space    , . Return"
-    upper_accents:
-        - "Ä Ě É Ř Ť Ž Ů Í Ó Ö"
-        - "Á Š Ď Ë Ŕ Ú Ü Ô Ľ"
-        - "accents_Shift_L    Ý ẞ Č Ç Ñ Ň Ĺ    BackSpace"
-        - "show_letters preferences show_upper_accents    space    , . Return"
-
-buttons:
-    Shift_L:
-        action:
-            locking:
-                lock_view: "upper"
-                unlock_view: "base"
-        outline: "altline"
-        icon: "key-shift"
-    accents_Shift_L:
-        action:
-            locking:
-                lock_view: "upper_accents"
-                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_accents:
-        action:
-            locking:
-                lock_view: "accents"
-                unlock_view: "base"
-        outline: "special"
-        label: "á"
-    show_upper_accents:
-        action:
-            locking:
-                lock_view: "upper_accents"
-                unlock_view: "base"
-        outline: "special"
-        label: "Á"
-    space:
-        outline: "spaceline"
-        text: " "
-    Return:
-        outline: "wide"
-        icon: "key-enter"
-        keysym: "Return"
-    colon:
-        text: ":"
--- a/data/keyboards/de.yaml
+++ b/data/keyboards/de.yaml
@ -21,7 +21,7 @@ views:
    numbers:
        - "1 2 3 4 5 6 7 8 9 0"
        - "@ # € % & - _ + ( )"
-        - "show_symbols   ; \" ' : = < >  BackSpace"
+        - "show_symbols   , \" ' : = < >  BackSpace"
        - "show_letters show_eschars preferences         space        , . Return"
    symbols:
        - "~ ` ´ | · √ µ ÷ × ¶"
@ -45,7 +45,7 @@ buttons:
    BackSpace:
        outline: "altline"
        icon: "edit-clear-symbolic"
-        action: "erase"
+        keysym: "BackSpace"
    preferences:
        action: "show_prefs"
        outline: "special"
--- a/data/keyboards/de_wide.yaml
+++ b/data/keyboards/de_wide.yaml
@ -21,7 +21,7 @@ views:
    numbers:
        - "1 2 3 4 5 6 7 8 9 0"
        - "@ # % & - _ + ( ) ß"
-        - "show_symbols   ; \" ' : = < >  BackSpace"
+        - "show_symbols   , \" ' : = < >  BackSpace"
        - "show_letters preferences         space        , . Return"
    symbols:
        - "~ ` ´  · © ® ÷ × ¶"
@ -45,7 +45,7 @@ buttons:
    BackSpace:
        outline: "altline"
        icon: "edit-clear-symbolic"
-        action: "erase"
+        keysym: "BackSpace"
    preferences:
        action: "show_prefs"
        outline: "special"
--- 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/el.yaml
+++ b/data/keyboards/el.yaml
@ -46,7 +46,7 @@ buttons:
    BackSpace:
        outline: "altline"
        icon: "edit-clear-symbolic"
-        action: "erase"
+        keysym: "BackSpace"
    preferences:
        action: "show_prefs"
        outline: "altline"
--- a/data/keyboards/emoji.yaml
+++ b/data/keyboards/emoji.yaml
@ -1,80 +1,16 @@
 ---
 outlines:
    default: { width: 52, height: 52 }
-    altline: { width: 40, height: 52 }
-    narrow: { width: 22, height: 52 }
+    altline: { width: 52, 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"
-
+        - "preferences 🤨 🤓 😴 🤢 🤮 😈"
 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/epo.yaml
+++ b/data/keyboards/epo.yaml
@ -1,81 +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: 35.33, height: 52 }
-
-views:
-    base:
-        - "q w e r t y u i o p"
-        - "a s d f g h j k l"
-        - "Shift_L   z x c v b n m  BackSpace"
-        - "show_numbers show_eschars preferences         space        , . Return"
-    upper:
-        - "Q W E R T Y U I O P"
-        - "A S D F G H J K L"
-        - "Shift_L   Z X C V B N M  BackSpace"
-        - "show_numbers show_eschars preferences         space        ! ? Return"
-    numbers:
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "@ # $ % & - _ + ( )"
-        - "show_symbols   , \" ' : ; ! ?  BackSpace"
-        - "show_letters preferences         space        . Return"
-    symbols:
-        - "~ ` | · √ π τ ÷ × ¶"
-        - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters 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/es+cat.yaml
+++ b/data/keyboards/es+cat.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/es.yaml
+++ b/data/keyboards/es.yaml
@ -44,7 +44,7 @@ buttons:
    BackSpace:
        outline: "altline"
        icon: "edit-clear-symbolic"
-        action: "erase"
+        keysym: "BackSpace"
    preferences:
        action: "show_prefs"
        outline: "default"
--- a/data/keyboards/fi.yaml
+++ b/data/keyboards/fi.yaml
@ -39,7 +39,7 @@ buttons:
    BackSpace:
        outline: "altline"
        icon: "edit-clear-symbolic"
-        action: "erase"
+        keysym: "BackSpace"
    preferences:
        action: "show_prefs"
        outline: "altline"
--- 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/fr_wide.yaml
+++ b/data/keyboards/fr_wide.yaml
@ -1,89 +0,0 @@
---
-outlines:
-    default:   { width: 54,  height: 42 }
-    altline:   { width: 81,  height: 42 }
-    wide:      { width: 100, height: 42 }
-    spaceline: { width: 205, height: 42 }
-    special:   { width: 54,  height: 42 }
-
-views:
-    base:
-        - "a z e r t y u i o p"
-        - "q s d f g h j k l m"
-        - "Shift_L   w x c v b n .   BackSpace"
-        - "show_numbers preferences         space        show_eschars Return"
-    upper:
-        - "A Z E R T Y U I O P"
-        - "Q S D F G H J K L M"
-        - "Shift_L   W X C V B N ,  BackSpace"
-        - "show_numbers preferences         space        show_eschars Return"
-    numbers:
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "@ # € % & - _ + ( )"
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
-        - "show_letters preferences         space        show_eschars Return"
-    symbols:
-        - "~ ` | · √ π τ ÷ × ¶"
-        - "© ® £ $ ¥ ^ ° * { }"
-        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        show_eschars Return"
-    eschars:
-        - "à â ç é è ê î ô ù û"
-        - "À Â Ç É È Ê Î Ô Ù Û"
-        - "show_numbers_from_symbols  æ œ ä ë ï ö ü  BackSpace"
-        - "show_letters preferences         space        show_eschars Return"
-
-buttons:
-    Shift_L:
-        action:
-            locking:
-                lock_view: "upper"
-                unlock_view: "base"
-        outline: "altline"
-        icon: "key-shift"
-    BackSpace:
-        outline: "altline"
-        icon: "edit-clear-symbolic"
-        action: erase
-    preferences:
-        action: "show_prefs"
-        outline: "special"
-        icon: "keyboard-mode-symbolic"
-    show_numbers:
-        action:
-            set_view: "numbers"
-        outline: "wide"
-        label: "123"
-    show_numbers_from_symbols:
-        action:
-            set_view: "numbers"
-        outline: "altline"
-        label: "123"
-    show_letters:
-        action:
-            set_view: "base"
-        outline: "wide"
-        label: "abc"
-    show_symbols:
-        action:
-            set_view: "symbols"
-        outline: "altline"
-        label: "*/="
-    show_eschars:
-        action:
-            locking:
-                lock_view: "eschars"
-                unlock_view: "base"
-        outline: "altline"
-        label: "âÂ"
-    space:
-        outline: "spaceline"
-        text: " "
-    Return:
-        outline: "wide"
-        icon: "key-enter"
-        keysym: "Return"
-    colon:
-        text: ":"
-    "\"":
-        keysym: "quotedbl"
--- a/data/keyboards/il.yaml
+++ b/data/keyboards/il.yaml
@ -1,71 +0,0 @@
---
-outlines:
-    default: { width: 40, height: 60 }
-    altline: { width: 56, height: 60 }
-    wide: { width: 62, height: 60 }
-    spaceline: { width: 142, height: 60 }
-    special: { width: 44, height: 60 }
-
-views:
-    base:
-        - "' - ק  ר א ט ו ן ם פ"
-        - "ש ד ג כ ע י ח ל ך ף"
-        - "ז ס ב ה נ מ צ ת ץ  BackSpace"
-        - "show_numbers comma 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:
-    BackSpace:
-        outline: "default"
-        icon: "edit-clear-symbolic"
-        action: erase
-    comma:
-        outline: "special"
-        text: ","
-        
-    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/ir.yaml
+++ b/data/keyboards/ir.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:
-        - "ض ص ق ف غ ع ه خ ح ج"
-        - "ش س ی ب ل ا ت ن م ک"
-        - "Shift_L   ظ ط ز ر ذ د و  BackSpace"
-        - "show_numbers preferences         space        period Return"
-    upper:
-        - "پ { } [ ] ّ   َ   ِ  ُ چ"
-        - "ؤ‌ ئ ي‌ إ أ آ ة‌ » « گ"
-        - "Shift_L  ك ٓ ژ ء > < ؟  BackSpace"
-        - "show_numbers preferences         space        period Return"
-    numbers:
-        - "۱ ۲ ۳ ۴ ۵ ۶ ۷ ۸ ۹ ۰"
-        - "@ # ﷼ % & - _ + ( )"
-        - "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/ir_wide.yaml
+++ b/data/keyboards/ir_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:
-        - "ض ص ق ف غ ع ه خ ح ج"
-        - "ش س ی ب ل ا ت ن م ک"
-        - "Shift_L   ظ ط ز ر ذ د و  BackSpace"
-        - "show_numbers preferences         space        period Return"
-    upper:
-        - "پ { } [ ] ّ   َ   ِ  ُ چ"
-        - "ؤ‌ ئ ي‌ إ أ آ ة‌ » « گ"
-        - "Shift_L  ك ٓ ژ ء > < ؟  BackSpace"
-        - "show_numbers preferences         space        period Return"
-    numbers:
-        - "۱ ۲ ۳ ۴ ۵ ۶ ۷ ۸ ۹ ۰"
-        - "@ # ﷼ % & - _ + ( )"
-        - "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: "*/="
-    ".":
-        outline: "special"
-        text: "."
-    space:
-        outline: "spaceline"
-        text: " "
-    Return:
-        outline: "wide"
-        icon: "key-enter"
-        keysym: "Return"
-    colon:
-        text: ":"
--- a/data/keyboards/it+fur.yaml
+++ b/data/keyboards/it+fur.yaml
@ -1,89 +0,0 @@
-# Friulian layout created by Fabio Tomat
-# 14 october 2020
---
-outlines:
-    default: { width: 35.33, height: 52 }
-    altline: { width: 52.67, height: 52 }
-    wide: { width: 62, height: 52 }
-    spaceline: { width: 99.67, height: 52 }
-    special: { width: 44, height: 52 }
-
-views:
-    base:
-        - "q w e r t y u i o p"
-        - "a s d f g h j k l"
-        - "Shift_L   z x c v b n m  BackSpace"
-        - "show_numbers show_eschars preferences         space        , . Return"
-    upper:
-        - "Q W E R T Y U I O P"
-        - "A S D F G H J K L"
-        - "Shift_L   Z X C V B N M  BackSpace"
-        - "show_numbers show_eschars preferences         space        “ ” Return"
-    numbers:
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "@ # € % & - _ + ( )"
-        - "show_symbols   , \" ' : ; ! =  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_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:
-            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/it.yaml
+++ b/data/keyboards/it.yaml
@ -13,22 +13,22 @@ views:
        - "q w e r t y u i o p"
        - "a s d f g h j k l"
        - "Shift_L   z x c v b n m  BackSpace"
-        - "show_numbers show_eschars preferences         space        , . Return"
+        - "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        ? . Return"
+        - "show_numbers show_eschars preferences         space        ? period Return"
    numbers:
        - "1 2 3 4 5 6 7 8 9 0"
        - "@ # € % & - _ + ( )"
-        - "show_symbols   , \" ' : ; ! ?  BackSpace"
-        - "show_letters show_eschars preferences         space        ? . Return"
+        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
+        - "show_letters show_eschars preferences         space        ? period Return"
    symbols:
        - "~ ` | · √ π τ ÷ × ¶"
        - "© ® £ $ ¥ ^ ° * { }"
        - "show_numbers   \\ / < > = [ ]  BackSpace"
-        - "show_letters show_eschars preferences         space        ? . Return"
+        - "show_letters show_eschars preferences         space        ? period Return"
    eschars:
        - "á é í ó ú Á É Í Ó Ú"
        - "à è ì ò « » ù ! { }"
@ -46,7 +46,7 @@ buttons:
    BackSpace:
        outline: "altline"
        icon: "edit-clear-symbolic"
-        action: "erase"
+        keysym: "BackSpace"
    preferences:
        action: "show_prefs"
        outline: "default"
@ -76,12 +76,17 @@ buttons:
            set_view: "eschars"
        outline: "altline"
        label: "àè"
+    period:
+        outline: "default"
+        label: "."
    space:
        outline: "spaceline"
        label: " "
-        text: " "
    Return:
        outline: "altline"
        icon: "key-enter"
        keysym: "Return"
-
+    colon:
+        label: ":"
+    "\"":
+        keysym: "quotedbl"
--- a/data/keyboards/jp+kana.yaml
+++ b/data/keyboards/jp+kana.yaml
@ -195,7 +195,7 @@ buttons:
    BackSpace:
        outline: "wide"
        icon: "edit-clear-symbolic"
-        action: erase
+        keysym: "BackSpace"
    Return:
        outline: "wide"
        icon: "key-enter"
--- a/data/keyboards/jp+kana_wide.yaml
+++ b/data/keyboards/jp+kana_wide.yaml
@ -195,7 +195,7 @@ buttons:
    BackSpace:
        outline: "wide"
        icon: "edit-clear-symbolic"
-        action: erase
+        keysym: "BackSpace"
    Return:
        outline: "wide"
        icon: "key-enter"
--- a/data/keyboards/no.yaml
+++ b/data/keyboards/no.yaml
@ -2,9 +2,9 @@
 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 }
+    wide: { width: 62, height: 52 }
+    outline7: { width: 88.97561, height: 52 }
+    spaceline: { width: 150.5853, height: 52 }

 views:
    base:
@ -25,7 +25,7 @@ views:
    symbols:
        - "~ ` | U00B7 squareroot Greek_pi Greek_tau division multiply paragraph"
        - "copyright U00AE U00A3 EuroSign U00A5 asciicircum degree * { }"
-        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
+        - "show_numbers   \\ / < > = [ ]  BackSpace"
        - "show_letters preferences         space        .    Return"

 buttons:
@ -39,25 +39,20 @@ buttons:
    BackSpace:
        outline: "altline"
        icon: "edit-clear-symbolic"
-        action: erase
+        keysym: "BackSpace"
    preferences:
        action: "show_prefs"
-        outline: "special"
+        outline: "altline"
        icon: "keyboard-mode-symbolic"
    show_numbers:
        action:
            set_view: "numbers"
-        outline: "wide"
-        label: "123"
-    show_numbers_from_symbols:
-        action:
-            set_view: "numbers"
-        outline: altline
+        outline: "altline"
        label: "123"
    show_letters:
        action:
            set_view: "base"
-        outline: "wide"
+        outline: "altline"
        label: "ABC"
    show_symbols:
        action:
@ -65,7 +60,7 @@ buttons:
        outline: "altline"
        label: "*/="
    ".":
-        outline: "special"
+        outline: altline
    space:
        outline: spaceline
        text: " "
--- a/data/keyboards/number.yaml
+++ b/data/keyboards/number.yaml
@ -16,7 +16,7 @@ buttons:
    BackSpace:
        outline: "altline"
        icon: "edit-clear-symbolic"
-        action: erase
+        keysym: "BackSpace"
    space:
        outline: spaceline
        text: " "
--- a/data/keyboards/pl.yaml
+++ b/data/keyboards/pl.yaml
@ -1,114 +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"
-                looks_locked_from:
-                    - "upper"
-        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"
-                looks_locked_from:
-                    - "accents"
-        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
@ -2,10 +2,9 @@
 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 }
- 
+    wide: { width: 62, height: 52 }
+    outline7: { width: 88.97561, height: 52 }
+    spaceline: { width: 150.5853, height: 52 }

 views:
    base:
@ -26,7 +25,7 @@ views:
    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_numbers   backslash slash less greater equal bracketleft bracketright  BackSpace"
        - "show_letters preferences         space        .    Return"

 buttons:
@ -38,27 +37,22 @@ buttons:
        outline: "altline"
        icon: "key-shift"
    BackSpace:
-        outline: altline
+        outline: "altline"
        icon: "edit-clear-symbolic"
-        action: erase
+        keysym: "BackSpace"
    preferences:
        action: "show_prefs"
-        outline: "special"
+        outline: "altline"
        icon: "keyboard-mode-symbolic"
    show_numbers:
-        outline: "wide"
        action:
            set_view: "numbers"
-        label: "123"
-    show_numbers_from_symbols:
-        action:
-            set_view: "numbers"
-        outline: altline
+        outline: "altline"
        label: "123"
    show_letters:
-        outline: "wide"
        action:
            set_view: "base"
+        outline: "altline"
        label: "ABC"
    show_symbols:
        action:
@ -66,7 +60,7 @@ buttons:
        outline: "altline"
        label: "*/="
    ".":
-        outline: "special"
+        outline: altline
    space:
        outline: spaceline
        text: " "
@ -162,3 +156,4 @@ buttons:
        text: "["
    bracketright:
        text: "]"
+
--- a/data/keyboards/terminal.yaml
+++ b/data/keyboards/terminal.yaml
@ -1,44 +1,38 @@
 ---
 outlines:
-    default: { width: 35.33, height: 46 }
-    action:  { width: 59,    height: 46 }
-    altline: { width: 52.67, height: 46 }
-    wide: { width: 59, height: 46 }
-    spaceline: { width: 140, height: 46 }
-    special: { width: 44, height: 46 }
-    small: { width: 59, height: 22 }
+    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:
-        - "Ctrl Alt ↑ ↓ ← →"
        - "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:
-        - "Ctrl Alt PgUp PgDn Home End"
        - "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:
-        - "Ctrl Alt ↑ ↓ ← →"
        - "1 2 3 4 5 6 7 8 9 0"
-        - "* # $ / & - _ + ( )"
+        - "@ # $ % & - _ + ( )"
        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
        - "show_letters preferences         space        period Return"
    symbols:
-        - "Ctrl Alt ↑ ↓ ← →"
        - "~ ` | · √ π τ ÷ × ¶"
-        - "© ® £ € ¥ ^ ° @ { }"
-        - "show_numbers_from_symbols   \\ % < > = [ ]  BackSpace"
+        - "© ® £ € ¥ ^ ° * { }"
+        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
        - "show_letters preferences         space        period Return"
    actions:
-        - "Ctrl Alt PgUp PgDn Home End"
        - "F1  F2  F3  F4  F5  F6"
        - "F7  F8  F9  F10 F11 F12"
-        - "Esc Tab Pause Insert Up Del"
-        - "show_letters Menu Break Left Down Right"
+        - "Esc Tab Del PgUp ↑ PgDn"
+        - "show_letters Home End ← ↓ →"

 buttons:
    Shift_L:
@ -51,7 +45,7 @@ buttons:
    BackSpace:
        outline: "altline"
        icon: "edit-clear-symbolic"
-        action: erase
+        keysym: "BackSpace"
    preferences:
        action: "show_prefs"
        outline: "special"
@ -75,14 +69,14 @@ buttons:
        action:
            set_view: "symbols"
        outline: "altline"
-        label: "τ=\\"
+        label: "*/="
    show_actions:
        action:
            set_view: "actions"
        outline: "altline"
        label: ">_"
    period:
-        outline: "altline"
+        outline: "special"
        text: "."
    space:
        outline: "spaceline"
@ -138,67 +132,28 @@ buttons:
    Del:
        outline: "action"
        keysym: "Delete"
-    Insert:
-        outline: "action"
-        keysym: "Insert"
-    Menu:
-        outline: "action"
-        keysym: "Menu"
-    Pause:
-        outline: "action"
-        keysym: "Pause"
-    Menu:
-        outline: "action"
-        keysym: "Menu"
-    Break:
-        outline: "action"
-        keysym: "Break"
    Home:
-        outline: "small"
+        outline: "action"
        keysym: "Home"
    End:
-        outline: "small"
+        outline: "action"
        keysym: "End"
    PgUp:
-        outline: "small"
+        outline: "action"
        keysym: "Page_Up"
    PgDn:
-        outline: "small"
+        outline: "action"
        keysym: "Page_Down"
    "↑":
-        outline: "small"
+        outline: "action"
        keysym: "Up"
    "↓":
-        outline: "small"
+        outline: "action"
        keysym: "Down"
    "←":
-        outline: "small"
+        outline: "action"
        keysym: "Left"
    "→":
-        outline: "small"
-        keysym: "Right"
-    Up:
-        label: "↑"
-        outline: "action"
-        keysym: "Up"
-    Left:
-        label: "←"
-        outline: "action"
-        keysym: "Left"
-    Down:
-        label: "↓"
-        outline: "action"
-        keysym: "Down"
-    Right:
-        label: "→"
        outline: "action"
        keysym: "Right"
-    Ctrl:
-        modifier: "Control"
-        outline: "small"
-        label: "Ctrl"
-    Alt:
-        modifier: "Alt"
-        outline: "small"
-        label: "Alt"

--- a/data/keyboards/terminal_wide.yaml
+++ b/data/keyboards/terminal_wide.yaml
@ -1,211 +0,0 @@
---
-outlines:
-    default:   { width: 54,   height: 37 }
-    action:    { width: 90,   height: 37 }
-    altline:   { width: 81,   height: 37 }
-    wide:      { width: 90,   height: 37 }
-    spaceline: { width: 225,  height: 37 }
-    special:   { width: 54,   height: 37 }
-    small:     { width: 67.4, height: 22 }
-
-views:
-    base:
-        - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
-        - "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:
-        - "EscSmall TabSmall Ctrl Alt PgUp PgDn Home End"
-        - "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:
-        - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "* # $ / & - _ + ( )"
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
-        - "show_letters preferences         space        period Return"
-    symbols:
-        - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
-        - "~ ` | · √ π τ ÷ × ¶"
-        - "© ® £ € ¥ ^ ° @ { }"
-        - "show_numbers_from_symbols   \\ % < > = [ ]  BackSpace"
-        - "show_letters preferences         space        period Return"
-    actions:
-        - "EscSmall TabSmall Ctrl Alt PgUp PgDn Home End"
-        - "F1  F2  F3  F4  F5  F6"
-        - "F7  F8  F9  F10 F11 F12"
-        - "Esc Tab Pause Insert Up Del"
-        - "show_letters Menu Break Left Down Right"
-
-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"
-    EscSmall:
-        outline: "small"
-        keysym: "Escape"
-        label: "Esc"
-    Tab:
-        outline: "action"
-        keysym: "Tab"
-    TabSmall:
-        outline: "small"
-        keysym: "Tab"
-        label: "Tab"
-    Del:
-        outline: "action"
-        keysym: "Delete"
-    Insert:
-        outline: "action"
-        keysym: "Insert"
-    Menu:
-        outline: "action"
-        keysym: "Menu"
-    Pause:
-        outline: "action"
-        keysym: "Pause"
-    Menu:
-        outline: "action"
-        keysym: "Menu"
-    Break:
-        outline: "action"
-        keysym: "Break"
-    Home:
-        outline: "small"
-        keysym: "Home"
-    End:
-        outline: "small"
-        keysym: "End"
-    PgUp:
-        outline: "small"
-        keysym: "Page_Up"
-    PgDn:
-        outline: "small"
-        keysym: "Page_Down"
-    "↑":
-        outline: "small"
-        keysym: "Up"
-    "↓":
-        outline: "small"
-        keysym: "Down"
-    "←":
-        outline: "small"
-        keysym: "Left"
-    "→":
-        outline: "small"
-        keysym: "Right"
-    Up:
-        label: "↑"
-        outline: "action"
-        keysym: "Up"
-    Left:
-        label: "←"
-        outline: "action"
-        keysym: "Left"
-    Down:
-        label: "↓"
-        outline: "action"
-        keysym: "Down"
-    Right:
-        label: "→"
-        outline: "action"
-        keysym: "Right"
-    Ctrl:
-        modifier: "Control"
-        outline: "small"
-        label: "Ctrl"
-    Alt:
-        modifier: "Alt"
-        outline: "small"
-        label: "Alt"
--- a/data/keyboards/th.yaml
+++ b/data/keyboards/th.yaml
@ -1,80 +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:
-        - "ๅ / _ ภ ถ ุ ึ ค ต จ ข ช"
-        - "ๆ ไ ำ พ ะ ั ี ร น ย บ ล"
-        - "ฟ ห ก ด เ ้ ่ า ส ว ง ฃ"
-        - "Shift_L   ผ ป แ อ ิ ื ท ม ใ ฝ   BackSpace"
-        - "show_numbers preferences         space        period Return"
-    upper:
-        - "+ ๑ ๒ ๓ ๔ ู ฿ ๕ ๖ ๗ ๘ ๙"
-        - "๐ \" ฎ ฑ ธ ํ ๊ ณ ฯ ญ ฐ ,"
-        - "ฤ ฆ ฏ โ ฌ ็ ๋ ษ ศ ซ . ฅ"
-        - "Shift_L   ( ) ฉ ฮ ฺ ์ ? ฒ ฬ ฦ  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: "กขค"
-    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/th_wide.yaml
+++ b/data/keyboards/th_wide.yaml
@ -1,84 +0,0 @@
---
-outlines:
-    default: { width: 75, height: 56 }
-    altline: { width: 75, height: 56 }
-    wide: { width: 135, height: 56 }
-    spaceline: { width: 450, height: 56 }
-    spacelinesymbol: { width: 300, height: 56 }
-    special: { width: 90, height: 56 }
-
-views:
-    base:
-        - "ๅ / _ ภ ถ ุ ึ ค ต จ ข ช"
-        - "ๆ ไ ำ พ ะ ั ี ร น ย บ ล"
-        - "ฟ ห ก ด เ ้ ่ า ส ว ง ฃ"
-        - "Shift_L   ผ ป แ อ ิ ื ท ม ใ ฝ   BackSpace"
-        - "show_numbers preferences         space        period Return"
-    upper:
-        - "+ ๑ ๒ ๓ ๔ ู ฿ ๕ ๖ ๗ ๘ ๙"
-        - "๐ \" ฎ ฑ ธ ํ ๊ ณ ฯ ญ ฐ ,"
-        - "ฤ ฆ ฏ โ ฌ ็ ๋ ษ ศ ซ . ฅ"
-        - "Shift_L   ( ) ฉ ฮ ฺ ์ ? ฒ ฬ ฦ  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         spacesymbol        period Return"
-    symbols:
-        - "~ ` | · √ π τ ÷ × ¶"
-        - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         spacesymbol        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: "กขค"
-    show_symbols:
-        action:
-            set_view: "symbols"
-        outline: "altline"
-        label: "*/="
-    period:
-        outline: "special"
-        text: "."
-    space:
-        outline: "spaceline"
-        text: " "
-    spacesymbol:
-        outline: "spacelinesymbol"
-        text: " "
-    Return:
-        outline: "wide"
-        icon: "key-enter"
-        keysym: "Return"
-    colon:
-        text: ":"
--- a/data/keyboards/ua.yaml
+++ b/data/keyboards/ua.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/us+colemak.yaml
+++ b/data/keyboards/us+colemak.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 f p g j l u y"
-        - "a r s t d h n e i o"
-        - "Shift_L   z x c v b k m  BackSpace"
-        - "show_numbers preferences         space        period Return"
-    upper:
-        - "Q W F P G J L U Y"
-        - "A R S T D H N E I O"
-        - "Shift_L   Z X C V B K 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+colemak_wide.yaml
+++ b/data/keyboards/us+colemak_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 f p g j l u y"
-        - "a r s t d h n e i o"
-        - "Shift_L   z x c v b k m  BackSpace"
-        - "show_numbers preferences         space        . Return"
-    upper:
-        - "Q W F P G J L U Y"
-        - "A R S T D H N E I O"
-        - "Shift_L   Z X C V B K 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/keyboards/us+dvorak.yaml
+++ b/data/keyboards/us+dvorak.yaml
@ -1,89 +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:
-        - "Shift_L   p y f g c r l  BackSpace"
-        - "a o e u i d h t n s"
-        - ", q j k x b m w v z"
-        - "show_numbers preferences         space        period Return"
-    upper:
-        - "Shift_L   P Y F G C R L  BackSpace"
-        - "A O E U I D H T N S"
-        - ", Q J K X B M W V Z"
-        - "show_numbers preferences         space        period Return"
-    numbers:
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
-        - "* # $ / & - _ + ( )"
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "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: ":"
-
-# The US QWERTY layout has fewer letters on the third row, and so has
-# the shift & backspace keys placed there. In contrast, the US DVORAK
-# layout has fewer letters on the first row, which makes it a good
-# choice for the shift & backspace keys. That leads to what may be,
-# for many people, an unexpected layout in numbers mode: the numerals
-# are on the third row (not the first) so that the backspace key
-# remains in a consistent location regardless of mode, without
-# sacrificing key width. (Once could argue that in numbers mode, the
-# numerals should be closer to the enter key.) As with any keyboard
-# layout, familiarity comes with repeated use.
--- a/data/keyboards/us+dvorak_wide.yaml
+++ b/data/keyboards/us+dvorak_wide.yaml
@ -1,89 +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:
-        - "Shift_L   p y f g c r l  BackSpace"
-        - "a o e u i d h t n s"
-        - ", q j k x b m w v z"
-        - "show_numbers preferences         space        period Return"
-    upper:
-        - "Shift_L   P Y F G C R L  BackSpace"
-        - "A O E U I D H T N S"
-        - ", Q J K X B M W V Z"
-        - "show_numbers preferences         space        period Return"
-    numbers:
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
-        - "* # $ / & - _ + ( )"
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "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: ":"
-
-# The US QWERTY layout has fewer letters on the third row, and so has
-# the shift & backspace keys placed there. In contrast, the US DVORAK
-# layout has fewer letters on the first row, which makes it a good
-# choice for the shift & backspace keys. That leads to what may be,
-# for many people, an unexpected layout in numbers mode: the numerals
-# are on the third row (not the first) so that the backspace key
-# remains in a consistent location regardless of mode, without
-# sacrificing key width. (Once could argue that in numbers mode, the
-# numerals should be closer to the enter key.) As with any keyboard
-# layout, familiarity comes with repeated use.
--- a/data/keyboards/us.yaml
+++ b/data/keyboards/us.yaml
@ -39,9 +39,9 @@ buttons:
    BackSpace:
        outline: "altline"
        icon: "edit-clear-symbolic"
-        action: erase
+        keysym: "BackSpace"
    preferences:
-        action: show_prefs
+        action: "show_prefs"
        outline: "special"
        icon: "keyboard-mode-symbolic"
    show_numbers:
--- a/data/keyboards/us_wide.yaml
+++ b/data/keyboards/us_wide.yaml
@ -39,7 +39,7 @@ buttons:
    BackSpace:
        outline: "altline"
        icon: "edit-clear-symbolic"
-        action: "erase"
+        keysym: "BackSpace"
    preferences:
        action: "show_prefs"
        outline: "special"
--- a/data/langs/bg-BG.txt
+++ b/data/langs/bg-BG.txt
@ -1,13 +0,0 @@
-bg Български
-de Немски
-es Испански
-emoji Емоджи
-fi Френски
-gr Гръцки
-it Италянски
-no Норевежки
-pl Полски
-ru Руски
-se Шведски
-terminal Терминал
-us Английски (САЩ)
--- a/data/langs/cs-CZ.txt
+++ b/data/langs/cs-CZ.txt
@ -1,21 +0,0 @@
-be Belgická
-cz Česká
-cz+qwerty Česká (QWERTY)
-de Německá
-dk Dánská
-emoji Emoji
-es Španělská
-fi Finská
-fr Francouzská
-gr Řecká
-it Italská
-jp Japonská
-jp+kana Japonská (Kana)
-no Norská
-pl Polská
-ru Ruská
-se Švédská
-terminal Terminál
-th Thajská
-ua Ukrajinská
-us Anglická (USA)
--- a/data/langs/de-DE.txt
+++ b/data/langs/de-DE.txt
@ -0,0 +1,8 @@
+us Englisch (US)
+de Deutsch
+el Griechisch
+es Spanisch
+it Italienisch
+jp+kana Japanisch (Kana)
+no Norwegisch
+
--- a/data/langs/en-US.txt
+++ b/data/langs/en-US.txt
@ -1,2 +1,10 @@
-emoji Emoji
-terminal Terminal
+us English (US)
+de German
+el Greek
+es Spanish
+fi Finnish
+it Italian
+jp+kana Japanese (kana)
+no Norwegian
+se Swedish
+
--- a/data/langs/fa-IR.txt
+++ b/data/langs/fa-IR.txt
@ -1,2 +0,0 @@
-emoji ایموجی
-terminal ترمینال
--- a/data/langs/fur-IT.txt
+++ b/data/langs/fur-IT.txt
@ -1,18 +0,0 @@
-be Belgjic
-br Brasilian
-de Todesc
-dk Danês
-es Spagnûl
-fi Finlandês
-fr Francês
-it+fur Furlan
-gr Grêc
-it Talian
-jp+kana Gjaponês (Kana)
-no Norvegjês
-pl Polac
-ru Rus
-se Svedês
-terminal Terminâl
-ua Ucrain
-us American (USA)
--- a/data/langs/he-IL.txt
+++ b/data/langs/he-IL.txt
@ -1,19 +0,0 @@
-be בלגית
-br פורטוגזית (ברזיל)
-cz צ'כית
-de גרמנית
-dk דנית
-es ספרדית
-emoji אימוג'י
-fi פינית
-fr צרפתית
-gr יוונית
-il עברית
-it איטלקית
-no נורווגית
-pl פולנית
-ru רוסית
-se שוודית
-terminal טרמינל
-ua אוקראינית
-us אנגלית (ארה"ב)
--- a/data/langs/ja-JP.txt
+++ b/data/langs/ja-JP.txt
@ -0,0 +1,8 @@
+us 英語 (US)
+de ドイツ語
+el ギリシャ語
+es スペイン語
+it イタリア語
+jp+kana 日本語 (かな)
+nb ノルウェー語
+
--- a/data/langs/pl-PL.txt
+++ b/data/langs/pl-PL.txt
@ -1,2 +1,9 @@
-emoji emoji
-terminal terminal
+us angielski (USA)
+de niemiecki
+el grecki
+es hiszpański
+fi fiński
+it włoski
+jp+kana japoński (kana)
+no norweski
+se szwedzki
--- a/data/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
@ -7,20 +7,13 @@ squeekboard_resources = gnome.compile_resources(
   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
-    ),
+    input: desktop_file + '.in',
    output: desktop_file,
    po_dir: '../po',
    install: true,
-    install_dir: desktopdir,
+    install_dir: join_paths(datadir, 'applications'),
    type: 'desktop'
 )
--- a/data/sm.puri.Squeekboard.desktop.in.in
+++ b/data/sm.puri.Squeekboard.desktop.in.in
@ -2,7 +2,7 @@
 Name=Squeekboard
 GenericName=Squeekboard Virtual Keyboard
 Comment=Virtual Keyboard
-Exec=@bindir@/squeekboard
+Exec=squeekboard
 Terminal=false
 Type=Application
 NoDisplay=true
--- a/data/style-Adwaita:dark.css
+++ b/data/style-Adwaita:dark.css
@ -31,24 +31,15 @@ sq_button.wide {
    border-color: #3e3a44;
 }

-sq_button.latched {
+sq_button.locked {
    background: #ffffff;
    color: #2b292f;
 }

-sq_button.locked {
-    background: #ffffff;
-    color: #1c71d8;
-}
-
 sq_button.action {
    font-size: 0.75em;
 }

-sq_button.small {
-    font-size: 0.5em;
-}
-
 #Return {
    background: #1c71d8;
    border-color: #1a5fb4;
--- a/data/style.css
+++ b/data/style.css
@ -34,24 +34,15 @@ sq_button.wide {
    border-color: @borders; /* #3e3a44; */
 }

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

-sq_button.locked {
-    background: @theme_fg_color; /*#ffffff;*/
-    color: mix(@theme_selected_bg_color, @theme_bg_color, 0.4); /*#2b292f;*/
-}
-
 sq_button.action {
    font-size: 0.75em;
 }

-sq_button.small {
-    font-size: 0.5em;
-}
-
 #Return {
    background: @theme_selected_bg_color; /* #1c71d8; */
    border-color: @borders; /*#1a5fb4;*/
--- a/debian/changelog
+++ b/debian/changelog
@ -1,303 +1,3 @@
-squeekboard (1.12.0pureos0~amber0) amber-phone; urgency=medium
-
-  [ Dorota Czaplejewicz ]
-  * docs: Correct Cargo update instructions
-  * visibility: Centralize keyboard panel visibility policy and handling
-  * build: Fix release
-  * tests: Prefer the env var for finding test layouts
-  * tests: Explicitly pass source directory to tests
-  * debian: Build reproducibly
-  * tests: Allow legacy mode to have much longer tests.
-  * build: Enable unused warnings in C
-  * build: Enable wformat to remove warnings about missing wformat
-  * build: Fail on any C warnings when strict
-  * data: Made data flow in fallback clearer
-  * data: Flattened layout fallback function
-  * layouts: Use base as fallback for alternative layouts
-  * layouts: Simplify the main flow of source list
-  * tests: Add some description to the list of tested layouts
-  * layout_names: Unmess the list of builtin layouts
-  * dbus: Reset hints if text input missing
-  * visibility: Stop calling GTK functions from the visibility manager
-
-  [ Wannaphong Phatthiyaphaibun ]
-  * Add thai keyboard
-  * Update resources.rs
-  * Update meson.build
-  * escape " on thai keyboard
-
-  [ clonex10100 ]
-  * Added US Colemak Keyboard Layout
-
-  [ Henry-Nicolas Tourneur ]
-  * d/rules: fix an FTBFS on mips64el with GOT > 64kb
-  * d/rules: export RUSTFLAGS only on architecture that needs it
-  * d/rules: export RUSTFLAGS only on architecture that needs it
-
-  [ Jiří Stránský ]
-  * Add Czech keyboard layouts
-
-  [ Stefan Grotz ]
-  * Esperanto keyboard
-
-  [ Vladimir ]
-  * Bulgarian language keyboard layout
-
-  [ Vladimir Stoilov ]
-  * bulgarian add translation and to needed lists
-  * Fix bulgarian layout size
-
-  [ Andreas Rönnquist ]
-  * no: Use wide button switching between numbers, symbols and base
-
-  [ jranaraki ]
-  * Farsi/Persian keyboard layout
-  * Farsi/Persian keyboard layout
-  * Added requirements to resources.rs and meson.build
-  * Updated the layout to provide more convenient and faster typing experience
-
- -- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>  Sun, 10 Jan 2021 09:43:42 +0000
-
-squeekboard (1.11.1) amber-phone; urgency=medium
-
-  [ Mark Müller ]
-  * keyboard: Fix semicolon in German layout
-  * keyboard: Move semicolon in German layout to numbers view replacing redundant comma key
-
-  [ Dorota Czaplejewicz ]
-  * imservice: Set up UI according to current needs when it shows up
-  * UI: Keep visibility factors in a central place
-  * cargo: Update deps
-
- -- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>  Sat, 21 Nov 2020 11:08:06 +0000
-
-squeekboard (1.11.0) amber-phone; urgency=medium
-
-  [ Dorota Czaplejewicz ]
-  * UI: Delay hiding only when leaving a text field
-  * ui: Cancel hiding delay when activity requested again
-  * Update dependencies
-
-  [ Fabio Tomat ]
-  * Update fur-IT.txt fix typo for Spanish
-
- -- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>  Sat, 14 Nov 2020 06:46:28 +0000
-
-squeekboard (1.10.0) amber-phone; urgency=medium
-
-  [ Dorota Czaplejewicz ]
-  * virtual_keyboard: Fix desynced modifiers state
-  * rust: Fix deprecation warnings
-  * docs: Tutorial syntax cleanups
-  * docs: Reorganize tutorial
-  * build: Error on repeating declarations
-  * keymap: Generate from symbol map, not layout
-  * data: Restore testability of action->keysym conversion
-  * syntax: Let older rustc understand symbolmap's lifetime
-  * debian: Insert a "breaks" for librem5-base < 24
-  * keymap: Keep keymap fd management in one place
-  * vkeyboard: Use a generic slice instead of a vector
-  * tests: Check for missing return in builtin layouts except emoji
-  * keymap: Concentrate special handling of BackSpace, which is implicit in Erase action
-  * keymaps: Use multiple key maps, each within the limit of what Xorg can accept.
-  * build: Avoid MaybeUninit on older Debian
-  * tests: Fix bad field access
-  * cargo: Update dependencies
-
-  [ Guido Günther ]
-  * eekboard-context-service: Return early if schema is unavailable
-  * treewide: Use new style function definitions
-  * build: Enable '-Wold-style-definition' '-Wstrict-prototypes'
-  * build: Enable '-Wunused-function'
-  * eekboard-context-service: Drop EEKBOARD_CONTEXT_SERVICE_GET_PRIVATE
-  * keyboard: Fix warning
-  * layout: Fix warning
-  * gitlab-ci: Enable --Werror
-  * eek-keyboard: Don't ignore return value
-  * build: Enable -Winit-self
-  * build: Enable -Wformat-security
-  * build: Enable -Wmaybe-uninitialized
-  * treewide: Drop redundant declarations
-  * build: Enable -Wredundant-declarations
-  * ServerContextService: Drop GObject boilerplate
-  * build: Enable '-Wformat-nonliteral'
-  * eekboad-context-service: Drop signal class handler
-  * eekboard-context-service: Drop docstrings for inexistent functions
-  * eekboard-context-service: Drop the GObject boilerplate
-  * eekboard-context-service: Drop private struct
-  * server-context-service: Consistenty name self argument 'self'
-  * server-context-service: swap signal arguments
-  * server-context-service: Don't show keyboard when disabled (Closes: #222)
-
-  [ Nazarii Kretovych ]
-  * Add Ukrainian keyboard layout.
-
-  [ Benjamin Schaaf ]
-  * Fix spelling mistakes in doc/hacking.md
-  * Expand the development documentation in the readme
-  * Expand key press detection to the edges of the view's bounding box
-  * Sort layouts by type before sorting by name
-  * Fix leak in level_keyboard_new
-  * Fix leak endlessly adding a resource path to the default theme
-  * Add settings option to popover
-
-  [ Al ]
-  * proposal for belgian layout (copy of fr)
-  * alphabetical order for src/resources.rs tests/meson.build
-
-  [ Arnaud Ferraris ]
-  * eek-gtk-keyboard: use virtual resolution to check arrangement kind
-  * server-context-service: optimize height calculation
-  * keyboards: add wide French layout
-  * keyboards: add wide Belgian layout
-  * keyboards: add wide terminal layout
-
-  [ Fabio Tomat ]
-  * Revert "Add friulian keyboard"
-
- -- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>  Mon, 19 Oct 2020 14:07:01 +0000
-
-squeekboard (1.9.3) amber-phone; urgency=medium
-
-  [ Björn Tantau ]
-  * Show more useful keys at the same time.
-  * Add Ctrl and Alt modifier keys.
-  * Add missing Ê key.
-  * Make f-keys slightly wider.
-  * Add Menu key.
-
-  [ Guido Günther ]
-  * d/rules: Only remove Cargo.lock if it exists
-  * eek: Drop libcanberra usage
-  * debian: Build-depend on libfeedback
-  * eek-gtk-keyboard: Trigger event feedback on button press (Closes: #166)
-
-  [ Dorota Czaplejewicz ]
-  * build: Add missing gio-unix dependency
-  * build: Make compatible with Debian Bullseye
-  * debian: Add amber to legacy distro list
-  * ci: Add amber job
-  * debian: Require lsb-release
-  * size: Hardcode size to work around screen rotation
-  * ci: Re-add x64 Buster build
-  * italian: Fix space and period
-
-  [ Sebastian Krzyszkowiak ]
-  * Revert "Merge branch 'btantau-master-patch-76686' into 'master'"
-  * Terminal layout: another approach
-
-  [ Luís Fernando Stürmer da Rosa ]
-  * Brazilian Portuguese Keyboard Layout.
-
- -- Sebastian Krzyszkowiak <sebastian.krzyszkowiak@puri.sm>  Wed, 05 Aug 2020 16:16:08 +0200
-
-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 ]
--- a/debian/check_release.py
+++ b/debian/check_release.py
@ -1,11 +0,0 @@
-#!/usr/bin/env python3
-
-"""Checks tag before release.
-Feed it the first changelog line, and then all available tags.
-"""
-
-import re, sys
-version = re.findall("\\((.*)\\)", input())[0]
-tag = 'v' + re.findall("([0-9]+\\.[0-9]+\\.[0-9]+).*", version)[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 +1 @@
-12
+10
--- a/debian/control
+++ b/debian/control
@ -11,7 +11,7 @@ Build-Depends:
 libglib2.0-dev,
 libgnome-desktop-3-dev,
 libgtk-3-dev,
- libfeedback-dev,
+ libcroco3-dev,
 librust-bitflags-1-dev (>= 1.0),
 librust-clap-2+default-dev (>= 2.32),
 librust-gio+v2-44-dev,
@ -25,8 +25,6 @@ Build-Depends:
 librust-serde-yaml-0.8-dev (>= 0.8),
 librust-xkbcommon-0.4+wayland-dev (>= 0.4),
 libwayland-dev (>= 1.16),
- lsb-release,
- python3,
 rustc,
 wayland-protocols (>= 1.14),
 Standards-Version: 4.1.3
@ -39,9 +37,6 @@ Depends:
 gnome-themes-extra-data,
 ${shlibs:Depends},
 ${misc:Depends},
-Breaks:
- librem5-base (<< 24),
- phosh (<= 0.10),
 Description: On-screen keyboard for Wayland
 Virtual keyboard supporting Wayland, built primarily for the Librem 5 phone.

--- a/debian/rules
+++ b/debian/rules
@ -2,42 +2,14 @@

 export CARGO_HOME = $(CURDIR)/debian/cargo
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-# the below avoids an FTBFS on mips64el with a GOT > 64kb
-DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
-ifeq ($(DEB_HOST_ARCH),mips64el)
- export RUSTFLAGS = -Ctarget-feature=+xgot
-endif
-
-# the below avoids an FTBFS on mips64el with a GOT > 64kb
-DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
-ifeq ($(DEB_HOST_ARCH),mips64el)
- xgot = -Ctarget-feature=+xgot
-else
- xgot = 
-endif
-
-# Don't use paths that may change between builds.
-# No need to care about $HOME
-# because Cargo will not place any source in ~/.cargo.
-# The build directory is a subdirectory of the source directory,
-# so it doesn't need to be explicitly taken care of.
-export RUSTFLAGS = --remap-path-prefix=$(CURDIR)=/remap-pwd $(xgot)
-
-
-distrel := $(shell lsb_release --codename --short)
-ifneq (,$(filter $(distrel),buster amber))
-	legacy = true
-else
-	legacy = false
-endif

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

 # The Debian version of linked-hash-map doesn't provide any hash,
 # causing Cargo to refuse to build with a crates.io copy
-override_dh_auto_configure:
-	[ ! -f Cargo.lock ] || rm Cargo.lock
-	dh_auto_configure -- -Dlegacy=$(legacy)
+build-arch:
+	rm Cargo.lock
+	dh $@ --builddirectory=_build --buildsystem=meson

 override_dh_autoreconf:
--- a/debian/squeekboard.install
+++ b/debian/squeekboard.install
@ -1,2 +1,2 @@
+tools/squeekboard-restyled usr/bin
 usr/bin/squeekboard /usr/bin
-usr/share/applications/sm.puri.Squeekboard.desktop
--- a/debian/squeekboard.user.service
+++ b/debian/squeekboard.user.service
@ -1,16 +0,0 @@
-[Unit]
-Description=Squeekboard - a Wayland virtual keyboard
-PartOf=graphical-session.target
-# Don't stop restarting the program
-StartLimitIntervalSec=0
-
-[Service]
-Environment="GTK_THEME=Adwaita:dark"
-ExecStart=/usr/bin/squeekboard
-
-Restart=on-failure
-RestartSec=3s
-
-[Install]
-WantedBy=graphical-session.target
-
--- a/doc/index.md
+++ b/doc/index.md
@ -5,23 +5,17 @@ Contents
 --------

 * [Tutorial](tutorial.md)
-* [Contributing](hacking.md)

 Introduction
 ------------

-Squeekboard is the on-screen keyboard for the Librem 5 phone. For information about building, look at the [README](https://source.puri.sm/Librem5/squeekboard/blob/master/README.md).
+Squeekboard is the on-screen keyboard for the Librem 5 phone. For more information, look at the [README](https://source.puri.sm/Librem5/squeekboard/blob/master/README.md).

 Layouts
 -------

-Squeekboard allows user-provided keyboard layouts. They can be created without recompiling the keyboard code. The [tutorial](tutorial.md) explains the process in detail.
+Squeekboard allows user-provided keyboard layouts. They can be created without recompiling the keyboard code. The [tutorial](/tutorial.md) explains the process in detail.

 Layouts are created using a text-based format, based on YAML.

 TODO: Provide a description of the format.
-
-Contributions
-------------
-
-Anyone is free to modify *squeekboard*. See the [contributing document](hacking.md).
--- a/doc/tutorial.md
+++ b/doc/tutorial.md
@ -1,92 +1,55 @@
-A guide to creating layouts
-===========================
+Kareema's guide to creating layouts
+===================================

-This guide is based on the original Kareema's [forum post](https://forums.puri.sm/t/translations-and-virtual-touch-keyboards-tracking-localization/7669/48).
+It’s long overdue to write a comprehensive guide how to add a keyboard layout from start. But unfortunately, I don’t have much time left ATM. A lot of information can be found in [this ](https://forums.puri.sm/t/using-non-latin-language-on-librem-5/7103/5) thread.

-It’s long overdue to write a comprehensive guide how to add a keyboard layout from start. But unfortunately, I don’t have much time left ATM. A lot of information can be found in [this](https://forums.puri.sm/t/using-non-latin-language-on-librem-5/7103/5) thread.
+So at least I will try to start writing a short how-to here and edit this post as I find the time. Hope this helps a bit - comments and corrections welcome.

-So at least I will try to start writing a short how-to here and edit this post as I find the time. Hope this helps a bit - comments and corrections [welcome](https://source.puri.sm/Librem5/squeekboard/-/merge_requests/)
+**Get one of the existing keyboard layouts**

-## Creating a new layout
-
-Creating a layout is easy. You don't need to recompile things, just edit and test. It's easiest to start with an existing layout.
-
-### Get one of the existing keyboard layouts
-
-* You can get one of the keyboards from the squeekboard git repository : [https://source.puri.sm/Librem5/squeekboard](https://source.puri.sm/Librem5/squeekboard)
-* The keyboard layouts are located in the subdirectory [`data/keyboards/`](https://source.puri.sm/Librem5/squeekboard/-/tree/master/data/keyboards) in the `.yaml` files
+* You can get one of the keyboards from the squeekboard git repository : [https://source.puri.sm/Librem5/squeekboard ](https://source.puri.sm/Librem5/squeekboard)
+* The keyboard layouts are located in the subdirectory `data/keyboard/` in the `.yaml` files
 * Take a look and try to understand them :slight_smile:

-
-### Creating the keyboard layout
-
-* To be written: For the time being, take a look at [Using non-latin language on Librem 5](https://forums.puri.sm/t/using-non-latin-language-on-librem-5/7103/5)
-* The correct name of the .yaml file can be found with the command 
-
-```
-gsettings get org.gnome.desktop.input-sources sources
-```
-
-The output should be something like this: `[('xkb', 'us'), ('xkb', 'de')]`
-So for example “de.yaml” would be the correct name for the German keyboard layout.
-
-If the name of your layout is not translated correctly in the list, you can fix it by adding it and recompiling Squeekboard.
-
-### Testing the layout
-
-Copy your yaml file to `~/.local/share/squeekboard/keyboards/` for testing purposes. From there it should get picked up by squeekboard automatically.
-
-You can also use the `test_layout` tool from the -devel package to check it for errors:
-
-```
-# squeekboard_test_layout ./mylayout.yaml
-Test result: OK
-```
-
-## Contributing your changes
-
-If you want to share your layout with the world, the best way is to submit it to the Squeekboard project. The workflow is similar to any other Gitlab-based project.
-
-Above all, your layout should be working, be tested, not break anything, and make sense.
-
-### Fork your own copy of squeekboard
+**Fork your own copy of squeekboard**

 * Best way would be to start with a fork of the squeekboard repository: Create a user account at https://source.puri.sm/, go the the squeekboard git repository, press “Fork” in the web interface. You can find further instructions [here](https://docs.gitlab.com/ee/user/project/repository/forking_workflow.html#creating-a-fork).
 * Clone your fork locally with `git clone` and use the uri of your forked repo there

-### Edit your keyboard and get it merged
+**Workflow to edit your keyboard and get it merged**

-* It may be useful to check out the [generic guide how the workflow to contribute works](https://developer.puri.sm/Librem5/Contact/Contributing.html)
+* A generic guide how the workflow to contribute works, can be found at https://developer.puri.sm/Librem5/Contact/Contributing.html
 * Create a branch: Name it “keyboard-layout-mylanguage” or whatever
 * Checkout your branch, edit your keyboard layout and commit your changes
-* Your layout **must** be correctly named, and in `data/keyboards/`.
-* Your layout **must** pass the `test_layout` tool with zero problems.
-* Your translation **must** be correctly named, and in `data/langs/`.
-* Your layout or translation **must** be added to automatic tests. **Don’t forget to add it** to `src/resources.rs` and the layout to `tests/meson.build` (that’s for me, because I always forget it).
-
-### Get it merged
-
-It's always recommended to **compile and run** squeekboard before submitting your changes. This serves as a test that all is working. See instructions in the [compiling section](#compiling-and-running-squeekboard).
-
 * Push the local changes (to the branch of your fork of squeekboard)
 * Create a merge request for the branch to get your changes merged to the official squeekboard git repository

-If your changes pass automated tests (CI), then the merge request will be reviewed by the maintainers, and you might be asked to change a thing or two.
+**Compile squeekboard**

-## Compiling and running Squeekboard
+* Follow the instructions found in “Building” section of the squeekboard’s README: Running squeekboard: [https://source.puri.sm/Librem5/squeekboard/blob/master/README.md#building ](https://source.puri.sm/Librem5/squeekboard/blob/master/README.md#building)

-If you want your change to become part of official Squeekboard, or if you want to add a translation of your layout name, you will have to recompile Squeekboard and test your changes there.
+**Running squeekboard**

-### Compile squeekboard
-
-* Follow the instructions found in “Building” section of the squeekboard’s README: Running squeekboard: [https://source.puri.sm/Librem5/squeekboard/blob/master/README.md#building](https://source.puri.sm/Librem5/squeekboard/blob/master/README.md#building)
-
-### Run squeekboard
-
-* Follow these instructions to run squeekboard: [https://source.puri.sm/Librem5/squeekboard/blob/master/README.md#running](https://source.puri.sm/Librem5/squeekboard/blob/master/README.md#running)
-* Additionally take a look at the contribution document for [testing info](HACKING.md#testing)
-* You can either test it locally on your Linux system or use the [QEMU Librem 5 image](https://developer.puri.sm/Librem5/Development_Environment/Boards/emulators.html)
+* Follow these instructions to run squeekboard: [https://source.puri.sm/Librem5/squeekboard/blob/master/README.md#running ](https://source.puri.sm/Librem5/squeekboard/blob/master/README.md#running)
+* Additionally take a look at https://source.puri.sm/Librem5/squeekboard/blob/master/HACKING.md#testing
+* You can either test it locally on your Linux system or use the [QEMU Librem 5 image ](https://developer.puri.sm/Librem5/Development_Environment/Boards/emulators.html)
 * To test squeekboard locally, you need phoc. Either compile that from the sources as well or use the CI repository ci.puri.sm for Debian based systems:
  `deb [arch=amd64] http://ci.puri.sm/ scratch librem5`

 Squeekboard can be installed from there as a Debian package, too (that’s what I often do). But beware - there be dragons! You could bork your system with these packages and you should probably disable this repository again after installing what you need - these packages are not meant for production systems (or so I heard :wink: )
+
+**Creating the keyboard layout**
+
+* To be written: For the time being, take a look at [Using non-latin language on Librem 5 ](https://forums.puri.sm/t/using-non-latin-language-on-librem-5/7103/5)
+* The correct name of the .yaml file can be found with the command `gsettings get org.gnome.desktop.input-sources sources`
+
+The output should be something like this: `[('xkb', 'us'), ('xkb', 'de')]`
+So f.ex. “de.yaml” would be the correct name for the German keyboard layout.
+* The translations for the keyboard layout names in the different languages can be found at `data/langs/`
+* Don’t forget to add your newly created layout or translation to `src/resources.rs` and the layout to `tests/meson.build` (that’s for me, because I always forget it)
+
+**Testing the layout**
+
+* Copy your yaml file to `~/.local/share/squeekboard/keyboards/` for testing purposes. From there it should get picked up by squeekboard
+* To test the translations in `data/langs/` , you have to compile squeekboard
+
--- a/eek/eek-element.h
+++ b/eek/eek-element.h
@ -38,6 +38,8 @@ struct _EekElementClass
    GObjectClass parent_class;
 };

+GType        eek_element_get_type              (void) G_GNUC_CONST;
+
 void         eek_element_set_name              (EekElement  *element,
                                                const gchar *name);

--- a/eek/eek-gtk-keyboard.c
+++ b/eek/eek-gtk-keyboard.c
@ -25,6 +25,10 @@

 #include "config.h"

+#ifdef HAVE_LIBCANBERRA
+#include <canberra-gtk.h>
+#endif
+
 #include <math.h>
 #include <string.h>

@ -37,24 +41,25 @@
 #include "src/layout.h"
 #include "src/submission.h"

-#define LIBFEEDBACK_USE_UNSTABLE_API
-#include <libfeedback.h>
+enum {
+    PROP_0,
+    PROP_LAST
+};

-#define SQUEEKBOARD_APP_ID "sm.puri.squeekboard"
+/* since 2.91.5 GDK_DRAWABLE was removed and gdk_cairo_create takes
+   GdkWindow as the argument */
+#ifndef GDK_DRAWABLE
+#define GDK_DRAWABLE(x) (x)
+#endif

 typedef struct _EekGtkKeyboardPrivate
 {
-    EekRenderer *renderer; // owned, nullable
-    struct render_geometry render_geometry; // mutable
-
+    EekRenderer *renderer;
    EekboardContextService *eekboard_context; // unowned reference
    struct submission *submission; // unowned reference
-
-    struct squeek_layout_state *layout; // unowned
-    LevelKeyboard *keyboard; // unowned reference; it's kept in server-context
+    LevelKeyboard *keyboard; // unowned reference; it's kept in server-context (FIXME)

    GdkEventSequence *sequence; // unowned reference
-    LfbEvent *event;
 } EekGtkKeyboardPrivate;

 G_DEFINE_TYPE_WITH_PRIVATE (EekGtkKeyboard, eek_gtk_keyboard, GTK_TYPE_DRAWING_AREA)
@ -74,129 +79,74 @@ eek_gtk_keyboard_real_realize (GtkWidget      *self)
    GTK_WIDGET_CLASS (eek_gtk_keyboard_parent_class)->realize (self);
 }

-static void set_allocation_size(EekGtkKeyboard *gtk_keyboard,
-    struct squeek_layout *layout, gdouble width, gdouble height)
-{
-    // This is where size-dependent surfaces would be released
-    EekGtkKeyboardPrivate *priv =
-        eek_gtk_keyboard_get_instance_private (gtk_keyboard);
-    priv->render_geometry = eek_render_geometry_from_allocation_size(
-        layout, width, height);
-}
-
 static gboolean
 eek_gtk_keyboard_real_draw (GtkWidget *self,
                            cairo_t   *cr)
 {
-    EekGtkKeyboard *keyboard = EEK_GTK_KEYBOARD (self);
    EekGtkKeyboardPrivate *priv =
-        eek_gtk_keyboard_get_instance_private (keyboard);
+        eek_gtk_keyboard_get_instance_private (EEK_GTK_KEYBOARD (self));
    GtkAllocation allocation;
    gtk_widget_get_allocation (self, &allocation);

-    if (!priv->keyboard) {
-        return FALSE;
-    }
-
    if (!priv->renderer) {
        PangoContext *pcontext = gtk_widget_get_pango_context (self);

-        priv->renderer = eek_renderer_new (
-                    priv->keyboard,
-                    pcontext);
+        priv->renderer = eek_renderer_new (priv->keyboard, pcontext);

-        set_allocation_size (keyboard, priv->keyboard->layout,
-            allocation.width, allocation.height);
+        eek_renderer_set_allocation_size (priv->renderer,
+                                          allocation.width,
+                                          allocation.height);
        eek_renderer_set_scale_factor (priv->renderer,
                                       gtk_widget_get_scale_factor (self));
    }

-    eek_renderer_render_keyboard (priv->renderer, priv->render_geometry,
-        priv->submission, cr, priv->keyboard);
+    eek_renderer_render_keyboard (priv->renderer, cr);
    return FALSE;
 }

-// Units of virtual pixels size
-static enum squeek_arrangement_kind get_type(uint32_t width, uint32_t height) {
-    (void)height;
-    if (width < 540) {
-        return ARRANGEMENT_KIND_BASE;
-    }
-    return ARRANGEMENT_KIND_WIDE;
-}
-
 static void
 eek_gtk_keyboard_real_size_allocate (GtkWidget     *self,
                                     GtkAllocation *allocation)
 {
-    EekGtkKeyboard *keyboard = EEK_GTK_KEYBOARD (self);
    EekGtkKeyboardPrivate *priv =
-        eek_gtk_keyboard_get_instance_private (keyboard);
-    // check if the change would switch types
-    enum squeek_arrangement_kind new_type = get_type(
-                (uint32_t)(allocation->width - allocation->x),
-                (uint32_t)(allocation->height - allocation->y));
-    if (priv->layout->arrangement != new_type) {
-        priv->layout->arrangement = new_type;
-        uint32_t time = gdk_event_get_time(NULL);
-        eekboard_context_service_use_layout(priv->eekboard_context, priv->layout, time);
-    }
+        eek_gtk_keyboard_get_instance_private (EEK_GTK_KEYBOARD (self));

-    if (priv->renderer) {
-        set_allocation_size (keyboard, priv->keyboard->layout,
-            allocation->width, allocation->height);
-    }
+    if (priv->renderer)
+        eek_renderer_set_allocation_size (priv->renderer,
+                                          allocation->width,
+                                          allocation->height);

    GTK_WIDGET_CLASS (eek_gtk_keyboard_parent_class)->
        size_allocate (self, allocation);
 }

-static void
-on_event_triggered (LfbEvent      *event,
-                    GAsyncResult  *res,
-                    gpointer      unused)
-{
-    g_autoptr (GError) err = NULL;
-
-    if (!lfb_event_trigger_feedback_finish (event, res, &err)) {
-        g_warning ("Failed to trigger feedback for '%s': %s",
-                   lfb_event_get_event (event), err->message);
-    }
-}
-
 static void depress(EekGtkKeyboard *self,
                    gdouble x, gdouble y, guint32 time)
 {
    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
-    if (!priv->keyboard) {
-        return;
-    }
+
    squeek_layout_depress(priv->keyboard->layout,
                          priv->submission,
-                          x, y, priv->render_geometry.widget_to_layout, time, self);
+                          x, y, eek_renderer_get_transformation(priv->renderer), time, self);
 }

 static void drag(EekGtkKeyboard *self,
                 gdouble x, gdouble y, guint32 time)
 {
    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
-    if (!priv->keyboard) {
-        return;
-    }
-    squeek_layout_drag(eekboard_context_service_get_keyboard(priv->eekboard_context)->layout,
+    squeek_layout_drag(priv->keyboard->layout,
                       priv->submission,
-                       x, y, priv->render_geometry.widget_to_layout, time,
+                       x, y, eek_renderer_get_transformation(priv->renderer), time,
                       priv->eekboard_context, self);
 }

 static void release(EekGtkKeyboard *self, guint32 time)
 {
    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
-    if (!priv->keyboard) {
-        return;
-    }
-    squeek_layout_release(eekboard_context_service_get_keyboard(priv->eekboard_context)->layout,
-                          priv->submission, priv->render_geometry.widget_to_layout, time,
+
+    squeek_layout_release(priv->keyboard->layout,
+                          priv->submission,
+                          eek_renderer_get_transformation(priv->renderer), time,
                          priv->eekboard_context, self);
 }

@ -314,7 +264,7 @@ eek_gtk_keyboard_dispose (GObject *object)
    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);

    if (priv->renderer) {
-        eek_renderer_free(priv->renderer);
+        g_object_unref (priv->renderer);
        priv->renderer = NULL;
        priv->renderer = NULL;
    }
@ -327,11 +277,6 @@ eek_gtk_keyboard_dispose (GObject *object)
        priv->keyboard = NULL;
    }

-    if (priv->event) {
-        g_clear_object (&priv->event);
-        lfb_uninit ();
-    }
-
    G_OBJECT_CLASS (eek_gtk_keyboard_parent_class)->dispose (object);
 }

@ -363,99 +308,29 @@ eek_gtk_keyboard_class_init (EekGtkKeyboardClass *klass)
 static void
 eek_gtk_keyboard_init (EekGtkKeyboard *self)
 {
-    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (EEK_GTK_KEYBOARD (self));
-    g_autoptr(GError) err = NULL;
-
-    if (lfb_init(SQUEEKBOARD_APP_ID, &err)) {
-        priv->event = lfb_event_new ("button-pressed");
-    } else {
-        g_warning ("Failed to init libfeedback: %s", err->message);
-    }
-
-    GtkIconTheme *theme = gtk_icon_theme_get_default ();
-
-    gtk_icon_theme_add_resource_path (theme, "/sm/puri/squeekboard/icons");
-}
-
-static void
-on_notify_keyboard (GObject              *object,
-                    GParamSpec           *spec,
-                    EekGtkKeyboard *self) {
-    (void)spec;
-    EekGtkKeyboardPrivate *priv = (EekGtkKeyboardPrivate*)eek_gtk_keyboard_get_instance_private (self);
-    priv->keyboard = eekboard_context_service_get_keyboard(EEKBOARD_CONTEXT_SERVICE(object));
-    if (priv->renderer) {
-        eek_renderer_free(priv->renderer);
-    }
-    priv->renderer = NULL;
-    gtk_widget_queue_draw(GTK_WIDGET(self));
+    (void)self;
 }

 /**
+ * eek_gtk_keyboard_new:
+ * @keyboard: an #EekKeyboard
+ *
 * Create a new #GtkWidget displaying @keyboard.
 * Returns: a #GtkWidget
 */
 GtkWidget *
-eek_gtk_keyboard_new (EekboardContextService *eekservice,
-                      struct submission *submission,
-                      struct squeek_layout_state *layout)
+eek_gtk_keyboard_new (LevelKeyboard *keyboard, EekboardContextService *eekservice,
+                      struct submission *submission)
 {
    EekGtkKeyboard *ret = EEK_GTK_KEYBOARD(g_object_new (EEK_TYPE_GTK_KEYBOARD, NULL));
    EekGtkKeyboardPrivate *priv = (EekGtkKeyboardPrivate*)eek_gtk_keyboard_get_instance_private (ret);
+    priv->keyboard = keyboard;
    priv->eekboard_context = eekservice;
    priv->submission = submission;
-    priv->layout = layout;
-    priv->renderer = NULL;
-    // This should really be done on initialization.
-    // Before the widget is allocated,
-    // we don't really know what geometry it takes.
-    // When it's off the screen, we also kinda don't.
-    struct render_geometry initial_geometry = {
-        // Set to 100 just to make sure if there's any attempt to use it,
-        // it actually gives plausible results instead of blowing up,
-        // e.g. on zero division.
-        .allocation_width = 100,
-        .allocation_height = 100,
-        .widget_to_layout = {
-            .origin_x = 0,
-            .origin_y = 0,
-            .scale = 1,
-        },
-    };
-    priv->render_geometry = initial_geometry;
-
-    g_signal_connect (eekservice,
-                      "notify::keyboard",
-                      G_CALLBACK(on_notify_keyboard),
-                      ret);
-    on_notify_keyboard(G_OBJECT(eekservice), NULL, ret);
-    /* TODO: this is how a compound keyboard
-     * made out of a layout and a suggestion bar could start.
-     * GtkBox *box = GTK_BOX(gtk_box_new(GTK_ORIENTATION_VERTICAL, 0));
-    GtkEntry *fill = GTK_ENTRY(gtk_entry_new());
-    gtk_box_pack_start(box, GTK_WIDGET(fill), FALSE, FALSE, 0);
-    gtk_box_pack_start(box, GTK_WIDGET(ret), TRUE, TRUE, 0);
-    return GTK_WIDGET(box);*/
    return GTK_WIDGET(ret);
 }

-/**
- * eek_gtk_keyboard_emit_feedback:
- *
- * Emit button press haptic feedback via libfeedack.
- */
-void
-eek_gtk_keyboard_emit_feedback (EekGtkKeyboard *self)
-{
-    EekGtkKeyboardPrivate *priv;
-
-    g_return_if_fail (EEK_IS_GTK_KEYBOARD (self));
-
-    priv = eek_gtk_keyboard_get_instance_private (EEK_GTK_KEYBOARD (self));
-    if (priv->event) {
-        lfb_event_trigger_feedback_async (priv->event,
-                                          NULL,
-                                          (GAsyncReadyCallback)on_event_triggered,
-                                          NULL);
-    }
+EekRenderer *eek_gtk_keyboard_get_renderer(EekGtkKeyboard *self) {
+    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
+    return priv->renderer;
 }
--- a/eek/eek-gtk-keyboard.h
+++ b/eek/eek-gtk-keyboard.h
@ -28,11 +28,10 @@
 #include <glib.h>
 #include <gtk/gtk.h>

-#include "eek/eek-renderer.h"
 #include "eek/eek-types.h"

 struct submission;
-struct squeek_layout_state;
+typedef struct _LevelKeyboard LevelKeyboard; // including causes weird bugs

 G_BEGIN_DECLS
 #define EEK_TYPE_GTK_KEYBOARD (eek_gtk_keyboard_get_type())
@ -48,8 +47,8 @@ struct _EekGtkKeyboardClass
    gpointer pdummy[24];
 };

-GtkWidget *eek_gtk_keyboard_new       (EekboardContextService *eekservice, struct submission *submission, struct squeek_layout_state *layout);
-void       eek_gtk_keyboard_emit_feedback (EekGtkKeyboard *self);
+GType      eek_gtk_keyboard_get_type  (void) G_GNUC_CONST;
+GtkWidget *eek_gtk_keyboard_new       (LevelKeyboard *keyboard, EekboardContextService *eekservice, struct submission *submission);

 G_END_DECLS
 #endif  /* EEK_GTK_KEYBOARD_H */
--- a/eek/eek-keyboard.c
+++ b/eek/eek-keyboard.c
@ -21,7 +21,6 @@
 #include "config.h"

 #define _XOPEN_SOURCE 500
-#include <errno.h>
 #include <fcntl.h>
 #include <string.h>
 #include <sys/mman.h>
@ -31,31 +30,47 @@

 #include "eek-keyboard.h"

-/// External linkage for Rust.
-/// The corresponding deinit is implemented in vkeyboard::KeyMap::drop
-struct keymap squeek_key_map_from_str(const char *keymap_str) {
+void level_keyboard_free(LevelKeyboard *self) {
+    xkb_keymap_unref(self->keymap);
+    close(self->keymap_fd);
+    squeek_layout_free(self->layout);
+    g_free(self);
+}
+
+LevelKeyboard*
+level_keyboard_new (const gchar            *keyboard_type,
+                    enum squeek_arrangement_kind t)
+{
+    struct squeek_layout *layout = squeek_load_layout(keyboard_type, t);
+    LevelKeyboard *keyboard = g_new0(LevelKeyboard, 1);
+
+    if (!keyboard) {
+        g_error("Failed to create a keyboard");
+    }
+    keyboard->layout = layout;
+
    struct xkb_context *context = xkb_context_new(XKB_CONTEXT_NO_FLAGS);
    if (!context) {
        g_error("No context created");
    }

+    const gchar *keymap_str = squeek_layout_get_keymap(keyboard->layout);
+
    struct xkb_keymap *keymap = xkb_keymap_new_from_string(context, keymap_str,
        XKB_KEYMAP_FORMAT_TEXT_V1, XKB_KEYMAP_COMPILE_NO_FLAGS);

-    if (!keymap) {
+    if (!keymap)
        g_error("Bad keymap:\n%s", keymap_str);
-    }

    xkb_context_unref(context);
+    keyboard->keymap = keymap;

-    char *xkb_keymap_str = xkb_keymap_get_as_string(keymap, XKB_KEYMAP_FORMAT_TEXT_V1);
-    size_t keymap_len = strlen(xkb_keymap_str) + 1;
+    keymap_str = xkb_keymap_get_as_string(keymap, XKB_KEYMAP_FORMAT_TEXT_V1);
+    keyboard->keymap_len = strlen(keymap_str) + 1;

    g_autofree char *path = strdup("/eek_keymap-XXXXXX");
    char *r = &path[strlen(path) - 6];
-    if (getrandom(r, 6, GRND_NONBLOCK) < 0) {
-        g_error("Failed to get random numbers: %s", strerror(errno));
-    }
+    getrandom(r, 6, GRND_NONBLOCK);
    for (unsigned i = 0; i < 6; i++) {
        r[i] = (r[i] & 0b1111111) | 0b1000000; // A-z
        r[i] = r[i] > 'z' ? '?' : r[i]; // The randomizer doesn't need to be good...
@ -64,39 +79,17 @@ struct keymap squeek_key_map_from_str(const char *keymap_str) {
    if (keymap_fd < 0) {
        g_error("Failed to set up keymap fd");
    }
-
+    keyboard->keymap_fd = keymap_fd;
    shm_unlink(path);
-    if (ftruncate(keymap_fd, (off_t)keymap_len)) {
+    if (ftruncate(keymap_fd, (off_t)keyboard->keymap_len)) {
        g_error("Failed to increase keymap fd size");
    }
-    char *ptr = mmap(NULL, keymap_len, PROT_WRITE, MAP_SHARED,
+    char *ptr = mmap(NULL, keyboard->keymap_len, PROT_WRITE, MAP_SHARED,
        keymap_fd, 0);
    if ((void*)ptr == (void*)-1) {
        g_error("Failed to set up mmap");
    }
-    strncpy(ptr, xkb_keymap_str, keymap_len);
-    munmap(ptr, keymap_len);
-    free(xkb_keymap_str);
-    xkb_keymap_unref(keymap);
-    struct keymap km = {
-        .fd = keymap_fd,
-        .fd_len = keymap_len,
-    };
-    return km;
-}
-
-void level_keyboard_free(LevelKeyboard *self) {
-    squeek_layout_free(self->layout);
-    g_free(self);
-}
-
-LevelKeyboard*
-level_keyboard_new (struct squeek_layout *layout)
-{
-    LevelKeyboard *keyboard = g_new0(LevelKeyboard, 1);
-    if (!keyboard) {
-        g_error("Failed to create a keyboard");
-    }
-    keyboard->layout = layout;
+    strncpy(ptr, keymap_str, keyboard->keymap_len);
+    munmap(ptr, keyboard->keymap_len);
    return keyboard;
 }
--- a/eek/eek-keyboard.h
+++ b/eek/eek-keyboard.h
@ -1,17 +1,17 @@
-/*
+/* 
 * 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
@ -32,23 +32,23 @@

 G_BEGIN_DECLS

-/// Keymap container for Rust interoperability.
-struct keymap {
-    uint32_t fd; // keymap formatted as XKB string
-    size_t fd_len; // length of the data inside keymap_fd
-};
-
 /// Keyboard state holder
 struct _LevelKeyboard {
    struct squeek_layout *layout; // owned
-// FIXME: This no longer needs to exist, keymap was folded into layout.
+    struct xkb_keymap *keymap; // owned
+    int keymap_fd; // keymap formatted as XKB string
+    size_t keymap_len; // length of the data inside keymap_fd
+
+    guint id; // as a key to layout choices
 };
 typedef struct _LevelKeyboard LevelKeyboard;

-gchar *eek_keyboard_get_keymap(LevelKeyboard *keyboard);
+gchar *             eek_keyboard_get_keymap
+                                     (LevelKeyboard *keyboard);

 LevelKeyboard*
-level_keyboard_new (struct squeek_layout *layout);
+level_keyboard_new (const gchar            *keyboard_type,
+                    enum squeek_arrangement_kind t);
 void level_keyboard_free(LevelKeyboard *self);

 G_END_DECLS
--- a/eek/eek-renderer.c
+++ b/eek/eek-renderer.c
@ -18,6 +18,8 @@
 * 02110-1301 USA
 */

+#include "config.h"
+
 #include <math.h>
 #include <string.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
@ -26,11 +28,36 @@
 #include "eek-renderer.h"
 #include "src/style.h"

+enum {
+    PROP_0,
+    PROP_PCONTEXT,
+    PROP_LAST
+};
+
+typedef struct _EekRendererPrivate
+{
+    LevelKeyboard *keyboard; // unowned
+    PangoContext *pcontext; // owned
+    GtkCssProvider *css_provider; // owned
+    GtkStyleContext *view_context; // owned
+    GtkStyleContext *button_context; // TODO: maybe move a copy to each button
+
+    gdouble allocation_width;
+    gdouble allocation_height;
+    gint scale_factor; /* the outputs scale factor */
+    struct transformation widget_to_layout;
+} EekRendererPrivate;
+
+G_DEFINE_TYPE_WITH_PRIVATE (EekRenderer, eek_renderer, G_TYPE_OBJECT)

 /* eek-keyboard-drawing.c */
 static void render_button_label (cairo_t *cr, GtkStyleContext *ctx,
                                                const gchar *label, EekBounds bounds);

+void eek_render_button                         (EekRenderer *self,
+                                                cairo_t     *cr, const struct squeek_button *button,
+                                                gboolean     pressed, gboolean locked);
+
 static void
 render_outline (cairo_t     *cr,
                GtkStyleContext *ctx,
@ -54,21 +81,21 @@ render_outline (cairo_t     *cr,
        position.x, position.y, position.width, position.height);
 }

-/// Rust interface
-void eek_render_button_in_context(uint32_t scale_factor,
+static void render_button_in_context(gint scale_factor,
                                     cairo_t     *cr,
                                     GtkStyleContext *ctx,
-                                     EekBounds bounds,
-                                     const char *icon_name,
-                                     const gchar *label) {
+                                     const struct squeek_button *button) {
    /* blank background */
    cairo_set_source_rgba (cr, 0.0, 0.0, 0.0, 0.0);
    cairo_paint (cr);

+    EekBounds bounds = squeek_button_get_bounds(button);
    render_outline (cr, ctx, bounds);
    cairo_paint (cr);

    /* render icon (if any) */
+    const char *icon_name = squeek_button_get_icon_name(button);
+
    if (icon_name) {
        cairo_surface_t *icon_surface =
            eek_renderer_get_icon_surface (icon_name, 16, scale_factor);
@ -98,27 +125,27 @@ void eek_render_button_in_context(uint32_t scale_factor,
        }
    }

+    const gchar *label = squeek_button_get_label(button);
    if (label) {
-        render_button_label (cr, ctx, label, bounds);
+        render_button_label (cr, ctx, label, squeek_button_get_bounds(button));
    }
 }

-/// Prepare context for drawing the button.
-/// The context MUST be released using the corresponing "put" procedure
-/// before drawing the next button.
-/// Interface for Rust.
-GtkStyleContext *
-eek_get_style_context_for_button (EekRenderer *self,
-                                  const char *name,
-                                  const char *outline_name,
-                                  const char *locked_class,
-               uint64_t     pressed)
+void
+eek_render_button (EekRenderer *self,
+            cairo_t     *cr,
+            const struct squeek_button *button,
+               gboolean     pressed,
+               gboolean     locked)
 {
-    GtkStyleContext *ctx = self->button_context;
+    EekRendererPrivate *priv = eek_renderer_get_instance_private (self);
+
+    GtkStyleContext *ctx = priv->button_context;
    /* Set the name of the button on the widget path, using the name obtained
       from the button's symbol. */
    g_autoptr (GtkWidgetPath) path = NULL;
    path = gtk_widget_path_copy (gtk_style_context_get_path (ctx));
+    const char *name = squeek_button_get_name(button);
    gtk_widget_path_iter_set_name (path, -1, name);

    /* Update the style context with the updated widget path. */
@ -127,22 +154,19 @@ eek_get_style_context_for_button (EekRenderer *self,
       (pressed) or normal. */
    gtk_style_context_set_state(ctx,
        pressed ? GTK_STATE_FLAG_ACTIVE : GTK_STATE_FLAG_NORMAL);
-    if (locked_class) {
-        gtk_style_context_add_class(ctx, locked_class);
+    const char *outline_name = squeek_button_get_outline_name(button);
+    if (locked) {
+        gtk_style_context_add_class(ctx, "locked");
    }
    gtk_style_context_add_class(ctx, outline_name);
-    return ctx;
-}

-/// Interface for Rust.
-void eek_put_style_context_for_button(GtkStyleContext *ctx,
-                                      const char *outline_name,
-                                      const char *locked_class) {
+    render_button_in_context(priv->scale_factor, cr, ctx, button);
+
    // Save and restore functions don't work if gtk_render_* was used in between
    gtk_style_context_set_state(ctx, GTK_STATE_FLAG_NORMAL);
    gtk_style_context_remove_class(ctx, outline_name);
-    if (locked_class) {
-        gtk_style_context_remove_class(ctx, locked_class);
+    if (locked) {
+        gtk_style_context_remove_class(ctx, "locked");
    }
 }

@ -190,47 +214,118 @@ render_button_label (cairo_t     *cr,
    g_object_unref (layout);
 }

-// FIXME: Pass just the active modifiers instead of entire submission
 void
 eek_renderer_render_keyboard (EekRenderer *self,
-                              struct render_geometry geometry,
-                              struct submission *submission,
-                                   cairo_t     *cr,
-                              LevelKeyboard *keyboard)
+                                   cairo_t     *cr)
 {
-    g_return_if_fail (geometry.allocation_width > 0.0);
-    g_return_if_fail (geometry.allocation_height > 0.0);
+    EekRendererPrivate *priv = eek_renderer_get_instance_private (self);
+
+    g_return_if_fail (priv->keyboard);
+    g_return_if_fail (priv->allocation_width > 0.0);
+    g_return_if_fail (priv->allocation_height > 0.0);

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

    cairo_save(cr);
-    cairo_translate (cr, geometry.widget_to_layout.origin_x, geometry.widget_to_layout.origin_y);
-    cairo_scale (cr, geometry.widget_to_layout.scale, geometry.widget_to_layout.scale);
+    cairo_translate (cr, priv->widget_to_layout.origin_x, priv->widget_to_layout.origin_y);
+    cairo_scale (cr, priv->widget_to_layout.scale, priv->widget_to_layout.scale);

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

-void
-eek_renderer_free (EekRenderer        *self)
+static void
+eek_renderer_set_property (GObject      *object,
+                           guint         prop_id,
+                           const GValue *value,
+                           GParamSpec   *pspec)
 {
-    if (self->pcontext) {
-        g_object_unref (self->pcontext);
-        self->pcontext = NULL;
+    EekRendererPrivate *priv = eek_renderer_get_instance_private (
+            EEK_RENDERER(object));
+
+    switch (prop_id) {
+    case PROP_PCONTEXT:
+        priv->pcontext = g_value_get_object (value);
+        g_object_ref (priv->pcontext);
+        break;
+    default:
+        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+        break;
    }
-    g_object_unref(self->css_provider);
-    g_object_unref(self->view_context);
-    g_object_unref(self->button_context);
+}
+
+static void
+eek_renderer_get_property (GObject    *object,
+                           guint       prop_id,
+                           GValue     *value,
+                           GParamSpec *pspec)
+{
+    (void)value;
+    switch (prop_id) {
+    default:
+        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+        break;
+    }
+}
+
+static void
+eek_renderer_dispose (GObject *object)
+{
+    EekRenderer        *self = EEK_RENDERER (object);
+    EekRendererPrivate *priv = eek_renderer_get_instance_private (self);
+
+    if (priv->keyboard) {
+        priv->keyboard = NULL;
+    }
+    if (priv->pcontext) {
+        g_object_unref (priv->pcontext);
+        priv->pcontext = NULL;
+    }
+
    // this is where renderer-specific surfaces would be released

-    free(self);
+    G_OBJECT_CLASS (eek_renderer_parent_class)->dispose (object);
 }

+static void
+eek_renderer_finalize (GObject *object)
+{
+    EekRenderer        *self = EEK_RENDERER(object);
+    EekRendererPrivate *priv = eek_renderer_get_instance_private (self);
+
+    g_object_unref(priv->css_provider);
+    g_object_unref(priv->view_context);
+    g_object_unref(priv->button_context);
+    G_OBJECT_CLASS (eek_renderer_parent_class)->finalize (object);
+}
+
+static void
+eek_renderer_class_init (EekRendererClass *klass)
+{
+    GObjectClass      *gobject_class = G_OBJECT_CLASS (klass);
+    GParamSpec        *pspec;
+
+    gobject_class->set_property = eek_renderer_set_property;
+    gobject_class->get_property = eek_renderer_get_property;
+    gobject_class->dispose = eek_renderer_dispose;
+    gobject_class->finalize = eek_renderer_finalize;
+
+    pspec = g_param_spec_object ("pango-context",
+                                 "Pango Context",
+                                 "Pango Context",
+                                 PANGO_TYPE_CONTEXT,
+                                 G_PARAM_CONSTRUCT_ONLY | G_PARAM_WRITABLE);
+    g_object_class_install_property (gobject_class,
+                                     PROP_PCONTEXT,
+                                     pspec);
+}
+
+
 static GType new_type(char *name) {
    GTypeInfo info = {0};
    info.class_size = sizeof(GtkWidgetClass);
@ -241,7 +336,7 @@ static GType new_type(char *name) {
    );
 }

-static GType view_type(void) {
+static GType view_type() {
    static GType type = 0;
    if (!type) {
        type = new_type("sq_view");
@ -249,7 +344,7 @@ static GType view_type(void) {
    return type;
 }

-static GType button_type(void) {
+static GType button_type() {
    static GType type = 0;
    if (!type) {
        type = new_type("sq_button");
@ -258,78 +353,92 @@ static GType button_type(void) {
 }

 static void
-renderer_init (EekRenderer *self)
+eek_renderer_init (EekRenderer *self)
 {
-    self->pcontext = NULL;
-    self->scale_factor = 1;
+    EekRendererPrivate *priv = eek_renderer_get_instance_private (self);

-    self->css_provider = squeek_load_style();
+    priv->keyboard = NULL;
+    priv->pcontext = NULL;
+    priv->allocation_width = 0.0;
+    priv->allocation_height = 0.0;
+    priv->scale_factor = 1;
+
+    GtkIconTheme *theme = gtk_icon_theme_get_default ();
+
+    gtk_icon_theme_add_resource_path (theme, "/sm/puri/squeekboard/icons");
+
+    priv->css_provider = squeek_load_style();
 }

 EekRenderer *
 eek_renderer_new (LevelKeyboard  *keyboard,
                  PangoContext *pcontext)
 {
-    EekRenderer *renderer = calloc(1, sizeof(EekRenderer));
-    renderer_init(renderer);
-    renderer->pcontext = pcontext;
-    g_object_ref (renderer->pcontext);
+    EekRenderer *renderer = g_object_new (EEK_TYPE_RENDERER,
+                         "pango-context", pcontext,
+                         NULL);
+    EekRendererPrivate *priv = eek_renderer_get_instance_private (renderer);
+    priv->keyboard = keyboard;

    /* Create a style context for the layout */
    GtkWidgetPath *path = gtk_widget_path_new();
    gtk_widget_path_append_type(path, view_type());

-    renderer->view_context = gtk_style_context_new();
-    gtk_style_context_set_path(renderer->view_context, path);
+    priv->view_context = gtk_style_context_new();
+    gtk_style_context_set_path(priv->view_context, path);
    gtk_widget_path_unref(path);
-    if (squeek_layout_get_kind(keyboard->layout) == ARRANGEMENT_KIND_WIDE) {
-        gtk_style_context_add_class(renderer->view_context, "wide");
+    if (squeek_layout_get_kind(priv->keyboard->layout) == ARRANGEMENT_KIND_WIDE) {
+        gtk_style_context_add_class(priv->view_context, "wide");
    }
-    gtk_style_context_add_provider (renderer->view_context,
-        GTK_STYLE_PROVIDER(renderer->css_provider),
+    gtk_style_context_add_provider (priv->view_context,
+        GTK_STYLE_PROVIDER(priv->css_provider),
        GTK_STYLE_PROVIDER_PRIORITY_USER);

    /* Create a style context for the buttons */
    path = gtk_widget_path_new();
    gtk_widget_path_append_type(path, view_type());
-    if (squeek_layout_get_kind(keyboard->layout) == ARRANGEMENT_KIND_WIDE) {
+    if (squeek_layout_get_kind(priv->keyboard->layout) == ARRANGEMENT_KIND_WIDE) {
        gtk_widget_path_iter_add_class(path, -1, "wide");
    }
    gtk_widget_path_append_type(path, button_type());
-    renderer->button_context = gtk_style_context_new ();
-    gtk_style_context_set_path(renderer->button_context, path);
+    priv->button_context = gtk_style_context_new ();
+    gtk_style_context_set_path(priv->button_context, path);
    gtk_widget_path_unref(path);
-    gtk_style_context_set_parent(renderer->button_context, renderer->view_context);
-    gtk_style_context_set_state (renderer->button_context, GTK_STATE_FLAG_NORMAL);
-    gtk_style_context_add_provider (renderer->button_context,
-        GTK_STYLE_PROVIDER(renderer->css_provider),
+    gtk_style_context_set_parent(priv->button_context, priv->view_context);
+    gtk_style_context_set_state (priv->button_context, GTK_STATE_FLAG_NORMAL);
+    gtk_style_context_add_provider (priv->button_context,
+        GTK_STYLE_PROVIDER(priv->css_provider),
        GTK_STYLE_PROVIDER_PRIORITY_USER);
    return renderer;
 }

-struct render_geometry
-eek_render_geometry_from_allocation_size (struct squeek_layout *layout,
+void
+eek_renderer_set_allocation_size (EekRenderer *renderer,
                                  gdouble      width,
                                  gdouble      height)
 {
-    struct render_geometry ret = {
-        .allocation_width = width,
-        .allocation_height = height,
-        .widget_to_layout = squeek_layout_calculate_transformation(
-            layout, width, height),
-    };
-    return ret;
+    g_return_if_fail (EEK_IS_RENDERER(renderer));
+    g_return_if_fail (width > 0.0 && height > 0.0);
+
+    EekRendererPrivate *priv = eek_renderer_get_instance_private (renderer);
+
+    priv->allocation_width = width;
+    priv->allocation_height = height;
+
+    priv->widget_to_layout = squeek_layout_calculate_transformation(
+                priv->keyboard->layout,
+                priv->allocation_width, priv->allocation_height);
+
+    // This is where size-dependent surfaces would be released
 }

 void
 eek_renderer_set_scale_factor (EekRenderer *renderer, gint scale)
 {
-    renderer->scale_factor = scale;
-}
+    g_return_if_fail (EEK_IS_RENDERER(renderer));

-/// Rust interface.
-uint32_t eek_renderer_get_scale_factor(EekRenderer *renderer) {
-    return renderer->scale_factor;
+    EekRendererPrivate *priv = eek_renderer_get_instance_private (renderer);
+    priv->scale_factor = scale;
 }

 cairo_surface_t *
@ -355,3 +464,12 @@ eek_renderer_get_icon_surface (const gchar *icon_name,
    }
    return surface;
 }
+
+struct transformation
+eek_renderer_get_transformation (EekRenderer *renderer) {
+    struct transformation failed = {0};
+    g_return_val_if_fail (EEK_IS_RENDERER(renderer), failed);
+
+    EekRendererPrivate *priv = eek_renderer_get_instance_private (renderer);
+    return priv->widget_to_layout;
+}
--- a/eek/eek-renderer.h
+++ b/eek/eek-renderer.h
@ -25,39 +25,33 @@
 #include <pango/pangocairo.h>

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

-struct squeek_layout;
+G_BEGIN_DECLS

-/// Renders LevelKayboards
-/// It cannot adjust styles at runtime.
-typedef struct EekRenderer
+#define EEK_TYPE_RENDERER (eek_renderer_get_type())
+G_DECLARE_DERIVABLE_TYPE (EekRenderer, eek_renderer, EEK, RENDERER, GObject)
+
+struct _EekRendererClass
 {
-    PangoContext *pcontext; // owned
-    GtkCssProvider *css_provider; // owned
-    GtkStyleContext *view_context; // owned
-    GtkStyleContext *button_context; // TODO: maybe move a copy to each button
-    /// Style class for rendering the view and button CSS.
-    gchar *extra_style; // owned
+    GObjectClass parent_class;

-    // Mutable state
-    gint scale_factor; /* the outputs scale factor */
-} EekRenderer;
+    cairo_surface_t *(* get_icon_surface)   (EekRenderer *self,
+                                             const gchar *icon_name,
+                                             gint         size,
+                                             gint         scale);

-
-/// Mutable part of the renderer state.
-/// TODO: Possibly should include scale factor.
-struct render_geometry {
-    /// Background extents
-    gdouble allocation_width;
-    gdouble allocation_height;
-    /// Coords transformation
-    struct transformation widget_to_layout;
+    /*< private >*/
+    /* padding */
+    gpointer pdummy[23];
 };

 GType            eek_renderer_get_type         (void) G_GNUC_CONST;
 EekRenderer     *eek_renderer_new              (LevelKeyboard     *keyboard,
                                                PangoContext    *pcontext);
+void             eek_renderer_set_allocation_size
+                                               (EekRenderer     *renderer,
+                                                gdouble          width,
+                                                gdouble          height);
 void             eek_renderer_set_scale_factor (EekRenderer     *renderer,
                                                gint             scale);

@ -65,14 +59,11 @@ cairo_surface_t *eek_renderer_get_icon_surface(const gchar     *icon_name,
                                                gint             size,
                                                gint             scale);

-void             eek_renderer_render_keyboard  (EekRenderer     *renderer, struct render_geometry geometry, struct submission *submission,
-                                                cairo_t         *cr, LevelKeyboard *keyboard);
-void
-eek_renderer_free (EekRenderer        *self);
+void             eek_renderer_render_keyboard  (EekRenderer     *renderer,
+                                                cairo_t         *cr);

-struct render_geometry
-eek_render_geometry_from_allocation_size (struct squeek_layout *layout,
-    gdouble      width, gdouble      height);
+struct transformation
+eek_renderer_get_transformation (EekRenderer *renderer);

 G_END_DECLS
 #endif  /* EEK_RENDERER_H */
--- a/eek/eek-types.h
+++ b/eek/eek-types.h
@ -90,5 +90,13 @@ struct transformation {
    gdouble scale;
 };

+struct squeek_button;
+struct squeek_row;
+
+/// Represents the path to the button within a view
+struct button_place {
+    const struct squeek_row *row;
+    const struct squeek_button *button;
+};
 G_END_DECLS
 #endif  /* EEK_TYPES_H */
--- a/eek/layersurface.c
+++ b/eek/layersurface.c
@ -590,32 +590,27 @@ phosh_layer_surface_set_size(PhoshLayerSurface *self, gint width, gint height)
  g_return_if_fail (PHOSH_IS_LAYER_SURFACE (self));
  priv = phosh_layer_surface_get_instance_private (self);

-  if (priv->height == height && priv->width == width) {
+  if (priv->height == height && priv->width == width)
    return;
-  }

  old_width = priv->width;
  old_height = priv->height;

-  if (width != -1) {
+  if (width != -1)
    priv->width = width;
-  }

-  if (height != -1) {
+  if (height != -1)
    priv->height = height;
-  }

  if (gtk_widget_get_mapped (GTK_WIDGET (self))) {
    zwlr_layer_surface_v1_set_size(priv->layer_surface, priv->width, priv->height);
  }

-  if (priv->height != old_height) {
+  if (priv->height != old_height)
    g_object_notify_by_pspec (G_OBJECT (self), props[PHOSH_LAYER_SURFACE_PROP_LAYER_HEIGHT]);
-  }

-  if (priv->width != old_width) {
+  if (priv->width != old_width)
    g_object_notify_by_pspec (G_OBJECT (self), props[PHOSH_LAYER_SURFACE_PROP_LAYER_WIDTH]);
-  }
 }

 /**
@ -637,31 +632,25 @@ phosh_layer_surface_set_margins(PhoshLayerSurface *self, gint top, gint right, g
  old_right = priv->margin_right;
  old_bottom = priv->margin_bottom;

-  if (old_top == top && old_left == left && old_right == right && old_bottom == bottom) {
+  if (old_top == top && old_left == left && old_right == right && old_bottom == bottom)
    return;
-  }

  priv->margin_top = top;
  priv->margin_left = left;
  priv->margin_right = right;
  priv->margin_bottom = bottom;

-  if (priv->layer_surface) {
+  if (priv->layer_surface)
    zwlr_layer_surface_v1_set_margin(priv->layer_surface, top, right, bottom, left);
-  }

-  if (old_top != top) {
+  if (old_top != top)
    g_object_notify_by_pspec (G_OBJECT (self), props[PHOSH_LAYER_SURFACE_PROP_MARGIN_TOP]);
-  }
-  if (old_bottom != bottom) {
+  if (old_bottom != bottom)
    g_object_notify_by_pspec (G_OBJECT (self), props[PHOSH_LAYER_SURFACE_PROP_MARGIN_BOTTOM]);
-  }
-  if (old_left != left) {
+  if (old_left != left)
    g_object_notify_by_pspec (G_OBJECT (self), props[PHOSH_LAYER_SURFACE_PROP_MARGIN_LEFT]);
-  }
-  if (old_right != right) {
+  if (old_right != right)
    g_object_notify_by_pspec (G_OBJECT (self), props[PHOSH_LAYER_SURFACE_PROP_MARGIN_RIGHT]);
-  }
 }

 /**
@ -680,15 +669,13 @@ phosh_layer_surface_set_exclusive_zone(PhoshLayerSurface *self, gint zone)

  old_zone = priv->exclusive_zone;

-  if (old_zone == zone) {
+  if (old_zone == zone)
    return;
-  }

  priv->exclusive_zone = zone;

-  if (priv->layer_surface) {
+  if (priv->layer_surface)
    zwlr_layer_surface_v1_set_exclusive_zone(priv->layer_surface, zone);
-  }

  g_object_notify_by_pspec (G_OBJECT (self), props[PHOSH_LAYER_SURFACE_PROP_EXCLUSIVE_ZONE]);
 }
@ -706,14 +693,13 @@ phosh_layer_surface_set_kbd_interactivity (PhoshLayerSurface *self, gboolean int
  g_return_if_fail (PHOSH_IS_LAYER_SURFACE (self));
  priv = phosh_layer_surface_get_instance_private (self);

-  if (priv->kbd_interactivity == interactivity) {
+    if (priv->kbd_interactivity == interactivity)
    return;
-  }
+
  priv->kbd_interactivity = interactivity;

-  if (priv->layer_surface) {
+  if (priv->layer_surface)
    zwlr_layer_surface_v1_set_keyboard_interactivity (priv->layer_surface, interactivity);
-  }

  g_object_notify_by_pspec (G_OBJECT (self), props[PHOSH_LAYER_SURFACE_PROP_KBD_INTERACTIVITY]);
 }
@ -731,7 +717,6 @@ phosh_layer_surface_wl_surface_commit (PhoshLayerSurface *self)
  g_return_if_fail (PHOSH_IS_LAYER_SURFACE (self));
  priv = phosh_layer_surface_get_instance_private (self);

-  if (priv->wl_surface) {
+  if (priv->wl_surface)
    wl_surface_commit (priv->wl_surface);
-  }
 }
--- a/eekboard/eekboard-context-service.c
+++ b/eekboard/eekboard-context-service.c
@ -42,23 +42,18 @@ enum {

 static guint signals[LAST_SIGNAL] = { 0, };

-/**
- * EekboardContextService:
- *
- * Handles layout state, gsettings, and virtual-keyboard.
- *
- * TODO: Restrict to managing keyboard layouts, and maybe button repeats,
- * and the virtual keyboard protocol.
- *
- * The #EekboardContextService structure contains only private data
- * and should only be accessed using the provided API.
- */
-struct _EekboardContextService {
-    GObject parent;
-    struct squeek_layout_state *layout; // Unowned
+#define EEKBOARD_CONTEXT_SERVICE_GET_PRIVATE(obj)                       \
+    (G_TYPE_INSTANCE_GET_PRIVATE ((obj), EEKBOARD_TYPE_CONTEXT_SERVICE, EekboardContextServicePrivate))

+struct _EekboardContextServicePrivate {
    LevelKeyboard *keyboard; // currently used keyboard
+    GHashTable *keyboard_hash; // a table of available keyboards, per layout
+
+    char *overlay;
+
    GSettings *settings; // Owned reference
+    uint32_t hint;
+    uint32_t purpose;

    // Maybe TODO: it's used only for fetching layout type.
    // Maybe let UI push the type to this structure?
@ -67,7 +62,7 @@ struct _EekboardContextService {
    struct submission *submission; // unowned
 };

-G_DEFINE_TYPE (EekboardContextService, eekboard_context_service, G_TYPE_OBJECT);
+G_DEFINE_TYPE_WITH_PRIVATE (EekboardContextService, eekboard_context_service, G_TYPE_OBJECT);

 static void
 eekboard_context_service_set_property (GObject      *object,
@ -93,7 +88,7 @@ eekboard_context_service_get_property (GObject    *object,

    switch (prop_id) {
    case PROP_KEYBOARD:
-        g_value_set_object (value, context->keyboard);
+        g_value_set_object (value, context->priv->keyboard);
        break;
    default:
        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@ -104,6 +99,13 @@ eekboard_context_service_get_property (GObject    *object,
 static void
 eekboard_context_service_dispose (GObject *object)
 {
+    EekboardContextService *context = EEKBOARD_CONTEXT_SERVICE(object);
+
+    if (context->priv->keyboard_hash) {
+        g_hash_table_destroy (context->priv->keyboard_hash);
+        context->priv->keyboard_hash = NULL;
+    }
+
    G_OBJECT_CLASS (eekboard_context_service_parent_class)->
        dispose (object);
 }
@ -111,58 +113,52 @@ eekboard_context_service_dispose (GObject *object)
 static void
 settings_get_layout(GSettings *settings, char **type, char **layout)
 {
-    if (!settings) {
-        return;
-    }
    GVariant *inputs = g_settings_get_value(settings, "sources");
-    if (g_variant_n_children(inputs) == 0) {
-        g_warning("No system layout present");
-        *type = NULL;
-        *layout = NULL;
-    } else {
-        // current layout is always first
-        g_variant_get_child(inputs, 0, "(ss)", type, layout);
-    }
-    g_variant_unref(inputs);
+    // current layout is always first
+    g_variant_get_child(inputs, 0, "(ss)", type, layout);
 }

 void
-eekboard_context_service_use_layout(EekboardContextService *context, struct squeek_layout_state *state, uint32_t timestamp) {
-    gchar *layout_name = state->overlay_name;
+eekboard_context_service_update_layout(EekboardContextService *context, enum squeek_arrangement_kind t)
+{
+    g_autofree gchar *keyboard_layout = NULL;
+    if (context->priv->overlay) {
+        keyboard_layout = g_strdup(context->priv->overlay);
+    } else {
+        g_autofree gchar *keyboard_type = NULL;
+        settings_get_layout(context->priv->settings,
+                            &keyboard_type, &keyboard_layout);
+    }

-    if (layout_name == NULL) {
-        layout_name = state->layout_name;
+    if (!keyboard_layout) {
+        keyboard_layout = g_strdup("us");
+    }

-        switch (state->purpose) {
-        case ZWP_TEXT_INPUT_V3_CONTENT_PURPOSE_NUMBER:
-        case ZWP_TEXT_INPUT_V3_CONTENT_PURPOSE_PHONE:
-            layout_name = "number";
-            break;
-        case ZWP_TEXT_INPUT_V3_CONTENT_PURPOSE_TERMINAL:
-            layout_name = "terminal";
-            break;
-        default:
-            ;
-        }
+    EekboardContextServicePrivate *priv = EEKBOARD_CONTEXT_SERVICE_GET_PRIVATE(context);

-        if (layout_name == NULL) {
-            layout_name = "us";
-        }
+    switch (priv->purpose) {
+    case ZWP_TEXT_INPUT_V3_CONTENT_PURPOSE_NUMBER:
+    case ZWP_TEXT_INPUT_V3_CONTENT_PURPOSE_PHONE:
+        keyboard_layout = g_strdup("number");
+        break;
+    case ZWP_TEXT_INPUT_V3_CONTENT_PURPOSE_TERMINAL:
+        keyboard_layout = g_strdup("terminal");
+        break;
+    default:
+        ;
    }

    // generic part follows
-    struct squeek_layout *layout = squeek_load_layout(layout_name, state->arrangement);
-    LevelKeyboard *keyboard = level_keyboard_new(layout);
+    LevelKeyboard *keyboard = level_keyboard_new(keyboard_layout, t);
    // set as current
-    LevelKeyboard *previous_keyboard = context->keyboard;
-    context->keyboard = keyboard;
+    LevelKeyboard *previous_keyboard = context->priv->keyboard;
+    context->priv->keyboard = keyboard;
    // Update the keymap if necessary.
    // TODO: Update submission on change event
-    if (context->submission) {
-        submission_use_layout(context->submission, keyboard->layout, timestamp);
+    if (context->priv->submission) {
+        submission_set_keyboard(context->priv->submission, keyboard);
    }

-    // Update UI
    g_object_notify (G_OBJECT(context), "keyboard");

    // replacing the keyboard above will cause the previous keyboard to get destroyed from the UI side (eek_gtk_keyboard_dispose)
@ -171,23 +167,13 @@ eekboard_context_service_use_layout(EekboardContextService *context, struct sque
    }
 }

-static void eekboard_context_service_update_settings_layout(EekboardContextService *context) {
-    g_autofree gchar *keyboard_layout = NULL;
-    g_autofree gchar *keyboard_type = NULL;
-    settings_get_layout(context->settings,
-                        &keyboard_type, &keyboard_layout);
-
-    if (g_strcmp0(context->layout->layout_name, keyboard_layout) != 0 || context->layout->overlay_name) {
-        g_free(context->layout->overlay_name);
-        context->layout->overlay_name = NULL;
-        if (keyboard_layout) {
-            g_free(context->layout->layout_name);
-            context->layout->layout_name = g_strdup(keyboard_layout);
-        }
-        // This must actually update the UI.
-        uint32_t time = gdk_event_get_time(NULL);
-        eekboard_context_service_use_layout(context, context->layout, time);
+static void update_layout_and_type(EekboardContextService *context) {
+    EekboardContextServicePrivate *priv = EEKBOARD_CONTEXT_SERVICE_GET_PRIVATE(context);
+    enum squeek_arrangement_kind layout_kind = ARRANGEMENT_KIND_BASE;
+    if (priv->ui) {
+        layout_kind = server_context_service_get_layout_type(priv->ui);
    }
+    eekboard_context_service_update_layout(context, layout_kind);
 }

 static gboolean
@ -198,14 +184,17 @@ settings_handle_layout_changed(GSettings *s,
    (void)keys;
    (void)n_keys;
    EekboardContextService *context = user_data;
-    eekboard_context_service_update_settings_layout(context);
+    g_free(context->priv->overlay);
+    context->priv->overlay = NULL;
+    update_layout_and_type(context);
    return TRUE;
 }

 static void
 eekboard_context_service_constructed (GObject *object)
 {
-    (void)object;
+    EekboardContextService *context = EEKBOARD_CONTEXT_SERVICE (object);
+    update_layout_and_type(context);
 }

 static void
@ -228,7 +217,7 @@ eekboard_context_service_class_init (EekboardContextServiceClass *klass)
        g_signal_new (I_("destroyed"),
                      G_TYPE_FROM_CLASS(gobject_class),
                      G_SIGNAL_RUN_LAST,
-                      0,
+                      G_STRUCT_OFFSET(EekboardContextServiceClass, destroyed),
                      NULL,
                      NULL,
                      g_cclosure_marshal_VOID__VOID,
@ -252,31 +241,24 @@ eekboard_context_service_class_init (EekboardContextServiceClass *klass)
 static void
 eekboard_context_service_init (EekboardContextService *self)
 {
-    const char *schema_name = "org.gnome.desktop.input-sources";
-    GSettingsSchemaSource *ssrc = g_settings_schema_source_get_default();
-    g_autoptr(GSettingsSchema) schema = NULL;
+    self->priv = EEKBOARD_CONTEXT_SERVICE_GET_PRIVATE(self);

-    if (!ssrc) {
-        g_warning("No gsettings schemas installed. Layout switching unavailable.");
-        return;
+    self->priv->keyboard_hash =
+        g_hash_table_new_full (g_direct_hash,
+                               g_direct_equal,
+                               NULL,
+                               (GDestroyNotify)g_object_unref);
+
+    self->priv->settings = g_settings_new ("org.gnome.desktop.input-sources");
+    gulong conn_id = g_signal_connect(self->priv->settings, "change-event",
+                                      G_CALLBACK(settings_handle_layout_changed),
+                                      self);
+    if (conn_id == 0) {
+        g_warning ("Could not connect to gsettings updates, layout"
+                   " changing unavailable");
    }

-    schema = g_settings_schema_source_lookup(ssrc, schema_name, TRUE);
-    if (schema) {
-        // Not referencing the found schema directly,
-        // because it's not clear how...
-        self->settings = g_settings_new (schema_name);
-        gulong conn_id = g_signal_connect(self->settings, "change-event",
-                                          G_CALLBACK(settings_handle_layout_changed),
-                                          self);
-        if (conn_id == 0) {
-            g_warning ("Could not connect to gsettings updates, "
-                       "automatic layout changing unavailable");
-        }
-    } else {
-        g_warning("Gsettings schema %s is not installed on the system. "
-                  "Layout switching unavailable", schema_name);
-    }
+    self->priv->overlay = NULL;
 }

 /**
@ -289,6 +271,8 @@ void
 eekboard_context_service_destroy (EekboardContextService *context)
 {
    g_return_if_fail (EEKBOARD_IS_CONTEXT_SERVICE(context));
+
+    g_free(context->priv->overlay);
    g_signal_emit (context, signals[DESTROYED], 0);
 }

@ -302,53 +286,44 @@ eekboard_context_service_destroy (EekboardContextService *context)
 LevelKeyboard *
 eekboard_context_service_get_keyboard (EekboardContextService *context)
 {
-    return context->keyboard;
+    return context->priv->keyboard;
 }

 void eekboard_context_service_set_hint_purpose(EekboardContextService *context,
                                               uint32_t hint, uint32_t purpose)
 {
-    if (context->layout->hint != hint || context->layout->purpose != purpose) {
-        context->layout->hint = hint;
-        context->layout->purpose = purpose;
-        uint32_t time = gdk_event_get_time(NULL);
-        eekboard_context_service_use_layout(context, context->layout, time);
+    EekboardContextServicePrivate *priv = EEKBOARD_CONTEXT_SERVICE_GET_PRIVATE(context);
+
+    if (priv->hint != hint || priv->purpose != purpose) {
+        priv->hint = hint;
+        priv->purpose = purpose;
+        update_layout_and_type(context);
    }
 }

 void
 eekboard_context_service_set_overlay(EekboardContextService *context, const char* name) {
-    if (g_strcmp0(context->layout->overlay_name, name)) {
-        g_free(context->layout->overlay_name);
-        context->layout->overlay_name = g_strdup(name);
-        uint32_t time = gdk_event_get_time(NULL);
-        eekboard_context_service_use_layout(context, context->layout, time);
-    }
+    context->priv->overlay = g_strdup(name);
+    update_layout_and_type(context);
 }

 const char*
 eekboard_context_service_get_overlay(EekboardContextService *context) {
-    return context->layout->overlay_name;
+    return context->priv->overlay;
 }

-EekboardContextService *eekboard_context_service_new(struct squeek_layout_state *state)
+EekboardContextService *eekboard_context_service_new(void)
 {
-    EekboardContextService *context = g_object_new (EEKBOARD_TYPE_CONTEXT_SERVICE, NULL);
-    context->layout = state;
-    eekboard_context_service_update_settings_layout(context);
-    uint32_t time = gdk_event_get_time(NULL);
-    eekboard_context_service_use_layout(context, context->layout, time);
-    return context;
+    return g_object_new (EEKBOARD_TYPE_CONTEXT_SERVICE, NULL);
 }

 void eekboard_context_service_set_submission(EekboardContextService *context, struct submission *submission) {
-    context->submission = submission;
-    if (context->submission) {
-        uint32_t time = gdk_event_get_time(NULL);
-        submission_use_layout(context->submission, context->keyboard->layout, time);
+    context->priv->submission = submission;
+    if (context->priv->submission) {
+        submission_set_keyboard(context->priv->submission, context->priv->keyboard);
    }
 }

 void eekboard_context_service_set_ui(EekboardContextService *context, ServerContextService *ui) {
-    context->ui = ui;
+    context->priv->ui = ui;
 }
--- a/eekboard/eekboard-context-service.h
+++ b/eekboard/eekboard-context-service.h
@ -34,10 +34,58 @@ G_BEGIN_DECLS
 #define EEKBOARD_CONTEXT_SERVICE_INTERFACE "org.fedorahosted.Eekboard.Context"

 #define EEKBOARD_TYPE_CONTEXT_SERVICE (eekboard_context_service_get_type())
+#define EEKBOARD_CONTEXT_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EEKBOARD_TYPE_CONTEXT_SERVICE, EekboardContextService))
+#define EEKBOARD_CONTEXT_SERVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EEKBOARD_TYPE_CONTEXT_SERVICE, EekboardContextServiceClass))
+#define EEKBOARD_IS_CONTEXT_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EEKBOARD_TYPE_CONTEXT_SERVICE))
+#define EEKBOARD_IS_CONTEXT_SERVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EEKBOARD_TYPE_CONTEXT_SERVICE))
+#define EEKBOARD_CONTEXT_SERVICE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EEKBOARD_TYPE_CONTEXT_SERVICE, EekboardContextServiceClass))

-G_DECLARE_FINAL_TYPE(EekboardContextService, eekboard_context_service, EEKBOARD, CONTEXT_SERVICE, GObject)

-EekboardContextService *eekboard_context_service_new(struct squeek_layout_state *state);
+typedef struct _EekboardContextServiceClass EekboardContextServiceClass;
+typedef struct _EekboardContextServicePrivate EekboardContextServicePrivate;
+
+/**
+ * EekboardContextService:
+ *
+ * Handles layout state, gsettings, and virtual-keyboard.
+ *
+ * TODO: Restrict to managing keyboard layouts, and maybe button repeats,
+ * and the virtual keyboard protocol.
+ *
+ * The #EekboardContextService structure contains only private data
+ * and should only be accessed using the provided API.
+ */
+struct _EekboardContextService {
+    GObject parent;
+
+    EekboardContextServicePrivate *priv;
+};
+
+/**
+ * EekboardContextServiceClass:
+ * @create_keyboard: virtual function for create a keyboard from string
+ * @enabled: class handler for #EekboardContextService::enabled signal
+ * @disabled: class handler for #EekboardContextService::disabled signal
+ */
+struct _EekboardContextServiceClass {
+    /*< private >*/
+    GObjectClass parent_class;
+
+    /*< public >*/
+    struct squeek_view *(*create_keyboard)    (EekboardContextService *self,
+                                        const gchar            *keyboard_type);
+
+    /* signals */
+    void         (*destroyed)          (EekboardContextService *self);
+
+    /*< private >*/
+    /* padding */
+    gpointer pdummy[24];
+};
+
+GType         eekboard_context_service_get_type
+                                              (void) G_GNUC_CONST;
+EekboardContextService *eekboard_context_service_new(void);
 void eekboard_context_service_set_submission(EekboardContextService *context, struct submission *submission);
 void eekboard_context_service_set_ui(EekboardContextService *context, ServerContextService *ui);
 void          eekboard_context_service_destroy (EekboardContextService *context);
@ -50,6 +98,6 @@ void eekboard_context_service_set_hint_purpose(EekboardContextService *context,
                                               uint32_t hint,
                                               uint32_t purpose);
 void
-eekboard_context_service_use_layout(EekboardContextService *context, struct squeek_layout_state *layout, uint32_t timestamp);
+eekboard_context_service_update_layout(EekboardContextService *context, enum squeek_arrangement_kind t);
 G_END_DECLS
 #endif  /* EEKBOARD_CONTEXT_SERVICE_H */
--- a/examples/test_layout.rs
+++ b/examples/test_layout.rs
@ -5,7 +5,6 @@ use std::env;

 fn main() -> () {
    check_builtin_layout(
-        env::args().nth(1).expect("No argument given").as_str(),
-        env::args().nth(2).map(|s| s == "allow_missing_return").unwrap_or(false),
+        env::args().nth(1).expect("No argument given").as_str()
    );
 }
--- a/meson.build
+++ b/meson.build
@ -1,7 +1,7 @@
 project(
    'squeekboard',
    'c', 'rust',
-    version: '1.12.0',
+    version: '1.8.0',
    license: 'GPLv3',
    meson_version: '>=0.51.0',
    default_options: [
@ -19,17 +19,6 @@ add_project_arguments(
    '-Werror=missing-field-initializers',
    '-Werror=incompatible-pointer-types',
    '-Werror=int-conversion',
-    '-Werror=redundant-decls',
-    '-Werror=parentheses',
-    '-Wformat-nonliteral',
-    '-Wformat-security',
-    '-Wformat',
-    '-Winit-self',
-    '-Wmaybe-uninitialized',
-    '-Wold-style-definition',
-    '-Wredundant-decls',
-    '-Wstrict-prototypes',
-    '-Wunused',
  ],
  language: 'c'
 )
@ -41,16 +30,6 @@ conf_data = configuration_data()
 if get_option('buildtype').startswith('debug')
    add_project_arguments('-DDEBUG=1', language : 'c')
 endif
-
-if get_option('strict')
-    add_project_arguments(
-        [
-            '-Werror',
-        ],
-        language: 'c'
-    )
-endif
-
 if get_option('buildtype') != 'plain'
    add_project_arguments('-fstack-protector-strong', language: 'c')
 endif
@ -63,7 +42,6 @@ endif
 prefix = get_option('prefix')
 bindir = join_paths(prefix, get_option('bindir'))
 datadir = join_paths(prefix, get_option('datadir'))
-desktopdir = join_paths(datadir, 'applications')
 pkgdatadir = join_paths(datadir, meson.project_name())
 if get_option('depdatadir') == ''
  depdatadir = datadir
@ -82,36 +60,9 @@ summary = [
 ]
 message('\n'.join(summary))

-# Rust deps are changing, depending on compile flags. Cargo can't handle it alone.
-# As a side effect, Cargo.toml never gets used.
-cargo_toml_in = files('Cargo.toml.in')
-path_data = configuration_data()
-path_data.set('path', meson.source_root())
-cargo_toml_base = configure_file(
-    input: 'Cargo.toml.in',
-    output: 'Cargo.toml.base',
-    configuration: path_data,
-)
-
-
-cargo_deps = files('Cargo.deps')
-
-if get_option('legacy') == true
-    cargo_build_flags += ['--features', 'gtk_v0_5,gio_v0_5,rustc_less_1_36']
-    cargo_deps = files('Cargo.deps.legacy')
-endif
-    
-cat = find_program('cat')
-cargo_toml = custom_target(
-    'Cargo.toml',
-    output: 'Cargo.toml',
-    command: [cat, cargo_toml_base, cargo_deps],
-    capture: true,
-)
-
 dep_cargo = find_program('cargo')
 cargo_script = find_program('cargo.sh')
-cargo_build = find_program('cargo_build.py')
+cargo_build = find_program('cargo_build.sh')

 subdir('data')
 subdir('protocols')
--- a/meson_options.txt
+++ b/meson_options.txt
@ -6,11 +6,3 @@ option('depdatadir',
 option('tests',
       type: 'boolean', value: true,
       description: 'Whether to compile unit tests')
-
-option('legacy',
-       type: 'boolean', value: false,
-       description: 'Build with Deban Buster versions of dependencies')
-
-option('strict',
-       type: 'boolean', value: true,
-       description: 'Turn more warnings into errors')
--- a/protocols/input-method-unstable-v2.xml
+++ b/protocols/input-method-unstable-v2.xml
@ -294,8 +294,8 @@

        The serial number reflects the last state of the zwp_input_method_v2
        object known to the client. The value of the serial argument must be
-        equal to the number of done events already issued on that object.
-        When the compositor receives a commit request with a serial different than
+        equal to the number of commit requests already issued on that object.
+        When the compositor receives a done event with a serial different than
        the number of past commit requests, it must proceed as normal, except
        it should not change the current state of the zwp_input_method_v2
        object.
--- a/squeekboard.doap
+++ b/squeekboard.doap
@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Project xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" xmlns="http://usefulinc.com/ns/doap#" xmlns:foaf="http://xmlns.com/foaf/0.1/" xmlns:admin="http://webns.net/mvcb/">
- <name>squeekboard</name>
- <shortdesc>A Wayland virtual keyboard</shortdesc>
- <description>A virtual keyboard supporting Wayland, built primarily for the Librem 5 phone.</description>
- <homepage rdf:resource="https://source.puri.sm/Librem5/squeekboard" />
- <bug-database rdf:resource="https://source.puri.sm/Librem5/squeekboard/issues" />
- <os>Linux</os>
- <license rdf:resource="http://usefulinc.com/doap/licenses/gpl" />
- <maintainer>
-  <foaf:Person>
-     <foaf:name>Dorota Czaplejewicz</foaf:name>
-     <foaf:mbox rdf:resource="mailto:dorota.czaplejewicz@puri.sm" />
-  </foaf:Person>
- </maintainer>
- 
-</Project>
--- a/src/action.rs
+++ b/src/action.rs
@ -10,14 +10,10 @@ pub struct KeySym(pub String);
 type View = String;

 /// Use to send modified keypresses
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+#[derive(Debug, Clone, PartialEq)]
 pub enum Modifier {
-    /// Control and Alt are the only modifiers
-    /// which doesn't interfere with levels,
-    /// so it's simple to implement as levels are deprecated in squeekboard.
    Control,
    Alt,
-    Mod4,
 }

 /// Action to perform on the keypress and, in reverse, on keyrelease
@ -30,49 +26,15 @@ pub enum Action {
        lock: View,
        /// When unlocked by pressing it or emitting a key
        unlock: View,
-        /// Whether key has a latched state
-        /// that pops when another key is pressed.
-        latches: bool,
-        /// Should take on *locked* appearance whenever latch comes back to those views.
-        looks_locked_from: Vec<View>,
    },
-    /// Hold this modifier for as long as the button is pressed
-    ApplyModifier(Modifier),
+    /// Set this modifier TODO: release?
+    SetModifier(Modifier),
    /// Submit some text
    Submit {
-        /// Text to submit with input-method.
-        /// If None, then keys are to be submitted instead.
+        /// Text to submit with input-method
        text: Option<CString>,
        /// The key events this symbol submits when submitting text is not possible
        keys: Vec<KeySym>,
    },
-    /// Erase a position behind the cursor
-    Erase,
    ShowPreferences,
 }
-
-impl Action {
-    pub fn is_locked(&self, view_name: &str) -> bool {
-        match self {
-            Action::LockView { lock, unlock: _, latches: _, looks_locked_from: _ } => lock == view_name,
-            _ => false,
-        }
-    }
-    pub fn has_locked_appearance_from(&self, locked_view_name: &str) -> bool {
-        match self {
-            Action::LockView { lock: _, unlock: _, latches: _, looks_locked_from } => {
-                looks_locked_from.iter()
-                    .find(|view| locked_view_name == view.as_str())
-                    .is_some()
-            },
-            _ => false,
-        }
-    }
-    pub fn is_active(&self, view_name: &str) -> bool {
-        match self {
-            Action::SetView(view) => view == view_name,
-            Action::LockView { lock, unlock: _, latches: _, looks_locked_from: _ } => lock == view_name,
-            _ => false,
-        }
-    }
-}
--- a/src/data.rs
+++ b/src/data.rs
@ -15,10 +15,9 @@ use std::vec::Vec;

 use xkbcommon::xkb;

-use ::action;
 use ::keyboard::{
    KeyState, PressType,
-    generate_keymaps, generate_keycodes, KeyCode, FormattingError
+    generate_keymap, generate_keycodes, FormattingError
 };
 use ::layout;
 use ::layout::ArrangementKind;
@ -97,8 +96,6 @@ impl fmt::Display for DataSource {
    }
 }

-type LayoutSource = (ArrangementKind, DataSource);
-
 /// Lists possible sources, with 0 as the most preferred one
 /// Trying order: native lang of the right kind, native base,
 /// fallback lang of the right kind, fallback base
@ -106,76 +103,55 @@ fn list_layout_sources(
    name: &str,
    kind: ArrangementKind,
    keyboards_path: Option<PathBuf>,
-) -> Vec<LayoutSource> {
-    // Just a simplification of often called code.
-    let add_by_name = |
-        mut ret: Vec<LayoutSource>,
-        name: &str,
-        kind: &ArrangementKind,
-    | -> Vec<LayoutSource> {
-        if let Some(path) = keyboards_path.clone() {
-            ret.push((
-                kind.clone(),
-                DataSource::File(
-                    path.join(name.to_owned()).with_extension("yaml")
-                )
-            ))
+) -> Vec<(ArrangementKind, DataSource)> {
+    let mut ret = Vec::new();
+    {
+        fn name_with_arrangement(name: String, kind: &ArrangementKind)
+            -> String
+        {
+            match kind {    
+                ArrangementKind::Base => name,
+                ArrangementKind::Wide => name + "_wide",
+            }
        }

-        ret.push((
-            kind.clone(),
-            DataSource::Resource(name.into())
-        ));
-        ret
-    };
+        let mut add_by_name = |name: &str, kind: &ArrangementKind| {
+            if let Some(path) = keyboards_path.clone() {
+                ret.push((
+                    kind.clone(),
+                    DataSource::File(
+                        path.join(name.to_owned()).with_extension("yaml")
+                    )
+                ))
+            }
+            
+            ret.push((
+                kind.clone(),
+                DataSource::Resource(name.into())
+            ));
+        };

-    // Another grouping.
-    let add_by_kind = |ret, name: &str, kind| {
-        let ret = match kind {
-            &ArrangementKind::Base => ret,
+        match &kind {
+            ArrangementKind::Base => {},
            kind => add_by_name(
-                ret,
-                &name_with_arrangement(name.into(), kind),
-                kind,
+                &name_with_arrangement(name.into(), &kind),
+                &kind,
            ),
        };

-        add_by_name(ret, name, &ArrangementKind::Base)
-    };
+        add_by_name(name, &ArrangementKind::Base);

-    fn name_with_arrangement(name: String, kind: &ArrangementKind) -> String {
-        match kind {    
-            ArrangementKind::Base => name,
-            ArrangementKind::Wide => name + "_wide",
-        }
+        match &kind {
+            ArrangementKind::Base => {},
+            kind => add_by_name(
+                &name_with_arrangement(FALLBACK_LAYOUT_NAME.into(), &kind),
+                &kind,
+            ),
+        };
+
+        add_by_name(FALLBACK_LAYOUT_NAME, &ArrangementKind::Base);
    }
-
-    let ret = Vec::new();
-
-    // Name as given takes priority.
-    let ret = add_by_kind(ret, name, &kind);
-
-    // Then try non-alternative name if applicable (`us` for `us+colemak`).
-    let ret = {
-        let mut parts = name.splitn(2, '+');
-        match parts.next() {
-            Some(base) => {
-                // The name is already equal to base, so it was already added.
-                if base == name { ret }
-                else {
-                    add_by_kind(ret, base, &kind)
-                }
-            },
-            // The layout's base name starts with a "+". Weird but OK.
-            None => {
-                log_print!(logging::Level::Surprise, "Base layout name is empty: {}", name);
-                ret
-            }
-        }
-    };
-
-    // No other choices left, so give anything.
-    add_by_kind(ret, FALLBACK_LAYOUT_NAME.into(), &kind)
+    ret
 }

 fn load_layout_data(source: DataSource)
@ -263,20 +239,14 @@ type ButtonIds = String;
 #[derive(Debug, Default, Deserialize, PartialEq)]
 #[serde(deny_unknown_fields)]
 struct ButtonMeta {
-    // TODO: structure (action, keysym, text, modifier) as an enum
-    // to detect conflicts and missing values at compile time
-    /// Special action to perform on activation.
-    /// Conflicts with keysym, text, modifier.
+    /// Special action to perform on activation. Conflicts with keysym, text.
    action: Option<Action>,
    /// The name of the XKB keysym to emit on activation.
-    /// Conflicts with action, text, modifier.
+    /// Conflicts with action, text
    keysym: Option<String>,
    /// The text to submit on activation. Will be derived from ID if not present
-    /// Conflicts with action, keysym, modifier.
+    /// Conflicts with action, keysym
    text: Option<String>,
-    /// The modifier to apply while the key is locked
-    /// Conflicts with action, keysym, text
-    modifier: Option<Modifier>,
    /// If not present, will be derived from text or the button ID
    label: Option<String>,
    /// Conflicts with label
@ -289,34 +259,11 @@ struct ButtonMeta {
 #[serde(deny_unknown_fields)]
 enum Action {
    #[serde(rename="locking")]
-    Locking {
-        lock_view: String,
-        unlock_view: String,
-        pops: Option<bool>,
-        #[serde(default)]
-        looks_locked_from: Vec<String>,
-    },
+    Locking { lock_view: String, unlock_view: String },
    #[serde(rename="set_view")]
    SetView(String),
    #[serde(rename="show_prefs")]
    ShowPrefs,
-    /// Remove last character
-    #[serde(rename="erase")]
-    Erase,
-}
-
-#[derive(Debug, Clone, PartialEq, Deserialize)]
-#[serde(deny_unknown_fields)]
-enum Modifier {
-    Control,
-    Shift,
-    Lock,
-    #[serde(alias="Mod1")]
-    Alt,
-    Mod2,
-    Mod3,
-    Mod4,
-    Mod5,
 }

 #[derive(Debug, Clone, Deserialize, PartialEq)]
@ -411,45 +358,53 @@ impl Layout {
                )
            )}).collect();

-        let symbolmap: HashMap<String, KeyCode> = generate_keycodes(
-            extract_symbol_names(&button_actions)
+        let keymap: HashMap<String, u32> = generate_keycodes(
+            button_actions.iter()
+                .filter_map(|(_name, action)| {
+                    match action {
+                        ::action::Action::Submit {
+                            text: _, keys,
+                        } => Some(keys),
+                        _ => None,
+                    }
+                })
+                .flatten()
+                .map(|named_keysym| named_keysym.0.as_str())
        );

+        let button_states = button_actions.into_iter().map(|(name, action)| {
+            let keycodes = match &action {
+                ::action::Action::Submit { text: _, keys } => {
+                    keys.iter().map(|named_keycode| {
+                        *keymap.get(named_keycode.0.as_str())
+                            .expect(
+                                format!(
+                                    "keycode {} in key {} missing from keymap",
+                                    named_keycode.0,
+                                    name
+                                ).as_str()
+                            )
+                    }).collect()
+                },
+                _ => Vec::new(),
+            };
+            (
+                name.into(),
+                KeyState {
+                    pressed: PressType::Released,
+                    locked: false,
+                    keycodes,
+                    action,
+                }
+            )
+        });
+
        let button_states = HashMap::<String, KeyState>::from_iter(
-            button_actions.into_iter().map(|(name, action)| {
-                let keycodes = match &action {
-                    ::action::Action::Submit { text: _, keys } => {
-                        keys.iter().map(|named_keysym| {
-                            symbolmap.get(named_keysym.0.as_str())
-                                .expect(
-                                    format!(
-                                        "keysym {} in key {} missing from symbol map",
-                                        named_keysym.0,
-                                        name
-                                    ).as_str()
-                                )
-                                .clone()
-                        }).collect()
-                    },
-                    action::Action::Erase => vec![
-                        symbolmap.get("BackSpace")
-                            .expect(&format!("BackSpace missing from symbol map"))
-                            .clone(),
-                    ],
-                    _ => Vec::new(),
-                };
-                (
-                    name.into(),
-                    KeyState {
-                        pressed: PressType::Released,
-                        keycodes,
-                        action,
-                    }
-                )
-            })
+            button_states
        );

-        let keymaps = match generate_keymaps(symbolmap) {
+        // TODO: generate from symbols
+        let keymap_str = match generate_keymap(&button_states) {
            Err(e) => { return (Err(e), warning_handler) },
            Ok(v) => v,
        };
@ -462,8 +417,8 @@ impl Layout {
            )}
        );

-        let views: Vec<_> = self.views.iter()
-            .map(|(name, view)| {
+        let views = HashMap::from_iter(
+            self.views.iter().map(|(name, view)| {
                let rows = view.iter().map(|row| {
                    let buttons = row.split_ascii_whitespace()
                        .map(|name| {
@ -477,46 +432,30 @@ impl Layout {
                                &mut warning_handler,
                            ))
                        });
-                    layout::Row::new(
-                        add_offsets(
+                    ::layout::Row {
+                        angle: 0,
+                        buttons: add_offsets(
                            buttons,
                            |button| button.size.width,
                        ).collect()
-                    )
+                    }
                });
-                let rows = add_offsets(rows, |row| row.get_size().height)
+                let rows = add_offsets(rows, |row| row.get_height())
                    .collect();
                (
                    name.clone(),
                    layout::View::new(rows)
                )
-            }).collect();
-
-        // Center views on the same point.
-        let views = {
-            let total_size = layout::View::calculate_super_size(
-                views.iter().map(|(_name, view)| view).collect()
-            );
-
-            HashMap::from_iter(views.into_iter().map(|(name, view)| (
-                name,
-                (
-                    layout::c::Point {
-                        x: (total_size.width - view.get_size().width) / 2.0,
-                        y: (total_size.height - view.get_size().height) / 2.0,
-                    },
-                    view,
-                ),
-            )))
-        };
+            })
+        );

        (
            Ok(::layout::LayoutData {
                views: views,
-                keymaps: keymaps.into_iter().map(|keymap_str|
+                keymap_str: {
                    CString::new(keymap_str)
                        .expect("Invalid keymap string generated")
-                ).collect(),
+                },
                // FIXME: use a dedicated field
                margins: layout::Margins {
                    top: self.margins.top,
@ -548,27 +487,22 @@ fn create_action<H: logging::Handler>(
        Action(Action),
        Text(String),
        Keysym(String),
-        Modifier(Modifier),
    };
    
    let submission = match (
        &symbol_meta.action,
        &symbol_meta.keysym,
-        &symbol_meta.text,
-        &symbol_meta.modifier,
+        &symbol_meta.text
    ) {
-        (Some(action), None, None, None) => SubmitData::Action(action.clone()),
-        (None, Some(keysym), None, None) => SubmitData::Keysym(keysym.clone()),
-        (None, None, Some(text), None) => SubmitData::Text(text.clone()),
-        (None, None, None, Some(modifier)) => {
-            SubmitData::Modifier(modifier.clone())
-        },
-        (None, None, None, None) => SubmitData::Text(name.into()),
+        (Some(action), None, None) => SubmitData::Action(action.clone()),
+        (None, Some(keysym), None) => SubmitData::Keysym(keysym.clone()),
+        (None, None, Some(text)) => SubmitData::Text(text.clone()),
+        (None, None, None) => SubmitData::Text(name.into()),
        _ => {
            warning_handler.handle(
                logging::Level::Warning,
                &format!(
-                    "Button {} has more than one of (action, keysym, text, modifier)",
+                    "Button {} has more than one of (action, keysym, text)",
                    name,
                ),
            );
@ -606,9 +540,7 @@ fn create_action<H: logging::Handler>(
            )
        ),
        SubmitData::Action(Action::Locking {
-            lock_view, unlock_view,
-            pops,
-            looks_locked_from,
+            lock_view, unlock_view
        }) => ::action::Action::LockView {
            lock: filter_view_name(
                name,
@ -622,13 +554,10 @@ fn create_action<H: logging::Handler>(
                &view_names,
                warning_handler,
            ),
-            latches: pops.unwrap_or(true),
-            looks_locked_from,
        },
        SubmitData::Action(
            Action::ShowPrefs
        ) => ::action::Action::ShowPreferences,
-        SubmitData::Action(Action::Erase) => action::Action::Erase,
        SubmitData::Keysym(keysym) => ::action::Action::Submit {
            text: None,
            keys: vec!(::action::KeySym(
@ -660,30 +589,7 @@ fn create_action<H: logging::Handler>(
                    false => format!("U{:04X}", codepoint as u32),
                })
            }).collect(),
-        },
-        SubmitData::Modifier(modifier) => match modifier {
-            Modifier::Control => action::Action::ApplyModifier(
-                action::Modifier::Control,
-            ),
-            Modifier::Alt => action::Action::ApplyModifier(
-                action::Modifier::Alt,
-            ),
-            Modifier::Mod4 => action::Action::ApplyModifier(
-                action::Modifier::Mod4,
-            ),
-            unsupported_modifier => {
-                warning_handler.handle(
-                    logging::Level::Bug,
-                    &format!(
-                        "Modifier {:?} unsupported", unsupported_modifier,
-                    ),
-                );
-                action::Action::Submit {
-                    text: None,
-                    keys: Vec::new(),
-                }
-            },
-        },
+        }
    }
 }

@ -759,50 +665,17 @@ fn create_button<H: logging::Handler>(
    }
 }

-fn extract_symbol_names<'a>(actions: &'a [(&str, action::Action)])
-    -> impl Iterator<Item=String> + 'a
-{
-    actions.iter()
-        .filter_map(|(_name, act)| {
-            match act {
-                action::Action::Submit {
-                    text: _, keys,
-                } => Some(keys.clone()),
-                action::Action::Erase => Some(vec!(action::KeySym("BackSpace".into()))),
-                _ => None,
-            }
-        })
-        .flatten()
-        .map(|named_keysym| named_keysym.0)
-}
-
 #[cfg(test)]
 mod tests {
    use super::*;
-
+    
+    use std::error::Error as ErrorTrait;
    use ::logging::ProblemPanic;

-    fn path_from_root(file: &'static str) -> PathBuf {
-        let source_dir = env::var("SOURCE_DIR")
-            .map(PathBuf::from)
-            .unwrap_or_else(|e| {
-                if let env::VarError::NotPresent = e {
-                    let this_file = file!();
-                    PathBuf::from(this_file)
-                        .parent().unwrap()
-                        .parent().unwrap()
-                        .into()
-                } else {
-                    panic!("{:?}", e);
-                }
-            });
-        source_dir.join(file)
-    }
-
    #[test]
    fn test_parse_path() {
        assert_eq!(
-            Layout::from_file(path_from_root("tests/layout.yaml")).unwrap(),
+            Layout::from_file(PathBuf::from("tests/layout.yaml")).unwrap(),
            Layout {
                margins: Margins { top: 0f64, bottom: 0f64, side: 0f64 },
                views: hashmap!(
@ -814,7 +687,6 @@ mod tests {
                        keysym: None,
                        action: None,
                        text: None,
-                        modifier: None,
                        label: Some("test".into()),
                        outline: None,
                    }
@ -829,14 +701,13 @@ mod tests {
    /// Check if the default protection works
    #[test]
    fn test_empty_views() {
-        let out = Layout::from_file(path_from_root("tests/layout2.yaml"));
+        let out = Layout::from_file(PathBuf::from("tests/layout2.yaml"));
        match out {
            Ok(_) => assert!(false, "Data mistakenly accepted"),
            Err(e) => {
                let mut handled = false;
                if let Error::Yaml(ye) = &e {
-                    handled = ye.to_string()
-                        .starts_with("missing field `views`");
+                    handled = ye.description() == "missing field `views`";
                };
                if !handled {
                    println!("Unexpected error {:?}", e);
@ -848,13 +719,13 @@ mod tests {

    #[test]
    fn test_extra_field() {
-        let out = Layout::from_file(path_from_root("tests/layout3.yaml"));
+        let out = Layout::from_file(PathBuf::from("tests/layout3.yaml"));
        match out {
            Ok(_) => assert!(false, "Data mistakenly accepted"),
            Err(e) => {
                let mut handled = false;
                if let Error::Yaml(ye) = &e {
-                    handled = ye.to_string()
+                    handled = ye.description()
                        .starts_with("unknown field `bad_field`");
                };
                if !handled {
@ -867,14 +738,14 @@ mod tests {
    
    #[test]
    fn test_layout_punctuation() {
-        let out = Layout::from_file(path_from_root("tests/layout_key1.yaml"))
+        let out = Layout::from_file(PathBuf::from("tests/layout_key1.yaml"))
            .unwrap()
            .build(ProblemPanic).0
            .unwrap();
        assert_eq!(
-            out.views["base"].1
+            out.views["base"]
                .get_rows()[0].1
-                .get_buttons()[0].1
+                .buttons[0].1
                .label,
            ::layout::Label::Text(CString::new("test").unwrap())
        );
@ -882,14 +753,14 @@ mod tests {

    #[test]
    fn test_layout_unicode() {
-        let out = Layout::from_file(path_from_root("tests/layout_key2.yaml"))
+        let out = Layout::from_file(PathBuf::from("tests/layout_key2.yaml"))
            .unwrap()
            .build(ProblemPanic).0
            .unwrap();
        assert_eq!(
-            out.views["base"].1
+            out.views["base"]
                .get_rows()[0].1
-                .get_buttons()[0].1
+                .buttons[0].1
                .label,
            ::layout::Label::Text(CString::new("test").unwrap())
        );
@ -898,37 +769,20 @@ mod tests {
    /// Test multiple codepoints
    #[test]
    fn test_layout_unicode_multi() {
-        let out = Layout::from_file(path_from_root("tests/layout_key3.yaml"))
+        let out = Layout::from_file(PathBuf::from("tests/layout_key3.yaml"))
            .unwrap()
            .build(ProblemPanic).0
            .unwrap();
        assert_eq!(
-            out.views["base"].1
+            out.views["base"]
                .get_rows()[0].1
-                .get_buttons()[0].1
+                .buttons[0].1
                .state.borrow()
                .keycodes.len(),
            2
        );
    }

-    /// Test if erase yields a useable keycode
-    #[test]
-    fn test_layout_erase() {
-        let out = Layout::from_file(path_from_root("tests/layout_erase.yaml"))
-            .unwrap()
-            .build(ProblemPanic).0
-            .unwrap();
-        assert_eq!(
-            out.views["base"].1
-                .get_rows()[0].1
-                .get_buttons()[0].1
-                .state.borrow()
-                .keycodes.len(),
-            1
-        );
-    }
-
    #[test]
    fn parsing_fallback() {
        assert!(Layout::from_resource(FALLBACK_LAYOUT_NAME)
@ -953,26 +807,7 @@ mod tests {
            )
        );
    }
-
-    /// If layout contains a "+", it should reach for what's in front of it too.
-    #[test]
-    fn fallbacks_order_base() {
-        let sources = list_layout_sources("nb+aliens", ArrangementKind::Base, None);
-
-        assert_eq!(
-            sources,
-            vec!(
-                (ArrangementKind::Base, DataSource::Resource("nb+aliens".into())),
-                (ArrangementKind::Base, DataSource::Resource("nb".into())),
-                (
-                    ArrangementKind::Base,
-                    DataSource::Resource(FALLBACK_LAYOUT_NAME.into())
-                ),
-            )
-        );
-    }
    
-
    #[test]
    fn unicode_keysym() {
        let keysym = xkb::keysym_from_name(
@ -993,7 +828,6 @@ mod tests {
                        keysym: None,
                        text: None,
                        action: None,
-                        modifier: None,
                        label: Some("test".into()),
                        outline: None,
                    }
@ -1011,7 +845,7 @@ mod tests {

    #[test]
    fn test_layout_margins() {
-        let out = Layout::from_file(path_from_root("tests/layout_margins.yaml"))
+        let out = Layout::from_file(PathBuf::from("tests/layout_margins.yaml"))
            .unwrap()
            .build(ProblemPanic).0
            .unwrap();
@ -1025,35 +859,4 @@ mod tests {
            }
        );
    }
-
-    #[test]
-    fn test_extract_symbols() {
-        let actions = [(
-            "ac",
-            action::Action::Submit {
-                text: None,
-                keys: vec![
-                    action::KeySym("a".into()),
-                    action::KeySym("c".into()),
-                ],
-            },
-        )];
-        assert_eq!(
-            extract_symbol_names(&actions[..]).collect::<Vec<_>>(),
-            vec!["a", "c"],
-        );
-    }
-
-    #[test]
-    fn test_extract_symbols_erase() {
-        let actions = [(
-            "Erase",
-            action::Action::Erase,
-        )];
-        assert_eq!(
-            extract_symbol_names(&actions[..]).collect::<Vec<_>>(),
-            vec!["BackSpace"],
-        );
-    }
-
 }
--- a/src/dbus.c
+++ b/src/dbus.c
@ -59,7 +59,7 @@ handle_set_visible(SmPuriOSK0 *object, GDBusMethodInvocation *invocation,

    if (service->context) {
        if (arg_visible) {
-            server_context_service_force_show_keyboard (service->context);
+            server_context_service_show_keyboard (service->context);
        } else {
            server_context_service_hide_keyboard (service->context);
        }
--- a/src/drawing.rs
+++ b/src/drawing.rs
@ -3,24 +3,18 @@
 use cairo;
 use std::cell::RefCell;

-use ::action::{ Action, Modifier };
 use ::keyboard;
-use ::layout::{ Button, Label, LatchedState, Layout };
-use ::layout::c::{ Bounds, EekGtkKeyboard, Point };
-use ::submission::Submission;
+use ::layout::{ Button, Layout };
+use ::layout::c::{ EekGtkKeyboard, Point };

 use glib::translate::FromGlibPtrNone;
 use gtk::WidgetExt;

-use std::collections::HashSet;
-use std::ffi::CStr;
-use std::ptr;
-
 mod c {
    use super::*;

    use cairo_sys;
-    use std::os::raw::{ c_char, c_void };
+    use std::os::raw::c_void;
    
    // This is constructed only in C, no need for warnings
    #[allow(dead_code)]
@ -28,81 +22,45 @@ mod c {
    #[derive(Clone, Copy)]
    pub struct EekRenderer(*const c_void);

-    // This is constructed only in C, no need for warnings
-    /// Just don't clone this for no reason.
-    #[allow(dead_code)]
-    #[repr(transparent)]
-    #[derive(Clone, Copy)]
-    pub struct GtkStyleContext(*const c_void);
-
-
+    #[no_mangle]
    extern "C" {
+        // Button and View inside CButtonPlace are safe to pass to C
+        // as long as they don't outlive the call
+        // and nothing dereferences them
        #[allow(improper_ctypes)]
-        pub fn eek_renderer_get_scale_factor(
+        pub fn eek_render_button(
            renderer: EekRenderer,
-        ) -> u32;
-
-        #[allow(improper_ctypes)]
-        pub fn eek_render_button_in_context(
-            scale_factor: u32,
            cr: *mut cairo_sys::cairo_t,
-            ctx: GtkStyleContext,
-            bounds: Bounds,
-            icon_name: *const c_char,
-            label: *const c_char,
-        );
-
-        #[allow(improper_ctypes)]
-        pub fn eek_get_style_context_for_button(
-            renderer: EekRenderer,
-            name: *const c_char,
-            outline_name: *const c_char,
-            locked_class: *const c_char,
+            button: *const Button,
            pressed: u64,
-        ) -> GtkStyleContext;
-
-        #[allow(improper_ctypes)]
-        pub fn eek_put_style_context_for_button(
-            ctx: GtkStyleContext,
-            outline_name: *const c_char,
-            locked_class: *const c_char,
+            locked: u64,
        );
    }

-    /// Draws all buttons that are not in the base state
    #[no_mangle]
    pub extern "C"
    fn squeek_layout_draw_all_changed(
        layout: *mut Layout,
        renderer: EekRenderer,
        cr: *mut cairo_sys::cairo_t,
-        submission: *const Submission,
    ) {
        let layout = unsafe { &mut *layout };
-        let submission = unsafe { &*submission };
        let cr = unsafe { cairo::Context::from_raw_none(cr) };
-        let active_modifiers = submission.get_active_modifiers();

-        layout.foreach_visible_button(|offset, button| {
-            let state = RefCell::borrow(&button.state).clone();
-
-            let locked = LockedStyle::from_action(
-                &state.action,
-                &active_modifiers,
-                layout.get_view_latched(),
-                &layout.current_view,
-            );
-            if state.pressed == keyboard::PressType::Pressed
-                || locked != LockedStyle::Free
-            {
-                render_button_at_position(
-                    renderer, &cr,
-                    offset,
-                    button.as_ref(),
-                    state.pressed, locked,
-                );
+        let view = layout.get_current_view();
+        for (row_offset, row) in &view.get_rows() {
+            for (x_offset, button) in &row.buttons {
+                let state = RefCell::borrow(&button.state).clone();
+                if state.pressed == keyboard::PressType::Pressed || state.locked {
+                    render_button_at_position(
+                        renderer, &cr,
+                        row_offset + Point { x: *x_offset, y: 0.0 },
+                        button.as_ref(),
+                        state.pressed, state.locked,
+                    );
+                }
            }
-        })
+        }
    }
    
    #[no_mangle]
@ -114,61 +72,28 @@ mod c {
    ) {
        let layout = unsafe { &mut *layout };
        let cr = unsafe { cairo::Context::from_raw_none(cr) };
-        
-        layout.foreach_visible_button(|offset, button| {
-            render_button_at_position(
-                renderer, &cr,
-                offset,
-                button.as_ref(),
-                keyboard::PressType::Released,
-                LockedStyle::Free,
-            );
-        })
-    }
-}
-
-#[derive(Clone, Copy, PartialEq, Debug)]
-enum LockedStyle {
-    Free,
-    Latched,
-    Locked,
-}
-
-impl LockedStyle {
-    fn from_action(
-        action: &Action,
-        mods: &HashSet<Modifier>,
-        latched_view: &LatchedState,
-        current_view: &str,
-    ) -> LockedStyle {
-        let active_mod = match action {
-            Action::ApplyModifier(m) => mods.contains(m),
-            _ => false,
-        };
-        
-        let active_view = action.is_active(current_view);
-        let latched_button = match latched_view {
-            LatchedState::Not => false,
-            LatchedState::FromView(view) => !action.has_locked_appearance_from(view),
-        };
-        match (active_mod, active_view, latched_button) {
-            // Modifiers don't latch.
-            (true, _, _) => LockedStyle::Locked,
-            (false, true, false) => LockedStyle::Locked,
-            (false, true, true) => LockedStyle::Latched,
-            _ => LockedStyle::Free,
+        let view = layout.get_current_view();
+        for (row_offset, row) in &view.get_rows() {
+            for (x_offset, button) in &row.buttons {
+                render_button_at_position(
+                    renderer, &cr,
+                    row_offset + Point { x: *x_offset, y: 0.0 },
+                    button.as_ref(),
+                    keyboard::PressType::Released, false,
+                );
+            }
        }
    }
 }

 /// Renders a button at a position (button's own bounds ignored)
-fn render_button_at_position(
+pub fn render_button_at_position(
    renderer: c::EekRenderer,
    cr: &cairo::Context,
    position: Point,
    button: &Button,
    pressed: keyboard::PressType,
-    locked: LockedStyle,
+    locked: bool,
 ) {
    cr.save();
    cr.translate(position.x, position.y);
@ -177,110 +102,19 @@ fn render_button_at_position(
        button.size.width, button.size.height
    );
    cr.clip();
-
-    let scale_factor = unsafe {
-        c::eek_renderer_get_scale_factor(renderer)
-    };
-    let bounds = button.get_bounds();
-    let (label_c, icon_name_c) = match &button.label {
-        Label::Text(text) => (text.as_ptr(), ptr::null()),
-        Label::IconName(name) => {
-            let l = unsafe {
-                // CStr doesn't allocate anything, so it only points to
-                // the 'static str, avoiding a memory leak
-                CStr::from_bytes_with_nul_unchecked(b"icon\0")
-            };
-            (l.as_ptr(), name.as_ptr())
-        },
-    };
-
-    with_button_context(
-        renderer,
-        button,
-        pressed,
-        locked,
-        |ctx| unsafe {
-            // TODO: split into separate procedures:
-            // draw outline, draw label, draw icon.
-            c::eek_render_button_in_context(
-                scale_factor,
-                cairo::Context::to_raw_none(&cr),
-                *ctx,
-                bounds,
-                icon_name_c,
-                label_c,
-            )
-        }
-    );
-
-    cr.restore();
-}
-
-fn with_button_context<R, F: FnOnce(&c::GtkStyleContext) -> R>(
-    renderer: c::EekRenderer,
-    button: &Button,
-    pressed: keyboard::PressType,
-    locked: LockedStyle,
-    operation: F,
-) -> R {
-    let outline_name_c = button.outline_name.as_ptr();
-    let locked_class_c = match locked {
-        LockedStyle::Free => ptr::null(),
-        LockedStyle::Locked => unsafe {
-            CStr::from_bytes_with_nul_unchecked(b"locked\0").as_ptr()
-        },
-        LockedStyle::Latched => unsafe {
-            CStr::from_bytes_with_nul_unchecked(b"latched\0").as_ptr()
-        },
-    };
-    
-    let ctx = unsafe {
-        c::eek_get_style_context_for_button(
-            renderer,
-            button.name.as_ptr(),
-            outline_name_c,
-            locked_class_c,
-            pressed as u64,
-        )
-    };
-    
-    let r = operation(&ctx);
-
    unsafe {
-        c::eek_put_style_context_for_button(
-            ctx,
-            outline_name_c,
-            locked_class_c,
+        c::eek_render_button(
+            renderer,
+            cairo::Context::to_raw_none(&cr),
+            button as *const Button,
+            pressed as u64,
+            locked as u64,
        )
    };
-
-    r
+    cr.restore();
 }

 pub fn queue_redraw(keyboard: EekGtkKeyboard) {
    let widget = unsafe { gtk::Widget::from_glib_none(keyboard.0) };
    widget.queue_draw();
 }
-
-#[cfg(test)]
-mod test {
-    use super::*;
-
-    #[test]
-    fn test_exit_only() {
-        assert_eq!(
-            LockedStyle::from_action(
-                &Action::LockView {
-                    lock: "ab".into(), 
-                    unlock: "a".into(),
-                    latches: true,
-                    looks_locked_from: vec!["b".into()],
-                },
-                &HashSet::new(),
-                &LatchedState::FromView("b".into()),
-                "ab",
-            ),
-            LockedStyle::Locked,
-        );
-    }
-}
--- a/src/imservice.c
+++ b/src/imservice.c
@ -25,7 +25,6 @@ static const struct zwp_input_method_v2_listener input_method_listener = {

 struct submission* get_submission(struct zwp_input_method_manager_v2 *immanager,
                                  struct zwp_virtual_keyboard_manager_v1 *vkmanager,
-                                  struct vis_manager *vis_manager,
                                  struct wl_seat *seat,
                                  EekboardContextService *state) {
    struct zwp_input_method_v2 *im = NULL;
@ -36,7 +35,7 @@ struct submission* get_submission(struct zwp_input_method_manager_v2 *immanager,
    if (vkmanager) {
        vk = zwp_virtual_keyboard_manager_v1_create_virtual_keyboard(vkmanager, seat);
    }
-    return submission_new(im, vk, state, vis_manager);
+    return submission_new(im, vk, state);
 }

 /// Un-inlined
@ -50,23 +49,6 @@ void imservice_connect_listeners(struct zwp_input_method_v2 *im, struct imservic
    zwp_input_method_v2_add_listener(im, &input_method_listener, imservice);
 }

-void
-eek_input_method_commit_string(struct zwp_input_method_v2 *zwp_input_method_v2, const char *text)
-{
-    zwp_input_method_v2_commit_string(zwp_input_method_v2, text);
-}
-
-void
-eek_input_method_delete_surrounding_text(struct zwp_input_method_v2 *zwp_input_method_v2, uint32_t before_length, uint32_t after_length) {
-    zwp_input_method_v2_delete_surrounding_text(zwp_input_method_v2, before_length, after_length);
-};
-
-void
-eek_input_method_commit(struct zwp_input_method_v2 *zwp_input_method_v2, uint32_t serial)
-{
-    zwp_input_method_v2_commit(zwp_input_method_v2, serial);
-}
-
 /// Declared explicitly because _destroy is inline,
 /// making it unavailable in Rust
 void imservice_destroy_im(struct zwp_input_method_v2 *im) {
--- a/src/imservice.rs
+++ b/src/imservice.rs
@ -1,8 +1,3 @@
-/*! Manages zwp_input_method_v2 protocol.
- * 
- * Library module.
- */
-
 use std::boxed::Box;
 use std::ffi::CString;
 use std::fmt;
@ -23,7 +18,7 @@ pub mod c {

    use std::os::raw::{c_char, c_void};

-    pub use ::ui_manager::c::UIManager;
+    pub use ::submission::c::UIManager;
    pub use ::submission::c::StateManager;

    // The following defined in C
@ -32,15 +27,14 @@ pub mod c {
    #[repr(transparent)]
    pub struct InputMethod(*const c_void);

+    #[no_mangle]
    extern "C" {
        fn imservice_destroy_im(im: *mut c::InputMethod);
-
        #[allow(improper_ctypes)] // IMService will never be dereferenced in C
        pub fn imservice_connect_listeners(im: *mut InputMethod, imservice: *const IMService);
-        pub fn eek_input_method_commit_string(im: *mut InputMethod, text: *const c_char);
-        pub fn eek_input_method_delete_surrounding_text(im: *mut InputMethod, before: u32, after: u32);
-        pub fn eek_input_method_commit(im: *mut InputMethod, serial: u32);
        fn eekboard_context_service_set_hint_purpose(state: *const StateManager, hint: u32, purpose: u32);
+        fn server_context_service_show_keyboard(imservice: *const UIManager);
+        fn server_context_service_hide_keyboard(imservice: *const UIManager);
    }
    
    // The following defined in Rust. TODO: wrap naked pointers to Rust data inside RefCells to prevent multiple writers
@ -149,11 +143,11 @@ pub mod c {
            ..IMProtocolState::default()
        };

-        imservice.serial += Wrapping(1u32);
-
        if active_changed {
-            (imservice.active_callback)(imservice.current.active);
            if imservice.current.active {
+                if let Some(ui) = imservice.ui_manager {
+                    unsafe { server_context_service_show_keyboard(ui); }
+                }
                unsafe {
                    eekboard_context_service_set_hint_purpose(
                        imservice.state_manager,
@ -161,6 +155,10 @@ pub mod c {
                        imservice.current.content_purpose.clone() as u32,
                    );
                }
+            } else {
+                if let Some(ui) = imservice.ui_manager {
+                    unsafe { server_context_service_hide_keyboard(ui); }
+                }
            }
        }
    }
@ -178,7 +176,9 @@ pub mod c {
        // the keyboard is already decommissioned
        imservice.current.active = false;

-        (imservice.active_callback)(imservice.current.active);
+        if let Some(ui) = imservice.ui_manager {
+            unsafe { server_context_service_hide_keyboard(ui); }
+        }
    }    

    // FIXME: destroy and deallocate
@ -328,10 +328,11 @@ impl Default for IMProtocolState {

 pub struct IMService {
    /// Owned reference (still created and destroyed in C)
-    pub im: *mut c::InputMethod,
+    pub im: *const c::InputMethod,
    /// Unowned reference. Be careful, it's shared with C at large
    state_manager: *const c::StateManager,
-    active_callback: Box<dyn Fn(bool)>,
+    /// Unowned reference. Be careful, it's shared with C at large
+    pub ui_manager: Option<*const c::UIManager>,

    pending: IMProtocolState,
    current: IMProtocolState, // turn current into an idiomatic representation?
@ -339,22 +340,16 @@ pub struct IMService {
    serial: Wrapping<u32>,
 }

-pub enum SubmitError {
-    /// The input method had not been activated
-    NotActive,
-}
-
 impl IMService {
    pub fn new(
        im: *mut c::InputMethod,
        state_manager: *const c::StateManager,
-        active_callback: Box<dyn Fn(bool)>,
    ) -> Box<IMService> {
        // IMService will be referenced to by C,
        // so it needs to stay in the same place in memory via Box
        let imservice = Box::new(IMService {
            im,
-            active_callback,
+            ui_manager: None,
            state_manager,
            pending: IMProtocolState::default(),
            current: IMProtocolState::default(),
@ -369,50 +364,4 @@ impl IMService {
        }
        imservice
    }
-
-    pub fn commit_string(&self, text: &CString) -> Result<(), SubmitError> {
-        match self.current.active {
-            true => {
-                unsafe {
-                    c::eek_input_method_commit_string(self.im, text.as_ptr())
-                }
-                Ok(())
-            },
-            false => Err(SubmitError::NotActive),
-        }
-    }
-
-    pub fn delete_surrounding_text(
-        &self,
-        before: u32, after: u32,
-    ) -> Result<(), SubmitError> {
-        match self.current.active {
-            true => {
-                unsafe {
-                    c::eek_input_method_delete_surrounding_text(
-                        self.im,
-                        before, after,
-                    )
-                }
-                Ok(())
-            },
-            false => Err(SubmitError::NotActive),
-        }
-    }
-
-    pub fn commit(&mut self) -> Result<(), SubmitError> {
-        match self.current.active {
-            true => {
-                unsafe {
-                    c::eek_input_method_commit(self.im, self.serial.0)
-                }
-                Ok(())
-            },
-            false => Err(SubmitError::NotActive),
-        }
-    }
-
-    pub fn is_active(&self) -> bool {
-        self.current.active
-    }
 }
--- a/src/keyboard.rs
+++ b/src/keyboard.rs
@ -1,19 +1,14 @@
 /*! State of the emulated keyboard and keys.
 * Regards the keyboard as if it was composed of switches. */

-use std::cell::RefCell;
 use std::collections::HashMap;
 use std::fmt;
 use std::io;
-use std::mem;
-use std::ptr;
-use std::rc::Rc;
 use std::string::FromUtf8Error;

 use ::action::Action;
-use ::util;
+use ::logging;

-// Traits
 use std::io::Write;
 use std::iter::{ FromIterator, IntoIterator };

@ -23,46 +18,30 @@ pub enum PressType {
    Pressed = 1,
 }

-/// The extended, unambiguous layout-keycode
-#[derive(Debug, Clone)]
-pub struct KeyCode {
-    pub code: u32,
-    pub keymap_idx: usize,
-}
-
-bitflags!{
-    /// Map to `virtual_keyboard.modifiers` modifiers values
-    /// From https://www.x.org/releases/current/doc/kbproto/xkbproto.html#Keyboard_State
-    pub struct Modifiers: u8 {
-        const SHIFT = 0x1;
-        const LOCK = 0x2;
-        const CONTROL = 0x4;
-        /// Alt
-        const MOD1 = 0x8;
-        const MOD2 = 0x10;
-        const MOD3 = 0x20;
-        /// Meta
-        const MOD4 = 0x40;
-        /// AltGr
-        const MOD5 = 0x80;
-    }
-}
-
-/// When the submitted actions of keys need to be tracked,
-/// they need a stable, comparable ID
-#[derive(Clone, PartialEq)]
-pub struct KeyStateId(*const KeyState);
+pub type KeyCode = u32;

 #[derive(Debug, Clone)]
 pub struct KeyState {
    pub pressed: PressType,
-    /// A cache of raw keycodes derived from Action::Submit given a keymap
+    pub locked: bool,
+    /// A cache of raw keycodes derived from Action::Sumbit given a keymap
    pub keycodes: Vec<KeyCode>,
    /// Static description of what the key does when pressed or released
    pub action: Action,
 }

 impl KeyState {
+    #[must_use]
+    pub fn into_activated(self) -> KeyState {
+        match self.action {
+            Action::LockView { lock: _, unlock: _ } => KeyState {
+                locked: self.locked ^ true,
+                ..self
+            },
+            _ => self,
+        }
+    }
+
    #[must_use]
    pub fn into_released(self) -> KeyState {
        KeyState {
@ -70,27 +49,13 @@ impl KeyState {
            ..self
        }
    }
-
-    #[must_use]
-    pub fn into_pressed(self) -> KeyState {
-        KeyState {
-            pressed: PressType::Pressed,
-            ..self
-        }
-    }
-
-    /// KeyStates instances are the unique identifiers of pressed keys,
-    /// and the actions submitted with them.
-    pub fn get_id(keystate: &Rc<RefCell<KeyState>>) -> KeyStateId {
-        KeyStateId(keystate.as_ptr() as *const KeyState)
-    }
 }

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

@ -133,54 +95,9 @@ impl From<io::Error> for FormattingError {
    }
 }

-/// Index is the key code, String is the occupant.
-/// Starts all empty.
-/// https://gitlab.freedesktop.org/xorg/xserver/-/issues/260
-type SingleKeyMap = [Option<String>; 256];
-
-fn single_key_map_new() -> SingleKeyMap {
-    // Why can't we just initialize arrays without tricks -_- ?
-    unsafe {
-        // Inspired by
-        // https://www.reddit.com/r/rust/comments/5n7bh1/how_to_create_an_array_of_a_type_with_clone_but/
-        #[cfg(feature = "rustc_less_1_36")]
-        let mut array: SingleKeyMap = mem::uninitialized();
-        #[cfg(not(feature = "rustc_less_1_36"))]
-        let mut array: SingleKeyMap = mem::MaybeUninit::uninit().assume_init();
-
-        for element in array.iter_mut() {
-            ptr::write(element, None);
-        }
-        array
-    }
-}
-
-pub fn generate_keymaps(symbolmap: HashMap::<String, KeyCode>)
-    -> Result<Vec<String>, FormattingError>
-{
-    let mut bins: Vec<SingleKeyMap> = Vec::new();
-    
-    for (name, KeyCode { code, keymap_idx }) in symbolmap.into_iter() {
-        if keymap_idx >= bins.len() {
-            bins.resize_with(
-                keymap_idx + 1,
-                || single_key_map_new(),
-            );
-        }
-        bins[keymap_idx][code as usize] = Some(name);
-    }
-
-    let mut out = Vec::new();
-    for bin in bins {
-        out.push(generate_keymap(&bin)?);
-    }
-    Ok(out)
-}
-
-/// Generates a de-facto single level keymap.
-/// Key codes must not repeat and must remain between 9 and 255.
-fn generate_keymap(
-    symbolmap: &SingleKeyMap,
+/// Generates a de-facto single level keymap. TODO: actually drop second level
+pub fn generate_keymap(
+    keystates: &HashMap::<String, KeyState>
 ) -> Result<String, FormattingError> {
    let mut buf: Vec<u8> = Vec::new();
    writeln!(
@ -191,80 +108,66 @@ fn generate_keymap(
        minimum = 8;
        maximum = 255;"
    )?;
-
-    let pairs: Vec<(&String, usize)> = symbolmap.iter()
-        // Attach a key code to each cell.
-        .enumerate()
-        // Get rid of empty keycodes.
-        .filter_map(|(code, name)| name.as_ref().map(|n| (n, code)))
-        .collect();
    
-    // Xorg can only consume up to 255 keys, so this may not work in Xwayland.
-    // Two possible solutions:
-    // - use levels to cram multiple characters into one key
-    // - swap layouts on key presses
-    for (_name, keycode) in &pairs {
-        write!(
-            buf,
-            "
-        <I{}> = {0};",
-            keycode,
-        )?;
+    for (name, state) in keystates.iter() {
+        if let Action::Submit { text: _, keys } = &state.action {
+            if let 0 = keys.len() {
+                log_print!(
+                    logging::Level::Warning,
+                    "Key {} has no keysyms", name,
+                );
+            };
+            for (named_keysym, keycode) in keys.iter().zip(&state.keycodes) {
+                write!(
+                    buf,
+                    "
+        <{}> = {};",
+                    named_keysym.0,
+                    keycode,
+                )?;
+            }
+        }
    }
-
+    
    writeln!(
        buf,
        "
-        indicator 1 = \"Caps Lock\"; // Xwayland won't accept without it.
    }};
    
    xkb_symbols \"squeekboard\" {{
-"
+
+        name[Group1] = \"Letters\";
+        name[Group2] = \"Numbers/Symbols\";"
    )?;
    
-    for (name, keycode) in pairs {
-        write!(
-            buf,
-            "
-key <I{}> {{ [ {} ] }};",
-            keycode,
-            name,
-        )?;
+    for (name, state) in keystates.iter() {
+        if let Action::Submit { text: _, keys } = &state.action {
+            for keysym in keys.iter() {
+                write!(
+                    buf,
+                    "
+        key <{}> {{ [ {0} ] }};",
+                    keysym.0,
+                )?;
+            }
+        }
    }
-
    writeln!(
        buf,
        "
    }};

    xkb_types \"squeekboard\" {{
-        virtual_modifiers Squeekboard; // No modifiers! Needed for Xorg for some reason.
-    
-        // Those names are needed for Xwayland.
-        type \"ONE_LEVEL\" {{
-            modifiers= none;
-            level_name[Level1]= \"Any\";
-        }};
-        type \"TWO_LEVEL\" {{
-            level_name[Level1]= \"Base\";
-        }};
-        type \"ALPHABETIC\" {{
-            level_name[Level1]= \"Base\";
-        }};
-        type \"KEYPAD\" {{
-            level_name[Level1]= \"Base\";
-        }};
-        type \"SHIFT+ALT\" {{
-            level_name[Level1]= \"Base\";
-        }};

+	type \"TWO_LEVEL\" {{
+            modifiers = Shift;
+            map[Shift] = Level2;
+            level_name[Level1] = \"Base\";
+            level_name[Level2] = \"Shift\";
+	}};
    }};

    xkb_compatibility \"squeekboard\" {{
-        // Needed for Xwayland again.
-        interpret Any+AnyOf(all) {{
-            action= SetMods(modifiers=modMapMods,clearLocks);
-        }};
    }};
 }};"
    )?;
@ -279,16 +182,24 @@ mod tests {
    
    use xkbcommon::xkb;

+    use ::action::KeySym;
+
    #[test]
-    fn test_keymap_single_resolve() {
-        let mut key_map = single_key_map_new();
-        key_map[9] = Some("a".into());
-        key_map[10] = Some("c".into());
-
-        let keymap_str = generate_keymap(&key_map).unwrap();
-
+    fn test_keymap_multi() {
        let context = xkb::Context::new(xkb::CONTEXT_NO_FLAGS);

+        let keymap_str = generate_keymap(&hashmap!{
+            "ac".into() => KeyState {
+                action: Action::Submit {
+                    text: None,
+                    keys: vec!(KeySym("a".into()), KeySym("c".into())),
+                },
+                keycodes: vec!(9, 10),
+                locked: false,
+                pressed: PressType::Released,
+            },
+        }).unwrap();
+
        let keymap = xkb::Keymap::new_from_string(
            &context,
            keymap_str.clone(),
@ -301,36 +212,4 @@ mod tests {
        assert_eq!(state.key_get_one_sym(9), xkb::KEY_a);
        assert_eq!(state.key_get_one_sym(10), xkb::KEY_c);
    }
-
-    #[test]
-    fn test_keymap_second_resolve() {
-        let keymaps = generate_keymaps(hashmap!(
-            "a".into() => KeyCode { keymap_idx: 1, code: 9 },
-        )).unwrap();
-
-        let context = xkb::Context::new(xkb::CONTEXT_NO_FLAGS);
-
-        let keymap = xkb::Keymap::new_from_string(
-            &context,
-            keymaps[1].clone(), // this index is part of the test
-            xkb::KEYMAP_FORMAT_TEXT_V1,
-            xkb::KEYMAP_COMPILE_NO_FLAGS,
-        ).expect("Failed to create keymap");
-
-        let state = xkb::State::new(&keymap);
-
-        assert_eq!(state.key_get_one_sym(9), xkb::KEY_a);
-    }
-
-    #[test]
-    fn test_symbolmap_overflow() {
-        // The 257th key (U1101) is interesting.
-        // Use Unicode encoding for being able to use in xkb keymaps.
-        let keynames = (0..258).map(|num| format!("U{:04X}", 0x1000 + num));
-        let keycodes = generate_keycodes(keynames);
-        
-        // test now
-        let code = keycodes.get("U1101").expect("Did not find the tested keysym");
-        assert_eq!(code.keymap_idx, 1);
-    }
 }
--- a/src/layout.h
+++ b/src/layout.h
@ -7,31 +7,29 @@
 #include "eek/eek-gtk-keyboard.h"
 #include "eek/eek-renderer.h"
 #include "eek/eek-types.h"
-#include "src/submission.h"
 #include "virtual-keyboard-unstable-v1-client-protocol.h"
-#include "text-input-unstable-v3-client-protocol.h"

 enum squeek_arrangement_kind {
    ARRANGEMENT_KIND_BASE = 0,
    ARRANGEMENT_KIND_WIDE = 1,
 };

-struct squeek_layout_state {
-    enum squeek_arrangement_kind arrangement;
-    enum zwp_text_input_v3_content_purpose purpose;
-    enum zwp_text_input_v3_content_hint hint;
-    char *layout_name;
-    char *overlay_name;
-};
-
 struct squeek_layout;

+EekBounds squeek_button_get_bounds(const struct squeek_button*);
+const char *squeek_button_get_label(const struct squeek_button*);
+const char *squeek_button_get_icon_name(const struct squeek_button*);
+const char *squeek_button_get_name(const struct squeek_button*);
+const char *squeek_button_get_outline_name(const struct squeek_button*);
+
+void squeek_button_print(const struct squeek_button* button);

 struct transformation squeek_layout_calculate_transformation(
        const struct squeek_layout *layout,
        double allocation_width, double allocation_size);

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

@ -55,6 +53,6 @@ void squeek_layout_drag(struct squeek_layout *layout,
                        struct transformation widget_to_layout,
                        uint32_t timestamp, EekboardContextService *manager,
                        EekGtkKeyboard *ui_keyboard);
-void squeek_layout_draw_all_changed(struct squeek_layout *layout, EekRenderer* renderer, cairo_t     *cr, struct submission *submission);
+void squeek_layout_draw_all_changed(struct squeek_layout *layout, EekRenderer* renderer, cairo_t     *cr);
 void squeek_draw_layout_base_view(struct squeek_layout *layout, EekRenderer* renderer, cairo_t     *cr);
 #endif
--- a/Show More
+++ b/Show More