Fixed layout switching.

input: Make it possible to deactivate a modifier with any button for it

Closes #433

See merge request World/Phosh/squeekboard!706

.gitignore

@@ -1,9 +1,21 @@
 _build/
+debian/*.debhelper
+debian/.debhelper/
+debian/cargo/registry/
+debian/cargo/.*cache*
+debian/debhelper-build-stamp
+debian/files
+debian/*.substvars
+debian/squeekboard/
+debian/squeekboard-devel/
+debian/tmp/
+meson_Cargo.toml.in
 po/squeekboard.pot
 po/*.mo
 TAGS
 tags
 target/
+vendor/
 vgdump
 *.swp
 *~

.gitlab-ci.yml

@@ -23,9 +23,6 @@ stages:
   - deploy
 
 before_script:
-# Workaround for unavailable dependencies
-  - mv debian/control.debian-testing debian/control
-# End of workaround for unavailable dependencies
   - apt-get -y update
   - apt-get -y install ca-certificates
 
@@ -65,17 +62,6 @@ build_deb:
       - '*.deb'
   script:
     - rm -f ../*.deb
-# Workaround for unavailable dependencies
-# TODO: Port Squeekboard to GTK4/GTK4-layer-shell
-# https://gitlab.gnome.org/World/Phosh/squeekboard/-/issues/64
-    - echo "deb http://deb.debian.org/debian/ unstable main" > /etc/apt/sources.list.d/unstable.list
-    - echo "deb http://deb.debian.org/debian/ experimental main" > /etc/apt/sources.list.d/experimental.list
-    - echo "APT::Default-Release \"trixie\";" > /etc/apt/apt.conf.d/default-release
-    - apt-get -y update
-    - apt-get -y --no-upgrade install librust-gio-dev librust-glib-dev librust-glib-sys-dev
-      librust-gtk-dev librust-gtk-sys-dev
-    - apt-get -y --no-upgrade install -t experimental librust-serde-yaml-dev
-# End of workaround for unavailable dependencies
     - apt-get -y build-dep .
     - apt-get -y install devscripts
     - REV=$(git log -1 --format=%h)
@@ -127,19 +113,6 @@ test_style:
     variables:
       - $PKG_ONLY == "1"
 
-check_release:
-  stage: test
-  needs: []
-  only:
-    refs:
-      - main
-  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:

Cargo.lock

@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "anstyle"
-version = "1.0.7"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b"
+checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
 
 [[package]]
 name = "async-io"
@@ -62,9 +62,9 @@ dependencies = [
 
 [[package]]
 name = "autocfg"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "bitflags"
@@ -74,9 +74,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "byteorder"
@@ -90,7 +90,7 @@ version = "0.18.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8ca26ef0159422fb77631dc9d17b102f253b876fe1586b03b803e63a309b4ee2"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "cairo-sys-rs",
  "glib",
  "libc",
@@ -111,9 +111,12 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.0.96"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "065a29261d53ba54260972629f9ca6bffa69bac13cd1fed61420f7fa68b9f8bd"
+checksum = "fd9de9f2205d5ef3fd67e685b0df337994ddd4495e2a28d185500d0e1edfea47"
+dependencies = [
+ "shlex",
+]
 
 [[package]]
 name = "cfg-expr"
@@ -133,18 +136,18 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "clap"
-version = "4.4.18"
+version = "4.5.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e578d6ec4194633722ccf9544794b71b1385c3c027efe0c55db226fc880865c"
+checksum = "fb3b4b9e5a7c7514dfa52869339ee98b3156b0bfb4e8a77c4ff4babb64b1604f"
 dependencies = [
  "clap_builder",
 ]
 
 [[package]]
 name = "clap_builder"
-version = "4.4.18"
+version = "4.5.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4df4df40ec50c46000231c914968278b1eb05098cf8f1b3a518a95030e71d1c7"
+checksum = "b17a95aa67cc7b5ebd32aa5370189aa0d79069ef1c64ce893bd30fb24bff20ec"
 dependencies = [
  "anstyle",
  "clap_lex",
@@ -152,9 +155,9 @@ dependencies = [
 
 [[package]]
 name = "clap_lex"
-version = "0.6.0"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1"
+checksum = "afb84c814227b90d6895e01398aee0d8033c00e7466aca416fb6a8e0eb19d8a7"
 
 [[package]]
 name = "concurrent-queue"
@@ -167,9 +170,9 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.19"
+version = "0.8.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345"
+checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
 
 [[package]]
 name = "derivative"
@@ -211,9 +214,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
 [[package]]
 name = "errno"
-version = "0.3.8"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"
+checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
 dependencies = [
  "libc",
  "windows-sys 0.52.0",
@@ -246,9 +249,9 @@ dependencies = [
 
 [[package]]
 name = "futures"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
+checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -261,9 +264,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
+checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -271,15 +274,15 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
+checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -288,9 +291,9 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
+checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
 
 [[package]]
 name = "futures-lite"
@@ -309,32 +312,32 @@ dependencies = [
 
 [[package]]
 name = "futures-macro"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
+checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.60",
+ "syn 2.0.87",
 ]
 
 [[package]]
 name = "futures-sink"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
+checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
 
 [[package]]
 name = "futures-task"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
+checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
 
 [[package]]
 name = "futures-util"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
+checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -444,7 +447,7 @@ version = "0.18.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "233daaf6e83ae6a12a52055f568f9d7cf4671dabb78ff9560ab6da230ce00ee5"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "futures-channel",
  "futures-core",
  "futures-executor",
@@ -472,7 +475,7 @@ dependencies = [
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 2.0.60",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -545,14 +548,14 @@ dependencies = [
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 2.0.60",
+ "syn 2.0.87",
 ]
 
 [[package]]
 name = "hashbrown"
-version = "0.14.5"
+version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+checksum = "3a9bfc1af68b1726ea47d3d5109de126281def866b33970e10fbab11b5dafab3"
 
 [[package]]
 name = "heck"
@@ -574,9 +577,9 @@ checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
 
 [[package]]
 name = "indexmap"
-version = "2.2.6"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
+checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da"
 dependencies = [
  "equivalent",
  "hashbrown",
@@ -584,9 +587,9 @@ dependencies = [
 
 [[package]]
 name = "instant"
-version = "0.1.12"
+version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
+checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
 dependencies = [
  "cfg-if",
 ]
@@ -610,9 +613,9 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
 
 [[package]]
 name = "libc"
-version = "0.2.154"
+version = "0.2.162"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346"
+checksum = "18d287de67fe55fd7e1581fe933d965a5a9477b38e949cfa9f8574ef01506398"
 
 [[package]]
 name = "linux-raw-sys"
@@ -622,9 +625,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
 
 [[package]]
 name = "log"
-version = "0.4.21"
+version = "0.4.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
+checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
 
 [[package]]
 name = "maplit"
@@ -634,15 +637,15 @@ checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d"
 
 [[package]]
 name = "memchr"
-version = "2.7.2"
+version = "2.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
 
 [[package]]
 name = "memmap2"
-version = "0.7.1"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f49388d20533534cd19360ad3d6a7dadc885944aa802ba3995040c5ec11288c6"
+checksum = "fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f"
 dependencies = [
  "libc",
 ]
@@ -690,9 +693,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.19.0"
+version = "1.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
 
 [[package]]
 name = "pango"
@@ -721,15 +724,15 @@ dependencies = [
 
 [[package]]
 name = "parking"
-version = "2.2.0"
+version = "2.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae"
+checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba"
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.14"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
+checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff"
 
 [[package]]
 name = "pin-utils"
@@ -739,9 +742,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
 [[package]]
 name = "pkg-config"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
+checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
 
 [[package]]
 name = "polling"
@@ -814,18 +817,18 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.81"
+version = "1.0.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba"
+checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -855,9 +858,9 @@ dependencies = [
 
 [[package]]
 name = "rustc_version"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
+checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
 dependencies = [
  "semver",
 ]
@@ -878,9 +881,9 @@ dependencies = [
 
 [[package]]
 name = "ryu"
-version = "1.0.17"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1"
+checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
 
 [[package]]
 name = "scoped-tls"
@@ -890,28 +893,28 @@ checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
 
 [[package]]
 name = "semver"
-version = "1.0.22"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca"
+checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
 
 [[package]]
 name = "serde"
-version = "1.0.200"
+version = "1.0.215"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddc6f9cc94d67c0e21aaf7eda3a010fd3af78ebf6e096aa6e2e13c79749cce4f"
+checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.200"
+version = "1.0.215"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "856f046b9400cee3c8c94ed572ecdb752444c24528c035cd35882aad6f492bcb"
+checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.60",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -922,14 +925,14 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.60",
+ "syn 2.0.87",
 ]
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.5"
+version = "0.6.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1"
+checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1"
 dependencies = [
  "serde",
 ]
@@ -947,6 +950,12 @@ dependencies = [
  "unsafe-libyaml",
 ]
 
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
 [[package]]
 name = "slab"
 version = "0.4.9"
@@ -991,9 +1000,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.60"
+version = "2.0.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3"
+checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1015,28 +1024,28 @@ dependencies = [
 
 [[package]]
 name = "target-lexicon"
-version = "0.12.14"
+version = "0.12.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f"
+checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
 
 [[package]]
 name = "thiserror"
-version = "1.0.59"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa"
+checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.59"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66"
+checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.60",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -1095,9 +1104,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unsafe-libyaml"
@@ -1113,15 +1122,15 @@ checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b"
 
 [[package]]
 name = "version_check"
-version = "0.9.4"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
 
 [[package]]
 name = "waker-fn"
-version = "1.1.1"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690"
+checksum = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7"
 
 [[package]]
 name = "winapi"
@@ -1160,7 +1169,7 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
 dependencies = [
- "windows-targets 0.52.5",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -1180,18 +1189,18 @@ dependencies = [
 
 [[package]]
 name = "windows-targets"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
 dependencies = [
- "windows_aarch64_gnullvm 0.52.5",
- "windows_aarch64_msvc 0.52.5",
- "windows_i686_gnu 0.52.5",
+ "windows_aarch64_gnullvm 0.52.6",
+ "windows_aarch64_msvc 0.52.6",
+ "windows_i686_gnu 0.52.6",
  "windows_i686_gnullvm",
- "windows_i686_msvc 0.52.5",
- "windows_x86_64_gnu 0.52.5",
- "windows_x86_64_gnullvm 0.52.5",
- "windows_x86_64_msvc 0.52.5",
+ "windows_i686_msvc 0.52.6",
+ "windows_x86_64_gnu 0.52.6",
+ "windows_x86_64_gnullvm 0.52.6",
+ "windows_x86_64_msvc 0.52.6",
 ]
 
 [[package]]
@@ -1202,9 +1211,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
 
 [[package]]
 name = "windows_aarch64_msvc"
@@ -1214,9 +1223,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
 
 [[package]]
 name = "windows_i686_gnu"
@@ -1226,15 +1235,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
 
 [[package]]
 name = "windows_i686_gnullvm"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
 
 [[package]]
 name = "windows_i686_msvc"
@@ -1244,9 +1253,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
 
 [[package]]
 name = "windows_x86_64_gnu"
@@ -1256,9 +1265,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
@@ -1268,9 +1277,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
 
 [[package]]
 name = "windows_x86_64_msvc"
@@ -1280,9 +1289,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "winnow"
@@ -1295,14 +1304,21 @@ dependencies = [
 
 [[package]]
 name = "xkbcommon"
-version = "0.5.1"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52db25b599e92bf6e3904134618728eeb7b49a5a4f38f107f92399bb9c496b88"
+checksum = "8d66ca9352cbd4eecbbc40871d8a11b4ac8107cfc528a6e14d7c19c69d0e1ac9"
 dependencies = [
  "libc",
  "memmap2",
+ "xkeysym",
 ]
 
+[[package]]
+name = "xkeysym"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9cc00251562a284751c9973bace760d86c0276c471b4be569fe6b068ee97a56"
+
 [[package]]
 name = "zbus"
 version = "1.9.3"

Cargo.toml

@@ -5,62 +5,62 @@ edition = "2021"
 
 [lib]
 name = "rs"
-path = "@path@/src/lib.rs"
+path = "src/lib.rs"
 crate-type = ["staticlib", "rlib"]
 
 # Cargo can't do autodiscovery if Cargo.toml is not in the root.
 [[bin]]
 name = "test_layout"
-path = "@path@/src/bin/test_layout.rs"
+path = "src/bin/test_layout.rs"
 
 [[example]]
 name = "test_layout"
-path = "@path@/examples/test_layout.rs"
+path = "examples/test_layout.rs"
 
 [[example]]
 name = "find_orphan_layouts"
-path = "@path@/examples/find_orphan_layouts.rs"
+path = "examples/find_orphan_layouts.rs"
 
 [features]
 zbus_v1_5 = []
 clap_v4 = []
 
 [dependencies]
-maplit = "1.0.*"
-serde = { version = "1.0.*", features = ["derive"] }
-serde_yaml = "0.9.*"
-bitflags = "1.3.*"
-clap = { version = "4.4.*", features=["std"], default-features = false }
-zbus = "1.9.*"
-zvariant = "2.10.*"
-zvariant_derive = "2.10.*"
-xkbcommon = { version = "0.5.*", features = ["wayland"] }
+maplit = "1.0"
+serde = { version = "1.0", features = ["derive"] }
+serde_yaml = "0.9"
+bitflags = "1.3"
+clap = { version = "4.4", features=["std"], default-features = false }
+zbus = "1.9"
+zvariant = "2.10"
+zvariant_derive = "2.10"
+xkbcommon = { version = "0.8", features = ["wayland"] }
 
 [dependencies.cairo-rs]
-version = "0.18.*"
+version = "0.18"
 
 [dependencies.cairo-sys-rs]
-version = "0.18.*"
+version = "0.18"
 
 [dependencies.gdk]
-version = "0.18.*"
+version = "0.18"
 
 [dependencies.gio]
-version = "0.18.*"
+version = "0.18"
 features = ["v2_58"]
 
 [dependencies.glib]
-version = "0.18.*"
+version = "0.18"
 features = ["v2_58"]
 
 [dependencies.glib-sys]
-version = "0.18.*"
+version = "0.18"
 features = ["v2_58"]
 
 [dependencies.gtk]
-version = "0.18.*"
+version = "0.18"
 features = ["v3_24"]
 
 [dependencies.gtk-sys]
-version = "0.18.*"
+version = "0.18"
 features = ["v3_24"]

NEWS

@@ -0,0 +1,183 @@
+squeekboard 1.43.0
+------------------
+Released November 2024
+* Fixes:
+    * Labels and icons on buttons will now keep their proportions when the proportions of layouts change.
+* Changes:
+    * Layouts will now change their shape to fill empty space on the panel.
+      Note: For the "Wide"-shapes of layouts, this is currently limited to about 1.4 times the width.
+    * A setting for changing wether or not layouts will change their shape to fit the panel has been added.
+    * The "Shift"-modifier can be assigned to buttons now.
+    * "Shift"-buttons have been added to the terminal-layouts.
+    * New emojis from Unicode 16.0 have been added.
+    * Layouts have been made more consistent.
+    * Some placeholders on layouts have been filled.
+* Contributors:
+    * Arnaud Ferraris
+    * MoonlightWave-12
+* UI translations:
+    * Alexander Shopov (bg)
+
+squeekboard 1.42.2
+------------------
+Released November 2024
+* Fixes:
+    * Compatibility: Squeekboard should now work better with apps that do not use the text-input-protocol of Wayland and rely on specific keycodes being assigned to specific characters/functions.
+    * Documentation: The recommended settings for creating layouts while using Phoc in a nested session, have been updated to work correctly with the changes to the scaling-algorithm.
+* Contributors:
+    * MoonlightWave-12
+
+squeekboard 1.42.1
+------------------
+Released October 2024
+* Fixes:
+    * With some apps, in particular apps made with Electron, text-input did not work with some buttons, depending on which layout was used. Text-input should now work normally with those apps.
+    * In some situations, modifiers were cleared after pressing another button (for example: when pressing `C`, for `Ctrl + C`), resulting in text-input without the modifiers. The modifiers will remain active in those situations from now on.
+* Contributors:
+    * MoonlightWave-12
+    * Sebastian Krzyszkowiak
+
+squeekboard 1.42.0
+------------------
+Released September 2024
+* New layouts:
+    * Belarusian (by)
+    * French (fr+bepo) terminal-layout
+    * Japanese (jp)
+    * Serbian (rs), (rs+latin), (rs+latinunicode)
+* Changed layouts:
+    * Thai (th):
+        * There is less empty space now.
+        * Most buttons are wider now.
+        * The arrangement of buttons for the `symbols` and `numbers` views, is more consistent with other layouts now.
+* Fixes:
+    * "Keyboard Settings" in the language-selection-popover will now open the correct panel in GNOME Settings.
+    * On some relatively small screens in horizontal orientation, the compact shape was used instead of the wide shape,
+      even though the wide shape can fit into the same height. The wide shape will be used on those screens now.
+* Changes:
+    * The height of the panel will adapt to screens differently.
+      In particular, the panel will be 1/3 of the screen's height on most monitors in horizontal orientation,
+      and as tall as it can be, while maintaining the aspect-ratio of the wide shape (16:5) without empty space next to it,
+      for most monitors in vertical orientation.
+    * GSettings for adjusting the height of the panel for the keyboard have been added.
+    * The documentation has been improved. In particular, it should now be much easier to learn how to test changes to Squeekboard and layouts.
+    * After building a Debian-package for Squeekboard and installing it, `update-alternatives` is now supported.
+    * The layout-files now have the English name of the language for which the respective layout is, in a comment at the top of the file.
+    * For a few languages which do not have a layout yet, a more appropriate fallback-layout will be chosen.
+* Contributors:
+    * Guido Günther
+    * MoonlightWave-12
+* UI translations:
+    * Sabri Ünal (tr)
+
+squeekboard 1.41.0
+------------------
+Released August 2024
+* New layouts:
+    * Malayalam
+    * German (Bone)
+    * German (Neo 2)
+* New icons:
+    * zwsp (zero-width-space)
+    * zwj (zero-width-joiner)
+
+squeekboard 1.39.0
+------------------
+Released May 2024
+* New button-styles:
+    * `change-view`: Highlighted like `special`, but with a border at the bottom.
+    * `character-group`: Like `change-view`, but with less highlighting.
+    * `placeholder`: Less contrast to the background and does not visually change when pressed.
+    * `subtle-highlight`: For highlighting commonly used characters in accent-views, for example.
+* New layouts:
+    * Portuguese
+    * Slovenian
+    * Turkish (F-layout)
+    * Turkish (Q-layout)
+* Remade layout:
+    * Portuguese (Brazil): A view for accents has been added.
+* Changes:
+    * The new button-styles are used in the available layouts, where appropriate.
+    * The top rows of the terminal-layouts are a little taller.
+    * Squeekboard will choose the wide shape of layouts, for more displays in horizontal orientation.
+    * Highlighted buttons now show visual feedback too, when pressed.
+    * Many layouts have been adjusted, so that those change their form less when switching views.
+    * Various small issues have been fixed, to make layouts more consistent.
+* Development:
+    * Scaling-tests for many display-types have been added.
+
+squeekboard 1.38.0
+------------------
+Released March 2024
+* Changes:
+    * 25 wide shapes have been added, so that every available layout now has a wide shape
+    * "PgUp" and "PgDn" on the terminal-layouts have been relabeled to "Page ↑" and "Page ↓"
+    * The Spanish and French terminal-layouts now have translated key-names
+    * The Spanish terminal-layout has been updated with the additional keys that are already available on the US-terminal-layout.
+    * The wide and base shapes of the German layout had a different key-arrangement and the wide shape did not have a button to access additional characters; this has been fixed.
+* Development:
+    * Squeekboard's versioning now follows Phosh's versioning (for example: Squeekboard 1.38 was released in time for Phosh 0.38)
+    * The build-system has been simplified
+    * A single Cargo.toml file is used, instead of assembling it from multiple parts
+    * Newer dependencies are now used for building Squeekboard by default
+    * Squeekboard's main development-platform is now Debian Testing
+    * The layout-files have been cleaned up, so that those are easier to understand and edit
+
+squeekboard 1.24.0
+------------------
+Released March 2024
+* Changes:
+    * The emoji-layout has been replaced with a new one, which offers many more emojis to choose from.
+
+squeekboard 1.23.0
+------------------
+Released March 2024
+* 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
+
+squeekboard 1.22.0 "Superposition"
+------------------
+Released April 2023
+* New or updated translations:
+    * Basque
+* Changes:
+    * fixed panel sizing when scaling
+    * fixed panel sizing when rotating
+    * fixed Dvorak terminal layout
+
+squeekboard 1.21.0 "Expected value"
+------------------
+Released February 2023
+* 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.
+
+squeekboard 1.20.0 "PID controller"
+------------------
+Released September 2023
+* 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

NEWS.md

@@ -1,112 +0,0 @@
-1.39.0
-------------------
-
-New button-styles:
- - `change-view`: Highlighted like `special`, but with a border at the bottom.
- - `character-group`: Like `change-view`, but with less highlighting.
- - `placeholder`: Less contrast to the background and does not visually change when pressed.
- - `subtle-highlight`: For highlighting commonly used characters in accent-views, for example.
-
-New layouts:
- - Portuguese
- - Slovenian
- - Turkish (F-layout)
- - Turkish (Q-layout)
-
-Remade layout:
- - Portuguese (Brazil): A view for accents has been added.
-
-Changes:
- - The new button-styles are used in the available layouts, where appropriate.
- - The top rows of the terminal-layouts are a little taller.
- - Squeekboard will choose the wide shape of layouts, for more displays in horizontal orientation.
- - Highlighted buttons now show visual feedback too, when pressed.
- - Many layouts have been adjusted, so that those change their form less when switching views.
- - Various small issues have been fixed, to make layouts more consistent.
-
-Development:
- - Scaling-tests for many display-types have been added.
-
-1.38.0
-------------------
-
-Changes:
-- 25 wide shapes have been added, so that every available layout now has a wide shape
-- "PgUp" and "PgDn" on the terminal-layouts have been relabeled to "Page ↑" and "Page ↓"
-- The Spanish and French terminal-layouts now have translated key-names
-- The Spanish terminal-layout has been updated with the additional keys that are already available on the US-terminal-layout.
-- The wide and base shapes of the German layout had a different key-arrangement and the wide shape did not have a button to access additional characters; this has been fixed.
-
-Development:
-- Squeekboard's versioning now follows Phosh's versioning (for example: Squeekboard 1.38 was released in time for Phosh 0.38)
-- The build-system has been simplified
-  - A single Cargo.toml file is used, instead of assembling it from multiple parts
-  - Newer dependencies are now used for building Squeekboard by default
-- Squeekboard's main development-platform is now Debian Testing
-- The layout-files have been cleaned up, so that those are easier to understand and edit
-
-1.24.0
-------------------
-
-Changes:
-- The emoji-layout has been replaced with a new one, which offers many more emojis to choose from.
-
-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

README.md

@@ -1,7 +1,7 @@
 *squeekboard* - a Wayland on-screen keyboard
 ========================================
 
-*Squeekboard* is the on-screen keyboard for Phosh. It is primarily designed for smartphones, tablet-PCs, and other devices with touchscreens.
+*Squeekboard* is the on-screen-keyboard input-method for Phosh. It is primarily designed for smartphones, tablet-PCs, and other devices with touchscreens.
 
 It squeaks because some Rust got inside.
 
@@ -30,6 +30,12 @@ Creating layouts
 
 If you want to work on layouts, check out the [guide](doc/tutorial.md).
 
+Nightly builds
+--------------
+
+For testing the latest commits of the `main`-branch, one can install the nightly builds of Squeekboard.
+For more information about the nightly builds, read the ["Phosh Nightly Package Builds"-blog-post](https://phosh.mobi/posts/phosh-nightly/).
+
 Building
 --------
 
@@ -43,7 +49,7 @@ See `.gitlab-ci.yml` or run `apt-get build-dep .`
 $ git clone https://gitlab.gnome.org/World/Phosh/squeekboard.git
 $ cd squeekboard
 $ mkdir _build
-$ meson _build/
+$ meson setup _build/
 $ cd _build
 $ ninja
 ```
@@ -54,11 +60,16 @@ Running
 -------
 
 ```sh
-$ phoc # if no compatible Wayland compositor is running yet
 $ cd ../build/
 $ src/squeekboard
 ```
 
+If no compatible Wayland compositor is running yet, you can use Phoc (after installing it):
+
+```sh
+$ phoc --exec '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:
@@ -73,6 +84,8 @@ Alternatively, force panel visibility manually with:
 $ busctl call --user sm.puri.OSK0 /sm/puri/OSK0 sm.puri.OSK0 SetVisible b true
 ```
 
+or by using the environment-variable `SQUEEKBOARD_DEBUG=force_show`.
+
 ### What the compositor has to support
 
 A compatible compositor has to support the protocols:
@@ -84,6 +97,31 @@ It's strongly recommended to support:
 
 - input-method-v2
 
+Settings
+--------
+
+You can change the height of the panel for the keyboard with:
+
+```sh
+$ gsettings set sm.puri.Squeekboard scale-in-horizontal-screen-orientation 1.0
+$ gsettings set sm.puri.Squeekboard scale-in-vertical-screen-orientation 1.0
+```
+and wether or not layouts will stretch to fit the panel with:
+
+```sh
+$ gsettings set sm.puri.Squeekboard layout-shape-changes-to-fit-panel true
+$ gsettings set sm.puri.Squeekboard layout-shape-changes-to-fit-panel false
+```
+
+Note: If the keyboard is open when the settings are changed, the changes will not be visible until the keyboard is opened again, or the layout is changed.
+While using Phosh, you can long-click/long-tap the home-bar at the bottom, to open and close the keyboard.
+
+To reset the settings to the default, you can use:
+
+```sh
+$ gsettings reset-recursively sm.puri.Squeekboard
+```
+
 Developing
 ----------
 

cargo.sh

@@ -12,6 +12,9 @@ SOURCE_DIR="$(dirname "$SCRIPT_PATH")"
 CARGO_TARGET_DIR="$(pwd)"
 export CARGO_TARGET_DIR
 
+GSETTINGS_SCHEMA_DIR="${CARGO_TARGET_DIR}/data:${GSETTINGS_SCHEMA_DIR}"
+export GSETTINGS_SCHEMA_DIR
+
 cd "$SOURCE_DIR"
 
 # the 'run" command takes arguments at the end,

data/common.css

@@ -8,13 +8,37 @@ sq_view {
 /* Becomes readable with a special font */
 sq_view.gr_polytonic {
     font-family: GFSDidotClassic, cantarell, sans-serif;
-    font-size: 2em;
+    font-size: 1.75em;
+}
+
+sq_view.wide.gr_polytonic {
+    font-size: 1.4em;
+}
+
+sq_view.in_mal {
+    font-size: 1.195em;
+}
+
+sq_view.wide.in_mal {
+    font-size: 1.25em;
 }
 
 sq_view.ir_azb {
     font-size: 1.368em;
 }
 
