text input: Reset hints when text input gone

This ensures that when the keyboard is force brought up next time, the user is not stuck with an overlay they can't switch. As a downside, there's a blink of default hint before the keyboard hides.
2020-12-15 12:50:47 +00:00
240 changed files with 4147 additions and 18472 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,6 +1,5 @@
+.zanata-cache/
 _build
-po/squeekboard.pot
-po/*.mo
 TAGS
 tags
 vgdump
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -1,180 +1,152 @@
-image: pureos/byzantium
+image: debian:bullseye

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

 before_script:
  - apt-get -y update
-  - apt-get -y install ca-certificates
+  - apt-get -y install wget ca-certificates gnupg
+  - echo "deb [trusted=yes] http://ci.puri.sm/ bullseyeci main" > /etc/apt/sources.list.d/ci.list
+  - wget -O- https://ci.puri.sm/ci-repo.key | apt-key add -
+  - apt-get -y update

 build_docs:
+  <<: *tags
  stage: build
  artifacts:
    paths:
      - _build
  script:
-    - apt-get -y install python3-pip python3-sphinx
-    - pip3 install recommonmark
-    - ./doc/build.sh _build
-  except:
-    variables:
-      - $PKG_ONLY == "1"
+      - apt-get -y install python3-pip python3-sphinx
+      - pip3 install recommonmark
+      - ./doc/build.sh _build

 build_meson:
-  image: debian:bookworm
+  tags:
+    - librem5
  stage: build
  artifacts:
    paths:
      - _build
    expire_in: 3h
  script:
-    - mv debian/control-newer debian/control
    - apt-get -y build-dep .
-    - meson . _build/ -Ddepdatadir=/usr/share -Dfind_orphans=true --werror
+    - meson . _build/ -Ddepdatadir=/usr/share --werror
    - ninja -C _build install
-  except:
-    variables:
-      - $PKG_ONLY == "1"

 build_deb:
-  stage: build
-  artifacts:
-    paths:
-      - '*.deb'
-  script:
-    - rm -f ../*.deb
-    - apt-get -y build-dep .
-    - apt-get -y install devscripts
-    - REV=$(git log -1 --format=%h)
-    - VER=$(dpkg-parsechangelog -SVersion)
-    - DEBFULLNAME="Librem5 CI"
-    - EMAIL="librem5-builds@lists.community.puri.sm"
-    - dch -v"$VER+librem5ci$CI_PIPELINE_ID.$REV" "$MSG"
-    - debuild -i -us -uc -b
-    - cp ../*.deb .
+    tags:
+        - librem5
+    stage: build
+    artifacts:
+      paths:
+        - "*.deb"
+    script:
+        - rm -f ../*.deb
+        - apt-get -y build-dep .
+        - apt-get -y install devscripts
+        - debuild -i -us -uc -b
+        - cp ../*.deb .
+
+build_deb:amber:
+    image: pureos/amber
+    tags:
+        - librem5
+    stage: build
+    artifacts:
+      paths:
+        - "*.deb"
+    script:
+        - echo "deb http://ci.puri.sm/ scratch librem5" > /etc/apt/sources.list.d/ci.list
+        - apt-get -y update
+        - rm -f ../*.deb
+        - apt-get -y build-dep .
+        - apt-get -y install devscripts
+        - debuild -i -us -uc -b
+        - cp ../*.deb .
+
+build_deb:buster:
+    image: "debian:buster"
+    tags:
+        - librem5
+    stage: build
+    artifacts:
+      paths:
+        - "*.deb"
+    script:
+        - echo "deb http://ci.puri.sm/ scratch librem5" > /etc/apt/sources.list.d/ci.list
+        - apt-get -y update
+        - rm -f ../*.deb
+        - apt-get -y build-dep .
+        - apt-get -y install devscripts
+        - debuild -i -us -uc -b
+        - cp ../*.deb .
+

 build_deb:arm64:
-  image: pureos/byzantium
-  tags:
-    - aarch64
-  stage: build
-  artifacts:
-    paths:
-      - '*.deb'
-  script:
-    - rm -f ../*.deb
-    - apt-get -y build-dep .
-    - apt-get -y install devscripts
-    - REV=$(git log -1 --format=%h)
-    - VER=$(dpkg-parsechangelog -SVersion)
-    - DEBFULLNAME="Librem5 CI"
-    - EMAIL="librem5-builds@lists.community.puri.sm"
-    - dch -v"$VER+librem5ci$CI_PIPELINE_ID.$REV" "$MSG"
-    - debuild -i -us -uc -b
-    - cp ../*.deb .
+    tags:
+        - librem5:arm64
+    stage: build
+    artifacts:
+      paths:
+        - "*.deb"
+    script:
+        - rm -f ../*.deb
+        - apt-get -y build-dep .
+        - apt-get -y install devscripts
+        - debuild -i -us -uc -b
+        - cp ../*.deb .

-build_deb:future:
-  image: debian:bookworm
-  allow_failure: true
-  tags:
-    - aarch64
-  stage: build
-  artifacts:
-    paths:
-      - '*.deb'
-  script:
-    - rm -f ../*.deb
-    - mv debian/control-newer debian/control
-    - apt-get -y build-dep .
-    - apt-get -y install devscripts
-    - REV=$(git log -1 --format=%h)
-    - VER=$(dpkg-parsechangelog -SVersion)
-    - DEBFULLNAME="Librem5 CI"
-    - EMAIL="librem5-builds@lists.community.puri.sm"
-    - dch -v"$VER+librem5ci$CI_PIPELINE_ID.$REV" "$MSG"
-    - debuild -i -us -uc -b
-    - cp ../*.deb .
-
-build_reference:
-  image: debian:bookworm
-  stage: build
-  needs:
-    - job: build_meson
-      artifacts: true
-  artifacts:
-    paths:
-      - _build/doc
-  script:
-    - apt-get -y install cargo
-    - cd _build
-    - ../cargo.sh doc --no-deps --document-private-items
-  except:
-    variables:
-      - $PKG_ONLY == "1"
+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:
-  stage: test
-  needs:
-    - job: build_deb
-      artifacts: true
-  script:
-    - apt-get -y install lintian
-    - lintian *.deb
-  except:
-    variables:
-      - $PKG_ONLY == "1"
+    <<: *tags
+    stage: test
+    dependencies:
+        - build_deb
+    script:
+        - apt-get -y install lintian
+        - lintian *.deb

 test:
-  image: debian:bookworm
+  tags:
+    - librem5
  stage: test
  needs:
-    - job: build_meson
-      artifacts: true
+    - build_meson
  script:
-    - mv debian/control-newer debian/control
    - apt-get -y build-dep .
    - apt-get -y install clang-tidy
    - ninja -C _build test
-    - tools/style-check_build _build
-  except:
-    variables:
-      - $PKG_ONLY == "1"
-
-test_style:
-  stage: test
-  needs: []
-  script:
-    - apt-get -y build-dep .
-    - tools/style-check_source
-  except:
-    variables:
-      - $PKG_ONLY == "1"
+    - 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
-  needs: []
  only:
    refs:
      - master
  script:
    - apt-get -y install git python3
    - (head -n 1 ./debian/changelog && git tag) | ./debian/check_release.py
-  except:
-    variables:
-      - $PKG_ONLY == "1"
-
-pages:
-  stage: deploy
-  needs:
-    - build_docs
-    - build_reference
-  script:
-    - mv _build/ public/
-  artifacts:
-    paths:
-      - public
-  only:
-    refs:
-      - master
--- a/Cargo.deps
+++ b/Cargo.deps
@ -1,17 +1,11 @@
 # Dependencies which change based on build flags
 bitflags = "1.2.*"
 clap = { version = "2.33.*", default-features = false }
-zbus = "1.0.*"
-zvariant = "2.0.*"
-# Newer versions seem to confuse the version of Cargo on Debian Bullseye
-zvariant_derive = "2.0.*"
+regex = { version = "1.3.*", default-features = false, features = ["std", "unicode-case"] }

 [dependencies.cairo-rs]
 version = "0.7.*"

-[dependencies.cairo-sys-rs]
-version = "0.9"
-
 [dependencies.gdk]
 version = "0.11.*"

@ -23,14 +17,6 @@ features = ["v2_44"]
 version = "0.8.*"
 features = ["v2_44"]

-[dependencies.glib-sys]
-version = "*"
-features = ["v2_44"]
-
 [dependencies.gtk]
 version = "0.7.*"
 features = ["v3_22"]
-
-[dependencies.gtk-sys]
-version = "0.9"
-features = ["v3_22"]
--- a/Cargo.deps.legacy
+++ b/Cargo.deps.legacy
@ -0,0 +1,22 @@
+# Dependencies which change based on build flags
+bitflags = "1.0.*"
+clap = { version = "2.32.*", default-features = false }
+regex = { version = "1.1.*", default-features = false, features = ['use_std'] }
+
+[dependencies.cairo-rs]
+version = "0.5.*"
+
+[dependencies.gdk]
+version = "0.9.*"
+
+[dependencies.gio]
+version = "0.5.*"
+features = ["v2_44"]
+
+[dependencies.glib]
+version = "0.6.*"
+features = ["v2_44"]
+
+[dependencies.gtk]
+version = "0.5.*"
+features = ["v3_22"]
--- a/Cargo.deps.newer
+++ b/Cargo.deps.newer
@ -1,38 +0,0 @@
-# Dependencies and tools which change based on build flags
-# For the newer-than-Byzantium config
-
-bitflags = "1.3.*"
-clap = { version = "4.*", features=["std"], default-features = false }
-zbus = "1.9.*"
-zvariant = "2.10.*"
-# Newer versions seem to confuse the version of Cargo on Debian Bullseye
-zvariant_derive = "2.10.*"
-
-[dependencies.cairo-rs]
-version = "0.14.*"
-
-[dependencies.cairo-sys-rs]
-version = "0.14.*"
-
-[dependencies.gdk]
-version = "0.14.*"
-
-[dependencies.gio]
-version = "0.14.*"
-features = ["v2_58"]
-
-[dependencies.glib]
-version = "0.14.*"
-features = ["v2_58"]
-
-[dependencies.glib-sys]
-version = "0.14.*"
-features = ["v2_58"]
-
-[dependencies.gtk]
-version = "0.14.*"
-features = ["v3_22"]
-
-[dependencies.gtk-sys]
-version = "0.14.*"
-features = ["v3_22"]
--- a/Cargo.deps.online
+++ b/Cargo.deps.online
@ -1,4 +0,0 @@
-# Dependencies which are only used with online, crates.io builds.
-[patch.crates-io]
-# Dependency was yanked, but gio 0.7 needs it.
-fragile = { git = "https://source.puri.sm/dorota.czaplejewicz/fragile.git", tag = "0.3.0" }
--- a/Cargo.lock
+++ b/Cargo.lock
@ -1,7 +1,5 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
-
 [[package]]
 name = "atk"
 version = "0.7.0"
@ -28,24 +26,12 @@ dependencies = [
 "pkg-config",
 ]

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

-[[package]]
-name = "byteorder"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
-
 [[package]]
 name = "cairo-rs"
 version = "0.7.1"
@ -73,27 +59,15 @@ dependencies = [

 [[package]]
 name = "cc"
-version = "1.0.90"
+version = "1.0.65"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5"
-
-[[package]]
-name = "cfg-if"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
-
-[[package]]
-name = "cfg-if"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+checksum = "95752358c8f7552394baf48cd82695b345628ad3f170d607de3ca03b8dacca15"

 [[package]]
 name = "clap"
-version = "2.33.4"
+version = "2.33.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "826bf7bc84f9435630275cb8e802a4a0ec792b615969934bd16d42ffed10f207"
+checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002"
 dependencies = [
 "bitflags",
 "textwrap",
@ -101,50 +75,16 @@ dependencies = [
 ]

 [[package]]
-name = "derivative"
-version = "2.2.0"
+name = "dtoa"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "enumflags2"
-version = "0.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83c8d82922337cd23a15f88b70d8e4ef5f11da38dd7cdb55e84dd5de99695da0"
-dependencies = [
- "enumflags2_derive",
- "serde",
-]
-
-[[package]]
-name = "enumflags2_derive"
-version = "0.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "946ee94e3dbf58fdd324f9ce245c7b238d46a66f00e86a020b71996349e46cce"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "fastrand"
-version = "1.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be"
-dependencies = [
- "instant",
-]
+checksum = "134951f4028bdadb9b84baf4232681efbf277da25144b9b0ad65df75946c422b"

 [[package]]
 name = "fragile"
 version = "0.3.0"
-source = "git+https://source.puri.sm/dorota.czaplejewicz/fragile.git?tag=0.3.0#51048ca11824279c2114c77fef5bcb950838fc09"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05f8140122fa0d5dcb9fc8627cfce2b37cc1500f752636d46ea28bc26785c2f9"

 [[package]]
 name = "gdk"
@ -317,31 +257,6 @@ dependencies = [
 "pkg-config",
 ]

-[[package]]
-name = "hashbrown"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
-
-[[package]]
-name = "indexmap"
-version = "1.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
-dependencies = [
- "autocfg",
- "hashbrown",
-]
-
-[[package]]
-name = "instant"
-version = "0.1.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
-dependencies = [
- "cfg-if 1.0.0",
-]
-
 [[package]]
 name = "lazy_static"
 version = "1.4.0"
@ -350,15 +265,15 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"

 [[package]]
 name = "libc"
-version = "0.2.153"
+version = "0.2.80"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
+checksum = "4d58d1b70b004888f764dfbf6a26a3b0342a1632d33968e4a179d8011c760614"

 [[package]]
 name = "linked-hash-map"
-version = "0.5.6"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
+checksum = "8dd5a6d5999d9907cda8ed67bbd137d3af8085216c2ac62de5be860bd41f304a"

 [[package]]
 name = "maplit"
@ -376,19 +291,6 @@ dependencies = [
 "winapi",
 ]

-[[package]]
-name = "nix"
-version = "0.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50e4785f2c3b7589a0d0c1dd60285e1188adac4006e8abd6dd578e1567027363"
-dependencies = [
- "bitflags",
- "cc",
- "cfg-if 0.1.10",
- "libc",
- "void",
-]
-
 [[package]]
 name = "pango"
 version = "0.7.0"
@ -418,37 +320,43 @@ dependencies = [

 [[package]]
 name = "pkg-config"
-version = "0.3.30"
+version = "0.3.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
-
-[[package]]
-name = "proc-macro-crate"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785"
-dependencies = [
- "toml",
-]
+checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c"

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

 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37"
 dependencies = [
 "proc-macro2",
 ]

+[[package]]
+name = "regex"
+version = "1.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c3780fcf44b193bc4d09f36d2a3c87b251da4a046c87795a0d35f4f927ad8e6"
+dependencies = [
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.6.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b181ba2dcf07aaccad5448e8ead58db5b742cf85dfe035e2227f137a539a189"
+
 [[package]]
 name = "rs"
 version = "0.1.0"
@ -464,89 +372,53 @@ dependencies = [
 "gtk",
 "gtk-sys",
 "maplit",
+ "regex",
 "serde",
 "serde_yaml",
 "xkbcommon",
- "zbus",
- "zvariant",
- "zvariant_derive",
 ]

-[[package]]
-name = "ryu"
-version = "1.0.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1"
-
-[[package]]
-name = "scoped-tls"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
-
 [[package]]
 name = "serde"
-version = "1.0.197"
+version = "1.0.117"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2"
+checksum = "b88fa983de7720629c9387e9f517353ed404164b1e482c970a90c1a4aaf7dc1a"
 dependencies = [
 "serde_derive",
 ]

 [[package]]
 name = "serde_derive"
-version = "1.0.197"
+version = "1.0.117"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b"
+checksum = "cbd1ae72adb44aab48f325a02444a5fc079349a8d804c1fc922aed3f7454c74e"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.52",
-]
-
-[[package]]
-name = "serde_repr"
-version = "0.1.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.52",
+ "syn",
 ]

 [[package]]
 name = "serde_yaml"
-version = "0.8.26"
+version = "0.8.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b"
+checksum = "f7baae0a99f1a324984bcdc5f0718384c1f69775f1c7eec8b859b71b443e3fd7"
 dependencies = [
- "indexmap",
- "ryu",
+ "dtoa",
+ "linked-hash-map",
 "serde",
 "yaml-rust",
 ]

 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "1.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+checksum = "cc371affeffc477f42a221a1e4297aedcea33d47d19b61455588bd9d8f6b19ac"
 dependencies = [
 "proc-macro2",
 "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.52"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
+ "unicode-xid",
 ]

 [[package]]
@ -558,32 +430,17 @@ dependencies = [
 "unicode-width",
 ]

-[[package]]
-name = "toml"
-version = "0.5.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "unicode-ident"
-version = "1.0.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
-
 [[package]]
 name = "unicode-width"
-version = "0.1.11"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"
+checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3"

 [[package]]
-name = "void"
-version = "1.0.2"
+name = "unicode-xid"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
+checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"

 [[package]]
 name = "winapi"
@ -609,9 +466,9 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"

 [[package]]
 name = "xkbcommon"
-version = "0.4.1"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "032ed00cc755c31221bbd6aaf9fa4196a01bf33bca185f9316e14f26d28c28cf"
+checksum = "fda0ea5f7ddabd51deeeda7799bee06274112f577da7dd3d954b8eda731b2fce"
 dependencies = [
 "libc",
 "memmap",
@ -619,62 +476,9 @@ dependencies = [

 [[package]]
 name = "yaml-rust"
-version = "0.4.5"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85"
+checksum = "39f0c922f1a334134dc2f7a8b67dc5d25f0735263feec974345ff706bcf20b0d"
 dependencies = [
 "linked-hash-map",
 ]
-
-[[package]]
-name = "zbus"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cb97c72cbfd5c7537ca730eeb810da7348f345ba67ab7673bcbe0d81c076427"
-dependencies = [
- "byteorder",
- "derivative",
- "enumflags2",
- "fastrand",
- "nix",
- "scoped-tls",
- "serde",
- "serde_repr",
- "zbus_macros",
- "zvariant",
- "zvariant_derive",
-]
-
-[[package]]
-name = "zbus_macros"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0c1f2a20a4cb90922b44d3bebd232b246e52b3dd95ed5bea8aec83cde3a5a8a"
-dependencies = [
- "proc-macro-crate",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "zvariant"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0bf85e67d1a3780cb1c56c80227532354f21907cba14805a773eb507b444580"
-dependencies = [
- "byteorder",
- "enumflags2",
- "serde",
-]
-
-[[package]]
-name = "zvariant_derive"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d68726e8c12757384a8d1485080527e263dea67d91f19e97cd71b9292f22d7c5"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
--- a/Cargo.lock.newer
+++ b/Cargo.lock.newer
--- a/Cargo.toml.in
+++ b/Cargo.toml.in
@ -1,7 +1,6 @@
 [package]
 name = "rs"
 version = "0.1.0"
-edition = "2021"

 [lib]
 name = "rs"
@ -17,16 +16,23 @@ path = "@path@/src/bin/test_layout.rs"
 name = "test_layout"
 path = "@path@/examples/test_layout.rs"

-[[example]]
-name = "find_orphan_layouts"
-path = "@path@/examples/find_orphan_layouts.rs"
-
 [features]
-glib_v0_14 = []
-zbus_v1_5 = []
-clap_v4 = []
+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.glib-sys]
+version = ""
+features = ["v2_44"]
+
+[dependencies.gtk-sys]
+version = ""
+features = ["v3_22"]
+
 [dependencies]
 maplit = "1.0.*"
 serde = { version = "1.0.*", features = ["derive"] }
--- a/NEWS.md
+++ b/NEWS.md
@ -1,59 +0,0 @@
-1.23.0
------------------
-
-New or updated translations:
- Belarusian
- Haitian Creole
-
-New layouts:
- French Canadian (QWERTY + accented letters)
- German terminal-layout
- Spanish terminal-layout
-
-Changes:
- Fixed Persian and Swiss layouts
- Fixed various small style-issues in many layouts
- Improved the US-terminal-layout
-
-1.22.0 "Superposition"
------------------
-
-New or updated translations:
- Basque
-
-Changes:
- fixed panel sizing when scaling
- fixed panel sizing when rotating
- fixed Dvorak terminal layout
-
-1.21.0 "Expected value"
------------------
-
-New or updated translations:
- Hindi
- Czech
- German
-
-New layouts:
- wide Swedish
- Hungarian
-
-Changes:
- use a custom font for gr+polytonic, where the default is unreadable
- require newer Rust
- fixed panel sizing when rotating
- internal improvements.
-
-1.20.0 "PID controller"
------------------
-
-New translations:
- Greek
- Croatian
-
-New layouts:
- US Dvorak terminal
-
-Improvements:
- forcing the panel to hide now takes effect immediately
- Squeekboard icon will present itself when other applications need to show it
--- a/README.md
+++ b/README.md
@ -1,7 +1,7 @@
-*squeekboard* - a Wayland on-screen keyboard
+*squeekboard* - a Wayland virtual keyboard
 ========================================

-*Squeekboard* is a keyboard-shaped input method supporting Wayland, built primarily for the *Librem 5* phone.
+*Squeekboard* is a virtual keyboard supporting Wayland, built primarily for the *Librem 5* phone.

 It squeaks because some Rust got inside.

@ -11,24 +11,20 @@ Features
 ### Present

 - GTK3
- Custom keyboard layouts defined in yaml
- Input purpose dependent keyboard layouts
+- Custom yaml-defined keyboards
 - DBus interface to show and hide
- Use Wayland input method protocol to submit text
+- Use Wayland input method protocol to show and hide
 - Use Wayland virtual keyboard protocol

+### Temporarily dropped
+
+- A settings interface
+
 ### TODO

- Text prediction/correction
- Use preedit
- Submit actions like "next field" using a future Wayland protocol
+- Use Wayland input method protocol
 - Pick up DBus interface files from /usr/share

-Creating layouts
-------------------
-
-If you want to work on layouts, check out the [guide](doc/tutorial.md).
-
 Building
 --------

@ -39,7 +35,7 @@ See `.gitlab-ci.yml` or run `apt-get build-dep .`
 ### Build from git repo

 ```bash
-$ git clone https://gitlab.gnome.org/World/Phosh/squeekboard.git
+$ git clone https://source.puri.sm/Librem5/squeekboard.git
 $ cd squeekboard
 $ mkdir _build
 $ meson _build/
@ -58,32 +54,19 @@ $ cd ../build/
 $ src/squeekboard
 ```

-Squeekboard's panel will appear whenever a compatible application requests an input method. Click a text field in any GTK application, like `python3 ./tools/entry.py`.
-
 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
 ```

-Alternatively, force panel visibility manually with:
+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
 ```

-### What the compositor has to support
-
-A compatible compositor has to support the protocols:
-
- layer-shell
- virtual-keyboard-v1
-
-It's strongly recommended to support:
-
- input-method-v2
-
 Developing
 ----------

-See [`doc/hacking.md`](doc/hacking.md) for this copy, or the [official documentation](https://world.pages.gitlab.gnome.org/Phosh/squeekboard) for the current release.
+See [`doc/hacking.md`](doc/hacking.md) for this copy, or the [official documentation](https://developer.puri.sm/projects/squeekboard/) for the current release.
--- a/cargo_build.py
+++ b/cargo_build.py
@ -34,7 +34,7 @@ if out_path:
    i = args.index(out_path)
    args.pop(i)    

-subprocess.run(['sh', "{}/cargo.sh".format(source_dir.as_posix()), 'build']
+subprocess.run(['sh', "{}/cargo.sh".format(shlex.quote(source_dir.as_posix())), 'build']
    + args,
    check=True)

@ -43,7 +43,7 @@ if out_path:
    out_basename = out_path.name
    filename = filename or out_basename
    subprocess.run(['cp', '-a',
-        './{}/{}'.format(binary_dir, filename),
+        './{}/{}'.format(shlex.quote(binary_dir), shlex.quote(filename)),
        out_path],
        check=True)

--- a/data/common.css
+++ b/data/common.css
@ -1,39 +0,0 @@
-/* Theme independent styles */
-
-sq_view {
-    font-family: cantarell, sans-serif;
-    font-size: 1.5em;
-}
-
-/* Becomes readable with a special font */
-sq_view.gr_polytonic {
-    font-family: GFSDidotClassic, cantarell, sans-serif;
-    font-size: 2em;
-}
-
-sq_button {
-    border-radius: 4px;
-    margin: 2px;
-}
-
-sq_view.wide sq_button {
-    margin: 3px;
-}
-
-sq_button.latched,
-sq_button.locked {
-    font-weight: bold;
-}
-
-sq_button.action {
-    font-size: 0.75em;
-}
-
-sq_button.small {
-    font-size: 0.5em;
-}
-
-sq_view.pin sq_button {
-    border-radius: 0px;
-    margin: 1px 1px 1px 1px;
-}
--- a/data/icons/zwnj.svg
+++ b/data/icons/zwnj.svg
@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1">
-  <path d="M 3,0.5 V 1 c 2.5,0 4.5,1 4.5,2 v 12.5 h 1 V 3 c 0,-1 2,-2 4.5,-2 V 0.5 Z" />
-</svg>
--- a/data/keyboards/am+phonetic.yaml
+++ b/data/keyboards/am+phonetic.yaml
@ -1,84 +0,0 @@
-# Armenian layout created by Norayr Chilingarian
-# Yerevan
-# Oct 2021
---
-outlines:
-    default:   { width: 35.33, height: 52 }
-    altline:   { width: 52.67, height: 52 }
-    wide:      { width: 32,    height: 32 }
-    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"
-        - "ﬓ  ﬔ  ﬕ  ﬖ  ﬗ   ՟ և"
-        - "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: "ԱԲԳ"
-    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/am.yaml
+++ b/data/keyboards/am.yaml
@ -1,84 +0,0 @@
-# Armenian layout created by Norayr Chilingarian
-# Yerevan
-# Oct 2021
---
-outlines:
-    default:   { width: 35.33, height: 52 }
-    altline:   { width: 52.67, height: 52 }
-    wide:      { width: 32,    height: 32 }
-    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"
-        - "ﬓ  ﬔ  ﬕ  ﬖ  ﬗ   ՟ և"
-        - "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: "ԱԲԳ"
-    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/ara.yaml
+++ b/data/keyboards/ara.yaml
@ -1,70 +0,0 @@
-# Maintained by: Khaled Eldoheiri <khalid@kdehairy.com>
---
-outlines:
-    default:   { width: 32.66,  height: 52 }
-    altline:   { width: 48.99,  height: 52 }
-    wide:      { width: 62,     height: 52 }
-    spaceline: { width: 195.96, height: 52 }
-    special:   { width: 35.66,  height: 52 }
-
-views:
-    base:
-        - "ذ ض ص ث ق ف غ ع خ ح ج"
-        - "ش س ي ب ل ا ت ن م ك ط"
-        - "Shift_L ء ؤ ر ة و ز ظ د BackSpace"
-        - "show_numbers preferences         space        . Return"
-    extra:
-        - "ذ ض ص ث ق لإ إ ع خ ح ج"
-        - "ش س ى ب لأ أ ت ن م ك ط"
-        - "Shift_L ئ لآ لا ه آ ز ظ د BackSpace"
-        - "show_numbers preferences         space        . Return"
-    numbers:
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "@ # € % & - _ + ( )"
-        - "show_symbols   ، \" ' : ؛ ! ؟  BackSpace"
-        - "show_letters preferences         space        . Return"
-    symbols:
-        - "~ ` | · √ π τ ÷ × ¶"
-        - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        . Return"
-
-buttons:
-    Shift_L:
-        action:
-            locking:
-                lock_view: "extra"
-                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: "ض"
-    show_symbols:
-        action:
-            set_view: "symbols"
-        outline: "altline"
-        label: "*/="
-    space:
-        outline: "spaceline"
-        label: " "
-        text: " "
-    Return:
-        outline: "altline"
-        icon: "key-enter"
-        keysym: "Return"
--- a/data/keyboards/ara_wide.yaml
+++ b/data/keyboards/ara_wide.yaml
@ -1,70 +0,0 @@
-# Maintained by: Khaled Eldoheiri <khalid@kdehairy.com>
---
-outlines:
-    default:   { width: 49,   height: 42 }
-    altline:   { width: 73.5, height: 42 }
-    wide:      { width: 108,  height: 42 }
-    spaceline: { width: 324,  height: 42 }
-    special:   { width: 49,   height: 42 }
-
-views:
-    base:
-        - "ذ ض ص ث ق ف غ ع خ ح ج"
-        - "ش س ي ب ل ا ت ن م ك ط"
-        - "Shift_L ء ؤ ر ة و ز ظ د BackSpace"
-        - "show_numbers preferences         space        . Return"
-    extra:
-        - "ذ ض ص ث ق لإ إ ع خ ح ج"
-        - "ش س ى ب لأ أ ت ن م ك ط"
-        - "Shift_L ئ لآ لا ه آ ز ظ د BackSpace"
-        - "show_numbers preferences         space        . Return"
-    numbers:
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "@ # € % & - _ + ( )"
-        - "show_symbols   ، \" ' : ؛ ! ؟  BackSpace"
-        - "show_letters preferences         space        . Return"
-    symbols:
-        - "~ ` | · √ π τ ÷ × ¶"
-        - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        . Return"
-
-buttons:
-    Shift_L:
-        action:
-            locking:
-                lock_view: "extra"
-                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: "ض"
-    show_symbols:
-        action:
-            set_view: "symbols"
-        outline: "altline"
-        label: "*/="
-    space:
-        outline: "spaceline"
-        label: " "
-        text: " "
-    Return:
-        outline: "altline"
-        icon: "key-enter"
-        keysym: "Return"
--- a/data/keyboards/be.yaml
+++ b/data/keyboards/be.yaml
@ -63,7 +63,7 @@ buttons:
        action:
            set_view: "base"
        outline: "wide"
-        label: "ABC"
+        label: "abc"
    show_symbols:
        action:
            set_view: "symbols"
--- a/data/keyboards/be_wide.yaml
+++ b/data/keyboards/be_wide.yaml
@ -63,7 +63,7 @@ buttons:
        action:
            set_view: "base"
        outline: "wide"
-        label: "ABC"
+        label: "abc"
    show_symbols:
        action:
            set_view: "symbols"
--- a/data/keyboards/bg+phonetic.yaml
+++ b/data/keyboards/bg+phonetic.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/bg.yaml
+++ b/data/keyboards/bg.yaml
@ -1,26 +1,26 @@
 ---
 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 }
+    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"
+        - "я в е р т ъ у и о п ю"
+        - "а с д ф г х й к л ш щ"
+        - "Shift_L з ь ц ж б н м ч BackSpace"
        - "show_numbers preferences         space   .    Return"
    upper:
-        - "У Е И Ш Щ К С Д З Ц Б"
-        - "Ь Я А О Ж Г Т Н В М Ч"
-        - "Shift_L Ю Й Ъ Ф Х П Р Л BackSpace"
+        - "Я В Е Р Т Ъ У И О П Ю"
+        - "А С Д Ф Г Х Й К Л Ш Щ"
+        - "Shift_L З Ь Ц Ж Б Н М Ч BackSpace"
        - "show_numbers preferences         space   ,    Return"
    numbers:
        - "1 2 3 4 5 6 7 8 9 0"
        - "@ # € % & - _ + ( )"
-        - "show_symbols , \" ' colon ; ! ? ѝ BackSpace"
+        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
        - "show_letters preferences         space        Return"
    symbols:
        - "~ ` | · √ π τ ÷ × ¶"
@ -59,7 +59,7 @@ buttons:
        action:
            set_view: "base"
        outline: "wide"
-        label: "ABC"
+        label: "abc"
    show_symbols:
        action:
            set_view: "symbols"
--- a/data/keyboards/br.yaml
+++ b/data/keyboards/br.yaml
@ -1,10 +1,10 @@
 ---
 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 }