+sq_view.jp {
+    font-size: 1.425em;
+}
+
+sq_view.wide.jp {
+    font-size: 1.5em;
+}
+
+sq_view.wide.emoji {
+    font-size: 1.225em;
+}
+
 sq_button {
     border-radius: 4px;
     margin: 2px;
@@ -37,6 +61,10 @@ sq_button.small {
     font-size: 0.5em;
 }
 
+sq_button.small-row {
+    font-size: 0.575em;
+}
+
 sq_view.pin sq_button {
     border-radius: 0px;
     margin: 1px 1px 1px 1px;

data/dbus/sm.puri.OSK0.xml

@@ -1,20 +1,31 @@
 <!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
 "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
 <node xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd">
+
+  <!--
+      sm.puri.OSK0:
+
+      This interface is exported by on screen keyboards (OSK) to
+      indicate and set state like visibility.
+  -->
+
   <interface name="sm.puri.OSK0">
+    <!--
+        SetVisible:
+        @visible: %TRUE if the OSK should be shown to the user, %FALSE otherwise
+
+        Toggle keyboard visibility.
+    -->
     <method name="SetVisible">
-      <arg name="visible" type="b" direction="in"/>
-      <doc:doc><doc:description>
-        Switch keyboard visibility
-      </doc:description></doc:doc>
+      <arg type="b" direction="in" name="visible"/>
     </method>
-    <method name="GetVisible">
-      <arg name="visible" type="b" direction="out"/>
-      <doc:doc><doc:description>
-        Get keyboard visibility
-      </doc:description></doc:doc>
-    </method>
-    <property name="Visible" type="b" access="read">
-    </property>
+    <!--
+        Visible:
+
+        Indicates whether the on screen keyboard is currently
+        unfolded. %TRUE if the OSK is currently visible to the user,
+        %FALSE otherwise.
+    -->
+    <property name="Visible" type="b" access="read"/>
   </interface>
 </node>

data/icons/zwj.svg

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="200" height="200" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <g fill="none" stroke="#000">
+  <path d="m135.66 182.97a51.681 32.879 0 0 1-71.332 9.8e-4" stroke-width="12.123"/>
+  <path d="m135.66 17.029a51.681 32.879 0 0 0-71.332-0.0011" stroke-width="12.123"/>
+  <path d="m100 7.7071v184.59" stroke-width="10"/>
+ </g>
+</svg>

data/icons/zwsp.svg

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="200" height="200" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <g fill="none" stroke="#000">
+  <circle cx="100" cy="20.429" r="14.118" stroke-width="9.05"/>
+  <circle cx="100" cy="179.57" r="14.118" stroke-width="9.05"/>
+  <path d="m100 34.739v130.52" stroke-width="8.5856"/>
+ </g>
+</svg>

data/keyboards/am+phonetic.yaml

@@ -1,46 +1,46 @@
+# Language: Armenian (phonetic)
 # Armenian layout based on work by Norayr Chilingarian
 # Yerevan
 # Oct 2021
 ---
 outlines:
-    default:       { width: 34.3,   height: 52 }
-    altline:       { width: 52,     height: 52 }
-    wide:          { width: 104,    height: 52 }
-    change-view:   { width: 52,     height: 52 }
-    change-view-2: { width: 104,    height: 52 }
-    spaceline:     { width: 150.99, height: 52 }
-    special:       { width: 44,     height: 52 }
-    large:         { width: 44,     height: 52 }
-    placeholder:   { width: 34.3,   height: 52 }
+    default:       { width: 34.285,  height: 52 }
+    change-view:   { width: 51.427,  height: 52 }
+    change-view-2: { width: 82.284,  height: 52 }
+    large:         { width: 51.427,  height: 52 }
+    placeholder:   { width: 34.285,  height: 52 }
+    spaceline:     { width: 178.283, height: 52 }
+    special:       { width: 51.427,  height: 52 }
+    special-2:     { width: 82.284,  height: 52 }
 
 views:
     base:
         - "՝ է թ փ ձ ջ ւ և ռ չ ճ ֊ ժ"
         - "ք ո ե ր տ ը ւ ի օ պ խ ծ շ"
         - "-- -- ա ս դ ֆ գ հ յ կ լ ․ --"
-        - "Shift_L -- զ ղ ց վ բ ն մ ՛ -- BackSpace"
-        - "show_numbers preferences         space        . Return"
+        - "show_upper -- զ ղ ց վ բ ն մ ՛ -- BackSpace"
+        - "show_numbers preferences space . Return"
     upper:
         - "՝ Է Թ Փ Ձ Ջ Ւ և Ռ Չ Ճ — Ժ"
         - "Ք Ո Ե Ր Տ Ը Ւ Ի Օ Պ Խ Ծ Շ"
         - "-- -- Ա Ս Դ Ֆ Գ Հ Յ Կ Լ ։ --"
-        - "Shift_L -- Զ Ղ Ց Վ Բ Ն Մ ՞ -- BackSpace"
-        - "show_numbers preferences         space        . Return"
+        - "show_upper -- Զ Ղ Ց Վ Բ Ն Մ ՞ -- BackSpace"
+        - "show_numbers preferences space . Return"
     numbers:
-        - "-- -- -- -- -- -- -- -- --"
-        - "-- ﬓ  ﬔ  ﬕ  ﬖ  ﬗ   ՟ և --"
-        - "-- , \" ' : ; ! ? --"
+        - "-- -- -- -- -- -- -- -- -- -- -- -- --"
+        - "-- -- -- ﬓ ﬔ ﬕ ﬖ ﬗ ՟ և -- -- --"
+        - "-- -- -- , \" ' : ; ! ? -- -- --"
         - "show_symbols 1 2 3 4 5 6 7 8 9 0 BackSpace"
-        - "show_letters preferences         space        . Return"
+        - "show_letters preferences space . Return"
     symbols:
-        - "* # \\ % < > = [ ]"
-        - "© $ / & - _ + ( )"
-        - "® £ € ¥ ^ ° @ { }"
+        - "-- -- * # \\ % < > = [ ] ² --"
+        - "-- -- © $ / & - _ + ( ) ³ --"
+        - "-- -- ® £ € ¥ ^ ° @ { } -- --"
         - "show_numbers_from_symbols ~ ` | · √ π τ ÷ × ¶ BackSpace"
-        - "show_letters preferences         space        . Return"
+        - "show_letters preferences space . Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -48,7 +48,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -81,7 +81,7 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "wide"
+        outline: "special-2"
         icon: "key-enter"
         keysym: "Return"
     --:

data/keyboards/am+phonetic_wide.yaml

@@ -1,46 +1,46 @@
+# Language: Armenian (phonetic)
 # Armenian layout based on work by Norayr Chilingarian
 # Yerevan
 # Oct 2021
 ---
 outlines:
-    default:       { width: 51.7,   height: 42 }
-    altline:       { width: 77.5,   height: 42 }
-    wide:          { width: 103.35, height: 42 }
-    change-view:   { width: 77.5,   height: 42 }
-    change-view-2: { width: 103.35, height: 42 }
-    spaceline:     { width: 340.3,  height: 42 }
-    special:       { width: 62.27,  height: 42 }
-    large:         { width: 62.27,  height: 42 }
-    placeholder:   { width: 51.7,   height: 42 }
+    default:       { width: 51.692,  height: 42 }
+    change-view:   { width: 77.538,  height: 42 }
+    change-view-2: { width: 103.384, height: 42 }
+    placeholder:   { width: 51.692,  height: 42 }
+    spaceline:     { width: 361.844, height: 42 }
+    special:       { width: 51.692,  height: 42 }
+    special-2:     { width: 77.538,  height: 42 }
+    special-3:     { width: 103.384, height: 42 }
 
 views:
     base:
         - "՝ է թ փ ձ ջ ւ և ռ չ ճ ֊ ժ"
         - "ք ո ե ր տ ը ւ ի օ պ խ ծ շ"
         - "-- -- ա ս դ ֆ գ հ յ կ լ ․ --"
-        - "Shift_L -- զ ղ ց վ բ ն մ ՛ -- BackSpace"
-        - "show_numbers preferences         space        . Return"
+        - "show_upper -- զ ղ ց վ բ ն մ ՛ -- BackSpace"
+        - "show_numbers preferences space . Return"
     upper:
         - "՝ Է Թ Փ Ձ Ջ Ւ և Ռ Չ Ճ — Ժ"
         - "Ք Ո Ե Ր Տ Ը Ւ Ի Օ Պ Խ Ծ Շ"
         - "-- -- Ա Ս Դ Ֆ Գ Հ Յ Կ Լ ։ --"
-        - "Shift_L -- Զ Ղ Ց Վ Բ Ն Մ ՞ -- BackSpace"
-        - "show_numbers preferences         space        . Return"
+        - "show_upper -- Զ Ղ Ց Վ Բ Ն Մ ՞ -- BackSpace"
+        - "show_numbers preferences space . Return"
     numbers:
-        - "-- -- -- -- -- -- -- -- --"
-        - "-- ﬓ  ﬔ  ﬕ  ﬖ  ﬗ   ՟ և --"
-        - "-- , \" ' : ; ! ? --"
+        - "-- -- -- -- -- -- -- -- -- -- -- -- --"
+        - "-- -- -- ﬓ ﬔ ﬕ ﬖ ﬗ ՟ և -- -- --"
+        - "-- -- -- , \" ' : ; ! ? -- -- --"
         - "show_symbols 1 2 3 4 5 6 7 8 9 0 BackSpace"
-        - "show_letters preferences         space        . Return"
+        - "show_letters preferences space . Return"
     symbols:
-        - "* # \\ % < > = [ ]"
-        - "© $ / & - _ + ( )"
-        - "® £ € ¥ ^ ° @ { }"
+        - "-- -- * # \\ % < > = [ ] ² --"
+        - "-- -- © $ / & - _ + ( ) ³ --"
+        - "-- -- ® £ € ¥ ^ ° @ { } -- --"
         - "show_numbers_from_symbols ~ ` | · √ π τ ÷ × ¶ BackSpace"
-        - "show_letters preferences         space        . Return"
+        - "show_letters preferences space . Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -48,7 +48,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -75,13 +75,11 @@ buttons:
             set_view: "symbols"
         outline: "change-view"
         label: "*/="
-    .:
-        outline: "large"
     space:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "wide"
+        outline: "special-3"
         icon: "key-enter"
         keysym: "Return"
     --:

data/keyboards/am.yaml

@@ -1,46 +1,46 @@
+# Language: Armenian
 # Armenian layout based on work by Norayr Chilingarian
 # Yerevan
 # Oct 2021
 ---
 outlines:
-    default:       { width: 34.3,   height: 52 }
-    altline:       { width: 52,     height: 52 }
-    wide:          { width: 104,    height: 52 }
-    change-view:   { width: 52,     height: 52 }
-    change-view-2: { width: 104,    height: 52 }
-    spaceline:     { width: 150.99, height: 52 }
-    special:       { width: 44,     height: 52 }
-    large:         { width: 44,     height: 52 }
-    placeholder:   { width: 34.3,   height: 52 }
+    default:       { width: 34.285,  height: 52 }
+    change-view:   { width: 51.427,  height: 52 }
+    change-view-2: { width: 82.284,  height: 52 }
+    large:         { width: 51.427,  height: 52 }
+    placeholder:   { width: 34.285,  height: 52 }
+    spaceline:     { width: 178.283, height: 52 }
+    special:       { width: 51.427,  height: 52 }
+    special-2:     { width: 82.284,  height: 52 }
 
 views:
     base:
         - "՝ ֆ ձ ֊ , ։ ՞ ․ ՛ ) օ է ղ"
         - "ճ փ բ ս մ ո ւ կ ը թ ծ ց »"
         - "-- ջ վ գ ե ա ն ի տ հ պ ր --"
-        - "Shift_L ժ դ չ յ զ լ ք խ շ ռ BackSpace"
-        - "show_numbers preferences         space        . Return"
+        - "show_upper ժ դ չ յ զ լ ք խ շ ռ BackSpace"
+        - "show_numbers preferences space . Return"
     upper:
         - "՜ Ֆ Ձ — $ … ՟ և ՚ ( Օ Է Ղ"
         - "Ճ Փ Բ Ս Մ Ո Ւ Կ Ը Թ Ծ Ց «"
         - "-- Ջ Վ Գ Ե Ա Ն Ի Տ Հ Պ Պ Ր"
-        - "Shift_L Ժ Դ Չ Յ Զ Լ Ք Խ Շ Ռ BackSpace"
-        - "show_numbers preferences         space        . Return"
+        - "show_upper Ժ Դ Չ Յ Զ Լ Ք Խ Շ Ռ BackSpace"
+        - "show_numbers preferences space . Return"
     numbers:
-        - "-- -- -- -- -- -- -- -- --"
-        - "-- ﬓ  ﬔ  ﬕ  ﬖ  ﬗ   ՟ և --"
-        - "-- , \" ' : ; ! ? --"
+        - "-- -- -- -- -- -- -- -- -- -- -- -- --"
+        - "-- -- -- ﬓ ﬔ ﬕ ﬖ ﬗ ՟ և -- -- --"
+        - "-- -- -- , \" ' : ; ! ? -- -- --"
         - "show_symbols 1 2 3 4 5 6 7 8 9 0 BackSpace"
-        - "show_letters preferences         space        . Return"
+        - "show_letters preferences space . Return"
     symbols:
-        - "* # \\ % < > = [ ]"
-        - "© $ / & - _ + ( )"
-        - "® £ € ¥ ^ ° @ { }"
+        - "-- -- * # \\ % < > = [ ] ² --"
+        - "-- -- © $ / & - _ + ( ) ³ --"
+        - "-- -- ® £ € ¥ ^ ° @ { } -- --"
         - "show_numbers_from_symbols ~ ` | · √ π τ ÷ × ¶ BackSpace"
-        - "show_letters preferences         space        . Return"
+        - "show_letters preferences space . Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -48,7 +48,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -81,7 +81,7 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "wide"
+        outline: "special-2"
         icon: "key-enter"
         keysym: "Return"
     --:

data/keyboards/am_wide.yaml

@@ -1,46 +1,46 @@
+# Language: Armenian
 # Armenian layout based on work by Norayr Chilingarian
 # Yerevan
 # Oct 2021
 ---
 outlines:
-    default:       { width: 51.7,   height: 42 }
-    altline:       { width: 77.5,   height: 42 }
-    wide:          { width: 103.35, height: 42 }
-    change-view:   { width: 77.5,   height: 42 }
-    change-view-2: { width: 103.35, height: 42 }
-    spaceline:     { width: 340.3,  height: 42 }
-    special:       { width: 62.27,  height: 42 }
-    large:         { width: 62.27,  height: 42 }
-    placeholder:   { width: 51.7,   height: 42 }
+    default:       { width: 51.692,  height: 42 }
+    change-view:   { width: 77.538,  height: 42 }
+    change-view-2: { width: 103.384, height: 42 }
+    placeholder:   { width: 51.692,  height: 42 }
+    spaceline:     { width: 361.844, height: 42 }
+    special:       { width: 51.692,  height: 42 }
+    special-2:     { width: 77.538,  height: 42 }
+    special-3:     { width: 103.384, height: 42 }
 
 views:
     base:
         - "՝ ֆ ձ ֊ , ։ ՞ ․ ՛ ) օ է ղ"
         - "ճ փ բ ս մ ո ւ կ ը թ ծ ց »"
         - "-- ջ վ գ ե ա ն ի տ հ պ ր --"
-        - "Shift_L ժ դ չ յ զ լ ք խ շ ռ BackSpace"
-        - "show_numbers preferences         space        . Return"
+        - "show_upper ժ դ չ յ զ լ ք խ շ ռ BackSpace"
+        - "show_numbers preferences space . Return"
     upper:
         - "՜ Ֆ Ձ — $ … ՟ և ՚ ( Օ Է Ղ"
         - "Ճ Փ Բ Ս Մ Ո Ւ Կ Ը Թ Ծ Ց «"
         - "-- Ջ Վ Գ Ե Ա Ն Ի Տ Հ Պ Պ Ր"
-        - "Shift_L Ժ Դ Չ Յ Զ Լ Ք Խ Շ Ռ BackSpace"
-        - "show_numbers preferences         space        . Return"
+        - "show_upper Ժ Դ Չ Յ Զ Լ Ք Խ Շ Ռ BackSpace"
+        - "show_numbers preferences space . Return"
     numbers:
-        - "-- -- -- -- -- -- -- -- --"
-        - "-- ﬓ  ﬔ  ﬕ  ﬖ  ﬗ   ՟ և --"
-        - "-- , \" ' : ; ! ? --"
+        - "-- -- -- -- -- -- -- -- -- -- -- -- --"
+        - "-- -- -- ﬓ ﬔ ﬕ ﬖ ﬗ ՟ և -- -- --"
+        - "-- -- -- , \" ' : ; ! ? -- -- --"
         - "show_symbols 1 2 3 4 5 6 7 8 9 0 BackSpace"
-        - "show_letters preferences         space        . Return"
+        - "show_letters preferences space . Return"
     symbols:
-        - "* # \\ % < > = [ ]"
-        - "© $ / & - _ + ( )"
-        - "® £ € ¥ ^ ° @ { }"
+        - "-- -- * # \\ % < > = [ ] ² --"
+        - "-- -- © $ / & - _ + ( ) ³ --"
+        - "-- -- ® £ € ¥ ^ ° @ { } -- --"
         - "show_numbers_from_symbols ~ ` | · √ π τ ÷ × ¶ BackSpace"
-        - "show_letters preferences         space        . Return"
+        - "show_letters preferences space . Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -48,7 +48,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -75,13 +75,11 @@ buttons:
             set_view: "symbols"
         outline: "change-view"
         label: "*/="
-    .:
-        outline: "large"
     space:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "wide"
+        outline: "special-3"
         icon: "key-enter"
         keysym: "Return"
     --:

data/keyboards/ara.yaml

@@ -1,39 +1,40 @@
+# Language: Arabic
 # Maintained by: Khaled Eldoheiri <khalid@kdehairy.com>
 ---
 outlines:
-    default:       { width: 32.95,  height: 52 }
-    altline:       { width: 48.99,  height: 52 }
-    wide:          { width: 62,     height: 52 }
-    change-view:   { width: 48.99,  height: 52 }
-    change-view-2: { width: 62,     height: 52 }
-    spaceline:     { width: 169.63, height: 52 }
-    special:       { width: 35.66,  height: 52 }
-    fill:          { width: 65.32,  height: 52 }
+    default:       { width: 32.415,  height: 52 }
+    change-view:   { width: 48.622,  height: 52 }
+    change-view-2: { width: 56.726,  height: 52 }
+    fill:          { width: 64.83,   height: 52 }
+    spaceline:     { width: 178.283, height: 52 }
+    special:       { width: 32.415,  height: 52 }
+    special-2:     { width: 48.622,  height: 52 }
+    special-3:     { width: 56.726,  height: 52 }
 
 views:
     base:
         - "ذ ض ص ث ق ف غ ع خ ح ج"
         - "ش س ي ب ل ا ت ن م ك ط"
-        - "Shift_L ء ؤ ر ة و ز ظ د BackSpace"
-        - "show_numbers preferences         space        . Return"
+        - "show_upper ء ؤ ر ة و ز ظ د BackSpace"
+        - "show_numbers preferences space . Return"
     extra:
         - "ذ ض ص ث ق لإ إ ع خ ح ج"
         - "ش س ى ب لأ أ ت ن م ك ط"
-        - "Shift_L ئ لآ لا ه آ ز ظ د BackSpace"
-        - "show_numbers preferences         space        . Return"
+        - "show_upper ئ لآ لا ه آ ز ظ د 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"
+        - "1 2 3 4 5 6 7 8 9 0 ²"
+        - "@ # € % & - _ + ( ) ³"
+        - "show_symbols ، \" ' : ؛ ! ؟ BackSpace"
+        - "show_letters preferences space . Return"
     symbols:
-        - "~ ` | · √ π τ ÷ × ¶"
-        - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        . Return"
+        - "~ ` | · √ π τ ÷ × ¶ ²"
+        - "© ® £ € ¥ ^ ° * { } ³"
+        - "show_numbers_from_symbols \\ / < > = [ ] BackSpace"
+        - "show_letters preferences space . Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "extra"
@@ -41,7 +42,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -72,18 +73,10 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "wide"
+        outline: "special-3"
         icon: "key-enter"
         keysym: "Return"
-    5:
-        outline: "fill"
-    "&":
-        outline: "fill"
     ":":
         outline: "fill"
-    √:
-        outline: "fill"
-    ¥:
-        outline: "fill"
     ">":
         outline: "fill"

data/keyboards/ara_wide.yaml

@@ -1,39 +1,38 @@
+# Language: Arabic
 # Maintained by: Khaled Eldoheiri <khalid@kdehairy.com>
 ---
 outlines:
-    default:       { width: 49,   height: 42 }
-    altline:       { width: 73.5, height: 42 }
-    wide:          { width: 108,  height: 42 }
-    change-view:   { width: 73.5, height: 42 }
-    change-view-2: { width: 108,  height: 42 }
-    spaceline:     { width: 295,  height: 42 }
-    special:       { width: 49,   height: 42 }
-    fill:          { width: 98,   height: 42 }
+    default:       { width: 48.872,  height: 42 }
+    change-view:   { width: 73.308,  height: 42 }
+    fill:          { width: 97.744,  height: 42 }
+    spaceline:     { width: 293.232, height: 42 }
+    special:       { width: 48.872,  height: 42 }
+    special-2:     { width: 73.308,  height: 42 }
 
 views:
     base:
         - "ذ ض ص ث ق ف غ ع خ ح ج"
         - "ش س ي ب ل ا ت ن م ك ط"
-        - "Shift_L ء ؤ ر ة و ز ظ د BackSpace"
-        - "show_numbers preferences         space        . Return"
+        - "show_upper ء ؤ ر ة و ز ظ د BackSpace"
+        - "show_numbers preferences space . Return"
     extra:
         - "ذ ض ص ث ق لإ إ ع خ ح ج"
         - "ش س ى ب لأ أ ت ن م ك ط"
-        - "Shift_L ئ لآ لا ه آ ز ظ د BackSpace"
-        - "show_numbers preferences         space        . Return"
+        - "show_upper ئ لآ لا ه آ ز ظ د 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"
+        - "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"
+        - "~ ` | · √ π τ ÷ × ¶ ²"
+        - "© ® £ € ¥ ^ ° * { } ³"
+        - "show_numbers \\ / < > = [ ] BackSpace"
+        - "show_letters preferences space . Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "extra"
@@ -41,7 +40,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -67,24 +66,12 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "altline"
+        outline: "special-2"
         icon: "key-enter"
         keysym: "Return"
-    5:
-        outline: "fill"
-        text: "5"
-    "&":
-        outline: "fill"
-        text: "&"
     ":":
         outline: "fill"
         text: ":"
-    √:
-        outline: "fill"
-        text: "√"
-    ¥:
-        outline: "fill"
-        text: "¥"
     ">":
         outline: "fill"
         text: ">"

data/keyboards/be.yaml

@@ -1,42 +1,42 @@
+# Language: Belgian
 ---
 outlines:
-    default:       { width: 35.33,  height: 52 }
-    altline:       { width: 53,     height: 52 }
-    wide:          { width: 59,     height: 52 }
-    change-view:   { width: 53,     height: 52 }
-    change-view-2: { width: 59,     height: 52 }
-    spaceline:     { width: 139.75,  height: 52 }
-    special:       { width: 44,     height: 52 }
+    default:       { width: 35.657,  height: 52 }
+    change-view:   { width: 53.485,  height: 52 }
+    change-view-2: { width: 62.399,  height: 52 }
+    spaceline:     { width: 124.802, height: 52 }
+    special:       { width: 53.485,  height: 52 }
+    special-2:     { width: 62.399,  height: 52 }
 
 views:
     base:
         - "a z e r t y u i o p"
         - "q s d f g h j k l m"
-        - "Shift_L   w x c v b n .   BackSpace"
-        - "show_numbers preferences         space        show_eschars Return"
+        - "show_upper w x c v b n . BackSpace"
+        - "show_numbers preferences space show_eschars Return"
     upper:
         - "A Z E R T Y U I O P"
         - "Q S D F G H J K L M"
-        - "Shift_L   W X C V B N ,  BackSpace"
-        - "show_numbers preferences         space        show_eschars Return"
+        - "show_upper W X C V B N , BackSpace"
+        - "show_numbers preferences space show_eschars Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # € % & - _ + ( )"
-        - "show_symbols   , \" ' : ; ! ?  BackSpace"
-        - "show_letters preferences         space        show_eschars Return"
+        - "show_symbols , \" ' : ; ! ? BackSpace"
+        - "show_letters preferences space show_eschars Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ $ ¥ ^ ° * { }"
-        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        show_eschars Return"
+        - "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"
+        - "show_numbers_from_symbols æ œ ä ë ï ö ü BackSpace"
+        - "show_letters preferences space show_eschars Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -44,7 +44,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -82,6 +82,6 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "wide"
+        outline: "special-2"
         icon: "key-enter"
         keysym: "Return"

data/keyboards/be_wide.yaml

@@ -1,42 +1,43 @@
+# Language: Belgian
 ---
 outlines:
-    default:       { width: 54,  height: 42 }
-    altline:       { width: 81,  height: 42 }
-    wide:          { width: 100, height: 42 }
-    change-view:   { width: 81,  height: 42 }
-    change-view-2: { width: 100, height: 42 }
-    spaceline:     { width: 205, height: 42 }
-    special:       { width: 54,  height: 42 }
+    default:       { width: 53.76,  height: 42 }
+    change-view:   { width: 80.64,  height: 42 }
+    change-view-2: { width: 94.08,  height: 42 }
+    spaceline:     { width: 215.04, height: 42 }
+    special:       { width: 53.76,  height: 42 }
+    special-2:     { width: 80.64,  height: 42 }
+    special-3:     { width: 94.08,  height: 42 }
 
 views:
     base:
         - "a z e r t y u i o p"
         - "q s d f g h j k l m"
-        - "Shift_L   w x c v b n .   BackSpace"
-        - "show_numbers preferences         space        show_eschars Return"
+        - "show_upper w x c v b n . BackSpace"
+        - "show_numbers preferences space show_eschars Return"
     upper:
         - "A Z E R T Y U I O P"
         - "Q S D F G H J K L M"
-        - "Shift_L   W X C V B N ,  BackSpace"
-        - "show_numbers preferences         space        show_eschars Return"
+        - "show_upper W X C V B N , BackSpace"
+        - "show_numbers preferences space show_eschars Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # € % & - _ + ( )"
-        - "show_symbols   , \" ' : ; ! ?  BackSpace"
-        - "show_letters preferences         space        show_eschars Return"
+        - "show_symbols , \" ' : ; ! ? BackSpace"
+        - "show_letters preferences space show_eschars Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ $ ¥ ^ ° * { }"
-        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        show_eschars Return"
+        - "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"
+        - "show_numbers_from_symbols æ œ ä ë ï ö ü BackSpace"
+        - "show_letters preferences space show_eschars Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -44,7 +45,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -82,6 +83,6 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "wide"
+        outline: "special-3"
         icon: "key-enter"
         keysym: "Return"

data/keyboards/bg+phonetic.yaml

@@ -1,40 +1,40 @@
+# Language: Bulgarian (phonetic)
 ---
 outlines:
-    default:       { width: 32.72,  height: 52 }
-    altline:       { width: 50.12,  height: 52 }
-    wide:          { width: 58.99,  height: 52 }
-    change-view:   { width: 50.12,  height: 52 }
-    change-view-2: { width: 58.99,  height: 52 }
-    spaceline:     { width: 167.26, height: 52 }
-    special:       { width: 44,     height: 52 }
-    placeholder:   { width: 32.72,  height: 52 }
-    fill:          { width: 65.44,  height: 52 }
+    default:       { width: 32.415,  height: 52 }
+    change-view:   { width: 48.622,  height: 52 }
+    change-view-2: { width: 56.726,  height: 52 }
+    large:         { width: 48.622,  height: 52 }
+    placeholder:   { width: 32.415,  height: 52 }
+    spaceline:     { width: 145.869, height: 52 }
+    special:       { width: 48.622,  height: 52 }
+    special-2:     { width: 56.726,  height: 52 }
 
 views:
     base:
         - "я в е р т ъ у и о п ю"
         - "а с д ф г х й к л ш щ"
-        - "Shift_L з ь ц ж б н м ч BackSpace"
-        - "show_numbers preferences         space   .    Return"
+        - "show_upper з ь ц ж б н м ч BackSpace"
+        - "show_numbers preferences space . Return"
     upper:
         - "Я В Е Р Т Ъ У И О П Ю"
         - "А С Д Ф Г Х Й К Л Ш Щ"
-        - "Shift_L З Ь Ц Ж Б Н М Ч BackSpace"
-        - "show_numbers preferences         space   ,    Return"
+        - "show_upper З Ь Ц Ж Б Н М Ч BackSpace"
+        - "show_numbers preferences space ,-large Return"
     numbers:
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "@ # € % & - _ + ( )"
-        - "show_symbols -- , \" ' : ; ! ?  BackSpace"
-        - "show_letters preferences         space    .    Return"
+        - "1 2 3 4 5 6 7 8 9 0 ²"
+        - "@ # € % & - _ + ( ) ³"
+        - "show_symbols , \" ' : ; ! ? -- BackSpace"
+        - "show_letters preferences space . Return"
     symbols:
-        - "~ ` | · √ π τ ÷ × ¶"
-        - "© ® £ $ ¥ ^ ° * { }"
-        - "show_numbers_from_symbols -- \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space    ,    Return"
+        - "~ ` | · √ π τ ÷ × ¶ ²"
+        - "© ® £ $ ¥ ^ ° * { } ³"
+        - "show_numbers_from_symbols \\ / < > = [ ] -- BackSpace"
+        - "show_letters preferences space ,-large Return"
 
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -42,7 +42,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -73,17 +73,14 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "wide"
+        outline: "special-2"
         icon: "key-enter"
         keysym: "Return"
     --:
         outline: "placeholder"
         text: ""
-    5:
-        outline: "fill"
-    "&":
-        outline: "fill"
-    √:
-        outline: "fill"
-    ¥:
-        outline: "fill"
+    .:
+        outline: "large"
+    ",-large":
+        outline: "large"
+        text: ","

data/keyboards/bg+phonetic_wide.yaml

@@ -1,39 +1,37 @@
+# Language: Bulgarian (phonetic)
 ---
 outlines:
-    default:       { width: 48.75, height: 42 }
-    altline:       { width: 73.5,  height: 42 }
-    wide:          { width: 73.5,  height: 42 }
-    change-view:   { width: 73.5,  height: 42 }
-    spaceline:     { width: 292.5, height: 42 }
-    special:       { width: 48.75, height: 42 }
-    placeholder:   { width: 48.75, height: 42 }
-    fill:          { width: 97.5,  height: 42 }
+    default:     { width: 48.872,  height: 42 }
+    change-view: { width: 73.308,  height: 42 }
+    placeholder: { width: 48.872,  height: 42 }
+    spaceline:   { width: 293.232, height: 42 }
+    special:     { width: 48.872,  height: 42 }
+    special-2:   { width: 73.308,  height: 42 }
 
 views:
     base:
         - "я в е р т ъ у и о п ю"
         - "а с д ф г х й к л ш щ"
-        - "Shift_L з ь ц ж б н м ч BackSpace"
-        - "show_numbers preferences         space   .    Return"
+        - "show_upper з ь ц ж б н м ч BackSpace"
+        - "show_numbers preferences space . Return"
     upper:
         - "Я В Е Р Т Ъ У И О П Ю"
         - "А С Д Ф Г Х Й К Л Ш Щ"
-        - "Shift_L З Ь Ц Ж Б Н М Ч BackSpace"
-        - "show_numbers preferences         space   ,    Return"
+        - "show_upper З Ь Ц Ж Б Н М Ч 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"
+        - "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"
-
+        - "~ ` | · √ π τ ÷ × ¶ ²"
+        - "© ® £ $ ¥ ^ ° * { } ³"
+        - "show_numbers \\ / < > = [ ] -- BackSpace"
+        - "show_letters preferences space , Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -41,7 +39,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -67,17 +65,9 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "wide"
+        outline: "special-2"
         icon: "key-enter"
         keysym: "Return"
     --:
         outline: "placeholder"
         text: ""
-    5:
-        outline: "fill"
-    "&":
-        outline: "fill"
-    √:
-        outline: "fill"
-    ¥:
-        outline: "fill"

data/keyboards/bg.yaml

@@ -1,40 +1,40 @@
+# Language: Bulgarian
 ---
 outlines:
-    default:       { width: 32.72,  height: 52 }
-    altline:       { width: 50.12,  height: 52 }
-    wide:          { width: 58.99,  height: 52 }
-    change-view:   { width: 50.12,  height: 52 }
-    change-view-2: { width: 58.99,  height: 52 }
-    spaceline:     { width: 167.26, height: 52 }
-    special:       { width: 44,     height: 52 }
-    placeholder:   { width: 32.72,  height: 52 }
-    fill:          { width: 65.44,  height: 52 }
+    default:       { width: 32.415,  height: 52 }
+    change-view:   { width: 48.622,  height: 52 }
+    change-view-2: { width: 56.726,  height: 52 }
+    large:         { width: 48.622,  height: 52 }
+    placeholder:   { width: 32.415,  height: 52 }
+    spaceline:     { width: 145.869, height: 52 }
+    special:       { width: 48.622,  height: 52 }
+    special-2:     { width: 56.726,  height: 52 }
 
 views:
     base:
         - "у е и ш щ к с д з ц б"
         - "ь я а о ж г т н в м ч"
-        - "Shift_L ю й ъ ф х п р л BackSpace"
-        - "show_numbers preferences         space   .    Return"
+        - "show_upper ю й ъ ф х п р л BackSpace"
+        - "show_numbers preferences space . Return"
     upper:
         - "У Е И Ш Щ К С Д З Ц Б"
         - "Ь Я А О Ж Г Т Н В М Ч"
-        - "Shift_L Ю Й Ъ Ф Х П Р Л BackSpace"
-        - "show_numbers preferences         space   ,    Return"
+        - "show_upper Ю Й Ъ Ф Х П Р Л BackSpace"
+        - "show_numbers preferences space ,-large Return"
     numbers:
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "@ # € % & - _ + ( )"
+        - "1 2 3 4 5 6 7 8 9 0 ²"
+        - "@ # € % & - _ + ( ) ³"
         - "show_symbols , \" ' : ; ! ? ѝ BackSpace"
-        - "show_letters preferences         space    .    Return"
+        - "show_letters preferences space . Return"
     symbols:
-        - "~ ` | · √ π τ ÷ × ¶"
-        - "© ® £ $ ¥ ^ ° * { }"
-        - "show_numbers_from_symbols -- \\ / < > = [ ] BackSpace"
-        - "show_letters preferences         space    ,    Return"
+        - "~ ` | · √ π τ ÷ × ¶ ²"
+        - "© ® £ $ ¥ ^ ° * { } ³"
+        - "show_numbers_from_symbols \\ / < > = [ ] -- BackSpace"
+        - "show_letters preferences space ,-large Return"
 
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -42,7 +42,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -73,17 +73,14 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "wide"
+        outline: "special-2"
         icon: "key-enter"
         keysym: "Return"
     --:
         outline: "placeholder"
         text: ""
-    5:
-        outline: "fill"
-    "&":
-        outline: "fill"
-    √:
-        outline: "fill"
-    ¥:
-        outline: "fill"
+    .:
+        outline: "large"
+    ",-large":
+        outline: "large"
+        text: ","

data/keyboards/bg_wide.yaml

@@ -1,39 +1,37 @@
+# Language: Bulgarian
 ---
 outlines:
-    default:       { width: 48.75, height: 42 }
-    altline:       { width: 73.5,  height: 42 }
-    wide:          { width: 73.5,  height: 42 }
-    change-view:   { width: 73.5,  height: 42 }
-    spaceline:     { width: 292.5, height: 42 }
-    special:       { width: 48.75, height: 42 }
-    placeholder:   { width: 48.75, height: 42 }
-    fill:          { width: 97.5,  height: 42 }
+    default:     { width: 48.872,  height: 42 }
+    change-view: { width: 73.308,  height: 42 }
+    placeholder: { width: 48.872,  height: 42 }
+    spaceline:   { width: 293.232, height: 42 }
+    special:     { width: 48.872,  height: 42 }
+    special-2:   { width: 73.308,  height: 42 }
 
 views:
     base:
         - "у е и ш щ к с д з ц б"
         - "ь я а о ж г т н в м ч"
-        - "Shift_L ю й ъ ф х п р л BackSpace"
-        - "show_numbers preferences         space   .    Return"
+        - "show_upper ю й ъ ф х п р л BackSpace"
+        - "show_numbers preferences space . Return"
     upper:
         - "У Е И Ш Щ К С Д З Ц Б"
         - "Ь Я А О Ж Г Т Н В М Ч"
-        - "Shift_L Ю Й Ъ Ф Х П Р Л BackSpace"
-        - "show_numbers preferences         space   ,    Return"
+        - "show_upper Ю Й Ъ Ф Х П Р Л BackSpace"
+        - "show_numbers preferences space , Return"
     numbers:
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "@ # € % & - _ + ( )"
+        - "1 2 3 4 5 6 7 8 9 0 ²"
+        - "@ # € % & - _ + ( ) ³"
         - "show_symbols , \" ' : ; ! ? ѝ BackSpace"
-        - "show_letters preferences         space    .    Return"
+        - "show_letters preferences space . Return"
     symbols:
-        - "~ ` | · √ π τ ÷ × ¶"
-        - "© ® £ $ ¥ ^ ° * { }"
-        - "show_numbers -- \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space    ,    Return"
-
+        - "~ ` | · √ π τ ÷ × ¶ ²"
+        - "© ® £ $ ¥ ^ ° * { } ³"
+        - "show_numbers \\ / < > = [ ] -- BackSpace"
+        - "show_letters preferences space , Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -41,7 +39,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -67,17 +65,9 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "wide"
+        outline: "special-2"
         icon: "key-enter"
         keysym: "Return"
     --:
         outline: "placeholder"
-        text: ""
-    5:
-        outline: "fill"
-    "&":
-        outline: "fill"
-    √:
-        outline: "fill"
-    ¥:
-        outline: "fill"
+        text: ""

data/keyboards/br.yaml

@@ -1,42 +1,42 @@
+# Language: Portuguese (Brazil)
 ---
 outlines:
-    default:       { width: 35.67, height: 52 }
-    altline:       { width: 53,    height: 52 }
-    wide:          { width: 53,    height: 52 }
-    change-view:   { width: 53,    height: 52 }
-    spaceline:     { width: 90,    height: 52 }
-    special:       { width: 35.67, height: 52 }
-    large:         { width: 71.34, height: 52 }
+    default:     { width: 35.657, height: 52 }
+    change-view: { width: 53.485, height: 52 }
+    large:       { width: 71.314, height: 52 }
+    spaceline:   { width: 89.144, height: 52 }
+    special:     { width: 35.657, height: 52 }
+    special-2:   { width: 53.485, 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     .-large Return"
+        - "show_upper z x c v b n m BackSpace"
+        - "show_numbers show_eschars preferences space .-large 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     ,-large Return"
+        - "show_upper Z X C V B N M BackSpace"
+        - "show_numbers show_eschars preferences space ,-large Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
-        - "show_symbols   , \" ' : ; ! ?  BackSpace"
+        - "show_symbols , \" ' : ; ! ? BackSpace"
         - "show_letters show_eschars preferences space º . Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers   \\ / < > = [ ]  BackSpace"
-        - "show_letters show_eschars preferences         space       ≠ § Return"
+        - "show_numbers \\ / < > = [ ] BackSpace"
+        - "show_letters show_eschars preferences space ≠ § Return"
     eschars:
         - "À Á Ã Â É Ê Í Ó Ô Õ"
         - "à á ã â é ê í ó ô õ "
         - "show_numbers Ú Ü ú ü ! ? . BackSpace"
-        - "show_letters show_eschars preferences         space    « »    Return"
+        - "show_letters show_eschars preferences space « » Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -44,7 +44,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -83,6 +83,6 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "wide"
+        outline: "special-2"
         icon: "key-enter"
         keysym: "Return"

data/keyboards/br_wide.yaml

@@ -1,43 +1,44 @@
+# Language: Portuguese (Brazil)
 ---
 outlines:
-    default:     { width: 53.75, height: 42 }
-    thin:        { width: 40.5,  height: 42 }
-    altline:     { width: 81,    height: 42 }
-    wide:        { width: 92,    height: 42 }
-    change-view: { width: 81,    height: 42 }
-    spaceline:   { width: 149.5, height: 42 }
-    special:     { width: 53.75, height: 42 }
-    large:       { width: 81,    height: 42 }
+    default:     { width: 53.76,  height: 42 }
+    change-view: { width: 80.64,  height: 42 }
+    large:       { width: 80.64,  height: 42 }
+    spaceline:   { width: 147.84, height: 42 }
+    special:     { width: 53.76,  height: 42 }
+    special-2:   { width: 80.64,  height: 42 }
+    special-3:   { width: 94.08,  height: 42 }
+    thin:        { width: 40.32,  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     .-large Return"
+        - "show_upper z x c v b n m BackSpace"
+        - "show_numbers show_eschars preferences space .-large 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     ,-large Return"
+        - "show_upper Z X C V B N M BackSpace"
+        - "show_numbers show_eschars preferences space ,-large Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
-        - "show_symbols   , \" ' : ; ! ?  BackSpace"
+        - "show_symbols , \" ' : ; ! ? BackSpace"
         - "show_letters show_eschars preferences space º .-thin Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers   \\ / < > = [ ]  BackSpace"
-        - "show_letters show_eschars preferences         space       ≠ § Return"
+        - "show_numbers \\ / < > = [ ] BackSpace"
+        - "show_letters show_eschars preferences space ≠ § Return"
     eschars:
         - "À Á Ã Â É Ê Í Ó Ô Õ"
         - "à á ã â é ê í ó ô õ "
         - "show_numbers Ú Ü ú ü ! ? . BackSpace"
-        - "show_letters show_eschars preferences         space    « »    Return"
+        - "show_letters show_eschars preferences space « » Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -45,7 +46,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -84,7 +85,7 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "wide"
+        outline: "special-3"
         icon: "key-enter"
         keysym: "Return"
     «:

data/keyboards/by.yaml

@@ -0,0 +1,83 @@
+# Language: Belarusian
+---
+outlines:
+    default:        { width: 32.415,  height: 52 }
+    change-view:    { width: 32.415,  height: 52 }
+    change-view-2:  { width: 64.83,   height: 52 }
+    fill:           { width: 64.83,   height: 52 }
+    large:          { width: 35.656,  height: 52 }
+    spaceline:      { width: 90.763,  height: 52 }
+    spaceline-fill: { width: 155.593, height: 52 }
+    special:        { width: 32.415,  height: 52 }
+    special-2:      { width: 35.656,  height: 52 }
+    special-3:      { width: 64.83,   height: 52 }
+
+views:
+    base:
+        - "й ц у к е н г ш ў з х"
+        - "ф ы в а п р о л д ж э"
+        - "show_upper я ч с м і т ь б ю BackSpace"
+        - "show_numbers preferences ё space , . Return"
+    upper:
+        - "Й Ц У К Е Н Г Ш Ў З Х"
+        - "Ф Ы В А П Р О Л Д Ж Э"
+        - "show_upper Я Ч С М І Т Ь Б Ю BackSpace"
+        - "show_numbers preferences Ё space , . Return"
+    numbers:
+        - "1 2 3 4 5 6 7 8 9 0 ²"
+        - "@ # $ % & - _ + ( ) ³"
+        - "show_symbols , \" ' : ; ! ? BackSpace-wide"
+        - "show_letters preferences space-fill . Return"
+    symbols:
+        - "~ ` | · √ π τ ÷ × ¶ ²"
+        - "© ® £ € ¥ ^ ° * { } ³"
+        - "show_numbers \\ / < > = [ ] BackSpace-wide"
+        - "show_letters preferences space-fill . Return"
+
+buttons:
+    show_upper:
+        action:
+            locking:
+                lock_view: "upper"
+                unlock_view: "base"
+        outline: "change-view"
+        icon: "key-shift"
+    BackSpace:
+        outline: "special"
+        icon: "edit-clear-symbolic"
+        action: "erase"
+    BackSpace-wide:
+        outline: "special-3"
+        icon: "edit-clear-symbolic"
+        action: "erase"
+    preferences:
+        action: "show_prefs"
+        outline: "special-2"
+        icon: "keyboard-mode-symbolic"
+    show_numbers:
+        action:
+            set_view: "numbers"
+        outline: "change-view-2"
+        label: "123"
+    show_letters:
+        action:
+            set_view: "base"
+        outline: "change-view-2"
+        label: "АБВ"
+    show_symbols:
+        action:
+            set_view: "symbols"
+        outline: "change-view-2"
+        label: "*/="
+    .:
+        outline: "large"
+    space:
+        outline: "spaceline"
+        text: " "
+    space-fill:
+        outline: "spaceline-fill"
+        text: " "
+    Return:
+        outline: "special-3"
+        icon: "key-enter"
+        keysym: "Return"

data/keyboards/by_wide.yaml

@@ -0,0 +1,79 @@
+# Language: Belarusian
+---
+outlines:
+    default:        { width: 48.872,  height: 42 }
+    change-view:    { width: 48.872,  height: 42 }
+    change-view-2:  { width: 97.744,  height: 42 }
+    fill:           { width: 97.744,  height: 42 }
+    spaceline:      { width: 146.616, height: 42 }
+    spaceline-fill: { width: 244.36,  height: 42 }
+    special:        { width: 48.872,  height: 42 }
+    special-2:      { width: 97.744,  height: 42 }
+
+views:
+    base:
+        - "й ц у к е н г ш ў з х"
+        - "ф ы в а п р о л д ж э"
+        - "show_upper я ч с м і т ь б ю BackSpace"
+        - "show_numbers preferences ё space , . Return"
+    upper:
+        - "Й Ц У К Е Н Г Ш Ў З Х"
+        - "Ф Ы В А П Р О Л Д Ж Э"
+        - "show_upper Я Ч С М І Т Ь Б Ю BackSpace"
+        - "show_numbers preferences Ё space , . Return"
+    numbers:
+        - "1 2 3 4 5 6 7 8 9 0 ²"
+        - "@ # $ % & - _ + ( ) ³"
+        - "show_symbols , \" ' : ; ! ? BackSpace-wide"
+        - "show_letters preferences space-fill . Return"
+    symbols:
+        - "~ ` | · √ π τ ÷ × ¶ ²"
+        - "© ® £ € ¥ ^ ° * { } ³"
+        - "show_numbers \\ / < > = [ ] BackSpace-wide"
+        - "show_letters preferences space-fill . Return"
+
+buttons:
+    show_upper:
+        action:
+            locking:
+                lock_view: "upper"
+                unlock_view: "base"
+        outline: "change-view"
+        icon: "key-shift"
+    BackSpace:
+        outline: "special"
+        icon: "edit-clear-symbolic"
+        action: "erase"
+    BackSpace-wide:
+        outline: "special-2"
+        icon: "edit-clear-symbolic"
+        action: "erase"
+    preferences:
+        action: "show_prefs"
+        outline: "special"
+        icon: "keyboard-mode-symbolic"
+    show_numbers:
+        action:
+            set_view: "numbers"
+        outline: "change-view-2"
+        label: "123"
+    show_letters:
+        action:
+            set_view: "base"
+        outline: "change-view-2"
+        label: "АБВ"
+    show_symbols:
+        action:
+            set_view: "symbols"
+        outline: "change-view-2"
+        label: "*/="
+    space:
+        outline: "spaceline"
+        text: " "
+    space-fill:
+        outline: "spaceline-fill"
+        text: " "
+    Return:
+        outline: "special-2"
+        icon: "key-enter"
+        keysym: "Return"

data/keyboards/ca.yaml

@@ -1,43 +1,43 @@
+# Language: French (Canada)
 ---
 outlines:
-    default:       { width: 35.5,  height: 52 }
-    altline:       { width: 53.5,  height: 52 }
-    wide:          { width: 62,    height: 52 }
-    change-view:   { width: 53.5,  height: 52 }
-    change-view-2: { width: 62,    height: 52 }
-    spaceline:     { width: 135,   height: 52 }
-    special:       { width: 44,    height: 52 }
-    placeholder:   { width: 36,    height: 52 }
+    default:       { width: 35.657,  height: 52 }
+    change-view:   { width: 53.485,  height: 52 }
+    change-view-2: { width: 62.399,  height: 52 }
+    placeholder:   { width: 35.657,  height: 52 }
+    spaceline:     { width: 124.802, height: 52 }
+    special:       { width: 53.485,  height: 52 }
+    special-2:     { width: 62.399,  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"
+        - "show_upper 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"
+        - "show_upper 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   , \" ' : ; ! ?  BackSpace"
-        - "show_letters preferences         space        show_eschars Return"
+        - "show_symbols , \" ' : ; ! ? BackSpace"
+        - "show_letters preferences space show_eschars Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        show_eschars Return"
+        - "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"
+        - "show_letters preferences space show_eschars Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -45,7 +45,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -83,7 +83,7 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "wide"
+        outline: "special-2"
         icon: "key-enter"
         keysym: "Return"
     --:

data/keyboards/ca_wide.yaml

@@ -1,43 +1,44 @@
+# Language: French (Canada)
 ---
 outlines:
-    default:       { width: 53.7,  height: 42 }
-    altline:       { width: 80.5,  height: 42 }
-    wide:          { width: 92,    height: 42 }
-    change-view:   { width: 80.5,  height: 42 }
-    change-view-2: { width: 92,    height: 42 }
-    spaceline:     { width: 219.5,   height: 42 }
-    special:       { width: 53.7, height: 42 }
-    placeholder:   { width: 53.7,  height: 42 }
+    default:       { width: 53.76,  height: 42 }
+    change-view:   { width: 80.64,  height: 42 }
+    change-view-2: { width: 94.08,  height: 42 }
+    placeholder:   { width: 53.76,  height: 42 }
+    spaceline:     { width: 215.04, height: 42 }
+    special:       { width: 53.76,  height: 42 }
+    special-2:     { width: 80.64,  height: 42 }
+    special-3:     { width: 94.08,  height: 42 }
 
 views:
     base:
         - "q w e r t y u i o p"
         - "a s d f g h j k l"
-        - "Shift_L   z x c v b n m  BackSpace"
-        - "show_numbers preferences         space        show_eschars Return"
+        - "show_upper 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"
+        - "show_upper 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   , \" ' : ; ! ?  BackSpace"
-        - "show_letters preferences         space        show_eschars Return"
+        - "show_symbols , \" ' : ; ! ? BackSpace"
+        - "show_letters preferences space show_eschars Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        show_eschars Return"
+        - "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"
+        - "show_letters preferences space show_eschars Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -45,7 +46,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -83,7 +84,7 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "wide"
+        outline: "special-3"
         icon: "key-enter"
         keysym: "Return"
     --:

data/keyboards/ch+de.yaml

@@ -1,39 +1,41 @@
+# Language: German (Switzerland) (ch+de)
 # 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 }
-    change-view:   { width: 48,    height: 52 }
-    change-view-2: { width: 59,    height: 52 }
-    spaceline:     { width: 70,    height: 52 }
-    special:       { width: 28,    height: 52 }
+    default:       { width: 32.415, height: 52 }
+    change-view:   { width: 48.622, height: 52 }
+    change-view-2: { width: 56.726, height: 52 }
+    placeholder:   { width: 32.415, height: 52 }
+    spaceline:     { width: 89.142, height: 52 }
+    special:       { width: 32.415, height: 52 }
+    special-2:     { width: 48.622, height: 52 }
+    special-3:     { width: 56.726, 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"
+        - "show_upper 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"
+        - "show_upper 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"
+        - "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"
+        - "€ $ £ ¥ % | § µ [ ] ²"
+        - "© ® § ` ^ { } · ¡ ¿ ³"
+        - "show_numbers « » ÷ × “ ” „ -- BackSpace"
+        - "show_letters preferences ! - space , . Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -41,7 +43,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -67,6 +69,9 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "wide"
+        outline: "special-3"
         icon: "key-enter"
         keysym: "Return"
+    --:
+        outline: "placeholder"
+        text: ""

data/keyboards/ch+de_wide.yaml

@@ -1,39 +1,41 @@
+# Language: German (Switzerland) (ch+de)
 # Maintained by Patrick Jörg <patrickjoerg@gmx.ch>. No Copyright, enjoy!
 
 ---
 outlines:
-    default:       { width: 52,     height: 42 }
-    altline:       { width: 70.65,  height: 42 }
-    wide:          { width: 86.84,  height: 42 }
-    change-view:   { width: 70.65,  height: 42 }
-    change-view-2: { width: 86.84,  height: 42 }
-    spaceline:     { width: 103.03, height: 42 }
-    special:       { width: 41.21,  height: 42 }
+    default:       { width: 48.872,  height: 42 }
+    change-view:   { width: 73.308,  height: 42 }
+    change-view-2: { width: 85.526,  height: 42 }
+    placeholder:   { width: 48.872,  height: 42 }
+    spaceline:     { width: 134.398, height: 42 }
+    special:       { width: 48.872,  height: 42 }
+    special-2:     { width: 73.308,  height: 42 }
+    special-3:     { width: 85.526,  height: 42 }
 
 views:
     base:
         - "q w e r t z u i o p ü"
         - "a s d f g h j k l ö ä"
-        - "Shift_L   y x c v b n m  BackSpace"
-        - "show_numbers ? !  preferences    '   space        , . Return"
+        - "show_upper 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"
+        - "show_upper 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"
+        - "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"
+        - "€ $ £ ¥ % | § µ [ ] ²"
+        - "© ® § ` ^ { } · ¡ ¿ ³"
+        - "show_numbers « » ÷ × “ ” „ -- BackSpace"
+        - "show_letters preferences ! - space , . Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -41,7 +43,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -67,6 +69,9 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "wide"
+        outline: "special-3"
         icon: "key-enter"
         keysym: "Return"
+    --:
+        outline: "placeholder"
+        text: ""

data/keyboards/ch+fr.yaml

@@ -1,43 +1,44 @@
+# Language: French (Switzerland)
 # Maintained by: Jordi Bossy <jordi@bossy.space>. No Copyright, enjoy!
 ---
 outlines:
-    default:       { width: 35.67, height: 52 }
-    altline:       { width: 53.5,  height: 52 }
-    wide:          { width: 59,    height: 52 }
-    change-view:   { width: 53.5,  height: 52 }
-    change-view-2: { width: 59,    height: 52 }
-    spaceline:     { width: 57,    height: 52 }
-    special:       { width: 28,    height: 52 }
+    default:       { width: 35.657, height: 52 }
+    change-view:   { width: 53.485, height: 52 }
+    change-view-2: { width: 62.399, height: 52 }
+    spaceline:     { width: 80.23,  height: 52 }
+    special:       { width: 35.657, height: 52 }
+    special-2:     { width: 53.485, height: 52 }
+    special-3:     { width: 62.399, 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"
+        - "show_upper 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"
+        - "show_upper 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"
+        - "show_symbols # & / \\ √ ; : BackSpace"
+        - "show_letters show_eschars preferences space , . Return"
     symbols:
         - "€ $ £ ¥ % | § µ [ ]"
         - "© ® § ` ^ { } · ¡ ¿"
-        - "show_numbers  « » ÷ × “ ” „ BackSpace"
-        - "show_letters show_eschars preferences    -   space        , . Return"
+        - "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:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -45,7 +46,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -78,6 +79,6 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "wide"
+        outline: "special-3"
         icon: "key-enter"
         keysym: "Return"

data/keyboards/ch+fr_wide.yaml

@@ -1,44 +1,43 @@
+# Language: French (Switzerland)
 # Maintained by: Jordi Bossy <jordi@bossy.space>. No Copyright, enjoy!
 ---
 outlines:
-    default:       { width: 53.5,  height: 42 }
-    thin:          { width: 40,    height: 42 }
-    altline:       { width: 80,    height: 42 }
-    wide:          { width: 86.84, height: 42 }
-    change-view:   { width: 80,    height: 42 }
-    change-view-2: { width: 86.84, height: 42 }
-    spaceline:     { width: 126,   height: 42 }
-    special:       { width: 41.21, height: 42 }
+    default:       { width: 53.76,  height: 42 }
+    change-view:   { width: 80.64,  height: 42 }
+    spaceline:     { width: 120.96, height: 42 }
+    special:       { width: 53.76,  height: 42 }
+    special-2:     { width: 80.64,  height: 42 }
+    special-3:     { width: 94.08,  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"
+        - "show_upper 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"
+        - "show_upper 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"
+        - "show_symbols # & / \\ √ ; : BackSpace"
+        - "show_letters show_eschars preferences space , . Return"
     symbols:
         - "€ $ £ ¥ % | § µ [ ]"
         - "© ® § ` ^ { } · ¡ ¿"
-        - "show_numbers  « » ÷ × “ ” „ BackSpace"
-        - "show_letters show_eschars preferences    --thin   space        , . Return"
+        - "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:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -46,7 +45,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -79,23 +78,6 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "wide"
+        outline: "special-3"
         icon: "key-enter"
-        keysym: "Return"
-    "'":
-        outline: "thin"
-    "\"":
-        outline: "thin"
-    _:
-        outline: "thin"
-    --thin:
-        outline: "thin"
-        text: "-"
-    .:
-        outline: "thin"
-    ",":
-        outline: "thin"
-    ß:
-        outline: "thin"
-    °:
-        outline: "thin"
+        keysym: "Return"

data/keyboards/ch.yaml

@@ -1,46 +1,47 @@
+# Language: German (Switzerland)
 # 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 }
-    change-view:   { width: 52.8,   height: 58 }
-    change-view-2: { width: 64.9,   height: 58 }
-    spaceline:     { width: 111.75, height: 58 }
-    special:       { width: 35.33,  height: 58 }
+    default:       { width: 32.415, height: 52 }
+    change-view:   { width: 48.622, height: 52 }
+    change-view-2: { width: 56.726, height: 52 }
+    fill:          { width: 64.83,  height: 52 }
+    spaceline:     { width: 105.35, height: 52 }
+    special:       { width: 32.415, height: 52 }
+    special-2:     { width: 48.622, height: 52 }
+    special-3:     { width: 56.726, 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"
+        - "show_upper 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"
+        - "show_upper 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"
+        - "show_letters show_eschars preferences space , . Return"
     symbols:
-        - "€ $ £ ¥ % | § µ [ ]"
-        - "© ® § ` { } @ · ¡ ¿"
-        - "show_numbers  « » ÷ × “ ” „ BackSpace"
-        - "show_letters show_eschars preferences       Space    , .    Return"
+        - "€ $ £ ¥ % | § µ [ ] ²"
+        - "© ® § ` { } @ · ¡ ¿ ³"
+        - "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:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -48,7 +49,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -77,18 +78,14 @@ buttons:
                 unlock_view: "base"
         outline: "change-view"
         label: "Ââ"
-    Space:
+    space:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "wide"
+        outline: "special-3"
         icon: "key-enter"
         keysym: "Return"
     °:
-        outline: "doublewidth"
-    "|":
-        outline: "doublewidth"
-    "}":
-        outline: "doublewidth"
+        outline: "fill"
     ×:
-        outline: "doublewidth"
+        outline: "fill"

data/keyboards/ch_wide.yaml

@@ -1,48 +1,48 @@
+# Language: German (Switzerland)
 # 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 }
-    change-view:   { width: 72,  height: 42 }
-    change-view-2: { width: 108, height: 42 }
-    spaceline:     { width: 162, height: 42 }
-    special:       { width: 48,  height: 42 }
+    default:       { width: 48.872, height: 42 }
+    change-view:   { width: 73.308, height: 42 }
+    fill:          { width: 97.744, height: 42 }
+    large:         { width: 73.308, height: 42 }
+    narrow:        { width: 36.654, height: 42 }
+    spaceline:     { width: 183.27, height: 42 }
+    special:       { width: 48.872, height: 42 }
+    special-2:     { width: 73.308, height: 42 }
+    special-3:     { width: 85.526, 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"
+        - "show_upper 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"
+        - "show_upper 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"
+        - "show_letters show_eschars preferences space , . Return"
     symbols:
-        - "€ $ £ ¥ % | § µ [ ]"
-        - "© ® § ` { } @ · ¡ ¿"
-        - "show_numbers  « » ÷ × “ ” „ BackSpace"
-        - "show_letters show_eschars preferences       Space    , .    Return"
+        - "€ $ £ ¥ % | § µ [ ] ²"
+        - "© ® § ` { } @ · ¡ ¿ ³"
+        - "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:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -50,7 +50,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -79,11 +79,11 @@ buttons:
                 unlock_view: "base"
         outline: "change-view"
         label: "Ââ"
-    Space:
+    space:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "wide"
+        outline: "special-3"
         icon: "key-enter"
         keysym: "Return"
     °:
@@ -92,9 +92,5 @@ buttons:
         outline: "narrow"
     ",":
         outline: "narrow"
-    "|":
-        outline: "doublewidth"
-    "}":
-        outline: "doublewidth"
     ×:
-        outline: "doublewidth"
+        outline: "fill"

data/keyboards/cz+qwerty.yaml

@@ -1,54 +1,54 @@
+# Language: Czech (QWERTY)
 ---
 outlines:
-    default:       { width: 35.33, height: 52 }
-    altline:       { width: 52.67, height: 52 }
-    wide:          { width: 52.67, height: 52 }
-    change-view:   { width: 52.67, height: 52 }
-    spaceline:     { width: 106,   height: 52 }
-    special:       { width: 35.33, height: 52 }
-    change-view-2: { width: 35.33, height: 52 }
+    default:       { width: 35.657,  height: 52 }
+    change-view:   { width: 53.485,  height: 52 }
+    change-view-2: { width: 35.657,  height: 52 }
+    spaceline:     { width: 106.972, height: 52 }
+    special:       { width: 35.657,  height: 52 }
+    special-2:     { width: 53.485,  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_accents preferences     space    , . Return"
+        - "show_upper z x c v b n m BackSpace"
+        - "show_numbers show_accents 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_upper_accents preferences     space    ! ? Return"
+        - "show_upper Z X C V B N M BackSpace"
+        - "show_numbers show_upper_accents preferences space ! ? Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
-        - "show_symbols    , \" ' : ; ! ?    BackSpace"
-        - "show_letters show_accents preferences     space    , . Return"
+        - "show_symbols , \" ' : ; ! ? BackSpace"
+        - "show_letters show_accents preferences space , . Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers    \\ / < > = [ ]    BackSpace"
-        - "show_letters show_accents preferences     space    , . Return"
+        - "show_numbers \\ / < > = [ ] BackSpace"
+        - "show_letters show_accents preferences space , . Return"
     accents:
         - "ä ě é ř ť ý ů í ó ö"
         - "á š ď ë ŕ ú ü ô ľ"
-        - "accents_Shift_L    ž ß č ç ñ ň ĺ    BackSpace"
-        - "show_letters show_accents preferences     space    , . Return"
+        - "show_upper_accents_from_accents ž ß č ç ñ ň ĺ BackSpace"
+        - "show_letters show_accents preferences space , . Return"
     upper_accents:
         - "Ä Ě É Ř Ť Ý Ů Í Ó Ö"
         - "Á Š Ď Ë Ŕ Ú Ü Ô Ľ"
-        - "accents_Shift_L    Ž ẞ Č Ç Ñ Ň Ĺ    BackSpace"
-        - "show_letters show_upper_accents preferences     space    , . Return"
+        - "show_upper_accents_from_accents Ž ẞ Č Ç Ñ Ň Ĺ BackSpace"
+        - "show_letters show_upper_accents preferences space , . Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
                 unlock_view: "base"
         outline: "change-view"
         icon: "key-shift"
-    accents_Shift_L:
+    show_upper_accents_from_accents:
         action:
             locking:
                 lock_view: "upper_accents"
@@ -56,7 +56,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -96,6 +96,6 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "wide"
+        outline: "special-2"
         icon: "key-enter"
         keysym: "Return"

data/keyboards/cz+qwerty_wide.yaml

@@ -1,62 +1,62 @@
+# Language: Czech (QWERTY)
 ---
 outlines:
-    default:       { width: 54,  height: 42 }
-    altline:       { width: 81,  height: 42 }
-    wide:          { width: 81,  height: 42 }
-    change-view:   { width: 81,  height: 42 }
-    spaceline:     { width: 162, height: 42 }
-    special:       { width: 54,  height: 42 }
-    change-view-2: { width: 54,  height: 42 }
+    default:       { width: 53.76,  height: 42 }
+    change-view:   { width: 53.76,  height: 42 }
+    change-view-2: { width: 80.64,  height: 42 }
+    spaceline:     { width: 161.28, height: 42 }
+    special:       { width: 53.76,  height: 42 }
+    special-2:     { width: 80.64,  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_accents preferences     space    , . Return"
+        - "show_upper z x c v b n m BackSpace"
+        - "show_numbers show_accents 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_upper_accents preferences     space    ! ? Return"
+        - "show_upper Z X C V B N M BackSpace"
+        - "show_numbers show_upper_accents preferences space ! ? Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
-        - "show_symbols    , \" ' : ; ! ?    BackSpace"
-        - "show_letters show_accents preferences     space    , . Return"
+        - "show_symbols , \" ' : ; ! ? BackSpace"
+        - "show_letters show_accents preferences space , . Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers    \\ / < > = [ ]    BackSpace"
-        - "show_letters show_accents preferences     space    , . Return"
+        - "show_numbers \\ / < > = [ ] BackSpace"
+        - "show_letters show_accents preferences space , . Return"
     accents:
         - "ä ě é ř ť ý ů í ó ö"
         - "á š ď ë ŕ ú ü ô ľ"
-        - "accents_Shift_L    ž ß č ç ñ ň ĺ    BackSpace"
-        - "show_letters show_accents preferences     space    , . Return"
+        - "accents_show_upper ž ß č ç ñ ň ĺ BackSpace"
+        - "show_letters show_accents preferences space , . Return"
     upper_accents:
         - "Ä Ě É Ř Ť Ý Ů Í Ó Ö"
         - "Á Š Ď Ë Ŕ Ú Ü Ô Ľ"
-        - "accents_Shift_L    Ž ẞ Č Ç Ñ Ň Ĺ    BackSpace"
-        - "show_letters show_upper_accents preferences     space    , . Return"
+        - "accents_show_upper Ž ẞ Č Ç Ñ Ň Ĺ BackSpace"
+        - "show_letters show_upper_accents preferences space , . Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
                 unlock_view: "base"
-        outline: "change-view"
+        outline: "change-view-2"
         icon: "key-shift"
-    accents_Shift_L:
+    accents_show_upper:
         action:
             locking:
                 lock_view: "upper_accents"
                 unlock_view: "base"
-        outline: "change-view"
+        outline: "change-view-2"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -66,36 +66,36 @@ buttons:
     show_numbers:
         action:
             set_view: "numbers"
-        outline: "change-view"
+        outline: "change-view-2"
         label: "123"
     show_letters:
         action:
             set_view: "base"
-        outline: "change-view"
+        outline: "change-view-2"
         label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"
-        outline: "change-view"
+        outline: "change-view-2"
         label: "*/="
     show_accents:
         action:
             locking:
                 lock_view: "accents"
                 unlock_view: "base"
-        outline: "change-view-2"
+        outline: "change-view"
         label: "á"
     show_upper_accents:
         action:
             locking:
                 lock_view: "upper_accents"
                 unlock_view: "base"
-        outline: "change-view-2"
+        outline: "change-view"
         label: "Á"
     space:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "wide"
+        outline: "special-2"
         icon: "key-enter"
         keysym: "Return"

data/keyboards/cz.yaml

@@ -1,54 +1,54 @@
+# Language: Czech
 ---
 outlines:
-    default:       { width: 35.33, height: 52 }
-    altline:       { width: 52.67, height: 52 }
-    wide:          { width: 52.67, height: 52 }
-    change-view:   { width: 52.67, height: 52 }
-    spaceline:     { width: 106,   height: 52 }
-    special:       { width: 35.33, height: 52 }
-    change-view-2: { width: 35.33, height: 52 }
+    default:       { width: 35.657,  height: 52 }
+    change-view:   { width: 53.485,  height: 52 }
+    change-view-2: { width: 35.657,  height: 52 }
+    spaceline:     { width: 106.972, height: 52 }
+    special:       { width: 35.657,  height: 52 }
+    special-2:     { width: 53.485,  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_accents preferences     space    , . Return"
+        - "show_upper y x c v b n m BackSpace"
+        - "show_numbers show_accents 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_upper_accents preferences     space    ! ? Return"
+        - "show_upper Y X C V B N M BackSpace"
+        - "show_numbers show_upper_accents preferences space ! ? Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
-        - "show_symbols    , \" ' : ; ! ?    BackSpace"
-        - "show_letters show_accents preferences     space    , . Return"
+        - "show_symbols , \" ' : ; ! ? BackSpace"
+        - "show_letters show_accents preferences space , . Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers    \\ / < > = [ ]    BackSpace"
-        - "show_letters show_accents preferences     space    , . Return"
+        - "show_numbers \\ / < > = [ ] BackSpace"
+        - "show_letters show_accents preferences space , . Return"
     accents:
         - "ä ě é ř ť ž ů í ó ö"
         - "á š ď ë ŕ ú ü ô ľ"
-        - "accents_Shift_L    ý ß č ç ñ ň ĺ    BackSpace"
-        - "show_letters show_accents preferences     space    , . Return"
+        - "show_upper_accents_from_accents ý ß č ç ñ ň ĺ BackSpace"
+        - "show_letters show_accents preferences space , . Return"
     upper_accents:
         - "Ä Ě É Ř Ť Ž Ů Í Ó Ö"
         - "Á Š Ď Ë Ŕ Ú Ü Ô Ľ"
-        - "accents_Shift_L    Ý ẞ Č Ç Ñ Ň Ĺ    BackSpace"
-        - "show_letters show_upper_accents preferences     space    , . Return"
+        - "show_upper_accents_from_accents Ý ẞ Č Ç Ñ Ň Ĺ BackSpace"
+        - "show_letters show_upper_accents preferences space , . Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
                 unlock_view: "base"
         outline: "change-view"
         icon: "key-shift"
-    accents_Shift_L:
+    show_upper_accents_from_accents:
         action:
             locking:
                 lock_view: "upper_accents"
@@ -56,7 +56,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -96,6 +96,6 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "wide"
+        outline: "special-2"
         icon: "key-enter"
         keysym: "Return"

data/keyboards/cz_wide.yaml

@@ -1,62 +1,62 @@
+# Language: Czech
 ---
 outlines:
-    default:       { width: 54,  height: 42 }
-    altline:       { width: 81,  height: 42 }
-    wide:          { width: 81,  height: 42 }
-    change-view:   { width: 81,  height: 42 }
-    spaceline:     { width: 162, height: 42 }
-    special:       { width: 54,  height: 42 }
-    change-view-2: { width: 54,  height: 42 }
+    default:       { width: 53.76,  height: 42 }
+    change-view:   { width: 53.76,  height: 42 }
+    change-view-2: { width: 80.64,  height: 42 }
+    spaceline:     { width: 161.28, height: 42 }
+    special:       { width: 53.76,  height: 42 }
+    special-2:     { width: 80.64,  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_accents preferences     space    , . Return"
+        - "show_upper y x c v b n m BackSpace"
+        - "show_numbers show_accents 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_upper_accents preferences     space    ! ? Return"
+        - "show_upper Y X C V B N M BackSpace"
+        - "show_numbers show_upper_accents preferences space ! ? Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
-        - "show_symbols    , \" ' : ; ! ?    BackSpace"
-        - "show_letters show_accents preferences     space    , . Return"
+        - "show_symbols , \" ' : ; ! ? BackSpace"
+        - "show_letters show_accents preferences space , . Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers    \\ / < > = [ ]    BackSpace"
-        - "show_letters show_accents preferences     space    , . Return"
+        - "show_numbers \\ / < > = [ ] BackSpace"
+        - "show_letters show_accents preferences space , . Return"
     accents:
         - "ä ě é ř ť ž ů í ó ö"
         - "á š ď ë ŕ ú ü ô ľ"
-        - "accents_Shift_L    ý ß č ç ñ ň ĺ    BackSpace"
-        - "show_letters show_accents preferences     space    , . Return"
+        - "accents_show_upper ý ß č ç ñ ň ĺ BackSpace"
+        - "show_letters show_accents preferences space , . Return"
     upper_accents:
         - "Ä Ě É Ř Ť Ž Ů Í Ó Ö"
         - "Á Š Ď Ë Ŕ Ú Ü Ô Ľ"
-        - "accents_Shift_L    Ý ẞ Č Ç Ñ Ň Ĺ    BackSpace"
-        - "show_letters show_upper_accents preferences     space    , . Return"
+        - "accents_show_upper Ý ẞ Č Ç Ñ Ň Ĺ BackSpace"
+        - "show_letters show_upper_accents preferences space , . Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
                 unlock_view: "base"
-        outline: "change-view"
+        outline: "change-view-2"
         icon: "key-shift"
-    accents_Shift_L:
+    accents_show_upper:
         action:
             locking:
                 lock_view: "upper_accents"
                 unlock_view: "base"
-        outline: "change-view"
+        outline: "change-view-2"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -66,36 +66,36 @@ buttons:
     show_numbers:
         action:
             set_view: "numbers"
-        outline: "change-view"
+        outline: "change-view-2"
         label: "123"
     show_letters:
         action:
             set_view: "base"
-        outline: "change-view"
+        outline: "change-view-2"
         label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"
-        outline: "change-view"
+        outline: "change-view-2"
         label: "*/="
     show_accents:
         action:
             locking:
                 lock_view: "accents"
                 unlock_view: "base"
-        outline: "change-view-2"
+        outline: "change-view"
         label: "á"
     show_upper_accents:
         action:
             locking:
                 lock_view: "upper_accents"
                 unlock_view: "base"
-        outline: "change-view-2"
+        outline: "change-view"
         label: "Á"
     space:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "wide"
+        outline: "special-2"
         icon: "key-enter"
         keysym: "Return"

data/keyboards/de+bone.yaml

@@ -0,0 +1,113 @@
+# Language: German (Bone)
+---
+outlines:
+    default:            { width: 32.415, height: 52 }
+    change-view:        { width: 48.622, height: 52 }
+    fill:               { width: 64.83,  height: 52 }
+    spaceline:          { width: 112.45, height: 52 }
+    special:            { width: 32.415, height: 52 }
+    special-2:          { width: 48.622, height: 52 }
+    subtle-highlight:   { width: 32.415, height: 52 }
+    subtle-highlight-2: { width: 64.83,  height: 52 }
+
+views:
+    base:
+        - "j d u a x p h l m w ß"
+        - "c t i e o b n r s g q"
+        - "show_upper f v ü ä ö y z k BackSpace"
+        - "show_numbers show_eschars preferences space , . Return"
+    upper:
+        - "J D U A X P H L M W ẞ"
+        - "C T I E O B N R S G Q"
+        - "show_upper F V Ü Ä Ö Y Z K 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:
+        - "ä-subtle-highlight è é ö-subtle-highlight ü-subtle-highlight-2 Ä-subtle-highlight È É Ö-subtle-highlight Ü-subtle-highlight"
+        - "à â ê î ô À Â Ê Î Ô"
+        - "show_numbers « » ç Ç æ œ ß-subtle-highlight BackSpace"
+        - "show_letters show_eschars preferences space „ “ Return"
+
+buttons:
+    show_upper:
+        action:
+            locking:
+                lock_view: "upper"
+                unlock_view: "base"
+        outline: "change-view"
+        icon: "key-shift"
+    BackSpace:
+        outline: "special-2"
+        icon: "edit-clear-symbolic"
+        action: "erase"
+    preferences:
+        action: "show_prefs"
+        outline: "special"
+        icon: "keyboard-mode-symbolic"
+    show_numbers:
+        action:
+            set_view: "numbers"
+        outline: "change-view"
+        label: "123"
+    show_letters:
+        action:
+            set_view: "base"
+        outline: "change-view"
+        label: "ABC"
+    show_symbols:
+        action:
+            set_view: "symbols"
+        outline: "change-view"
+        label: "*/="
+    show_eschars:
+        action:
+            locking:
+                lock_view: "eschars"
+                unlock_view: "base"
+        outline: "change-view"
+        label: "Ää"
+    space:
+        outline: "spaceline"
+        text: " "
+    Return:
+        outline: "special-2"
+        icon: "key-enter"
+        keysym: "Return"
+    ä-subtle-highlight:
+        outline: "subtle-highlight"
+        text: "ä"
+    ö-subtle-highlight:
+        outline: "subtle-highlight"
+        text: "ö"
+    ü-subtle-highlight-2:
+        outline: "subtle-highlight-2"
+        text: "ü"
+    Ä-subtle-highlight:
+        outline: "subtle-highlight"
+        text: "Ä"
+    Ö-subtle-highlight:
+        outline: "subtle-highlight"
+        text: "Ö"
+    Ü-subtle-highlight:
+        outline: "subtle-highlight"
+        text: "Ü"
+    ß-subtle-highlight:
+        outline: "subtle-highlight"
+        text: "ß"
+    ô:
+        outline: "fill"
+    Ç:
+        outline: "fill"
+    ":":
+        outline: "fill"
+    π:
+        outline: "fill"

data/keyboards/de+bone_wide.yaml

@@ -0,0 +1,113 @@
+# Language: German (Bone)
+---
+outlines:
+    default:            { width: 48.872,  height: 42 }
+    change-view:        { width: 73.308,  height: 42 }
+    fill:               { width: 97.744,  height: 42 }
+    spaceline:          { width: 171.052, height: 42 }
+    special:            { width: 48.872,  height: 42 }
+    special-2:          { width: 73.308,  height: 42 }
+    subtle-highlight:   { width: 48.872,  height: 42 }
+    subtle-highlight-2: { width: 97.744,  height: 42 }
+
+views:
+    base:
+        - "j d u a x p h l m w ß"
+        - "c t i e o b n r s g q"
+        - "show_upper f v ü ä ö y z k BackSpace"
+        - "show_numbers show_eschars preferences space , . Return"
+    upper:
+        - "J D U A X P H L M W ẞ"
+        - "C T I E O B N R S G Q"
+        - "show_upper F V Ü Ä Ö Y Z K 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:
+        - "ä-subtle-highlight è é ö-subtle-highlight ü-subtle-highlight-2 Ä-subtle-highlight È É Ö-subtle-highlight Ü-subtle-highlight"
+        - "à â ê î ô À Â Ê Î Ô"
+        - "show_numbers « » ç Ç æ œ ß-subtle-highlight BackSpace"
+        - "show_letters show_eschars preferences space „ “ Return"
+
+buttons:
+    show_upper:
+        action:
+            locking:
+                lock_view: "upper"
+                unlock_view: "base"
+        outline: "change-view"
+        icon: "key-shift"
+    BackSpace:
+        outline: "special-2"
+        icon: "edit-clear-symbolic"
+        action: "erase"
+    preferences:
+        action: "show_prefs"
+        outline: "special"
+        icon: "keyboard-mode-symbolic"
+    show_numbers:
+        action:
+            set_view: "numbers"
+        outline: "change-view"
+        label: "123"
+    show_letters:
+        action:
+            set_view: "base"
+        outline: "change-view"
+        label: "ABC"
+    show_symbols:
+        action:
+            set_view: "symbols"
+        outline: "change-view"
+        label: "*/="
+    show_eschars:
+        action:
+            locking:
+                lock_view: "eschars"
+                unlock_view: "base"
+        outline: "change-view"
+        label: "Ää"
+    space:
+        outline: "spaceline"
+        text: " "
+    Return:
+        outline: "special-2"
+        icon: "key-enter"
+        keysym: "Return"
+    ä-subtle-highlight:
+        outline: "subtle-highlight"
+        text: "ä"
+    ö-subtle-highlight:
+        outline: "subtle-highlight"
+        text: "ö"
+    ü-subtle-highlight-2:
+        outline: "subtle-highlight-2"
+        text: "ü"
+    Ä-subtle-highlight:
+        outline: "subtle-highlight"
+        text: "Ä"
+    Ö-subtle-highlight:
+        outline: "subtle-highlight"
+        text: "Ö"
+    Ü-subtle-highlight:
+        outline: "subtle-highlight"
+        text: "Ü"
+    ß-subtle-highlight:
+        outline: "subtle-highlight"
+        text: "ß"
+    ô:
+        outline: "fill"
+    Ç:
+        outline: "fill"
+    ":":
+        outline: "fill"
+    π:
+        outline: "fill"

data/keyboards/de+neo.yaml

@@ -0,0 +1,113 @@
+# Language: German (Neo 2)
+---
+outlines:
+    default:            { width: 32.415, height: 52 }
+    change-view:        { width: 48.622, height: 52 }
+    fill:               { width: 64.83,  height: 52 }
+    spaceline:          { width: 112.45, height: 52 }
+    special:            { width: 32.415, height: 52 }
+    special-2:          { width: 48.622, height: 52 }
+    subtle-highlight:   { width: 32.415, height: 52 }
+    subtle-highlight-2: { width: 64.83,  height: 52 }
+
+views:
+    base:
+        - "x v l c w k h g f q ß"
+        - "u i a e o s n r t d y"
+        - "show_upper ü ö ä p z b m j BackSpace"
+        - "show_numbers show_eschars preferences space , . Return"
+    upper:
+        - "X V L C W K H G F Q ẞ"
+        - "U I A E O S N R T D Y"
+        - "show_upper Ü Ö Ä P Z B M J 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:
+        - "ä-subtle-highlight è é ö-subtle-highlight ü-subtle-highlight-2 Ä-subtle-highlight È É Ö-subtle-highlight Ü-subtle-highlight"
+        - "à â ê î ô À Â Ê Î Ô"
+        - "show_numbers « » ç Ç æ œ ß-subtle-highlight BackSpace"
+        - "show_letters show_eschars preferences space „ “ Return"
+
+buttons:
+    show_upper:
+        action:
+            locking:
+                lock_view: "upper"
+                unlock_view: "base"
+        outline: "change-view"
+        icon: "key-shift"
+    BackSpace:
+        outline: "special-2"
+        icon: "edit-clear-symbolic"
+        action: "erase"
+    preferences:
+        action: "show_prefs"
+        outline: "special"
+        icon: "keyboard-mode-symbolic"
+    show_numbers:
+        action:
+            set_view: "numbers"
+        outline: "change-view"
+        label: "123"
+    show_letters:
+        action:
+            set_view: "base"
+        outline: "change-view"
+        label: "ABC"
+    show_symbols:
+        action:
+            set_view: "symbols"
+        outline: "change-view"
+        label: "*/="
+    show_eschars:
+        action:
+            locking:
+                lock_view: "eschars"
+                unlock_view: "base"
+        outline: "change-view"
+        label: "Ää"
+    space:
+        outline: "spaceline"
+        text: " "
+    Return:
+        outline: "special-2"
+        icon: "key-enter"
+        keysym: "Return"
+    ä-subtle-highlight:
+        outline: "subtle-highlight"
+        text: "ä"
+    ö-subtle-highlight:
+        outline: "subtle-highlight"
+        text: "ö"
+    ü-subtle-highlight-2:
+        outline: "subtle-highlight-2"
+        text: "ü"
+    Ä-subtle-highlight:
+        outline: "subtle-highlight"
+        text: "Ä"
+    Ö-subtle-highlight:
+        outline: "subtle-highlight"
+        text: "Ö"
+    Ü-subtle-highlight:
+        outline: "subtle-highlight"
+        text: "Ü"
+    ß-subtle-highlight:
+        outline: "subtle-highlight"
+        text: "ß"
+    ô:
+        outline: "fill"
+    Ç:
+        outline: "fill"
+    ":":
+        outline: "fill"
+    π:
+        outline: "fill"

data/keyboards/de+neo_wide.yaml

@@ -0,0 +1,113 @@
+# Language: German (Neo 2)
+---
+outlines:
+    default:            { width: 48.872,  height: 42 }
+    change-view:        { width: 73.308,  height: 42 }
+    fill:               { width: 97.744,  height: 42 }
+    spaceline:          { width: 171.052, height: 42 }
+    special:            { width: 48.872,  height: 42 }
+    special-2:          { width: 73.308,  height: 42 }
+    subtle-highlight:   { width: 48.872,  height: 42 }
+    subtle-highlight-2: { width: 97.744,  height: 42 }
+
+views:
+    base:
+        - "x v l c w k h g f q ß"
+        - "u i a e o s n r t d y"
+        - "show_upper ü ö ä p z b m j BackSpace"
+        - "show_numbers show_eschars preferences space , . Return"
+    upper:
+        - "X V L C W K H G F Q ẞ"
+        - "U I A E O S N R T D Y"
+        - "show_upper Ü Ö Ä P Z B M J 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:
+        - "ä-subtle-highlight è é ö-subtle-highlight ü-subtle-highlight-2 Ä-subtle-highlight È É Ö-subtle-highlight Ü-subtle-highlight"
+        - "à â ê î ô À Â Ê Î Ô"
+        - "show_numbers « » ç Ç æ œ ß-subtle-highlight BackSpace"
+        - "show_letters show_eschars preferences space „ “ Return"
+
+buttons:
+    show_upper:
+        action:
+            locking:
+                lock_view: "upper"
+                unlock_view: "base"
+        outline: "change-view"
+        icon: "key-shift"
+    BackSpace:
+        outline: "special-2"
+        icon: "edit-clear-symbolic"
+        action: "erase"
+    preferences:
+        action: "show_prefs"
+        outline: "special"
+        icon: "keyboard-mode-symbolic"
+    show_numbers:
+        action:
+            set_view: "numbers"
+        outline: "change-view"
+        label: "123"
+    show_letters:
+        action:
+            set_view: "base"
+        outline: "change-view"
+        label: "ABC"
+    show_symbols:
+        action:
+            set_view: "symbols"
+        outline: "change-view"
+        label: "*/="
+    show_eschars:
+        action:
+            locking:
+                lock_view: "eschars"
+                unlock_view: "base"
+        outline: "change-view"
+        label: "Ää"
+    space:
+        outline: "spaceline"
+        text: " "
+    Return:
+        outline: "special-2"
+        icon: "key-enter"
+        keysym: "Return"
+    ä-subtle-highlight:
+        outline: "subtle-highlight"
+        text: "ä"
+    ö-subtle-highlight:
+        outline: "subtle-highlight"
+        text: "ö"
+    ü-subtle-highlight-2:
+        outline: "subtle-highlight-2"
+        text: "ü"
+    Ä-subtle-highlight:
+        outline: "subtle-highlight"
+        text: "Ä"
+    Ö-subtle-highlight:
+        outline: "subtle-highlight"
+        text: "Ö"
+    Ü-subtle-highlight:
+        outline: "subtle-highlight"
+        text: "Ü"
+    ß-subtle-highlight:
+        outline: "subtle-highlight"
+        text: "ß"
+    ô:
+        outline: "fill"
+    Ç:
+        outline: "fill"
+    ":":
+        outline: "fill"
+    π:
+        outline: "fill"

data/keyboards/de.yaml

@@ -1,41 +1,42 @@
+# Language: German
 ---
 outlines:
-    default:          { width: 35.33, height: 52 }
-    subtle-highlight: { width: 35.33, height: 52 }
-    altline:          { width: 52.67, height: 52 }
-    change-view:      { width: 52.67, height: 52 }
-    spaceline:        { width: 89.3,  height: 52 }
-    special:          { width: 35.33, height: 52 }
+    default:          { width: 35.657, height: 52 }
+    change-view:      { width: 53.485, height: 52 }
+    spaceline:        { width: 89.144, height: 52 }
+    special:          { width: 35.657, height: 52 }
+    special-2:        { width: 53.485, height: 52 }
+    subtle-highlight: { width: 35.657, 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"
+        - "show_upper 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"
+        - "show_upper 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"
+        - "show_symbols ; \" ' : = < > BackSpace"
+        - "show_letters show_eschars preferences space , . Return"
     symbols:
         - "~ ` ´ | · √ µ ÷ × ¶"
         - "© ® £ $ ¥ ^ ° * { }"
-        - "show_numbers   \\ / § π τ [ ]  BackSpace"
-        - "show_letters show_eschars preferences         space        , . Return"
+        - "show_numbers \\ / § π τ [ ] BackSpace"
+        - "show_letters show_eschars preferences space , . Return"
     eschars:
         - "ä è é ö ü Ä È É Ö Ü"
         - "à â ê î ô À Â Ê Î Ô"
-        - "show_numbers  « » ç Ç æ œ ß-subtle-highlight  BackSpace"
-        - "show_letters show_eschars preferences         space        „ “ Return"
+        - "show_numbers « » ç Ç æ œ ß-subtle-highlight BackSpace"
+        - "show_letters show_eschars preferences space „ “ Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -43,7 +44,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -76,7 +77,7 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "altline"
+        outline: "special-2"
         icon: "key-enter"
         keysym: "Return"
     ä:

data/keyboards/de_wide.yaml

@@ -1,47 +1,45 @@
+# Language: German
 ---
 outlines:
-    default:            { width: 48.87,  height: 42 }
-    subtle-highlight:   { width: 48.87,  height: 42 }
-    halfwidth:          { width: 24,     height: 42 }
-    thin:               { width: 30,     height: 42 }
-    narrow:             { width: 40.5,   height: 42 }
-    altline:            { width: 82.74,  height: 42 }
-    change-view:        { width: 82.74,  height: 42 }
-    fill:               { width: 97.74,  height: 42 }
-    subtle-highlight-2: { width: 97.74,  height: 42 }
-    spaceline:          { width: 159.13, height: 42 }
-    special:            { width: 48.87,  height: 42 }
-    placeholder:        { width: 30,     height: 42 }
+    default:            { width: 48.872,  height: 42 }
+    change-view:        { width: 73.308,  height: 42 }
+    fill:               { width: 97.744,  height: 42 }
+    placeholder:        { width: 48.872,  height: 42 }
+    spaceline:          { width: 171.052, height: 42 }
+    special:            { width: 48.872,  height: 42 }
+    special-2:          { width: 73.308,  height: 42 }
+    subtle-highlight:   { width: 48.872,  height: 42 }
+    subtle-highlight-2: { width: 97.744,  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 ß-thin BackSpace"
-        - "show_numbers show_eschars preferences         space        ,-narrow .-narrow Return"
+        - "show_upper 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 --thin BackSpace"
-        - "show_numbers show_eschars preferences         space        !-narrow ?-narrow Return"
+        - "show_upper 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        ,-narrow .-narrow Return"
+        - "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        ,-narrow .-narrow Return"
+        - "~ ` ´ | · √ µ ÷ × ¶ ²"
+        - "© ® £ $ ¥ ^ ° * { } ³"
+        - "show_numbers \\ / § π τ [ ] -- BackSpace"
+        - "show_letters show_eschars preferences space , . Return"
     eschars:
         - "ä-subtle-highlight è é ö-subtle-highlight ü-subtle-highlight-2 Ä-subtle-highlight È É Ö-subtle-highlight Ü-subtle-highlight"
         - "à â ê î ô À Â Ê Î Ô"
-        - "show_numbers  « » ç Ç æ œ ß-subtle-highlight -- BackSpace"
-        - "show_letters show_eschars preferences         space        „ “ Return"
+        - "show_numbers « » ç Ç æ œ ß-subtle-highlight ẞ-subtle-highlight BackSpace"
+        - "show_letters show_eschars preferences space „ “ Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -49,7 +47,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -82,31 +80,9 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "altline"
+        outline: "special-2"
         icon: "key-enter"
         keysym: "Return"
-    „:
-        outline: "narrow"
-    “:
-        outline: "narrow"
-    ",-narrow":
-        outline: "narrow"
-        text: ","
-    .-narrow:
-        outline: "narrow"
-        text: "."
-    "!-narrow":
-        outline: "narrow"
-        text: "!"
-    ?-narrow:
-        outline: "narrow"
-        text: "?"
-    --thin:
-        outline: "thin"
-        text: "-"
-    ß-thin:
-        outline: "thin"
-        text: "ß"
     ä-subtle-highlight:
         outline: "subtle-highlight"
         text: "ä"
@@ -128,16 +104,11 @@ buttons:
     ß-subtle-highlight:
         outline: "subtle-highlight"
         text: "ß"
+    ẞ-subtle-highlight:
+        outline: "subtle-highlight"
+        text: "ẞ"
     --:
         outline: "placeholder"
         text: ""
-    5:
-        outline: "fill"
-    "&":
-        outline: "fill"
-    ·:
-        outline: "fill"
-    ¥:
-        outline: "fill"
     ô:
         outline: "fill"

data/keyboards/dk.yaml

@@ -1,40 +1,39 @@
+# Language: Danish
 ---
 outlines:
-    default:       { width: 32.4,   height: 52 }
-    altline:       { width: 48.39,  height: 52 }
-    large:         { width: 48.39,  height: 52 }
-    wide:          { width: 62,     height: 52 }
-    change-view:   { width: 48.39,  height: 52 }
-    change-view-2: { width: 62,     height: 52 }
-    spaceline:     { width: 136.39, height: 52 }
-    special:       { width: 48,     height: 52 }
-    placeholder:   { width: 32,     height: 52 }
-    fill:          { width: 64,     height: 52 }
+    default:       { width: 32.415,  height: 52 }
+    change-view:   { width: 48.622,  height: 52 }
+    change-view-2: { width: 56.726,  height: 52 }
+    large:         { width: 48.622,  height: 52 }
+    placeholder:   { width: 32.415,  height: 52 }
+    spaceline:     { width: 145.869, height: 52 }
+    special:       { width: 48.622,  height: 52 }
+    special-2:     { width: 56.726,  height: 52 }
 
 views:
     base:
         - "q w e r t y u i o p å"
         - "a s d f g h j k l ø æ"
-        - "Shift_L   z x c v b n m , BackSpace"
-        - "show_numbers preferences         space        .    Return"
+        - "show_upper 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"
+        - "show_upper Z X C V B N M , BackSpace"
+        - "show_numbers preferences space . Return"
     numbers:
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "@ # $ % & - _ + ( )"
-        - "show_symbols -- , \" ' : ; ! ?  BackSpace"
-        - "show_letters preferences         space        .    Return"
+        - "1 2 3 4 5 6 7 8 9 0 ²"
+        - "@ # $ % & - _ + ( ) ³"
+        - "show_symbols , \" ' : ; ! ? -- BackSpace"
+        - "show_letters preferences space . Return"
     symbols:
-        - "~ ` | · √ π τ ÷ × ¶"
-        - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers_from_symbols -- \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        .    Return"
+        - "~ ` | · √ π τ ÷ × ¶ ²"
+        - "© ® £ € ¥ ^ ° * { } ³"
+        - "show_numbers_from_symbols \\ / < > = [ ] -- BackSpace"
+        - "show_letters preferences space . Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -42,7 +41,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -75,17 +74,9 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "wide"
+        outline: "special-2"
         icon: "key-enter"
         keysym: "Return"
     --:
         outline: "placeholder"
         text: ""
-    5:
-        outline: "fill"
-    "&":
-        outline: "fill"
-    √:
-        outline: "fill"
-    ¥:
-        outline: "fill"

data/keyboards/dk_wide.yaml

@@ -1,38 +1,39 @@
+# Language: Danish
 ---
 outlines:
-    default:     { width: 48.87,  height: 42 }
-    altline:     { width: 73.5,   height: 42 }
-    wide:        { width: 92.99,  height: 42 }
-    change-view: { width: 73.5,   height: 42 }
-    spaceline:   { width: 273.5,  height: 42 }
-    special:     { width: 48.87,  height: 42 }
-    placeholder: { width: 48.87,  height: 42 }
-    fill:        { width: 97.74,  height: 42 }
+    default:       { width: 48.872,  height: 42 }
+    change-view:   { width: 73.308,  height: 42 }
+    change-view-2: { width: 85.526,  height: 42 }
+    placeholder:   { width: 48.872,  height: 42 }
+    spaceline:     { width: 268.796, height: 42 }
+    special:       { width: 48.872,  height: 42 }
+    special-2:     { width: 73.308,  height: 42 }
+    special-3:     { width: 85.526,  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"
+        - "show_upper 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"
+        - "show_upper Z X C V B N M , BackSpace"
+        - "show_numbers preferences space . Return"
     numbers:
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "@ # $ % & - _ + ( )"
-        - "show_symbols -- , \" ' : ; ! ?  BackSpace"
-        - "show_letters preferences         space        .    Return"
+        - "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"
+        - "~ ` | · √ π τ ÷ × ¶ ²"
+        - "© ® £ € ¥ ^ ° * { } ³"
+        - "show_numbers_from_symbols \\ / < > = [ ] -- BackSpace"
+        - "show_letters preferences space . Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -40,7 +41,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -48,6 +49,11 @@ buttons:
         outline: "special"
         icon: "keyboard-mode-symbolic"
     show_numbers:
+        action:
+            set_view: "numbers"
+        outline: "change-view-2"
+        label: "123"
+    show_numbers_from_symbols:
         action:
             set_view: "numbers"
         outline: "change-view"
@@ -55,7 +61,7 @@ buttons:
     show_letters:
         action:
             set_view: "base"
-        outline: "change-view"
+        outline: "change-view-2"
         label: "ABC"
     show_symbols:
         action:
@@ -66,17 +72,9 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "wide"
+        outline: "special-3"
         icon: "key-enter"
         keysym: "Return"
     --:
         outline: "placeholder"
         text: ""
-    5:
-        outline: "fill"
-    "&":
-        outline: "fill"
-    √:
-        outline: "fill"
-    ¥:
-        outline: "fill"

data/keyboards/email/us.yaml

@@ -1,37 +1,38 @@
 ---
 outlines:
-    default:       { width: 35.33,  height: 52 }
-    wide:          { width: 62,     height: 52 }
-    change-view:   { width: 52.67,  height: 52 }
-    change-view-2: { width: 62,     height: 52 }
-    spaceline:     { width: 106.67, height: 52 }
-    special:       { width: 44,     height: 52 }
-    large:         { width: 44,     height: 52 }
+    default:       { width: 35.657,  height: 52 }
+    change-view:   { width: 53.485,  height: 52 }
+    change-view-2: { width: 62.399,  height: 52 }
+    large:         { width: 39.222,  height: 52 }
+    spaceline:     { width: 108.757, height: 52 }
+    special:       { width: 44.571,  height: 52 }
+    special-2:     { width: 53.485,  height: 52 }
+    special-3:     { width: 62.399,  height: 52 }
 
 views:
     base:
         - "q w e r t y u i o p"
         - "a s d f g h j k l"
-        - "Shift_L   z x c v b n m  BackSpace"
-        - "show_numbers preferences         space        @ . Return"
+        - "show_upper z x c v b n m BackSpace"
+        - "show_numbers preferences space @-large . 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"
+        - "show_upper Z X C V B N M BackSpace"
+        - "show_numbers preferences space @-large . Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
-        - "show_symbols   , \" ' : ; ! ?  BackSpace"
-        - "show_letters preferences         space        @ . Return"
+        - "show_symbols , \" ' : ; ! ? BackSpace"
+        - "show_letters preferences space @-large . Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        @ . Return"
+        - "show_numbers_from_symbols \\ / < > = [ ] BackSpace"
+        - "show_letters preferences space @-large . Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -39,11 +40,9 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
-    "@":
-        outline: "large"
     preferences:
         action: "show_prefs"
         outline: "special"
@@ -68,12 +67,15 @@ buttons:
             set_view: "symbols"
         outline: "change-view"
         label: "*/="
-    .:
-        outline: "large"
     space:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "wide"
+        outline: "special-3"
         icon: "key-enter"
         keysym: "Return"
+    .:
+        outline: "large"
+    "@-large":
+        outline: "large"
+        text: "@"

data/keyboards/email/us_wide.yaml

@@ -1,37 +1,36 @@
 ---
 outlines:
-    default:       { width: 52,    height: 42 }
-    wide:          { width: 91.25, height: 42 }
-    change-view:   { width: 77.52, height: 42 }
-    change-view-2: { width: 91.25, height: 42 }
-    spaceline:     { width: 157,   height: 42 }
-    special:       { width: 64.76, height: 42 }
-    large:         { width: 54.76, height: 42 }
+    default:       { width: 53.76,  height: 42 }
+    change-view:   { width: 80.64,  height: 42 }
+    change-view-2: { width: 94.08,  height: 42 }
+    spaceline:     { width: 188.16, height: 42 }
+    special:       { width: 53.76,  height: 42 }
+    special-2:     { width: 94.08,  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"
+        - "show_upper 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"
+        - "show_upper Z X C V B N M BackSpace"
+        - "show_numbers preferences space @ . Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
-        - "show_symbols   , \" ' : ; ! ?  BackSpace"
-        - "show_letters preferences         space        @ . Return"
+        - "show_symbols , \" ' : ; ! ? BackSpace"
+        - "show_letters preferences space @ . Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        @ . Return"
+        - "show_numbers_from_symbols \\ / < > = [ ] BackSpace"
+        - "show_letters preferences space @ . Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -39,11 +38,9 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
-    "@":
-        outline: "large"
     preferences:
         action: "show_prefs"
         outline: "special"
@@ -68,12 +65,10 @@ buttons:
             set_view: "symbols"
         outline: "change-view"
         label: "*/="
-    .:
-        outline: "large"
     space:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "wide"
+        outline: "special-2"
         icon: "key-enter"
         keysym: "Return"

data/keyboards/emoji/us.yaml

@@ -1,12 +1,12 @@
 ---
 outlines:
-    default:       { width: 52,   height: 52 }
-    placeholder:   { width: 52,   height: 52 }
-    special:       { width: 52,   height: 52 }
-    change-view:   { width: 52,   height: 52 }
-    change-view-2: { width: 36.4, height: 56 }
-    emoji-group:   { width: 52,   height: 52 }
-    placeholder-2: { width: 260,  height: 52 }
+    default:       { width: 51.918, height: 52 }
+    change-view:   { width: 51.918, height: 52 }
+    change-view-2: { width: 36.341, height: 56 }
+    emoji-group:   { width: 51.918, height: 52 }
+    placeholder:   { width: 51.918, height: 52 }
+    placeholder-2: { width: 259.59, height: 52 }
+    special:       { width: 51.918, height: 52 }
 
 views:
     base:
@@ -37,10 +37,10 @@ views:
     face-neutral-skeptical:
         - "🤐 🤨 😐 😑 😶 🫥 😶‍🌫️"
         - "😏 😒 🙄 😬 😮‍💨 🤥 🫨"
-        - "preferences 🙂‍↔️ 🙂‍↕️ 0 0 BackSpace"
+        - "preferences 🙂‍↔️ 🙂‍↕️ 0 0 0 BackSpace"
         - "1 2 3 4 5 6 7 8 9 10"
     face-sleepy:
-        - "😌 😔 😪 🤤 😴 0 0"
+        - "😌 😔 😪 🤤 😴 🫩 0"
         - "0 0 0 0 0 0 0"
         - "preferences 0 0 0 0 0 BackSpace"
         - "1 2 3 4 5 6 7 8 9 10"
@@ -256,7 +256,7 @@ views:
         - "1 2 3 4 5 6 7 8 9 10"
     person-symbol:
         - "🗣 👤 👥 🫂 👪 🧑‍🧑‍🧒 🧑‍🧑‍🧒‍🧒"
-        - "🧑‍🧒 🧑‍🧒‍🧒 👣 0 0 0 0"
+        - "🧑‍🧒 🧑‍🧒‍🧒 👣 🫆 0 0 0"
         - "preferences 0 0 0 0 0 BackSpace"
         - "1 2 3 4 5 6 7 8 9 10"
     component:
@@ -327,7 +327,7 @@ views:
     plant-other:
         - "🌱 🪴 🌲 🌳 🌴 🌵 🌾"
         - "🌿 ☘ 🍀 🍁 🍂 🍃 🪹"
-        - "preferences 🪺 🍄 0 0 0 BackSpace"
+        - "preferences 🪺 🍄 🪾 0 0 BackSpace"
         - "1 2 3 4 5 6 7 8 9 10"
     food-and-drink:
         - "🍒+ 🥕+ 🥐+ 🍱+ 🦐+ 🍰+ 🍵+"
@@ -347,7 +347,7 @@ views:
     food-vegetable:
         - "🥑 🍆 🥔 🥕 🌽 🌶 🫑"
         - "🥒 🥬 🥦 🧄 🧅 🥜 🫘"
-        - "preferences 🌰 🫚 🫛 🍄‍🟫 0 BackSpace"
+        - "preferences 🌰 🫚 🫛 🍄‍🟫 🫜 BackSpace"
         - "1 2 3 4 5 6 7 8 9 10"
     food-prepared:
         - "🍞 🥐 🥖 🫓 🥨 🥯 🥞"
@@ -556,7 +556,7 @@ views:
         - "1 2 3 4 5 6 7 8 9 10"
     musical-instrument:
         - "🎷 🪗 🎸 🎹 🎺 🎻 🪕"
-        - "🥁 🪘 🪇 🪈 0 0 0"
+        - "🥁 🪘 🪇 🪈 🪉 0 0"
         - "preferences 0 0 0 0 0 BackSpace"
         - "1 2 3 4 5 6 7 8 9 10"
     phone:
@@ -616,7 +616,7 @@ views:
         - "1 2 3 4 5 6 7 8 9 10"
     tool-2:
         - "🦯 🔗 ⛓️‍💥 ⛓ 🪝 🧰 🧲"
-        - "tool-backwards  🪜 0 0 0 0 0"
+        - "tool-backwards  🪜 🪏 0 0 0 0"
         - "preferences 0 0 0 0 0 BackSpace"
         - "1 2 3 4 5 6 7 8 9 10"
     science:
@@ -715,7 +715,7 @@ views:
         - "preferences ➿ 〽 ✳ ✴ ❇ BackSpace"
         - "1 2 3 4 5 6 7 8 9 10"
     other-symbol-2:
-        - "© ® ™ 0 0 0 0"
+        - "© ® ™ 🫟 0 0 0"
         - "other-symbol-backwards 0 0 0 0 0 0"
         - "preferences 0 0 0 0 0 BackSpace"
         - "1 2 3 4 5 6 7 8 9 10"
@@ -772,70 +772,70 @@ views:
     country-flag-3:
         - "🇧🇼 🇧🇾 🇧🇿 🇨🇦 🇨🇨 🇨🇩 🇨🇫"
         - "country-flag-2-backwards 🇨🇬 🇨🇭 🇨🇮 🇨🇰 🇨🇱 country-flag-4"
-        - "preferences 🇨🇲 🇨🇳 🇨🇴 🇨🇵 🇨🇷 BackSpace"
+        - "preferences 🇨🇲 🇨🇳 🇨🇴 🇨🇵 🇨🇶 BackSpace"
         - "1 2 3 4 5 6 7 8 9 10"
     country-flag-4:
-        - "🇨🇺 🇨🇻 🇨🇼 🇨🇽 🇨🇾 🇨🇿 🇩🇪"
-        - "country-flag-3-backwards 🇩🇬 🇩🇯 🇩🇰 🇩🇲 🇩🇴 country-flag-5"
-        - "preferences 🇩🇿 🇪🇦 🇪🇨 🇪🇪 🇪🇬 BackSpace"
+        - "🇨🇷 🇨🇺 🇨🇻 🇨🇼 🇨🇽 🇨🇾 🇨🇿 "
+        - "country-flag-3-backwards 🇩🇪 🇩🇬 🇩🇯 🇩🇰 🇩🇲 country-flag-5"
+        - "preferences 🇩🇴 🇩🇿 🇪🇦 🇪🇨 🇪🇪 BackSpace"
         - "1 2 3 4 5 6 7 8 9 10"
     country-flag-5:
-        - "🇪🇭 🇪🇷 🇪🇸 🇪🇹 🇪🇺 🇫🇮 🇫🇯"
-        - "country-flag-4-backwards 🇫🇰 🇫🇲 🇫🇴 🇫🇷 🇬🇦 country-flag-6"
-        - "preferences 🇬🇧 🇬🇩 🇬🇪 🇬🇫 🇬🇬 BackSpace"
+        - "🇪🇬 🇪🇭 🇪🇷 🇪🇸 🇪🇹 🇪🇺 🇫🇮"
+        - "country-flag-4-backwards 🇫🇯 🇫🇰 🇫🇲 🇫🇴 🇫🇷 country-flag-6"
+        - "preferences 🇬🇦 🇬🇧 🇬🇩 🇬🇪 🇬🇫 BackSpace"
         - "1 2 3 4 5 6 7 8 9 10"
     country-flag-6:
-        - "🇬🇭 🇬🇮 🇬🇱 🇬🇲 🇬🇳 🇬🇵 🇬🇶"
-        - "country-flag-5-backwards 🇬🇷 🇬🇸 🇬🇹 🇬🇺 🇬🇼 country-flag-7"
-        - "preferences 🇬🇾 🇭🇰 🇭🇲 🇭🇳 🇭🇷 BackSpace"
+        - "🇬🇬 🇬🇭 🇬🇮 🇬🇱 🇬🇲 🇬🇳 🇬🇵"
+        - "country-flag-5-backwards 🇬🇶 🇬🇷 🇬🇸 🇬🇹 🇬🇺 country-flag-7"
+        - "preferences 🇬🇼 🇬🇾 🇭🇰 🇭🇲 🇭🇳 BackSpace"
         - "1 2 3 4 5 6 7 8 9 10"
     country-flag-7:
-        - "🇭🇹 🇭🇺 🇮🇨 🇮🇩 🇮🇪 🇮🇱 🇮🇲"
-        - "country-flag-6-backwards 🇮🇳 🇮🇴 🇮🇶 🇮🇷 🇮🇸 country-flag-8"
-        - "preferences 🇮🇹 🇯🇪 🇯🇲 🇯🇴 🇯🇵 BackSpace"
+        - "🇭🇷 🇭🇹 🇭🇺 🇮🇨 🇮🇩 🇮🇪 🇮🇱"
+        - "country-flag-6-backwards 🇮🇲 🇮🇳 🇮🇴 🇮🇶 🇮🇷 country-flag-8"
+        - "preferences 🇮🇸 🇮🇹 🇯🇪 🇯🇲 🇯🇴 BackSpace"
         - "1 2 3 4 5 6 7 8 9 10"
     country-flag-8:
-        - "🇰🇪 🇰🇬 🇰🇭 🇰🇮 🇰🇲 🇰🇳 🇰🇵"
-        - "country-flag-7-backwards 🇰🇷 🇰🇼 🇰🇾 🇰🇿 🇱🇦 country-flag-9"
-        - "preferences 🇱🇧 🇱🇨 🇱🇮 🇱🇰 🇱🇷 BackSpace"
+        - "🇯🇵 🇰🇪 🇰🇬 🇰🇭 🇰🇮 🇰🇲 🇰🇳"
+        - "country-flag-7-backwards 🇰🇵 🇰🇷 🇰🇼 🇰🇾 🇰🇿 country-flag-9"
+        - "preferences 🇱🇦 🇱🇧 🇱🇨 🇱🇮 🇱🇰 BackSpace"
         - "1 2 3 4 5 6 7 8 9 10"
     country-flag-9:
-        - "🇱🇸 🇱🇹 🇱🇺 🇱🇻 🇱🇾 🇲🇦 🇲🇨"
-        - "country-flag-8-backwards 🇲🇩 🇲🇪 🇲🇫 🇲🇬 🇲🇭 country-flag-10"
-        - "preferences 🇲🇰 🇲🇱 🇲🇲 🇲🇳 🇲🇴 BackSpace"
+        - "🇱🇷 🇱🇸 🇱🇹 🇱🇺 🇱🇻 🇱🇾 🇲🇦"
+        - "country-flag-8-backwards 🇲🇨 🇲🇩 🇲🇪 🇲🇫 🇲🇬 country-flag-10"
+        - "preferences 🇲🇭 🇲🇰 🇲🇱 🇲🇲 🇲🇳 BackSpace"
         - "1 2 3 4 5 6 7 8 9 10"
     country-flag-10:
-        - "🇲🇵 🇲🇶 🇲🇷 🇲🇸 🇲🇹 🇲🇺 🇲🇻"
-        - "country-flag-9-backwards 🇲🇼 🇲🇽 🇲🇾 🇲🇿 🇳🇦 country-flag-11"
-        - "preferences 🇳🇨 🇳🇪 🇳🇫 🇳🇬 🇳🇮 BackSpace"
+        - "🇲🇴 🇲🇵 🇲🇶 🇲🇷 🇲🇸 🇲🇹 🇲🇺"
+        - "country-flag-9-backwards 🇲🇻 🇲🇼 🇲🇽 🇲🇾 🇲🇿 country-flag-11"
+        - "preferences 🇳🇦 🇳🇨 🇳🇪 🇳🇫 🇳🇬 BackSpace"
         - "1 2 3 4 5 6 7 8 9 10"
     country-flag-11:
-        - "🇳🇱 🇳🇴 🇳🇵 🇳🇷 🇳🇺 🇳🇿 🇴🇲"
-        - "country-flag-10-backwards 🇵🇦 🇵🇪 🇵🇫 🇵🇬 🇵🇭 country-flag-12"
-        - "preferences 🇵🇰 🇵🇱 🇵🇲 🇵🇳 🇵🇷 BackSpace"
+        - "🇳🇮 🇳🇱 🇳🇴 🇳🇵 🇳🇷 🇳🇺 🇳🇿"
+        - "country-flag-10-backwards 🇴🇲 🇵🇦 🇵🇪 🇵🇫 🇵🇬 country-flag-12"
+        - "preferences 🇵🇭 🇵🇰 🇵🇱 🇵🇲 🇵🇳 BackSpace"
         - "1 2 3 4 5 6 7 8 9 10"
     country-flag-12:
-        - "🇵🇸 🇵🇹 🇵🇼 🇵🇾 🇶🇦 🇷🇪 🇷🇴"
-        - "country-flag-11-backwards 🇷🇸 🇷🇺 🇷🇼 🇸🇦 🇸🇧 country-flag-13"
-        - "preferences 🇸🇨 🇸🇩 🇸🇪 🇸🇬 🇸🇭 BackSpace"
+        - "🇵🇷 🇵🇸 🇵🇹 🇵🇼 🇵🇾 🇶🇦 🇷🇪"
+        - "country-flag-11-backwards 🇷🇴 🇷🇸 🇷🇺 🇷🇼 🇸🇦 country-flag-13"
+        - "preferences 🇸🇧 🇸🇨 🇸🇩 🇸🇪 🇸🇬 BackSpace"
         - "1 2 3 4 5 6 7 8 9 10"
     country-flag-13:
-        - "🇸🇮 🇸🇯 🇸🇰 🇸🇱 🇸🇲 🇸🇳 🇸🇴"
-        - "country-flag-12-backwards 🇸🇷 🇸🇸 🇸🇹 🇸🇻 🇸🇽 country-flag-14"
-        - "preferences 🇸🇾 🇸🇿 🇹🇦 🇹🇨 🇹🇩 BackSpace"
+        - "🇸🇭 🇸🇮 🇸🇯 🇸🇰 🇸🇱 🇸🇲 🇸🇳"
+        - "country-flag-12-backwards 🇸🇴 🇸🇷 🇸🇸 🇸🇹 🇸🇻 country-flag-14"
+        - "preferences 🇸🇽 🇸🇾 🇸🇿 🇹🇦 🇹🇨 BackSpace"
         - "1 2 3 4 5 6 7 8 9 10"
     country-flag-14:
-        - "🇹🇫 🇹🇬 🇹🇭 🇹🇯 🇹🇰 🇹🇱 🇹🇲"
-        - "country-flag-13-backwards 🇹🇳 🇹🇴 🇹🇷 🇹🇹 🇹🇻 country-flag-15"
-        - "preferences 🇹🇼 🇹🇿 🇺🇦 🇺🇬 🇺🇲 BackSpace"
+        - "🇹🇩 🇹🇫 🇹🇬 🇹🇭 🇹🇯 🇹🇰 🇹🇱"
+        - "country-flag-13-backwards 🇹🇲 🇹🇳 🇹🇴 🇹🇷 🇹🇹 country-flag-15"
+        - "preferences 🇹🇻 🇹🇼 🇹🇿 🇺🇦 🇺🇬 BackSpace"
         - "1 2 3 4 5 6 7 8 9 10"
     country-flag-15:
-        - "🇺🇳 🇺🇸 🇺🇾 🇺🇿 🇻🇦 🇻🇨 🇻🇪"
-        - "country-flag-14-backwards 🇻🇬 🇻🇮 🇻🇳 🇻🇺 🇼🇫 country-flag-16"
-        - "preferences 🇼🇸 🇽🇰 🇾🇪 🇾🇹 🇿🇦 BackSpace"
+        - "🇺🇲 🇺🇳 🇺🇸 🇺🇾 🇺🇿 🇻🇦 🇻🇨"
+        - "country-flag-14-backwards 🇻🇪 🇻🇬 🇻🇮 🇻🇳 🇻🇺 country-flag-16"
+        - "preferences 🇼🇫 🇼🇸 🇽🇰 🇾🇪 🇾🇹 BackSpace"
         - "1 2 3 4 5 6 7 8 9 10"
     country-flag-16:
-        - "🇿🇲 🇿🇼 0 0 0 0 0"
+        - "🇿🇦 🇿🇲 🇿🇼 0 0 0 0"
         - "country-flag-15-backwards 0 0 0 0 0 0"
         - "preferences 0 0 0 0 0 BackSpace"
         - "1 2 3 4 5 6 7 8 9 10"

data/keyboards/emoji/us_wide.yaml

@@ -1,12 +1,12 @@
 ---
 outlines:
-    default:       { width: 97.07,  height: 52 }
-    placeholder:   { width: 97.07,  height: 52 }
-    special:       { width: 97.07,  height: 52 }
-    change-view:   { width: 97.07,  height: 52 }
-    change-view-2: { width: 67.95,  height: 56 }
-    emoji-group:   { width: 97.07,  height: 52 }
-    placeholder-2: { width: 485.33, height: 52 }
+    default:       { width: 78.628, height: 42 }
+    change-view:   { width: 78.628, height: 42 }
+    change-view-2: { width: 55.039, height: 46 }
+    emoji-group:   { width: 78.628, height: 42 }
+    placeholder:   { width: 78.628, height: 42 }
+    placeholder-2: { width: 393.14, height: 42 }
+    special:       { width: 78.628, height: 42 }
 
 views:
     base:
@@ -37,10 +37,10 @@ views:
     face-neutral-skeptical:
         - "🤐 🤨 😐 😑 😶 🫥 😶‍🌫️"
         - "😏 😒 🙄 😬 😮‍💨 🤥 🫨"
-        - "preferences 🙂‍↔️ 🙂‍↕️ 0 0 BackSpace"
+        - "preferences 🙂‍↔️ 🙂‍↕️ 0 0 0 BackSpace"
         - "1 2 3 4 5 6 7 8 9 10"
     face-sleepy:
-        - "😌 😔 😪 🤤 😴 0 0"
+        - "😌 😔 😪 🤤 😴 🫩 0"
         - "0 0 0 0 0 0 0"
         - "preferences 0 0 0 0 0 BackSpace"
         - "1 2 3 4 5 6 7 8 9 10"
@@ -256,7 +256,7 @@ views:
         - "1 2 3 4 5 6 7 8 9 10"
     person-symbol:
         - "🗣 👤 👥 🫂 👪 🧑‍🧑‍🧒 🧑‍🧑‍🧒‍🧒"
-        - "🧑‍🧒 🧑‍🧒‍🧒 👣 0 0 0 0"
+        - "🧑‍🧒 🧑‍🧒‍🧒 👣 🫆 0 0 0"
         - "preferences 0 0 0 0 0 BackSpace"
         - "1 2 3 4 5 6 7 8 9 10"
     component:
@@ -327,7 +327,7 @@ views:
     plant-other:
         - "🌱 🪴 🌲 🌳 🌴 🌵 🌾"
         - "🌿 ☘ 🍀 🍁 🍂 🍃 🪹"
-        - "preferences 🪺 🍄 0 0 0 BackSpace"
+        - "preferences 🪺 🍄 🪾 0 0 BackSpace"
         - "1 2 3 4 5 6 7 8 9 10"
     food-and-drink:
         - "🍒+ 🥕+ 🥐+ 🍱+ 🦐+ 🍰+ 🍵+"
@@ -347,7 +347,7 @@ views:
     food-vegetable:
         - "🥑 🍆 🥔 🥕 🌽 🌶 🫑"
         - "🥒 🥬 🥦 🧄 🧅 🥜 🫘"
-        - "preferences 🌰 🫚 🫛 🍄‍🟫 0 BackSpace"
+        - "preferences 🌰 🫚 🫛 🍄‍🟫 🫜 BackSpace"
         - "1 2 3 4 5 6 7 8 9 10"
     food-prepared:
         - "🍞 🥐 🥖 🫓 🥨 🥯 🥞"
@@ -556,7 +556,7 @@ views:
         - "1 2 3 4 5 6 7 8 9 10"
     musical-instrument:
         - "🎷 🪗 🎸 🎹 🎺 🎻 🪕"
-        - "🥁 🪘 🪇 🪈 0 0 0"
+        - "🥁 🪘 🪇 🪈 🪉 0 0"
         - "preferences 0 0 0 0 0 BackSpace"
         - "1 2 3 4 5 6 7 8 9 10"
     phone:
@@ -616,7 +616,7 @@ views:
         - "1 2 3 4 5 6 7 8 9 10"
     tool-2:
         - "🦯 🔗 ⛓️‍💥 ⛓ 🪝 🧰 🧲"
-        - "tool-backwards  🪜 0 0 0 0 0"
+        - "tool-backwards  🪜 🪏 0 0 0 0"
         - "preferences 0 0 0 0 0 BackSpace"
         - "1 2 3 4 5 6 7 8 9 10"
     science:
@@ -715,7 +715,7 @@ views:
         - "preferences ➿ 〽 ✳ ✴ ❇ BackSpace"
         - "1 2 3 4 5 6 7 8 9 10"
     other-symbol-2:
-        - "© ® ™ 0 0 0 0"
+        - "© ® ™ 🫟 0 0 0"
         - "other-symbol-backwards 0 0 0 0 0 0"
         - "preferences 0 0 0 0 0 BackSpace"
         - "1 2 3 4 5 6 7 8 9 10"
@@ -772,70 +772,70 @@ views:
     country-flag-3:
         - "🇧🇼 🇧🇾 🇧🇿 🇨🇦 🇨🇨 🇨🇩 🇨🇫"
         - "country-flag-2-backwards 🇨🇬 🇨🇭 🇨🇮 🇨🇰 🇨🇱 country-flag-4"
-        - "preferences 🇨🇲 🇨🇳 🇨🇴 🇨🇵 🇨🇷 BackSpace"
+        - "preferences 🇨🇲 🇨🇳 🇨🇴 🇨🇵 🇨🇶 BackSpace"
         - "1 2 3 4 5 6 7 8 9 10"
     country-flag-4:
-        - "🇨🇺 🇨🇻 🇨🇼 🇨🇽 🇨🇾 🇨🇿 🇩🇪"
-        - "country-flag-3-backwards 🇩🇬 🇩🇯 🇩🇰 🇩🇲 🇩🇴 country-flag-5"
-        - "preferences 🇩🇿 🇪🇦 🇪🇨 🇪🇪 🇪🇬 BackSpace"
+        - "🇨🇷 🇨🇺 🇨🇻 🇨🇼 🇨🇽 🇨🇾 🇨🇿 "
+        - "country-flag-3-backwards 🇩🇪 🇩🇬 🇩🇯 🇩🇰 🇩🇲 country-flag-5"
+        - "preferences 🇩🇴 🇩🇿 🇪🇦 🇪🇨 🇪🇪 BackSpace"
         - "1 2 3 4 5 6 7 8 9 10"
     country-flag-5:
-        - "🇪🇭 🇪🇷 🇪🇸 🇪🇹 🇪🇺 🇫🇮 🇫🇯"
-        - "country-flag-4-backwards 🇫🇰 🇫🇲 🇫🇴 🇫🇷 🇬🇦 country-flag-6"
-        - "preferences 🇬🇧 🇬🇩 🇬🇪 🇬🇫 🇬🇬 BackSpace"
+        - "🇪🇬 🇪🇭 🇪🇷 🇪🇸 🇪🇹 🇪🇺 🇫🇮"
+        - "country-flag-4-backwards 🇫🇯 🇫🇰 🇫🇲 🇫🇴 🇫🇷 country-flag-6"
+        - "preferences 🇬🇦 🇬🇧 🇬🇩 🇬🇪 🇬🇫 BackSpace"
         - "1 2 3 4 5 6 7 8 9 10"
     country-flag-6:
-        - "🇬🇭 🇬🇮 🇬🇱 🇬🇲 🇬🇳 🇬🇵 🇬🇶"
-        - "country-flag-5-backwards 🇬🇷 🇬🇸 🇬🇹 🇬🇺 🇬🇼 country-flag-7"
-        - "preferences 🇬🇾 🇭🇰 🇭🇲 🇭🇳 🇭🇷 BackSpace"
+        - "🇬🇬 🇬🇭 🇬🇮 🇬🇱 🇬🇲 🇬🇳 🇬🇵"
+        - "country-flag-5-backwards 🇬🇶 🇬🇷 🇬🇸 🇬🇹 🇬🇺 country-flag-7"
+        - "preferences 🇬🇼 🇬🇾 🇭🇰 🇭🇲 🇭🇳 BackSpace"
         - "1 2 3 4 5 6 7 8 9 10"
     country-flag-7:
-        - "🇭🇹 🇭🇺 🇮🇨 🇮🇩 🇮🇪 🇮🇱 🇮🇲"
-        - "country-flag-6-backwards 🇮🇳 🇮🇴 🇮🇶 🇮🇷 🇮🇸 country-flag-8"
-        - "preferences 🇮🇹 🇯🇪 🇯🇲 🇯🇴 🇯🇵 BackSpace"
+        - "🇭🇷 🇭🇹 🇭🇺 🇮🇨 🇮🇩 🇮🇪 🇮🇱"
+        - "country-flag-6-backwards 🇮🇲 🇮🇳 🇮🇴 🇮🇶 🇮🇷 country-flag-8"
+        - "preferences 🇮🇸 🇮🇹 🇯🇪 🇯🇲 🇯🇴 BackSpace"
         - "1 2 3 4 5 6 7 8 9 10"
     country-flag-8:
-        - "🇰🇪 🇰🇬 🇰🇭 🇰🇮 🇰🇲 🇰🇳 🇰🇵"
-        - "country-flag-7-backwards 🇰🇷 🇰🇼 🇰🇾 🇰🇿 🇱🇦 country-flag-9"
-        - "preferences 🇱🇧 🇱🇨 🇱🇮 🇱🇰 🇱🇷 BackSpace"
+        - "🇯🇵 🇰🇪 🇰🇬 🇰🇭 🇰🇮 🇰🇲 🇰🇳"
+        - "country-flag-7-backwards 🇰🇵 🇰🇷 🇰🇼 🇰🇾 🇰🇿 country-flag-9"
+        - "preferences 🇱🇦 🇱🇧 🇱🇨 🇱🇮 🇱🇰 BackSpace"
         - "1 2 3 4 5 6 7 8 9 10"
     country-flag-9:
-        - "🇱🇸 🇱🇹 🇱🇺 🇱🇻 🇱🇾 🇲🇦 🇲🇨"
-        - "country-flag-8-backwards 🇲🇩 🇲🇪 🇲🇫 🇲🇬 🇲🇭 country-flag-10"
-        - "preferences 🇲🇰 🇲🇱 🇲🇲 🇲🇳 🇲🇴 BackSpace"
+        - "🇱🇷 🇱🇸 🇱🇹 🇱🇺 🇱🇻 🇱🇾 🇲🇦"
+        - "country-flag-8-backwards 🇲🇨 🇲🇩 🇲🇪 🇲🇫 🇲🇬 country-flag-10"
+        - "preferences 🇲🇭 🇲🇰 🇲🇱 🇲🇲 🇲🇳 BackSpace"
         - "1 2 3 4 5 6 7 8 9 10"
     country-flag-10:
-        - "🇲🇵 🇲🇶 🇲🇷 🇲🇸 🇲🇹 🇲🇺 🇲🇻"
-        - "country-flag-9-backwards 🇲🇼 🇲🇽 🇲🇾 🇲🇿 🇳🇦 country-flag-11"
-        - "preferences 🇳🇨 🇳🇪 🇳🇫 🇳🇬 🇳🇮 BackSpace"
+        - "🇲🇴 🇲🇵 🇲🇶 🇲🇷 🇲🇸 🇲🇹 🇲🇺"
+        - "country-flag-9-backwards 🇲🇻 🇲🇼 🇲🇽 🇲🇾 🇲🇿 country-flag-11"
+        - "preferences 🇳🇦 🇳🇨 🇳🇪 🇳🇫 🇳🇬 BackSpace"
         - "1 2 3 4 5 6 7 8 9 10"
     country-flag-11:
-        - "🇳🇱 🇳🇴 🇳🇵 🇳🇷 🇳🇺 🇳🇿 🇴🇲"
-        - "country-flag-10-backwards 🇵🇦 🇵🇪 🇵🇫 🇵🇬 🇵🇭 country-flag-12"
-        - "preferences 🇵🇰 🇵🇱 🇵🇲 🇵🇳 🇵🇷 BackSpace"
+        - "🇳🇮 🇳🇱 🇳🇴 🇳🇵 🇳🇷 🇳🇺 🇳🇿"
+        - "country-flag-10-backwards 🇴🇲 🇵🇦 🇵🇪 🇵🇫 🇵🇬 country-flag-12"
+        - "preferences 🇵🇭 🇵🇰 🇵🇱 🇵🇲 🇵🇳 BackSpace"
         - "1 2 3 4 5 6 7 8 9 10"
     country-flag-12:
-        - "🇵🇸 🇵🇹 🇵🇼 🇵🇾 🇶🇦 🇷🇪 🇷🇴"
-        - "country-flag-11-backwards 🇷🇸 🇷🇺 🇷🇼 🇸🇦 🇸🇧 country-flag-13"
-        - "preferences 🇸🇨 🇸🇩 🇸🇪 🇸🇬 🇸🇭 BackSpace"
+        - "🇵🇷 🇵🇸 🇵🇹 🇵🇼 🇵🇾 🇶🇦 🇷🇪"
+        - "country-flag-11-backwards 🇷🇴 🇷🇸 🇷🇺 🇷🇼 🇸🇦 country-flag-13"
+        - "preferences 🇸🇧 🇸🇨 🇸🇩 🇸🇪 🇸🇬 BackSpace"
         - "1 2 3 4 5 6 7 8 9 10"
     country-flag-13:
-        - "🇸🇮 🇸🇯 🇸🇰 🇸🇱 🇸🇲 🇸🇳 🇸🇴"
-        - "country-flag-12-backwards 🇸🇷 🇸🇸 🇸🇹 🇸🇻 🇸🇽 country-flag-14"
-        - "preferences 🇸🇾 🇸🇿 🇹🇦 🇹🇨 🇹🇩 BackSpace"
+        - "🇸🇭 🇸🇮 🇸🇯 🇸🇰 🇸🇱 🇸🇲 🇸🇳"
+        - "country-flag-12-backwards 🇸🇴 🇸🇷 🇸🇸 🇸🇹 🇸🇻 country-flag-14"
+        - "preferences 🇸🇽 🇸🇾 🇸🇿 🇹🇦 🇹🇨 BackSpace"
         - "1 2 3 4 5 6 7 8 9 10"
     country-flag-14:
-        - "🇹🇫 🇹🇬 🇹🇭 🇹🇯 🇹🇰 🇹🇱 🇹🇲"
-        - "country-flag-13-backwards 🇹🇳 🇹🇴 🇹🇷 🇹🇹 🇹🇻 country-flag-15"
-        - "preferences 🇹🇼 🇹🇿 🇺🇦 🇺🇬 🇺🇲 BackSpace"
+        - "🇹🇩 🇹🇫 🇹🇬 🇹🇭 🇹🇯 🇹🇰 🇹🇱"
+        - "country-flag-13-backwards 🇹🇲 🇹🇳 🇹🇴 🇹🇷 🇹🇹 country-flag-15"
+        - "preferences 🇹🇻 🇹🇼 🇹🇿 🇺🇦 🇺🇬 BackSpace"
         - "1 2 3 4 5 6 7 8 9 10"
     country-flag-15:
-        - "🇺🇳 🇺🇸 🇺🇾 🇺🇿 🇻🇦 🇻🇨 🇻🇪"
-        - "country-flag-14-backwards 🇻🇬 🇻🇮 🇻🇳 🇻🇺 🇼🇫 country-flag-16"
-        - "preferences 🇼🇸 🇽🇰 🇾🇪 🇾🇹 🇿🇦 BackSpace"
+        - "🇺🇲 🇺🇳 🇺🇸 🇺🇾 🇺🇿 🇻🇦 🇻🇨"
+        - "country-flag-14-backwards 🇻🇪 🇻🇬 🇻🇮 🇻🇳 🇻🇺 country-flag-16"
+        - "preferences 🇼🇫 🇼🇸 🇽🇰 🇾🇪 🇾🇹 BackSpace"
         - "1 2 3 4 5 6 7 8 9 10"
     country-flag-16:
-        - "🇿🇲 🇿🇼 0 0 0 0 0"
+        - "🇿🇦 🇿🇲 🇿🇼 0 0 0 0"
         - "country-flag-15-backwards 0 0 0 0 0 0"
         - "preferences 0 0 0 0 0 BackSpace"
         - "1 2 3 4 5 6 7 8 9 10"

data/keyboards/epo.yaml

@@ -1,44 +1,43 @@
+# Language: Esperanto
 ---
 outlines:
-    default:       { width: 35.67, height: 52 }
-    altline:       { width: 54,    height: 52 }
-    wide:          { width: 54,    height: 52 }
-    change-view:   { width: 54,    height: 52 }
-    change-view-2: { width: 62,    height: 52 }
-    spaceline:     { width: 88.75, height: 52 }
-    special:       { width: 35.67, height: 52 }
-    placeholder:   { width: 35.67, height: 52 }
-    large:         { width: 71.34, height: 52 }
+    default:     { width: 35.657, height: 52 }
+    change-view: { width: 53.485, height: 52 }
+    large:       { width: 71.314, height: 52 }
+    placeholder: { width: 35.657, height: 52 }
+    spaceline:   { width: 89.144, height: 52 }
+    special:     { width: 35.657, height: 52 }
+    special-2:   { width: 53.485, 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        .-large Return"
+        - "show_upper z x c v b n m BackSpace"
+        - "show_numbers show_eschars preferences space .-large Return"
     upper:
         - "Q W E R T Y U I O P"
         - "A S D F G H J K L"
-        - "Shift_L   Z X C V B N M  BackSpace"
-        - "show_numbers show_eschars preferences         space        ! ? Return"
+        - "show_upper Z X C V B N M BackSpace"
+        - "show_numbers show_eschars preferences space ! ? Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
-        - "show_symbols   , \" ' : ; ! ?  BackSpace"
-        - "show_letters show_eschars preferences         space       .-large Return"
+        - "show_symbols , \" ' : ; ! ? BackSpace"
+        - "show_letters show_eschars preferences space .-large Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers   \\ / < > = [ ]  BackSpace"
-        - "show_letters show_eschars preferences         space       , . Return"
+        - "show_numbers \\ / < > = [ ] BackSpace"
+        - "show_letters show_eschars preferences space , . Return"
     eschars:
         - "-- -- ĉ ĝ ĥ ĵ ŝ ŭ ? --"
         - "-- -- Ĉ Ĝ Ĥ Ĵ Ŝ Ŭ ! --"
         - "show_numbers ' \" - – , . … BackSpace"
-        - "show_letters show_eschars preferences         space        „ “ Return"
+        - "show_letters show_eschars preferences space „ “ Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -46,7 +45,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -79,7 +78,7 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "wide"
+        outline: "special-2"
         icon: "key-enter"
         keysym: "Return"
     --:

data/keyboards/epo_wide.yaml

@@ -1,45 +1,44 @@
+# Language: Esperanto
 ---
 outlines:
-    default:       { width: 53.75, height: 42 }
-    thin:          { width: 40,    height: 42 }
-    altline:       { width: 80.5,  height: 42 }
-    wide:          { width: 91.25, height: 42 }
-    change-view:   { width: 80.5,  height: 42 }
-    change-view-2: { width: 91.25, height: 42 }
-    spaceline:     { width: 164,   height: 42 }
-    special:       { width: 52,    height: 42 }
-    placeholder:   { width: 53.75, height: 42 }
-    large:         { width: 80,    height: 42 }
+    default:     { width: 53.76,  height: 42 }
+    change-view: { width: 80.64,  height: 42 }
+    large:       { width: 80.64,  height: 42 }
+    placeholder: { width: 53.76,  height: 42 }
+    spaceline:   { width: 161.28, height: 42 }
+    special:     { width: 53.76,  height: 42 }
+    special-2:   { width: 80.64,  height: 42 }
+    thin:        { width: 40.32,  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        .-large Return"
+        - "show_upper z x c v b n m BackSpace"
+        - "show_numbers show_eschars preferences space .-large 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        !-thin ?-thin Return"
+        - "show_upper Z X C V B N M BackSpace"
+        - "show_numbers show_eschars preferences space !-thin ?-thin Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
-        - "show_symbols   , \" ' : ; ! ?  BackSpace"
-        - "show_letters show_eschars preferences         space       .-large Return"
+        - "show_symbols , \" ' : ; ! ? BackSpace"
+        - "show_letters show_eschars preferences space .-large Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers   \\ / < > = [ ]  BackSpace"
-        - "show_letters show_eschars preferences         space       ,-thin .-thin Return"
+        - "show_numbers \\ / < > = [ ] BackSpace"
+        - "show_letters show_eschars preferences space ,-thin .-thin Return"
     eschars:
         - "-- -- ĉ ĝ ĥ ĵ ŝ ŭ ? --"
         - "-- -- Ĉ Ĝ Ĥ Ĵ Ŝ Ŭ ! --"
         - "show_numbers ' \" - – , . … BackSpace"
-        - "show_letters show_eschars preferences         space        „ “ Return"
+        - "show_letters show_eschars preferences space „ “ Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -47,7 +46,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -80,7 +79,7 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "altline"
+        outline: "special-2"
         icon: "key-enter"
         keysym: "Return"
     --:

data/keyboards/es+cat.yaml

@@ -1,42 +1,41 @@
+# Language: Catalan (Spain, with middle-dot L)
 ---
 outlines:
-    default:       { width: 35.67, height: 52 }
-    altline:       { width: 52.67, height: 52 }
-    wide:          { width: 62,    height: 52 }
-    change-view:   { width: 52.67, height: 52 }
-    change-view-2: { width: 62,    height: 52 }
-    spaceline:     { width: 90,    height: 52 }
-    special:       { width: 35.67, height: 52 }
+    default:     { width: 35.657, height: 52 }
+    change-view: { width: 53.485, height: 52 }
+    spaceline:   { width: 89.144, height: 52 }
+    special:     { width: 35.657, height: 52 }
+    special-2:   { width: 53.485, 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"
+        - "show_upper 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"
+        - "show_upper Z X C V B N M BackSpace"
+        - "show_numbers show_eschars preferences space ¿ . Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # € % & - _ + ( )"
-        - "show_symbols   , \" ' : ; ! = BackSpace"
-        - "show_letters show_eschars preferences         space        ? . Return"
+        - "show_symbols , \" ' : ; ! = BackSpace"
+        - "show_letters show_eschars preferences space ? . Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ $ ¥ ^ ° * { }"
-        - "show_numbers   \\ / < > = [ ]  BackSpace"
-        - "show_letters show_eschars preferences         space        ? . Return"
+        - "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:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -44,7 +43,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -77,6 +76,6 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "altline"
+        outline: "special-2"
         icon: "key-enter"
         keysym: "Return"

data/keyboards/es+cat_wide.yaml

@@ -1,42 +1,41 @@
+# Language: Catalan (Spain, with middle-dot L)
 ---
 outlines:
-    default:       { width: 53.75, height: 42 }
-    altline:       { width: 80,    height: 42 }
-    wide:          { width: 92,    height: 42 }
-    change-view:   { width: 80,    height: 42 }
-    change-view-2: { width: 92,    height: 42 }
-    spaceline:     { width: 135,   height: 42 }
-    special:       { width: 53.75, height: 42 }
+    default:     { width: 53.76, height: 42 }
+    change-view: { width: 80.64, height: 42 }
+    spaceline:   { width: 134.4, height: 42 }
+    special:     { width: 53.76, height: 42 }
+    special-2:   { width: 80.64, 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"
+        - "show_upper 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"
+        - "show_upper Z X C V B N M BackSpace"
+        - "show_numbers show_eschars preferences space ¿ . Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # € % & - _ + ( )"
-        - "show_symbols   , \" ' : ; ! = BackSpace"
-        - "show_letters show_eschars preferences         space        ? . Return"
+        - "show_symbols , \" ' : ; ! = BackSpace"
+        - "show_letters show_eschars preferences space ? . Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ $ ¥ ^ ° * { }"
-        - "show_numbers   \\ / < > = [ ]  BackSpace"
-        - "show_letters show_eschars preferences         space        ? . Return"
+        - "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:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -44,7 +43,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -77,6 +76,6 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "altline"
+        outline: "special-2"
         icon: "key-enter"
         keysym: "Return"

data/keyboards/es.yaml

@@ -1,41 +1,41 @@
+# Language: Spanish
 ---
 outlines:
-    default:       { width: 35.67, height: 52 }
-    altline:       { width: 52.67, height: 52 }
-    wide:          { width: 62,    height: 52 }
-    change-view:   { width: 52.67, height: 52 }
-    spaceline:     { width: 90,    height: 52 }
-    special:       { width: 35.67, height: 52 }
+    default:     { width: 35.657, height: 52 }
+    change-view: { width: 53.485, height: 52 }
+    spaceline:   { width: 89.144, height: 52 }
+    special:     { width: 35.657, height: 52 }
+    special-2:   { width: 53.485, 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"
+        - "show_upper 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"
+        - "show_upper Z X C V B N M BackSpace"
+        - "show_numbers show_eschars preferences space ¿ . Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # € % & - _ + ( )"
-        - "show_symbols   , \" ' : ; ! = BackSpace"
-        - "show_letters show_eschars preferences         space        ? . Return"
+        - "show_symbols , \" ' : ; ! = BackSpace"
+        - "show_letters show_eschars preferences space ? . Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ $ ¥ ^ ° * { }"
-        - "show_numbers   \\ / < > = [ ]  BackSpace"
-        - "show_letters show_eschars preferences         space        ? . Return"
+        - "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:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -43,7 +43,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -76,6 +76,6 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "altline"
+        outline: "special-2"
         icon: "key-enter"
         keysym: "Return"

data/keyboards/es_wide.yaml

@@ -1,41 +1,41 @@
+# Language: Spanish
 ---
 outlines:
-    default:       { width: 53.75, height: 42 }
-    altline:       { width: 80,    height: 42 }
-    wide:          { width: 92,    height: 42 }
-    change-view:   { width: 80,    height: 42 }
-    spaceline:     { width: 135,   height: 42 }
-    special:       { width: 53.75, height: 42 }
+    default:     { width: 53.76, height: 42 }
+    change-view: { width: 80.64, height: 42 }
+    spaceline:   { width: 134.4, height: 42 }
+    special:     { width: 53.76, height: 42 }
+    special-2:   { width: 80.64, 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"
+        - "show_upper 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"
+        - "show_upper Z X C V B N M BackSpace"
+        - "show_numbers show_eschars preferences space ¿ . Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # € % & - _ + ( )"
-        - "show_symbols   , \" ' : ; ! = BackSpace"
-        - "show_letters show_eschars preferences         space        ? . Return"
+        - "show_symbols , \" ' : ; ! = BackSpace"
+        - "show_letters show_eschars preferences space ? . Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ $ ¥ ^ ° * { }"
-        - "show_numbers   \\ / < > = [ ]  BackSpace"
-        - "show_letters show_eschars preferences         space        ? . Return"
+        - "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:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -43,7 +43,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -76,6 +76,6 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "altline"
+        outline: "special-2"
         icon: "key-enter"
         keysym: "Return"

data/keyboards/fi.yaml

@@ -1,40 +1,39 @@
+# Language: Finnish
 ---
 outlines:
-    default:       { width: 32.4,   height: 52 }
-    altline:       { width: 48.39,  height: 52 }
-    large:         { width: 48.39,  height: 52 }
-    wide:          { width: 62,     height: 52 }
-    change-view:   { width: 48.39,  height: 52 }
-    change-view-2: { width: 62,     height: 52 }
-    spaceline:     { width: 136.39, height: 52 }
-    special:       { width: 48,     height: 52 }
-    placeholder:   { width: 32,     height: 52 }
-    fill:          { width: 64,     height: 52 }
+    default:       { width: 32.415,  height: 52 }
+    change-view:   { width: 48.622,  height: 52 }
+    change-view-2: { width: 56.726,  height: 52 }
+    large:         { width: 48.622,  height: 52 }
+    placeholder:   { width: 32.415,  height: 52 }
+    spaceline:     { width: 145.869, height: 52 }
+    special:       { width: 48.622,  height: 52 }
+    special-2:     { width: 56.726,  height: 52 }
 
 views:
     base:
         - "q w e r t y u i o p å"
         - "a s d f g h j k l ö ä"
-        - "Shift_L   z x c v b n m , BackSpace"
-        - "show_numbers preferences         space        .    Return"
+        - "show_upper 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"
+        - "show_upper Z X C V B N M , BackSpace"
+        - "show_numbers preferences space . Return"
     numbers:
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "@ # $ % & - _ + ( )"
-        - "show_symbols -- , \" ' : ; ! ? BackSpace"
-        - "show_letters preferences         space        .    Return"
+        - "1 2 3 4 5 6 7 8 9 0 ²"
+        - "@ # $ % & - _ + ( ) ³"
+        - "show_symbols , \" ' : ; ! ? -- BackSpace"
+        - "show_letters preferences space . Return"
     symbols:
-        - "~ ` | · √ π τ ÷ × ¶"
-        - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers_from_symbols -- \\ / < > = [ ] BackSpace"
-        - "show_letters preferences         space        .    Return"
+        - "~ ` | · √ π τ ÷ × ¶ ²"
+        - "© ® £ € ¥ ^ ° * { } ³"
+        - "show_numbers_from_symbols \\ / < > = [ ] -- BackSpace"
+        - "show_letters preferences space . Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -42,7 +41,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -75,17 +74,9 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "wide"
+        outline: "special-2"
         icon: "key-enter"
         keysym: "Return"
     --:
         outline: "placeholder"
-        text: ""
-    5:
-        outline: "fill"
-    "&":
-        outline: "fill"
-    √:
-        outline: "fill"
-    ¥:
-        outline: "fill"
+        text: ""

data/keyboards/fi_wide.yaml

@@ -1,38 +1,39 @@
+# Language: Finnish
 ---
 outlines:
-    default:     { width: 48.87,  height: 42 }
-    altline:     { width: 73.5,   height: 42 }
-    wide:        { width: 92.99,  height: 42 }
-    change-view: { width: 73.5,   height: 42 }
-    spaceline:   { width: 273.5,  height: 42 }
-    special:     { width: 48.87,  height: 42 }
-    placeholder: { width: 48.87,  height: 42 }
-    fill:        { width: 97.74,  height: 42 }
+    default:       { width: 48.872,  height: 42 }
+    change-view:   { width: 73.308,  height: 42 }
+    change-view-2: { width: 85.526,  height: 42 }
+    placeholder:   { width: 48.872,  height: 42 }
+    spaceline:     { width: 268.796, height: 42 }
+    special:       { width: 48.872,  height: 42 }
+    special-2:     { width: 73.308,  height: 42 }
+    special-3:     { width: 85.526,  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"
+        - "show_upper 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"
+        - "show_upper Z X C V B N M , BackSpace"
+        - "show_numbers preferences space . Return"
     numbers:
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "@ # $ % & - _ + ( )"
-        - "show_symbols -- , \" ' : ; ! ? BackSpace"
-        - "show_letters preferences         space        .    Return"
+        - "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"
+        - "~ ` | · √ π τ ÷ × ¶ ²"
+        - "© ® £ € ¥ ^ ° * { } ³"
+        - "show_numbers_from_symbols \\ / < > = [ ] -- BackSpace"
+        - "show_letters preferences space . Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -40,7 +41,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -48,6 +49,11 @@ buttons:
         outline: "special"
         icon: "keyboard-mode-symbolic"
     show_numbers:
+        action:
+            set_view: "numbers"
+        outline: "change-view-2"
+        label: "123"
+    show_numbers_from_symbols:
         action:
             set_view: "numbers"
         outline: "change-view"
@@ -55,7 +61,7 @@ buttons:
     show_letters:
         action:
             set_view: "base"
-        outline: "change-view"
+        outline: "change-view-2"
         label: "ABC"
     show_symbols:
         action:
@@ -66,17 +72,9 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "wide"
+        outline: "special-3"
         icon: "key-enter"
         keysym: "Return"
     --:
         outline: "placeholder"
         text: ""
-    5:
-        outline: "fill"
-    "&":
-        outline: "fill"
-    √:
-        outline: "fill"
-    ¥:
-        outline: "fill"

data/keyboards/fr+bepo.yaml

@@ -1,44 +1,45 @@
+# Language: French (BEPO)
 ---
 outlines:
-    default:       { width: 35.33, height: 52 }
-    altline:       { width: 37.0,  height: 52 }
-    wide:          { width: 50,    height: 52 }
-    change-view:   { width: 37.0,  height: 52 }
-    change-view-2: { width: 50,    height: 52 }
-    spaceline:     { width: 171,   height: 52 }
-    special:       { width: 35.33, height: 52 }
-    large:         { width: 35.33, height: 52 }
-    placeholder:   { width: 35.33, height: 52 }
+    default:       { width: 35.657,  height: 52 }
+    change-view:   { width: 35.657,  height: 52 }
+    change-view-2: { width: 53.485,  height: 52 }
+    change-view-3: { width: 62.399,  height: 52 }
+    placeholder:   { width: 35.657,  height: 52 }
+    spaceline:     { width: 124.802, height: 52 }
+    special:       { width: 35.657,  height: 52 }
+    special-2:     { width: 53.485,  height: 52 }
+    special-3:     { width: 62.399,  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 . BackSpace"
-        - "show_numbers preferences         space   show_eschars Return"
+        - "show_upper 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   show_eschars Return"
+        - "show_upper Y X K Q G H F - BackSpace"
+        - "show_numbers preferences space show_eschars Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # € % & - _ + ( )"
-        - "show_symbols -- , \" ' : ; ! ?  BackSpace"
-        - "show_letters preferences         space   show_eschars Return"
+        - "show_symbols , \" ' : ; ! ? -- BackSpace"
+        - "show_letters preferences space show_eschars Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ $ ¥ ^ ° * { }"
-        - "show_numbers_from_symbols -- \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space   show_eschars Return"
+        - "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"
+        - "show_numbers_from_symbols æ œ ä ë ï ö ü : BackSpace"
+        - "show_letters preferences space show_eschars Return"
  
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -46,17 +47,17 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
         action: "show_prefs"
-        outline: "special"
+        outline: "special-2"
         icon: "keyboard-mode-symbolic"
     show_numbers:
         action:
             set_view: "numbers"
-        outline: "change-view-2"
+        outline: "change-view-3"
         label: "123"
     show_numbers_from_symbols:
         action:
@@ -66,7 +67,7 @@ buttons:
     show_letters:
         action:
             set_view: "base"
-        outline: "change-view-2"
+        outline: "change-view-3"
         label: "ABC"
     show_symbols:
         action:
@@ -84,11 +85,9 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "wide"
+        outline: "special-3"
         icon: "key-enter"
         keysym: "Return"
-    .:
-        outline: "large"
     --:
         outline: "placeholder"
         text: ""

data/keyboards/fr+bepo_wide.yaml

@@ -1,43 +1,43 @@
+# Language: French (BEPO)
 ---
 outlines:
-    default:       { width: 54,  height: 42 }
-    altline:       { width: 54,  height: 42 }
-    wide:          { width: 80,  height: 42 }
-    change-view:   { width: 54,  height: 42 }
-    change-view-2: { width: 80,  height: 42 }
-    spaceline:     { width: 246, height: 42 }
-    special:       { width: 54,  height: 42 }
-    placeholder:   { width: 54,  height: 42 }
+    default:       { width: 53.76,  height: 42 }
+    change-view:   { width: 53.76,  height: 42 }
+    change-view-2: { width: 80.64,  height: 42 }
+    placeholder:   { width: 53.76,  height: 42 }
+    spaceline:     { width: 241.92, height: 42 }
+    special:       { width: 53.76,  height: 42 }
+    special-2:     { width: 80.64,  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"
+        - "show_upper 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    show_eschars Return"
+        - "show_upper Y X K Q G H F - BackSpace"
+        - "show_numbers preferences space show_eschars Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # € % & - _ + ( )"
-        - "show_symbols -- , \" ' : ; ! ?  BackSpace"
-        - "show_letters preferences         space        show_eschars Return"
+        - "show_symbols , \" ' : ; ! ? -- BackSpace"
+        - "show_letters preferences space show_eschars Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ $ ¥ ^ ° * { }"
-        - "show_numbers_from_symbols -- \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        show_eschars Return"
+        - "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"
+        - "show_numbers_from_symbols æ œ ä ë ï ö ü : BackSpace"
+        - "show_letters preferences space show_eschars Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -45,7 +45,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -83,7 +83,7 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "wide"
+        outline: "special-2"
         icon: "key-enter"
         keysym: "Return"
     --:

data/keyboards/fr.yaml

@@ -1,42 +1,42 @@
+# Language: French
 ---
 outlines:
-    default:       { width: 35.33, height: 52 }
-    altline:       { width: 52.67, height: 52 }
-    wide:          { width: 59,    height: 52 }
-    change-view:   { width: 52.67, height: 52 }
-    change-view-2: { width: 59,    height: 52 }
-    spaceline:     { width: 140,   height: 52 }
-    special:       { width: 44,    height: 52 }
+    default:       { width: 35.657,  height: 52 }
+    change-view:   { width: 53.485,  height: 52 }
+    change-view-2: { width: 62.399,  height: 52 }
+    spaceline:     { width: 124.802, height: 52 }
+    special:       { width: 53.485,  height: 52 }
+    special-2:     { width: 62.399,  height: 52 }
 
 views:
     base:
         - "a z e r t y u i o p"
         - "q s d f g h j k l m"
-        - "Shift_L   w x c v b n .   BackSpace"
-        - "show_numbers preferences         space        show_eschars Return"
+        - "show_upper w x c v b n . BackSpace"
+        - "show_numbers preferences space show_eschars Return"
     upper:
         - "A Z E R T Y U I O P"
         - "Q S D F G H J K L M"
-        - "Shift_L   W X C V B N ,  BackSpace"
-        - "show_numbers preferences         space        show_eschars Return"
+        - "show_upper W X C V B N , BackSpace"
+        - "show_numbers preferences space show_eschars Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # € % & - _ + ( )"
-        - "show_symbols   , \" ' : ; ! ?  BackSpace"
-        - "show_letters preferences         space        show_eschars Return"
+        - "show_symbols , \" ' : ; ! ? BackSpace"
+        - "show_letters preferences space show_eschars Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ $ ¥ ^ ° * { }"
-        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        show_eschars Return"
+        - "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"
+        - "show_numbers_from_symbols æ œ ä ë ï ö ü BackSpace"
+        - "show_letters preferences space show_eschars Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -44,7 +44,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -82,6 +82,6 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "wide"
+        outline: "special-2"
         icon: "key-enter"
         keysym: "Return"

data/keyboards/fr_wide.yaml

@@ -1,42 +1,41 @@
+# Language: French
 ---
 outlines:
-    default:       { width: 54,  height: 42 }
-    altline:       { width: 81,  height: 42 }
-    wide:          { width: 100, height: 42 }
-    change-view:   { width: 81,  height: 42 }
-    change-view-2: { width: 100, height: 42 }
-    spaceline:     { width: 205, height: 42 }
-    special:       { width: 54,  height: 42 }
+    default:     { width: 53.76,  height: 42 }
+    change-view: { width: 80.64,  height: 42 }
+    spaceline:   { width: 241.92, height: 42 }
+    special:     { width: 53.76,  height: 42 }
+    special-2:   { width: 80.64,  height: 42 }
 
 views:
     base:
         - "a z e r t y u i o p"
         - "q s d f g h j k l m"
-        - "Shift_L   w x c v b n .   BackSpace"
-        - "show_numbers preferences         space        show_eschars Return"
+        - "show_upper w x c v b n . BackSpace"
+        - "show_numbers preferences space show_eschars Return"
     upper:
         - "A Z E R T Y U I O P"
         - "Q S D F G H J K L M"
-        - "Shift_L   W X C V B N ,  BackSpace"
-        - "show_numbers preferences         space        show_eschars Return"
+        - "show_upper W X C V B N , BackSpace"
+        - "show_numbers preferences space show_eschars Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # € % & - _ + ( )"
-        - "show_symbols   , \" ' : ; ! ?  BackSpace"
-        - "show_letters preferences         space        show_eschars Return"
+        - "show_symbols , \" ' : ; ! ? BackSpace"
+        - "show_letters preferences space show_eschars Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ $ ¥ ^ ° * { }"
-        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        show_eschars Return"
+        - "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"
+        - "show_numbers_from_symbols æ œ ä ë ï ö ü BackSpace"
+        - "show_letters preferences space show_eschars Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -44,7 +43,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -54,7 +53,7 @@ buttons:
     show_numbers:
         action:
             set_view: "numbers"
-        outline: "change-view-2"
+        outline: "change-view"
         label: "123"
     show_numbers_from_symbols:
         action:
@@ -64,7 +63,7 @@ buttons:
     show_letters:
         action:
             set_view: "base"
-        outline: "change-view-2"
+        outline: "change-view"
         label: "ABC"
     show_symbols:
         action:
@@ -82,6 +81,6 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "wide"
+        outline: "special-2"
         icon: "key-enter"
         keysym: "Return"

data/keyboards/ge.yaml

@@ -1,38 +1,38 @@
+# Language: Georgian
 ---
 outlines:
-    default:       { width: 35.67, height: 52 }
-    altline:       { width: 53,    height: 52 }
-    wide:          { width: 62,    height: 52 }
-    change-view:   { width: 53,    height: 52 }
-    change-view-2: { width: 62,    height: 52 }
-    spaceline:     { width: 142,   height: 52 }
-    special:       { width: 44,    height: 52 }
-    large:         { width: 44,    height: 52 }
+    default:       { width: 35.657,  height: 52 }
+    change-view:   { width: 53.485,  height: 52 }
+    change-view-2: { width: 62.399,  height: 52 }
+    large:         { width: 53.485,  height: 52 }
+    spaceline:     { width: 124.802, height: 52 }
+    special:       { width: 53.485,  height: 52 }
+    special-2:     { width: 62.399,  height: 52 }
 
 views:
     base:
         - "ქ წ ე რ ტ ყ უ ი ო პ"
         - "ა ს დ ფ გ ჰ ჯ კ ლ"
-        - "Shift_L ზ ხ ც ვ ბ ნ მ BackSpace"
-        - "show_numbers preferences         space    .     Return"
+        - "show_upper ზ ხ ც ვ ბ ნ მ BackSpace"
+        - "show_numbers preferences space . Return"
     upper:
         - "ქ ჭ ე ღ თ ყ უ ი ო პ"
         - "ა შ დ ფ გ ჰ ჟ კ ლ"
-        - "Shift_L ძ ხ ჩ ვ ბ ნ მ BackSpace"
-        - "show_numbers preferences         space    .     Return"
+        - "show_upper ძ ხ ჩ ვ ბ ნ მ 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"
+        - "show_symbols - ' \" : ; , ? BackSpace"
+        - "show_letters preferences space . Return"
     symbols:
         - "+ ⨯ ÷ = / _ € £ ¥ ₾"
         - "~ ` | · √ π τ ° { }"
-        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space    .     Return"
+        - "show_numbers_from_symbols \\ / < > = [ ] BackSpace"
+        - "show_letters preferences space . Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -40,7 +40,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -73,6 +73,6 @@ buttons:
     .:
         outline: "large"
     Return:
-        outline: "wide"
+        outline: "special-2"
         icon: "key-enter"
         keysym: "Return"

data/keyboards/ge_wide.yaml

@@ -1,37 +1,38 @@
+# Language: Georgian
 ---
 outlines:
-    default:       { width: 53.5,  height: 42 }
-    altline:       { width: 80.25, height: 42 }
-    wide:          { width: 91.26, height: 42 }
-    change-view:   { width: 80.25, height: 42 }
-    change-view-2: { width: 91.26, height: 42 }
-    spaceline:     { width: 245,   height: 42 }
-    special:       { width: 53.5,  height: 42 }
+    default:       { width: 53.76,  height: 42 }
+    change-view:   { width: 80.64,  height: 42 }
+    change-view-2: { width: 94.08,  height: 42 }
+    spaceline:     { width: 241.92, height: 42 }
+    special:       { width: 53.76,  height: 42 }
+    special-2:     { width: 80.64,  height: 42 }
+    special-3:     { width: 94.08,  height: 42 }
 
 views:
     base:
         - "ქ წ ე რ ტ ყ უ ი ო პ"
         - "ა ს დ ფ გ ჰ ჯ კ ლ"
-        - "Shift_L ზ ხ ც ვ ბ ნ მ BackSpace"
-        - "show_numbers preferences         space    .     Return"
+        - "show_upper ზ ხ ც ვ ბ ნ მ BackSpace"
+        - "show_numbers preferences space . Return"
     upper:
         - "ქ ჭ ე ღ თ ყ უ ი ო პ"
         - "ა შ დ ფ გ ჰ ჟ კ ლ"
-        - "Shift_L ძ ხ ჩ ვ ბ ნ მ BackSpace"
-        - "show_numbers preferences         space    .     Return"
+        - "show_upper ძ ხ ჩ ვ ბ ნ მ 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"
+        - "show_symbols - ' \" : ; , ? BackSpace"
+        - "show_letters preferences space . Return"
     symbols:
         - "+ ⨯ ÷ = / _ € £ ¥ ₾"
         - "~ ` | · √ π τ ° { }"
-        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space    .     Return"
+        - "show_numbers_from_symbols \\ / < > = [ ] BackSpace"
+        - "show_letters preferences space . Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -39,7 +40,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -70,7 +71,7 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "wide"
+        outline: "special-3"
         icon: "key-enter"
         keysym: "Return"
     --:

data/keyboards/gr+polytonic.yaml

@@ -1,34 +1,35 @@
+# Language: Greek (polytonic)
 # Greek polytonic layout by Antonis Tsolomitis
 # University of the Aegean, Department of Mathematics, atsol@aegean.gr
 # March 2022
 # 
 ---
 outlines:
-    default:          { width: 40,    height: 60 }
-    subtle-highlight: { width: 40,    height: 60 }
-    placeholder:      { width: 40,    height: 60 }
-    special:          { width: 52.67, height: 60 }
-    fill:             { width: 57.5,  height: 60 }
-    altline:          { width: 57.5,  height: 60 }
-    large:            { width: 57.5,  height: 60 }
-    change-view:      { width: 57.5,  height: 60 }
-    wide:             { width: 62,    height: 60 }
-    change-view-2:    { width: 81,    height: 60 }
-    character-group:  { width: 72,    height: 60 }
-    placeholder-2:    { width: 72,    height: 60 }
-    spaceline:        { width: 143,   height: 60 }
-    spaceline-2:      { width: 223,   height: 60 }
+    default:          { width: 34.336,  height: 52 }
+    change-view:      { width: 47.547,  height: 52 }
+    change-view-2:    { width: 68.672,  height: 52 }
+    character-group:  { width: 61.804,  height: 52 }
+    fill:             { width: 47.547,  height: 52 }
+    large:            { width: 47.547,  height: 52 }
+    placeholder:      { width: 34.336,  height: 52 }
+    placeholder-2:    { width: 61.804,  height: 52 }
+    spaceline:        { width: 124.133, height: 52 }
+    spaceline-2:      { width: 192.805, height: 52 }
+    special:          { width: 47.547,  height: 52 }
+    special-2:        { width: 47.547,  height: 52 }
+    special-3:        { width: 47.547,  height: 52 }
+    subtle-highlight: { width: 34.336,  height: 52 }
 
 views:
     base:
         - "; ς ε ρ τ υ θ ι ο π-fill"
         - "α σ δ φ γ η ξ κ λ show_accents"
-        - "Shift_L ζ χ ψ ω β ν μ BackSpace"
+        - "show_upper ζ χ ψ ω β ν μ BackSpace"
         - "show_numbers preferences space . ,-subtle-highlight Return"
     upper:
         - ": € Ε Ρ Τ Υ Θ Ι Ο Π"
         - "Α Σ Δ Φ Γ Η Ξ Κ Λ show_accents"
-        - "Shift_L Ζ Χ Ψ Ω Β Ν Μ BackSpace"
+        - "show_upper Ζ Χ Ψ Ω Β Ν Μ BackSpace"
         - "show_numbers preferences space ! ·-subtle-highlight Return"
     accents:
         - "show_psiliordasiaandvaria show_psiliordasiaandoxia show_psiliordasia show_bariaorperispomeni show_oxia ᾿"
@@ -103,11 +104,11 @@ views:
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers \\ / < > = [ ]  BackSpace"
+        - "show_numbers \\ / < > = [ ] BackSpace"
         - "show_letters preferences space . ,-subtle-highlight Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -115,7 +116,7 @@ buttons:
         outline: "change-view-2"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -213,7 +214,7 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "wide"
+        outline: "special-3"
         icon: "key-enter"
         keysym: "Return"
     .:

data/keyboards/gr+polytonic_wide.yaml

@@ -1,34 +1,35 @@
+# Language: Greek (polytonic)
 # Greek polytonic layout by Antonis Tsolomitis
 # University of the Aegean, Department of Mathematics, atsol@aegean.gr
 # March 2022
 # 
 ---
 outlines:
-    default:          { width: 74,    height: 60 }
-    special:          { width: 74,    height: 60 }
-    placeholder:      { width: 74,    height: 60 }
-    subtle-highlight: { width: 74,    height: 60 }
-    fill:             { width: 97.44, height: 60 }
-    altline:          { width: 97.44, height: 60 }
-    large:            { width: 97.44, height: 60 }
-    change-view:      { width: 97.44, height: 60 }
-    wide:             { width: 114.7, height: 60 }
-    character-group:  { width: 133.2, height: 60 }
-    placeholder-2:    { width: 133.2, height: 60 }
-    change-view-2:    { width: 148,   height: 60 }
-    spaceline:        { width: 279,   height: 60 }
-    spaceline-2:      { width: 427,   height: 60 }
+    default:          { width: 51.968,  height: 42 }
+    change-view:      { width: 69.888,  height: 42 }
+    change-view-2:    { width: 103.936, height: 42 }
+    character-group:  { width: 93.542,  height: 42 }
+    fill:             { width: 69.888,  height: 42 }
+    large:            { width: 69.888,  height: 42 }
+    placeholder:      { width: 51.968,  height: 42 }
+    placeholder-2:    { width: 93.542,  height: 42 }
+    spaceline:        { width: 199.808, height: 42 }
+    spaceline-2:      { width: 303.744, height: 42 }
+    special:          { width: 51.968,  height: 42 }
+    special-2:        { width: 69.888,  height: 42 }
+    special-3:        { width: 77.952,  height: 42 }
+    subtle-highlight: { width: 51.968,  height: 42 }
 
 views:
     base:
         - "; ς ε ρ τ υ θ ι ο π-fill"
         - "α σ δ φ γ η ξ κ λ show_accents"
-        - "Shift_L ζ χ ψ ω β ν μ BackSpace"
+        - "show_upper ζ χ ψ ω β ν μ BackSpace"
         - "show_numbers preferences space . ,-subtle-highlight Return"
     upper:
         - ": € Ε Ρ Τ Υ Θ Ι Ο Π"
         - "Α Σ Δ Φ Γ Η Ξ Κ Λ show_accents"
-        - "Shift_L Ζ Χ Ψ Ω Β Ν Μ BackSpace"
+        - "show_upper Ζ Χ Ψ Ω Β Ν Μ BackSpace"
         - "show_numbers preferences space ! ·-subtle-highlight Return"
     accents:
         - "show_psiliordasiaandvaria show_psiliordasiaandoxia show_psiliordasia show_bariaorperispomeni show_oxia ᾿"
@@ -103,11 +104,11 @@ views:
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers \\ / < > = [ ]  BackSpace"
+        - "show_numbers \\ / < > = [ ] BackSpace"
         - "show_letters preferences space . ,-subtle-highlight Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -115,7 +116,7 @@ buttons:
         outline: "change-view-2"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -213,7 +214,7 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "wide"
+        outline: "special-3"
         icon: "key-enter"
         keysym: "Return"
     .:

data/keyboards/gr.yaml

@@ -1,28 +1,29 @@
+# Language: Greek
 # Greek layout originally 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 }
-    subtle-highlight: { width: 40,    height: 60 }
-    fill:             { width: 52.67, height: 60 }
-    altline:          { width: 52.67, height: 60 }
-    change-view:      { width: 52.67, height: 60 }
-    wide:             { width: 80,    height: 60 }
-    change-view-2:    { width: 80,    height: 60 }
-    spaceline:        { width: 120,   height: 60 }
+    default:          { width: 34.336,  height: 52 }
+    change-view:      { width: 47.547,  height: 52 }
+    change-view-2:    { width: 68.672,  height: 52 }
+    fill:             { width: 47.547,  height: 52 }
+    spaceline:        { width: 103.008, height: 52 }
+    special-2:        { width: 47.547,  height: 52 }
+    special-3:        { width: 68.672,  height: 52 }
+    subtle-highlight: { width: 34.336,  height: 52 }
 
 views:
     base:
         - "; ς ε ρ τ υ θ ι ο π-fill"
         - "α σ δ φ γ η ξ κ λ show_accented"
-        - "Shift_L ζ χ ψ ω β ν μ BackSpace"
+        - "show_upper ζ χ ψ ω β ν μ BackSpace"
         - "show_numbers preferences space . ,-subtle-highlight Return"
     upper:
         - ": ! Ε Ρ Τ Υ Θ Ι Ο Π"
         - "Α Σ Δ Φ Γ Η Ξ Κ Λ show_accented"
-        - "Shift_L Ζ Χ Ψ Ω Β Ν Μ BackSpace"
+        - "show_upper Ζ Χ Ψ Ω Β Ν Μ BackSpace"
         - "show_numbers preferences space ·-subtle-highlight ᾿ Return"
     accented:
         - "ά έ ή ί ϊ ΐ ό ύ ϋ ώ"
@@ -37,10 +38,10 @@ views:
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers \\ / < > = [ ]  BackSpace"
+        - "show_numbers \\ / < > = [ ] BackSpace"
         - "show_letters preferences space . ,-subtle-highlight Return"
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -48,12 +49,12 @@ buttons:
         outline: "change-view-2"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
         action: "show_prefs"
-        outline: "altline"
+        outline: "special-2"
         icon: "keyboard-mode-symbolic"
     show_numbers:
         action:
@@ -81,7 +82,7 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "wide"
+        outline: "special-3"
         icon: "key-enter"
         keysym: "Return"
     .:
@@ -118,4 +119,4 @@ buttons:
     ¶:
         outline: "fill"
     "}":
-        outline: "fill"
+        outline: "fill"

data/keyboards/gr_wide.yaml

@@ -1,26 +1,27 @@
+# Language: Greek
 # Created by Sotiris Papadopoulos, sotirios.papadopoulos@inserm.fr
 ---
 outlines:
-    default:          { width: 73,  height: 60 }
-    special:          { width: 73,  height: 60 }
-    subtle-highlight: { width: 73,  height: 60 }
-    fill:             { width: 110, height: 60 }
-    altline:          { width: 110, height: 60 }
-    change-view:      { width: 110, height: 60 }
-    wide:             { width: 146, height: 60 }
-    change-view-2:    { width: 146, height: 60 }
-    spaceline:        { width: 256, height: 60 }
+    default:          { width: 51.768,  height: 42 }
+    fill:             { width: 77.652,  height: 42 }
+    change-view:      { width: 77.652,  height: 42 }
+    change-view-2:    { width: 103.536, height: 42 }
+    spaceline:        { width: 181.188, height: 42 }
+    special:          { width: 51.768,  height: 42 }
+    special-2:        { width: 77.652,  height: 42 }
+    special-3:        { width: 103.536, height: 42 }
+    subtle-highlight: { width: 51.768,  height: 42 }
 
 views:
     base:
         - "; ς ε ρ τ υ θ ι ο π-fill"
         - "α σ δ φ γ η ξ κ λ show_accented"
-        - "Shift_L ζ χ ψ ω β ν μ BackSpace"
+        - "show_upper ζ χ ψ ω β ν μ BackSpace"
         - "show_numbers preferences space . ,-subtle-highlight Return"
     upper:
         - ": ! Ε Ρ Τ Υ Θ Ι Ο Π"
         - "Α Σ Δ Φ Γ Η Ξ Κ Λ show_accented"
-        - "Shift_L Ζ Χ Ψ Ω Β Ν Μ BackSpace"
+        - "show_upper Ζ Χ Ψ Ω Β Ν Μ BackSpace"
         - "show_numbers preferences space ·-subtle-highlight ᾿ Return"
     accented:
         - "ά έ ή ί ϊ ΐ ό ύ ϋ ώ"
@@ -35,10 +36,10 @@ views:
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers \\ / < > = [ ]  BackSpace"
+        - "show_numbers \\ / < > = [ ] BackSpace"
         - "show_letters preferences space . ,-subtle-highlight Return"
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -46,7 +47,7 @@ buttons:
         outline: "change-view-2"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -79,7 +80,7 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "wide"
+        outline: "special-3"
         icon: "key-enter"
         keysym: "Return"
     .:

data/keyboards/hu.yaml

@@ -1,44 +1,45 @@
+# Language: Hungarian
 # Based on work by: soyer <soyer@irl.hu>
 ---
 outlines:
-    default:       { width: 35.67, height: 52 }
-    altline:       { width: 53,    height: 52 }
-    change-view:   { width: 53,    height: 52 }
-    change-view-2: { width: 62,    height: 52 }
-    spaceline:     { width: 53.5,  height: 52 }
-    special:       { width: 35.67, height: 52 }
-    placeholder:   { width: 35.67, height: 52 }
-    placeholder-2: { width: 17.83, height: 52 }
+    default:       { width: 35.657, height: 52 }
+    change-view:   { width: 53.485, height: 52 }
+    change-view-2: { width: 62.399, height: 52 }
+    placeholder:   { width: 35.657, height: 52 }
+    placeholder-2: { width: 17.828, height: 52 }
+    spaceline:     { width: 53.487, height: 52 }
+    special:       { width: 35.657, height: 52 }
+    special-2:     { width: 53.485, 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"
+        - "show_upper 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"
+        - "show_upper 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"
+        - "show_symbols ; \" ' : = < > BackSpace"
+        - "show_letters show_eschars preferences space , . - Return"
     symbols:
         - "~ ` ´ | · √ µ ÷ × ¶"
         - "© ® £ $ ¥ ^ ° * { }"
-        - "show_numbers   \\ / § π τ [ ]  BackSpace"
-        - "show_letters show_eschars preferences         space        , . - Return"
+        - "show_numbers \\ / § π τ [ ] BackSpace"
+        - "show_letters show_eschars preferences space , . - Return"
     eschars:
         - "-- -- ö ü ó Ö Ü Ó -- --"
         - "-- -- í ő ú Í Ő Ú -- --"
         - "show_numbers --- é á ű É Á Ű --- BackSpace"
-        - "show_letters show_eschars preferences         space       , „ “ Return"
+        - "show_letters show_eschars preferences space , „ “ Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -46,7 +47,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -79,7 +80,7 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "altline"
+        outline: "special-2"
         icon: "key-enter"
         keysym: "Return"
     --:

data/keyboards/hu_wide.yaml

@@ -1,43 +1,44 @@
+# Language: Hungarian
 # Based on work by: soyer <soyer@irl.hu>
 ---
 outlines:
-    default:       { width: 44.75,   height: 42 }
-    altline:       { width: 89.5,    height: 42 }
-    change-view:   { width: 89.5,    height: 42 }
-    change-view-2: { width: 67.125,  height: 42 }
-    spaceline:     { width: 111.875, height: 42 }
-    special:       { width: 44.75,   height: 42 }
-    placeholder:   { width: 44.75,   height: 42 }
+    default:       { width: 44.8, height: 42 }
+    change-view:   { width: 89.6, height: 42 }
+    change-view-2: { width: 67.2, height: 42 }
+    placeholder:   { width: 44.8, height: 42 }
+    spaceline:     { width: 112,  height: 42 }
+    special:       { width: 44.8, height: 42 }
+    special-2:     { width: 89.6, 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"
+        - "show_upper í 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"
+        - "show_upper Í 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"
+        - "-- 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"
+        - "-- ~ ` ´ | · √ µ ÷ × ¶ ²"
+        - "-- © ® £ $ ¥ ^ ° * { } ³"
+        - "show_numbers \\ / § π τ [ ] -- BackSpace"
+        - "show_letters show_eschars preferences space , . - Return"
     eschars:
         - "-- -- -- ö ü ó Ö Ü Ó -- -- --"
         - "-- -- -- í ő ú Í Ő Ú -- -- --"
         - "show_numbers -- é á ű É Á Ű -- BackSpace"
-        - "show_letters show_eschars preferences         space       , „ “ Return"
+        - "show_letters show_eschars preferences space , „ “ Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -45,7 +46,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -78,7 +79,7 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "altline"
+        outline: "special-2"
         icon: "key-enter"
         keysym: "Return"
     --:

data/keyboards/il.yaml

@@ -1,32 +1,32 @@
+# Language: Hebrew
 ---
 outlines:
-    default:          { width: 41,  height: 60 }
-    altline:          { width: 41,  height: 60 }
-    wide:             { width: 82,  height: 60 }
-    change-view:      { width: 82,  height: 60 }
-    spaceline:        { width: 122, height: 60 }
-    special:          { width: 41,  height: 60 }
+    default:     { width: 35.657,  height: 52 }
+    change-view: { width: 71.314,  height: 52 }
+    spaceline:   { width: 106.971, height: 52 }
+    special:     { width: 35.657,  height: 52 }
+    special-2:   { width: 71.314,  height: 52 }
 
 views:
     base:
         - "' - ק  ר א ט ו ן ם פ"
         - "ש ד ג כ ע י ח ל ך ף"
-        - "ז ס ב ה נ מ צ ת ץ  BackSpace"
-        - "show_numbers preferences    ,     space        . Return"
+        - "ז ס ב ה נ מ צ ת ץ 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"
+        - "show_symbols , \" ' : ; ! ? BackSpace"
+        - "show_letters preferences , space . Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € $ ^ ° * { }"
-        - "show_numbers   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences    ,     space        . Return"
+        - "show_numbers \\ / < > = [ ] BackSpace"
+        - "show_letters preferences , space . Return"
 
 buttons:
     BackSpace:
-        outline: "altline"
+        outline: "special"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -52,9 +52,6 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "wide"
+        outline: "special-2"
         icon: "key-enter"
-        keysym: "Return"
-    --:
-        outline: "placeholder"
-        text: ""
+        keysym: "Return"

data/keyboards/il_wide.yaml

@@ -1,32 +1,32 @@
+# Language: Hebrew
 ---
 outlines:
-    default:          { width: 53.75, height: 42 }
-    altline:          { width: 53.75, height: 42 }
-    wide:             { width: 107,   height: 42 }
-    change-view:      { width: 107,   height: 42 }
-    spaceline:        { width: 162,   height: 42 }
-    special:          { width: 53.5,  height: 42 }
+    default:     { width: 53.76,  height: 42 }
+    change-view: { width: 107.52, height: 42 }
+    spaceline:   { width: 161.28, height: 42 }
+    special:     { width: 53.76,  height: 42 }
+    special-2:   { width: 107.52, height: 42 }
 
 views:
     base:
         - "' - ק  ר א ט ו ן ם פ"
         - "ש ד ג כ ע י ח ל ך ף"
-        - "ז ס ב ה נ מ צ ת ץ  BackSpace"
-        - "show_numbers preferences    ,     space        . Return"
+        - "ז ס ב ה נ מ צ ת ץ 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"
+        - "show_symbols , \" ' : ; ! ? BackSpace"
+        - "show_letters preferences , space . Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € $ ^ ° * { }"
-        - "show_numbers   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences    ,     space        . Return"
+        - "show_numbers \\ / < > = [ ] BackSpace"
+        - "show_letters preferences , space . Return"
 
 buttons:
     BackSpace:
-        outline: "altline"
+        outline: "special"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -52,6 +52,6 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "wide"
+        outline: "special-2"
         icon: "key-enter"
         keysym: "Return"

data/keyboards/in+mal.yaml

@@ -0,0 +1,89 @@
+# Language: Malayalam
+---
+outlines:
+    default:     { width: 34.285, height: 52 }
+    change-view: { width: 68.57,  height: 52 }
+    placeholder: { width: 34.285, height: 52 }
+    spaceline:   { width: 274.28, height: 52 }
+    special:     { width: 34.285, height: 52 }
+    special-2:   { width: 68.57,  height: 52 }
+
+views:
+    base:
+        - " ൊ ൧ ൨ ൩ ൪ ൫ ൬ ൭ ൮ ൯ ൦ - ൃ "
+        - " ൗ ൈ ാ ീ ൂ ബ ഹ ഗ ദ ജ ഡ zwj zwnj "
+        - " -- ോ േ ് ി ു പ ര ക ത ച ട zwsp "
+        - "show_upper െ ം മ ന വ ല സ യ -- BackSpace"
+        - "show_numbers preferences space Return"
+    upper:
+        - " ഒ ! @ # ₹ % ^ & ൾ ( ) ഃ ഋ "
+        - " ഔ ഐ ആ ഈ ഊ ഭ ങ ഘ ധ ഝ ഢ ഞ ർ "
+        - " -- ഓ ഏ അ ഇ ഉ ഫ റ ഖ ഥ ഛ ഠ -- "
+        - "show_upper എ ൺ ണ ൻ ഴ ള ശ ഷ ൽ 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:
+    show_upper:
+        action:
+            locking:
+                lock_view: "upper"
+                unlock_view: "base"
+        outline: "change-view"
+        icon: "key-shift"
+    BackSpace:
+        outline: "special-2"
+        icon: "edit-clear-symbolic"
+        action: "erase"
+    preferences:
+        action: "show_prefs"
+        outline: "special"
+        icon: "keyboard-mode-symbolic"
+    show_numbers:
+        action:
+            set_view: "numbers"
+        outline: "change-view"
+        label: "123"
+    show_letters:
+        action:
+            set_view: "base"
+        outline: "change-view"
+        label: "ABC"
+    show_symbols:
+        action:
+            set_view: "symbols"
+        outline: "change-view"
+        label: "*/="
+    space:
+        outline: "spaceline"
+        text: " "
+    Return:
+        outline: "special-2"
+        icon: "key-enter"
+        keysym: "Return"
+    --:
+        outline: "placeholder"
+        text: ""
+# U+200B - zero-width-space
+    zwsp:
+        icon: "zwsp"
+        text: "​"
+# U+200C - zero-width-non-joiner
+    zwnj:
+        icon: "zwnj"
+        text: "‌"
+# U+200D - zero-width-joiner
+    zwj:
+        icon: "zwj"
+        text: "‍"

data/keyboards/in+mal_wide.yaml

@@ -0,0 +1,89 @@
+# Language: Malayalam
+---
+outlines:
+    default:     { width: 51.692,  height: 42 }
+    change-view: { width: 103.384, height: 42 }
+    placeholder: { width: 51.692,  height: 42 }
+    spaceline:   { width: 413.536, height: 42 }
+    special:     { width: 51.692,  height: 42 }
+    special-2:   { width: 103.384, height: 42 }
+
+views:
+    base:
+        - " ൊ ൧ ൨ ൩ ൪ ൫ ൬ ൭ ൮ ൯ ൦ - ൃ "
+        - " ൗ ൈ ാ ീ ൂ ബ ഹ ഗ ദ ജ ഡ zwj zwnj "
+        - " -- ോ േ ് ി ു പ ര ക ത ച ട zwsp "
+        - "show_upper െ ം മ ന വ ല സ യ -- BackSpace"
+        - "show_numbers preferences space Return"
+    upper:
+        - " ഒ ! @ # ₹ % ^ & ൾ ( ) ഃ ഋ "
+        - " ഔ ഐ ആ ഈ ഊ ഭ ങ ഘ ധ ഝ ഢ ഞ ർ "
+        - " -- ഓ ഏ അ ഇ ഉ ഫ റ ഖ ഥ ഛ ഠ -- "
+        - "show_upper എ ൺ ണ ൻ ഴ ള ശ ഷ ൽ 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:
+    show_upper:
+        action:
+            locking:
+                lock_view: "upper"
+                unlock_view: "base"
+        outline: "change-view"
+        icon: "key-shift"
+    BackSpace:
+        outline: "special-2"
+        icon: "edit-clear-symbolic"
+        action: "erase"
+    preferences:
+        action: "show_prefs"
+        outline: "special"
+        icon: "keyboard-mode-symbolic"
+    show_numbers:
+        action:
+            set_view: "numbers"
+        outline: "change-view"
+        label: "123"
+    show_letters:
+        action:
+            set_view: "base"
+        outline: "change-view"
+        label: "ABC"
+    show_symbols:
+        action:
+            set_view: "symbols"
+        outline: "change-view"
+        label: "*/="
+    space:
+        outline: "spaceline"
+        text: " "
+    Return:
+        outline: "special-2"
+        icon: "key-enter"
+        keysym: "Return"
+    --:
+        outline: "placeholder"
+        text: ""
+# U+200B - zero-width-space
+    zwsp:
+        icon: "zwsp"
+        text: "​"
+# U+200C - zero-width-non-joiner
+    zwnj:
+        icon: "zwnj"
+        text: "‌"
+# U+200D - zero-width-joiner
+    zwj:
+        icon: "zwj"
+        text: "‍"

data/keyboards/ir.yaml

@@ -1,38 +1,39 @@
+# Language: Azerbaijani (Iran)
 ---
 outlines:
-    default:       { width: 32.75,  height: 52 }
-    altline:       { width: 48.99,  height: 52 }
-    wide:          { width: 62,     height: 52 }
-    change-view:   { width: 48.99,  height: 52 }
-    change-view-2: { width: 62,     height: 52 }
-    spaceline:     { width: 135,    height: 52 }
-    special:       { width: 35.66,  height: 52 }
-    placeholder:   { width: 32.75,  height: 52 }
+    default:       { width: 32.415, height: 52 }
+    change-view:   { width: 48.622, height: 52 }
+    change-view-2: { width: 64.83,  height: 52 }
+    placeholder:   { width: 32.415, height: 52 }
+    spaceline:     { width: 129.66, height: 52 }
+    special:       { width: 32.415, height: 52 }
+    special-2:     { width: 48.622, height: 52 }
+    special-3:     { width: 64.83,  height: 52 }
 
 views:
     base:
         - "ض ص ث ق ف غ ع ه خ ح ج"
         - "ش س ی ب ل ا ت ن م ک گ"
-        - "Shift_L  ظ ط ز ر ذ د پ و  BackSpace"
-        - "show_numbers preferences         space     zwnj . Return"
+        - "show_upper ظ ط ز ر ذ د پ و BackSpace"
+        - "show_numbers preferences space zwnj . Return"
     upper:
         - "  ْ  ٌ  ٍ  ً  ُ  ِ  َ  ّ # @ چ"
         - "_ ئ ي إ أ آ ة » « : ؛"
-        - "Shift_L ك  ٓ ژ  ٔ ء > < ؟ BackSpace"
-        - "show_numbers preferences         space       ، ! Return"
+        - "show_upper ك  ٓ ژ  ٔ ء > < ؟ BackSpace"
+        - "show_numbers preferences space ، ! Return"
     numbers:
         - "۱ ۲ ۳ ۴ ۵ ۶ ۷ ۸ ۹ ۰ |"
         - "… ٬ ٫ ﷼ ٪ ^ * ) ( − ـ"
         - "show_symbols + - × ÷ = / % -- BackSpace"
-        - "show_letters preferences         space       ، . Return"
+        - "show_letters preferences space ، . Return"
     symbols:
         - "& ` | · • % π τ ¶ [ ]"
         - "© ® £ € ¥ ^ * ° { } --"
         - "show_numbers_from_symbols + - × ÷  = \\ < > BackSpace"
-        - "show_letters preferences         space       ، . Return"
+        - "show_letters preferences space ، . Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -40,7 +41,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -71,7 +72,7 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "wide"
+        outline: "special-3"
         icon: "key-enter"
         keysym: "Return"
     zwnj:

data/keyboards/ir_wide.yaml

@@ -1,39 +1,40 @@
+# Language: Azerbaijani (Iran)
 ---
 outlines:
-    default:       { width: 44.75, height: 42 }
-    altline:       { width: 67.25, height: 42 }
-    wide:          { width: 80,    height: 42 }
-    change-view:   { width: 67.25, height: 42 }
-    change-view-2: { width: 80,    height: 42 }
-    spaceline:     { width: 198,   height: 42 }
-    special:       { width: 44.75, height: 42 }
-    placeholder:   { width: 44.75, height: 42 }
-    fill:          { width: 89.5,  height: 42 }
+    default:       { width: 44.8,  height: 42 }
+    change-view:   { width: 67.2,  height: 42 }
+    change-view-2: { width: 78.4,  height: 42 }
+    fill:          { width: 89.6,  height: 42 }
+    placeholder:   { width: 44.8,  height: 42 }
+    spaceline:     { width: 201.6, height: 42 }
+    special:       { width: 44.8,  height: 42 }
+    special-2:     { width: 67.2,  height: 42 }
+    special-3:     { width: 78.4,  height: 42 }
 
 views:
     base:
         - "ض ص ث ق ف غ ع ه خ ح ج چ"
         - "ش س ی ب ل ا ت ن م ک گ /"
-        - "Shift_L ظ ط ز ر ذ د پ و ، BackSpace"
-        - "show_numbers preferences         space     zwnj ؟ . Return"
+        - "show_upper ظ ط ز ر ذ د پ و ، BackSpace"
+        - "show_numbers preferences space zwnj ؟ . Return"
     upper:
         - " ْ  ٌ  ٍ  ً  ُ  ِ  َ  ّ  ] [ @ #"
         - "ؤ ئ ي إ أ آ ة » « : ؛ \\"
-        - "Shift_L ك  ٓ ژ ٰ  ‌  ٔ  ء  >  <  BackSpace"
-        - "show_numbers preferences         space        ، ؟ ! Return"
+        - "show_upper ك  ٓ ژ ٰ  ‌  ٔ  ء  >  < BackSpace"
+        - "show_numbers preferences space ، ؟ ! Return"
     numbers:
         - "-- ۱ ۲ ۳ ۴ ۵ ۶ ۷ ۸ ۹ ۰ |"
         - "… ٬ ٫ ﷼ ٪ ^ * ° ) ( − _"
-        - "show_symbols + - × ÷ = / % > <  BackSpace"
-        - "show_letters preferences         space        ، ؟ . Return"
+        - "show_symbols + - × ÷ = / % > < BackSpace"
+        - "show_letters preferences space ، ؟ . Return"
     symbols:
         - "-- & ` | · • % π τ ¶ [ ]"
         - "© ® £ € ¥ ^ * ° { } -- --"
         - "show_numbers_from_symbols + - × ÷ = \\ % < > BackSpace"
-        - "show_letters preferences         space        ، ! . Return"
+        - "show_letters preferences space ، ! . Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -41,7 +42,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -72,7 +73,7 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "wide"
+        outline: "special-3"
         icon: "key-enter"
         keysym: "Return"
     zwnj:

data/keyboards/it+fur.yaml

@@ -1,45 +1,45 @@
+# Language: Friulian (Italy)
 # Based on the Friulian layout created by Fabio Tomat
 # 14 october 2020
 ---
 outlines:
-    default:       { width: 35.67, height: 52 }
-    altline:       { width: 52.75, height: 52 }
-    wide:          { width: 62,    height: 52 }
-    change-view:   { width: 52.75, height: 52 }
-    change-view-2: { width: 62,    height: 52 }
-    spaceline:     { width: 91.08, height: 52 }
-    special:       { width: 35.67, height: 52 }
-    placeholder:   { width: 35.67, height: 52 }
+    default:       { width: 35.657, height: 52 }
+    change-view:   { width: 53.485, height: 52 }
+    change-view-2: { width: 62.399, height: 52 }
+    spaceline:     { width: 89.144, height: 52 }
+    special:       { width: 35.657, height: 52 }
+    special-2:     { width: 53.485, height: 52 }
+    special-3:     { width: 62.399, 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"
+        - "show_upper 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"
+        - "show_upper Z X C V B N M BackSpace"
+        - "show_numbers show_eschars preferences space “ ” Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # € % & - _ + ( )"
-        - "show_symbols   , \" ' : ; ! =  BackSpace"
-        - "show_letters show_eschars preferences         space        ? . Return"
+        - "show_symbols , \" ' : ; ! = BackSpace"
+        - "show_letters show_eschars preferences space ? . Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ $ ¥ ^ ° * { }"
-        - "show_numbers   \\ / < > = [ ]  BackSpace"
-        - "show_letters show_eschars preferences         space        ? . Return"
+        - "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:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -47,7 +47,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -80,9 +80,6 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "altline"
+        outline: "special-2"
         icon: "key-enter"
-        keysym: "Return"
-    --:
-        outline: "placeholder"
-        text: ""
+        keysym: "Return"

data/keyboards/it+fur_wide.yaml

@@ -1,45 +1,43 @@
+# Language: Friulian (Italy)
 # Based on the Friulian layout created by Fabio Tomat
 # 14 october 2020
 ---
 outlines:
-    default:       { width: 53.5,  height: 42 }
-    altline:       { width: 80.25, height: 42 }
-    wide:          { width: 91.26, height: 42 }
-    change-view:   { width: 80.25, height: 42 }
-    change-view-2: { width: 91.26, height: 42 }
-    spaceline:     { width: 134,   height: 42 }
-    special:       { width: 53.5,  height: 42 }
-    placeholder:   { width: 53.5,  height: 42 }
+    default:       { width: 53.76, height: 42 }
+    change-view:   { width: 80.64, height: 42 }
+    spaceline:     { width: 134.4, height: 42 }
+    special:       { width: 53.76, height: 42 }
+    special-2:     { width: 80.64, 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"
+        - "show_upper 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"
+        - "show_upper Z X C V B N M BackSpace"
+        - "show_numbers show_eschars preferences space “ ” Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # € % & - _ + ( )"
-        - "show_symbols   , \" ' : ; ! =  BackSpace"
-        - "show_letters show_eschars preferences         space        ? . Return"
+        - "show_symbols , \" ' : ; ! = BackSpace"
+        - "show_letters show_eschars preferences space ? . Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ $ ¥ ^ ° * { }"
-        - "show_numbers   \\ / < > = [ ]  BackSpace"
-        - "show_letters show_eschars preferences         space        ? . Return"
+        - "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:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -47,7 +45,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -80,9 +78,6 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "altline"
+        outline: "special-2"
         icon: "key-enter"
         keysym: "Return"
-    --:
-        outline: "placeholder"
-        text: ""

data/keyboards/it.yaml

@@ -1,45 +1,45 @@
+# Language: Italian
 # Italian layout created by Antonio Pandolfo
 # 03 october 2019
 ---
 outlines:
-    default:       { width: 35.67, height: 52 }
-    altline:       { width: 52.75, height: 52 }
-    wide:          { width: 62,    height: 52 }
-    change-view:   { width: 52.75, height: 52 }
-    change-view-2: { width: 62,    height: 52 }
-    spaceline:     { width: 91.08, height: 52 }
-    special:       { width: 35.67, height: 52 }
-    placeholder:   { width: 35.67, height: 52 }
+    default:       { width: 35.657, height: 52 }
+    change-view:   { width: 53.485, height: 52 }
+    change-view-2: { width: 62.399, height: 52 }
+    spaceline:     { width: 89.144, height: 52 }
+    special:       { width: 35.657, height: 52 }
+    special-2:     { width: 53.485, height: 52 }
+    special-3:     { width: 62.399, 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"
+        - "show_upper 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"
+        - "show_upper Z X C V B N M BackSpace"
+        - "show_numbers show_eschars preferences space ? . Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # € % & - _ + ( )"
-        - "show_symbols   , \" ' : ; ! ?  BackSpace"
-        - "show_letters show_eschars preferences         space        ? . Return"
+        - "show_symbols , \" ' : ; ! ? BackSpace"
+        - "show_letters show_eschars preferences space ? . Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ $ ¥ ^ ° * { }"
-        - "show_numbers   \\ / < > = [ ]  BackSpace"
-        - "show_letters show_eschars preferences         space        ? . Return"
+        - "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:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -47,7 +47,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -80,9 +80,6 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "altline"
+        outline: "special-2"
         icon: "key-enter"
         keysym: "Return"
-    --:
-        outline: "placeholder"
-        text: ""

data/keyboards/it_wide.yaml

@@ -1,45 +1,43 @@
+# Language: Italian
 # Italian layout created by Antonio Pandolfo
 # 03 october 2019
 ---
 outlines:
-    default:       { width: 53.5,  height: 42 }
-    altline:       { width: 80.25, height: 42 }
-    wide:          { width: 91.26, height: 42 }
-    change-view:   { width: 80.25, height: 42 }
-    change-view-2: { width: 91.26, height: 42 }
-    spaceline:     { width: 134,   height: 42 }
-    special:       { width: 53.5,  height: 42 }
-    placeholder:   { width: 53.5,  height: 42 }
+    default:       { width: 53.76, height: 42 }
+    change-view:   { width: 80.64, height: 42 }
+    spaceline:     { width: 134.4, height: 42 }
+    special:       { width: 53.76, height: 42 }
+    special-2:     { width: 80.64, 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"
+        - "show_upper 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"
+        - "show_upper Z X C V B N M BackSpace"
+        - "show_numbers show_eschars preferences space ? . Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # € % & - _ + ( )"
-        - "show_symbols   , \" ' : ; ! ?  BackSpace"
-        - "show_letters show_eschars preferences         space        ? . Return"
+        - "show_symbols , \" ' : ; ! ? BackSpace"
+        - "show_letters show_eschars preferences space ? . Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ $ ¥ ^ ° * { }"
-        - "show_numbers   \\ / < > = [ ]  BackSpace"
-        - "show_letters show_eschars preferences         space        ? . Return"
+        - "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:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -47,7 +45,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -80,9 +78,6 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "altline"
+        outline: "special-2"
         icon: "key-enter"
         keysym: "Return"
-    --:
-        outline: "placeholder"
-        text: ""

data/keyboards/jp+kana.yaml

@@ -1,12 +1,12 @@
+# Language: Japanese (Kana)
 # Based on work by: Mark Müller <markmueller86@gmail.com>
 ---
 outlines:
-    default:         { width: 71.33, height: 52 }
-    wide:            { width: 71.33, height: 52 }
-    character-group: { width: 71.33, height: 52 }
-    change-view:     { width: 71.33, height: 52 }
-    special:         { width: 71.33, height: 52 }
-    placeholder:     { width: 71.33, height: 52 }
+    default:         { width: 71.314, height: 52 }
+    change-view:     { width: 71.314, height: 52 }
+    character-group: { width: 71.314, height: 52 }
+    placeholder:     { width: 71.314, height: 52 }
+    special:         { width: 71.314, height: 52 }
 
 views:
     base: # hiragana
@@ -229,19 +229,19 @@ views:
 buttons:
     # following 4 buttons use the corresponding xkb name as keysym
     BackSpace:
-        outline: "wide"
+        outline: "special"
         icon: "edit-clear-symbolic"
         action: "erase"
     Return:
-        outline: "wide"
+        outline: "special"
         icon: "key-enter"
         keysym: "Return"
     Left:
-        outline: "wide"
+        outline: "special"
         label: "←"
         keysym: "Left"
     Right:
-        outline: "wide"
+        outline: "special"
         label: "→"
         keysym: "Right"
     # special button "preferences" is handled in the code

data/keyboards/jp+kana_wide.yaml

@@ -1,12 +1,12 @@
+# Language: Japanese (Kana)
 # Based on work by: Mark Müller <markmueller86@gmail.com>
 ---
 outlines:
     default:         { width: 84, height: 42 }
-    wide:            { width: 84, height: 42 }
-    character-group: { width: 84, height: 42 }
     change-view:     { width: 84, height: 42 }
-    special:         { width: 84, height: 42 }
+    character-group: { width: 84, height: 42 }
     placeholder:     { width: 84, height: 42 }
+    special:         { width: 84, height: 42 }
 
 views:
     base: # hiragana
@@ -229,19 +229,19 @@ views:
 buttons:
     # following 4 buttons use the corresponding xkb name as keysym
     BackSpace:
-        outline: "wide"
+        outline: "special"
         icon: "edit-clear-symbolic"
         action: "erase"
     Return:
-        outline: "wide"
+        outline: "special"
         icon: "key-enter"
         keysym: "Return"
     Left:
-        outline: "wide"
+        outline: "special"
         label: "←"
         keysym: "Left"
     Right:
-        outline: "wide"
+        outline: "special"
         label: "→"
         keysym: "Right"
     # special button "preferences" is handled in the code

data/keyboards/jp.yaml

@@ -0,0 +1,790 @@
+# Language: Japanese
+---
+outlines:
+    default:       { width: 37.142, height: 52 }
+    default-2:     { width: 44.570, height: 52 }
+    change-view:   { width: 34.284, height: 52 }
+    change-view-2: { width: 66.855, height: 52 }
+    change-view-3: { width: 74.284, height: 52 }
+    placeholder:   { width: 44.570, height: 52 }
+    placeholder-2: { width: 74.284, height: 52 }
+    spaceline:     { width: 74.284, height: 52 }
+    special:       { width: 34.284, height: 52 }
+    special-2:     { width: 37.142, height: 52 }
+    special-3:     { width: 66.855, height: 52 }
+    thin:          { width: 34.284, height: 52 }
+
+views:
+    base:
+        - "ぬ ふ あ う え お や ゆ よ わ ほ へ"
+        - "た て い す か ん な に ら せ  ゙  ゚ "
+        - "ち と し は き く ま の り れ け む"
+        - "show_hiragana_upper つ さ そ ひ こ み も ね る め ろ BackSpace"
+        - "show_numbers show_romaji preferences fullwidth-space --- show_katakana Return"
+    hiragana_upper:
+        - "ぬ ふ ぁ ぅ ぇ ぉ ゃ ゅ ょ を ほ ゑ"
+        - "た て ぃ す ヵ ん な に ら せ  ゙ 「"
+        - "ち と し ゎ き く ま の り れ ヶ 」"
+        - "show_hiragana_upper っ さ そ ゐ こ み も 、 。 ・ ー BackSpace"
+        - "show_numbers show_romaji preferences fullwidth-space --- show_katakana Return"
+    katakana:
+        - "ヌ フ ア ウ エ オ ヤ ユ ヨ ワ ホ ヘ"
+        - "タ テ イ ス カ ン ナ ニ ラ セ  ゙  ゚ "
+        - "チ ト シ ハ キ ク マ ノ リ レ ケ ム"
+        - "show_katakana_upper ツ サ ソ ヒ コ ミ モ ネ ル メ ロ BackSpace"
+        - "show_numbers show_romaji preferences fullwidth-space katakana_width_toggle_half show_hiragana Return"
+    katakana_upper:
+        - "ヌ フ ァ ゥ ェ ォ ャ ュ ョ ヲ ホ ヱ"
+        - "タ テ ィ ス ヵ ン ナ ニ ラ セ  ゙ 「"
+        - "チ ト シ ハ キ ク マ ノ リ レ ケ 」"
+        - "show_katakana_upper ッ サ ソ ヰ コ ミ モ 、 。 ・ ー BackSpace"
+        - "show_numbers show_romaji preferences fullwidth-space katakana_width_toggle_half show_hiragana Return"
+    katakana_halfwidth:
+        - "ﾇ ﾌ ｱ ｳ ｴ ｵ ﾔ ﾕ ﾖ ﾜ ﾎ ﾍ"
+        - "ﾀ ﾃ ｲ ｽ ｶ ﾝ ﾅ ﾆ ﾗ ｾ  ゙  ゚ "
+        - "ﾁ ﾄ ｼ ﾊ ｷ ｸ ﾏ ﾉ ﾘ ﾚ ｹ ﾑ"
+        - "show_katakana_halfwidth_upper ﾂ ｻ ｿ ﾋ ｺ ﾐ ﾓ ﾈ ﾙ ﾒ ﾛ BackSpace"
+        - "show_numbers show_romaji preferences space katakana_halfwidth_width_toggle_full show_hiragana Return"
+    katakana_halfwidth_upper:
+        - "ﾇ ﾌ ｧ ｩ ｪ ｫ ｬ ｭ ｮ ｦ ｪ ﾍ"
+        - "ﾀ ﾃ ｨ ｽ ｶ ﾝ ﾅ ﾆ ﾗ ｾ  ゙ ｢"
+        - "ﾁ ﾄ ｼ ﾜ ｷ ｸ ﾏ ﾉ ﾘ ﾚ ｹ ｣"
+        - "show_katakana_halfwidth_upper ｯ ｻ ｿ ﾋ ｺ ﾐ ﾓ ､ ｡ ･ ｰ BackSpace"
+        - "show_numbers show_romaji preferences space katakana_halfwidth_width_toggle_full show_hiragana Return"
+    numbers:
+        - " … -- -- -- -- -- -- -- ² ³"
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "@ # ¥ % & - _ + ( )"
+        - "show_symbols ; \" ' : = < > BackSpace-wide"
+        - "show_hiragana show_romaji preferences space numbers_width_toggle_full , . Return"
+    numbers_fullwidth:
+        - "゠ -- -- -- -- -- -- -- -- --"
+        - "１ ２ ３ ４ ５ ６ ７ ８ ９ ０"
+        - "＠ ＃ ￥ ％ ＆ － ＿ ＋ （ ）"
+        - "show_symbols_fullwidth ； ＂ ＇ ： ＝ ＜ ＞ BackSpace-wide"
+        - "show_hiragana show_romaji_fullwidth preferences fullwidth-space numbers_fullwidth_width_toggle_half ， ． Return"
+    symbols:
+        - "ヽ ♪ -- -- -- -- -- ヿ 【 】"
+        - "~ ` ´ | · √ µ ÷ × ¶"
+        - "© ® £ $ € ^ ° * { }"
+        - "show_numbers_from_symbols \\ / § π τ [ ] BackSpace-wide"
+        - "show_hiragana show_romaji preferences space symbols_width_toggle_full ! ? Return"
+    symbols_fullwidth:
+        - "￣ ￤ -- -- -- -- -- ￢ ｟ ｠"
+        - "～ ｀ -- ｜ -- -- -- -- -- --"
+        - "-- -- ￡ ＄ -- ＾ -- ＊ ｛ ｝"
+        - "show_numbers_fullwidth_from_symbols ＼ ／ -- -- -- ［ ］ BackSpace-wide"
+        - "show_hiragana show_romaji_fullwidth preferences fullwidth-space symbols_fullwidth_width_toggle_half ！ ？ Return"
+    romaji:
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "q w e r t y u i o p"
+        - "a s d f g h j k l --"
+        - "show_romaji_upper z x c v b n m BackSpace-wide"
+        - "show_numbers show_hiragana preferences space romaji_width_toggle_full , . Return"
+    romaji_upper:
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "Q W E R T Y U I O P"
+        - "A S D F G H J K L --"
+        - "show_romaji_upper Z X C V B N M BackSpace-wide"
+        - "show_numbers show_hiragana preferences space romaji_width_toggle_full ! ? Return"
+    romaji_fullwidth:
+        - "１ ２ ３ ４ ５ ６ ７ ８ ９ ０"
+        - "ｑ ｗ ｅ ｒ ｔ ｙ ｕ ｉ ｏ ｐ"
+        - "ａ ｓ ｄ ｆ ｇ ｈ ｊ ｋ ｌ --"
+        - "show_romaji_fullwidth_upper ｚ ｘ ｃ ｖ ｂ ｎ ｍ BackSpace-wide"
+        - "show_numbers_fullwidth show_hiragana preferences fullwidth-space romaji_fullwidth_width_toggle_half ， ． Return"
+    romaji_fullwidth_upper:
+        - "１ ２ ３ ４ ５ ６ ７ ８ ９ ０"
+        - "Ｑ Ｗ Ｅ Ｒ Ｔ Ｙ Ｕ Ｉ Ｏ Ｐ"
+        - "Ａ Ｓ Ｄ Ｆ Ｇ Ｈ Ｊ Ｋ Ｌ --"
+        - "show_romaji_fullwidth_upper Ｚ Ｘ Ｃ Ｖ Ｂ Ｎ Ｍ BackSpace-wide"
+        - "show_numbers_fullwidth show_hiragana preferences fullwidth-space romaji_fullwidth_width_toggle_half ！ ？ Return"
+
+
+#              k       s       t       n       h       m       y       r       w
+#a 	あア 	かカ 	さサ 	たタ 	なナ 	はハ 	まマ 	やヤ	らラ 	わワ
+#i 	いイ 	きキ 	しシ 	ちチ 	にニ 	ひヒ 	みミ 	※	りリ 	ゐヰ
+#u 	うウ 	くク 	すス 	つツ 	ぬヌ 	ふフ 	むム 	ゆユ	るル 	※
+#e 	えエ 	けケ 	せセ 	てテ 	ねネ 	へヘ 	めメ 	※	れレ 	ゑヱ
+#o 	おオ 	こコ 	そソ 	とト 	のノ 	ほホ 	もモ 	よヨ	ろロ 	をヲ
+
+#      g       z       d       b       p       n
+#a 	が ガ 	ざ ザ 	だ ダ 	ば バ 	ぱ パ	ん ン
+#i 	ぎ ギ 	じ ジ 	ぢ ヂ 	び ビ 	ぴ ピ
+#u 	ぐ グ 	ず ズ 	づ ヅ 	ぶ ブ 	ぷ プ
+#e 	げ ゲ 	ぜ ゼ 	で デ 	べ ベ 	ぺ ペ
+#o 	ご ゴ 	ぞ ゾ 	ど ド 	ぼ ボ 	ぽ ポ
+
+
+buttons:
+    BackSpace:
+        outline: "special"
+        icon: "edit-clear-symbolic"
+        action: "erase"
+    BackSpace-wide:
+        outline: "special-3"
+        icon: "edit-clear-symbolic"
+        action: "erase"
+    preferences:
+        action: "show_prefs"
+        outline: "special-2"
+        icon: "keyboard-mode-symbolic"
+    show_numbers:
+        action:
+            set_view: "numbers"
+        outline: "change-view-3"
+        label: "123"
+    show_numbers_from_symbols:
+        action:
+            set_view: "numbers"
+        outline: "change-view-2"
+        label: "123"
+    numbers_fullwidth_width_toggle_half:
+        action:
+            set_view: "numbers"
+        outline: "change-view-3"
+        label: "半／全"
+    show_symbols:
+        action:
+            set_view: "symbols"
+        outline: "change-view-2"
+        label: "*/="
+    symbols_fullwidth_width_toggle_half:
+        action:
+            set_view: "symbols"
+        outline: "change-view-3"
+        label: "半／全"
+    show_hiragana:
+        action:
+            set_view: "base"
+        outline: "change-view-3"
+        label: "あいう"
+    show_hiragana_upper:
+        action:
+            locking:
+                lock_view: "hiragana_upper"
+                unlock_view: "base"
+        outline: "change-view"
+        icon: "key-shift"
+    show_katakana:
+        action:
+            set_view: "katakana"
+        outline: "change-view-3"
+        label: "アイウ"
+    katakana_halfwidth_width_toggle_full:
+        action:
+            set_view: "katakana"
+        outline: "change-view-3"
+        label: "半／全"
+    show_katakana_upper:
+        action:
+            locking:
+                lock_view: "katakana_upper"
+                unlock_view: "katakana"
+        outline: "change-view"
+        icon: "key-shift"
+    show_romaji:
+        action:
+            set_view: "romaji"
+        outline: "change-view-3"
+        label: "ABC"
+    romaji_fullwidth_width_toggle_half:
+        action:
+            set_view: "romaji"
+        outline: "change-view-3"
+        label: "半／全"
+    show_romaji_upper:
+        action:
+            locking:
+                lock_view: "romaji_upper"
+                unlock_view: "romaji"
+        outline: "change-view-2"
+        icon: "key-shift"
+    katakana_width_toggle_half:
+        action:
+            set_view: "katakana_halfwidth"
+        outline: "change-view-3"
+        label: "半／全"
+    show_katakana_halfwidth_upper:
+        action:
+            locking:
+                lock_view: "katakana_halfwidth_upper"
+                unlock_view: "katakana_halfwidth"
+        outline: "change-view"
+        icon: "key-shift"
+    show_romaji_fullwidth:
+        action:
+            set_view: "romaji_fullwidth"
+        outline: "change-view-3"
+        label: "ＡＢＣ"
+    romaji_width_toggle_full:
+        action:
+            set_view: "romaji_fullwidth"
+        outline: "change-view-3"
+        label: "半／全"
+    show_romaji_fullwidth_upper:
+        action:
+            locking:
+                lock_view: "romaji_fullwidth_upper"
+                unlock_view: "romaji_fullwidth"
+        outline: "change-view-2"
+        icon: "key-shift"
+    show_numbers_fullwidth:
+        action:
+            set_view: "numbers_fullwidth"
+        outline: "change-view-3"
+        label: "１２３"
+    show_numbers_fullwidth_from_symbols:
+        action:
+            set_view: "numbers_fullwidth"
+        outline: "change-view-2"
+        label: "１２３"
+    numbers_width_toggle_full:
+        action:
+            set_view: "numbers_fullwidth"
+        outline: "change-view-3"
+        label: "半／全"
+    show_symbols_fullwidth:
+        action:
+            set_view: "symbols_fullwidth"
+        outline: "change-view-2"
+        label: "＊／＝"
+    symbols_width_toggle_full:
+        action:
+            set_view: "symbols_fullwidth"
+        outline: "change-view-3"
+        label: "半／全"
+    space:
+        outline: "spaceline"
+        text: " "
+        label: "␣"
+    fullwidth-space:
+        outline: "spaceline"
+        text: "　"
+        label: "␣"
+    Return:
+        outline: "special-2"
+        icon: "key-enter"
+        keysym: "Return"
+    --:
+        outline: "placeholder"
+        text: ""
+    ---:
+        outline: "placeholder-2"
+        text: ""
+    つ:
+        outline: "thin"
+    さ:
+        outline: "thin"
+    そ:
+        outline: "thin"
+    ひ:
+        outline: "thin"
+    こ:
+        outline: "thin"
+    み:
+        outline: "thin"
+    も:
+        outline: "thin"
+    ね:
+        outline: "thin"
+    る:
+        outline: "thin"
+    め:
+        outline: "thin"
+    ろ:
+        outline: "thin"
+    っ:
+        outline: "thin"
+    ゐ:
+        outline: "thin"
+    、:
+        outline: "thin"
+    。:
+        outline: "thin"
+    ・:
+        outline: "thin"
+    ー:
+        outline: "thin"
+    ツ:
+        outline: "thin"
+    サ:
+        outline: "thin"
+    ソ:
+        outline: "thin"
+    ヒ:
+        outline: "thin"
+    コ:
+        outline: "thin"
+    ミ:
+        outline: "thin"
+    モ:
+        outline: "thin"
+    ネ:
+        outline: "thin"
+    ル:
+        outline: "thin"
+    メ:
+        outline: "thin"
+    ロ:
+        outline: "thin"
+    ッ:
+        outline: "thin"
+    ﾂ:
+        outline: "thin"
+    ｻ:
+        outline: "thin"
+    ｿ:
+        outline: "thin"
+    ヰ:
+        outline: "thin"
+    ﾋ:
+        outline: "thin"
+    ｺ:
+        outline: "thin"
+    ﾐ:
+        outline: "thin"
+    ﾓ:
+        outline: "thin"
+    ﾈ:
+        outline: "thin"
+    ﾙ:
+        outline: "thin"
+    ﾒ:
+        outline: "thin"
+    ﾛ:
+        outline: "thin"
+    ｯ:
+        outline: "thin"
+    ､:
+        outline: "thin"
+    ｡:
+        outline: "thin"
+    ･:
+        outline: "thin"
+    ｰ:
+        outline: "thin"
+    …:
+        outline: "default-2"
+    1:
+        outline: "default-2"
+    2:
+        outline: "default-2"
+    3:
+        outline: "default-2"
+    4:
+        outline: "default-2"
+    5:
+        outline: "default-2"
+    6:
+        outline: "default-2"
+    7:
+        outline: "default-2"
+    8:
+        outline: "default-2"
+    9:
+        outline: "default-2"
+    0:
+        outline: "default-2"
+    ²:
+        outline: "default-2"
+    ³:
+        outline: "default-2"
+    "@":
+        outline: "default-2"
+    "#":
+        outline: "default-2"
+    ¥:
+        outline: "default-2"
+    "%":
+        outline: "default-2"
+    "&":
+        outline: "default-2"
+    -:
+        outline: "default-2"
+    _:
+        outline: "default-2"
+    +:
+        outline: "default-2"
+    (:
+        outline: "default-2"
+    ):
+        outline: "default-2"
+    ;:
+        outline: "default-2"
+    "\"":
+        outline: "default-2"
+    "'":
+        outline: "default-2"
+    ":":
+        outline: "default-2"
+    =:
+        outline: "default-2"
+    <:
+        outline: "default-2"
+    ">":
+        outline: "default-2"
+    a:
+        outline: "default-2"
+    b:
+        outline: "default-2"
+    c:
+        outline: "default-2"
+    d:
+        outline: "default-2"
+    e:
+        outline: "default-2"
+    f:
+        outline: "default-2"
+    g:
+        outline: "default-2"
+    h:
+        outline: "default-2"
+    i:
+        outline: "default-2"
+    j:
+        outline: "default-2"
+    k:
+        outline: "default-2"
+    l:
+        outline: "default-2"
+    m:
+        outline: "default-2"
+    n:
+        outline: "default-2"
+    o:
+        outline: "default-2"
+    p:
+        outline: "default-2"
+    q:
+        outline: "default-2"
+    r:
+        outline: "default-2"
+    s:
+        outline: "default-2"
+    t:
+        outline: "default-2"
+    u:
+        outline: "default-2"
+    v:
+        outline: "default-2"
+    w:
+        outline: "default-2"
+    x:
+        outline: "default-2"
+    y:
+        outline: "default-2"
+    z:
+        outline: "default-2"
+    A:
+        outline: "default-2"
+    B:
+        outline: "default-2"
+    C:
+        outline: "default-2"
+    D:
+        outline: "default-2"
+    E:
+        outline: "default-2"
+    F:
+        outline: "default-2"
+    G:
+        outline: "default-2"
+    H:
+        outline: "default-2"
+    I:
+        outline: "default-2"
+    J:
+        outline: "default-2"
+    K:
+        outline: "default-2"
+    L:
+        outline: "default-2"
+    M:
+        outline: "default-2"
+    N:
+        outline: "default-2"
+    O:
+        outline: "default-2"
+    P:
+        outline: "default-2"
+    Q:
+        outline: "default-2"
+    R:
+        outline: "default-2"
+    S:
+        outline: "default-2"
+    T:
+        outline: "default-2"
+    U:
+        outline: "default-2"
+    V:
+        outline: "default-2"
+    W:
+        outline: "default-2"
+    X:
+        outline: "default-2"
+    Y:
+        outline: "default-2"
+    Z:
+        outline: "default-2"
+    １:
+        outline: "default-2"
+    ２:
+        outline: "default-2"
+    ３:
+        outline: "default-2"
+    ４:
+        outline: "default-2"
+    ５:
+        outline: "default-2"
+    ６:
+        outline: "default-2"
+    ７:
+        outline: "default-2"
+    ８:
+        outline: "default-2"
+    ９:
+        outline: "default-2"
+    ０:
+        outline: "default-2"
+    ａ:
+        outline: "default-2"
+    ｂ:
+        outline: "default-2"
+    ｃ:
+        outline: "default-2"
+    ｄ:
+        outline: "default-2"
+    ｅ:
+        outline: "default-2"
+    ｆ:
+        outline: "default-2"
+    ｇ:
+        outline: "default-2"
+    ｈ:
+        outline: "default-2"
+    ｉ:
+        outline: "default-2"
+    ｊ:
+        outline: "default-2"
+    ｋ:
+        outline: "default-2"
+    ｌ:
+        outline: "default-2"
+    ｍ:
+        outline: "default-2"
+    ｎ:
+        outline: "default-2"
+    ｏ:
+        outline: "default-2"
+    ｐ:
+        outline: "default-2"
+    ｑ:
+        outline: "default-2"
+    ｒ:
+        outline: "default-2"
+    ｓ:
+        outline: "default-2"
+    ｔ:
+        outline: "default-2"
+    ｕ:
+        outline: "default-2"
+    ｖ:
+        outline: "default-2"
+    ｗ:
+        outline: "default-2"
+    ｘ:
+        outline: "default-2"
+    ｙ:
+        outline: "default-2"
+    ｚ:
+        outline: "default-2"
+    Ａ:
+        outline: "default-2"
+    Ｂ:
+        outline: "default-2"
+    Ｃ:
+        outline: "default-2"
+    Ｄ:
+        outline: "default-2"
+    Ｅ:
+        outline: "default-2"
+    Ｆ:
+        outline: "default-2"
+    Ｇ:
+        outline: "default-2"
+    Ｈ:
+        outline: "default-2"
+    Ｉ:
+        outline: "default-2"
+    Ｊ:
+        outline: "default-2"
+    Ｋ:
+        outline: "default-2"
+    Ｌ:
+        outline: "default-2"
+    Ｍ:
+        outline: "default-2"
+    Ｎ:
+        outline: "default-2"
+    Ｏ:
+        outline: "default-2"
+    Ｐ:
+        outline: "default-2"
+    Ｑ:
+        outline: "default-2"
+    Ｒ:
+        outline: "default-2"
+    Ｓ:
+        outline: "default-2"
+    Ｔ:
+        outline: "default-2"
+    Ｕ:
+        outline: "default-2"
+    Ｖ:
+        outline: "default-2"
+    Ｗ:
+        outline: "default-2"
+    Ｘ:
+        outline: "default-2"
+    Ｙ:
+        outline: "default-2"
+    Ｚ:
+        outline: "default-2"
+    ヽ:
+        outline: "default-2"
+    ♪:
+        outline: "default-2"
+    ヿ:
+        outline: "default-2"
+    【:
+        outline: "default-2"
+    】:
+        outline: "default-2"
+    ~:
+        outline: "default-2"
+    "`":
+        outline: "default-2"
+    ´:
+        outline: "default-2"
+    "|":
+        outline: "default-2"
+    ·:
+        outline: "default-2"
+    √:
+        outline: "default-2"
+    µ:
+        outline: "default-2"
+    ÷:
+        outline: "default-2"
+    ×:
+        outline: "default-2"
+    ¶:
+        outline: "default-2"
+    ©:
+        outline: "default-2"
+    ®:
+        outline: "default-2"
+    £:
+        outline: "default-2"
+    $:
+        outline: "default-2"
+    €:
+        outline: "default-2"
+    ^:
+        outline: "default-2"
+    °:
+        outline: "default-2"
+    "*":
+        outline: "default-2"
+    "{":
+        outline: "default-2"
+    "}":
+        outline: "default-2"
+    "\\":
+        outline: "default-2"
+    /:
+        outline: "default-2"
+    §:
+        outline: "default-2"
+    π:
+        outline: "default-2"
+    τ:
+        outline: "default-2"
+    "[":
+        outline: "default-2"
+    "]":
+        outline: "default-2"
+    ゠:
+        outline: "default-2"
+    ＠:
+        outline: "default-2"
+    ＃:
+        outline: "default-2"
+    ￥:
+        outline: "default-2"
+    ％:
+        outline: "default-2"
+    ＆:
+        outline: "default-2"
+    －:
+        outline: "default-2"
+    ＿:
+        outline: "default-2"
+    ＋:
+        outline: "default-2"
+    （:
+        outline: "default-2"
+    ）:
+        outline: "default-2"
+    ；:
+        outline: "default-2"
+    ＂:
+        outline: "default-2"
+    ＇:
+        outline: "default-2"
+    ：:
+        outline: "default-2"
+    ＝:
+        outline: "default-2"
+    ＜:
+        outline: "default-2"
+    ＞:
+        outline: "default-2"
+    ￣:
+        outline: "default-2"
+    ￤:
+        outline: "default-2"
+    ￢:
+        outline: "default-2"
+    ｟:
+        outline: "default-2"
+    ｠:
+        outline: "default-2"
+    ～:
+        outline: "default-2"
+    ｀:
+        outline: "default-2"
+    ｜:
+        outline: "default-2"
+    ￡:
+        outline: "default-2"
+    ＄:
+        outline: "default-2"
+    ＾:
+        outline: "default-2"
+    ＊:
+        outline: "default-2"
+    ｛:
+        outline: "default-2"
+    ｝:
+        outline: "default-2"
+    ＼:
+        outline: "default-2"
+    ／:
+        outline: "default-2"
+    ［:
+        outline: "default-2"
+    ］:
+        outline: "default-2"

data/keyboards/jp_wide.yaml

@@ -0,0 +1,790 @@
+# Language: Japanese
+---
+outlines:
+    default:       { width: 56,     height: 42 }
+    default-2:     { width: 67.2,   height: 42 }
+    change-view:   { width: 51.692, height: 42 }
+    change-view-2: { width: 100.8,  height: 42 }
+    change-view-3: { width: 112,    height: 42 }
+    placeholder:   { width: 67.2,   height: 42 }
+    placeholder-2: { width: 112,    height: 42 }
+    spaceline:     { width: 112,    height: 42 }
+    special:       { width: 51.692, height: 42 }
+    special-2:     { width: 56,     height: 42 }
+    special-3:     { width: 100.8,  height: 42 }
+    thin:          { width: 51.692, height: 42 }
+
+views:
+    base:
+        - "ぬ ふ あ う え お や ゆ よ わ ほ へ"
+        - "た て い す か ん な に ら せ  ゙  ゚ "
+        - "ち と し は き く ま の り れ け む"
+        - "show_hiragana_upper つ さ そ ひ こ み も ね る め ろ BackSpace"
+        - "show_numbers show_romaji preferences fullwidth-space --- show_katakana Return"
+    hiragana_upper:
+        - "ぬ ふ ぁ ぅ ぇ ぉ ゃ ゅ ょ を ほ ゑ"
+        - "た て ぃ す ヵ ん な に ら せ  ゙ 「"
+        - "ち と し ゎ き く ま の り れ ヶ 」"
+        - "show_hiragana_upper っ さ そ ゐ こ み も 、 。 ・ ー BackSpace"
+        - "show_numbers show_romaji preferences fullwidth-space --- show_katakana Return"
+    katakana:
+        - "ヌ フ ア ウ エ オ ヤ ユ ヨ ワ ホ ヘ"
+        - "タ テ イ ス カ ン ナ ニ ラ セ  ゙  ゚ "
+        - "チ ト シ ハ キ ク マ ノ リ レ ケ ム"
+        - "show_katakana_upper ツ サ ソ ヒ コ ミ モ ネ ル メ ロ BackSpace"
+        - "show_numbers show_romaji preferences fullwidth-space katakana_width_toggle_half show_hiragana Return"
+    katakana_upper:
+        - "ヌ フ ァ ゥ ェ ォ ャ ュ ョ ヲ ホ ヱ"
+        - "タ テ ィ ス ヵ ン ナ ニ ラ セ  ゙ 「"
+        - "チ ト シ ハ キ ク マ ノ リ レ ケ 」"
+        - "show_katakana_upper ッ サ ソ ヰ コ ミ モ 、 。 ・ ー BackSpace"
+        - "show_numbers show_romaji preferences fullwidth-space katakana_width_toggle_half show_hiragana Return"
+    katakana_halfwidth:
+        - "ﾇ ﾌ ｱ ｳ ｴ ｵ ﾔ ﾕ ﾖ ﾜ ﾎ ﾍ"
+        - "ﾀ ﾃ ｲ ｽ ｶ ﾝ ﾅ ﾆ ﾗ ｾ  ゙  ゚ "
+        - "ﾁ ﾄ ｼ ﾊ ｷ ｸ ﾏ ﾉ ﾘ ﾚ ｹ ﾑ"
+        - "show_katakana_halfwidth_upper ﾂ ｻ ｿ ﾋ ｺ ﾐ ﾓ ﾈ ﾙ ﾒ ﾛ BackSpace"
+        - "show_numbers show_romaji preferences space katakana_halfwidth_width_toggle_full show_hiragana Return"
+    katakana_halfwidth_upper:
+        - "ﾇ ﾌ ｧ ｩ ｪ ｫ ｬ ｭ ｮ ｦ ｪ ﾍ"
+        - "ﾀ ﾃ ｨ ｽ ｶ ﾝ ﾅ ﾆ ﾗ ｾ  ゙ ｢"
+        - "ﾁ ﾄ ｼ ﾜ ｷ ｸ ﾏ ﾉ ﾘ ﾚ ｹ ｣"
+        - "show_katakana_halfwidth_upper ｯ ｻ ｿ ﾋ ｺ ﾐ ﾓ ､ ｡ ･ ｰ BackSpace"
+        - "show_numbers show_romaji preferences space katakana_halfwidth_width_toggle_full show_hiragana Return"
+    numbers:
+        - " … -- -- -- -- -- -- -- ² ³"
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "@ # ¥ % & - _ + ( )"
+        - "show_symbols ; \" ' : = < > BackSpace-wide"
+        - "show_hiragana show_romaji preferences space numbers_width_toggle_full , . Return"
+    numbers_fullwidth:
+        - "゠ -- -- -- -- -- -- -- -- --"
+        - "１ ２ ３ ４ ５ ６ ７ ８ ９ ０"
+        - "＠ ＃ ￥ ％ ＆ － ＿ ＋ （ ）"
+        - "show_symbols_fullwidth ； ＂ ＇ ： ＝ ＜ ＞ BackSpace-wide"
+        - "show_hiragana show_romaji_fullwidth preferences fullwidth-space numbers_fullwidth_width_toggle_half ， ． Return"
+    symbols:
+        - "ヽ ♪ -- -- -- -- -- ヿ 【 】"
+        - "~ ` ´ | · √ µ ÷ × ¶"
+        - "© ® £ $ € ^ ° * { }"
+        - "show_numbers_from_symbols \\ / § π τ [ ] BackSpace-wide"
+        - "show_hiragana show_romaji preferences space symbols_width_toggle_full ! ? Return"
+    symbols_fullwidth:
+        - "￣ ￤ -- -- -- -- -- ￢ ｟ ｠"
+        - "～ ｀ -- ｜ -- -- -- -- -- --"
+        - "-- -- ￡ ＄ -- ＾ -- ＊ ｛ ｝"
+        - "show_numbers_fullwidth_from_symbols ＼ ／ -- -- -- ［ ］ BackSpace-wide"
+        - "show_hiragana show_romaji_fullwidth preferences fullwidth-space symbols_fullwidth_width_toggle_half ！ ？ Return"
+    romaji:
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "q w e r t y u i o p"
+        - "a s d f g h j k l --"
+        - "show_romaji_upper z x c v b n m BackSpace-wide"
+        - "show_numbers show_hiragana preferences space romaji_width_toggle_full , . Return"
+    romaji_upper:
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "Q W E R T Y U I O P"
+        - "A S D F G H J K L --"
+        - "show_romaji_upper Z X C V B N M BackSpace-wide"
+        - "show_numbers show_hiragana preferences space romaji_width_toggle_full ! ? Return"
+    romaji_fullwidth:
+        - "１ ２ ３ ４ ５ ６ ７ ８ ９ ０"
+        - "ｑ ｗ ｅ ｒ ｔ ｙ ｕ ｉ ｏ ｐ"
+        - "ａ ｓ ｄ ｆ ｇ ｈ ｊ ｋ ｌ --"
+        - "show_romaji_fullwidth_upper ｚ ｘ ｃ ｖ ｂ ｎ ｍ BackSpace-wide"
+        - "show_numbers_fullwidth show_hiragana preferences fullwidth-space romaji_fullwidth_width_toggle_half ， ． Return"
+    romaji_fullwidth_upper:
+        - "１ ２ ３ ４ ５ ６ ７ ８ ９ ０"
+        - "Ｑ Ｗ Ｅ Ｒ Ｔ Ｙ Ｕ Ｉ Ｏ Ｐ"
+        - "Ａ Ｓ Ｄ Ｆ Ｇ Ｈ Ｊ Ｋ Ｌ --"
+        - "show_romaji_fullwidth_upper Ｚ Ｘ Ｃ Ｖ Ｂ Ｎ Ｍ BackSpace-wide"
+        - "show_numbers_fullwidth show_hiragana preferences fullwidth-space romaji_fullwidth_width_toggle_half ！ ？ Return"
+
+
+#              k       s       t       n       h       m       y       r       w
+#a 	あア 	かカ 	さサ 	たタ 	なナ 	はハ 	まマ 	やヤ	らラ 	わワ
+#i 	いイ 	きキ 	しシ 	ちチ 	にニ 	ひヒ 	みミ 	※	りリ 	ゐヰ
+#u 	うウ 	くク 	すス 	つツ 	ぬヌ 	ふフ 	むム 	ゆユ	るル 	※
+#e 	えエ 	けケ 	せセ 	てテ 	ねネ 	へヘ 	めメ 	※	れレ 	ゑヱ
+#o 	おオ 	こコ 	そソ 	とト 	のノ 	ほホ 	もモ 	よヨ	ろロ 	をヲ
+
+#      g       z       d       b       p       n
+#a 	が ガ 	ざ ザ 	だ ダ 	ば バ 	ぱ パ	ん ン
+#i 	ぎ ギ 	じ ジ 	ぢ ヂ 	び ビ 	ぴ ピ
+#u 	ぐ グ 	ず ズ 	づ ヅ 	ぶ ブ 	ぷ プ
+#e 	げ ゲ 	ぜ ゼ 	で デ 	べ ベ 	ぺ ペ
+#o 	ご ゴ 	ぞ ゾ 	ど ド 	ぼ ボ 	ぽ ポ
+
+
+buttons:
+    BackSpace:
+        outline: "special"
+        icon: "edit-clear-symbolic"
+        action: "erase"
+    BackSpace-wide:
+        outline: "special-3"
+        icon: "edit-clear-symbolic"
+        action: "erase"
+    preferences:
+        action: "show_prefs"
+        outline: "special-2"
+        icon: "keyboard-mode-symbolic"
+    show_numbers:
+        action:
+            set_view: "numbers"
+        outline: "change-view-3"
+        label: "123"
+    show_numbers_from_symbols:
+        action:
+            set_view: "numbers"
+        outline: "change-view-2"
+        label: "123"
+    numbers_fullwidth_width_toggle_half:
+        action:
+            set_view: "numbers"
+        outline: "change-view-3"
+        label: "半／全"
+    show_symbols:
+        action:
+            set_view: "symbols"
+        outline: "change-view-2"
+        label: "*/="
+    symbols_fullwidth_width_toggle_half:
+        action:
+            set_view: "symbols"
+        outline: "change-view-3"
+        label: "半／全"
+    show_hiragana:
+        action:
+            set_view: "base"
+        outline: "change-view-3"
+        label: "あいう"
+    show_hiragana_upper:
+        action:
+            locking:
+                lock_view: "hiragana_upper"
+                unlock_view: "base"
+        outline: "change-view"
+        icon: "key-shift"
+    show_katakana:
+        action:
+            set_view: "katakana"
+        outline: "change-view-3"
+        label: "アイウ"
+    katakana_halfwidth_width_toggle_full:
+        action:
+            set_view: "katakana"
+        outline: "change-view-3"
+        label: "半／全"
+    show_katakana_upper:
+        action:
+            locking:
+                lock_view: "katakana_upper"
+                unlock_view: "katakana"
+        outline: "change-view"
+        icon: "key-shift"
+    show_romaji:
+        action:
+            set_view: "romaji"
+        outline: "change-view-3"
+        label: "ABC"
+    romaji_fullwidth_width_toggle_half:
+        action:
+            set_view: "romaji"
+        outline: "change-view-3"
+        label: "半／全"
+    show_romaji_upper:
+        action:
+            locking:
+                lock_view: "romaji_upper"
+                unlock_view: "romaji"
+        outline: "change-view-2"
+        icon: "key-shift"
+    katakana_width_toggle_half:
+        action:
+            set_view: "katakana_halfwidth"
+        outline: "change-view-3"
+        label: "半／全"
+    show_katakana_halfwidth_upper:
+        action:
+            locking:
+                lock_view: "katakana_halfwidth_upper"
+                unlock_view: "katakana_halfwidth"
+        outline: "change-view"
+        icon: "key-shift"
+    show_romaji_fullwidth:
+        action:
+            set_view: "romaji_fullwidth"
+        outline: "change-view-3"
+        label: "ＡＢＣ"
+    romaji_width_toggle_full:
+        action:
+            set_view: "romaji_fullwidth"
+        outline: "change-view-3"
+        label: "半／全"
+    show_romaji_fullwidth_upper:
+        action:
+            locking:
+                lock_view: "romaji_fullwidth_upper"
+                unlock_view: "romaji_fullwidth"
+        outline: "change-view-2"
+        icon: "key-shift"
+    show_numbers_fullwidth:
+        action:
+            set_view: "numbers_fullwidth"
+        outline: "change-view-3"
+        label: "１２３"
+    show_numbers_fullwidth_from_symbols:
+        action:
+            set_view: "numbers_fullwidth"
+        outline: "change-view-2"
+        label: "１２３"
+    numbers_width_toggle_full:
+        action:
+            set_view: "numbers_fullwidth"
+        outline: "change-view-3"
+        label: "半／全"
+    show_symbols_fullwidth:
+        action:
+            set_view: "symbols_fullwidth"
+        outline: "change-view-2"
+        label: "＊／＝"
+    symbols_width_toggle_full:
+        action:
+            set_view: "symbols_fullwidth"
+        outline: "change-view-3"
+        label: "半／全"
+    space:
+        outline: "spaceline"
+        text: " "
+        label: "␣"
+    fullwidth-space:
+        outline: "spaceline"
+        text: "　"
+        label: "␣"
+    Return:
+        outline: "special-2"
+        icon: "key-enter"
+        keysym: "Return"
+    --:
+        outline: "placeholder"
+        text: ""
+    ---:
+        outline: "placeholder-2"
+        text: ""
+    つ:
+        outline: "thin"
+    さ:
+        outline: "thin"
+    そ:
+        outline: "thin"
+    ひ:
+        outline: "thin"
+    こ:
+        outline: "thin"
+    み:
+        outline: "thin"
+    も:
+        outline: "thin"
+    ね:
+        outline: "thin"
+    る:
+        outline: "thin"
+    め:
+        outline: "thin"
+    ろ:
+        outline: "thin"
+    っ:
+        outline: "thin"
+    ゐ:
+        outline: "thin"
+    、:
+        outline: "thin"
+    。:
+        outline: "thin"
+    ・:
+        outline: "thin"
+    ー:
+        outline: "thin"
+    ツ:
+        outline: "thin"
+    サ:
+        outline: "thin"
+    ソ:
+        outline: "thin"
+    ヒ:
+        outline: "thin"
+    コ:
+        outline: "thin"
+    ミ:
+        outline: "thin"
+    モ:
+        outline: "thin"
+    ネ:
+        outline: "thin"
+    ル:
+        outline: "thin"
+    メ:
+        outline: "thin"
+    ロ:
+        outline: "thin"
+    ッ:
+        outline: "thin"
+    ﾂ:
+        outline: "thin"
+    ｻ:
+        outline: "thin"
+    ｿ:
+        outline: "thin"
+    ヰ:
+        outline: "thin"
+    ﾋ:
+        outline: "thin"
+    ｺ:
+        outline: "thin"
+    ﾐ:
+        outline: "thin"
+    ﾓ:
+        outline: "thin"
+    ﾈ:
+        outline: "thin"
+    ﾙ:
+        outline: "thin"
+    ﾒ:
+        outline: "thin"
+    ﾛ:
+        outline: "thin"
+    ｯ:
+        outline: "thin"
+    ､:
+        outline: "thin"
+    ｡:
+        outline: "thin"
+    ･:
+        outline: "thin"
+    ｰ:
+        outline: "thin"
+    …:
+        outline: "default-2"
+    1:
+        outline: "default-2"
+    2:
+        outline: "default-2"
+    3:
+        outline: "default-2"
+    4:
+        outline: "default-2"
+    5:
+        outline: "default-2"
+    6:
+        outline: "default-2"
+    7:
+        outline: "default-2"
+    8:
+        outline: "default-2"
+    9:
+        outline: "default-2"
+    0:
+        outline: "default-2"
+    ²:
+        outline: "default-2"
+    ³:
+        outline: "default-2"
+    "@":
+        outline: "default-2"
+    "#":
+        outline: "default-2"
+    ¥:
+        outline: "default-2"
+    "%":
+        outline: "default-2"
+    "&":
+        outline: "default-2"
+    -:
+        outline: "default-2"
+    _:
+        outline: "default-2"
+    +:
+        outline: "default-2"
+    (:
+        outline: "default-2"
+    ):
+        outline: "default-2"
+    ;:
+        outline: "default-2"
+    "\"":
+        outline: "default-2"
+    "'":
+        outline: "default-2"
+    ":":
+        outline: "default-2"
+    =:
+        outline: "default-2"
+    <:
+        outline: "default-2"
+    ">":
+        outline: "default-2"
+    a:
+        outline: "default-2"
+    b:
+        outline: "default-2"
+    c:
+        outline: "default-2"
+    d:
+        outline: "default-2"
+    e:
+        outline: "default-2"
+    f:
+        outline: "default-2"
+    g:
+        outline: "default-2"
+    h:
+        outline: "default-2"
+    i:
+        outline: "default-2"
+    j:
+        outline: "default-2"
+    k:
+        outline: "default-2"
+    l:
+        outline: "default-2"
+    m:
+        outline: "default-2"
+    n:
+        outline: "default-2"
+    o:
+        outline: "default-2"
+    p:
+        outline: "default-2"
+    q:
+        outline: "default-2"
+    r:
+        outline: "default-2"
+    s:
+        outline: "default-2"
+    t:
+        outline: "default-2"
+    u:
+        outline: "default-2"
+    v:
+        outline: "default-2"
+    w:
+        outline: "default-2"
+    x:
+        outline: "default-2"
+    y:
+        outline: "default-2"
+    z:
+        outline: "default-2"
+    A:
+        outline: "default-2"
+    B:
+        outline: "default-2"
+    C:
+        outline: "default-2"
+    D:
+        outline: "default-2"
+    E:
+        outline: "default-2"
+    F:
+        outline: "default-2"
+    G:
+        outline: "default-2"
+    H:
+        outline: "default-2"
+    I:
+        outline: "default-2"
+    J:
+        outline: "default-2"
+    K:
+        outline: "default-2"
+    L:
+        outline: "default-2"
+    M:
+        outline: "default-2"
+    N:
+        outline: "default-2"
+    O:
+        outline: "default-2"
+    P:
+        outline: "default-2"
+    Q:
+        outline: "default-2"
+    R:
+        outline: "default-2"
+    S:
+        outline: "default-2"
+    T:
+        outline: "default-2"
+    U:
+        outline: "default-2"
+    V:
+        outline: "default-2"
+    W:
+        outline: "default-2"
+    X:
+        outline: "default-2"
+    Y:
+        outline: "default-2"
+    Z:
+        outline: "default-2"
+    １:
+        outline: "default-2"
+    ２:
+        outline: "default-2"
+    ３:
+        outline: "default-2"
+    ４:
+        outline: "default-2"
+    ５:
+        outline: "default-2"
+    ６:
+        outline: "default-2"
+    ７:
+        outline: "default-2"
+    ８:
+        outline: "default-2"
+    ９:
+        outline: "default-2"
+    ０:
+        outline: "default-2"
+    ａ:
+        outline: "default-2"
+    ｂ:
+        outline: "default-2"
+    ｃ:
+        outline: "default-2"
+    ｄ:
+        outline: "default-2"
+    ｅ:
+        outline: "default-2"
+    ｆ:
+        outline: "default-2"
+    ｇ:
+        outline: "default-2"
+    ｈ:
+        outline: "default-2"
+    ｉ:
+        outline: "default-2"
+    ｊ:
+        outline: "default-2"
+    ｋ:
+        outline: "default-2"
+    ｌ:
+        outline: "default-2"
+    ｍ:
+        outline: "default-2"
+    ｎ:
+        outline: "default-2"
+    ｏ:
+        outline: "default-2"
+    ｐ:
+        outline: "default-2"
+    ｑ:
+        outline: "default-2"
+    ｒ:
+        outline: "default-2"
+    ｓ:
+        outline: "default-2"
+    ｔ:
+        outline: "default-2"
+    ｕ:
+        outline: "default-2"
+    ｖ:
+        outline: "default-2"
+    ｗ:
+        outline: "default-2"
+    ｘ:
+        outline: "default-2"
+    ｙ:
+        outline: "default-2"
+    ｚ:
+        outline: "default-2"
+    Ａ:
+        outline: "default-2"
+    Ｂ:
+        outline: "default-2"
+    Ｃ:
+        outline: "default-2"
+    Ｄ:
+        outline: "default-2"
+    Ｅ:
+        outline: "default-2"
+    Ｆ:
+        outline: "default-2"
+    Ｇ:
+        outline: "default-2"
+    Ｈ:
+        outline: "default-2"
+    Ｉ:
+        outline: "default-2"
+    Ｊ:
+        outline: "default-2"
+    Ｋ:
+        outline: "default-2"
+    Ｌ:
+        outline: "default-2"
+    Ｍ:
+        outline: "default-2"
+    Ｎ:
+        outline: "default-2"
+    Ｏ:
+        outline: "default-2"
+    Ｐ:
+        outline: "default-2"
+    Ｑ:
+        outline: "default-2"
+    Ｒ:
+        outline: "default-2"
+    Ｓ:
+        outline: "default-2"
+    Ｔ:
+        outline: "default-2"
+    Ｕ:
+        outline: "default-2"
+    Ｖ:
+        outline: "default-2"
+    Ｗ:
+        outline: "default-2"
+    Ｘ:
+        outline: "default-2"
+    Ｙ:
+        outline: "default-2"
+    Ｚ:
+        outline: "default-2"
+    ヽ:
+        outline: "default-2"
+    ♪:
+        outline: "default-2"
+    ヿ:
+        outline: "default-2"
+    【:
+        outline: "default-2"
+    】:
+        outline: "default-2"
+    ~:
+        outline: "default-2"
+    "`":
+        outline: "default-2"
+    ´:
+        outline: "default-2"
+    "|":
+        outline: "default-2"
+    ·:
+        outline: "default-2"
+    √:
+        outline: "default-2"
+    µ:
+        outline: "default-2"
+    ÷:
+        outline: "default-2"
+    ×:
+        outline: "default-2"
+    ¶:
+        outline: "default-2"
+    ©:
+        outline: "default-2"
+    ®:
+        outline: "default-2"
+    £:
+        outline: "default-2"
+    $:
+        outline: "default-2"
+    €:
+        outline: "default-2"
+    ^:
+        outline: "default-2"
+    °:
+        outline: "default-2"
+    "*":
+        outline: "default-2"
+    "{":
+        outline: "default-2"
+    "}":
+        outline: "default-2"
+    "\\":
+        outline: "default-2"
+    /:
+        outline: "default-2"
+    §:
+        outline: "default-2"
+    π:
+        outline: "default-2"
+    τ:
+        outline: "default-2"
+    "[":
+        outline: "default-2"
+    "]":
+        outline: "default-2"
+    ゠:
+        outline: "default-2"
+    ＠:
+        outline: "default-2"
+    ＃:
+        outline: "default-2"
+    ￥:
+        outline: "default-2"
+    ％:
+        outline: "default-2"
+    ＆:
+        outline: "default-2"
+    －:
+        outline: "default-2"
+    ＿:
+        outline: "default-2"
+    ＋:
+        outline: "default-2"
+    （:
+        outline: "default-2"
+    ）:
+        outline: "default-2"
+    ；:
+        outline: "default-2"
+    ＂:
+        outline: "default-2"
+    ＇:
+        outline: "default-2"
+    ：:
+        outline: "default-2"
+    ＝:
+        outline: "default-2"
+    ＜:
+        outline: "default-2"
+    ＞:
+        outline: "default-2"
+    ￣:
+        outline: "default-2"
+    ￤:
+        outline: "default-2"
+    ￢:
+        outline: "default-2"
+    ｟:
+        outline: "default-2"
+    ｠:
+        outline: "default-2"
+    ～:
+        outline: "default-2"
+    ｀:
+        outline: "default-2"
+    ｜:
+        outline: "default-2"
+    ￡:
+        outline: "default-2"
+    ＄:
+        outline: "default-2"
+    ＾:
+        outline: "default-2"
+    ＊:
+        outline: "default-2"
+    ｛:
+        outline: "default-2"
+    ｝:
+        outline: "default-2"
+    ＼:
+        outline: "default-2"
+    ／:
+        outline: "default-2"
+    ［:
+        outline: "default-2"
+    ］:
+        outline: "default-2"

data/keyboards/no.yaml

@@ -1,40 +1,39 @@
+# Language: Norwegian
 ---
 outlines:
-    default:       { width: 32.4,   height: 52 }
-    altline:       { width: 48.39,  height: 52 }
-    large:         { width: 48.39,  height: 52 }
-    wide:          { width: 62,     height: 52 }
-    change-view:   { width: 48.39,  height: 52 }
-    change-view-2: { width: 62,     height: 52 }
-    spaceline:     { width: 136.39, height: 52 }
-    special:       { width: 48,     height: 52 }
-    placeholder:   { width: 32,     height: 52 }
-    fill:          { width: 64,     height: 52 }
+    default:       { width: 32.415,  height: 52 }
+    change-view:   { width: 48.622,  height: 52 }
+    change-view-2: { width: 64.83,   height: 52 }
+    large:         { width: 48.622,  height: 52 }
+    placeholder:   { width: 32,      height: 52 }
+    spaceline:     { width: 129.661, height: 52 }
+    special:       { width: 48.622,  height: 52 }
+    special-2:     { width: 64.83,   height: 52 }
 
 views:
     base:
         - "q w e r t y u i o p å"
         - "a s d f g h j k l ø æ"
-        - "Shift_L   z x c v b n m , BackSpace"
-        - "show_numbers preferences         space        .    Return"
+        - "show_upper 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"
+        - "show_upper Z X C V B N M , BackSpace"
+        - "show_numbers preferences space . Return"
     numbers:
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "@ # $ % & - _ + ( )"
-        - "show_symbols -- , \" ' : ; ! ? BackSpace"
-        - "show_letters preferences         space        .    Return"
+        - "1 2 3 4 5 6 7 8 9 0 ²"
+        - "@ # $ % & - _ + ( ) ³"
+        - "show_symbols , \" ' : ; ! ? -- BackSpace"
+        - "show_letters preferences space . Return"
     symbols:
-        - "~ ` | · √ π τ ÷ × ¶"
-        - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers_from_symbols -- \\ / < > = [ ] BackSpace"
-        - "show_letters preferences         space        .    Return"
+        - "~ ` | · √ π τ ÷ × ¶ ²"
+        - "© ® £ € ¥ ^ ° * { } ³"
+        - "show_numbers_from_symbols \\ / < > = [ ] -- BackSpace"
+        - "show_letters preferences space . Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -42,7 +41,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -75,17 +74,9 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "wide"
+        outline: "special-2"
         icon: "key-enter"
         keysym: "Return"
     --:
         outline: "placeholder"
         text: ""
-    5:
-        outline: "fill"
-    "&":
-        outline: "fill"
-    √:
-        outline: "fill"
-    ¥:
-        outline: "fill"

data/keyboards/no_wide.yaml

@@ -1,38 +1,39 @@
+# Language: Norwegian
 ---
 outlines:
-    default:     { width: 48.87,  height: 42 }
-    altline:     { width: 73.5,   height: 42 }
-    wide:        { width: 92.99,  height: 42 }
-    change-view: { width: 73.5,   height: 42 }
-    spaceline:   { width: 273.5,  height: 42 }
-    special:     { width: 48.87,  height: 42 }
-    placeholder: { width: 48.87,  height: 42 }
-    fill:        { width: 97.74,  height: 42 }
+    default:       { width: 48.872,  height: 42 }
+    change-view:   { width: 73.308,  height: 42 }
+    change-view-2: { width: 85.526,  height: 42 }
+    placeholder:   { width: 48.872,  height: 42 }
+    spaceline:     { width: 268.796, height: 42 }
+    special:       { width: 48.872,  height: 42 }
+    special-2:     { width: 73.308,  height: 42 }
+    special-3:     { width: 85.526,  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"
+        - "show_upper 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"
+        - "show_upper Z X C V B N M , BackSpace"
+        - "show_numbers preferences space . Return"
     numbers:
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "@ # $ % & - _ + ( )"
-        - "show_symbols -- , \" ' : ; ! ? BackSpace"
-        - "show_letters preferences         space        .    Return"
+        - "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"
+        - "~ ` | · √ π τ ÷ × ¶ ²"
+        - "© ® £ € ¥ ^ ° * { } ³"
+        - "show_numbers_from_symbols \\ / < > = [ ] -- BackSpace"
+        - "show_letters preferences space . Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -40,7 +41,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -48,6 +49,11 @@ buttons:
         outline: "special"
         icon: "keyboard-mode-symbolic"
     show_numbers:
+        action:
+            set_view: "numbers"
+        outline: "change-view-2"
+        label: "123"
+    show_numbers_from_symbols:
         action:
             set_view: "numbers"
         outline: "change-view"
@@ -55,7 +61,7 @@ buttons:
     show_letters:
         action:
             set_view: "base"
-        outline: "change-view"
+        outline: "change-view-2"
         label: "ABC"
     show_symbols:
         action:
@@ -66,17 +72,9 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "wide"
+        outline: "special-3"
         icon: "key-enter"
         keysym: "Return"
     --:
         outline: "placeholder"
         text: ""
-    5:
-        outline: "fill"
-    "&":
-        outline: "fill"
-    √:
-        outline: "fill"
-    ¥:
-        outline: "fill"

data/keyboards/number/us.yaml

@@ -1,26 +1,26 @@
 ---
 outlines:
-    default:   { width: 37.46,  height: 52 }
-    altline:   { width: 48.39,  height: 52 }
-    wide:      { width: 88.98,  height: 52 }
-    spaceline: { width: 120.58, height: 52 }
+    default:   { width: 71.314,  height: 52 }
+    spaceline: { width: 142.628, height: 52 }
+    special:   { width: 71.314,  height: 52 }
 
 views:
     base:
-        - "1 2 3 ( )"
-        - "4 5 6 # *"
-        - "7 8 9 + -"
+        - "( 1 2 3 )"
+        - "# 4 5 6 +"
+        - "* 7 8 9 -"
         - "BackSpace 0 space Return"
 
 buttons:
     BackSpace:
-        outline: "altline"
+        outline: "special"
         icon: "edit-clear-symbolic"
         action: "erase"
     space:
         outline: "spaceline"
         text: " "
+        label: "␣"
     Return:
-        outline: "wide"
+        outline: "special"
         icon: "key-enter"
-        keysym: "Return"
+        keysym: "Return"

data/keyboards/number/us_wide.yaml

@@ -1,26 +1,26 @@
 ---
 outlines:
-    default:   { width: 37.46,  height: 42 }
-    altline:   { width: 48.39,  height: 42 }
-    wide:      { width: 88.98,  height: 42 }
-    spaceline: { width: 120.58, height: 42 }
+    default:   { width: 73.5, height: 42 }
+    spaceline: { width: 147,  height: 42 }
+    special:   { width: 73.5, height: 42 }
 
 views:
     base:
-        - "1 2 3 ( )"
-        - "4 5 6 # *"
-        - "7 8 9 + -"
+        - "( 1 2 3 )"
+        - "# 4 5 6 +"
+        - "* 7 8 9 -"
         - "BackSpace 0 space Return"
 
 buttons:
     BackSpace:
-        outline: "altline"
+        outline: "special"
         icon: "edit-clear-symbolic"
         action: "erase"
     space:
         outline: "spaceline"
         text: " "
+        label: "␣"
     Return:
-        outline: "wide"
+        outline: "special"
         icon: "key-enter"
-        keysym: "Return"
+        keysym: "Return"

data/keyboards/pin/us.yaml

@@ -1,7 +1,8 @@
 ---
 margins: { top: 4, side: 0, bottom: 4 }
 outlines:
-    default: { width: 120, height: 52 }
+    default: { width: 123.428, height: 52 }
+    special: { width: 123.428, height: 52 }
 
 views:
     base:
@@ -12,9 +13,10 @@ views:
 
 buttons:
     BackSpace:
+        outline: "special"
         icon: "edit-clear-symbolic"
         action: "erase"
     Return:
+        outline: "special"
         icon: "key-enter"
         keysym: "Return"
-

data/keyboards/pin/us_wide.yaml

@@ -1,7 +1,8 @@
 ---
 margins: { top: 4, side: 0, bottom: 4 }
 outlines:
-    default: { width: 120, height: 52 }
+    default: { width: 123.428, height: 52 }
+    special: { width: 123.428, height: 52 }
 
 views:
     base:
@@ -12,9 +13,10 @@ views:
 
 buttons:
     BackSpace:
+        outline: "special"
         icon: "edit-clear-symbolic"
         action: "erase"
     Return:
+        outline: "special"
         icon: "key-enter"
         keysym: "Return"
-

data/keyboards/pl.yaml

@@ -1,56 +1,55 @@
+# Language: Polish
 ---
 outlines:
-    default:       { width: 35.67, height: 52 }
-    altline:       { width: 52.67, height: 52 }
-    large:         { width: 52.67, height: 52 }
-    wide:          { width: 59,    height: 52 }
-    change-view:   { width: 52.67, height: 52 }
-    change-view-2: { width: 59,    height: 52 }
-    spaceline:     { width: 141,   height: 52 }
-    special:       { width: 44,    height: 52 }
-    placeholder:   { width: 35.67, height: 52 }
+    default:       { width: 35.657,  height: 52 }
+    change-view:   { width: 53.485,  height: 52 }
+    change-view-2: { width: 62.399,  height: 52 }
+    large:         { width: 53.485,  height: 52 }
+    spaceline:     { width: 124.802, height: 52 }
+    special:       { width: 53.485,  height: 52 }
+    special-2:     { width: 62.399,  height: 52 }
 
 views:
     base:
         - "q w e r t y u i o p"
         - "a s d f g h j k l"
-        - "Shift_L   z x c v b n m  BackSpace"
-        - "show_numbers preferences         space        show_accents Return"
+        - "show_upper z x c v b n m BackSpace"
+        - "show_numbers preferences space show_accents Return"
     upper:
         - "Q W E R T Y U I O P"
         - "A S D F G H J K L"
-        - "Shift_L   Z X C V B N M  BackSpace"
-        - "show_numbers preferences         space        show_upper_accents Return"
+        - "show_upper Z X C V B N M BackSpace"
+        - "show_numbers preferences space show_upper_accents Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
-        - "show_symbols   , \" ' : ; ! ?  BackSpace"
-        - "show_letters preferences         space        .-large Return"
+        - "show_symbols , \" ' : ; ! ? BackSpace"
+        - "show_letters preferences space .-large Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        .-large Return"
+        - "show_numbers_from_symbols \\ / < > = [ ] BackSpace"
+        - "show_letters preferences space .-large Return"
     accents:
         - "q w ę r t y u i ó p"
         - "ą ś d f g h j k ł"
-        - "accents_show_upper   ż ź ć v b ń m  BackSpace"
-        - "show_numbers preferences         space        show_accents Return"
+        - "show_upper_accents_from_accents ż ź ć v b ń m BackSpace"
+        - "show_numbers preferences space show_accents Return"
     upper_accents:
         - "Q W Ę R T Y U I Ó P"
         - "Ą Ś D F G H J K Ł"
-        - "accents_show_upper   Ż Ź Ć V B Ń M  BackSpace"
-        - "show_numbers preferences         space        show_upper_accents Return"
+        - "show_upper_accents_from_accents Ż Ź Ć V B Ń M BackSpace"
+        - "show_numbers preferences space show_upper_accents Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
                 unlock_view: "base"
         outline: "change-view"
         icon: "key-shift"
-    accents_show_upper:
+    show_upper_accents_from_accents:
         action:
             locking:
                 lock_view: "upper_accents"
@@ -60,7 +59,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special"
         icon: "edit-clear-symbolic"
         keysym: "BackSpace"
     preferences:
@@ -110,9 +109,6 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "wide"
+        outline: "special-2"
         icon: "key-enter"
         keysym: "Return"
-    --:
-        outline: "placeholder"
-        text: ""

data/keyboards/pl_wide.yaml

@@ -1,49 +1,50 @@
+# Language: Polish
 ---
 outlines:
-    default:       { width: 54,  height: 42 }
-    altline:       { width: 81,  height: 42 }
-    large:         { width: 81,  height: 42 }
-    wide:          { width: 100, height: 42 }
-    change-view:   { width: 81,  height: 42 }
-    change-view-2: { width: 100, height: 42 }
-    spaceline:     { width: 206, height: 42 }
-    special:       { width: 54,  height: 42 }
-    placeholder:   { width: 54,  height: 42 }
+    default:       { width: 53.76,  height: 42 }
+    change-view:   { width: 80.64,  height: 42 }
+    change-view-2: { width: 94.08,  height: 42 }
+    large:         { width: 80.64,  height: 42 }
+    placeholder:   { width: 53.76,  height: 42 }
+    spaceline:     { width: 215.04, height: 42 }
+    special:       { width: 53.76,  height: 42 }
+    special-2:     { width: 80.64,  height: 42 }
+    special-3:     { width: 94.08,  height: 42 }
 
 views:
     base:
         - "q w e r t y u i o p"
         - "a s d f g h j k l"
-        - "Shift_L   z x c v b n m  BackSpace"
-        - "show_numbers preferences         space        show_accents Return"
+        - "show_upper z x c v b n m BackSpace"
+        - "show_numbers preferences space show_accents Return"
     upper:
         - "Q W E R T Y U I O P"
         - "A S D F G H J K L"
-        - "Shift_L   Z X C V B N M  BackSpace"
-        - "show_numbers preferences         space        show_upper_accents Return"
+        - "show_upper Z X C V B N M BackSpace"
+        - "show_numbers preferences space show_upper_accents Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
-        - "show_symbols   , \" ' : ; ! ?  BackSpace"
-        - "show_letters preferences         space        .-large Return"
+        - "show_symbols , \" ' : ; ! ? BackSpace"
+        - "show_letters preferences space .-large Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        .-large Return"
+        - "show_numbers_from_symbols \\ / < > = [ ] BackSpace"
+        - "show_letters preferences space .-large Return"
     accents:
         - "q w ę r t y u i ó p"
         - "ą ś d f g h j k ł"
-        - "accents_show_upper   ż ź ć v b ń m  BackSpace"
-        - "show_numbers preferences         space        show_accents Return"
+        - "accents_show_upper ż ź ć v b ń m BackSpace"
+        - "show_numbers preferences space show_accents Return"
     upper_accents:
         - "Q W Ę R T Y U I Ó P"
         - "Ą Ś D F G H J K Ł"
-        - "accents_show_upper   Ż Ź Ć V B Ń M  BackSpace"
-        - "show_numbers preferences         space        show_upper_accents Return"
+        - "accents_show_upper Ż Ź Ć V B Ń M BackSpace"
+        - "show_numbers preferences space show_upper_accents Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -60,7 +61,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         keysym: "BackSpace"
     preferences:
@@ -110,7 +111,7 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "wide"
+        outline: "special-3"
         icon: "key-enter"
         keysym: "Return"
     --:

data/keyboards/pt.yaml

@@ -1,43 +1,43 @@
+# Language: Portuguese
 # This layout-file is a copy of "br.yaml"
 ---
 outlines:
-    default:       { width: 35.67, height: 52 }
-    altline:       { width: 53,    height: 52 }
-    wide:          { width: 53,    height: 52 }
-    change-view:   { width: 53,    height: 52 }
-    spaceline:     { width: 90,    height: 52 }
-    special:       { width: 35.67, height: 52 }
-    large:         { width: 71.34, height: 52 }
+    default:     { width: 35.657, height: 52 }
+    change-view: { width: 53.485, height: 52 }
+    large:       { width: 71.314, height: 52 }
+    spaceline:   { width: 89.144, height: 52 }
+    special:     { width: 35.657, height: 52 }
+    special-2:   { width: 53.485, 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     .-large Return"
+        - "show_upper z x c v b n m BackSpace"
+        - "show_numbers show_eschars preferences space .-large 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     ,-large Return"
+        - "show_upper Z X C V B N M BackSpace"
+        - "show_numbers show_eschars preferences space ,-large Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
-        - "show_symbols   , \" ' : ; ! ?  BackSpace"
+        - "show_symbols , \" ' : ; ! ? BackSpace"
         - "show_letters show_eschars preferences space º . Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers   \\ / < > = [ ]  BackSpace"
-        - "show_letters show_eschars preferences         space       ≠ § Return"
+        - "show_numbers \\ / < > = [ ] BackSpace"
+        - "show_letters show_eschars preferences space ≠ § Return"
     eschars:
         - "À Á Ã Â É Ê Í Ó Ô Õ"
         - "à á ã â é ê í ó ô õ "
         - "show_numbers Ú Ü ú ü ! ? . BackSpace"
-        - "show_letters show_eschars preferences         space    « »    Return"
+        - "show_letters show_eschars preferences space « » Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -45,7 +45,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -84,6 +84,6 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "wide"
+        outline: "special-2"
         icon: "key-enter"
         keysym: "Return"

data/keyboards/pt_wide.yaml

@@ -1,44 +1,45 @@
+# Language: Portuguese
 # This layout-file is a copy of "br_wide.yaml"
 ---
 outlines:
-    default:     { width: 53.75, height: 42 }
-    thin:        { width: 40.5,  height: 42 }
-    altline:     { width: 81,    height: 42 }
-    wide:        { width: 92,    height: 42 }
-    change-view: { width: 81,    height: 42 }
-    spaceline:   { width: 149.5, height: 42 }
-    special:     { width: 53.75, height: 42 }
-    large:       { width: 81,    height: 42 }
+    default:     { width: 53.76,  height: 42 }
+    change-view: { width: 80.64,  height: 42 }
+    large:       { width: 80.64,  height: 42 }
+    spaceline:   { width: 147.84, height: 42 }
+    special:     { width: 53.76,  height: 42 }
+    special-2:   { width: 80.64,  height: 42 }
+    special-3:   { width: 94.08,  height: 42 }
+    thin:        { width: 40.32,  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     .-large Return"
+        - "show_upper z x c v b n m BackSpace"
+        - "show_numbers show_eschars preferences space .-large 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     ,-large Return"
+        - "show_upper Z X C V B N M BackSpace"
+        - "show_numbers show_eschars preferences space ,-large Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
-        - "show_symbols   , \" ' : ; ! ?  BackSpace"
+        - "show_symbols , \" ' : ; ! ? BackSpace"
         - "show_letters show_eschars preferences space º .-thin Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers   \\ / < > = [ ]  BackSpace"
-        - "show_letters show_eschars preferences         space       ≠ § Return"
+        - "show_numbers \\ / < > = [ ] BackSpace"
+        - "show_letters show_eschars preferences space ≠ § Return"
     eschars:
         - "À Á Ã Â É Ê Í Ó Ô Õ"
         - "à á ã â é ê í ó ô õ "
         - "show_numbers Ú Ü ú ü ! ? . BackSpace"
-        - "show_letters show_eschars preferences         space    « »    Return"
+        - "show_letters show_eschars preferences space « » Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -46,7 +47,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -85,7 +86,7 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "wide"
+        outline: "special-3"
         icon: "key-enter"
         keysym: "Return"
     «:

data/keyboards/ro.yaml

@@ -1,42 +1,43 @@
+# Language: Romanian
 ---
 outlines:
-    default:       { width: 35.67,  height: 52 }
-    altline:       { width: 53.5,   height: 52 }
-    wide:          { width: 62,     height: 52 }
-    change-view:   { width: 53.5,   height: 52 }
-    spaceline:     { width: 107.67, height: 52 }
-    special:       { width: 35.67,  height: 52 }
-    large:         { width: 44,     height: 52 }
+    default:     { width: 35.657,  height: 52 }
+    change-view: { width: 53.485,  height: 52 }
+    large:       { width: 44.571,  height: 52 }
+    spaceline:   { width: 106.973, height: 52 }
+    special:     { width: 35.657,  height: 52 }
+    special-2:   { width: 53.485,  height: 52 }
+    special-3:   { width: 62.399,  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"
+        - "show_upper 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"
+        - "show_upper Z X C V B N M BackSpace"
+        - "show_numbers show_eschars preferences space . Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # € % & - _ + ( )"
-        - "show_symbols   , \" ' : ; ! ?  BackSpace"
-        - "show_letters show_eschars preferences         space        . Return"
+        - "show_symbols , \" ' : ; ! ? BackSpace"
+        - "show_letters show_eschars preferences space . Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ $ ¥ ^ ° * { }"
-        - "show_numbers   \\ / < > = [ ]  BackSpace"
-        - "show_letters show_eschars preferences         space        . Return"
+        - "show_numbers \\ / < > = [ ] BackSpace"
+        - "show_letters show_eschars preferences space . Return"
     eschars:
         - "Ă Â Î Ș Ț Á É Í Ó Ü"
         - "ă â î ș ț á é í ó ü"
         - "show_numbers „ ” « » ― { } BackSpace"
-        - "show_letters show_eschars preferences         space        . Return"
+        - "show_letters show_eschars preferences space . Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -44,7 +45,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -77,7 +78,7 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "wide"
+        outline: "special-3"
         icon: "key-enter"
         keysym: "Return"
     .:

data/keyboards/ro_wide.yaml

@@ -1,41 +1,42 @@
+# Language: Romanian
 ---
 outlines:
-    default:       { width: 54,     height: 42 }
-    altline:       { width: 81,     height: 42 }
-    wide:          { width: 81,     height: 42 }
-    change-view:   { width: 81,     height: 42 }
-    spaceline:     { width: 189.25, height: 42 }
-    special:       { width: 54,     height: 42 }
+    default:     { width: 53.76,  height: 42 }
+    change-view: { width: 80.64,  height: 42 }
+    spaceline:   { width: 188.16, height: 42 }
+    special:     { width: 53.76,  height: 42 }
+    special-2:   { width: 80.64,  height: 42 }
+    special-3:   { width: 80.64,  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"
+        - "show_upper 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"
+        - "show_upper Z X C V B N M BackSpace"
+        - "show_numbers show_eschars preferences space , Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # € % & - _ + ( )"
-        - "show_symbols   , \" ' : ; ! ?  BackSpace"
-        - "show_letters show_eschars preferences         space        . Return"
+        - "show_symbols , \" ' : ; ! ? BackSpace"
+        - "show_letters show_eschars preferences space . Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ $ ¥ ^ ° * { }"
-        - "show_numbers   \\ / < > = [ ]  BackSpace"
-        - "show_letters show_eschars preferences         space        , Return"
+        - "show_numbers \\ / < > = [ ] BackSpace"
+        - "show_letters show_eschars preferences space , Return"
     eschars:
         - "ă â î ș ț á é í ó ü"
         - "Ă Â Î Ș Ț Á É Í Ó Ü"
         - "show_numbers „ ” « » ― { } BackSpace"
-        - "show_letters show_eschars preferences         space        . Return"
+        - "show_letters show_eschars preferences space . Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -43,7 +44,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -76,6 +77,6 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "wide"
+        outline: "special-3"
         icon: "key-enter"
         keysym: "Return"

data/keyboards/rs+latin.yaml

@@ -0,0 +1,85 @@
+# Language: Serbian (Latin)
+---
+outlines:
+    default:       { width: 32.415,  height: 52 }
+    change-view:   { width: 32.415,  height: 52 }
+    change-view-2: { width: 48.622,  height: 52 }
+    change-view-3: { width: 56.726,  height: 52 }
+    placeholder:   { width: 32.415,  height: 52 }
+    spaceline:     { width: 145.868, height: 52 }
+    special:       { width: 32.415,  height: 52 }
+    special-2:     { width: 48.622,  height: 52 }
+    special-3:     { width: 56.726,  height: 52 }
+
+views:
+    base:
+        - "q w e r t z u i o p š"
+        - "a s d f g h j k l č ć"
+        - "show_upper 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 Č Ć"
+        - "show_upper 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-wide"
+        - "show_letters preferences space , . Return"
+    symbols:
+        - "~ ` | · √ π τ ÷ × ¶ ²"
+        - "© ® £ € ¥ ^ ° * { } ³"
+        - "show_numbers_from_symbols \\ / < > = [ ] -- BackSpace-wide"
+        - "show_letters preferences space , . Return"
+
+buttons:
+    show_upper:
+        action:
+            locking:
+                lock_view: "upper"
+                unlock_view: "base"
+        outline: "change-view"
+        icon: "key-shift"
+    BackSpace:
+        outline: "special"
+        icon: "edit-clear-symbolic"
+        action: "erase"
+    BackSpace-wide:
+        outline: "special-2"
+        icon: "edit-clear-symbolic"
+        action: "erase"
+    preferences:
+        action: "show_prefs"
+        outline: "special"
+        icon: "keyboard-mode-symbolic"
+    show_numbers:
+        action:
+            set_view: "numbers"
+        outline: "change-view-3"
+        label: "123"
+    show_numbers_from_symbols:
+        action:
+            set_view: "numbers"
+        outline: "change-view-2"
+        label: "123"
+    show_letters:
+        action:
+            set_view: "base"
+        outline: "change-view-3"
+        label: "ABC"
+    show_symbols:
+        action:
+            set_view: "symbols"
+        outline: "change-view-2"
+        label: "*/="
+    space:
+        outline: "spaceline"
+        text: " "
+    Return:
+        outline: "special-3"
+        icon: "key-enter"
+        keysym: "Return"
+    --:
+        outline: "placeholder"
+        text: ""

data/keyboards/rs+latin_wide.yaml

@@ -0,0 +1,79 @@
+# Language: Serbian (Latin)
+---
+outlines:
+    default:       { width: 48.872, height: 42 }
+    change-view:   { width: 48.872, height: 42 }
+    change-view-2: { width: 73.308, height: 42 }
+    placeholder:   { width: 48.872, height: 42 }
+    spaceline:     { width: 244.36, height: 42 }
+    special:       { width: 48.872, height: 42 }
+    special-2:     { width: 48.872, height: 42 }
+    special-3:     { width: 73.308, height: 42 }
+
+views:
+    base:
+        - "q w e r t z u i o p š"
+        - "a s d f g h j k l č ć"
+        - "show_upper 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 Č Ć"
+        - "show_upper 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-wide"
+        - "show_letters preferences space , . Return"
+    symbols:
+        - "~ ` | · √ π τ ÷ × ¶ ²"
+        - "© ® £ € ¥ ^ ° * { } ³"
+        - "show_numbers \\ / < > = [ ] -- BackSpace-wide"
+        - "show_letters preferences space , . Return"
+
+buttons:
+    show_upper:
+        action:
+            locking:
+                lock_view: "upper"
+                unlock_view: "base"
+        outline: "change-view"
+        icon: "key-shift"
+    BackSpace:
+        outline: "special-2"
+        icon: "edit-clear-symbolic"
+        action: "erase"
+    BackSpace-wide:
+        outline: "special-3"
+        icon: "edit-clear-symbolic"
+        action: "erase"
+    preferences:
+        action: "show_prefs"
+        outline: "special"
+        icon: "keyboard-mode-symbolic"
+    show_numbers:
+        action:
+            set_view: "numbers"
+        outline: "change-view-2"
+        label: "123"
+    show_letters:
+        action:
+            set_view: "base"
+        outline: "change-view-2"
+        label: "ABC"
+    show_symbols:
+        action:
+            set_view: "symbols"
+        outline: "change-view-2"
+        label: "*/="
+    space:
+        outline: "spaceline"
+        text: " "
+    Return:
+        outline: "special-3"
+        icon: "key-enter"
+        keysym: "Return"
+    --:
+        outline: "placeholder"
+        text: ""