+    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:
--- a/data/keyboards/ca.yaml
+++ b/data/keyboards/ca.yaml
@ -1,93 +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        show_eschars 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_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: "âÂ"
-    period:
-        outline: "special"
-        text: "."
-    space:
-        outline: "spaceline"
-        text: " "
-    Return:
-        outline: "wide"
-        icon: "key-enter"
-        keysym: "Return"
-    colon:
-        text: ":"
-
-
-
--- a/data/keyboards/ch+de.yaml
+++ b/data/keyboards/ch+de.yaml
@ -1,73 +0,0 @@
-# Maintained by Patrick Jörg <patrickjoerg@gmx.ch>. No Copyright, enjoy!
-
---
-outlines:
-    default:   { width: 35.33, height: 52 }
-    altline:   { width: 48,    height: 52 }
-    wide:      { width: 59,    height: 52 }
-    spaceline: { width: 70,    height: 52 }
-    special:   { width: 28,    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    '   space        , . Return"
-    upper:
-        - "Q W E R T Z U I O P Ü"
-        - "A S D F G H J K L Ö Ä"
-        - "Shift_L   Y X C V B N M  BackSpace"
-        - "show_numbers - _  preferences    \"  space        , . Return"
-    numbers:      
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "@ * + - = ( ) ~ < >"
-        - "show_symbols  # & / \\ √ ; : BackSpace"
-        - "show_letters ? !  preferences    _   space        , . Return"
-    symbols:
-        - "€ $ £ ¥ % | § µ [ ]"
-        - "© ® § ` ^ { } · ¡ ¿"
-        - "show_numbers  « » ÷ × “ ” „ BackSpace"
-        - "show_letters  preferences    -   space        , . Return"
-
-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: "*/="
-    space:
-        outline: "spaceline"
-        label: " "
-        text: " "
-    Return:
-        outline: "wide"
-        icon: "key-enter"
-        keysym: "Return"
-    "\"":
-        keysym: "quotedbl"
--- a/data/keyboards/ch+fr.yaml
+++ b/data/keyboards/ch+fr.yaml
@ -1,84 +0,0 @@
-# Maintained by: Jordi Bossy <jordi@bossy.space>. No Copyright, enjoy!
---
-outlines:
-    default:   { width: 35.33, height: 52 }
-    altline:   { width: 48,    height: 52 }
-    wide:      { width: 59,    height: 52 }
-    spaceline: { width: 70,    height: 52 }
-    special:   { width: 28,    height: 52 }
-
-views:
-    base:
-        - "q w e r t z u i o p"
-        - "a s d f g h j k l ?"
-        - "Shift_L   y x c v b n m  BackSpace"
-        - "show_numbers show_eschars preferences    '   space        , . Return"
-    upper:
-        - "Q W E R T Z U I O P"
-        - "A S D F G H J K L !"
-        - "Shift_L   Y X C V B N M  BackSpace"
-        - "show_numbers show_eschars preferences    \"  space        , . Return"
-    numbers:      
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "@ * + - = ( ) ~ < >"
-        - "show_symbols  # & / \\ √ ; : BackSpace"
-        - "show_letters show_eschars preferences    _   space        , . Return"
-    symbols:
-        - "€ $ £ ¥ % | § µ [ ]"
-        - "© ® § ` ^ { } · ¡ ¿"
-        - "show_numbers  « » ÷ × “ ” „ BackSpace"
-        - "show_letters show_eschars preferences    -   space        , . Return"
-    eschars:
-        - "à â ç é è ê î ô ù û"
-        - "À Â Ç É È Ê Î Ô Ù Û"
-        - "show_numbers  æ œ ä ë ï ö ü  BackSpace"
-        - "show_letters show_eschars preferences  ñ Ñ   space        ° ß Return"
-
-buttons:
-    Shift_L:
-        action:
-            locking:
-                lock_view: "upper"
-                unlock_view: "base"
-        outline: "altline"
-        icon: "key-shift"
-    BackSpace:
-        outline: "altline"
-        icon: "edit-clear-symbolic"
-        action: erase
-    preferences:
-        action: "show_prefs"
-        outline: "special"
-        icon: "keyboard-mode-symbolic"
-    show_numbers:
-        action:
-            set_view: "numbers"
-        outline: "altline"
-        label: "123"
-    show_letters:
-        action:
-            set_view: "base"
-        outline: "altline"
-        label: "ABC"
-    show_symbols:
-        action:
-            set_view: "symbols"
-        outline: "altline"
-        label: "*/="
-    show_eschars:
-        action:
-            locking:
-                lock_view: "eschars"
-                unlock_view: "base"
-        outline: "altline"
-        label: "Ââ"
-    space:
-        outline: "spaceline"
-        label: " "
-        text: " "
-    Return:
-        outline: "wide"
-        icon: "key-enter"
-        keysym: "Return"
-    "\"":
-        keysym: "quotedbl"
--- a/data/keyboards/ch.yaml
+++ b/data/keyboards/ch.yaml
@ -1,95 +0,0 @@
-# Maintained by: Jordy Bossy <jordi@bossy.space>
-# and Patrick Jörg <patrickjoerg@gmx.ch>. No Copyright, enjoy!
-
---
-outlines:
-    default:     { width: 35.33,  height: 58 }
-    doublewidth: { width: 70.66,  height: 58 }
-    altline:     { width: 52.8,   height: 58 }
-    wide:        { width: 64.9,   height: 58 }
-    spaceline:   { width: 116.67, height: 58 }
-    special:     { width: 30.41,  height: 58 }
-
-views:
-    base:
-        - "q w e r t z u i o p ü"
-        - "a s d f g h j k l ö ä"
-        - "Shift_L   y x c v b n m ' BackSpace"
-        - "show_numbers show_eschars preferences       Space    , .    Return"
-    upper:
-        - "Q W E R T Z U I O P Ü"
-        - "A S D F G H J K L Ö Ä"
-        - "Shift_L   Y X C V B N M \" BackSpace"
-        - "show_numbers show_eschars preferences       Space    , .    Return"
-    numbers:      
-        - "1 2 3 4 5 6 7 8 9 0 ^"
-        - "* + - = ( ) ~ < > ! ?"
-        - "show_symbols _ # & / \\ √ ; : BackSpace"
-        - "show_letters show_eschars preferences       Space    , .    Return"
-    symbols:
-        - "€ $ £ ¥ % | § µ [ ]"
-        - "© ® § ` { } @ · ¡ ¿"
-        - "show_numbers  « » ÷ × “ ” „ BackSpace"
-        - "show_letters show_eschars preferences       Space    , .    Return"
-    eschars:
-        - "à â ç é è ê î ô ù û ñ"
-        - "À Â Ç É È Ê Î Ô Ù Û Ñ"
-        - "show_numbers  æ œ ä ë ï ö ü ß BackSpace"
-        - "show_letters show_eschars preferences       Space     °     Return"
-
-buttons:
-    Shift_L:
-        action:
-            locking:
-                lock_view: "upper"
-                unlock_view: "base"
-        outline: "altline"
-        icon: "key-shift"
-    BackSpace:
-        outline: "altline"
-        icon: "edit-clear-symbolic"
-        action: "erase"
-    preferences:
-        action: "show_prefs"
-        outline: "special"
-        icon: "keyboard-mode-symbolic"
-    show_numbers:
-        action:
-            set_view: "numbers"
-        outline: "altline"
-        label: "123"
-    show_letters:
-        action:
-            set_view: "base"
-        outline: "altline"
-        label: "ABC"
-    show_symbols:
-        action:
-            set_view: "symbols"
-        outline: "altline"
-        label: "*/="
-    show_eschars:
-        action:
-            locking:
-                lock_view: "eschars"
-                unlock_view: "base"
-        outline: "altline"
-        label: "Ââ"
-    Space:
-        outline: "spaceline"
-        label: " "
-        text: " "
-    Return:
-        outline: "wide"
-        icon: "key-enter"
-        keysym: "Return"
-    "\"":
-        keysym: "quotedbl"
-    °:
-        outline: "doublewidth"
-    "|":
-        outline: "doublewidth"
-    "}":
-        outline: "doublewidth"
-    ×:
-        outline: "doublewidth"
--- a/data/keyboards/ch_wide.yaml
+++ b/data/keyboards/ch_wide.yaml
@ -1,101 +0,0 @@
-# Maintained by: Jordy Bossy <jordy@bossy.space>
-# and Patrick Jörg <patrickjoerg@gmx.ch>. No Copyright, enjoy!
-
---
-outlines:
-    default:     { width: 48,  height: 42 }
-    doublewidth: { width: 96,  height: 42 }
-    narrow:      { width: 33,  height: 42 }
-    large:       { width: 66,  height: 42 }
-    altline:     { width: 72,  height: 42 }
-    wide:        { width: 108, height: 42 }
-    spaceline:   { width: 162, height: 42 }
-    special:     { width: 48,  height: 42 }
-
-views:
-    base:
-        - "q w e r t z u i o p ü"
-        - "a s d f g h j k l ö ä"
-        - "Shift_L   y x c v b n m ' BackSpace"
-        - "show_numbers show_eschars preferences       Space    , .    Return"
-    upper:
-        - "Q W E R T Z U I O P Ü"
-        - "A S D F G H J K L Ö Ä"
-        - "Shift_L   Y X C V B N M \" BackSpace"
-        - "show_numbers show_eschars preferences       Space    , .    Return"
-    numbers:      
-        - "1 2 3 4 5 6 7 8 9 0 ^"
-        - "* + - = ( ) ~ < > ! ?"
-        - "show_symbols _ # & / \\ √ ; : BackSpace"
-        - "show_letters show_eschars preferences       Space    , .    Return"
-    symbols:
-        - "€ $ £ ¥ % | § µ [ ]"
-        - "© ® § ` { } @ · ¡ ¿"
-        - "show_numbers  « » ÷ × “ ” „ BackSpace"
-        - "show_letters show_eschars preferences       Space    , .    Return"
-    eschars:
-        - "à â ç é è ê î ô ù û ñ"
-        - "À Â Ç É È Ê Î Ô Ù Û Ñ"
-        - "show_numbers  æ œ ä ë ï ö ü ß BackSpace"
-        - "show_letters show_eschars preferences       Space     °     Return"
-
-buttons:
-    Shift_L:
-        action:
-            locking:
-                lock_view: "upper"
-                unlock_view: "base"
-        outline: "altline"
-        icon: "key-shift"
-    BackSpace:
-        outline: "altline"
-        icon: "edit-clear-symbolic"
-        action: "erase"
-    preferences:
-        action: "show_prefs"
-        outline: "special"
-        icon: "keyboard-mode-symbolic"
-    show_numbers:
-        action:
-            set_view: "numbers"
-        outline: "altline"
-        label: "123"
-    show_letters:
-        action:
-            set_view: "base"
-        outline: "altline"
-        label: "ABC"
-    show_symbols:
-        action:
-            set_view: "symbols"
-        outline: "altline"
-        label: "*/="
-    show_eschars:
-        action:
-            locking:
-                lock_view: "eschars"
-                unlock_view: "base"
-        outline: "altline"
-        label: "Ââ"
-    Space:
-        outline: "spaceline"
-        label: " "
-        text: " "
-    Return:
-        outline: "wide"
-        icon: "key-enter"
-        keysym: "Return"
-    "\"":
-        keysym: "quotedbl"
-    °:
-        outline: "large"
-    ".":
-        outline: "narrow"
-    ",":
-        outline: "narrow"
-    "|":
-        outline: "doublewidth"
-    "}":
-        outline: "doublewidth"
-    ×:
-        outline: "doublewidth"
--- a/data/keyboards/cz+qwerty.yaml
+++ b/data/keyboards/cz+qwerty.yaml
@ -1,10 +1,10 @@
 ---
 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 }
+    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:
@ -75,7 +75,7 @@ buttons:
        action:
            set_view: "base"
        outline: "wide"
-        label: "ABC"
+        label: "abc"
    show_symbols:
        action:
            set_view: "symbols"
--- a/data/keyboards/cz+qwerty_wide.yaml
+++ b/data/keyboards/cz+qwerty_wide.yaml
@ -1,10 +1,10 @@
 ---
 outlines:
-    default:   { width: 54,  height: 42 }
-    altline:   { width: 81,  height: 42 }
-    wide:      { width: 81,  height: 42 }
+    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 }
+    special: { width: 54, height: 42 }

 views:
    base:
@ -75,7 +75,7 @@ buttons:
        action:
            set_view: "base"
        outline: "wide"
-        label: "ABC"
+        label: "abc"
    show_symbols:
        action:
            set_view: "symbols"
--- a/data/keyboards/cz.yaml
+++ b/data/keyboards/cz.yaml
@ -1,10 +1,10 @@
 ---
 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 }
+    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:
@ -75,7 +75,7 @@ buttons:
        action:
            set_view: "base"
        outline: "wide"
-        label: "ABC"
+        label: "abc"
    show_symbols:
        action:
            set_view: "symbols"
--- a/data/keyboards/cz_wide.yaml
+++ b/data/keyboards/cz_wide.yaml
@ -1,10 +1,10 @@
 ---
 outlines:
-    default:   { width: 54,  height: 42 }
-    altline:   { width: 81,  height: 42 }
-    wide:      { width: 81,  height: 42 }
+    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 }
+    special: { width: 54, height: 42 }

 views:
    base:
@ -75,7 +75,7 @@ buttons:
        action:
            set_view: "base"
        outline: "wide"
-        label: "ABC"
+        label: "abc"
    show_symbols:
        action:
            set_view: "symbols"
--- a/data/keyboards/de.yaml
+++ b/data/keyboards/de.yaml
@ -1,11 +1,11 @@
 # Maintained by: Mark Müller <markmueller86@gmail.com>
 ---
 outlines:
-    default:   { width: 35.33, height: 52 }
-    altline:   { width: 52.67, height: 52 }
-    wide:      { width: 62,    height: 52 }
+    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 }
+    special: { width: 35.33, height: 52 }

 views:
    base:
@ -59,7 +59,7 @@ buttons:
        action:
            set_view: "base"
        outline: "altline"
-        label: "ABC"
+        label: "abc"
    show_symbols:
        action:
            set_view: "symbols"
@ -71,7 +71,7 @@ buttons:
                lock_view: "eschars"
                unlock_view: "base"
        outline: "altline"
-        label: "Ää"
+        label: "äÄ"
    space:
        outline: "spaceline"
        label: " "
--- a/data/keyboards/de_wide.yaml
+++ b/data/keyboards/de_wide.yaml
@ -1,11 +1,11 @@
 # Maintained by: Mark Müller <markmueller86@gmail.com>
 ---
 outlines:
-    default:   { width: 48,  height: 42 }
-    altline:   { width: 81,  height: 42 }
-    wide:      { width: 108, height: 42 }
+    default: { width: 48, height: 42 }
+    altline: { width: 81, height: 42 }
+    wide: { width: 108, height: 42 }
    spaceline: { width: 216, height: 42 }
-    special:   { width: 48,  height: 42 }
+    special: { width: 48, height: 42 }

 views:
    base:
@ -59,7 +59,7 @@ buttons:
        action:
            set_view: "base"
        outline: "altline"
-        label: "ABC"
+        label: "abc"
    show_symbols:
        action:
            set_view: "symbols"
@ -71,7 +71,7 @@ buttons:
                lock_view: "eschars"
                unlock_view: "base"
        outline: "altline"
-        label: "Ää"
+        label: "äÄ"
    space:
        outline: "spaceline"
        text: " "
--- a/data/keyboards/dk.yaml
+++ b/data/keyboards/dk.yaml
@ -1,8 +1,9 @@
 ---
 outlines:
-    default:   { width: 32,       height: 52 }
-    altline:   { width: 48.39024, height: 52 }
-    wide:      { width: 62,       height: 52 }
+    default: { width: 32, height: 52 }
+    altline: { width: 48.39024, height: 52 }
+    wide: { width: 62, height: 52 }
+    outline7: { width: 88.97561, height: 52 }
    spaceline: { width: 150.5853, height: 52 }

 views:
--- a/data/keyboards/email/us.yaml
+++ b/data/keyboards/email/us.yaml
@ -1,82 +0,0 @@
---
-outlines:
-    default:   { width: 35.33, height: 52 }
-    altline:   { width: 52.67, height: 52 }
-    wide:      { width: 62, height: 52 }
-    spaceline: { width: 106.67, height: 52 }
-    special:   { width: 44,     height: 52 }
-    large:     { 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        at period Return"
-    upper:
-        - "Q W E R T Y U I O P"
-        - "A S D F G H J K L"
-        - "Shift_L   Z X C V B N M  BackSpace"
-        - "show_numbers preferences         space        at period Return"
-    numbers:
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "@ # $ % & - _ + ( )"
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
-        - "show_letters preferences         space        at period Return"
-    symbols:
-        - "~ ` | · √ π τ ÷ × ¶"
-        - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        at 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
-    at:
-        outline: "large"
-        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: "large"
-        text: "."
-    space:
-        outline: "spaceline"
-        text: " "
-    Return:
-        outline: "wide"
-        icon: "key-enter"
-        keysym: "Return"
-    colon:
-        text: ":"
--- a/data/keyboards/emoji/us.yaml
+++ b/data/keyboards/emoji/us.yaml
--- a/data/keyboards/emoji/us_wide.yaml
+++ b/data/keyboards/emoji/us_wide.yaml
@ -1,80 +0,0 @@
---
-outlines:
-    default: { width: 104, height: 52 }
-    altline: { width: 80, height: 52 }
-    narrow: { width: 44, height: 52 }
-
-views:
-    base:
-        - "😀 😁 😅 😂 😊 😇 🙃"
-        - "😍 😘 😋 😜 😎 🥳 😔"
-        - "😢 😭 😡 😱 🤔 😬 🙄"
-        - "preferences blank 1 2 3 4 5 6 blank BackSpace"
-    two:
-        - "🤩 🤨 🤓 😴 🤢 🤮 😈"
-        - "💩 🙌 👏 👍 👎 👌 👋"
-        - "💪 🖕 🙏 💋 🤦‍♀️ 🤷‍♀️ 💃"
-        - "preferences blank 1 2 3 4 5 6 blank BackSpace"
-    three:
-        - "🐶 🐱 🐯 🙈 🐴 🦄 🌳"
-        - "🍀 🌹 💫 ⭐️ ✨ 💥 🔥"
-        - "🌈 ☀️ 🌤 🌧 ⛄️ ☂️ 🌊"
-        - "preferences blank 1 2 3 4 5 6 blank BackSpace"
-    four:
-        - "🍎 🍓 🍑 🍍 🍆 🥑 🥦"
-        - "🍕 🎂 🍫 🍿 🍻 🍾 🍽"
-        - "⚽️ 🏀 🏓 🏆 🎹 🎸 🎯"
-        - "preferences blank 1 2 3 4 5 6 blank BackSpace"
-    five:
-        - "🚗 🚌 🚲 🚄 🚂 ✈️ 🛰"
-        - "🚀 🛸 🚁 🚦 🏝 🏔 ⛺️"
-        - "🏠 🏢 🏥 🏛 🛤 🌅 🎇"
-        - "preferences blank 1 2 3 4 5 6 blank BackSpace"
-    six:
-        - "⌚️ 📱 💻 🖥 🖨 🕹 ✉️"
-        - "📞 ☎️ ⏰ ⏳ 📈 📉 📌"
-        - "🎁 ❤️ 💕 💯 ✅ ❎ 📢"
-        - "preferences blank 1 2 3 4 5 6 blank BackSpace"
-
-buttons:
-    1:
-        action:
-            set_view: "base"
-        outline: "altline"
-        label: "1"
-    2:
-        action:
-            set_view: "two"
-        outline: "altline"
-        label: "2"
-    3:
-        action:
-            set_view: "three"
-        outline: "altline"
-        label: "3"
-    4:
-        action:
-            set_view: "four"
-        outline: "altline"
-        label: "4"
-    5:
-        action:
-            set_view: "five"
-        outline: "altline"
-        label: "5"
-    6:
-        action:
-            set_view: "six"
-        outline: "altline"
-        label: "6"
-    preferences:
-        action: "show_prefs"
-        outline: "altline"
-        icon: "keyboard-mode-symbolic"
-    BackSpace:
-        outline: "altline"
-        icon: "edit-clear-symbolic"
-        keysym: BackSpace
-    blank:
-        outline: "narrow"
-        text: ""
--- a/data/keyboards/epo.yaml
+++ b/data/keyboards/epo.yaml
@ -1,10 +1,10 @@
 ---
 outlines:
-    default:   { width: 35.33, height: 52 }
-    altline:   { width: 52.67, height: 52 }
-    wide:      { width: 62,    height: 52 }
+    default: { width: 35.33, height: 52 }
+    altline: { width: 52.67, height: 52 }
+    wide: { width: 62, height: 52 }
    spaceline: { width: 99.67, height: 52 }
-    special:   { width: 35.33, height: 52 }
+    special: { width: 35.33, height: 52 }

 views:
    base:
@ -58,7 +58,7 @@ buttons:
        action:
            set_view: "base"
        outline: "altline"
-        label: "ABC"
+        label: "abc"
    show_symbols:
        action:
            set_view: "symbols"
--- 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
@ -1,10 +1,10 @@
 ---
 outlines:
-    default:   { width: 35.33, height: 52 }
-    altline:   { width: 52.67, height: 52 }
-    wide:      { width: 62,    height: 52 }
+    default: { width: 35.33, height: 52 }
+    altline: { width: 52.67, height: 52 }
+    wide: { width: 62, height: 52 }
    spaceline: { width: 99.67, height: 52 }
-    special:   { width: 44,    height: 52 }
+    special: { width: 44, height: 52 }

 views:
    base:
@ -58,7 +58,7 @@ buttons:
        action:
            set_view: "base"
        outline: "altline"
-        label: "ABC"
+        label: "abc"
    show_symbols:
        action:
            set_view: "symbols"
--- a/data/keyboards/fi.yaml
+++ b/data/keyboards/fi.yaml
@ -1,8 +1,9 @@
 ---
 outlines:
-    default:   { width: 32,       height: 52 }
-    altline:   { width: 48.39024, height: 52 }
-    wide:      { width: 62,       height: 52 }
+    default: { width: 32, height: 52 }
+    altline: { width: 48.39024, height: 52 }
+    wide: { width: 62, height: 52 }
+    outline7: { width: 88.97561, height: 52 }
    spaceline: { width: 150.5853, height: 52 }

 views:
--- a/data/keyboards/fr+bepo.yaml
+++ b/data/keyboards/fr+bepo.yaml
@ -1,206 +0,0 @@
---
-outlines:
-    default:   { width: 35.33, height: 52 }
-    small:     { width: 50,    height: 30 }
-    altline:   { width: 35.33, height: 52 }
-    wide:      { width: 50,    height: 52 }
-    spaceline: { width: 150,   height: 52 }
-    special:   { width: 35.33, height: 52 }
-
-views:
-    base:
-        - "b é p o w v d l j z"
-        - "a u i e c t s r n m"
-        - "Shift_L y x k q g h f period BackSpace"
-        - "show_numbers preferences         space    show_eschars Return"
-    upper:
-        - "B É P O W V D L J Z"
-        - "A U I E C T S R N M"
-        - "Shift_L   Y X K Q G H F -  BackSpace"
-        - "show_numbers preferences         space  colon   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:
-    F1:
-        outline: "action"
-        keysym: "F1"
-    F2:
-        outline: "action"
-        keysym: "F2"
-    F3:
-        outline: "action"
-        keysym: "F3"
-    F4:
-        outline: "action"
-        keysym: "F4"
-    F5:
-        outline: "action"
-        keysym: "F5"
-    F6:
-        outline: "action"
-        keysym: "F6"
-    F7:
-        outline: "action"
-        keysym: "F7"
-    F8:
-        outline: "action"
-        keysym: "F8"
-    F9:
-        outline: "action"
-        keysym: "F9"
-    F10:
-        outline: "action"
-        keysym: "F10"
-    F11:
-        outline: "action"
-        keysym: "F11"
-    F12:
-        outline: "action"
-        keysym: "F12"
-    Esc:
-        outline: "action"
-        keysym: "Escape"
-    Tab:
-        outline: "action"
-        keysym: "Tab"
-    Del:
-        outline: "action"
-        keysym: "Delete"
-    Insert:
-        outline: "action"
-        keysym: "Insert"
-    Menu:
-        outline: "action"
-        keysym: "Menu"
-    Pause:
-        outline: "action"
-        keysym: "Pause"
-    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"
-    period:
-        outline: "special"
-        text: "."
-    slash:
-        outline: "special"
-        text: "/"
-    show_actions:
-        action:
-            set_view: "actions"
-        outline: "special"
-        label: ">_"
-    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+bepo_wide.yaml
+++ b/data/keyboards/fr+bepo_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:
-        - "b é p o w v d l j z"
-        - "a u i e c t s r n m"
-        - "Shift_L y x k q g h f . BackSpace"
-        - "show_numbers preferences         space    show_eschars Return"
-    upper:
-        - "B É P O W V D L J Z"
-        - "A U I E C T S R N M"
-        - "Shift_L   Y X K Q G H F -  BackSpace"
-        - "show_numbers preferences         space  colon   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.yaml
+++ b/data/keyboards/fr.yaml
@ -63,7 +63,7 @@ buttons:
        action:
            set_view: "base"
        outline: "wide"
-        label: "ABC"
+        label: "abc"
    show_symbols:
        action:
            set_view: "symbols"
--- a/data/keyboards/fr_wide.yaml
+++ b/data/keyboards/fr_wide.yaml
@ -63,7 +63,7 @@ buttons:
        action:
            set_view: "base"
        outline: "wide"
-        label: "ABC"
+        label: "abc"
    show_symbols:
        action:
            set_view: "symbols"
--- a/data/keyboards/ge.yaml
+++ b/data/keyboards/ge.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:
-        - "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/gr+polytonic.yaml
+++ b/data/keyboards/gr+polytonic.yaml
@ -1,326 +0,0 @@
-# Greek polytonic layout by Antonis Tsolomitis
-# University of the Aegean, Department of Mathematics, atsol@aegean.gr
-# March 2022
-# 
---
-outlines:
-    default:   { width: 40,    height: 60 }
-    altline:   { width: 52.67, height: 60 }
-    wide:      { width: 62,    height: 60 }
-    extrawide: { width: 66,    height: 60 }
-    spaceline: { width: 140,   height: 60 }
-    special:   { width: 44,    height: 60 }
-
-views:
-    base:
-        - "semicolon ς ε ρ τ υ θ ι ο π"
-        - "α σ δ φ γ η ξ κ λ show_accents"
-        - "Shift_L ζ χ ψ ω β ν μ BackSpace"
-        - "show_numbers preferences space period comma Return"
-    upper:
-        - "colon EuroSign Ε Ρ Τ Υ Θ Ι Ο Π"
-        - "Α Σ Δ Φ Γ Η Ξ Κ Λ show_accents"
-        - "Shift_L Ζ Χ Ψ Ω Β Ν Μ BackSpace"
-        - "show_numbers preferences space exclam period_upper Return"
-    accents:
-        - "show_psiliordasiaandvaria show_psiliordasiaandoxia show_psiliordasia show_bariaorperispomeni show_oxia"
-        - "show_PsiliOrDasiaAndVaria show_PsiliOrDasiaAndOxia show_PsiliOrDasia show_BariaOrPerispomeni show_Oxia show_base"
-        - "show_PsiliOrDasiaAndPerispomeni show_psiliordasiaandperispomeni ᾿ BackSpace"
-        - "show_numbers preferences space Return"
-    oxia:
-        - "ά έ ή ί ϊ ΐ ό ύ ϋ ώ"
-        - "show_Oxia ᾳ ᾴ ῃ ῄ ῳ ῴ show_base"
-        - "Ϗ ϐ ϑ ϗ ϖ ΰ ϕ – — BackSpace"
-        - "show_numbers preferences space eis_l eis_r Return"
-    Oxia:
-        - "Ά Έ Ή Ί Ϊ Ό Ύ Ϋ Ώ"
-        - "show_oxia ᾼ ῌ ῼ show_base"
-        - "Ϗ ϐ ϑ ϗ ϖ ϕ – — BackSpace"
-        - "show_numbers preferences space eis_l eis_r Return"
-    bariaorperispomeni:
-        - "ὰ ὲ ὴ ὶ ῒ ὸ ὺ ὼ ῐ ῑ"
-        - "show_BariaOrPerispomeni ᾳ ᾲ ῃ ῂ ῳ ῲ ῠ show_base"
-        - "ᾶ ᾷ ῆ ῖ ῗ ῦ ῧ ῶ ῡ BackSpace"
-        - "show_numbers preferences space ῇ ῷ Return"
-    BariaOrPerispomeni:
-        - "Ὰ Ὲ Ὴ Ὶ Ὸ Ὺ Ὼ"
-        - "show_bariaorperispomeni ᾼ ῌ ῼ show_base"
-        - "show_numbers preferences space BackSpace Return"
-    psiliordasia:
-        - "ἀ ἐ ἠ ἰ ὀ ὐ ὠ ᾀ ᾐ ᾠ"
-        - "show_PsiliOrDasia ἁ ἑ ἡ ἱ ὁ ὑ ὡ show_base"
-        - "ᾁ ᾑ ᾡ ῤ ῥ BackSpace"
-        - "show_numbers preferences space Return"
-    PsiliOrDasia:
-        - "Ἀ Ἐ Ἠ Ἰ Ὀ Ὠ ᾈ ᾘ ᾨ"
-        - "show_psiliordasia Ἁ Ἑ Ἡ Ἱ Ὁ Ὑ Ὡ show_base"
-        - "ᾉ ᾙ ᾩ Ῥ BackSpace"
-        - "show_numbers preferences space Return"
-    psiliordasiaandoxia:
-        - "ἄ ἔ ἤ ἴ ὄ ὔ ὤ ᾄ ᾔ ᾤ"
-        - "show_PsiliOrDasiaAndOxia ἅ ἕ ἥ ἵ ὅ ὕ ὥ show_base"
-        - "ᾅ ᾕ ᾥ BackSpace"
-        - "show_numbers preferences space Return"
-    PsiliOrDasiaAndOxia:
-        - "Ἄ Ἔ Ἤ Ἴ Ὄ Ὤ ᾌ ᾜ ᾬ"
-        - "show_psiliordasiaandoxia Ἅ Ἕ Ἥ Ἵ Ὅ Ὕ Ὥ show_base"
-        - "ᾍ ᾝ ᾭ BackSpace"
-        - "show_numbers preferences space Return"
-    psiliordasiaandvaria:
-        - "ἂ ἒ ἢ ἲ ὂ ὒ ὢ ᾂ ᾒ ᾢ"
-        - "show_PsiliOrDasiaAndVaria ἃ ἓ ἣ ἳ ὃ ὓ ὣ show_base"
-        - "ᾃ ᾓ ᾣ BackSpace"
-        - "show_numbers preferences space Return"
-    PsiliOrDasiaAndVaria:
-        - "Ἂ Ἒ Ἢ Ἲ Ὂ Ὢ ᾊ ᾚ ᾪ"
-        - "show_psiliordasiaandvaria Ἃ Ἓ Ἣ Ἳ Ὃ Ὓ Ὣ show_base"
-        - "ᾋ ᾛ ᾫ BackSpace"
-        - "show_numbers preferences space Return"
-    psiliordasiaandperispomeni:
-        - "ἆ ἦ ἶ ὖ ὦ ᾆ ᾖ ᾦ"
-        - "show_PsiliOrDasiaAndPerispomeni ἇ ἧ ἷ ὗ ὧ show_base"
-        - "ᾇ ᾗ ᾧ BackSpace"
-        - "show_numbers preferences space Return"
-    PsiliOrDasiaAndPerispomeni:
-        - "Ἆ Ἦ Ἶ Ὦ ᾎ ᾞ ᾮ"
-        - "show_psiliordasiaandperispomeni Ἇ Ἧ Ἷ Ὗ Ὧ show_base"
-        - "ᾏ ᾟ ᾯ BackSpace"
-        - "show_numbers preferences space Return"
-    numbers:
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "at numbersign dollar percent ampersand minus underscore plus parenleft parenright"
-        - "show_symbols comma quotedbl quoteright colon semicolon exclam question BackSpace"
-        - "show_letters preferences space period comma Return"
-    symbols:
-        - "asciitilde quoteleft bar U00B7 squareroot Greek_pi Greek_tau division multiply paragraph"
-        - "copyright U00AE U00A3 EuroSign U00A5 asciicircum degree asterisk braceleft braceright"
-        - "show_numbers backslash slash less greater equal bracketleft bracketright  BackSpace"
-        - "show_letters preferences space period comma 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_oxia:
-        action:
-            set_view: "oxia"
-        outline: "extrawide"
-        label: "´ ΅"
-    show_Oxia:
-        action:
-            set_view: "Oxia"
-        outline: "extrawide"
-        label: "´¨↑"
-    show_bariaorperispomeni:
-        action:
-            set_view: "bariaorperispomeni"
-        outline: "extrawide"
-        label: "` ῀"
-    show_BariaOrPerispomeni:
-        action:
-            set_view: "BariaOrPerispomeni"
-        outline: "extrawide"
-        label: "`῀↑"
-    show_psiliordasia:
-        action:
-            set_view: "psiliordasia"
-        outline: "extrawide"
-        label: "᾿ ῾"
-    show_PsiliOrDasia:
-        action:
-            set_view: "PsiliOrDasia"
-        outline: "extrawide"
-        label: "᾿῾↑"
-    show_psiliordasiaandoxia:
-        action:
-            set_view: "psiliordasiaandoxia"
-        outline: "extrawide"
-        label: "῎ ῞"
-    show_PsiliOrDasiaAndOxia:
-        action:
-            set_view: "PsiliOrDasiaAndOxia"
-        outline: "extrawide"
-        label: "῎῞↑"
-    show_psiliordasiaandvaria:
-        action:
-            set_view: "psiliordasiaandvaria"
-        outline: "extrawide"
-        label: "῍ ῝"
-    show_PsiliOrDasiaAndVaria:
-        action:
-            set_view: "PsiliOrDasiaAndVaria"
-        outline: "extrawide"
-        label: "῍῝↑"
-    show_psiliordasiaandperispomeni:
-        action:
-            set_view: "psiliordasiaandperispomeni"
-        outline: "extrawide"
-        label: "῏ ῟"
-    show_PsiliOrDasiaAndPerispomeni:
-        action:
-            set_view: "PsiliOrDasiaAndPerispomeni"
-        outline: "extrawide"
-        label: "῏῟↑"
-    show_numbers:
-        action:
-            set_view: "numbers"
-        outline: "wide"
-        label: "123"
-    show_letters:
-        action:
-            set_view: "base"
-        outline: "wide"
-        label: "ΑΒΓ"
-    show_symbols:
-        action:
-            set_view: "symbols"
-        outline: "altline"
-        label: "*/="
-    show_accents:
-        action:
-            locking:
-                lock_view: "accents"
-                unlock_view: "base"
-        outline: "altline"
-        label: "ᾦ"
-    show_base:
-        action:
-            set_view: "base"
-        outline: "altline"
-        label: "αι"
-    space:
-        outline: "spaceline"
-        text: " "
-    Return:
-        outline: "wide"
-        icon: "key-enter"
-        keysym: "Return"
-    period:
-        outline: "special"
-        text: "."
-    period_upper:
-        outline: "special"
-        text: "·"
-    comma:
-        outline: "special"
-        text: ","
-    colon:
-        outline: "special"
-        text: ":"
-    semicolon:
-        outline: "special"
-        text: ";"
-    exclam:
-        outline: "special"
-        text: "!"
-    eis_l:
-        outline: "special"
-        text: "«"
-    eis_r:
-        outline: "special"
-        text: "»"
-    aring:
-        text: "å"
-    Aring:
-        text: "Å"
-    oslash:
-        text: "ø"
-    Oslash:
-        text: "Ø"
-    ae:
-        text: "æ"
-    AE:
-        text: "Æ"
-    asterisk:
-        text: "*"
-    asciitilde:
-        text: "~"
-    quoteleft:
-        text: "`"
-    bar:
-        text: "|"
-    U00B7:
-        text: "·"
-    squareroot:
-        text: "√"
-    Greek_pi:
-        text: "π"
-    division:
-        text: "÷"
-    multiply:
-        text: "×"
-    paragraph:
-        text: "¶"
-    Greek_tau:
-        text: "τ"
-    copyright:
-        text: "©"
-    numbersign:
-        text: "#"
-    U00AE:
-        text: "®"
-    at:
-        text: "@"
-    dollar:
-        text: "$"
-    U00A3:
-        text: "£"
-    percent:
-        text: "%"
-    EuroSign:
-        outline: "special"
-        text: "€"
-    ampersand:
-        text: "&"
-    U00A5:
-        text: "¥"
-    minus:
-        text: "-"
-    asciicircum:
-        text: "^"
-    underscore:
-        text: "_"
-    degree:
-        text: "°"
-    plus:
-        text: "+"
-    equal:
-        text: "="
-    parenleft:
-        text: "("
-    parenright:
-        text: ")"
-    braceleft:
-        text: "{"
-    braceright:
-        text: "}"
-    backslash:
-        text: "\\"
-    slash:
-        text: "/"
-    quotedbl:
-        text: "\""
-    quoteright:
-        text: "'"
-    less:
-        text: "<"
-    greater:
-        text: ">"
-    question:
-        text: "?"
-    bracketleft:
-        text: "["
-    bracketright:
-        text: "]"
-
--- a/data/keyboards/gr.yaml
+++ b/data/keyboards/gr.yaml
@ -1,41 +1,40 @@
-# Greek layout originally created by Antonis Tsolomitis
+# Greek layout created by Antonis Tsolomitis
 # University of the Aegean, Department of Mathematics, atsol@aegean.gr
 # Sep 2019
-# Edited by Sotiris Papadopoulos, sotirios.papadopoulos@inserm.fr
 ---
 outlines:
-    default:   { width: 40,    height: 60 }
-    altline:   { width: 52.67, height: 60 }
-    wide:      { width: 62,    height: 60 }
-    spaceline: { width: 140,   height: 60 }
-    special:   { width: 44,    height: 60 }
+    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:
-        - "semicolon ς ε ρ τ υ θ ι ο π"
+        - "; ς ε ρ τ υ θ ι ο π !"
        - "α σ δ φ γ η ξ κ λ show_accented"
-        - "Shift_L ζ χ ψ ω β ν μ BackSpace"
-        - "show_numbers preferences space period comma Return"
+        - "Shift_L ζ χ ψ ω β ν μ , BackSpace"
+        - "show_numbers preferences space period Return"
    upper:
-        - "colon exclam Ε Ρ Τ Υ Θ Ι Ο Π"
+        - ": EuroSign Ε Ρ Τ Υ Θ Ι Ο Π"
        - "Α Σ Δ Φ Γ Η Ξ Κ Λ show_accented"
-        - "Shift_L Ζ Χ Ψ Ω Β Ν Μ BackSpace"
-        - "show_numbers preferences space period_upper apostrophe Return"
+        - "Shift_L Ζ Χ Ψ Ω Β Ν Μ · BackSpace"
+        - "show_numbers preferences space « » Return"
    accented:
-        - "ά έ ή ί ϊ ΐ ό ύ ϋ ώ "
-        - "Ά Έ Ή Ί Ϊ Ό Ύ Ϋ Ώ show_base"
-        - "Ϗ ϐ ϑ ϗ ϖ ΰ ϕ – — BackSpace"
-        - "show_numbers preferences space eis_l eis_r Return"
+        - "ά έ ή ί ό ύ ώ ϊ ϋ ΐ"
+        - "ΰ Ά Έ Ή Ί Ό Ύ Ώ Ϊ show_base"
+        - "Ϋ Ϗ ϐ ϑ ϕ ϖ ϗ – — BackSpace"
+        - "show_numbers preferences space quoteleft quoteright Return"
    numbers:
        - "1 2 3 4 5 6 7 8 9 0"
        - "at numbersign dollar percent ampersand minus underscore plus parenleft parenright"
        - "show_symbols comma quotedbl quoteright colon semicolon exclam question BackSpace"
-        - "show_letters preferences space period comma Return"
+        - "show_letters preferences space period Return"
    symbols:
        - "asciitilde quoteleft bar U00B7 squareroot Greek_pi Greek_tau division multiply paragraph"
        - "copyright U00AE U00A3 EuroSign U00A5 asciicircum degree asterisk braceleft braceright"
        - "show_numbers backslash slash less greater equal bracketleft bracketright  BackSpace"
-        - "show_letters preferences space period comma Return"
+        - "show_letters preferences space period Return"
 buttons:
    Shift_L:
        action:
@ -55,12 +54,12 @@ buttons:
    show_numbers:
        action:
            set_view: "numbers"
-        outline: "wide"
+        outline: "altline"
        label: "123"
    show_letters:
        action:
            set_view: "base"
-        outline: "wide"
+        outline: "altline"
        label: "ΑΒΓ"
    show_symbols:
        action:
@ -79,40 +78,16 @@ buttons:
            set_view: "base"
        outline: "altline"
        label: "αι"
+    period:
+        outline: "altline"
+        text: "."
    space:
-        outline: "spaceline"
+        outline: spaceline
        text: " "
    Return:
        outline: "wide"
        icon: "key-enter"
        keysym: "Return"
-    period:
-        outline: "special"
-        text: "."
-    period_upper:
-        outline: "special"
-        text: "·"
-    comma:
-        outline: "special"
-        text: ","
-    colon:
-        outline: "special"
-        text: ":"
-    semicolon:
-        outline: "special"
-        text: ";"
-    apostrophe:
-        outline: "special"
-        text: "᾿"
-    exclam:
-        outline: "special"
-        text: "!"
-    eis_l:
-        outline: "special"
-        text: "«"
-    eis_r:
-        outline: "special"
-        text: "»"
    aring:
        text: "å"
    Aring:
@ -187,6 +162,8 @@ buttons:
        text: "{"
    braceright:
        text: "}"
+    comma:
+        text: ","
    backslash:
        text: "\\"
    slash:
@ -199,6 +176,12 @@ buttons:
        text: "<"
    greater:
        text: ">"
+    colon:
+        text: ":"
+    semicolon:
+        text: ";"
+    exclam:
+        text: "!"
    question:
        text: "?"
    bracketleft:
--- a/data/keyboards/gr_wide.yaml
+++ b/data/keyboards/gr_wide.yaml
@ -1,204 +0,0 @@
-# Creaed by Sotiris Papadopoulos, sotirios.papadopoulos@inserm.fr
---
-outlines:
-    default:   { width: 80,  height: 60 }
-    altline:   { width: 110, height: 60 }
-    wide:      { width: 120, height: 60 }
-    spaceline: { width: 250, height: 60 }
-    special:   { width: 75,  height: 60 }
-
-views:
-    base:
-        - "semicolon ς ε ρ τ υ θ ι ο π"
-        - "α σ δ φ γ η ξ κ λ show_accented"
-        - "Shift_L ζ χ ψ ω β ν μ BackSpace"
-        - "show_numbers preferences space period comma Return"
-    upper:
-        - "colon exclam Ε Ρ Τ Υ Θ Ι Ο Π"
-        - "Α Σ Δ Φ Γ Η Ξ Κ Λ show_accented"
-        - "Shift_L Ζ Χ Ψ Ω Β Ν Μ BackSpace"
-        - "show_numbers preferences space period_upper apostrophe Return"
-    accented:
-        - "ά έ ή ί ϊ ΐ ό ύ ϋ ώ "
-        - "Ά Έ Ή Ί Ϊ Ό Ύ Ϋ Ώ show_base"
-        - "Ϗ ϐ ϑ ϗ ΰ ϕ ϖ – — BackSpace"
-        - "show_numbers preferences space eis_l eis_r Return"
-    numbers:
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "at numbersign dollar percent ampersand minus underscore plus parenleft parenright"
-        - "show_symbols comma quotedbl quoteright colon semicolon exclam question BackSpace"
-        - "show_letters preferences space period comma Return"
-    symbols:
-        - "asciitilde quoteleft bar U00B7 squareroot Greek_pi Greek_tau division multiply paragraph"
-        - "copyright U00AE U00A3 EuroSign U00A5 asciicircum degree asterisk braceleft braceright"
-        - "show_numbers backslash slash less greater equal bracketleft bracketright  BackSpace"
-        - "show_letters preferences space period comma 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_letters:
-        action:
-            set_view: "base"
-        outline: "wide"
-        label: "ΑΒΓ"
-    show_symbols:
-        action:
-            set_view: "symbols"
-        outline: "altline"
-        label: "*/="
-    show_accented:
-        action:
-            locking:
-                lock_view: "accented"
-                unlock_view: "base"
-        outline: "altline"
-        label: "άΐ"
-    show_base:
-        action:
-            set_view: "base"
-        outline: "altline"
-        label: "αι"
-    space:
-        outline: "spaceline"
-        text: " "
-    Return:
-        outline: "wide"
-        icon: "key-enter"
-        keysym: "Return"
-    period:
-        outline: "special"
-        text: "."
-    period_upper:
-        outline: "special"
-        text: "·"
-    comma:
-        outline: "special"
-        text: ","
-    colon:
-        outline: "special"
-        text: ":"
-    semicolon:
-        outline: "special"
-        text: ";"
-    apostrophe:
-        outline: "special"
-        text: "᾿"
-    exclam:
-        outline: "special"
-        text: "!"
-    eis_l:
-        outline: "special"
-        text: "«"
-    eis_r:
-        outline: "special"
-        text: "»"
-    aring:
-        text: "å"
-    Aring:
-        text: "Å"
-    oslash:
-        text: "ø"
-    Oslash:
-        text: "Ø"
-    ae:
-        text: "æ"
-    AE:
-        text: "Æ"
-    asterisk:
-        text: "*"
-    asciitilde:
-        text: "~"
-    quoteleft:
-        text: "`"
-    bar:
-        text: "|"
-    U00B7:
-        text: "·"
-    squareroot:
-        text: "√"
-    Greek_pi:
-        text: "π"
-    division:
-        text: "÷"
-    multiply:
-        text: "×"
-    paragraph:
-        text: "¶"
-    Greek_tau:
-        text: "τ"
-    copyright:
-        text: "©"
-    numbersign:
-        text: "#"
-    U00AE:
-        text: "®"
-    at:
-        text: "@"
-    dollar:
-        text: "$"
-    U00A3:
-        text: "£"
-    percent:
-        text: "%"
-    EuroSign:
-        text: "€"
-    ampersand:
-        text: "&"
-    U00A5:
-        text: "¥"
-    minus:
-        text: "-"
-    asciicircum:
-        text: "^"
-    underscore:
-        text: "_"
-    degree:
-        text: "°"
-    plus:
-        text: "+"
-    equal:
-        text: "="
-    parenleft:
-        text: "("
-    parenright:
-        text: ")"
-    braceleft:
-        text: "{"
-    braceright:
-        text: "}"
-    backslash:
-        text: "\\"
-    slash:
-        text: "/"
-    quotedbl:
-        text: "\""
-    quoteright:
-        text: "'"
-    less:
-        text: "<"
-    greater:
-        text: ">"
-    question:
-        text: "?"
-    bracketleft:
-        text: "["
-    bracketright:
-        text: "]"
--- a/data/keyboards/hu.yaml
+++ b/data/keyboards/hu.yaml
@ -1,82 +0,0 @@
-# Maintained by: soyer <soyer@irl.hu>
---
-outlines:
-    default:   { width: 35.33, height: 52 }
-    altline:   { width: 52.67, height: 52 }
-    wide:      { width: 62,    height: 52 }
-    spaceline: { width: 99.67, height: 52 }
-    special:   { width: 35.33, height: 52 }
-
-views:
-    base:
-        - "q w e r t z u i o p"
-        - "a s d f g h j k l"
-        - "Shift_L y x c v b n m  BackSpace"
-        - "show_numbers show_eschars preferences         space        , . - Return"
-    upper:
-        - "Q W E R T Z U I O P"
-        - "A S D F G H J K L"
-        - "Shift_L   Y X C V B N M  BackSpace"
-        - "show_numbers show_eschars preferences         space        ? : ! Return"
-    numbers:
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "@ # € % & - _ + ( )"
-        - "show_symbols   ; \" ' : = < >  BackSpace"
-        - "show_letters show_eschars preferences         space        , . - Return"
-    symbols:
-        - "~ ` ´ | · √ µ ÷ × ¶"
-        - "© ® £ $ ¥ ^ ° * { }"
-        - "show_numbers   \\ / § π τ [ ]  BackSpace"
-        - "show_letters show_eschars preferences         space        , . - Return"
-    eschars:
-        - "ö ü ó Ö Ü Ó"
-        - "í ő ú Í Ő Ú"
-        - "show_numbers é á ű É Á Ű BackSpace"
-        - "show_letters show_eschars preferences         space        „ “ Return"
-
-buttons:
-    Shift_L:
-        action:
-            locking:
-                lock_view: "upper"
-                unlock_view: "base"
-        outline: "altline"
-        icon: "key-shift"
-    BackSpace:
-        outline: "altline"
-        icon: "edit-clear-symbolic"
-        action: "erase"
-    preferences:
-        action: "show_prefs"
-        outline: "special"
-        icon: "keyboard-mode-symbolic"
-    show_numbers:
-        action:
-            set_view: "numbers"
-        outline: "altline"
-        label: "123"
-    show_letters:
-        action:
-            set_view: "base"
-        outline: "altline"
-        label: "ABC"
-    show_symbols:
-        action:
-            set_view: "symbols"
-        outline: "altline"
-        label: "*/="
-    show_eschars:
-        action:
-            locking:
-                lock_view: "eschars"
-                unlock_view: "base"
-        outline: "altline"
-        label: "éá"
-    space:
-        outline: "spaceline"
-        label: " "
-        text: " "
-    Return:
-        outline: "altline"
-        icon: "key-enter"
-        keysym: "Return"
--- a/data/keyboards/hu_wide.yaml
+++ b/data/keyboards/hu_wide.yaml
@ -1,82 +0,0 @@
-# Maintained by: soyer <soyer@irl.hu>
---
-outlines:
-    default:   { width: 48,  height: 42 }
-    altline:   { width: 81,  height: 42 }
-    wide:      { width: 108, height: 42 }
-    spaceline: { width: 216, height: 42 }
-    special:   { width: 48,  height: 42 }
-
-views:
-    base:
-        - "q w e r t z u i o p ő ú"
-        - "a s d f g h j k l é á ű"
-        - "Shift_L í y x c v b n m  BackSpace"
-        - "show_numbers show_eschars preferences         space        , . - Return"
-    upper:
-        - "Q W E R T Z U I O P Ő Ú"
-        - "A S D F G H J K L É Á Ű"
-        - "Shift_L Í Y X C V B N M  BackSpace"
-        - "show_numbers show_eschars preferences         space        ? : ! Return"
-    numbers:
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "@ # € % & - _ + ( )"
-        - "show_symbols   ; \" ' : = < >  BackSpace"
-        - "show_letters show_eschars preferences         space        , . - Return"
-    symbols:
-        - "~ ` ´ | · √ µ ÷ × ¶"
-        - "© ® £ $ ¥ ^ ° * { }"
-        - "show_numbers   \\ / § π τ [ ]  BackSpace"
-        - "show_letters show_eschars preferences         space        , . - Return"
-    eschars:
-        - "ö ü ó Ö Ü Ó"
-        - "í ő ú Í Ő Ú"
-        - "show_numbers é á ű É Á Ű BackSpace"
-        - "show_letters show_eschars preferences         space        „ “ Return"
-
-buttons:
-    Shift_L:
-        action:
-            locking:
-                lock_view: "upper"
-                unlock_view: "base"
-        outline: "altline"
-        icon: "key-shift"
-    BackSpace:
-        outline: "altline"
-        icon: "edit-clear-symbolic"
-        action: "erase"
-    preferences:
-        action: "show_prefs"
-        outline: "special"
-        icon: "keyboard-mode-symbolic"
-    show_numbers:
-        action:
-            set_view: "numbers"
-        outline: "altline"
-        label: "123"
-    show_letters:
-        action:
-            set_view: "base"
-        outline: "altline"
-        label: "ABC"
-    show_symbols:
-        action:
-            set_view: "symbols"
-        outline: "altline"
-        label: "*/="
-    show_eschars:
-        action:
-            locking:
-                lock_view: "eschars"
-                unlock_view: "base"
-        outline: "altline"
-        label: "éá"
-    space:
-        outline: "spaceline"
-        label: " "
-        text: " "
-    Return:
-        outline: "altline"
-        icon: "key-enter"
-        keysym: "Return"
--- a/data/keyboards/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,81 +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     zwnj period Return"
-    upper:
-        - "  ْ  ٌ  ٍ  ً  ُ  ِ  َ  ّ # @ چ"
-        - "_ ئ ي إ أ آ ة » « : ؛"
-        - "Shift_L ك  ٓ ژ  ٔ ء > < ؟ BackSpace"
-        - "show_numbers preferences         space        ! ، Return"
-    numbers:
-        - "۱ ۲ ۳ ۴ ۵ ۶ ۷ ۸ ۹ ۰ |"
-        - "… ٬ ٫ ﷼ ٪ ، * ) ( − ـ"
-        - "show_symbols + - × ÷ = ^ % / 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: "۱۲۳"
-    show_numbers_from_symbols:
-        action:
-            set_view: "numbers"
-        outline: "altline"
-        label: "۱۲۳"
-    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"
-    zwnj:
-        icon: "zwnj"
-        text: "‌"
-    colon:
-        text: ":"
--- a/data/keyboards/ir_wide.yaml
+++ b/data/keyboards/ir_wide.yaml
@ -1,81 +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     zwnj ؟ ! period Return"
-    upper:
-        - " ْ  ٌ  ٍ  ً  ُ  ِ  َ  ّ  ] [ @ # _"
-        - "ؤ ئ ي إ أ آ ة » « : ؛"
-        - "Shift_L ك  ٓ ژ ٰ  ‌  ٔ  ء  >  <  ؟ BackSpace"
-        - "show_numbers preferences         space        ، ؟ ! period Return"
-    numbers:
-        - "۱ ۲ ۳ ۴ ۵ ۶ ۷ ۸ ۹ ۰ | ="
-        - "… ٬ ٫ ﷼ ٪ ، * ) ( − _"
-        - "show_symbols + - × ÷ = ^ % / 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: "۱۲۳"
-    show_numbers_from_symbols:
-        action:
-            set_view: "numbers"
-        outline: "altline"
-        label: "۱۲۳"
-    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"
-    zwnj:
-        icon: "zwnj"
-        text: "‌"
-    colon:
-        text: ":"
--- a/data/keyboards/it+fur.yaml
+++ b/data/keyboards/it+fur.yaml
@ -2,11 +2,11 @@
 # 14 october 2020
 ---
 outlines:
-    default:   { width: 35.33, height: 52 }
-    altline:   { width: 52.67, height: 52 }
-    wide:      { width: 62,    height: 52 }
+    default: { width: 35.33, height: 52 }
+    altline: { width: 52.67, height: 52 }
+    wide: { width: 62, height: 52 }
    spaceline: { width: 99.67, height: 52 }
-    special:   { width: 44,    height: 52 }
+    special: { width: 44, height: 52 }

 views:
    base:
@ -22,7 +22,7 @@ views:
    numbers:
        - "1 2 3 4 5 6 7 8 9 0"
        - "@ # € % & - _ + ( )"
-        - "show_symbols   , \" ' : ; ! =  BackSpace"
+        - "show_symbols   , \" ' colon ; ! =  BackSpace"
        - "show_letters show_eschars preferences         space        ? . Return"
    symbols:
        - "~ ` | · √ π τ ÷ × ¶"
@ -65,7 +65,7 @@ buttons:
        action:
            set_view: "base"
        outline: "altline"
-        label: "ABC"
+        label: "abc"
    show_symbols:
        action:
            set_view: "symbols"
@ -86,4 +86,7 @@ buttons:
        outline: "altline"
        icon: "key-enter"
        keysym: "Return"
-
+    colon:
+        label: ":"
+    "\"":
+        keysym: "quotedbl"
--- a/data/keyboards/it.yaml
+++ b/data/keyboards/it.yaml
@ -2,11 +2,11 @@
 # 03 october 2019
 ---
 outlines:
-    default:   { width: 35.33, height: 52 }
-    altline:   { width: 52.67, height: 52 }
-    wide:      { width: 62,    height: 52 }
+    default: { width: 35.33, height: 52 }
+    altline: { width: 52.67, height: 52 }
+    wide: { width: 62, height: 52 }
    spaceline: { width: 99.67, height: 52 }
-    special:   { width: 44,    height: 52 }
+    special: { width: 44, height: 52 }

 views:
    base:
@ -22,7 +22,7 @@ views:
    numbers:
        - "1 2 3 4 5 6 7 8 9 0"
        - "@ # € % & - _ + ( )"
-        - "show_symbols   , \" ' : ; ! ?  BackSpace"
+        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
        - "show_letters show_eschars preferences         space        ? . Return"
    symbols:
        - "~ ` | · √ π τ ÷ × ¶"
@ -30,10 +30,10 @@ views:
        - "show_numbers   \\ / < > = [ ]  BackSpace"
        - "show_letters show_eschars preferences         space        ? . Return"
    eschars:
-        - "è é È É ù ú Ù Ú ò ó"
-        - "à á À Á ì í Ì Í Ò Ó"
-        - "show_numbers   “ ” « » ≈ ≠ ‽  BackSpace"
-        - "show_letters show_eschars preferences         space        , . Return"
+        - "á é í ó ú Á É Í Ó Ú"
+        - "à è ì ò « » ù ! { }"
+        - "show_numbers   \\ / < > = [ ]  BackSpace"
+        - "show_letters show_eschars preferences         space        « » Return"

 buttons:
    Shift_L:
@ -65,7 +65,7 @@ buttons:
        action:
            set_view: "base"
        outline: "altline"
-        label: "ABC"
+        label: "abc"
    show_symbols:
        action:
            set_view: "symbols"
@ -84,4 +84,7 @@ buttons:
        outline: "altline"
        icon: "key-enter"
        keysym: "Return"
-
+    colon:
+        label: ":"
+    "\"":
+        keysym: "quotedbl"
--- a/data/keyboards/jp+kana.yaml
+++ b/data/keyboards/jp+kana.yaml
@ -1,11 +1,11 @@
 # Maintained by: Mark Müller <markmueller86@gmail.com>
 ---
 outlines:
-    default:      { width: 62, height: 52 }
+    default: { width: 62, height: 52 }
    default-wide: { width: 62, height: 52 }
-    altline:      { width: 62, height: 52 }
-    wide:         { width: 62, height: 52 }
-    special:      { width: 62, height: 52 }
+    altline: { width: 62, height: 52 }
+    wide: { width: 62, height: 52 }
+    special: { width: 62, height: 52 }

 views:
    base: # hiragana
@ -438,7 +438,7 @@ buttons:
                unlock_view: "カタカナ"
        outline: "altline"
        label: "。"
-    # Buttons for Latin characters
+    # Buttons for Latin charachters
    RSYM1:
        action:
            locking:
--- a/data/keyboards/jp+kana_wide.yaml
+++ b/data/keyboards/jp+kana_wide.yaml
@ -1,11 +1,11 @@
 # Maintained by: Mark Müller <markmueller86@gmail.com>
 ---
 outlines:
-    default:      { width: 62, height: 42 }
+    default: { width: 62, height: 42 }
    default-wide: { width: 62, height: 42 }
-    altline:      { width: 62, height: 42 }
-    wide:         { width: 62, height: 42 }
-    special:      { width: 62, height: 42 }
+    altline: { width: 62, height: 42 }
+    wide: { width: 62, height: 42 }
+    special: { width: 62, height: 42 }

 views:
    base: # hiragana
@ -438,7 +438,7 @@ buttons:
                unlock_view: "カタカナ"
        outline: "altline"
        label: "。"
-    # Buttons for Latin characters
+    # Buttons for Latin charachters
    RSYM1:
        action:
            locking:
--- a/data/keyboards/no.yaml
+++ b/data/keyboards/no.yaml
@ -1,10 +1,10 @@
 ---
 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 }
+    default: { width: 32, height: 52 }
+    altline: { width: 48.39024, height: 52 }
+    wide: { width: 64, height: 52 }
+    spaceline: { width: 142, height: 52 }
+    special: { width: 44, height: 52 }

 views:
    base:
--- a/data/keyboards/number/us.yaml
+++ b/data/keyboards/number/us.yaml
@ -1,8 +1,8 @@
 ---
 outlines:
-    default:   { width: 37.46341, height: 52 }
-    altline:   { width: 48.39024, height: 52 }
-    outline7:  { width: 88.97561, height: 52 }
+    default: { width: 37.46341, height: 52 }
+    altline: { width: 48.39024, height: 52 }
+    outline7: { width: 88.97561, height: 52 }
    spaceline: { width: 120.5853, height: 52 }

 views:
--- a/data/keyboards/pin/us.yaml
+++ b/data/keyboards/pin/us.yaml
@ -1,20 +0,0 @@
---
-margins: { top: 4, side: 0, bottom: 4 }
-outlines:
-    default: { width: 120, height: 52 }
-
-views:
-    base:
-        - "1 2 3"
-        - "4 5 6"
-        - "7 8 9"
-        - "BackSpace 0 Return"
-
-buttons:
-    BackSpace:
-        icon: "edit-clear-symbolic"
-        action: erase
-    Return:
-        icon: "key-enter"
-        keysym: "Return"
-
--- a/data/keyboards/pl.yaml
+++ b/data/keyboards/pl.yaml
@ -1,10 +1,10 @@
 ---
 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 }
+    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:
@ -52,8 +52,6 @@ buttons:
            locking:
                lock_view: "upper_accents"
                unlock_view: "accents"
-                looks_locked_from:
-                    - "upper"
        outline: "altline"
        icon: "key-shift"
    BackSpace:
@ -96,8 +94,6 @@ buttons:
            locking:
                lock_view: "upper_accents"
                unlock_view: "upper"
-                looks_locked_from:
-                    - "accents"
        outline: "altline"
        label: "ĄĘ"
    period:
--- a/data/keyboards/pl_wide.yaml
+++ b/data/keyboards/pl_wide.yaml
@ -1,10 +1,10 @@
 ---
 outlines:
-    default:   { width: 54,  height: 42 }
-    altline:   { width: 81,  height: 42 }
-    wide:      { width: 100, height: 42 }
+    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 }
+    special: { width: 54, height: 42 }

 views:
    base:
--- a/data/keyboards/ro.yaml
+++ b/data/keyboards/ro.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: 99.67, height: 52 }
-    special:   { width: 44,    height: 52 }
-
-views:
-    base:
-        - "q w e r t y u i o p"
-        - "a s d f g h j k l"
-        - "Shift_L   z x c v b n m  BackSpace"
-        - "show_numbers show_eschars preferences         space        . Return"
-    upper:
-        - "Q W E R T Y U I O P"
-        - "A S D F G H J K L"
-        - "Shift_L   Z X C V B N M  BackSpace"
-        - "show_numbers show_eschars preferences         space        , Return"
-    numbers:
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "@ # € % & - _ + ( )"
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
-        - "show_letters show_eschars preferences         space        . Return"
-    symbols:
-        - "~ ` | · √ π τ ÷ × ¶"
-        - "© ® £ $ ¥ ^ ° * { }"
-        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters show_eschars preferences         space        , Return"
-    eschars:
-        - "ă â î ș ț á é í ó ü"
-        - "Ă Â Î Ș Ț Á É Í Ó Ü"
-        - "show_numbers_from_symbols „ ” « » ― { } 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: "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/ro_wide.yaml
+++ b/data/keyboards/ro_wide.yaml
@ -1,89 +0,0 @@
---
-outlines:
-    default:   { width: 54,  height: 42 }
-    altline:   { width: 81,  height: 42 }
-    wide:      { width: 108, height: 42 }
-    spaceline: { width: 153, 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 show_eschars preferences         space        . Return"
-    upper:
-        - "Q W E R T Y U I O P"
-        - "A S D F G H J K L"
-        - "Shift_L   Z X C V B N M  BackSpace"
-        - "show_numbers show_eschars preferences         space        , Return"
-    numbers:
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "@ # € % & - _ + ( )"
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
-        - "show_letters show_eschars preferences         space        . Return"
-    symbols:
-        - "~ ` | · √ π τ ÷ × ¶"
-        - "© ® £ $ ¥ ^ ° * { }"
-        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters show_eschars preferences         space        , Return"
-    eschars:
-        - "ă â î ș ț á é í ó ü"
-        - "Ă Â Î Ș Ț Á É Í Ó Ü"
-        - "show_numbers_from_symbols „ ” « » ― { } 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: "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/ru.yaml
+++ b/data/keyboards/ru.yaml
@ -1,12 +1,12 @@
 ---
 outlines:
-    default:   { width: 32,  height: 52 }
-    altline:   { width: 32,  height: 52 }
-    wide:      { width: 57,  height: 52 }
-    narrow:    { width: 26,  height: 52 }
+    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 }
+    fill: { width: 159, height: 52 }
+    special: { width: 42, height: 52 }

 views:
    base:
--- a/data/keyboards/se.yaml
+++ b/data/keyboards/se.yaml
@ -1,10 +1,10 @@
 ---
 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 }
+    default: { width: 32, height: 52 }
+    altline: { width: 48.39024, height: 52 }
+    wide: { width: 64,  height: 52 }
+    spaceline: { width: 142, height: 52 }
+    special: { width: 44, height: 52 }
 

 views:
--- a/data/keyboards/se_wide.yaml
+++ b/data/keyboards/se_wide.yaml
@ -1,164 +0,0 @@
---
-outlines:
-    default:   { width: 50,  height: 42 }
-    altline:   { width: 81,  height: 42 }
-    wide:      { width: 108, height: 42 }
-    spaceline: { width: 216, height: 42 }
-    special:   { width: 60,  height: 42 }
- 
-
-views:
-    base:
-        - "q w e r t y u i o p å"
-        - "a s d f g h j k l ö ä"
-        - "Shift_L   z x c v b n m  BackSpace"
-        - "show_numbers preferences         space        .    Return"
-    upper:
-        - "Q W E R T Y U I O P Å"
-        - "A S D F G H J K L Ö Ä"
-        - "Shift_L   Z X C V B N M  BackSpace"
-        - "show_numbers preferences         space        .    Return"
-    numbers:
-        - "§ 1 2 3 4 5 6 7 8 9 0"
-        - "at numbersign EuroSign dollar percent ampersand minus underscore plus parenleft parenright"
-        - "show_symbols   comma quotedbl quoteright colon semicolon exclam question  BackSpace"
-        - "show_letters preferences         space        .    Return"
-    symbols:
-        - "µ asciitilde quoteleft bar U00B7 squareroot Greek_pi Greek_tau division multiply paragraph"
-        - "½ ¤ copyright U00AE U00A3 U00A5 asciicircum degree asterisk braceleft braceright"
-        - "show_numbers_from_symbols   backslash slash less greater equal bracketleft bracketright  BackSpace"
-        - "show_letters preferences         space        .    Return"
-
-buttons:
-    Shift_L:
-        action:
-            locking:
-                lock_view: "upper"
-                unlock_view: "base"
-        outline: "altline"
-        icon: "key-shift"
-    BackSpace:
-        outline: altline
-        icon: "edit-clear-symbolic"
-        action: erase
-    preferences:
-        action: "show_prefs"
-        outline: "special"
-        icon: "keyboard-mode-symbolic"
-    show_numbers:
-        outline: "wide"
-        action:
-            set_view: "numbers"
-        label: "123"
-    show_numbers_from_symbols:
-        action:
-            set_view: "numbers"
-        outline: altline
-        label: "123"
-    show_letters:
-        outline: "wide"
-        action:
-            set_view: "base"
-        label: "ABC"
-    show_symbols:
-        action:
-            set_view: "symbols"
-        outline: "altline"
-        label: "*/="
-    ".":
-        outline: "special"
-    space:
-        outline: spaceline
-        text: " "
-    Return:
-        outline: "wide"
-        icon: "key-enter"
-        keysym: "Return"
-    asterisk:
-        text: "*"
-    asciitilde:
-        text: "~"
-    quoteleft:
-        text: "`"
-    bar:
-        text: "|"
-    U00B7:
-        text: "·"
-    squareroot:
-        text: "√"
-    Greek_pi:
-        text: "π"
-    division:
-        text: "÷"
-    multiply:
-        text: "×"
-    paragraph:
-        text: "¶"
-    Greek_tau:
-        text: "τ"
-    copyright:
-        text: "©"
-    numbersign:
-        text: "#"
-    U00AE:
-        text: "®"
-    at:
-        text: "@"
-    dollar:
-        text: "$"
-    U00A3:
-        text: "£"
-    percent:
-        text: "%"
-    EuroSign:
-        text: "€"
-    ampersand:
-        text: "&"
-    U00A5:
-        text: "¥"
-    minus:
-        text: "-"
-    asciicircum:
-        text: "^"
-    underscore:
-        text: "_"
-    degree:
-        text: "°"
-    plus:
-        text: "+"
-    equal:
-        text: "="
-    parenleft:
-        text: "("
-    parenright:
-        text: ")"
-    braceleft:
-        text: "{"
-    braceright:
-        text: "}"
-    comma:
-        text: ","
-    backslash:
-        text: "\\"
-    slash:
-        text: "/"
-    quotedbl:
-        text: "\""
-    quoteright:
-        text: "'"
-    less:
-        text: "<"
-    greater:
-        text: ">"
-    colon:
-        text: ":"
-    semicolon:
-        text: ";"
-    exclam:
-        text: "!"
-    question:
-        text: "?"
-    bracketleft:
-        text: "["
-    bracketright:
-        text: "]"
--- a/data/keyboards/terminal/us+dvorak.yaml
+++ b/data/keyboards/terminal/us+dvorak.yaml
@ -1,40 +1,40 @@
 ---
 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: 50.47, height: 22 }
+    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 }

 views:
    base:
-        - "TabSmall Ctrl Alt ↑ ↓ ← →"
-        - "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"
+        - "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:
-        - "TabSmall Ctrl Alt PgUp PgDn Home End"
-        - "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"
+        - "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:
-        - "TabSmall Ctrl Alt ↑ ↓ ← →"
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
-        - "* # $ / & - _ + ( )"
+        - "Ctrl Alt ↑ ↓ ← →"
        - "1 2 3 4 5 6 7 8 9 0"
+        - "* # $ / & - _ + ( )"
+        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
        - "show_letters preferences         space        period Return"
    symbols:
-        - "TabSmall Ctrl Alt ↑ ↓ ← →"
-        - "show_numbers_from_symbols   \\ % < > = [ ]  BackSpace"
-        - "© ® £ € ¥ ^ ° @ { }"
+        - "Ctrl Alt ↑ ↓ ← →"
        - "~ ` | · √ π τ ÷ × ¶"
+        - "© ® £ € ¥ ^ ° @ { }"
+        - "show_numbers_from_symbols   \\ % < > = [ ]  BackSpace"
        - "show_letters preferences         space        period Return"
    actions:
-        - "TabSmall Ctrl Alt PgUp PgDn Home End"
+        - "Ctrl Alt PgUp PgDn Home End"
        - "F1  F2  F3  F4  F5  F6"
        - "F7  F8  F9  F10 F11 F12"
        - "Esc Tab Pause Insert Up Del"
@ -135,10 +135,6 @@ buttons:
    Tab:
        outline: "action"
        keysym: "Tab"
-    TabSmall:
-        outline: "small"
-        keysym: "Tab"
-        label: "Tab"
    Del:
        outline: "action"
        keysym: "Delete"
@ -151,6 +147,9 @@ buttons:
    Pause:
        outline: "action"
        keysym: "Pause"
+    Menu:
+        outline: "action"
+        keysym: "Menu"
    Break:
        outline: "action"
        keysym: "Break"
@ -202,3 +201,4 @@ buttons:
        modifier: "Alt"
        outline: "small"
        label: "Alt"
+
--- a/data/keyboards/terminal/de.yaml
+++ b/data/keyboards/terminal/de.yaml
@ -1,255 +0,0 @@
---
-outlines:
-    default:    { width: 35.33,  height: 46 }
-    halfwidth:  { width: 17.665, height: 46 }
-    narrow:     { width: 26.335, height: 46 }
-    special:    { width: 35.33,  height: 46 }
-    altline:    { width: 52.67,  height: 46 }
-    large:      { width: 52.67,  height: 46 }
-    action:     { width: 59,     height: 46 }
-    wide:       { width: 59,     height: 46 }
-    spaceline:  { width: 100.96, height: 46 }
-    small:      { width: 50.471, height: 22 }
-
-views:
-    base:
-        - "TabSmall Ctrl Alt ↑ ↓ ← →"
-        - "q w e r t z u i o p"
-        - "PeriodSmall a s d f g h j k l MinusSmall"
-        - "Shift_L   y x c v b n m  BackSpace"
-        - "show_numbers show_eschars preferences      space        show_actions Return"
-    upper:
-        - "TabSmall Ctrl Alt PgUp PgDn Home End"
-        - "Q W E R T Z U I O P"
-        - "SlashSmall A S D F G H J K L PipeSmall"
-        - "Shift_L   Y X C V B N M  BackSpace"
-        - "show_numbers show_eschars preferences      space        show_actions Return"
-    numbers:
-        - "TabSmall Ctrl Alt ↑ ↓ ← →"
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "\\ * # $ / & - + ( ) _"
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
-        - "show_letters show_eschars preferences         space        period Return"
-    symbols:
-        - "TabSmall Ctrl Alt ↑ ↓ ← →"
-        - "~ ` · √ π τ ÷ × ¶ @"
-        - "© ® £ € ¥ ^ ° { }"
-        - "show_numbers_from_symbols   % | < > = [ ]  BackSpace"
-        - "show_letters show_eschars preferences         space        period Return"
-    eschars:
-        - "TabSmall Ctrl Alt ↑ ↓ ← →"
-        - "ä è é ö ü Ä È É Ö Ü"
-        - "à â ê î ô À Â È Î Ô"
-        - "show_numbers  « » ç Ç æ œ ß  BackSpace"
-        - "show_letters show_eschars preferences         space        „ “ Return"
-    actions:
-        - "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_actions 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: "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_letters_actions:
-        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: "Ää"
-    show_actions:
-        action:
-            set_view: "actions"
-        outline: "altline"
-        label: ">_"
-    period:
-        outline: "large"
-        text: "."
-    space:
-        outline: "spaceline"
-        text: " "
-    Return:
-        outline: "wide"
-        icon: "key-enter"
-        keysym: "Return"
-    colon:
-        text: ":"
-    F1:
-        outline: "action"
-        keysym: "F1"
-    F2:
-        outline: "action"
-        keysym: "F2"
-    F3:
-        outline: "action"
-        keysym: "F3"
-    F4:
-        outline: "action"
-        keysym: "F4"
-    F5:
-        outline: "action"
-        keysym: "F5"
-    F6:
-        outline: "action"
-        keysym: "F6"
-    F7:
-        outline: "action"
-        keysym: "F7"
-    F8:
-        outline: "action"
-        keysym: "F8"
-    F9:
-        outline: "action"
-        keysym: "F9"
-    F10:
-        outline: "action"
-        keysym: "F10"
-    F11:
-        outline: "action"
-        keysym: "F11"
-    F12:
-        outline: "action"
-        keysym: "F12"
-    Esc:
-        outline: "action"
-        keysym: "Escape"
-    Tab:
-        outline: "action"
-        keysym: "Tab"
-    TabSmall:
-        outline: "small"
-        keysym: "Tab"
-        label: "Tab"
-    Del:
-        outline: "action"
-        keysym: "Delete"
-        label: "Entf"
-    Insert:
-        outline: "action"
-        keysym: "Insert"
-        label: "Einfg"
-    Menu:
-        outline: "action"
-        keysym: "Menu"
-        label: "Menü"
-    Pause:
-        outline: "action"
-        keysym: "Pause"
-    Break:
-        outline: "action"
-        keysym: "Break"
-        label: "Untbr"
-    Home:
-        outline: "small"
-        keysym: "Home"
-        label: "Pos1"
-    End:
-        outline: "small"
-        keysym: "End"
-        label: "Ende"
-    PgUp:
-        outline: "small"
-        keysym: "Page_Up"
-        label: "Bild↑"
-    PgDn:
-        outline: "small"
-        keysym: "Page_Down"
-        label: "Bild↓"
-    "↑":
-        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: "Strg"
-    Alt:
-        modifier: "Alt"
-        outline: "small"
-        label: "Alt"
-    MinusSmall:
-        outline: "halfwidth"
-        text: "-"
-    SlashSmall:
-        outline: "halfwidth"
-        text: "/"
-    PipeSmall:
-        outline: "halfwidth"
-        text: "|"
-    PeriodSmall:
-        outline: "halfwidth"
-        text: "."
-    "„":
-        outline: "narrow"
-        text: "„"
-    "“":
-        outline: "narrow"
-        text: "“"
-    "\\":
-        outline: "halfwidth"
-    _:
-        outline: "halfwidth"
--- a/data/keyboards/terminal/de_wide.yaml
+++ b/data/keyboards/terminal/de_wide.yaml
@ -1,259 +0,0 @@
---
-outlines:
-    default:   { width: 54,   height: 37 }
-    halfwidth: { width: 27,   height: 37 }
-    narrow:    { width: 40.5, height: 37 }
-    special:   { width: 54,   height: 37 }
-    altline:   { width: 81,   height: 37 }
-    large:     { width: 81,   height: 37 }
-    action:    { width: 90,   height: 37 }
-    wide:      { width: 90,   height: 37 }
-    spaceline: { width: 153,  height: 37 }
-    small:     { width: 67.4, height: 22 }
-
-views:
-    base:
-        - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
-        - "q w e r t z u i o p"
-        - "PeriodSmall a s d f g h j k l MinusSmall"
-        - "Shift_L   y x c v b n m  BackSpace"
-        - "show_numbers show_eschars preferences      space        show_actions Return"
-    upper:
-        - "EscSmall TabSmall Ctrl Alt PgUp PgDn Home End"
-        - "Q W E R T Z U I O P"
-        - "SlashSmall A S D F G H J K L PipeSmall"
-        - "Shift_L   Y X C V B N M  BackSpace"
-        - "show_numbers show_eschars 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 show_eschars preferences         space        period Return"
-    symbols:
-        - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
-        - "~ ` · √ π τ ÷ × ¶ @"
-        - "© ® £ € ¥ ^ ° { }"
-        - "show_numbers_from_symbols   % | < > = [ ]  BackSpace"
-        - "show_letters show_eschars preferences         space        period Return"
-    eschars:
-        - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
-        - "ä è é ö ü Ä È É Ö Ü"
-        - "à â ê î ô À Â È Î Ô"
-        - "show_numbers  « » ç Ç æ œ ß  BackSpace"
-        - "show_letters show_eschars preferences         space        „ “ 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_actions 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: "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_letters_actions:
-        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: "Ää"
-    show_actions:
-        action:
-            set_view: "actions"
-        outline: "altline"
-        label: ">_"
-    period:
-        outline: "large"
-        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"
-        label: "Entf"
-    Insert:
-        outline: "action"
-        keysym: "Insert"
-        label: "Einfg"
-    Menu:
-        outline: "action"
-        keysym: "Menu"
-        label: "Menü"
-    Pause:
-        outline: "action"
-        keysym: "Pause"
-    Break:
-        outline: "action"
-        keysym: "Break"
-        label: "Untbr"
-    Home:
-        outline: "small"
-        keysym: "Home"
-        label: "Pos1"
-    End:
-        outline: "small"
-        keysym: "End"
-        label: "Ende"
-    PgUp:
-        outline: "small"
-        keysym: "Page_Up"
-        label: "Bild↑"
-    PgDn:
-        outline: "small"
-        keysym: "Page_Down"
-        label: "Bild↓"
-    "↑":
-        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: "Strg"
-    Alt:
-        modifier: "Alt"
-        outline: "small"
-        label: "Alt"
-    MinusSmall:
-        outline: "halfwidth"
-        text: "-"
-    SlashSmall:
-        outline: "halfwidth"
-        text: "/"
-    PipeSmall:
-        outline: "halfwidth"
-        text: "|"
-    PeriodSmall:
-        outline: "halfwidth"
-        text: "."
-    "„":
-        outline: "narrow"
-        text: "„"
-    "“":
-        outline: "narrow"
-        text: "“"
-    "\\":
-        outline: "halfwidth"
-    _:
-        outline: "halfwidth"
--- a/data/keyboards/terminal/es.yaml
+++ b/data/keyboards/terminal/es.yaml
@ -1,220 +0,0 @@
---
-outlines:
-    default:   { width: 35.33, height: 46 }
-    action:    { width: 59,    height: 46 }
-    altline:   { width: 52.67, height: 46 }
-    large:     { width: 52.67, height: 46 }
-    wide:      { width: 59,    height: 46 }
-    spaceline: { width: 92.29, height: 46 }
-    special:   { width: 44,    height: 46 }
-    small:     { width: 50.57, height: 22 }
-
-views:
-    base:
-        - "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 show_eschars preferences      space        show_actions Return"
-    upper:
-        - "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  DelUp"
-        - "show_numbers show_eschars preferences      space        show_actions Return"
-    numbers:
-        - "TabSmall Ctrl Alt ↑ ↓ ← →"
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "* # € / & - _ + ( )"
-        - "show_symbols , \" ' colon ; ! ?  BackSpace"
-        - "show_letters show_eschars preferences         space        . Return"
-    symbols:
-        - "TabSmall Ctrl Alt ↑ ↓ ← →"
-        - "~ ` | · √ π τ ÷ × ¶"
-        - "© ® £ $ ¥ ^ ° @ { }"
-        - "show_numbers   \\ % < > = [ ]  BackSpace"
-        - "show_letters show_eschars preferences         space        . Return"
-    eschars:
-        - "TabSmall Ctrl Alt ↑ ↓ ← →"
-        - "á é í ó ú Á É Í Ó Ú"
-        - "à è ì ò ù À È Ì Ò Ù"
-        - "show_numbers , ü ç ï Ü Ç ï BackSpace"
-        - "show_letters show_symbols preferences        space        show_actions Return"
-    actions:
-        - "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_actions 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: "altline"
-        label: "123"
-    show_letters:
-        action:
-            set_view: "base"
-        outline: "altline"
-        label: "ABC"
-    show_letters_actions:
-        action:
-            set_view: "base"
-        outline: "wide"
-        label: "ABC"
-    show_symbols:
-        action:
-            set_view: "symbols"
-        outline: "altline"
-        label: "τ=\\"
-    show_eschars:
-        action:
-            set_view: "eschars"
-        outline: "altline"
-        label: "áÁ"
-    show_actions:
-        action:
-            set_view: "actions"
-        outline: "altline"
-        label: ">_"
-    ".":
-        outline: "large"
-        text: "."
-    space:
-        outline: "spaceline"
-        text: " "
-    Return:
-        outline: "wide"
-        icon: "key-enter"
-        keysym: "Return"
-    colon:
-        text: ":"
-    F1:
-        outline: "action"
-        keysym: "F1"
-    F2:
-        outline: "action"
-        keysym: "F2"
-    F3:
-        outline: "action"
-        keysym: "F3"
-    F4:
-        outline: "action"
-        keysym: "F4"
-    F5:
-        outline: "action"
-        keysym: "F5"
-    F6:
-        outline: "action"
-        keysym: "F6"
-    F7:
-        outline: "action"
-        keysym: "F7"
-    F8:
-        outline: "action"
-        keysym: "F8"
-    F9:
-        outline: "action"
-        keysym: "F9"
-    F10:
-        outline: "action"
-        keysym: "F10"
-    F11:
-        outline: "action"
-        keysym: "F11"
-    F12:
-        outline: "action"
-        keysym: "F12"
-    Esc:
-        outline: "action"
-        keysym: "Escape"
-    Tab:
-        outline: "action"
-        keysym: "Tab"
-    TabSmall:
-        outline: "small"
-        keysym: "Tab"
-        label: "Tab"
-    Del:
-        outline: "action"
-        keysym: "Delete"
-    DelUp:
-        outline: "altline"
-        keysym: "Delete"
-        label: "Del"
-    Insert:
-        outline: "action"
-        keysym: "Insert"
-    Menu:
-        outline: "action"
-        keysym: "Menu"
-    Pause:
-        outline: "action"
-        keysym: "Pause"
-    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/terminal/es_wide.yaml
+++ b/data/keyboards/terminal/es_wide.yaml
@ -1,224 +0,0 @@
---
-outlines:
-    default:   { width: 54,   height: 37 }
-    action:    { width: 90,   height: 37 }
-    altline:   { width: 81,   height: 37 }
-    large:     { width: 81,   height: 37 }
-    wide:      { width: 90,   height: 37 }
-    spaceline: { width: 153,  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 show_eschars 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  DelUp"
-        - "show_numbers show_eschars 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 show_eschars preferences         space        . Return"
-    symbols:
-        - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
-        - "~ ` | · √ π τ ÷ × ¶"
-        - "© ® £ € ¥ ^ ° @ { }"
-        - "show_numbers   \\ % < > = [ ]  BackSpace"
-        - "show_letters show_eschars preferences         space        . Return"
-    eschars:
-        - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
-        - "á é í ó ú Á É Í Ó Ú"
-        - "à è ì ò ù À È Ì Ò Ù"
-        - "show_numbers ´ ü ç ï Ü Ç Ï BackSpace"
-        - "show_letters show_symbols preferences        space        show_actions 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_actions 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: "altline"
-        label: "123"
-    show_letters:
-        action:
-            set_view: "base"
-        outline: "altline"
-        label: "ABC"
-    show_letters_actions:
-        action:
-            set_view: "base"
-        outline: "wide"
-        label: "ABC"
-    show_symbols:
-        action:
-            set_view: "symbols"
-        outline: "altline"
-        label: "τ=\\"
-    show_eschars:
-        action:
-            set_view: "eschars"
-        outline: "altline"
-        label: "áÁ"
-    show_actions:
-        action:
-            set_view: "actions"
-        outline: "altline"
-        label: ">_"
-    ".":
-        outline: "large"
-        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"
-    DelUp:
-        outline: "altline"
-        keysym: "Delete"
-        label: "Del"
-    Insert:
-        outline: "action"
-        keysym: "Insert"
-    Menu:
-        outline: "action"
-        keysym: "Menu"
-    Pause:
-        outline: "action"
-        keysym: "Pause"
-    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/terminal/fr+bepo.yaml
+++ b/data/keyboards/terminal/fr+bepo.yaml
@ -1,223 +0,0 @@
---
-outlines:
-    action:    { width: 59,    height: 46 }
-    small:     { width: 50,    height: 22 }
-    default:   { width: 35.33, height: 46 }
-    altline:   { width: 35.33, height: 46 }
-    wide:      { width: 50,    height: 46 }
-    spaceline: { width: 110,   height: 46 }
-    special:   { width: 35.33,    height: 46 }
-
-views:
-    base:
-        - "Ctrl Alt Tabsmall ↑ ↓ ← →"
-        - "b é p o w v d l j z"
-        - "a u i e c t s r n m"
-        - "Shift_L y x k q g h f period BackSpace"
-        - "show_numbers preferences slash  space  show_eschars show_actions Return"
-    upper:
-        - "Ctrl Alt Tabsmall PgUp PgDn Home End"
-        - "B É P O W V D L J Z"
-        - "A U I E C T S R N M"
-        - "Shift_L   Y X K Q G H F -  BackSpace"
-        - "show_numbers preferences  space  colon  show_eschars show_actions Return"
-    numbers:
-        - "Ctrl Alt Tabsmall ↑ ↓ ← →"
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "@ # € % & - _ + ( )"
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
-        - "show_letters preferences         space        show_eschars show_actions Return"
-    symbols:
-        - "Ctrl Alt Tabsmall ↑ ↓ ← →"
-        - "~ ` | · √ π τ ÷ × ¶"
-        - "© ® £ $ ¥ ^ ° * { }"
-        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        show_eschars show_actions Return"
-    eschars:
-        - "Ctrl Alt Tabsmall ↑ ↓ ← →"
-        - "à â ç é è ê î ô ù û"
-        - "À Â Ç É È Ê Î Ô Ù Û"
-        - "show_numbers_from_symbols  æ œ ä ë ï ö ü  BackSpace"
-        - "show_letters preferences         space        show_eschars show_actions 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"
-
- 
-buttons:
-    F1:
-        outline: "action"
-        keysym: "F1"
-    F2:
-        outline: "action"
-        keysym: "F2"
-    F3:
-        outline: "action"
-        keysym: "F3"
-    F4:
-        outline: "action"
-        keysym: "F4"
-    F5:
-        outline: "action"
-        keysym: "F5"
-    F6:
-        outline: "action"
-        keysym: "F6"
-    F7:
-        outline: "action"
-        keysym: "F7"
-    F8:
-        outline: "action"
-        keysym: "F8"
-    F9:
-        outline: "action"
-        keysym: "F9"
-    F10:
-        outline: "action"
-        keysym: "F10"
-    F11:
-        outline: "action"
-        keysym: "F11"
-    F12:
-        outline: "action"
-        keysym: "F12"
-    Esc:
-        outline: "action"
-        keysym: "Escape"
-    Tab:
-        outline: "action"
-        keysym: "Tab"
-    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"
-    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"
-    period:
-        outline: "special"
-        text: "."
-    slash:
-        outline: "special"
-        text: "/"
-    show_actions:
-        action:
-            set_view: "actions"
-        outline: "special"
-        label: ">_"
-    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: "ABC"
-    show_symbols:
-        action:
-            set_view: "symbols"
-        outline: "wide"
-        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/terminal/fr+bepo_wide.yaml
+++ b/data/keyboards/terminal/fr+bepo_wide.yaml
@ -1,227 +0,0 @@
---
-outlines:
-    default:   { width: 54,   height: 37 }
-    action:    { width: 90,   height: 37 }
-    small:     { width: 67.4, height: 22 }
-    altline:   { width: 81,   height: 37 }
-    wide:      { width: 100,  height: 37 }
-    spaceline: { width: 110,  height: 37 }
-    special:   { width: 54,   height: 37 }
-
-views:
-    base:
-        - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
-        - "b é p o w v d l j z"
-        - "a u i e c t s r n m"
-        - "Shift_L y x k q g h f period BackSpace"
-        - "show_numbers preferences         space    slash show_eschars show_actions Return"
-    upper:
-        - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
-        - "B É P O W V D L J Z"
-        - "A U I E C T S R N M"
-        - "Shift_L   Y X K Q G H F -  BackSpace"
-        - "show_numbers preferences         space  colon   show_eschars 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        show_eschars show_actions Return"
-    symbols:
-        - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"    
-        - "~ ` | · √ π τ ÷ × ¶"
-        - "© ® £ $ ¥ ^ ° * { }"
-        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        show_eschars show_actions Return"
-    eschars:
-        - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"        
-        - "à â ç é è ê î ô ù û"
-        - "À Â Ç É È Ê Î Ô Ù Û"
-        - "show_numbers_from_symbols  æ œ ä ë ï ö ü  BackSpace"
-        - "show_letters preferences         space        show_eschars show_actions 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:
-    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"
-    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"
-    period:
-        outline: "special"
-        text: "."
-    slash:
-        outline: "special"
-        text: "/"
-    show_actions:
-        action:
-            set_view: "actions"
-        outline: "special"
-        label: ">_"
-    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/terminal/fr.yaml
+++ b/data/keyboards/terminal/fr.yaml
@ -1,220 +0,0 @@
---
-outlines:
-    action:    { width: 59,    height: 46 }
-    small:     { width: 50,    height: 22 }
-    default:   { width: 35.33, height: 46 }
-    altline:   { width: 48,    height: 46 }
-    wide:      { width: 50,    height: 46 }
-    spaceline: { width: 110,   height: 46 }
-    special:   { width: 44,    height: 46 }
-
-views:
-    base:
-        - "Ctrl Alt Tabsmall ↑ ↓ ← →"
-        - "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 period   BackSpace"
-        - "show_numbers preferences         space        show_eschars show_actions Return"
-    upper:
-        - "Ctrl Alt Tabsmall PgUp PgDn Home End"
-        - "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 show_actions Return"
-    numbers:
-        - "Ctrl Alt Tabsmall ↑ ↓ ← →"
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "@ # € % & - _ + ( )"
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
-        - "show_letters preferences         space        show_eschars show_actions Return"
-    symbols:
-        - "Ctrl Alt Tabsmall ↑ ↓ ← →"
-        - "~ ` | · √ π τ ÷ × ¶"
-        - "© ® £ $ ¥ ^ ° * { }"
-        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        show_eschars show_actions Return"
-    eschars:
-        - "Ctrl Alt Tabsmall ↑ ↓ ← →"
-        - "à â ç é è ê î ô ù û"
-        - "À Â Ç É È Ê Î Ô Ù Û"
-        - "show_numbers_from_symbols  æ œ ä ë ï ö ü  BackSpace"
-        - "show_letters preferences         space        show_eschars show_actions 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"
-
- 
-buttons:
-    F1:
-        outline: "action"
-        keysym: "F1"
-    F2:
-        outline: "action"
-        keysym: "F2"
-    F3:
-        outline: "action"
-        keysym: "F3"
-    F4:
-        outline: "action"
-        keysym: "F4"
-    F5:
-        outline: "action"
-        keysym: "F5"
-    F6:
-        outline: "action"
-        keysym: "F6"
-    F7:
-        outline: "action"
-        keysym: "F7"
-    F8:
-        outline: "action"
-        keysym: "F8"
-    F9:
-        outline: "action"
-        keysym: "F9"
-    F10:
-        outline: "action"
-        keysym: "F10"
-    F11:
-        outline: "action"
-        keysym: "F11"
-    F12:
-        outline: "action"
-        keysym: "F12"
-    Esc:
-        outline: "action"
-        keysym: "Escape"
-    Tab:
-        outline: "action"
-        keysym: "Tab"
-    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"
-    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"
-    period:
-        outline: "special"
-        text: "."
-    show_actions:
-        action:
-            set_view: "actions"
-        outline: "special"
-        label: ">_"
-    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/terminal/fr_wide.yaml
+++ b/data/keyboards/terminal/fr_wide.yaml
@ -1,223 +0,0 @@
---
-outlines:
-    default:   { width: 54,   height: 37 }
-    action:    { width: 90,   height: 37 }
-    small:     { width: 67.4, height: 22 }
-    altline:   { width: 81,   height: 37 }
-    wide:      { width: 100,  height: 37 }
-    spaceline: { width: 110,  height: 37 }
-    special:   { width: 54,   height: 37 }
-
-views:
-    base:
-        - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
-        - "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 period   BackSpace"
-        - "show_numbers preferences         space        show_eschars show_actions Return"
-    upper:
-        - "EscSmall TabSmall Ctrl Alt PgUp PgDn Home End"
-        - "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 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        show_eschars show_actions Return"
-    symbols:
-        - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
-        - "~ ` | · √ π τ ÷ × ¶"
-        - "© ® £ $ ¥ ^ ° * { }"
-        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        show_eschars show_actions Return"
-    eschars:
-        - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
-        - "à â ç é è ê î ô ù û"
-        - "À Â Ç É È Ê Î Ô Ù Û"
-        - "show_numbers_from_symbols  æ œ ä ë ï ö ü  BackSpace"
-        - "show_letters preferences         space        show_eschars show_actions 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:
-    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"
-    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"
-    period:
-        outline: "special"
-        text: "."
-    show_actions:
-        action:
-            set_view: "actions"
-        outline: "special"
-        label: ">_"
-    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/terminal/us.yaml
+++ b/data/keyboards/terminal/us.yaml
@ -1,227 +0,0 @@
---
-outlines:
-    default:   { width: 35.33,  height: 46 }
-    halfwidth: { width: 17.665, height: 46 }
-    special:   { width: 44,     height: 46 }
-    altline:   { width: 52.67,  height: 46 }
-    large:     { width: 52.67,  height: 46 }
-    action:    { width: 59,     height: 46 }
-    wide:      { width: 59,     height: 46 }
-    spaceline: { width: 144.96, height: 46 }
-    small:     { width: 50.57,  height: 22 }
-
-views:
-    base:
-        - "TabSmall Ctrl Alt ↑ ↓ ← →"
-        - "q w e r t y u i o p"
-        - "PeriodSmall a s d f g h j k l MinusSmall"
-        - "Shift_L   z x c v b n m  BackSpace"
-        - "show_numbers preferences      space        show_actions Return"
-    upper:
-        - "TabSmall Ctrl Alt PgUp PgDn Home End"
-        - "Q W E R T Y U I O P"
-        - "SlashSmall A S D F G H J K L PipeSmall"
-        - "Shift_L   Z X C V B N M  BackSpace"
-        - "show_numbers preferences      space        show_actions Return"
-    numbers:
-        - "TabSmall Ctrl Alt ↑ ↓ ← →"
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "\\ * # $ / & - + ( ) _"
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
-        - "show_letters preferences         space        period Return"
-    symbols:
-        - "TabSmall Ctrl Alt ↑ ↓ ← →"
-        - "~ ` · √ π τ ÷ × ¶ @"
-        - "© ® £ € ¥ ^ ° { }"
-        - "show_numbers_from_symbols   % | < > = [ ]  BackSpace"
-        - "show_letters preferences         space        period Return"
-    actions:
-        - "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_actions 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: "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_letters_actions:
-        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: "large"
-        text: "."
-    space:
-        outline: "spaceline"
-        text: " "
-    Return:
-        outline: "wide"
-        icon: "key-enter"
-        keysym: "Return"
-    colon:
-        text: ":"
-    F1:
-        outline: "action"
-        keysym: "F1"
-    F2:
-        outline: "action"
-        keysym: "F2"
-    F3:
-        outline: "action"
-        keysym: "F3"
-    F4:
-        outline: "action"
-        keysym: "F4"
-    F5:
-        outline: "action"
-        keysym: "F5"
-    F6:
-        outline: "action"
-        keysym: "F6"
-    F7:
-        outline: "action"
-        keysym: "F7"
-    F8:
-        outline: "action"
-        keysym: "F8"
-    F9:
-        outline: "action"
-        keysym: "F9"
-    F10:
-        outline: "action"
-        keysym: "F10"
-    F11:
-        outline: "action"
-        keysym: "F11"
-    F12:
-        outline: "action"
-        keysym: "F12"
-    Esc:
-        outline: "action"
-        keysym: "Escape"
-    Tab:
-        outline: "action"
-        keysym: "Tab"
-    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"
-    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"
-    MinusSmall:
-        outline: "halfwidth"
-        text: "-"
-    SlashSmall:
-        outline: "halfwidth"
-        text: "/"
-    PipeSmall:
-        outline: "halfwidth"
-        text: "|"
-    PeriodSmall:
-        outline: "halfwidth"
-        text: "."
-    "\\":
-        outline: "halfwidth"
-    _:
-        outline: "halfwidth"
--- a/data/keyboards/terminal/us_wide.yaml
+++ b/data/keyboards/terminal/us_wide.yaml
@ -1,231 +0,0 @@
---
-outlines:
-    default:   { width: 54,   height: 37 }
-    halfwidth: { width: 27,   height: 37 }
-    special:   { width: 54,   height: 37 }
-    altline:   { width: 81,   height: 37 }
-    large:     { width: 81,   height: 37 }
-    action:    { width: 90,   height: 37 }
-    wide:      { width: 90,   height: 37 }
-    spaceline: { width: 234,  height: 37 }
-    small:     { width: 67.4, height: 22 }
-
-views:
-    base:
-        - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
-        - "q w e r t y u i o p"
-        - "PeriodSmall a s d f g h j k l MinusSmall"
-        - "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"
-        - "SlashSmall A S D F G H J K L PipeSmall"
-        - "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_actions 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: "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_letters_actions:
-        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: "large"
-        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"
-    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"
-    MinusSmall:
-        outline: "halfwidth"
-        text: "-"
-    SlashSmall:
-        outline: "halfwidth"
-        text: "/"
-    PipeSmall:
-        outline: "halfwidth"
-        text: "|"
-    PeriodSmall:
-        outline: "halfwidth"
-        text: "."
-    "\\":
-        outline: "halfwidth"
-    _:
-        outline: "halfwidth"
--- a/data/keyboards/terminal/us+dvorak_wide.yaml
+++ b/data/keyboards/terminal/us+dvorak_wide.yaml
@ -11,27 +11,27 @@ outlines:
 views:
    base:
        - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
-        - "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"
+        - "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"
-        - "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"
+        - "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 ↑ ↓ ← →"
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
-        - "* # $ / & - _ + ( )"
        - "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_numbers_from_symbols   \\ % < > = [ ]  BackSpace"
        - "show_letters preferences         space        period Return"
    actions:
        - "EscSmall TabSmall Ctrl Alt PgUp PgDn Home End"
@ -155,6 +155,9 @@ buttons:
    Pause:
        outline: "action"
        keysym: "Pause"
+    Menu:
+        outline: "action"
+        keysym: "Menu"
    Break:
        outline: "action"
        keysym: "Break"
--- a/data/keyboards/th.yaml
+++ b/data/keyboards/th.yaml
@ -1,10 +1,10 @@
 ---
 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 }
+    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:
--- 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,12 +1,12 @@
 ---
 outlines:
-    default:   { width: 32,  height: 52 }
-    altline:   { width: 32,  height: 52 }
-    wide:      { width: 57,  height: 52 }
-    narrow:    { width: 26,  height: 52 }
+    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 }
+    fill: { width: 159, height: 52 }
+    special: { width: 42, height: 52 }

 views:
    base:
--- a/data/keyboards/url/us.yaml
+++ b/data/keyboards/url/us.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: 106.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 preferences         space        slash period Return"
-    upper:
-        - "Q W E R T Y U I O P"
-        - "A S D F G H J K L"
-        - "Shift_L   Z X C V B N M  BackSpace"
-        - "show_numbers preferences         space        slash period Return"
-    numbers:
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "@ # $ % & - _ + ( )"
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
-        - "show_letters preferences         space        slash period Return"
-    symbols:
-        - "~ ` | · √ π τ ÷ × ¶"
-        - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        slash 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: "."
-    slash:
-        outline: "special"
-        text: "/"
-    space:
-        outline: "spaceline"
-        text: " "
-    Return:
-        outline: "wide"
-        icon: "key-enter"
-        keysym: "Return"
-    colon:
-        text: ":"
--- a/data/keyboards/us+colemak.yaml
+++ b/data/keyboards/us+colemak.yaml
@ -1,10 +1,10 @@
 ---
 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 }
+    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:
--- 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_wide.yaml
+++ b/data/keyboards/us_wide.yaml
@ -1,10 +1,10 @@
 ---
 outlines:
-    default:   { width: 54,  height: 42 }
-    altline:   { width: 81,  height: 42 }
-    wide:      { width: 108, height: 42 }
+    default: { width: 54, height: 42 }
+    altline: { width: 81, height: 42 }
+    wide: { width: 108, height: 42 }
    spaceline: { width: 216, height: 42 }
-    special:   { width: 54,  height: 42 }
+    special: { width: 54, height: 42 }

 views:
    base:
--- a/data/langs/bg-BG.txt
+++ b/data/langs/bg-BG.txt
@ -0,0 +1,13 @@
+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
@ -0,0 +1,21 @@
+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
--- a/data/langs/en-US.txt
+++ b/data/langs/en-US.txt
@ -0,0 +1,2 @@
+emoji Emoji
+terminal Terminal
--- a/data/langs/es-ES.txt
+++ b/data/langs/es-ES.txt
@ -0,0 +1,7 @@
+us Inglés (EE.UU.)
+de Alemán
+el Griego
+es Español
+it Italiano
+jp+kana Japonés (Kana)
+no Noruego
--- a/data/langs/fur-IT.txt
+++ b/data/langs/fur-IT.txt
@ -0,0 +1,18 @@
+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/ja-JP.txt
+++ b/data/langs/ja-JP.txt
--- a/data/langs/pl-PL.txt
+++ b/data/langs/pl-PL.txt
@ -0,0 +1,2 @@
+emoji emoji
+terminal terminal
--- a/data/langs/ru-RU.txt
+++ b/data/langs/ru-RU.txt
@ -0,0 +1,11 @@
+de Немецкий
+es Испанский
+fi Финский
+gr Греческий
+it Итальянский
+no Норвежский
+pl Польский
+ru Русский
+se Шведский
+terminal Терминал
+us Английский (США)
--- a/data/meson.build
+++ b/data/meson.build
@ -12,7 +12,7 @@ desktopconf.set('bindir', bindir)

 desktop_file = 'sm.puri.Squeekboard.desktop'

-i18n.merge_file(
+i18n.merge_file('desktop',
    input: configure_file(
      input: desktop_file + '.in.in',
      output: desktop_file + '.in',
--- a/Show More
+++ b/Show More