Merge branch 'release-1.39.0' into 'main'

Release 1.39.0

See merge request World/Phosh/squeekboard!655

.gitignore

@@ -1,8 +1,9 @@
-_build
+_build/
 po/squeekboard.pot
 po/*.mo
 TAGS
 tags
+target/
 vgdump
 *.swp
 *~

.gitlab-ci.yml

@@ -23,7 +23,9 @@ stages:
   - deploy
 
 before_script:
-  - echo "deb http://deb.debian.org/debian/ experimental main" > /etc/apt/sources.list.d/experimental.list
+# 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
 
@@ -33,7 +35,7 @@ build_docs:
     paths:
       - _build
   script:
-    - apt-get -y install --on-install-recommends python3-pip python3-sphinx python3-recommonmark
+    - apt-get -y install --no-install-recommends python3-pip python3-sphinx python3-recommonmark
     - ./doc/build.sh _build
   except:
     variables:
@@ -46,7 +48,6 @@ build_meson:
       - _build
     expire_in: 3h
   script:
-    - apt-get -y install -t experimental librust-serde-yaml-dev
     - apt-get -y build-dep .
     - meson . _build/ -Ddepdatadir=/usr/share -Dfind_orphans=true --werror
     - ninja -C _build install
@@ -55,6 +56,7 @@ build_meson:
       - $PKG_ONLY == "1"
 
 build_deb:
+  allow_failure: true
   tags:
     - aarch64
   stage: build
@@ -63,7 +65,17 @@ build_deb:
       - '*.deb'
   script:
     - rm -f ../*.deb
-    - apt-get -y install -t experimental librust-serde-yaml-dev
+# 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)
@@ -83,7 +95,6 @@ build_reference:
     paths:
       - _build/doc
   script:
-    - apt-get -y install -t experimental librust-serde-yaml-dev
     - apt-get -y build-dep .
     - apt-get -y install cargo
     - cd _build
@@ -98,7 +109,6 @@ test:
     - job: build_meson
       artifacts: true
   script:
-    - apt-get -y install -t experimental librust-serde-yaml-dev
     - apt-get -y build-dep .
     - apt-get -y install clang-tidy
     - ninja -C _build test
@@ -111,7 +121,6 @@ test_style:
   stage: test
   needs: []
   script:
-    - apt-get -y install -t experimental librust-serde-yaml-dev
     - apt-get -y build-dep .
     - tools/style-check_source
   except:

COPYING

@@ -1,7 +1,7 @@
                     GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -645,7 +645,7 @@ the "copyright" line and a pointer to where the full notice is found.
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -664,11 +664,11 @@ might be different; for a GUI interface, you would use an "about box".
   You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
+<https://www.gnu.org/licenses/>.
 
   The GNU General Public License does not permit incorporating your program
 into proprietary programs.  If your program is a subroutine library, you
 may consider it more useful to permit linking proprietary applications with
 the library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+<https://www.gnu.org/licenses/why-not-lgpl.html>.

Cargo.lock

@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "anstyle"
-version = "1.0.6"
+version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc"
+checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b"
 
 [[package]]
 name = "async-io"
@@ -62,9 +62,9 @@ dependencies = [
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
@@ -111,15 +111,15 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.0.90"
+version = "1.0.96"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5"
+checksum = "065a29261d53ba54260972629f9ca6bffa69bac13cd1fed61420f7fa68b9f8bd"
 
 [[package]]
 name = "cfg-expr"
-version = "0.15.7"
+version = "0.15.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa50868b64a9a6fda9d593ce778849ea8715cd2a3d2cc17ffdb4a2f2f2f1961d"
+checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02"
 dependencies = [
  "smallvec",
  "target-lexicon",
@@ -158,9 +158,9 @@ checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1"
 
 [[package]]
 name = "concurrent-queue"
-version = "2.4.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363"
+checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973"
 dependencies = [
  "crossbeam-utils",
 ]
@@ -240,7 +240,7 @@ version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f"
 dependencies = [
- "memoffset 0.9.0",
+ "memoffset 0.9.1",
  "rustc_version",
 ]
 
@@ -315,7 +315,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.53",
+ "syn 2.0.60",
 ]
 
 [[package]]
@@ -472,7 +472,7 @@ dependencies = [
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 2.0.53",
+ "syn 2.0.60",
 ]
 
 [[package]]
@@ -545,14 +545,14 @@ dependencies = [
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 2.0.53",
+ "syn 2.0.60",
 ]
 
 [[package]]
 name = "hashbrown"
-version = "0.14.3"
+version = "0.14.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
+checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
 
 [[package]]
 name = "heck"
@@ -604,15 +604,15 @@ dependencies = [
 
 [[package]]
 name = "itoa"
-version = "1.0.10"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c"
+checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
 
 [[package]]
 name = "libc"
-version = "0.2.153"
+version = "0.2.154"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
+checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346"
 
 [[package]]
 name = "linux-raw-sys"
@@ -634,9 +634,9 @@ checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d"
 
 [[package]]
 name = "memchr"
-version = "2.7.1"
+version = "2.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149"
+checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d"
 
 [[package]]
 name = "memmap2"
@@ -658,9 +658,9 @@ dependencies = [
 
 [[package]]
 name = "memoffset"
-version = "0.9.0"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c"
+checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
 dependencies = [
  "autocfg",
 ]
@@ -727,9 +727,9 @@ checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae"
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.13"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58"
+checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
 
 [[package]]
 name = "pin-utils"
@@ -814,18 +814,18 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.79"
+version = "1.0.81"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e"
+checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -896,33 +896,33 @@ checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca"
 
 [[package]]
 name = "serde"
-version = "1.0.197"
+version = "1.0.200"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2"
+checksum = "ddc6f9cc94d67c0e21aaf7eda3a010fd3af78ebf6e096aa6e2e13c79749cce4f"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.197"
+version = "1.0.200"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b"
+checksum = "856f046b9400cee3c8c94ed572ecdb752444c24528c035cd35882aad6f492bcb"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.53",
+ "syn 2.0.60",
 ]
 
 [[package]]
 name = "serde_repr"
-version = "0.1.18"
+version = "0.1.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb"
+checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.53",
+ "syn 2.0.60",
 ]
 
 [[package]]
@@ -936,9 +936,9 @@ dependencies = [
 
 [[package]]
 name = "serde_yaml"
-version = "0.9.33"
+version = "0.9.34+deprecated"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0623d197252096520c6f2a5e1171ee436e5af99a5d7caa2891e55e61950e6d9"
+checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47"
 dependencies = [
  "indexmap",
  "itoa",
@@ -991,9 +991,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.53"
+version = "2.0.60"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7383cd0e49fff4b6b90ca5670bfd3e9d6a733b3f90c686605aa7eec8c4996032"
+checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1021,22 +1021,22 @@ checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f"
 
 [[package]]
 name = "thiserror"
-version = "1.0.58"
+version = "1.0.59"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297"
+checksum = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.58"
+version = "1.0.59"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7"
+checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.53",
+ "syn 2.0.60",
 ]
 
 [[package]]
@@ -1160,7 +1160,7 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
 dependencies = [
- "windows-targets 0.52.4",
+ "windows-targets 0.52.5",
 ]
 
 [[package]]
@@ -1180,17 +1180,18 @@ dependencies = [
 
 [[package]]
 name = "windows-targets"
-version = "0.52.4"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b"
+checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"
 dependencies = [
- "windows_aarch64_gnullvm 0.52.4",
- "windows_aarch64_msvc 0.52.4",
- "windows_i686_gnu 0.52.4",
- "windows_i686_msvc 0.52.4",
- "windows_x86_64_gnu 0.52.4",
- "windows_x86_64_gnullvm 0.52.4",
- "windows_x86_64_msvc 0.52.4",
+ "windows_aarch64_gnullvm 0.52.5",
+ "windows_aarch64_msvc 0.52.5",
+ "windows_i686_gnu 0.52.5",
+ "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",
 ]
 
 [[package]]
@@ -1201,9 +1202,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.52.4"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9"
+checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263"
 
 [[package]]
 name = "windows_aarch64_msvc"
@@ -1213,9 +1214,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.52.4"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675"
+checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6"
 
 [[package]]
 name = "windows_i686_gnu"
@@ -1225,9 +1226,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.52.4"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3"
+checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9"
 
 [[package]]
 name = "windows_i686_msvc"
@@ -1237,9 +1244,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.52.4"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02"
+checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf"
 
 [[package]]
 name = "windows_x86_64_gnu"
@@ -1249,9 +1256,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.52.4"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03"
+checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
@@ -1261,9 +1268,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.52.4"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177"
+checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596"
 
 [[package]]
 name = "windows_x86_64_msvc"
@@ -1273,9 +1280,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.52.4"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8"
+checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
 
 [[package]]
 name = "winnow"

NEWS.md

@@ -1,3 +1,32 @@
+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
 ------------------
 

README.md

@@ -1,7 +1,7 @@
 *squeekboard* - a Wayland on-screen keyboard
 ========================================
 
-*Squeekboard* is a keyboard-shaped input method supporting Wayland, built primarily for the *Librem 5* phone.
+*Squeekboard* is the on-screen keyboard for Phosh. It is primarily designed for smartphones, tablet-PCs, and other devices with touchscreens.
 
 It squeaks because some Rust got inside.
 
@@ -19,7 +19,8 @@ Features
 
 ### TODO
 
-- Text prediction/correction
+- [Port to GTK4 / GTK4-Layer-Shell](https://gitlab.gnome.org/World/Phosh/squeekboard/-/issues/64)
+- [Text prediction/correction](https://gitlab.gnome.org/World/Phosh/squeekboard/-/issues/54)
 - Use preedit
 - Submit actions like "next field" using a future Wayland protocol
 - Pick up DBus interface files from /usr/share
@@ -38,7 +39,7 @@ See `.gitlab-ci.yml` or run `apt-get build-dep .`
 
 ### Build from git repo
 
-```bash
+```sh
 $ git clone https://gitlab.gnome.org/World/Phosh/squeekboard.git
 $ cd squeekboard
 $ mkdir _build
@@ -52,7 +53,7 @@ To run tests use `ninja test`. To install squeekboard run `ninja install`.
 Running
 -------
 
-```bash
+```sh
 $ phoc # if no compatible Wayland compositor is running yet
 $ cd ../build/
 $ src/squeekboard
@@ -62,14 +63,14 @@ Squeekboard's panel will appear whenever a compatible application requests an in
 
 Squeekboard honors the gnome "screen-keyboard-enabled" setting. Either enable this through gnome-settings under accessibility or run:
 
-```bash
+```sh
 $ gsettings set org.gnome.desktop.a11y.applications screen-keyboard-enabled true
 ```
 
 Alternatively, force panel visibility manually with:
 
-```bash
-busctl call --user sm.puri.OSK0 /sm/puri/OSK0 sm.puri.OSK0 SetVisible b true
+```sh
+$ busctl call --user sm.puri.OSK0 /sm/puri/OSK0 sm.puri.OSK0 SetVisible b true
 ```
 
 ### What the compositor has to support

data/common.css

@@ -11,6 +11,10 @@ sq_view.gr_polytonic {
     font-size: 2em;
 }
 
+sq_view.ir_azb {
+    font-size: 1.368em;
+}
+
 sq_button {
     border-radius: 4px;
     margin: 2px;
@@ -36,4 +40,4 @@ sq_button.small {
 sq_view.pin sq_button {
     border-radius: 0px;
     margin: 1px 1px 1px 1px;
-}
+}

data/keyboards/am+phonetic.yaml

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

data/keyboards/am+phonetic_wide.yaml

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

data/keyboards/am.yaml

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

data/keyboards/am_wide.yaml

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

data/keyboards/ara.yaml

@@ -1,11 +1,14 @@
 # Maintained by: Khaled Eldoheiri <khalid@kdehairy.com>
 ---
 outlines:
-    default:   { width: 32.66,  height: 52 }
-    altline:   { width: 48.99,  height: 52 }
-    wide:      { width: 62,     height: 52 }
-    spaceline: { width: 195.96, height: 52 }
-    special:   { width: 35.66,  height: 52 }
+    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 }
 
 views:
     base:
@@ -26,7 +29,7 @@ views:
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers   \\ / < > = [ ]  BackSpace"
+        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
         - "show_letters preferences         space        . Return"
 
 buttons:
@@ -35,7 +38,7 @@ buttons:
             locking:
                 lock_view: "extra"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         icon: "key-shift"
     BackSpace:
         outline: "altline"
@@ -48,23 +51,39 @@ buttons:
     show_numbers:
         action:
             set_view: "numbers"
-        outline: "altline"
+        outline: "change-view-2"
+        label: "123"
+    show_numbers_from_symbols:
+        action:
+            set_view: "numbers"
+        outline: "change-view"
         label: "123"
     show_letters:
         action:
             set_view: "base"
-        outline: "altline"
+        outline: "change-view-2"
         label: "ض"
     show_symbols:
         action:
             set_view: "symbols"
-        outline: "altline"
+        outline: "change-view"
         label: "*/="
     space:
         outline: "spaceline"
-        label: " "
         text: " "
     Return:
-        outline: "altline"
+        outline: "wide"
         icon: "key-enter"
         keysym: "Return"
+    5:
+        outline: "fill"
+    "&":
+        outline: "fill"
+    ":":
+        outline: "fill"
+    √:
+        outline: "fill"
+    ¥:
+        outline: "fill"
+    ">":
+        outline: "fill"

data/keyboards/ara_wide.yaml

@@ -1,11 +1,14 @@
 # Maintained by: Khaled Eldoheiri <khalid@kdehairy.com>
 ---
 outlines:
-    default:   { width: 49,   height: 42 }
-    altline:   { width: 73.5, height: 42 }
-    wide:      { width: 108,  height: 42 }
-    spaceline: { width: 324,  height: 42 }
-    special:   { width: 49,   height: 42 }
+    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 }
 
 views:
     base:
@@ -35,7 +38,7 @@ buttons:
             locking:
                 lock_view: "extra"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         icon: "key-shift"
     BackSpace:
         outline: "altline"
@@ -48,23 +51,40 @@ buttons:
     show_numbers:
         action:
             set_view: "numbers"
-        outline: "altline"
+        outline: "change-view"
         label: "123"
     show_letters:
         action:
             set_view: "base"
-        outline: "altline"
+        outline: "change-view"
         label: "ض"
     show_symbols:
         action:
             set_view: "symbols"
-        outline: "altline"
+        outline: "change-view"
         label: "*/="
     space:
         outline: "spaceline"
-        label: " "
         text: " "
     Return:
         outline: "altline"
         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,10 +1,12 @@
 ---
 outlines:
-    default:   { width: 35.33, height: 52 }
-    altline:   { width: 52.67, height: 52 }
-    wide:      { width: 59,    height: 52 }
-    spaceline: { width: 140,   height: 52 }
-    special:   { width: 44,    height: 52 }
+    default:       { width: 35.33,  height: 52 }
+    altline:       { width: 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 }
 
 views:
     base:
@@ -39,12 +41,12 @@ buttons:
             locking:
                 lock_view: "upper"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         icon: "key-shift"
     BackSpace:
         outline: "altline"
         icon: "edit-clear-symbolic"
-        action: erase
+        action: "erase"
     preferences:
         action: "show_prefs"
         outline: "special"
@@ -52,29 +54,29 @@ buttons:
     show_numbers:
         action:
             set_view: "numbers"
-        outline: "wide"
+        outline: "change-view-2"
         label: "123"
     show_numbers_from_symbols:
         action:
             set_view: "numbers"
-        outline: "altline"
+        outline: "change-view"
         label: "123"
     show_letters:
         action:
             set_view: "base"
-        outline: "wide"
+        outline: "change-view-2"
         label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"
-        outline: "altline"
+        outline: "change-view"
         label: "*/="
     show_eschars:
         action:
             locking:
                 lock_view: "eschars"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         label: "âÂ"
     space:
         outline: "spaceline"

data/keyboards/be_wide.yaml

@@ -1,10 +1,12 @@
 ---
 outlines:
-    default:   { width: 54,  height: 42 }
-    altline:   { width: 81,  height: 42 }
-    wide:      { width: 100, height: 42 }
-    spaceline: { width: 205, height: 42 }
-    special:   { width: 54,  height: 42 }
+    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 }
 
 views:
     base:
@@ -39,12 +41,12 @@ buttons:
             locking:
                 lock_view: "upper"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         icon: "key-shift"
     BackSpace:
         outline: "altline"
         icon: "edit-clear-symbolic"
-        action: erase
+        action: "erase"
     preferences:
         action: "show_prefs"
         outline: "special"
@@ -52,29 +54,29 @@ buttons:
     show_numbers:
         action:
             set_view: "numbers"
-        outline: "wide"
+        outline: "change-view-2"
         label: "123"
     show_numbers_from_symbols:
         action:
             set_view: "numbers"
-        outline: "altline"
+        outline: "change-view"
         label: "123"
     show_letters:
         action:
             set_view: "base"
-        outline: "wide"
+        outline: "change-view-2"
         label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"
-        outline: "altline"
+        outline: "change-view"
         label: "*/="
     show_eschars:
         action:
             locking:
                 lock_view: "eschars"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         label: "âÂ"
     space:
         outline: "spaceline"

data/keyboards/bg+phonetic.yaml

@@ -1,10 +1,14 @@
 ---
 outlines:
-    default:   { width: 32.72, height: 52 }
-    altline:   { width: 47,    height: 52 }
-    wide:      { width: 49.09, height: 52 }
-    spaceline: { width: 185,   height: 52 }
-    special:   { width: 44,    height: 52 }
+    default:       { width: 32.72,  height: 52 }
+    altline:       { width: 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 }
 
 views:
     base:
@@ -20,13 +24,13 @@ views:
     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:
@@ -35,12 +39,12 @@ buttons:
             locking:
                 lock_view: "upper"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         icon: "key-shift"
     BackSpace:
         outline: "altline"
         icon: "edit-clear-symbolic"
-        action: erase
+        action: "erase"
     preferences:
         action: "show_prefs"
         outline: "special"
@@ -48,22 +52,22 @@ buttons:
     show_numbers:
         action:
             set_view: "numbers"
-        outline: "wide"
+        outline: "change-view-2"
         label: "123"
     show_numbers_from_symbols:
         action:
             set_view: "numbers"
-        outline: "altline"
+        outline: "change-view"
         label: "123"
     show_letters:
         action:
             set_view: "base"
-        outline: "wide"
+        outline: "change-view-2"
         label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"
-        outline: "altline"
+        outline: "change-view"
         label: "*/="
     space:
         outline: "spaceline"
@@ -72,3 +76,14 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
+    --:
+        outline: "placeholder"
+        text: ""
+    5:
+        outline: "fill"
+    "&":
+        outline: "fill"
+    √:
+        outline: "fill"
+    ¥:
+        outline: "fill"

data/keyboards/bg+phonetic_wide.yaml

@@ -1,10 +1,13 @@
 ---
 outlines:
-    default:   { width: 48,     height: 42 }
-    altline:   { width: 68.95,  height: 42 }
-    wide:      { width: 72.01,  height: 42 }
-    spaceline: { width: 271.39, height: 42 }
-    special:   { width: 64.55,  height: 42 }
+    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 }
 
 views:
     base:
@@ -25,7 +28,7 @@ views:
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ $ ¥ ^ ° * { }"
-        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
+        - "show_numbers   \\ / < > = [ ]  BackSpace"
         - "show_letters preferences         space        Return"
 
 
@@ -35,12 +38,12 @@ buttons:
             locking:
                 lock_view: "upper"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         icon: "key-shift"
     BackSpace:
         outline: "altline"
         icon: "edit-clear-symbolic"
-        action: erase
+        action: "erase"
     preferences:
         action: "show_prefs"
         outline: "special"
@@ -48,22 +51,17 @@ buttons:
     show_numbers:
         action:
             set_view: "numbers"
-        outline: "wide"
-        label: "123"
-    show_numbers_from_symbols:
-        action:
-            set_view: "numbers"
-        outline: "altline"
+        outline: "change-view"
         label: "123"
     show_letters:
         action:
             set_view: "base"
-        outline: "wide"
+        outline: "change-view"
         label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"
-        outline: "altline"
+        outline: "change-view"
         label: "*/="
     space:
         outline: "spaceline"
@@ -72,3 +70,14 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
+    --:
+        outline: "placeholder"
+        text: ""
+    5:
+        outline: "fill"
+    "&":
+        outline: "fill"
+    √:
+        outline: "fill"
+    ¥:
+        outline: "fill"

data/keyboards/bg.yaml

@@ -1,10 +1,14 @@
 ---
 outlines:
-    default:   { width: 32.72, height: 52 }
-    altline:   { width: 47,    height: 52 }
-    wide:      { width: 49.09, height: 52 }
-    spaceline: { width: 185,   height: 52 }
-    special:   { width: 44,    height: 52 }
+    default:       { width: 32.72,  height: 52 }
+    altline:       { width: 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 }
 
 views:
     base:
@@ -21,12 +25,12 @@ views:
         - "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    ,    Return"
 
 
 buttons:
@@ -35,12 +39,12 @@ buttons:
             locking:
                 lock_view: "upper"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         icon: "key-shift"
     BackSpace:
         outline: "altline"
         icon: "edit-clear-symbolic"
-        action: erase
+        action: "erase"
     preferences:
         action: "show_prefs"
         outline: "special"
@@ -48,22 +52,22 @@ buttons:
     show_numbers:
         action:
             set_view: "numbers"
-        outline: "wide"
+        outline: "change-view-2"
         label: "123"
     show_numbers_from_symbols:
         action:
             set_view: "numbers"
-        outline: "altline"
+        outline: "change-view"
         label: "123"
     show_letters:
         action:
             set_view: "base"
-        outline: "wide"
+        outline: "change-view-2"
         label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"
-        outline: "altline"
+        outline: "change-view"
         label: "*/="
     space:
         outline: "spaceline"
@@ -72,3 +76,14 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
+    --:
+        outline: "placeholder"
+        text: ""
+    5:
+        outline: "fill"
+    "&":
+        outline: "fill"
+    √:
+        outline: "fill"
+    ¥:
+        outline: "fill"

data/keyboards/bg_wide.yaml

@@ -1,10 +1,13 @@
 ---
 outlines:
-    default:   { width: 48,     height: 42 }
-    altline:   { width: 68.95,  height: 42 }
-    wide:      { width: 72.01,  height: 42 }
-    spaceline: { width: 271.39, height: 42 }
-    special:   { width: 64.55,  height: 42 }
+    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 }
 
 views:
     base:
@@ -21,12 +24,12 @@ views:
         - "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 -- \\ / < > = [ ]  BackSpace"
+        - "show_letters preferences         space    ,    Return"
 
 
 buttons:
@@ -35,12 +38,12 @@ buttons:
             locking:
                 lock_view: "upper"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         icon: "key-shift"
     BackSpace:
         outline: "altline"
         icon: "edit-clear-symbolic"
-        action: erase
+        action: "erase"
     preferences:
         action: "show_prefs"
         outline: "special"
@@ -48,22 +51,17 @@ buttons:
     show_numbers:
         action:
             set_view: "numbers"
-        outline: "wide"
-        label: "123"
-    show_numbers_from_symbols:
-        action:
-            set_view: "numbers"
-        outline: "altline"
+        outline: "change-view"
         label: "123"
     show_letters:
         action:
             set_view: "base"
-        outline: "wide"
+        outline: "change-view"
         label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"
-        outline: "altline"
+        outline: "change-view"
         label: "*/="
     space:
         outline: "spaceline"
@@ -72,3 +70,14 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
+    --:
+        outline: "placeholder"
+        text: ""
+    5:
+        outline: "fill"
+    "&":
+        outline: "fill"
+    √:
+        outline: "fill"
+    ¥:
+        outline: "fill"

data/keyboards/br.yaml

@@ -1,32 +1,39 @@
 ---
 outlines:
-    default:   { width: 35.33, height: 52 }
-    altline:   { width: 52.67, height: 52 }
-    wide:      { width: 62,    height: 52 }
-    spaceline: { width: 142,   height: 52 }
-    special:   { width: 44,    height: 52 }
+    default:       { width: 35.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 }
 
 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_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 preferences         space     . Return"
+        - "show_numbers show_eschars preferences         space     ,-large Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
-        - "à À á Á ã Ã â Â é É"
-        - "show_symbols   ê Ê í Í ó Ó ô Ô"
-        - "show_letters        õ Õ ú Ú ü Ü . BackSpace"
+        - "@ # $ % & - _ + ( )"
+        - "show_symbols   , \" ' : ; ! ?  BackSpace"
+        - "show_letters show_eschars preferences space º . Return"
     symbols:
-        - "@ # $ % - + ÷ × = ≠"
-        - "( ) § & < > / * { }"
-        - "show_numbers_from_symbols     º \" ' : ; ! ?  BackSpace"
-        - "show_letters preferences         space        . Return"
+        - "~ ` | · √ π τ ÷ × ¶"
+        - "© ® £ € ¥ ^ ° * { }"
+        - "show_numbers   \\ / < > = [ ]  BackSpace"
+        - "show_letters show_eschars preferences         space       ≠ § Return"
+    eschars:
+        - "À Á Ã Â É Ê Í Ó Ô Õ"
+        - "à á ã â é ê í ó ô õ "
+        - "show_numbers Ú Ü ú ü ! ? . BackSpace"
+        - "show_letters show_eschars preferences         space    « »    Return"
 
 buttons:
     Shift_L:
@@ -34,38 +41,44 @@ buttons:
             locking:
                 lock_view: "upper"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         icon: "key-shift"
     BackSpace:
         outline: "altline"
         icon: "edit-clear-symbolic"
-        action: erase
+        action: "erase"
     preferences:
-        action: show_prefs
+        action: "show_prefs"
         outline: "special"
         icon: "keyboard-mode-symbolic"
     show_numbers:
         action:
             set_view: "numbers"
-        outline: "wide"
-        label: "1ã"
-    show_numbers_from_symbols:
-        action:
-            set_view: "numbers"
-        outline: "altline"
-        label: "1ã"
+        outline: "change-view"
+        label: "123"
     show_letters:
         action:
             set_view: "base"
-        outline: "wide"
+        outline: "change-view"
         label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"
-        outline: "altline"
+        outline: "change-view"
         label: "*/="
-    .:
-        outline: "special"
+    show_eschars:
+        action:
+            locking:
+                lock_view: "eschars"
+                unlock_view: "base"
+        outline: "change-view"
+        label: "Ãã"
+    .-large:
+        outline: "large"
+        text: "."
+    ",-large":
+        outline: "large"
+        text: ","
     space:
         outline: "spaceline"
         text: " "

data/keyboards/br_wide.yaml

@@ -1,32 +1,40 @@
 ---
 outlines:
-    default:   { width: 52,    height: 42 }
-    altline:   { width: 77.52, height: 42 }
-    wide:      { width: 91.25, height: 42 }
-    spaceline: { width: 209,   height: 42 }
-    special:   { width: 64.76, height: 42 }
+    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 }
 
 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_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 preferences         space     . Return"
+        - "show_numbers show_eschars preferences         space     ,-large Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
-        - "à À á Á ã Ã â Â é É"
-        - "show_symbols   ê Ê í Í ó Ó ô Ô"
-        - "show_letters        õ Õ ú Ú ü Ü . BackSpace"
+        - "@ # $ % & - _ + ( )"
+        - "show_symbols   , \" ' : ; ! ?  BackSpace"
+        - "show_letters show_eschars preferences space º .-thin Return"
     symbols:
-        - "@ # $ % - + ÷ × = ≠"
-        - "( ) § & < > / * { }"
-        - "show_numbers_from_symbols     º \" ' : ; ! ?  BackSpace"
-        - "show_letters preferences         space        . Return"
+        - "~ ` | · √ π τ ÷ × ¶"
+        - "© ® £ € ¥ ^ ° * { }"
+        - "show_numbers   \\ / < > = [ ]  BackSpace"
+        - "show_letters show_eschars preferences         space       ≠ § Return"
+    eschars:
+        - "À Á Ã Â É Ê Í Ó Ô Õ"
+        - "à á ã â é ê í ó ô õ "
+        - "show_numbers Ú Ü ú ü ! ? . BackSpace"
+        - "show_letters show_eschars preferences         space    « »    Return"
 
 buttons:
     Shift_L:
@@ -34,38 +42,44 @@ buttons:
             locking:
                 lock_view: "upper"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         icon: "key-shift"
     BackSpace:
         outline: "altline"
         icon: "edit-clear-symbolic"
-        action: erase
+        action: "erase"
     preferences:
-        action: show_prefs
+        action: "show_prefs"
         outline: "special"
         icon: "keyboard-mode-symbolic"
     show_numbers:
         action:
             set_view: "numbers"
-        outline: "wide"
-        label: "1ã"
-    show_numbers_from_symbols:
-        action:
-            set_view: "numbers"
-        outline: "altline"
-        label: "1ã"
+        outline: "change-view"
+        label: "123"
     show_letters:
         action:
             set_view: "base"
-        outline: "wide"
+        outline: "change-view"
         label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"
-        outline: "altline"
+        outline: "change-view"
         label: "*/="
-    .:
-        outline: "special"
+    show_eschars:
+        action:
+            locking:
+                lock_view: "eschars"
+                unlock_view: "base"
+        outline: "change-view"
+        label: "Ãã"
+    .-large:
+        outline: "large"
+        text: "."
+    ",-large":
+        outline: "large"
+        text: ","
     space:
         outline: "spaceline"
         text: " "
@@ -73,3 +87,16 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
+    «:
+        outline: "thin"
+    »:
+        outline: "thin"
+    º:
+        outline: "thin"
+    .-thin:
+        outline: "thin"
+        text: "."
+    ≠:
+        outline: "thin"
+    §:
+        outline: "thin"

data/keyboards/ca.yaml

@@ -1,10 +1,13 @@
 ---
 outlines:
-    default:   { width: 35.33, height: 52 }
-    altline:   { width: 52.67, height: 52 }
-    wide:      { width: 62,    height: 52 }
-    spaceline: { width: 142,   height: 52 }
-    special:   { width: 44,    height: 52 }
+    default:       { width: 35.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 }
 
 views:
     base:
@@ -30,7 +33,7 @@ views:
     eschars:
         - "à â ç é è ê ë î ï ô"
         - "ù û À Â Ç É È Ê Î Ô"
-        - "show_numbers_from_symbols  ' ! ? . ,   BackSpace"
+        - "show_numbers_from_symbols -- ' ! ? . , -- BackSpace"
         - "show_letters preferences         space        show_eschars Return"
 
 buttons:
@@ -39,42 +42,42 @@ buttons:
             locking:
                 lock_view: "upper"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         icon: "key-shift"
     BackSpace:
         outline: "altline"
         icon: "edit-clear-symbolic"
-        action: erase
+        action: "erase"
     preferences:
-        action: show_prefs
+        action: "show_prefs"
         outline: "special"
         icon: "keyboard-mode-symbolic"
     show_numbers:
         action:
             set_view: "numbers"
-        outline: "wide"
+        outline: "change-view-2"
         label: "123"
     show_numbers_from_symbols:
         action:
             set_view: "numbers"
-        outline: "altline"
+        outline: "change-view"
         label: "123"
     show_letters:
         action:
             set_view: "base"
-        outline: "wide"
+        outline: "change-view-2"
         label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"
-        outline: "altline"
+        outline: "change-view"
         label: "*/="
     show_eschars:
         action:
             locking:
                 lock_view: "eschars"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         label: "âÂ"
     space:
         outline: "spaceline"
@@ -83,6 +86,6 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-
-
-
+    --:
+        outline: "placeholder"
+        text: ""

data/keyboards/ca_wide.yaml

@@ -1,10 +1,13 @@
 ---
 outlines:
-    default:   { width: 52,    height: 42 }
-    altline:   { width: 77.52, height: 42 }
-    wide:      { width: 91.25, height: 42 }
-    spaceline: { width: 209,   height: 42 }
-    special:   { width: 64.76, height: 42 }
+    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 }
 
 views:
     base:
@@ -30,7 +33,7 @@ views:
     eschars:
         - "à â ç é è ê ë î ï ô"
         - "ù û À Â Ç É È Ê Î Ô"
-        - "show_numbers_from_symbols  ' ! ? . ,   BackSpace"
+        - "show_numbers_from_symbols -- ' ! ? . , -- BackSpace"
         - "show_letters preferences         space        show_eschars Return"
 
 buttons:
@@ -39,42 +42,42 @@ buttons:
             locking:
                 lock_view: "upper"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         icon: "key-shift"
     BackSpace:
         outline: "altline"
         icon: "edit-clear-symbolic"
-        action: erase
+        action: "erase"
     preferences:
-        action: show_prefs
+        action: "show_prefs"
         outline: "special"
         icon: "keyboard-mode-symbolic"
     show_numbers:
         action:
             set_view: "numbers"
-        outline: "wide"
+        outline: "change-view-2"
         label: "123"
     show_numbers_from_symbols:
         action:
             set_view: "numbers"
-        outline: "altline"
+        outline: "change-view"
         label: "123"
     show_letters:
         action:
             set_view: "base"
-        outline: "wide"
+        outline: "change-view-2"
         label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"
-        outline: "altline"
+        outline: "change-view"
         label: "*/="
     show_eschars:
         action:
             locking:
                 lock_view: "eschars"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         label: "âÂ"
     space:
         outline: "spaceline"
@@ -83,6 +86,6 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-
-
-
+    --:
+        outline: "placeholder"
+        text: ""

data/keyboards/ch+de.yaml

@@ -2,11 +2,13 @@
 
 ---
 outlines:
-    default:   { width: 35.33, height: 52 }
-    altline:   { width: 48,    height: 52 }
-    wide:      { width: 59,    height: 52 }
-    spaceline: { width: 70,    height: 52 }
-    special:   { width: 28,    height: 52 }
+    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 }
 
 views:
     base:
@@ -36,12 +38,12 @@ buttons:
             locking:
                 lock_view: "upper"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         icon: "key-shift"
     BackSpace:
         outline: "altline"
         icon: "edit-clear-symbolic"
-        action: erase
+        action: "erase"
     preferences:
         action: "show_prefs"
         outline: "special"
@@ -49,21 +51,20 @@ buttons:
     show_numbers:
         action:
             set_view: "numbers"
-        outline: "altline"
+        outline: "change-view"
         label: "123"
     show_letters:
         action:
             set_view: "base"
-        outline: "altline"
+        outline: "change-view"
         label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"
-        outline: "altline"
+        outline: "change-view"
         label: "*/="
     space:
         outline: "spaceline"
-        label: " "
         text: " "
     Return:
         outline: "wide"

data/keyboards/ch+de_wide.yaml

@@ -2,11 +2,13 @@
 
 ---
 outlines:
-    default:   { width: 52,     height: 42 }
-    altline:   { width: 70.65,  height: 42 }
-    wide:      { width: 86.84,  height: 42 }
-    spaceline: { width: 103.03, height: 42 }
-    special:   { width: 41.21,  height: 42 }
+    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 }
 
 views:
     base:
@@ -36,12 +38,12 @@ buttons:
             locking:
                 lock_view: "upper"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         icon: "key-shift"
     BackSpace:
         outline: "altline"
         icon: "edit-clear-symbolic"
-        action: erase
+        action: "erase"
     preferences:
         action: "show_prefs"
         outline: "special"
@@ -49,21 +51,20 @@ buttons:
     show_numbers:
         action:
             set_view: "numbers"
-        outline: "altline"
+        outline: "change-view"
         label: "123"
     show_letters:
         action:
             set_view: "base"
-        outline: "altline"
+        outline: "change-view"
         label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"
-        outline: "altline"
+        outline: "change-view"
         label: "*/="
     space:
         outline: "spaceline"
-        label: " "
         text: " "
     Return:
         outline: "wide"

data/keyboards/ch+fr.yaml

@@ -1,11 +1,13 @@
 # Maintained by: Jordi Bossy <jordi@bossy.space>. No Copyright, enjoy!
 ---
 outlines:
-    default:   { width: 35.33, height: 52 }
-    altline:   { width: 48,    height: 52 }
-    wide:      { width: 59,    height: 52 }
-    spaceline: { width: 70,    height: 52 }
-    special:   { width: 28,    height: 52 }
+    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 }
 
 views:
     base:
@@ -32,7 +34,7 @@ views:
         - "à â ç é è ê î ô ù û"
         - "À Â Ç É È Ê Î Ô Ù Û"
         - "show_numbers  æ œ ä ë ï ö ü  BackSpace"
-        - "show_letters show_eschars preferences  ñ Ñ   space        ° ß Return"
+        - "show_letters show_eschars preferences ' space        ° ß Return"
 
 buttons:
     Shift_L:
@@ -40,12 +42,12 @@ buttons:
             locking:
                 lock_view: "upper"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         icon: "key-shift"
     BackSpace:
         outline: "altline"
         icon: "edit-clear-symbolic"
-        action: erase
+        action: "erase"
     preferences:
         action: "show_prefs"
         outline: "special"
@@ -53,30 +55,29 @@ buttons:
     show_numbers:
         action:
             set_view: "numbers"
-        outline: "altline"
+        outline: "change-view"
         label: "123"
     show_letters:
         action:
             set_view: "base"
-        outline: "altline"
+        outline: "change-view"
         label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"
-        outline: "altline"
+        outline: "change-view"
         label: "*/="
     show_eschars:
         action:
             locking:
                 lock_view: "eschars"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         label: "Ââ"
     space:
         outline: "spaceline"
-        label: " "
         text: " "
     Return:
         outline: "wide"
         icon: "key-enter"
-        keysym: "Return"
+        keysym: "Return"

data/keyboards/ch+fr_wide.yaml

@@ -1,11 +1,14 @@
 # Maintained by: Jordi Bossy <jordi@bossy.space>. No Copyright, enjoy!
 ---
 outlines:
-    default:   { width: 52,     height: 42 }
-    altline:   { width: 70.65,  height: 42 }
-    wide:      { width: 86.84,  height: 42 }
-    spaceline: { width: 103.03, height: 42 }
-    special:   { width: 41.21,  height: 42 }
+    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 }
 
 views:
     base:
@@ -27,12 +30,12 @@ views:
         - "€ $ £ ¥ % | § µ [ ]"
         - "© ® § ` ^ { } · ¡ ¿"
         - "show_numbers  « » ÷ × “ ” „ BackSpace"
-        - "show_letters show_eschars preferences    -   space        , . Return"
+        - "show_letters show_eschars preferences    --thin   space        , . Return"
     eschars:
         - "à â ç é è ê î ô ù û"
         - "À Â Ç É È Ê Î Ô Ù Û"
         - "show_numbers  æ œ ä ë ï ö ü  BackSpace"
-        - "show_letters show_eschars preferences  ñ Ñ   space        ° ß Return"
+        - "show_letters show_eschars preferences ' space        ° ß Return"
 
 buttons:
     Shift_L:
@@ -40,12 +43,12 @@ buttons:
             locking:
                 lock_view: "upper"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         icon: "key-shift"
     BackSpace:
         outline: "altline"
         icon: "edit-clear-symbolic"
-        action: erase
+        action: "erase"
     preferences:
         action: "show_prefs"
         outline: "special"
@@ -53,30 +56,46 @@ buttons:
     show_numbers:
         action:
             set_view: "numbers"
-        outline: "altline"
+        outline: "change-view"
         label: "123"
     show_letters:
         action:
             set_view: "base"
-        outline: "altline"
+        outline: "change-view"
         label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"
-        outline: "altline"
+        outline: "change-view"
         label: "*/="
     show_eschars:
         action:
             locking:
                 lock_view: "eschars"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         label: "Ââ"
     space:
         outline: "spaceline"
-        label: " "
         text: " "
     Return:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
+    "'":
+        outline: "thin"
+    "\"":
+        outline: "thin"
+    _:
+        outline: "thin"
+    --thin:
+        outline: "thin"
+        text: "-"
+    .:
+        outline: "thin"
+    ",":
+        outline: "thin"
+    ß:
+        outline: "thin"
+    °:
+        outline: "thin"

data/keyboards/ch.yaml

@@ -3,12 +3,14 @@
 
 ---
 outlines:
-    default:     { width: 35.33,  height: 58 }
-    doublewidth: { width: 70.66,  height: 58 }
-    altline:     { width: 52.8,   height: 58 }
-    wide:        { width: 64.9,   height: 58 }
-    spaceline:   { width: 116.67, height: 58 }
-    special:     { width: 30.41,  height: 58 }
+    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 }
 
 views:
     base:
@@ -43,7 +45,7 @@ buttons:
             locking:
                 lock_view: "upper"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         icon: "key-shift"
     BackSpace:
         outline: "altline"
@@ -56,28 +58,27 @@ buttons:
     show_numbers:
         action:
             set_view: "numbers"
-        outline: "altline"
+        outline: "change-view"
         label: "123"
     show_letters:
         action:
             set_view: "base"
-        outline: "altline"
+        outline: "change-view"
         label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"
-        outline: "altline"
+        outline: "change-view"
         label: "*/="
     show_eschars:
         action:
             locking:
                 lock_view: "eschars"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         label: "Ââ"
     Space:
         outline: "spaceline"
-        label: " "
         text: " "
     Return:
         outline: "wide"

data/keyboards/ch_wide.yaml

@@ -3,14 +3,16 @@
 
 ---
 outlines:
-    default:     { width: 48,  height: 42 }
-    doublewidth: { width: 96,  height: 42 }
-    narrow:      { width: 33,  height: 42 }
-    large:       { width: 66,  height: 42 }
-    altline:     { width: 72,  height: 42 }
-    wide:        { width: 108, height: 42 }
-    spaceline:   { width: 162, height: 42 }
-    special:     { width: 48,  height: 42 }
+    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 }
 
 views:
     base:
@@ -45,7 +47,7 @@ buttons:
             locking:
                 lock_view: "upper"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         icon: "key-shift"
     BackSpace:
         outline: "altline"
@@ -58,28 +60,27 @@ buttons:
     show_numbers:
         action:
             set_view: "numbers"
-        outline: "altline"
+        outline: "change-view"
         label: "123"
     show_letters:
         action:
             set_view: "base"
-        outline: "altline"
+        outline: "change-view"
         label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"
-        outline: "altline"
+        outline: "change-view"
         label: "*/="
     show_eschars:
         action:
             locking:
                 lock_view: "eschars"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         label: "Ââ"
     Space:
         outline: "spaceline"
-        label: " "
         text: " "
     Return:
         outline: "wide"
@@ -87,7 +88,7 @@ buttons:
         keysym: "Return"
     °:
         outline: "large"
-    ".":
+    .:
         outline: "narrow"
     ",":
         outline: "narrow"

data/keyboards/cz+qwerty.yaml

@@ -1,42 +1,44 @@
 ---
 outlines:
-    default:   { width: 35.33, height: 52 }
-    altline:   { width: 52.67, height: 52 }
-    wide:      { width: 52.67, height: 52 }
-    spaceline: { width: 106,   height: 52 }
-    special:   { width: 35.33, height: 52 }
+    default:       { width: 35.33, height: 52 }
+    altline:       { width: 52.67, height: 52 }
+    wide:          { width: 52.67, height: 52 }
+    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 }
 
 views:
     base:
         - "q w e r t y u i o p"
         - "a s d f g h j k l"
         - "Shift_L    z x c v b n m    BackSpace"
-        - "show_numbers preferences show_accents    space    , . Return"
+        - "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 preferences show_upper_accents    space    ! ? Return"
+        - "show_numbers show_upper_accents preferences     space    ! ? Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
         - "show_symbols    , \" ' : ; ! ?    BackSpace"
-        - "show_letters preferences show_accents    space    , . Return"
+        - "show_letters show_accents preferences     space    , . Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers_from_symbols    \\ / < > = [ ]    BackSpace"
-        - "show_letters preferences show_accents    space    , . Return"
+        - "show_numbers    \\ / < > = [ ]    BackSpace"
+        - "show_letters show_accents preferences     space    , . Return"
     accents:
         - "ä ě é ř ť ý ů í ó ö"
         - "á š ď ë ŕ ú ü ô ľ"
         - "accents_Shift_L    ž ß č ç ñ ň ĺ    BackSpace"
-        - "show_letters preferences show_accents    space    , . Return"
+        - "show_letters show_accents preferences     space    , . Return"
     upper_accents:
         - "Ä Ě É Ř Ť Ý Ů Í Ó Ö"
         - "Á Š Ď Ë Ŕ Ú Ü Ô Ľ"
         - "accents_Shift_L    Ž ẞ Č Ç Ñ Ň Ĺ    BackSpace"
-        - "show_letters preferences show_upper_accents    space    , . Return"
+        - "show_letters show_upper_accents preferences     space    , . Return"
 
 buttons:
     Shift_L:
@@ -44,56 +46,51 @@ buttons:
             locking:
                 lock_view: "upper"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         icon: "key-shift"
     accents_Shift_L:
         action:
             locking:
                 lock_view: "upper_accents"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         icon: "key-shift"
     BackSpace:
         outline: "altline"
         icon: "edit-clear-symbolic"
-        action: erase
+        action: "erase"
     preferences:
-        action: show_prefs
+        action: "show_prefs"
         outline: "special"
         icon: "keyboard-mode-symbolic"
     show_numbers:
         action:
             set_view: "numbers"
-        outline: "wide"
-        label: "123"
-    show_numbers_from_symbols:
-        action:
-            set_view: "numbers"
-        outline: "altline"
+        outline: "change-view"
         label: "123"
     show_letters:
         action:
             set_view: "base"
-        outline: "wide"
+        outline: "change-view"
         label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"
-        outline: "altline"
+        outline: "change-view"
         label: "*/="
     show_accents:
         action:
             locking:
                 lock_view: "accents"
                 unlock_view: "base"
-        outline: "special"
+        outline: "change-view-2"
         label: "á"
     show_upper_accents:
         action:
             locking:
                 lock_view: "upper_accents"
                 unlock_view: "base"
-        outline: "special"
+        outline: "change-view-2"
         label: "Á"
     space:
         outline: "spaceline"

data/keyboards/cz+qwerty_wide.yaml

@@ -1,42 +1,44 @@
 ---
 outlines:
-    default:   { width: 54,  height: 42 }
-    altline:   { width: 81,  height: 42 }
-    wide:      { width: 81,  height: 42 }
-    spaceline: { width: 162, height: 42 }
-    special:   { width: 54,  height: 42 }
+    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 }
 
 views:
     base:
         - "q w e r t y u i o p"
         - "a s d f g h j k l"
         - "Shift_L    z x c v b n m    BackSpace"
-        - "show_numbers preferences show_accents    space    , . Return"
+        - "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 preferences show_upper_accents    space    ! ? Return"
+        - "show_numbers show_upper_accents preferences     space    ! ? Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
         - "show_symbols    , \" ' : ; ! ?    BackSpace"
-        - "show_letters preferences show_accents    space    , . Return"
+        - "show_letters show_accents preferences     space    , . Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers_from_symbols    \\ / < > = [ ]    BackSpace"
-        - "show_letters preferences show_accents    space    , . Return"
+        - "show_numbers    \\ / < > = [ ]    BackSpace"
+        - "show_letters show_accents preferences     space    , . Return"
     accents:
         - "ä ě é ř ť ý ů í ó ö"
         - "á š ď ë ŕ ú ü ô ľ"
         - "accents_Shift_L    ž ß č ç ñ ň ĺ    BackSpace"
-        - "show_letters preferences show_accents    space    , . Return"
+        - "show_letters show_accents preferences     space    , . Return"
     upper_accents:
         - "Ä Ě É Ř Ť Ý Ů Í Ó Ö"
         - "Á Š Ď Ë Ŕ Ú Ü Ô Ľ"
         - "accents_Shift_L    Ž ẞ Č Ç Ñ Ň Ĺ    BackSpace"
-        - "show_letters preferences show_upper_accents    space    , . Return"
+        - "show_letters show_upper_accents preferences     space    , . Return"
 
 buttons:
     Shift_L:
@@ -44,56 +46,51 @@ buttons:
             locking:
                 lock_view: "upper"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         icon: "key-shift"
     accents_Shift_L:
         action:
             locking:
                 lock_view: "upper_accents"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         icon: "key-shift"
     BackSpace:
         outline: "altline"
         icon: "edit-clear-symbolic"
-        action: erase
+        action: "erase"
     preferences:
-        action: show_prefs
+        action: "show_prefs"
         outline: "special"
         icon: "keyboard-mode-symbolic"
     show_numbers:
         action:
             set_view: "numbers"
-        outline: "wide"
-        label: "123"
-    show_numbers_from_symbols:
-        action:
-            set_view: "numbers"
-        outline: "altline"
+        outline: "change-view"
         label: "123"
     show_letters:
         action:
             set_view: "base"
-        outline: "wide"
+        outline: "change-view"
         label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"
-        outline: "altline"
+        outline: "change-view"
         label: "*/="
     show_accents:
         action:
             locking:
                 lock_view: "accents"
                 unlock_view: "base"
-        outline: "special"
+        outline: "change-view-2"
         label: "á"
     show_upper_accents:
         action:
             locking:
                 lock_view: "upper_accents"
                 unlock_view: "base"
-        outline: "special"
+        outline: "change-view-2"
         label: "Á"
     space:
         outline: "spaceline"

data/keyboards/cz.yaml

@@ -1,42 +1,44 @@
 ---
 outlines:
-    default:   { width: 35.33, height: 52 }
-    altline:   { width: 52.67, height: 52 }
-    wide:      { width: 52.67, height: 52 }
-    spaceline: { width: 106,   height: 52 }
-    special:   { width: 35.33, height: 52 }
+    default:       { width: 35.33, height: 52 }
+    altline:       { width: 52.67, height: 52 }
+    wide:          { width: 52.67, height: 52 }
+    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 }
 
 views:
     base:
         - "q w e r t z u i o p"
         - "a s d f g h j k l"
         - "Shift_L    y x c v b n m    BackSpace"
-        - "show_numbers preferences show_accents    space    , . Return"
+        - "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 preferences show_upper_accents    space    ! ? Return"
+        - "show_numbers show_upper_accents preferences     space    ! ? Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
         - "show_symbols    , \" ' : ; ! ?    BackSpace"
-        - "show_letters preferences show_accents    space    , . Return"
+        - "show_letters show_accents preferences     space    , . Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers_from_symbols    \\ / < > = [ ]    BackSpace"
-        - "show_letters preferences show_accents    space    , . Return"
+        - "show_numbers    \\ / < > = [ ]    BackSpace"
+        - "show_letters show_accents preferences     space    , . Return"
     accents:
         - "ä ě é ř ť ž ů í ó ö"
         - "á š ď ë ŕ ú ü ô ľ"
         - "accents_Shift_L    ý ß č ç ñ ň ĺ    BackSpace"
-        - "show_letters preferences show_accents    space    , . Return"
+        - "show_letters show_accents preferences     space    , . Return"
     upper_accents:
         - "Ä Ě É Ř Ť Ž Ů Í Ó Ö"
         - "Á Š Ď Ë Ŕ Ú Ü Ô Ľ"
         - "accents_Shift_L    Ý ẞ Č Ç Ñ Ň Ĺ    BackSpace"
-        - "show_letters preferences show_upper_accents    space    , . Return"
+        - "show_letters show_upper_accents preferences     space    , . Return"
 
 buttons:
     Shift_L:
@@ -44,56 +46,51 @@ buttons:
             locking:
                 lock_view: "upper"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         icon: "key-shift"
     accents_Shift_L:
         action:
             locking:
                 lock_view: "upper_accents"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         icon: "key-shift"
     BackSpace:
         outline: "altline"
         icon: "edit-clear-symbolic"
-        action: erase
+        action: "erase"
     preferences:
-        action: show_prefs
+        action: "show_prefs"
         outline: "special"
         icon: "keyboard-mode-symbolic"
     show_numbers:
         action:
             set_view: "numbers"
-        outline: "wide"
-        label: "123"
-    show_numbers_from_symbols:
-        action:
-            set_view: "numbers"
-        outline: "altline"
+        outline: "change-view"
         label: "123"
     show_letters:
         action:
             set_view: "base"
-        outline: "wide"
+        outline: "change-view"
         label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"
-        outline: "altline"
+        outline: "change-view"
         label: "*/="
     show_accents:
         action:
             locking:
                 lock_view: "accents"
                 unlock_view: "base"
-        outline: "special"
+        outline: "change-view-2"
         label: "á"
     show_upper_accents:
         action:
             locking:
                 lock_view: "upper_accents"
                 unlock_view: "base"
-        outline: "special"
+        outline: "change-view-2"
         label: "Á"
     space:
         outline: "spaceline"

data/keyboards/cz_wide.yaml

@@ -1,42 +1,44 @@
 ---
 outlines:
-    default:   { width: 54,  height: 42 }
-    altline:   { width: 81,  height: 42 }
-    wide:      { width: 81,  height: 42 }
-    spaceline: { width: 162, height: 42 }
-    special:   { width: 54,  height: 42 }
+    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 }
 
 views:
     base:
         - "q w e r t z u i o p"
         - "a s d f g h j k l"
         - "Shift_L    y x c v b n m    BackSpace"
-        - "show_numbers preferences show_accents    space    , . Return"
+        - "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 preferences show_upper_accents    space    ! ? Return"
+        - "show_numbers show_upper_accents preferences     space    ! ? Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
         - "show_symbols    , \" ' : ; ! ?    BackSpace"
-        - "show_letters preferences show_accents    space    , . Return"
+        - "show_letters show_accents preferences     space    , . Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers_from_symbols    \\ / < > = [ ]    BackSpace"
-        - "show_letters preferences show_accents    space    , . Return"
+        - "show_numbers    \\ / < > = [ ]    BackSpace"
+        - "show_letters show_accents preferences     space    , . Return"
     accents:
         - "ä ě é ř ť ž ů í ó ö"
         - "á š ď ë ŕ ú ü ô ľ"
         - "accents_Shift_L    ý ß č ç ñ ň ĺ    BackSpace"
-        - "show_letters preferences show_accents    space    , . Return"
+        - "show_letters show_accents preferences     space    , . Return"
     upper_accents:
         - "Ä Ě É Ř Ť Ž Ů Í Ó Ö"
         - "Á Š Ď Ë Ŕ Ú Ü Ô Ľ"
         - "accents_Shift_L    Ý ẞ Č Ç Ñ Ň Ĺ    BackSpace"
-        - "show_letters preferences show_upper_accents    space    , . Return"
+        - "show_letters show_upper_accents preferences     space    , . Return"
 
 buttons:
     Shift_L:
@@ -44,56 +46,51 @@ buttons:
             locking:
                 lock_view: "upper"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         icon: "key-shift"
     accents_Shift_L:
         action:
             locking:
                 lock_view: "upper_accents"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         icon: "key-shift"
     BackSpace:
         outline: "altline"
         icon: "edit-clear-symbolic"
-        action: erase
+        action: "erase"
     preferences:
-        action: show_prefs
+        action: "show_prefs"
         outline: "special"
         icon: "keyboard-mode-symbolic"
     show_numbers:
         action:
             set_view: "numbers"
-        outline: "wide"
-        label: "123"
-    show_numbers_from_symbols:
-        action:
-            set_view: "numbers"
-        outline: "altline"
+        outline: "change-view"
         label: "123"
     show_letters:
         action:
             set_view: "base"
-        outline: "wide"
+        outline: "change-view"
         label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"
-        outline: "altline"
+        outline: "change-view"
         label: "*/="
     show_accents:
         action:
             locking:
                 lock_view: "accents"
                 unlock_view: "base"
-        outline: "special"
+        outline: "change-view-2"
         label: "á"
     show_upper_accents:
         action:
             locking:
                 lock_view: "upper_accents"
                 unlock_view: "base"
-        outline: "special"
+        outline: "change-view-2"
         label: "Á"
     space:
         outline: "spaceline"

data/keyboards/de.yaml

@@ -1,10 +1,11 @@
 ---
 outlines:
-    default:   { width: 35.33, height: 52 }
-    altline:   { width: 52.67, height: 52 }
-    wide:      { width: 62,    height: 52 }
-    spaceline: { width: 89.3,  height: 52 }
-    special:   { width: 35.33, height: 52 }
+    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 }
 
 views:
     base:
@@ -29,8 +30,8 @@ views:
         - "show_letters show_eschars preferences         space        , . Return"
     eschars:
         - "ä è é ö ü Ä È É Ö Ü"
-        - "à â ê î ô À Â È Î Ô"
-        - "show_numbers  « » ç Ç æ œ ß  BackSpace"
+        - "à â ê î ô À Â Ê Î Ô"
+        - "show_numbers  « » ç Ç æ œ ß-subtle-highlight  BackSpace"
         - "show_letters show_eschars preferences         space        „ “ Return"
 
 buttons:
@@ -39,7 +40,7 @@ buttons:
             locking:
                 lock_view: "upper"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         icon: "key-shift"
     BackSpace:
         outline: "altline"
@@ -52,24 +53,24 @@ buttons:
     show_numbers:
         action:
             set_view: "numbers"
-        outline: "altline"
+        outline: "change-view"
         label: "123"
     show_letters:
         action:
             set_view: "base"
-        outline: "altline"
+        outline: "change-view"
         label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"
-        outline: "altline"
+        outline: "change-view"
         label: "*/="
     show_eschars:
         action:
             locking:
                 lock_view: "eschars"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         label: "Ää"
     space:
         outline: "spaceline"
@@ -78,3 +79,18 @@ buttons:
         outline: "altline"
         icon: "key-enter"
         keysym: "Return"
+    ä:
+        outline: "subtle-highlight"
+    ö:
+        outline: "subtle-highlight"
+    ü:
+        outline: "subtle-highlight"
+    Ä:
+        outline: "subtle-highlight"
+    Ö:
+        outline: "subtle-highlight"
+    Ü:
+        outline: "subtle-highlight"
+    ß-subtle-highlight:
+        outline: "subtle-highlight"
+        text: "ß"

data/keyboards/de_wide.yaml

@@ -1,13 +1,17 @@
 ---
 outlines:
-    default:   { width: 48,   height: 42 }
-    halfwidth: { width: 24,   height: 42 }
-    thin:      { width: 30,   height: 42 }
-    narrow:    { width: 40.5, height: 42 }
-    altline:   { width: 81,   height: 42 }
-    wide:      { width: 108,  height: 42 }
-    spaceline: { width: 156,  height: 42 }
-    special:   { width: 48,   height: 42 }
+    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 }
 
 views:
     base:
@@ -23,17 +27,17 @@ views:
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # € % & - _ + ( )"
-        - "show_symbols   ; \" ' : = < >  BackSpace"
+        - "show_symbols   ; \" ' : = < > -- BackSpace"
         - "show_letters show_eschars preferences         space        ,-narrow .-narrow Return"
     symbols:
         - "~ ` ´ | · √ µ ÷ × ¶"
         - "© ® £ $ ¥ ^ ° * { }"
-        - "show_numbers   \\ / § π τ [ ]  BackSpace"
+        - "show_numbers   \\ / § π τ [ ] -- BackSpace"
         - "show_letters show_eschars preferences         space        ,-narrow .-narrow Return"
     eschars:
-        - "ä è é ö ü Ä È É Ö Ü"
-        - "à â ê î ô À Â È Î Ô"
-        - "show_numbers  « » ç Ç æ œ ß  BackSpace"
+        - "ä-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:
@@ -42,7 +46,7 @@ buttons:
             locking:
                 lock_view: "upper"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         icon: "key-shift"
     BackSpace:
         outline: "altline"
@@ -55,24 +59,24 @@ buttons:
     show_numbers:
         action:
             set_view: "numbers"
-        outline: "altline"
+        outline: "change-view"
         label: "123"
     show_letters:
         action:
             set_view: "base"
-        outline: "altline"
+        outline: "change-view"
         label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"
-        outline: "altline"
+        outline: "change-view"
         label: "*/="
     show_eschars:
         action:
             locking:
                 lock_view: "eschars"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         label: "Ää"
     space:
         outline: "spaceline"
@@ -103,3 +107,37 @@ buttons:
     ß-thin:
         outline: "thin"
         text: "ß"
+    ä-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: "placeholder"
+        text: ""
+    5:
+        outline: "fill"
+    "&":
+        outline: "fill"
+    ·:
+        outline: "fill"
+    ¥:
+        outline: "fill"
+    ô:
+        outline: "fill"

data/keyboards/dk.yaml

@@ -1,30 +1,36 @@
 ---
 outlines:
-    default:   { width: 32,       height: 52 }
-    altline:   { width: 48.39024, height: 52 }
-    wide:      { width: 62,       height: 52 }
-    spaceline: { width: 150.5853, height: 52 }
+    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 }
 
 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"
+        - "Shift_L   z x c v b n m , BackSpace"
         - "show_numbers preferences         space        .    Return"
     upper:
         - "Q W E R T Y U I O P Å"
         - "A S D F G H J K L Ø Æ"
-        - "Shift_L   Z X C V B N M  BackSpace"
+        - "Shift_L   Z X C V B N M , BackSpace"
         - "show_numbers preferences         space        .    Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
-        - "show_symbols   , \" ' : ; ! ?  BackSpace"
+        - "show_symbols -- , \" ' : ; ! ?  BackSpace"
         - "show_letters preferences         space        .    Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers   \\ / < > = [ ]  BackSpace"
+        - "show_numbers_from_symbols -- \\ / < > = [ ]  BackSpace"
         - "show_letters preferences         space        .    Return"
 
 buttons:
@@ -33,33 +39,38 @@ buttons:
             locking:
                 lock_view: "upper"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         icon: "key-shift"
     BackSpace:
         outline: "altline"
         icon: "edit-clear-symbolic"
-        action: erase
+        action: "erase"
     preferences:
         action: "show_prefs"
-        outline: "altline"
+        outline: "special"
         icon: "keyboard-mode-symbolic"
     show_numbers:
         action:
             set_view: "numbers"
-        outline: "altline"
+        outline: "change-view-2"
+        label: "123"
+    show_numbers_from_symbols:
+        action:
+            set_view: "numbers"
+        outline: "change-view"
         label: "123"
     show_letters:
         action:
             set_view: "base"
-        outline: "altline"
+        outline: "change-view-2"
         label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"
-        outline: "altline"
+        outline: "change-view"
         label: "*/="
-    ".":
-        outline: altline
+    .:
+        outline: "large"
     space:
         outline: "spaceline"
         text: " "
@@ -67,3 +78,14 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
+    --:
+        outline: "placeholder"
+        text: ""
+    5:
+        outline: "fill"
+    "&":
+        outline: "fill"
+    √:
+        outline: "fill"
+    ¥:
+        outline: "fill"

data/keyboards/dk_wide.yaml

@@ -1,30 +1,34 @@
 ---
 outlines:
-    default:   { width: 48,     height: 42 }
-    altline:   { width: 72.58,  height: 42 }
-    wide:      { width: 92.99,  height: 42 }
-    spaceline: { width: 225.87, height: 42 }
+    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 }
 
 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"
+        - "Shift_L   z x c v b n m , BackSpace"
         - "show_numbers preferences         space        .    Return"
     upper:
         - "Q W E R T Y U I O P Å"
         - "A S D F G H J K L Ø Æ"
-        - "Shift_L   Z X C V B N M  BackSpace"
+        - "Shift_L   Z X C V B N M , BackSpace"
         - "show_numbers preferences         space        .    Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
-        - "show_symbols   , \" ' : ; ! ?  BackSpace"
+        - "show_symbols -- , \" ' : ; ! ?  BackSpace"
         - "show_letters preferences         space        .    Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers   \\ / < > = [ ]  BackSpace"
+        - "show_numbers -- \\ / < > = [ ]  BackSpace"
         - "show_letters preferences         space        .    Return"
 
 buttons:
@@ -33,33 +37,31 @@ buttons:
             locking:
                 lock_view: "upper"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         icon: "key-shift"
     BackSpace:
         outline: "altline"
         icon: "edit-clear-symbolic"
-        action: erase
+        action: "erase"
     preferences:
         action: "show_prefs"
-        outline: "altline"
+        outline: "special"
         icon: "keyboard-mode-symbolic"
     show_numbers:
         action:
             set_view: "numbers"
-        outline: "altline"
+        outline: "change-view"
         label: "123"
     show_letters:
         action:
             set_view: "base"
-        outline: "altline"
+        outline: "change-view"
         label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"
-        outline: "altline"
+        outline: "change-view"
         label: "*/="
-    ".":
-        outline: altline
     space:
         outline: "spaceline"
         text: " "
@@ -67,3 +69,14 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
+    --:
+        outline: "placeholder"
+        text: ""
+    5:
+        outline: "fill"
+    "&":
+        outline: "fill"
+    √:
+        outline: "fill"
+    ¥:
+        outline: "fill"

data/keyboards/email/us.yaml

@@ -1,11 +1,12 @@
 ---
 outlines:
-    default:   { width: 35.33, height: 52 }
-    altline:   { width: 52.67, height: 52 }
-    wide:      { width: 62, height: 52 }
-    spaceline: { width: 106.67, height: 52 }
-    special:   { width: 44,     height: 52 }
-    large:     { width: 44,     height: 52 }
+    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 }
 
 views:
     base:
@@ -35,12 +36,12 @@ buttons:
             locking:
                 lock_view: "upper"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         icon: "key-shift"
     BackSpace:
         outline: "altline"
         icon: "edit-clear-symbolic"
-        action: erase
+        action: "erase"
     "@":
         outline: "large"
     preferences:
@@ -50,22 +51,22 @@ buttons:
     show_numbers:
         action:
             set_view: "numbers"
-        outline: "wide"
+        outline: "change-view-2"
         label: "123"
     show_numbers_from_symbols:
         action:
             set_view: "numbers"
-        outline: "altline"
+        outline: "change-view"
         label: "123"
     show_letters:
         action:
             set_view: "base"
-        outline: "wide"
+        outline: "change-view-2"
         label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"
-        outline: "altline"
+        outline: "change-view"
         label: "*/="
     .:
         outline: "large"

data/keyboards/email/us_wide.yaml

@@ -1,11 +1,12 @@
 ---
 outlines:
-    default:   { width: 52,    height: 42 }
-    altline:   { width: 77.52, height: 42 }
-    wide:      { width: 91.25, height: 42 }
-    spaceline: { width: 157,   height: 42 }
-    special:   { width: 64.76, height: 42 }
-    large:     { width: 54.76, height: 42 }
+    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 }
 
 views:
     base:
@@ -35,12 +36,12 @@ buttons:
             locking:
                 lock_view: "upper"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         icon: "key-shift"
     BackSpace:
         outline: "altline"
         icon: "edit-clear-symbolic"
-        action: erase
+        action: "erase"
     "@":
         outline: "large"
     preferences:
@@ -50,22 +51,22 @@ buttons:
     show_numbers:
         action:
             set_view: "numbers"
-        outline: "wide"
+        outline: "change-view-2"
         label: "123"
     show_numbers_from_symbols:
         action:
             set_view: "numbers"
-        outline: "altline"
+        outline: "change-view"
         label: "123"
     show_letters:
         action:
             set_view: "base"
-        outline: "wide"
+        outline: "change-view-2"
         label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"
-        outline: "altline"
+        outline: "change-view"
         label: "*/="
     .:
         outline: "large"

data/keyboards/epo.yaml

@@ -1,17 +1,21 @@
 ---
 outlines:
-    default:   { width: 35.33, height: 52 }
-    altline:   { width: 52.67, height: 52 }
-    wide:      { width: 62,    height: 52 }
-    spaceline: { width: 99.67, height: 52 }
-    special:   { width: 35.33, height: 52 }
+    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 }
 
 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_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"
@@ -21,16 +25,16 @@ views:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
         - "show_symbols   , \" ' : ; ! ?  BackSpace"
-        - "show_letters preferences         space        . Return"
+        - "show_letters show_eschars preferences         space       .-large Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
         - "show_numbers   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        . Return"
+        - "show_letters show_eschars preferences         space       , . Return"
     eschars:
-        - "ĉ ĝ ĥ ĵ ŝ ŭ ?"
-        - "Ĉ Ĝ Ĥ Ĵ Ŝ Ŭ !"
-        - "show_numbers ' - 🐊 💚 🌐 . BackSpace"
+        - "-- -- ĉ ĝ ĥ ĵ ŝ ŭ ? --"
+        - "-- -- Ĉ Ĝ Ĥ Ĵ Ŝ Ŭ ! --"
+        - "show_numbers ' \" - – , . … BackSpace"
         - "show_letters show_eschars preferences         space        „ “ Return"
 
 buttons:
@@ -39,7 +43,7 @@ buttons:
             locking:
                 lock_view: "upper"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         icon: "key-shift"
     BackSpace:
         outline: "altline"
@@ -52,30 +56,35 @@ buttons:
     show_numbers:
         action:
             set_view: "numbers"
-        outline: "altline"
+        outline: "change-view"
         label: "123"
     show_letters:
         action:
             set_view: "base"
-        outline: "altline"
+        outline: "change-view"
         label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"
-        outline: "altline"
+        outline: "change-view"
         label: "*/="
     show_eschars:
         action:
             locking:
                 lock_view: "eschars"
                 unlock_view: "base"
-        outline: "altline"
-        label: "ŭŜ"
+        outline: "change-view"
+        label: "Ŝŭ"
     space:
         outline: "spaceline"
-        label: " "
         text: " "
     Return:
-        outline: "altline"
+        outline: "wide"
         icon: "key-enter"
         keysym: "Return"
+    --:
+        outline: "placeholder"
+        text: ""
+    .-large:
+        outline: "large"
+        text: "."

data/keyboards/epo_wide.yaml

@@ -1,36 +1,41 @@
 ---
 outlines:
-    default:   { width: 52,    height: 42 }
-    altline:   { width: 77.52, height: 42 }
-    wide:      { width: 91.25, height: 42 }
-    spaceline: { width: 146.7, height: 42 }
-    special:   { width: 52,    height: 42 }
+    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 }
 
 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_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_numbers show_eschars preferences         space        !-thin ?-thin Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
         - "show_symbols   , \" ' : ; ! ?  BackSpace"
-        - "show_letters preferences         space        . Return"
+        - "show_letters show_eschars preferences         space       .-large Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
         - "show_numbers   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        . Return"
+        - "show_letters show_eschars preferences         space       ,-thin .-thin Return"
     eschars:
-        - "ĉ ĝ ĥ ĵ ŝ ŭ ?"
-        - "Ĉ Ĝ Ĥ Ĵ Ŝ Ŭ !"
-        - "show_numbers ' - 🐊 💚 🌐 . BackSpace"
+        - "-- -- ĉ ĝ ĥ ĵ ŝ ŭ ? --"
+        - "-- -- Ĉ Ĝ Ĥ Ĵ Ŝ Ŭ ! --"
+        - "show_numbers ' \" - – , . … BackSpace"
         - "show_letters show_eschars preferences         space        „ “ Return"
 
 buttons:
@@ -39,7 +44,7 @@ buttons:
             locking:
                 lock_view: "upper"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         icon: "key-shift"
     BackSpace:
         outline: "altline"
@@ -52,30 +57,51 @@ buttons:
     show_numbers:
         action:
             set_view: "numbers"
-        outline: "altline"
+        outline: "change-view"
         label: "123"
     show_letters:
         action:
             set_view: "base"
-        outline: "altline"
+        outline: "change-view"
         label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"
-        outline: "altline"
+        outline: "change-view"
         label: "*/="
     show_eschars:
         action:
             locking:
                 lock_view: "eschars"
                 unlock_view: "base"
-        outline: "altline"
-        label: "ŭŜ"
+        outline: "change-view"
+        label: "Ŝŭ"
     space:
         outline: "spaceline"
-        label: " "
         text: " "
     Return:
         outline: "altline"
         icon: "key-enter"
         keysym: "Return"
+    --:
+        outline: "placeholder"
+        text: ""
+    .-large:
+        outline: "large"
+        text: "."
+    "!-thin":
+        outline: "thin"
+        text: "!"
+    ?-thin:
+        outline: "thin"
+        text: "?"
+    ",-thin":
+        outline: "thin"
+        text: ","
+    .-thin:
+        outline: "thin"
+        text: "."
+    „:
+        outline: "thin"
+    “:
+        outline: "thin"

data/keyboards/es+cat.yaml

@@ -1,10 +1,12 @@
 ---
 outlines:
-    default:   { width: 35.33, height: 52 }
-    altline:   { width: 52.67, height: 52 }
-    wide:      { width: 62,    height: 52 }
-    spaceline: { width: 99.67, height: 52 }
-    special:   { width: 44,    height: 52 }
+    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 }
 
 views:
     base:
@@ -39,7 +41,7 @@ buttons:
             locking:
                 lock_view: "upper"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         icon: "key-shift"
     BackSpace:
         outline: "altline"
@@ -47,30 +49,30 @@ buttons:
         action: "erase"
     preferences:
         action: "show_prefs"
-        outline: "default"
+        outline: "special"
         icon: "keyboard-mode-symbolic"
     show_numbers:
         action:
             set_view: "numbers"
-        outline: "altline"
+        outline: "change-view"
         label: "123"
     show_letters:
         action:
             set_view: "base"
-        outline: "altline"
+        outline: "change-view"
         label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"
-        outline: "altline"
+        outline: "change-view"
         label: "*/="
     show_eschars:
         action:
             locking:
                 lock_view: "eschars"
                 unlock_view: "base"
-        outline: "altline"
-        label: "àÀ"
+        outline: "change-view"
+        label: "Àà"
     space:
         outline: "spaceline"
         text: " "

data/keyboards/es+cat_wide.yaml

@@ -1,10 +1,12 @@
 ---
 outlines:
-    default:   { width: 52,     height: 42 }
-    altline:   { width: 77.51,  height: 42 }
-    wide:      { width: 91.25,  height: 42 }
-    spaceline: { width: 146.69, height: 42 }
-    special:   { width: 64.75,  height: 42 }
+    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 }
 
 views:
     base:
@@ -39,7 +41,7 @@ buttons:
             locking:
                 lock_view: "upper"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         icon: "key-shift"
     BackSpace:
         outline: "altline"
@@ -47,30 +49,30 @@ buttons:
         action: "erase"
     preferences:
         action: "show_prefs"
-        outline: "default"
+        outline: "special"
         icon: "keyboard-mode-symbolic"
     show_numbers:
         action:
             set_view: "numbers"
-        outline: "altline"
+        outline: "change-view"
         label: "123"
     show_letters:
         action:
             set_view: "base"
-        outline: "altline"
+        outline: "change-view"
         label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"
-        outline: "altline"
+        outline: "change-view"
         label: "*/="
     show_eschars:
         action:
             locking:
                 lock_view: "eschars"
                 unlock_view: "base"
-        outline: "altline"
-        label: "àÀ"
+        outline: "change-view"
+        label: "Àà"
     space:
         outline: "spaceline"
         text: " "

data/keyboards/es.yaml

@@ -1,10 +1,11 @@
 ---
 outlines:
-    default:   { width: 35.33, height: 52 }
-    altline:   { width: 52.67, height: 52 }
-    wide:      { width: 62,    height: 52 }
-    spaceline: { width: 99.67, height: 52 }
-    special:   { width: 44,    height: 52 }
+    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 }
 
 views:
     base:
@@ -39,7 +40,7 @@ buttons:
             locking:
                 lock_view: "upper"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         icon: "key-shift"
     BackSpace:
         outline: "altline"
@@ -47,30 +48,30 @@ buttons:
         action: "erase"
     preferences:
         action: "show_prefs"
-        outline: "default"
+        outline: "special"
         icon: "keyboard-mode-symbolic"
     show_numbers:
         action:
             set_view: "numbers"
-        outline: "altline"
+        outline: "change-view"
         label: "123"
     show_letters:
         action:
             set_view: "base"
-        outline: "altline"
+        outline: "change-view"
         label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"
-        outline: "altline"
+        outline: "change-view"
         label: "*/="
     show_eschars:
         action:
             locking:
                 lock_view: "eschars"
                 unlock_view: "base"
-        outline: "altline"
-        label: "áÁ"
+        outline: "change-view"
+        label: "Áá"
     space:
         outline: "spaceline"
         text: " "

data/keyboards/es_wide.yaml

@@ -1,10 +1,11 @@
 ---
 outlines:
-    default:   { width: 52,     height: 42 }
-    altline:   { width: 77.51,  height: 42 }
-    wide:      { width: 91.25,  height: 42 }
-    spaceline: { width: 146.69, height: 42 }
-    special:   { width: 64.75,  height: 42 }
+    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 }
 
 views:
     base:
@@ -39,7 +40,7 @@ buttons:
             locking:
                 lock_view: "upper"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         icon: "key-shift"
     BackSpace:
         outline: "altline"
@@ -47,30 +48,30 @@ buttons:
         action: "erase"
     preferences:
         action: "show_prefs"
-        outline: "default"
+        outline: "special"
         icon: "keyboard-mode-symbolic"
     show_numbers:
         action:
             set_view: "numbers"
-        outline: "altline"
+        outline: "change-view"
         label: "123"
     show_letters:
         action:
             set_view: "base"
-        outline: "altline"
+        outline: "change-view"
         label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"
-        outline: "altline"
+        outline: "change-view"
         label: "*/="
     show_eschars:
         action:
             locking:
                 lock_view: "eschars"
                 unlock_view: "base"
-        outline: "altline"
-        label: "áÁ"
+        outline: "change-view"
+        label: "Áá"
     space:
         outline: "spaceline"
         text: " "

data/keyboards/fi.yaml

@@ -1,30 +1,36 @@
 ---
 outlines:
-    default:   { width: 32,       height: 52 }
-    altline:   { width: 48.39024, height: 52 }
-    wide:      { width: 62,       height: 52 }
-    spaceline: { width: 150.5853, height: 52 }
+    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 }
 
 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"
+        - "Shift_L   z x c v b n m , BackSpace"
         - "show_numbers preferences         space        .    Return"
     upper:
         - "Q W E R T Y U I O P Å"
         - "A S D F G H J K L Ö Ä"
-        - "Shift_L   Z X C V B N M  BackSpace"
+        - "Shift_L   Z X C V B N M , BackSpace"
         - "show_numbers preferences         space        .    Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
-        - "show_symbols   , \" ' : ; ! ?  BackSpace"
+        - "show_symbols -- , \" ' : ; ! ? BackSpace"
         - "show_letters preferences         space        .    Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers   \\ / < > = [ ]  BackSpace"
+        - "show_numbers_from_symbols -- \\ / < > = [ ] BackSpace"
         - "show_letters preferences         space        .    Return"
 
 buttons:
@@ -33,7 +39,7 @@ buttons:
             locking:
                 lock_view: "upper"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         icon: "key-shift"
     BackSpace:
         outline: "altline"
@@ -41,29 +47,45 @@ buttons:
         action: "erase"
     preferences:
         action: "show_prefs"
-        outline: "altline"
+        outline: "special"
         icon: "keyboard-mode-symbolic"
     show_numbers:
         action:
             set_view: "numbers"
-        outline: "altline"
+        outline: "change-view-2"
+        label: "123"
+    show_numbers_from_symbols:
+        action:
+            set_view: "numbers"
+        outline: "change-view"
         label: "123"
     show_letters:
         action:
             set_view: "base"
-        outline: "altline"
+        outline: "change-view-2"
         label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"
-        outline: "altline"
+        outline: "change-view"
         label: "*/="
-    ".":
-        outline: altline
+    .:
+        outline: "large"
     space:
-        outline: spaceline
+        outline: "spaceline"
         text: " "
     Return:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
+    --:
+        outline: "placeholder"
+        text: ""
+    5:
+        outline: "fill"
+    "&":
+        outline: "fill"
+    √:
+        outline: "fill"
+    ¥:
+        outline: "fill"

data/keyboards/fi_wide.yaml

@@ -1,30 +1,34 @@
 ---
 outlines:
-    default:   { width: 48,     height: 42 }
-    altline:   { width: 72.59,  height: 42 }
-    wide:      { width: 93,     height: 42 }
-    spaceline: { width: 225.88, height: 42 }
+    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 }
 
 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"
+        - "Shift_L   z x c v b n m , BackSpace"
         - "show_numbers preferences         space        .    Return"
     upper:
         - "Q W E R T Y U I O P Å"
         - "A S D F G H J K L Ö Ä"
-        - "Shift_L   Z X C V B N M  BackSpace"
+        - "Shift_L   Z X C V B N M , BackSpace"
         - "show_numbers preferences         space        .    Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
-        - "show_symbols   , \" ' : ; ! ?  BackSpace"
+        - "show_symbols -- , \" ' : ; ! ? BackSpace"
         - "show_letters preferences         space        .    Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers   \\ / < > = [ ]  BackSpace"
+        - "show_numbers -- \\ / < > = [ ] BackSpace"
         - "show_letters preferences         space        .    Return"
 
 buttons:
@@ -33,7 +37,7 @@ buttons:
             locking:
                 lock_view: "upper"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         icon: "key-shift"
     BackSpace:
         outline: "altline"
@@ -41,29 +45,38 @@ buttons:
         action: "erase"
     preferences:
         action: "show_prefs"
-        outline: "altline"
+        outline: "special"
         icon: "keyboard-mode-symbolic"
     show_numbers:
         action:
             set_view: "numbers"
-        outline: "altline"
+        outline: "change-view"
         label: "123"
     show_letters:
         action:
             set_view: "base"
-        outline: "altline"
+        outline: "change-view"
         label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"
-        outline: "altline"
+        outline: "change-view"
         label: "*/="
-    ".":
-        outline: altline
     space:
-        outline: spaceline
+        outline: "spaceline"
         text: " "
     Return:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
+    --:
+        outline: "placeholder"
+        text: ""
+    5:
+        outline: "fill"
+    "&":
+        outline: "fill"
+    √:
+        outline: "fill"
+    ¥:
+        outline: "fill"

data/keyboards/fr+bepo.yaml

@@ -1,38 +1,41 @@
 ---
 outlines:
-    default:   { width: 35.33, height: 52 }
-    small:     { width: 50,    height: 30 }
-    altline:   { width: 35.33, height: 52 }
-    wide:      { width: 50,    height: 52 }
-    spaceline: { width: 150,   height: 52 }
-    special:   { width: 35.33, height: 52 }
+    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 }
 
 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_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_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:
@@ -40,12 +43,12 @@ buttons:
             locking:
                 lock_view: "upper"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         icon: "key-shift"
     BackSpace:
         outline: "altline"
         icon: "edit-clear-symbolic"
-        action: erase
+        action: "erase"
     preferences:
         action: "show_prefs"
         outline: "special"
@@ -53,29 +56,29 @@ buttons:
     show_numbers:
         action:
             set_view: "numbers"
-        outline: "wide"
+        outline: "change-view-2"
         label: "123"
     show_numbers_from_symbols:
         action:
             set_view: "numbers"
-        outline: "altline"
+        outline: "change-view"
         label: "123"
     show_letters:
         action:
             set_view: "base"
-        outline: "wide"
+        outline: "change-view-2"
         label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"
-        outline: "altline"
+        outline: "change-view"
         label: "*/="
     show_eschars:
         action:
             locking:
                 lock_view: "eschars"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view-2"
         label: "âÂ"
     space:
         outline: "spaceline"
@@ -85,4 +88,7 @@ buttons:
         icon: "key-enter"
         keysym: "Return"
     .:
-        outline: "special"
+        outline: "large"
+    --:
+        outline: "placeholder"
+        text: ""

data/keyboards/fr+bepo_wide.yaml

@@ -1,10 +1,13 @@
 ---
 outlines:
-    default:   { width: 54,  height: 42 }
-    altline:   { width: 81,  height: 42 }
-    wide:      { width: 100, height: 42 }
-    spaceline: { width: 205, height: 42 }
-    special:   { width: 54,  height: 42 }
+    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 }
 
 views:
     base:
@@ -16,21 +19,21 @@ views:
         - "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_numbers preferences         space    show_eschars Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # € % & - _ + ( )"
-        - "show_symbols   , \" ' : ; ! ?  BackSpace"
+        - "show_symbols -- , \" ' : ; ! ?  BackSpace"
         - "show_letters preferences         space        show_eschars Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ $ ¥ ^ ° * { }"
-        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
+        - "show_numbers_from_symbols -- \\ / < > = [ ]  BackSpace"
         - "show_letters preferences         space        show_eschars Return"
     eschars:
         - "à â ç é è ê î ô ù û"
         - "À Â Ç É È Ê Î Ô Ù Û"
-        - "show_numbers_from_symbols  æ œ ä ë ï ö ü  BackSpace"
+        - "show_numbers_from_symbols  æ œ ä ë ï ö ü : BackSpace"
         - "show_letters preferences         space        show_eschars Return"
 
 buttons:
@@ -39,12 +42,12 @@ buttons:
             locking:
                 lock_view: "upper"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         icon: "key-shift"
     BackSpace:
         outline: "altline"
         icon: "edit-clear-symbolic"
-        action: erase
+        action: "erase"
     preferences:
         action: "show_prefs"
         outline: "special"
@@ -52,29 +55,29 @@ buttons:
     show_numbers:
         action:
             set_view: "numbers"
-        outline: "wide"
+        outline: "change-view-2"
         label: "123"
     show_numbers_from_symbols:
         action:
             set_view: "numbers"
-        outline: "altline"
+        outline: "change-view"
         label: "123"
     show_letters:
         action:
             set_view: "base"
-        outline: "wide"
+        outline: "change-view-2"
         label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"
-        outline: "altline"
+        outline: "change-view"
         label: "*/="
     show_eschars:
         action:
             locking:
                 lock_view: "eschars"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view-2"
         label: "âÂ"
     space:
         outline: "spaceline"
@@ -83,3 +86,6 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
+    --:
+        outline: "placeholder"
+        text: ""

data/keyboards/fr.yaml

@@ -1,10 +1,12 @@
 ---
 outlines:
-    default:   { width: 35.33, height: 52 }
-    altline:   { width: 52.67, height: 52 }
-    wide:      { width: 59,    height: 52 }
-    spaceline: { width: 140,   height: 52 }
-    special:   { width: 44,    height: 52 }
+    default:       { width: 35.33, height: 52 }
+    altline:       { width: 52.67, height: 52 }
+    wide:          { width: 59,    height: 52 }
+    change-view:   { width: 52.67, height: 52 }
+    change-view-2: { width: 59,    height: 52 }
+    spaceline:     { width: 140,   height: 52 }
+    special:       { width: 44,    height: 52 }
 
 views:
     base:
@@ -39,12 +41,12 @@ buttons:
             locking:
                 lock_view: "upper"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         icon: "key-shift"
     BackSpace:
         outline: "altline"
         icon: "edit-clear-symbolic"
-        action: erase
+        action: "erase"
     preferences:
         action: "show_prefs"
         outline: "special"
@@ -52,29 +54,29 @@ buttons:
     show_numbers:
         action:
             set_view: "numbers"
-        outline: "wide"
+        outline: "change-view-2"
         label: "123"
     show_numbers_from_symbols:
         action:
             set_view: "numbers"
-        outline: "altline"
+        outline: "change-view"
         label: "123"
     show_letters:
         action:
             set_view: "base"
-        outline: "wide"
+        outline: "change-view-2"
         label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"
-        outline: "altline"
+        outline: "change-view"
         label: "*/="
     show_eschars:
         action:
             locking:
                 lock_view: "eschars"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         label: "âÂ"
     space:
         outline: "spaceline"

data/keyboards/fr_wide.yaml

@@ -1,10 +1,12 @@
 ---
 outlines:
-    default:   { width: 54,  height: 42 }
-    altline:   { width: 81,  height: 42 }
-    wide:      { width: 100, height: 42 }
-    spaceline: { width: 205, height: 42 }
-    special:   { width: 54,  height: 42 }
+    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 }
 
 views:
     base:
@@ -39,12 +41,12 @@ buttons:
             locking:
                 lock_view: "upper"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         icon: "key-shift"
     BackSpace:
         outline: "altline"
         icon: "edit-clear-symbolic"
-        action: erase
+        action: "erase"
     preferences:
         action: "show_prefs"
         outline: "special"
@@ -52,29 +54,29 @@ buttons:
     show_numbers:
         action:
             set_view: "numbers"
-        outline: "wide"
+        outline: "change-view-2"
         label: "123"
     show_numbers_from_symbols:
         action:
             set_view: "numbers"
-        outline: "altline"
+        outline: "change-view"
         label: "123"
     show_letters:
         action:
             set_view: "base"
-        outline: "wide"
+        outline: "change-view-2"
         label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"
-        outline: "altline"
+        outline: "change-view"
         label: "*/="
     show_eschars:
         action:
             locking:
                 lock_view: "eschars"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         label: "âÂ"
     space:
         outline: "spaceline"

data/keyboards/ge.yaml

@@ -1,32 +1,35 @@
 ---
 outlines:
-    default:   { width: 35.33, height: 52 }
-    altline:   { width: 52.67, height: 52 }
-    wide:      { width: 62,    height: 52 }
-    spaceline: { width: 142,   height: 52 }
-    special:   { width: 44,    height: 52 }
+    default:       { width: 35.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 }
 
 views:
     base:
         - "ქ წ ე რ ტ ყ უ ი ო პ"
         - "ა ს დ ფ გ ჰ ჯ კ ლ"
         - "Shift_L ზ ხ ც ვ ბ ნ მ BackSpace"
-        - "show_numbers preferences         space        . Return"
+        - "show_numbers preferences         space    .     Return"
     upper:
         - "ქ ჭ ე ღ თ ყ უ ი ო პ"
         - "ა შ დ ფ გ ჰ ჟ კ ლ"
         - "Shift_L ძ ხ ჩ ვ ბ ნ მ BackSpace"
-        - "show_numbers preferences         space        . Return"
+        - "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_letters preferences         space    .     Return"
     symbols:
         - "+ ⨯ ÷ = / _ € £ ¥ ₾"
         - "~ ` | · √ π τ ° { }"
         - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        . Return"
+        - "show_letters preferences         space    .     Return"
 
 buttons:
     Shift_L:
@@ -34,7 +37,7 @@ buttons:
             locking:
                 lock_view: "upper"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         icon: "key-shift"
     BackSpace:
         outline: "altline"
@@ -47,28 +50,28 @@ buttons:
     show_numbers:
         action:
             set_view: "numbers"
-        outline: "wide"
+        outline: "change-view-2"
         label: "123"
     show_numbers_from_symbols:
         action:
             set_view: "numbers"
-        outline: "altline"
+        outline: "change-view"
         label: "123"
     show_letters:
         action:
             set_view: "base"
-        outline: "wide"
+        outline: "change-view-2"
         label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"
-        outline: "altline"
+        outline: "change-view"
         label: "*/="
-    .:
-        outline: "special"
     space:
         outline: "spaceline"
         text: " "
+    .:
+        outline: "large"
     Return:
         outline: "wide"
         icon: "key-enter"

data/keyboards/ge_wide.yaml

@@ -1,32 +1,34 @@
 ---
 outlines:
-    default:   { width: 52,     height: 42 }
-    altline:   { width: 77.52,  height: 42 }
-    wide:      { width: 91.26,  height: 42 }
-    spaceline: { width: 209.01, height: 42 }
-    special:   { width: 64.76,  height: 42 }
+    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 }
 
 views:
     base:
         - "ქ წ ე რ ტ ყ უ ი ო პ"
         - "ა ს დ ფ გ ჰ ჯ კ ლ"
         - "Shift_L ზ ხ ც ვ ბ ნ მ BackSpace"
-        - "show_numbers preferences         space        . Return"
+        - "show_numbers preferences         space    .     Return"
     upper:
         - "ქ ჭ ე ღ თ ყ უ ი ო პ"
         - "ა შ დ ფ გ ჰ ჟ კ ლ"
         - "Shift_L ძ ხ ჩ ვ ბ ნ მ BackSpace"
-        - "show_numbers preferences         space        . Return"
+        - "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_letters preferences         space    .     Return"
     symbols:
         - "+ ⨯ ÷ = / _ € £ ¥ ₾"
         - "~ ` | · √ π τ ° { }"
         - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        . Return"
+        - "show_letters preferences         space    .     Return"
 
 buttons:
     Shift_L:
@@ -34,7 +36,7 @@ buttons:
             locking:
                 lock_view: "upper"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         icon: "key-shift"
     BackSpace:
         outline: "altline"
@@ -47,25 +49,23 @@ buttons:
     show_numbers:
         action:
             set_view: "numbers"
-        outline: "wide"
+        outline: "change-view-2"
         label: "123"
     show_numbers_from_symbols:
         action:
             set_view: "numbers"
-        outline: "altline"
+        outline: "change-view"
         label: "123"
     show_letters:
         action:
             set_view: "base"
-        outline: "wide"
+        outline: "change-view-2"
         label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"
-        outline: "altline"
+        outline: "change-view"
         label: "*/="
-    .:
-        outline: "special"
     space:
         outline: "spaceline"
         text: " "
@@ -73,3 +73,6 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
+    --:
+        outline: "placeholder"
+        text: ""

data/keyboards/gr+polytonic.yaml

@@ -4,38 +4,46 @@
 # 
 ---
 outlines:
-    default:   { width: 40,    height: 60 }
-    altline:   { width: 52.67, height: 60 }
-    wide:      { width: 62,    height: 60 }
-    extrawide: { width: 66,    height: 60 }
-    spaceline: { width: 140,   height: 60 }
-    special:   { width: 44,    height: 60 }
+    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 }
 
 views:
     base:
-        - "; ς ε ρ τ υ θ ι ο π"
+        - "; ς ε ρ τ υ θ ι ο π-fill"
         - "α σ δ φ γ η ξ κ λ show_accents"
         - "Shift_L ζ χ ψ ω β ν μ BackSpace"
-        - "show_numbers preferences space . CommaSpecial Return"
+        - "show_numbers preferences space . ,-subtle-highlight Return"
     upper:
         - ": € Ε Ρ Τ Υ Θ Ι Ο Π"
         - "Α Σ Δ Φ Γ Η Ξ Κ Λ show_accents"
         - "Shift_L Ζ Χ Ψ Ω Β Ν Μ BackSpace"
-        - "show_numbers preferences space ! ·Special Return"
+        - "show_numbers preferences space ! ·-subtle-highlight Return"
     accents:
-        - "show_psiliordasiaandvaria show_psiliordasiaandoxia show_psiliordasia show_bariaorperispomeni show_oxia"
+        - "show_psiliordasiaandvaria show_psiliordasiaandoxia show_psiliordasia show_bariaorperispomeni show_oxia ᾿"
         - "show_PsiliOrDasiaAndVaria show_PsiliOrDasiaAndOxia show_PsiliOrDasia show_BariaOrPerispomeni show_Oxia show_base"
-        - "show_PsiliOrDasiaAndPerispomeni show_psiliordasiaandperispomeni ᾿ BackSpace"
-        - "show_numbers preferences space Return"
+        - "--- show_PsiliOrDasiaAndPerispomeni show_psiliordasiaandperispomeni --- --- BackSpace"
+        - "show_numbers preferences space-spaceline-2 Return"
     oxia:
         - "ά έ ή ί ϊ ΐ ό ύ ϋ ώ"
-        - "show_Oxia ᾳ ᾴ ῃ ῄ ῳ ῴ show_base"
+        - "show_Oxia -- ᾳ ᾴ ῃ ῄ ῳ ῴ show_base"
         - "Ϗ ϐ ϑ ϗ ϖ ΰ ϕ – — BackSpace"
         - "show_numbers preferences space « » Return"
     Oxia:
-        - "Ά Έ Ή Ί Ϊ Ό Ύ Ϋ Ώ"
-        - "show_oxia ᾼ ῌ ῼ show_base"
-        - "Ϗ ϐ ϑ ϗ ϖ ϕ – — BackSpace"
+        - "Ά Έ Ή Ί Ϊ Ό Ύ Ϋ Ώ --"
+        - "show_oxia -- -- ᾼ ῌ ῼ -- -- show_base"
+        - "Ϗ ϐ ϑ ϗ ϖ -- ϕ – — BackSpace"
         - "show_numbers preferences space « » Return"
     bariaorperispomeni:
         - "ὰ ὲ ὴ ὶ ῒ ὸ ὺ ὼ ῐ ῑ"
@@ -43,66 +51,68 @@ views:
         - "ᾶ ᾷ ῆ ῖ ῗ ῦ ῧ ῶ ῡ BackSpace"
         - "show_numbers preferences space ῇ ῷ Return"
     BariaOrPerispomeni:
-        - "Ὰ Ὲ Ὴ Ὶ Ὸ Ὺ Ὼ"
-        - "show_bariaorperispomeni ᾼ ῌ ῼ show_base"
-        - "show_numbers preferences space BackSpace Return"
+        - "-- Ὰ Ὲ Ὴ Ὶ Ὸ Ὺ Ὼ -- --"
+        - "show_bariaorperispomeni -- -- ᾼ ῌ ῼ -- -- show_base"
+        - "--- -- -- -- -- -- -- -- BackSpace"
+        - "show_numbers preferences space-spaceline-2 Return"
     psiliordasia:
         - "ἀ ἐ ἠ ἰ ὀ ὐ ὠ ᾀ ᾐ ᾠ"
         - "show_PsiliOrDasia ἁ ἑ ἡ ἱ ὁ ὑ ὡ show_base"
-        - "ᾁ ᾑ ᾡ ῤ ῥ BackSpace"
-        - "show_numbers preferences space Return"
+        - "--- ᾁ ᾑ ᾡ ῤ ῥ -- -- BackSpace"
+        - "show_numbers preferences space-spaceline-2 Return"
     PsiliOrDasia:
-        - "Ἀ Ἐ Ἠ Ἰ Ὀ Ὠ ᾈ ᾘ ᾨ"
+        - "Ἀ Ἐ Ἠ Ἰ Ὀ Ὠ ᾈ ᾘ ᾨ --"
         - "show_psiliordasia Ἁ Ἑ Ἡ Ἱ Ὁ Ὑ Ὡ show_base"
-        - "ᾉ ᾙ ᾩ Ῥ BackSpace"
-        - "show_numbers preferences space Return"
+        - "--- -- ᾉ ᾙ ᾩ Ῥ -- -- BackSpace"
+        - "show_numbers preferences space-spaceline-2 Return"
     psiliordasiaandoxia:
         - "ἄ ἔ ἤ ἴ ὄ ὔ ὤ ᾄ ᾔ ᾤ"
         - "show_PsiliOrDasiaAndOxia ἅ ἕ ἥ ἵ ὅ ὕ ὥ show_base"
-        - "ᾅ ᾕ ᾥ BackSpace"
-        - "show_numbers preferences space Return"
+        - "--- -- ᾅ ᾕ ᾥ -- -- -- BackSpace"
+        - "show_numbers preferences space-spaceline-2 Return"
     PsiliOrDasiaAndOxia:
-        - "Ἄ Ἔ Ἤ Ἴ Ὄ Ὤ ᾌ ᾜ ᾬ"
+        - "Ἄ Ἔ Ἤ Ἴ Ὄ Ὤ ᾌ ᾜ ᾬ --"
         - "show_psiliordasiaandoxia Ἅ Ἕ Ἥ Ἵ Ὅ Ὕ Ὥ show_base"
-        - "ᾍ ᾝ ᾭ BackSpace"
-        - "show_numbers preferences space Return"
+        - "--- -- ᾍ ᾝ ᾭ -- -- -- BackSpace"
+        - "show_numbers preferences space-spaceline-2 Return"
     psiliordasiaandvaria:
         - "ἂ ἒ ἢ ἲ ὂ ὒ ὢ ᾂ ᾒ ᾢ"
         - "show_PsiliOrDasiaAndVaria ἃ ἓ ἣ ἳ ὃ ὓ ὣ show_base"
-        - "ᾃ ᾓ ᾣ BackSpace"
-        - "show_numbers preferences space Return"
+        - "--- -- ᾃ ᾓ ᾣ -- -- -- BackSpace"
+        - "show_numbers preferences space-spaceline-2 Return"
     PsiliOrDasiaAndVaria:
-        - "Ἂ Ἒ Ἢ Ἲ Ὂ Ὢ ᾊ ᾚ ᾪ"
+        - "Ἂ Ἒ Ἢ Ἲ Ὂ Ὢ ᾊ ᾚ ᾪ --"
         - "show_psiliordasiaandvaria Ἃ Ἓ Ἣ Ἳ Ὃ Ὓ Ὣ show_base"
-        - "ᾋ ᾛ ᾫ BackSpace"
-        - "show_numbers preferences space Return"
+        - "--- -- ᾋ ᾛ ᾫ -- -- -- BackSpace"
+        - "show_numbers preferences space-spaceline-2 Return"
     psiliordasiaandperispomeni:
-        - "ἆ ἦ ἶ ὖ ὦ ᾆ ᾖ ᾦ"
-        - "show_PsiliOrDasiaAndPerispomeni ἇ ἧ ἷ ὗ ὧ show_base"
-        - "ᾇ ᾗ ᾧ BackSpace"
-        - "show_numbers preferences space Return"
+        - "-- ἆ ἦ ἶ ὖ ὦ ᾆ ᾖ ᾦ --"
+        - "show_PsiliOrDasiaAndPerispomeni -- ἇ ἧ ἷ ὗ ὧ -- show_base"
+        - "--- -- ᾇ ᾗ ᾧ -- -- -- BackSpace"
+        - "show_numbers preferences space-spaceline-2 Return"
     PsiliOrDasiaAndPerispomeni:
-        - "Ἆ Ἦ Ἶ Ὦ ᾎ ᾞ ᾮ"
-        - "show_psiliordasiaandperispomeni Ἇ Ἧ Ἷ Ὗ Ὧ show_base"
-        - "ᾏ ᾟ ᾯ BackSpace"
-        - "show_numbers preferences space Return"
+        - "-- Ἆ Ἦ Ἶ Ὦ ᾎ ᾞ ᾮ -- --"
+        - "show_psiliordasiaandperispomeni -- Ἇ Ἧ Ἷ Ὗ Ὧ -- show_base"
+        - "--- -- ᾏ ᾟ ᾯ -- -- -- BackSpace"
+        - "show_numbers preferences space-spaceline-2 Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
-        - "show_symbols CommaSpecial \" ' : ; ! ? BackSpace"
-        - "show_letters preferences space . CommaSpecial Return"
+        - "show_symbols ,-subtle-highlight \" ' : ; ! ? BackSpace"
+        - "show_letters preferences space . ,-subtle-highlight Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
         - "show_numbers \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences space . CommaSpecial Return"
+        - "show_letters preferences space . ,-subtle-highlight Return"
+
 buttons:
     Shift_L:
         action:
             locking:
                 lock_view: "upper"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view-2"
         icon: "key-shift"
     BackSpace:
         outline: "altline"
@@ -110,94 +120,94 @@ buttons:
         action: "erase"
     preferences:
         action: "show_prefs"
-        outline: "altline"
+        outline: "special"
         icon: "keyboard-mode-symbolic"
     show_oxia:
         action:
             set_view: "oxia"
-        outline: "extrawide"
+        outline: "character-group"
         label: "´ ΅"
     show_Oxia:
         action:
             set_view: "Oxia"
-        outline: "extrawide"
+        outline: "character-group"
         label: "´¨↑"
     show_bariaorperispomeni:
         action:
             set_view: "bariaorperispomeni"
-        outline: "extrawide"
+        outline: "character-group"
         label: "` ῀"
     show_BariaOrPerispomeni:
         action:
             set_view: "BariaOrPerispomeni"
-        outline: "extrawide"
+        outline: "character-group"
         label: "`῀↑"
     show_psiliordasia:
         action:
             set_view: "psiliordasia"
-        outline: "extrawide"
+        outline: "character-group"
         label: "᾿ ῾"
     show_PsiliOrDasia:
         action:
             set_view: "PsiliOrDasia"
-        outline: "extrawide"
+        outline: "character-group"
         label: "᾿῾↑"
     show_psiliordasiaandoxia:
         action:
             set_view: "psiliordasiaandoxia"
-        outline: "extrawide"
+        outline: "character-group"
         label: "῎ ῞"
     show_PsiliOrDasiaAndOxia:
         action:
             set_view: "PsiliOrDasiaAndOxia"
-        outline: "extrawide"
+        outline: "character-group"
         label: "῎῞↑"
     show_psiliordasiaandvaria:
         action:
             set_view: "psiliordasiaandvaria"
-        outline: "extrawide"
+        outline: "character-group"
         label: "῍ ῝"
     show_PsiliOrDasiaAndVaria:
         action:
             set_view: "PsiliOrDasiaAndVaria"
-        outline: "extrawide"
+        outline: "character-group"
         label: "῍῝↑"
     show_psiliordasiaandperispomeni:
         action:
             set_view: "psiliordasiaandperispomeni"
-        outline: "extrawide"
+        outline: "character-group"
         label: "῏ ῟"
     show_PsiliOrDasiaAndPerispomeni:
         action:
             set_view: "PsiliOrDasiaAndPerispomeni"
-        outline: "extrawide"
+        outline: "character-group"
         label: "῏῟↑"
     show_numbers:
         action:
             set_view: "numbers"
-        outline: "wide"
+        outline: "change-view-2"
         label: "123"
     show_letters:
         action:
             set_view: "base"
-        outline: "wide"
+        outline: "change-view-2"
         label: "ΑΒΓ"
     show_symbols:
         action:
             set_view: "symbols"
-        outline: "altline"
+        outline: "change-view-2"
         label: "*/="
     show_accents:
         action:
             locking:
                 lock_view: "accents"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         label: "ᾦ"
     show_base:
         action:
             set_view: "base"
-        outline: "altline"
+        outline: "change-view"
         label: "αι"
     space:
         outline: "spaceline"
@@ -207,22 +217,56 @@ buttons:
         icon: "key-enter"
         keysym: "Return"
     .:
-        outline: "special"
-    ·Special:
-        outline: "special"
+        outline: "subtle-highlight"
+    ·-subtle-highlight:
+        outline: "subtle-highlight"
         text: "·"
-    CommaSpecial:
-        outline: "special"
+    ",-subtle-highlight":
+        outline: "subtle-highlight"
         text: ","
     ":":
-        outline: "special"
+        outline: "subtle-highlight"
     ;:
-        outline: "special"
+        outline: "subtle-highlight"
     "!":
-        outline: "special"
+        outline: "subtle-highlight"
     «:
-        outline: "special"
+        outline: "subtle-highlight"
     »:
-        outline: "special"
+        outline: "subtle-highlight"
     €:
-        outline: "special"
+        outline: "subtle-highlight"
+    space-spaceline-2:
+        outline: "spaceline-2"
+        text: " "
+    --:
+        outline: "placeholder"
+        text: ""
+    ---:
+        outline: "placeholder-2"
+        text: ""
+    ᾿:
+        outline: "large"
+    π-fill:
+        outline: "fill"
+        text: "π"
+    Π:
+        outline: "fill"
+    0:
+        outline: "fill"
+    ):
+        outline: "fill"
+    ¶:
+        outline: "fill"
+    "}":
+        outline: "fill"
+    ώ:
+        outline: "fill"
+    ῑ:
+        outline: "fill"
+    ᾠ:
+        outline: "fill"
+    ᾤ:
+        outline: "fill"
+    ᾢ:
+        outline: "fill"

data/keyboards/gr+polytonic_wide.yaml

@@ -4,38 +4,46 @@
 # 
 ---
 outlines:
-    default:   { width: 74,    height: 60 }
-    altline:   { width: 97.44, height: 60 }
-    wide:      { width: 114.7, height: 60 }
-    extrawide: { width: 122.1, height: 60 }
-    spaceline: { width: 259,   height: 60 }
-    special:   { width: 81.4,  height: 60 }
+    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 }
 
 views:
     base:
-        - "; ς ε ρ τ υ θ ι ο π"
+        - "; ς ε ρ τ υ θ ι ο π-fill"
         - "α σ δ φ γ η ξ κ λ show_accents"
         - "Shift_L ζ χ ψ ω β ν μ BackSpace"
-        - "show_numbers preferences space . CommaSpecial Return"
+        - "show_numbers preferences space . ,-subtle-highlight Return"
     upper:
         - ": € Ε Ρ Τ Υ Θ Ι Ο Π"
         - "Α Σ Δ Φ Γ Η Ξ Κ Λ show_accents"
         - "Shift_L Ζ Χ Ψ Ω Β Ν Μ BackSpace"
-        - "show_numbers preferences space ! ·Special Return"
+        - "show_numbers preferences space ! ·-subtle-highlight Return"
     accents:
-        - "show_psiliordasiaandvaria show_psiliordasiaandoxia show_psiliordasia show_bariaorperispomeni show_oxia"
+        - "show_psiliordasiaandvaria show_psiliordasiaandoxia show_psiliordasia show_bariaorperispomeni show_oxia ᾿"
         - "show_PsiliOrDasiaAndVaria show_PsiliOrDasiaAndOxia show_PsiliOrDasia show_BariaOrPerispomeni show_Oxia show_base"
-        - "show_PsiliOrDasiaAndPerispomeni show_psiliordasiaandperispomeni ᾿ BackSpace"
-        - "show_numbers preferences space Return"
+        - "--- show_PsiliOrDasiaAndPerispomeni show_psiliordasiaandperispomeni --- --- BackSpace"
+        - "show_numbers preferences space-spaceline-2 Return"
     oxia:
         - "ά έ ή ί ϊ ΐ ό ύ ϋ ώ"
-        - "show_Oxia ᾳ ᾴ ῃ ῄ ῳ ῴ show_base"
+        - "show_Oxia -- ᾳ ᾴ ῃ ῄ ῳ ῴ show_base"
         - "Ϗ ϐ ϑ ϗ ϖ ΰ ϕ – — BackSpace"
         - "show_numbers preferences space « » Return"
     Oxia:
-        - "Ά Έ Ή Ί Ϊ Ό Ύ Ϋ Ώ"
-        - "show_oxia ᾼ ῌ ῼ show_base"
-        - "Ϗ ϐ ϑ ϗ ϖ ϕ – — BackSpace"
+        - "Ά Έ Ή Ί Ϊ Ό Ύ Ϋ Ώ --"
+        - "show_oxia -- -- ᾼ ῌ ῼ -- -- show_base"
+        - "Ϗ ϐ ϑ ϗ ϖ -- ϕ – — BackSpace"
         - "show_numbers preferences space « » Return"
     bariaorperispomeni:
         - "ὰ ὲ ὴ ὶ ῒ ὸ ὺ ὼ ῐ ῑ"
@@ -43,66 +51,68 @@ views:
         - "ᾶ ᾷ ῆ ῖ ῗ ῦ ῧ ῶ ῡ BackSpace"
         - "show_numbers preferences space ῇ ῷ Return"
     BariaOrPerispomeni:
-        - "Ὰ Ὲ Ὴ Ὶ Ὸ Ὺ Ὼ"
-        - "show_bariaorperispomeni ᾼ ῌ ῼ show_base"
-        - "show_numbers preferences space BackSpace Return"
+        - "-- Ὰ Ὲ Ὴ Ὶ Ὸ Ὺ Ὼ -- --"
+        - "show_bariaorperispomeni -- -- ᾼ ῌ ῼ -- -- show_base"
+        - "--- -- -- -- -- -- -- -- BackSpace"
+        - "show_numbers preferences space-spaceline-2 Return"
     psiliordasia:
         - "ἀ ἐ ἠ ἰ ὀ ὐ ὠ ᾀ ᾐ ᾠ"
         - "show_PsiliOrDasia ἁ ἑ ἡ ἱ ὁ ὑ ὡ show_base"
-        - "ᾁ ᾑ ᾡ ῤ ῥ BackSpace"
-        - "show_numbers preferences space Return"
+        - "--- ᾁ ᾑ ᾡ ῤ ῥ -- -- BackSpace"
+        - "show_numbers preferences space-spaceline-2 Return"
     PsiliOrDasia:
-        - "Ἀ Ἐ Ἠ Ἰ Ὀ Ὠ ᾈ ᾘ ᾨ"
+        - "Ἀ Ἐ Ἠ Ἰ Ὀ Ὠ ᾈ ᾘ ᾨ --"
         - "show_psiliordasia Ἁ Ἑ Ἡ Ἱ Ὁ Ὑ Ὡ show_base"
-        - "ᾉ ᾙ ᾩ Ῥ BackSpace"
-        - "show_numbers preferences space Return"
+        - "--- -- ᾉ ᾙ ᾩ Ῥ -- -- BackSpace"
+        - "show_numbers preferences space-spaceline-2 Return"
     psiliordasiaandoxia:
         - "ἄ ἔ ἤ ἴ ὄ ὔ ὤ ᾄ ᾔ ᾤ"
         - "show_PsiliOrDasiaAndOxia ἅ ἕ ἥ ἵ ὅ ὕ ὥ show_base"
-        - "ᾅ ᾕ ᾥ BackSpace"
-        - "show_numbers preferences space Return"
+        - "--- -- ᾅ ᾕ ᾥ -- -- -- BackSpace"
+        - "show_numbers preferences space-spaceline-2 Return"
     PsiliOrDasiaAndOxia:
-        - "Ἄ Ἔ Ἤ Ἴ Ὄ Ὤ ᾌ ᾜ ᾬ"
+        - "Ἄ Ἔ Ἤ Ἴ Ὄ Ὤ ᾌ ᾜ ᾬ --"
         - "show_psiliordasiaandoxia Ἅ Ἕ Ἥ Ἵ Ὅ Ὕ Ὥ show_base"
-        - "ᾍ ᾝ ᾭ BackSpace"
-        - "show_numbers preferences space Return"
+        - "--- -- ᾍ ᾝ ᾭ -- -- -- BackSpace"
+        - "show_numbers preferences space-spaceline-2 Return"
     psiliordasiaandvaria:
         - "ἂ ἒ ἢ ἲ ὂ ὒ ὢ ᾂ ᾒ ᾢ"
         - "show_PsiliOrDasiaAndVaria ἃ ἓ ἣ ἳ ὃ ὓ ὣ show_base"
-        - "ᾃ ᾓ ᾣ BackSpace"
-        - "show_numbers preferences space Return"
+        - "--- -- ᾃ ᾓ ᾣ -- -- -- BackSpace"
+        - "show_numbers preferences space-spaceline-2 Return"
     PsiliOrDasiaAndVaria:
-        - "Ἂ Ἒ Ἢ Ἲ Ὂ Ὢ ᾊ ᾚ ᾪ"
+        - "Ἂ Ἒ Ἢ Ἲ Ὂ Ὢ ᾊ ᾚ ᾪ --"
         - "show_psiliordasiaandvaria Ἃ Ἓ Ἣ Ἳ Ὃ Ὓ Ὣ show_base"
-        - "ᾋ ᾛ ᾫ BackSpace"
-        - "show_numbers preferences space Return"
+        - "--- -- ᾋ ᾛ ᾫ -- -- -- BackSpace"
+        - "show_numbers preferences space-spaceline-2 Return"
     psiliordasiaandperispomeni:
-        - "ἆ ἦ ἶ ὖ ὦ ᾆ ᾖ ᾦ"
-        - "show_PsiliOrDasiaAndPerispomeni ἇ ἧ ἷ ὗ ὧ show_base"
-        - "ᾇ ᾗ ᾧ BackSpace"
-        - "show_numbers preferences space Return"
+        - "-- ἆ ἦ ἶ ὖ ὦ ᾆ ᾖ ᾦ --"
+        - "show_PsiliOrDasiaAndPerispomeni -- ἇ ἧ ἷ ὗ ὧ -- show_base"
+        - "--- -- ᾇ ᾗ ᾧ -- -- -- BackSpace"
+        - "show_numbers preferences space-spaceline-2 Return"
     PsiliOrDasiaAndPerispomeni:
-        - "Ἆ Ἦ Ἶ Ὦ ᾎ ᾞ ᾮ"
-        - "show_psiliordasiaandperispomeni Ἇ Ἧ Ἷ Ὗ Ὧ show_base"
-        - "ᾏ ᾟ ᾯ BackSpace"
-        - "show_numbers preferences space Return"
+        - "-- Ἆ Ἦ Ἶ Ὦ ᾎ ᾞ ᾮ -- --"
+        - "show_psiliordasiaandperispomeni -- Ἇ Ἧ Ἷ Ὗ Ὧ -- show_base"
+        - "--- -- ᾏ ᾟ ᾯ -- -- -- BackSpace"
+        - "show_numbers preferences space-spaceline-2 Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
-        - "show_symbols CommaSpecial \" ' : ; ! ? BackSpace"
-        - "show_letters preferences space . CommaSpecial Return"
+        - "show_symbols ,-subtle-highlight \" ' : ; ! ? BackSpace"
+        - "show_letters preferences space . ,-subtle-highlight Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
         - "show_numbers \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences space . CommaSpecial Return"
+        - "show_letters preferences space . ,-subtle-highlight Return"
+
 buttons:
     Shift_L:
         action:
             locking:
                 lock_view: "upper"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view-2"
         icon: "key-shift"
     BackSpace:
         outline: "altline"
@@ -110,94 +120,94 @@ buttons:
         action: "erase"
     preferences:
         action: "show_prefs"
-        outline: "altline"
+        outline: "special"
         icon: "keyboard-mode-symbolic"
     show_oxia:
         action:
             set_view: "oxia"
-        outline: "extrawide"
+        outline: "character-group"
         label: "´ ΅"
     show_Oxia:
         action:
             set_view: "Oxia"
-        outline: "extrawide"
+        outline: "character-group"
         label: "´¨↑"
     show_bariaorperispomeni:
         action:
             set_view: "bariaorperispomeni"
-        outline: "extrawide"
+        outline: "character-group"
         label: "` ῀"
     show_BariaOrPerispomeni:
         action:
             set_view: "BariaOrPerispomeni"
-        outline: "extrawide"
+        outline: "character-group"
         label: "`῀↑"
     show_psiliordasia:
         action:
             set_view: "psiliordasia"
-        outline: "extrawide"
+        outline: "character-group"
         label: "᾿ ῾"
     show_PsiliOrDasia:
         action:
             set_view: "PsiliOrDasia"
-        outline: "extrawide"
+        outline: "character-group"
         label: "᾿῾↑"
     show_psiliordasiaandoxia:
         action:
             set_view: "psiliordasiaandoxia"
-        outline: "extrawide"
+        outline: "character-group"
         label: "῎ ῞"
     show_PsiliOrDasiaAndOxia:
         action:
             set_view: "PsiliOrDasiaAndOxia"
-        outline: "extrawide"
+        outline: "character-group"
         label: "῎῞↑"
     show_psiliordasiaandvaria:
         action:
             set_view: "psiliordasiaandvaria"
-        outline: "extrawide"
+        outline: "character-group"
         label: "῍ ῝"
     show_PsiliOrDasiaAndVaria:
         action:
             set_view: "PsiliOrDasiaAndVaria"
-        outline: "extrawide"
+        outline: "character-group"
         label: "῍῝↑"
     show_psiliordasiaandperispomeni:
         action:
             set_view: "psiliordasiaandperispomeni"
-        outline: "extrawide"
+        outline: "character-group"
         label: "῏ ῟"
     show_PsiliOrDasiaAndPerispomeni:
         action:
             set_view: "PsiliOrDasiaAndPerispomeni"
-        outline: "extrawide"
+        outline: "character-group"
         label: "῏῟↑"
     show_numbers:
         action:
             set_view: "numbers"
-        outline: "wide"
+        outline: "change-view-2"
         label: "123"
     show_letters:
         action:
             set_view: "base"
-        outline: "wide"
+        outline: "change-view-2"
         label: "ΑΒΓ"
     show_symbols:
         action:
             set_view: "symbols"
-        outline: "altline"
+        outline: "change-view-2"
         label: "*/="
     show_accents:
         action:
             locking:
                 lock_view: "accents"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         label: "ᾦ"
     show_base:
         action:
             set_view: "base"
-        outline: "altline"
+        outline: "change-view"
         label: "αι"
     space:
         outline: "spaceline"
@@ -207,22 +217,56 @@ buttons:
         icon: "key-enter"
         keysym: "Return"
     .:
-        outline: "special"
-    ·Special:
-        outline: "special"
+        outline: "subtle-highlight"
+    ·-subtle-highlight:
+        outline: "subtle-highlight"
         text: "·"
-    CommaSpecial:
-        outline: "special"
+    ",-subtle-highlight":
+        outline: "subtle-highlight"
         text: ","
     ":":
-        outline: "special"
+        outline: "subtle-highlight"
     ;:
-        outline: "special"
+        outline: "subtle-highlight"
     "!":
-        outline: "special"
+        outline: "subtle-highlight"
     «:
-        outline: "special"
+        outline: "subtle-highlight"
     »:
-        outline: "special"
+        outline: "subtle-highlight"
     €:
-        outline: "special"
+        outline: "subtle-highlight"
+    space-spaceline-2:
+        outline: "spaceline-2"
+        text: " "
+    --:
+        outline: "placeholder"
+        text: ""
+    ---:
+        outline: "placeholder-2"
+        text: ""
+    ᾿:
+        outline: "large"
+    π-fill:
+        outline: "fill"
+        text: "π"
+    Π:
+        outline: "fill"
+    0:
+        outline: "fill"
+    ):
+        outline: "fill"
+    ¶:
+        outline: "fill"
+    "}":
+        outline: "fill"
+    ώ:
+        outline: "fill"
+    ῑ:
+        outline: "fill"
+    ᾠ:
+        outline: "fill"
+    ᾤ:
+        outline: "fill"
+    ᾢ:
+        outline: "fill"

data/keyboards/gr.yaml

@@ -4,45 +4,48 @@
 # Edited by Sotiris Papadopoulos, sotirios.papadopoulos@inserm.fr
 ---
 outlines:
-    default:   { width: 40,    height: 60 }
-    altline:   { width: 52.67, height: 60 }
-    wide:      { width: 62,    height: 60 }
-    spaceline: { width: 140,   height: 60 }
-    special:   { width: 44,    height: 60 }
+    default:          { width: 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 }
 
 views:
     base:
-        - "; ς ε ρ τ υ θ ι ο π"
+        - "; ς ε ρ τ υ θ ι ο π-fill"
         - "α σ δ φ γ η ξ κ λ show_accented"
         - "Shift_L ζ χ ψ ω β ν μ BackSpace"
-        - "show_numbers preferences space . CommaSpecial Return"
+        - "show_numbers preferences space . ,-subtle-highlight Return"
     upper:
         - ": ! Ε Ρ Τ Υ Θ Ι Ο Π"
         - "Α Σ Δ Φ Γ Η Ξ Κ Λ show_accented"
         - "Shift_L Ζ Χ Ψ Ω Β Ν Μ BackSpace"
-        - "show_numbers preferences space ·Special ᾿ Return"
+        - "show_numbers preferences space ·-subtle-highlight ᾿ Return"
     accented:
-        - "ά έ ή ί ϊ ΐ ό ύ ϋ ώ "
-        - "Ά Έ Ή Ί Ϊ Ό Ύ Ϋ Ώ show_base"
+        - "ά έ ή ί ϊ ΐ ό ύ ϋ ώ"
+        - "Ά Έ Ή Ί Ϊ Ό Ύ Ϋ Ώ show_accented"
         - "Ϗ ϐ ϑ ϗ ϖ ΰ ϕ – — BackSpace"
         - "show_numbers preferences space « » Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
-        - "show_symbols CommaSpecial \" ' : ; ! ? BackSpace"
-        - "show_letters preferences space . CommaSpecial Return"
+        - "show_symbols ,-subtle-highlight \" ' : ; ! ? BackSpace"
+        - "show_letters preferences space . ,-subtle-highlight Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
         - "show_numbers \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences space . CommaSpecial Return"
+        - "show_letters preferences space . ,-subtle-highlight Return"
 buttons:
     Shift_L:
         action:
             locking:
                 lock_view: "upper"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view-2"
         icon: "key-shift"
     BackSpace:
         outline: "altline"
@@ -55,30 +58,25 @@ buttons:
     show_numbers:
         action:
             set_view: "numbers"
-        outline: "wide"
+        outline: "change-view-2"
         label: "123"
     show_letters:
         action:
             set_view: "base"
-        outline: "wide"
+        outline: "change-view-2"
         label: "ΑΒΓ"
     show_symbols:
         action:
             set_view: "symbols"
-        outline: "altline"
+        outline: "change-view-2"
         label: "*/="
     show_accented:
         action:
             locking:
                 lock_view: "accented"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         label: "άΐ"
-    show_base:
-        action:
-            set_view: "base"
-        outline: "altline"
-        label: "αι"
     space:
         outline: "spaceline"
         text: " "
@@ -87,22 +85,37 @@ buttons:
         icon: "key-enter"
         keysym: "Return"
     .:
-        outline: "special"
-    ·Special:
-        outline: "special"
+        outline: "subtle-highlight"
+    ·-subtle-highlight:
+        outline: "subtle-highlight"
         text: "·"
-    CommaSpecial:
-        outline: "special"
+    ",-subtle-highlight":
+        outline: "subtle-highlight"
         text: ","
     ":":
-        outline: "special"
+        outline: "subtle-highlight"
     ;:
-        outline: "special"
+        outline: "subtle-highlight"
     ᾿:
-        outline: "special"
+        outline: "subtle-highlight"
     "!":
-        outline: "special"
+        outline: "subtle-highlight"
     «:
-        outline: "special"
+        outline: "subtle-highlight"
     »:
-        outline: "special"
+        outline: "subtle-highlight"
+    π-fill:
+        outline: "fill"
+        text: "π"
+    Π:
+        outline: "fill"
+    ώ:
+        outline: "fill"
+    0:
+        outline: "fill"
+    ):
+        outline: "fill"
+    ¶:
+        outline: "fill"
+    "}":
+        outline: "fill"

data/keyboards/gr_wide.yaml

@@ -1,45 +1,49 @@
 # Created by Sotiris Papadopoulos, sotirios.papadopoulos@inserm.fr
 ---
 outlines:
-    default:   { width: 80,  height: 60 }
-    altline:   { width: 110, height: 60 }
-    wide:      { width: 120, height: 60 }
-    spaceline: { width: 250, height: 60 }
-    special:   { width: 75,  height: 60 }
+    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 }
 
 views:
     base:
-        - "; ς ε ρ τ υ θ ι ο π"
+        - "; ς ε ρ τ υ θ ι ο π-fill"
         - "α σ δ φ γ η ξ κ λ show_accented"
         - "Shift_L ζ χ ψ ω β ν μ BackSpace"
-        - "show_numbers preferences space . CommaSpecial Return"
+        - "show_numbers preferences space . ,-subtle-highlight Return"
     upper:
         - ": ! Ε Ρ Τ Υ Θ Ι Ο Π"
         - "Α Σ Δ Φ Γ Η Ξ Κ Λ show_accented"
         - "Shift_L Ζ Χ Ψ Ω Β Ν Μ BackSpace"
-        - "show_numbers preferences space ·Special ᾿ Return"
+        - "show_numbers preferences space ·-subtle-highlight ᾿ Return"
     accented:
-        - "ά έ ή ί ϊ ΐ ό ύ ϋ ώ "
-        - "Ά Έ Ή Ί Ϊ Ό Ύ Ϋ Ώ show_base"
-        - "Ϗ ϐ ϑ ϗ ΰ ϕ ϖ – — BackSpace"
+        - "ά έ ή ί ϊ ΐ ό ύ ϋ ώ"
+        - "Ά Έ Ή Ί Ϊ Ό Ύ Ϋ Ώ show_accented"
+        - "Ϗ ϐ ϑ ϗ ϖ ΰ ϕ – — BackSpace"
         - "show_numbers preferences space « » Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
-        - "show_symbols CommaSpecial \" ' : ; ! ? BackSpace"
-        - "show_letters preferences space . CommaSpecial Return"
+        - "show_symbols ,-subtle-highlight \" ' : ; ! ? BackSpace"
+        - "show_letters preferences space . ,-subtle-highlight Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
         - "show_numbers \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences space . CommaSpecial Return"
+        - "show_letters preferences space . ,-subtle-highlight Return"
 buttons:
     Shift_L:
         action:
             locking:
                 lock_view: "upper"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view-2"
         icon: "key-shift"
     BackSpace:
         outline: "altline"
@@ -52,30 +56,25 @@ buttons:
     show_numbers:
         action:
             set_view: "numbers"
-        outline: "wide"
+        outline: "change-view-2"
         label: "123"
     show_letters:
         action:
             set_view: "base"
-        outline: "wide"
+        outline: "change-view-2"
         label: "ΑΒΓ"
     show_symbols:
         action:
             set_view: "symbols"
-        outline: "altline"
+        outline: "change-view-2"
         label: "*/="
     show_accented:
         action:
             locking:
                 lock_view: "accented"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         label: "άΐ"
-    show_base:
-        action:
-            set_view: "base"
-        outline: "altline"
-        label: "αι"
     space:
         outline: "spaceline"
         text: " "
@@ -84,22 +83,37 @@ buttons:
         icon: "key-enter"
         keysym: "Return"
     .:
-        outline: "special"
-    ·Special:
-        outline: "special"
+        outline: "subtle-highlight"
+    ·-subtle-highlight:
+        outline: "subtle-highlight"
         text: "·"
-    CommaSpecial:
-        outline: "special"
+    ",-subtle-highlight":
+        outline: "subtle-highlight"
         text: ","
     ":":
-        outline: "special"
+        outline: "subtle-highlight"
     ;:
-        outline: "special"
+        outline: "subtle-highlight"
     ᾿:
-        outline: "special"
+        outline: "subtle-highlight"
     "!":
-        outline: "special"
+        outline: "subtle-highlight"
     «:
-        outline: "special"
+        outline: "subtle-highlight"
     »:
-        outline: "special"
+        outline: "subtle-highlight"
+    π-fill:
+        outline: "fill"
+        text: "π"
+    Π:
+        outline: "fill"
+    ώ:
+        outline: "fill"
+    0:
+        outline: "fill"
+    ):
+        outline: "fill"
+    ¶:
+        outline: "fill"
+    "}":
+        outline: "fill"

data/keyboards/hu.yaml

@@ -1,11 +1,14 @@
-# Maintained by: soyer <soyer@irl.hu>
+# Based on work by: soyer <soyer@irl.hu>
 ---
 outlines:
-    default:   { width: 35.33, height: 52 }
-    altline:   { width: 52.67, height: 52 }
-    wide:      { width: 62,    height: 52 }
-    spaceline: { width: 99.67, height: 52 }
-    special:   { width: 35.33, height: 52 }
+    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 }
 
 views:
     base:
@@ -29,10 +32,10 @@ views:
         - "show_numbers   \\ / § π τ [ ]  BackSpace"
         - "show_letters show_eschars preferences         space        , . - Return"
     eschars:
-        - "ö ü ó Ö Ü Ó"
-        - "í ő ú Í Ő Ú"
-        - "show_numbers é á ű É Á Ű BackSpace"
-        - "show_letters show_eschars preferences         space        „ “ Return"
+        - "-- -- ö ü ó Ö Ü Ó -- --"
+        - "-- -- í ő ú Í Ő Ú -- --"
+        - "show_numbers --- é á ű É Á Ű --- BackSpace"
+        - "show_letters show_eschars preferences         space       , „ “ Return"
 
 buttons:
     Shift_L:
@@ -40,7 +43,7 @@ buttons:
             locking:
                 lock_view: "upper"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         icon: "key-shift"
     BackSpace:
         outline: "altline"
@@ -53,30 +56,35 @@ buttons:
     show_numbers:
         action:
             set_view: "numbers"
-        outline: "altline"
+        outline: "change-view"
         label: "123"
     show_letters:
         action:
             set_view: "base"
-        outline: "altline"
+        outline: "change-view"
         label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"
-        outline: "altline"
+        outline: "change-view"
         label: "*/="
     show_eschars:
         action:
             locking:
                 lock_view: "eschars"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         label: "éá"
     space:
         outline: "spaceline"
-        label: " "
         text: " "
     Return:
         outline: "altline"
         icon: "key-enter"
         keysym: "Return"
+    --:
+        outline: "placeholder"
+        text: ""
+    ---:
+        outline: "placeholder-2"
+        text: ""

data/keyboards/hu_wide.yaml

@@ -1,11 +1,13 @@
-# Maintained by: soyer <soyer@irl.hu>
+# Based on work by: soyer <soyer@irl.hu>
 ---
 outlines:
-    default:   { width: 48,  height: 42 }
-    altline:   { width: 81,  height: 42 }
-    wide:      { width: 108, height: 42 }
-    spaceline: { width: 216, height: 42 }
-    special:   { width: 48,  height: 42 }
+    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 }
 
 views:
     base:
@@ -19,20 +21,20 @@ views:
         - "Shift_L Í Y X C V B N M  BackSpace"
         - "show_numbers show_eschars preferences         space        ? : ! Return"
     numbers:
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "@ # € % & - _ + ( )"
-        - "show_symbols   ; \" ' : = < >  BackSpace"
+        - "-- 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_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:
@@ -40,7 +42,7 @@ buttons:
             locking:
                 lock_view: "upper"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         icon: "key-shift"
     BackSpace:
         outline: "altline"
@@ -53,30 +55,32 @@ buttons:
     show_numbers:
         action:
             set_view: "numbers"
-        outline: "altline"
+        outline: "change-view"
         label: "123"
     show_letters:
         action:
             set_view: "base"
-        outline: "altline"
+        outline: "change-view"
         label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"
-        outline: "altline"
+        outline: "change-view"
         label: "*/="
     show_eschars:
         action:
             locking:
                 lock_view: "eschars"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view-2"
         label: "éá"
     space:
         outline: "spaceline"
-        label: " "
         text: " "
     Return:
         outline: "altline"
         icon: "key-enter"
         keysym: "Return"
+    --:
+        outline: "placeholder"
+        text: ""

data/keyboards/il.yaml

@@ -1,63 +1,53 @@
 ---
 outlines:
-    default:   { width: 40,  height: 60 }
-    altline:   { width: 56,  height: 60 }
-    wide:      { width: 62,  height: 60 }
-    spaceline: { width: 142, height: 60 }
-    special:   { width: 44,  height: 60 }
+    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 }
 
 views:
     base:
         - "' - ק  ר א ט ו ן ם פ"
         - "ש ד ג כ ע י ח ל ך ף"
         - "ז ס ב ה נ מ צ ת ץ  BackSpace"
-        - "show_numbers CommaLarge preferences         space        . Return"
+        - "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_letters preferences    ,     space        . Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € $ ^ ° * { }"
-        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        . Return"
+        - "show_numbers   \\ / < > = [ ]  BackSpace"
+        - "show_letters preferences    ,     space        . Return"
 
 buttons:
     BackSpace:
-        outline: "default"
+        outline: "altline"
         icon: "edit-clear-symbolic"
-        action: erase
-    CommaLarge:
-        outline: "special"
-        text: ","
-        
+        action: "erase"
     preferences:
-        action: show_prefs
+        action: "show_prefs"
         outline: "special"
         icon: "keyboard-mode-symbolic"
     show_numbers:
         action:
             set_view: "numbers"
-        outline: "wide"
-        label: "123"
-    show_numbers_from_symbols:
-        action:
-            set_view: "numbers"
-        outline: "altline"
+        outline: "change-view"
         label: "123"
     show_letters:
         action:
             set_view: "base"
-        outline: "wide"
+        outline: "change-view"
         label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"
-        outline: "altline"
+        outline: "change-view"
         label: "*/="
-    .:
-        outline: "special"
     space:
         outline: "spaceline"
         text: " "
@@ -65,3 +55,6 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
+    --:
+        outline: "placeholder"
+        text: ""

data/keyboards/il_wide.yaml

@@ -1,63 +1,53 @@
 ---
 outlines:
-    default:   { width: 52,    height: 42 }
-    altline:   { width: 72.8,  height: 42 }
-    wide:      { width: 80.6,  height: 42 }
-    spaceline: { width: 184.6, height: 42 }
-    special:   { width: 57.2,  height: 42 }
+    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 }
 
 views:
     base:
         - "' - ק  ר א ט ו ן ם פ"
         - "ש ד ג כ ע י ח ל ך ף"
         - "ז ס ב ה נ מ צ ת ץ  BackSpace"
-        - "show_numbers CommaLarge preferences         space        . Return"
+        - "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_letters preferences    ,     space        . Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € $ ^ ° * { }"
-        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        . Return"
+        - "show_numbers   \\ / < > = [ ]  BackSpace"
+        - "show_letters preferences    ,     space        . Return"
 
 buttons:
     BackSpace:
-        outline: "default"
+        outline: "altline"
         icon: "edit-clear-symbolic"
-        action: erase
-    CommaLarge:
-        outline: "special"
-        text: ","
-        
+        action: "erase"
     preferences:
-        action: show_prefs
+        action: "show_prefs"
         outline: "special"
         icon: "keyboard-mode-symbolic"
     show_numbers:
         action:
             set_view: "numbers"
-        outline: "wide"
-        label: "123"
-    show_numbers_from_symbols:
-        action:
-            set_view: "numbers"
-        outline: "altline"
+        outline: "change-view"
         label: "123"
     show_letters:
         action:
             set_view: "base"
-        outline: "wide"
+        outline: "change-view"
         label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"
-        outline: "altline"
+        outline: "change-view"
         label: "*/="
-    .:
-        outline: "special"
     space:
         outline: "spaceline"
         text: " "

data/keyboards/ir.yaml

@@ -1,10 +1,13 @@
 ---
 outlines:
-    default:   { width: 35.33, height: 52 }
-    altline:   { width: 52.67, height: 52 }
-    wide:      { width: 62,    height: 52 }
-    spaceline: { width: 142,   height: 52 }
-    special:   { width: 44,    height: 52 }
+    default:       { width: 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 }
 
 views:
     base:
@@ -16,17 +19,17 @@ views:
         - "  ْ  ٌ  ٍ  ً  ُ  ِ  َ  ّ # @ چ"
         - "_ ئ ي إ أ آ ة » « : ؛"
         - "Shift_L ك  ٓ ژ  ٔ ء > < ؟ BackSpace"
-        - "show_numbers preferences         space        ! ، Return"
+        - "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_numbers_from_symbols + - × ÷  = \\ < > BackSpace"
+        - "show_letters preferences         space       ، . Return"
 
 buttons:
     Shift_L:
@@ -34,38 +37,36 @@ buttons:
             locking:
                 lock_view: "upper"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         icon: "key-shift"
     BackSpace:
         outline: "altline"
         icon: "edit-clear-symbolic"
-        action: erase
+        action: "erase"
     preferences:
-        action: show_prefs
+        action: "show_prefs"
         outline: "special"
         icon: "keyboard-mode-symbolic"
     show_numbers:
         action:
             set_view: "numbers"
-        outline: "wide"
+        outline: "change-view-2"
         label: "۱۲۳"
     show_numbers_from_symbols:
         action:
             set_view: "numbers"
-        outline: "altline"
+        outline: "change-view"
         label: "۱۲۳"
     show_letters:
         action:
             set_view: "base"
-        outline: "wide"
+        outline: "change-view-2"
         label: "ا‌ب‌پ"
     show_symbols:
         action:
             set_view: "symbols"
-        outline: "altline"
+        outline: "change-view"
         label: "*/="
-    .:
-        outline: "special"
     space:
         outline: "spaceline"
         text: " "
@@ -76,3 +77,6 @@ buttons:
     zwnj:
         icon: "zwnj"
         text: "‌"
+    --:
+        outline: "placeholder"
+        text: ""

data/keyboards/ir_wide.yaml

@@ -1,32 +1,36 @@
 ---
 outlines:
-    default:   { width: 54,  height: 42 }
-    altline:   { width: 81,  height: 42 }
-    wide:      { width: 108, height: 42 }
-    spaceline: { width: 216, height: 42 }
-    special:   { width: 54,  height: 42 }
+    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 }
 
 views:
     base:
-        - "ض ص ث ق ف غ ع ه خ ح ج چ \\"
-        - "ش س ی ب ل ا ت ن م ک گ"
-        - "Shift_L ظ ط ز ر ذ د پ و ، / BackSpace"
-        - "show_numbers preferences         space     zwnj ؟ ! . Return"
+        - "ض ص ث ق ف غ ع ه خ ح ج چ"
+        - "ش س ی ب ل ا ت ن م ک گ /"
+        - "Shift_L ظ ط ز ر ذ د پ و ، BackSpace"
+        - "show_numbers preferences         space     zwnj ؟ . Return"
     upper:
-        - " ْ  ٌ  ٍ  ً  ُ  ِ  َ  ّ  ] [ @ # _"
-        - "ؤ ئ ي إ أ آ ة » « : ؛"
-        - "Shift_L ك  ٓ ژ ٰ  ‌  ٔ  ء  >  <  ؟ BackSpace"
-        - "show_numbers preferences         space        ، ؟ ! . Return"
+        - " ْ  ٌ  ٍ  ً  ُ  ِ  َ  ّ  ] [ @ #"
+        - "ؤ ئ ي إ أ آ ة » « : ؛ \\"
+        - "Shift_L ك  ٓ ژ ٰ  ‌  ٔ  ء  >  <  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_numbers_from_symbols + - × ÷ = \\ % < > BackSpace"
+        - "show_letters preferences         space        ، ! . Return"
 
 buttons:
     Shift_L:
@@ -34,7 +38,7 @@ buttons:
             locking:
                 lock_view: "upper"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         icon: "key-shift"
     BackSpace:
         outline: "altline"
@@ -47,25 +51,23 @@ buttons:
     show_numbers:
         action:
             set_view: "numbers"
-        outline: "wide"
+        outline: "change-view-2"
         label: "۱۲۳"
     show_numbers_from_symbols:
         action:
             set_view: "numbers"
-        outline: "altline"
+        outline: "change-view"
         label: "۱۲۳"
     show_letters:
         action:
             set_view: "base"
-        outline: "wide"
+        outline: "change-view-2"
         label: "ا‌ب‌پ"
     show_symbols:
         action:
             set_view: "symbols"
-        outline: "altline"
+        outline: "change-view"
         label: "*/="
-    .:
-        outline: "special"
     space:
         outline: "spaceline"
         text: " "
@@ -76,3 +78,6 @@ buttons:
     zwnj:
         icon: "zwnj"
         text: "‌"
+    --:
+        outline: "placeholder"
+        text: ""

data/keyboards/it+fur.yaml

@@ -1,12 +1,15 @@
-# Friulian layout created by Fabio Tomat
+# Based on the Friulian layout created by Fabio Tomat
 # 14 october 2020
 ---
 outlines:
-    default:   { width: 35.33, height: 52 }
-    altline:   { width: 52.67, height: 52 }
-    wide:      { width: 62,    height: 52 }
-    spaceline: { width: 99.67, height: 52 }
-    special:   { width: 44,    height: 52 }
+    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 }
 
 views:
     base:
@@ -41,7 +44,7 @@ buttons:
             locking:
                 lock_view: "upper"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         icon: "key-shift"
     BackSpace:
         outline: "altline"
@@ -54,36 +57,32 @@ buttons:
     show_numbers:
         action:
             set_view: "numbers"
-        outline: "altline"
-        label: "123"
-    show_numbers_from_symbols:
-        action:
-            set_view: "numbers"
-        outline: "altline"
+        outline: "change-view"
         label: "123"
     show_letters:
         action:
             set_view: "base"
-        outline: "altline"
+        outline: "change-view"
         label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"
-        outline: "altline"
+        outline: "change-view"
         label: "*/="
     show_eschars:
         action:
             locking:
                 lock_view: "eschars"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         label: "àê"
     space:
         outline: "spaceline"
-        label: " "
         text: " "
     Return:
         outline: "altline"
         icon: "key-enter"
         keysym: "Return"
-
+    --:
+        outline: "placeholder"
+        text: ""

data/keyboards/it+fur_wide.yaml

@@ -1,12 +1,15 @@
-# Friulian layout created by Fabio Tomat
+# Based on the Friulian layout created by Fabio Tomat
 # 14 october 2020
 ---
 outlines:
-    default:   { width: 52,    height: 42 }
-    altline:   { width: 77.52, height: 42 }
-    wide:      { width: 91.26, height: 42 }
-    spaceline: { width: 146.7, height: 42 }
-    special:   { width: 64.76, height: 42 }
+    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 }
 
 views:
     base:
@@ -41,7 +44,7 @@ buttons:
             locking:
                 lock_view: "upper"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         icon: "key-shift"
     BackSpace:
         outline: "altline"
@@ -54,36 +57,32 @@ buttons:
     show_numbers:
         action:
             set_view: "numbers"
-        outline: "altline"
-        label: "123"
-    show_numbers_from_symbols:
-        action:
-            set_view: "numbers"
-        outline: "altline"
+        outline: "change-view"
         label: "123"
     show_letters:
         action:
             set_view: "base"
-        outline: "altline"
+        outline: "change-view"
         label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"
-        outline: "altline"
+        outline: "change-view"
         label: "*/="
     show_eschars:
         action:
             locking:
                 lock_view: "eschars"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         label: "àê"
     space:
         outline: "spaceline"
-        label: " "
         text: " "
     Return:
         outline: "altline"
         icon: "key-enter"
         keysym: "Return"
-
+    --:
+        outline: "placeholder"
+        text: ""

data/keyboards/it.yaml

@@ -2,11 +2,14 @@
 # 03 october 2019
 ---
 outlines:
-    default:   { width: 35.33, height: 52 }
-    altline:   { width: 52.67, height: 52 }
-    wide:      { width: 62,    height: 52 }
-    spaceline: { width: 99.67, height: 52 }
-    special:   { width: 44,    height: 52 }
+    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 }
 
 views:
     base:
@@ -41,7 +44,7 @@ buttons:
             locking:
                 lock_view: "upper"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         icon: "key-shift"
     BackSpace:
         outline: "altline"
@@ -49,39 +52,37 @@ buttons:
         action: "erase"
     preferences:
         action: "show_prefs"
-        outline: "default"
+        outline: "special"
         icon: "keyboard-mode-symbolic"
     show_numbers:
         action:
             set_view: "numbers"
-        outline: "altline"
-        label: "123"
-    show_numbers_from_symbols:
-        action:
-            set_view: "numbers"
-        outline: "altline"
+        outline: "change-view"
         label: "123"
     show_letters:
         action:
             set_view: "base"
-        outline: "altline"
+        outline: "change-view"
         label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"
-        outline: "altline"
+        outline: "change-view"
         label: "*/="
     show_eschars:
         action:
-            set_view: "eschars"
-        outline: "altline"
+            locking:
+                lock_view: "eschars"
+                unlock_view: "base"
+        outline: "change-view"
         label: "àè"
     space:
         outline: "spaceline"
-        label: " "
         text: " "
     Return:
         outline: "altline"
         icon: "key-enter"
         keysym: "Return"
-
+    --:
+        outline: "placeholder"
+        text: ""

data/keyboards/it_wide.yaml

@@ -2,11 +2,14 @@
 # 03 october 2019
 ---
 outlines:
-    default:   { width: 52,    height: 42 }
-    altline:   { width: 77.52, height: 42 }
-    wide:      { width: 91.26, height: 42 }
-    spaceline: { width: 146.7, height: 42 }
-    special:   { width: 64.76, height: 42 }
+    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 }
 
 views:
     base:
@@ -41,7 +44,7 @@ buttons:
             locking:
                 lock_view: "upper"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         icon: "key-shift"
     BackSpace:
         outline: "altline"
@@ -49,39 +52,37 @@ buttons:
         action: "erase"
     preferences:
         action: "show_prefs"
-        outline: "default"
+        outline: "special"
         icon: "keyboard-mode-symbolic"
     show_numbers:
         action:
             set_view: "numbers"
-        outline: "altline"
-        label: "123"
-    show_numbers_from_symbols:
-        action:
-            set_view: "numbers"
-        outline: "altline"
+        outline: "change-view"
         label: "123"
     show_letters:
         action:
             set_view: "base"
-        outline: "altline"
+        outline: "change-view"
         label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"
-        outline: "altline"
+        outline: "change-view"
         label: "*/="
     show_eschars:
         action:
-            set_view: "eschars"
-        outline: "altline"
+            locking:
+                lock_view: "eschars"
+                unlock_view: "base"
+        outline: "change-view"
         label: "àè"
     space:
         outline: "spaceline"
-        label: " "
         text: " "
     Return:
         outline: "altline"
         icon: "key-enter"
         keysym: "Return"
-
+    --:
+        outline: "placeholder"
+        text: ""

data/keyboards/jp+kana.yaml

@@ -1,11 +1,12 @@
-# Maintained by: Mark Müller <markmueller86@gmail.com>
+# Based on work by: Mark Müller <markmueller86@gmail.com>
 ---
 outlines:
-    default:      { width: 62, height: 52 }
-    default-wide: { width: 62, height: 52 }
-    altline:      { width: 62, height: 52 }
-    wide:         { width: 62, height: 52 }
-    special:      { width: 62, height: 52 }
+    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 }
 
 views:
     base: # hiragana
@@ -14,66 +15,74 @@ views:
         - "カタカナ ma ya ra space"
         - "switch2roman symbols wa punct Return"
     _a:
-        - "preferences dummykey _a dummykey BackSpace"
+        - "preferences _A _a -- BackSpace"
         - "あ い う え お"
         - "ぁ ぃ ぅ ぇ ぉ" # 2 code points each
-        - "dummykey dummykey ゔ dummykey dummykey"
+        - "-- -- ゔ -- --"
     ka:
-        - "preferences dummykey ka dummykey BackSpace"
+        - "preferences KA ka -- BackSpace"
         - "か き く け こ"
         - "が ぎ ぐ げ ご"
-        - "ゕ dummykey dummykey ゖ dummykey"
+        - "ゕ -- -- ゖ --"
     sa:
-        - "preferences dummykey sa dummykey BackSpace"
+        - "preferences SA sa -- BackSpace"
         - "さ し す せ そ"
         - "ざ じ ず ぜ ぞ"
+        - "-- -- -- -- --"
     ta:
-        - "preferences dummykey ta dummykey BackSpace"
+        - "preferences TA ta -- BackSpace"
         - "た ち つ て と"
         - "だ ぢ づ で ど"
-        - "dummykey dummykey っ dummykey dummykey"
+        - "-- -- っ -- --"
     na:
-        - "preferences dummykey na dummykey BackSpace"
+        - "preferences NA na -- BackSpace"
         - "な に ぬ ね の"
+        - "-- -- -- -- --"
+        - "-- -- -- -- --"
     ha:
-        - "preferences dummykey ha dummykey BackSpace"
+        - "preferences HA ha -- BackSpace"
         - "は ひ ふ へ ほ"
         - "ば び ぶ べ ぼ"
         - "ぱ ぴ ぷ ぺ ぽ"
     ma:
-        - "preferences dummykey ma dummykey BackSpace"
+        - "preferences MA ma -- BackSpace"
         - "ま み む め も"
+        - "-- -- -- -- --"
+        - "-- -- -- -- --"
     ya:
-        - "preferences dummykey ya dummykey BackSpace"
-        - "や dummykey ゆ dummykey よ"
-        - "ゃ dummykey ゅ dummykey ょ"
+        - "preferences YA ya -- BackSpace"
+        - "や -- ゆ -- よ"
+        - "ゃ -- ゅ -- ょ"
+        - "-- -- -- -- --"
     ra:
-        - "preferences dummykey ra dummykey BackSpace"
+        - "preferences RA ra -- BackSpace"
         - "ら り る れ ろ"
+        - "-- -- -- -- --"
+        - "-- -- -- -- --"
     wa:
-        - "preferences dummykey wa dummykey BackSpace"
-        - "わ ゐ dummykey ゑ を"
-        - "ゎ dummykey ん dummykey dummykey"
+        - "preferences WA wa -- BackSpace"
+        - "わ ゐ -- ゑ を"
+        - "ゎ -- -- -- --"
+        - "-- -- ん -- --"
     symbols:
-        - "preferences dummykey symbols dummykey BackSpace"
+        - "preferences punct symbols -- BackSpace"
         - "「 」 （ ） §"
         - "【 】 ＜ ＞ ＝"
         - "＋ ＊ ＆ ％ ＄ "
     punct:
-        - "preferences dummykey punct dummykey BackSpace"
+        - "preferences symbols punct -- BackSpace"
         - "。 、 ？ ！ ー"
-
         - "： ； ・ 〜 …"
-        - "♪ ” ’ ゙ ゚"
-        
-#a 	あア 	かカ 	さサ 	たタ 	なナ 	はハ 	まマ 	やヤ 	らラ 	わワ
-#i 	いイ 	きキ 	しシ 	ちチ 	にニ 	ひヒ 	みミ 	※      りリ 	ゐヰ
-#u 	うウ 	くク 	すス 	つツ 	ぬヌ 	ふフ 	むム 	ゆユ 	るル 	※
-#e 	えエ 	けケ 	せセ 	てテ 	ねネ 	へヘ 	めメ 	※      れレ 	ゑヱ
-#o 	おオ 	こコ 	そソ 	とト 	のノ 	ほホ 	もモ 	よヨ 	ろロ 	をヲ
+        - "♪ ” ’  ゙  ゚"
+#              k       s       t       n       h       m       y       r       w
+#a 	あア 	かカ 	さサ 	たタ 	なナ 	はハ 	まマ 	やヤ	らラ 	わワ
+#i 	いイ 	きキ 	しシ 	ちチ 	にニ 	ひヒ 	みミ 	※	りリ 	ゐヰ
+#u 	うウ 	くク 	すス 	つツ 	ぬヌ 	ふフ 	むム 	ゆユ	るル 	※
+#e 	えエ 	けケ 	せセ 	てテ 	ねネ 	へヘ 	めメ 	※	れレ 	ゑヱ
+#o 	おオ 	こコ 	そソ 	とト 	のノ 	ほホ 	もモ 	よヨ	ろロ 	をヲ
 
-#      g       z       d       b       p      n
-#a 	が ガ 	ざ ザ 	だ ダ 	ば バ 	ぱ パ   ん ン
+#      g       z       d       b       p       n
+#a 	が ガ 	ざ ザ 	だ ダ 	ば バ 	ぱ パ	ん ン
 #i 	ぎ ギ 	じ ジ 	ぢ ヂ 	び ビ 	ぴ ピ 
 #u 	ぐ グ 	ず ズ 	づ ヅ 	ぶ ブ 	ぷ プ 
 #e 	げ ゲ 	ぜ ゼ 	で デ 	べ ベ 	ぺ ペ 
@@ -85,50 +94,65 @@ views:
         - "ひらがな MA YA RA space"
         - "switch2roman SYMBOLS WA PUNCT Return"
     _A:
-        - "preferences DUMMYKEY _A DUMMYKEY BackSpace"
+        - "preferences _a _A -- BackSpace"
         - "ア イ ウ エ オ"
         - "ァ ィ ゥ ェ ォ"
-        - "DUMMYKEY DUMMYKEY ヴ DUMMYKEY DUMMYKEY"
+        - "-- -- ヴ -- --"
     KA:
-        - "preferences DUMMYKEY KA DUMMYKEY BackSpace"
+        - "preferences ka KA -- BackSpace"
         - "カ キ ク ケ コ"
         - "ガ ギ グ ゲ ゴ"
-        - "ヵ DUMMYKEY ㇰ ヶ DUMMYKEY"
+        - "ヵ -- ㇰ ヶ --"
     SA:
-        - "preferences DUMMYKEY SA DUMMYKEY BackSpace"
+        - "preferences sa SA -- BackSpace"
         - "サ シ ス セ ソ"
         - "ザ ジ ズ ゼ ゾ"
-        - "DUMMYKEY ㇱ ㇲ DUMMYKEY DUMMYKEY"
+        - "-- ㇱ ㇲ -- --"
     TA:
-        - "preferences DUMMYKEY TA DUMMYKEY BackSpace"
+        - "preferences ta TA -- BackSpace"
         - "タ チ ツ テ ト"
         - "ダ ヂ ヅ デ ド"
-        - "DUMMYKEY DUMMYKEY ッ DUMMYKEY ㇳ"
+        - "-- -- ッ -- ㇳ"
     NA: 
-        - "preferences DUMMYKEY NA DUMMYKEY BackSpace"
+        - "preferences na NA -- BackSpace"
         - "ナ ニ ヌ ネ ノ"
-        - "DUMMYKEY DUMMYKEY ㇴ DUMMYKEY DUMMYKEY"
+        - "-- -- ㇴ -- --"
+        - "-- -- -- -- --"
     HA:
-        - "preferences DUMMYKEY HA DUMMYKEY BackSpace"
+        - "preferences ha HA -- BackSpace"
         - "ハ ヒ フ ヘ ホ"
         - "バ ビ ブ ベ ボ"
         - "パ ピ プ ペ ポ"
     MA:
-        - "preferences DUMMYKEY MA DUMMYKEY BackSpace"
+        - "preferences ma MA -- BackSpace"
         - "マ ミ ム メ モ"
-        - "DUMMYKEY DUMMYKEY ㇺ DUMMYKEY DUMMYKEY"
+        - "-- -- ㇺ -- --"
+        - "-- -- -- -- --"
     YA:
-        - "preferences DUMMYKEY YA DUMMYKEY BackSpace"
-        - "ヤ DUMMYKEY ユ DUMMYKEY ヨ"
-        - "ャ DUMMYKEY ュ DUMMYKEY ョ"
+        - "preferences ya YA -- BackSpace"
+        - "ヤ -- ユ -- ヨ"
+        - "ャ -- ュ -- ョ"
+        - "-- -- -- -- --"
     RA:
-        - "preferences DUMMYKEY RA DUMMYKEY BackSpace"
+        - "preferences ra RA -- BackSpace"
         - "ラ リ ル レ ロ"
         - "ㇻ ㇼ ㇽ ㇾ ㇿ"
+        - "-- -- -- -- --"
     WA:
-        - "preferences DUMMYKEY WA DUMMYKEY BackSpace"
-        - "ワ ヰ DUMMYKEY ヱ ヲ"
-        - "ヮ ヸ ン ヹ ヺ"
+        - "preferences wa WA -- BackSpace"
+        - "ワ ヰ -- ヱ ヲ"
+        - "ヮ ヸ -- ヹ ヺ"
+        - "-- -- ン -- --"
+    SYMBOLS:
+        - "preferences PUNCT SYMBOLS -- BackSpace"
+        - "「 」 （ ） §"
+        - "【 】 ＜ ＞ ＝"
+        - "＋ ＊ ＆ ％ ＄ "
+    PUNCT:
+        - "preferences SYMBOLS PUNCT -- BackSpace"
+        - "。 、 ？ ！ ー"
+        - "： ； ・ 〜 …"
+        - "♪ ” ’ ゙  ゚"
     # numbers view
     numbers:
         - "preferences 1 2 3 BackSpace"
@@ -142,60 +166,72 @@ views:
         - "ひらがな PQRS TUV WXYZ space"
         - "switch2num RSYM2 RSYM3 RSYM4 Return"
     RSYM1:
-        - "preferences dummykey RSYM1 dummykey BackSpace"
+        - "preferences -- RSYM1 -- BackSpace"
         - "@ # $ § :"
-        - "| € ¥ £ 1"
+        - "| € ¥ £ --"
+        - "1 -- -- -- --"
     ABC:
-        - "preferences dummykey ABC dummykey BackSpace"
+        - "preferences -- ABC -- BackSpace"
         - "A B C Ä ç"
-        - "a b c ä 2"
+        - "a b c ä --"
+        - "2 -- -- -- --"
     DEF:
-        - "preferences dummykey DEF dummykey BackSpace"
-        - "D E F dummykey"
-        - "d e f 3"
+        - "preferences -- DEF -- BackSpace"
+        - "D E F -- --"
+        - "d e f -- --"
+        - "3 -- -- -- --"
     GHI:
-        - "preferences dummykey GHI dummykey BackSpace"
-        - "G H I dummykey"
-        - "g h i 4"
+        - "preferences -- GHI -- BackSpace"
+        - "G H I -- --"
+        - "g h i -- --"
+        - "4 -- -- -- --"
     JKL:
-        - "preferences dummykey JKL dummykey BackSpace"
-        - "J K L dummykey"
-        - "j k l 5"
+        - "preferences -- JKL -- BackSpace"
+        - "J K L -- --"
+        - "j k l -- --"
+        - "5 -- -- -- --"
     MNO:
-        - "preferences dummykey MNO dummykey BackSpace"
-        - "M N O Ö dummykey"
-        - "m n o ö 6"
+        - "preferences -- MNO -- BackSpace"
+        - "M N O Ö --"
+        - "m n o ö --"
+        - "6 -- -- -- --"
     PQRS:
-        - "preferences dummykey PQRS dummykey BackSpace"
-        - "P Q R S ß"
-        - "p q r s 7"
+        - "preferences -- PQRS -- BackSpace"
+        - "P Q R S --"
+        - "p q r s ß"
+        - "7 -- -- -- --"
     TUV:
-        - "preferences dummykey TUV dummykey BackSpace"
-        - "T U V Ü dummykey"
-        - "t u v ü 8"
+        - "preferences -- TUV -- BackSpace"
+        - "T U V Ü --"
+        - "t u v ü --"
+        - "8 -- -- -- --"
     WXYZ:
-        - "preferences dummykey WXYZ dummykey BackSpace"
-        - "W X Y Z dummykey"
-        - "w x y z 9"
+        - "preferences -- WXYZ -- BackSpace"
+        - "W X Y Z --"
+        - "w x y z --"
+        - "9 -- -- -- --"
     RSYM2:
-        - "preferences dummykey RSYM2 dummykey BackSpace"
+        - "preferences -- RSYM2 -- BackSpace"
         - "( ) ' \" ~"
         - "[ ] { } _"
+        - "-- -- -- -- --"
     RSYM3:
-        - "preferences dummykey RSYM3 dummykey BackSpace"
+        - "preferences -- RSYM3 -- BackSpace"
         - "+ - * / ="
-        - "< > ^ ° 0"
+        - "< > ^ ° --"
+        - "0 -- -- -- --"
     RSYM4:
-        - "preferences dummykey RSYM4 dummykey BackSpace"
+        - "preferences -- RSYM4 -- BackSpace"
         - ", . ? ! ;"
-        - "\\ ´ ` · ¶" 
+        - "\\ ´ ` · ¶"
+        - "-- -- -- -- --"
 
 buttons:
     # following 4 buttons use the corresponding xkb name as keysym
     BackSpace:
         outline: "wide"
         icon: "edit-clear-symbolic"
-        action: erase
+        action: "erase"
     Return:
         outline: "wide"
         icon: "key-enter"
@@ -215,118 +251,115 @@ buttons:
         icon: "keyboard-mode-symbolic"
     # space button using text tag for ideographic space
     space:
-        outline: "default-wide"
         label: "␣"
         text: "　"
     # switch to number view
     numbers:
         action:
             set_view: "numbers"
-        outline: "wide"
+        outline: "change-view"
         label: "123"
     # switch to latin characters
     roman:
         action:
             set_view: "roman"
-        outline: "wide"
+        outline: "change-view"
         label: "ᴀʙᴄ"
     # toggle button with 3 different states
     switch2roman: # switch from kana to latin characters view
         action:
             set_view: "roman"
-        outline: "wide"
+        outline: "change-view"
         label: "あᴀ₁"
     switch2num: # switch from latin characters to numbers view
         action:
             set_view: "numbers"
-        outline: "wide"
+        outline: "change-view"
         label: "ぁA₁"
     switch2kana: # switch from numbers to hiragana view
         action:
             set_view: "base"
-        outline: "wide"
+        outline: "change-view"
         label: "ぁᴀ1"
     # Buttons for katakana and symbols
     ひらがな:
         action:
             set_view: "base"
-        outline: "wide"
+        outline: "change-view"
         label: "あさ"
     _a:
         action:
             locking:
                 lock_view: "_a"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "character-group"
         label: "あ"
     ka:
         action:
             locking:
                 lock_view: "ka"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "character-group"
         label: "か"
     sa:
         action:
             locking:
                 lock_view: "sa"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "character-group"
         label: "さ"
     ta:
         action:
             locking:
                 lock_view: "ta"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "character-group"
         label: "た"
     na:
         action:
             locking:
                 lock_view: "na"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "character-group"
         label: "な"
     ha:
         action:
             locking:
                 lock_view: "ha"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "character-group"
         label: "は"
     ma:
         action:
             locking:
                 lock_view: "ma"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "character-group"
         label: "ま"
     ya:
         action:
             locking:
                 lock_view: "ya"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "character-group"
         label: "や"
     ra:
         action:
             locking:
                 lock_view: "ra"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "character-group"
         label: "ら"
     wa:
         action:
             locking:
                 lock_view: "wa"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "character-group"
         label: "わ"
-    dummykey:
-        action:
-            set_view: "base"
-        outline: "altline"
-        label: ""
+    --:
+        outline: "placeholder"
+        text: ""
     # buttons available on different views like symbols and punct should go
     # back to their corresponding view
     symbols:
@@ -334,109 +367,104 @@ buttons:
             locking:
                 lock_view: "symbols"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "character-group"
         label: "（）"
     punct:
         action:
             locking:
                 lock_view: "punct"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "character-group"
         label: "。"
     # Buttons for katakana and symbols
     カタカナ:
         action:
             set_view: "カタカナ"
-        outline: "wide"
+        outline: "change-view"
         label: "アサ"
     _A:
         action:
             locking:
                 lock_view: "_A"
                 unlock_view: "カタカナ"
-        outline: "altline"
+        outline: "character-group"
         label: "ア"
     KA:
         action:
             locking:
                 lock_view: "KA"
                 unlock_view: "カタカナ"
-        outline: "altline"
+        outline: "character-group"
         label: "カ"
     SA:
         action:
             locking:
                 lock_view: "SA"
                 unlock_view: "カタカナ"
-        outline: "altline"
+        outline: "character-group"
         label: "サ"
     TA:
         action:
             locking:
                 lock_view: "TA"
                 unlock_view: "カタカナ"
-        outline: "altline"
+        outline: "character-group"
         label: "タ"
     NA:
         action:
             locking:
                 lock_view: "NA"
                 unlock_view: "カタカナ"
-        outline: "altline"
+        outline: "character-group"
         label: "ナ"
     HA:
         action:
             locking:
                 lock_view: "HA"
                 unlock_view: "カタカナ"
-        outline: "altline"
+        outline: "character-group"
         label: "ハ"
     MA:
         action:
             locking:
                 lock_view: "MA"
                 unlock_view: "カタカナ"
-        outline: "altline"
+        outline: "character-group"
         label: "マ"
     YA:
         action:
             locking:
                 lock_view: "YA"
                 unlock_view: "カタカナ"
-        outline: "altline"
+        outline: "character-group"
         label: "ヤ"
     RA:
         action:
             locking:
                 lock_view: "RA"
                 unlock_view: "カタカナ"
-        outline: "altline"
+        outline: "character-group"
         label: "ラ"
     WA:
         action:
             locking:
                 lock_view: "WA"
                 unlock_view: "カタカナ"
-        outline: "altline"
+        outline: "character-group"
         label: "ワ"
-    DUMMYKEY:
-        action:
-            set_view: "カタカナ"
-        outline: "altline"
-        label: ""
     SYMBOLS:
         action:
             locking:
-                lock_view: "symbols"
+                lock_view: "SYMBOLS"
                 unlock_view: "カタカナ"
-        outline: "altline"
+        outline: "character-group"
         label: "（）"
     PUNCT:
         action:
             locking:
-                lock_view: "punct"
+                lock_view: "PUNCT"
                 unlock_view: "カタカナ"
-        outline: "altline"
+        outline: "character-group"
         label: "。"
     # Buttons for Latin characters
     RSYM1:
@@ -444,82 +472,82 @@ buttons:
             locking:
                 lock_view: "RSYM1"
                 unlock_view: "roman"
-        outline: "altline"
+        outline: "character-group"
         label: "@#"
     ABC:
         action:
             locking:
                 lock_view: "ABC"
                 unlock_view: "roman"
-        outline: "altline"
+        outline: "character-group"
         label: "ᴀʙᴄ"
     DEF:
         action:
             locking:
                 lock_view: "DEF"
                 unlock_view: "roman"
-        outline: "altline"
+        outline: "character-group"
         label: "ᴅᴇꜰ"
     GHI:
         action:
             locking:
                 lock_view: "GHI"
                 unlock_view: "roman"
-        outline: "altline"
+        outline: "character-group"
         label: "ɢʜɪ"
     JKL:
         action:
             locking:
                 lock_view: "JKL"
                 unlock_view: "roman"
-        outline: "altline"
+        outline: "character-group"
         label: "ᴊᴋʟ"
     MNO:
         action:
             locking:
                 lock_view: "MNO"
                 unlock_view: "roman"
-        outline: "altline"
+        outline: "character-group"
         label: "ᴍɴᴏ"
     PQRS:
         action:
             locking:
                 lock_view: "PQRS"
                 unlock_view: "roman"
-        outline: "altline"
+        outline: "character-group"
         label: "ᴘǫʀs"
     TUV:
         action:
             locking:
                 lock_view: "TUV"
                 unlock_view: "roman"
-        outline: "altline"
+        outline: "character-group"
         label: "ᴛᴜᴠ"
     WXYZ:
         action:
             locking:
                 lock_view: "WXYZ"
                 unlock_view: "roman"
-        outline: "altline"
+        outline: "character-group"
         label: "ᴡxʏᴢ"
     RSYM2:
         action:
             locking:
                 lock_view: "RSYM2"
                 unlock_view: "roman"
-        outline: "altline"
+        outline: "character-group"
         label: "()"
     RSYM3:
         action:
             locking:
                 lock_view: "RSYM3"
                 unlock_view: "roman"
-        outline: "altline"
+        outline: "character-group"
         label: "+-"
     RSYM4:
         action:
             locking:
                 lock_view: "RSYM4"
                 unlock_view: "roman"
-        outline: "altline"
+        outline: "character-group"
         label: ",.?"

data/keyboards/jp+kana_wide.yaml

@@ -1,11 +1,12 @@
-# Maintained by: Mark Müller <markmueller86@gmail.com>
+# Based on work by: Mark Müller <markmueller86@gmail.com>
 ---
 outlines:
-    default:      { width: 62, height: 42 }
-    default-wide: { width: 62, height: 42 }
-    altline:      { width: 62, height: 42 }
-    wide:         { width: 62, height: 42 }
-    special:      { width: 62, height: 42 }
+    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 }
+    placeholder:     { width: 84, height: 42 }
 
 views:
     base: # hiragana
@@ -14,66 +15,74 @@ views:
         - "カタカナ ma ya ra space"
         - "switch2roman symbols wa punct Return"
     _a:
-        - "preferences dummykey _a dummykey BackSpace"
+        - "preferences _A _a -- BackSpace"
         - "あ い う え お"
         - "ぁ ぃ ぅ ぇ ぉ" # 2 code points each
-        - "dummykey dummykey ゔ dummykey dummykey"
+        - "-- -- ゔ -- --"
     ka:
-        - "preferences dummykey ka dummykey BackSpace"
+        - "preferences KA ka -- BackSpace"
         - "か き く け こ"
         - "が ぎ ぐ げ ご"
-        - "ゕ dummykey dummykey ゖ dummykey"
+        - "ゕ -- -- ゖ --"
     sa:
-        - "preferences dummykey sa dummykey BackSpace"
+        - "preferences SA sa -- BackSpace"
         - "さ し す せ そ"
         - "ざ じ ず ぜ ぞ"
+        - "-- -- -- -- --"
     ta:
-        - "preferences dummykey ta dummykey BackSpace"
+        - "preferences TA ta -- BackSpace"
         - "た ち つ て と"
         - "だ ぢ づ で ど"
-        - "dummykey dummykey っ dummykey dummykey"
+        - "-- -- っ -- --"
     na:
-        - "preferences dummykey na dummykey BackSpace"
+        - "preferences NA na -- BackSpace"
         - "な に ぬ ね の"
+        - "-- -- -- -- --"
+        - "-- -- -- -- --"
     ha:
-        - "preferences dummykey ha dummykey BackSpace"
+        - "preferences HA ha -- BackSpace"
         - "は ひ ふ へ ほ"
         - "ば び ぶ べ ぼ"
         - "ぱ ぴ ぷ ぺ ぽ"
     ma:
-        - "preferences dummykey ma dummykey BackSpace"
+        - "preferences MA ma -- BackSpace"
         - "ま み む め も"
+        - "-- -- -- -- --"
+        - "-- -- -- -- --"
     ya:
-        - "preferences dummykey ya dummykey BackSpace"
-        - "や dummykey ゆ dummykey よ"
-        - "ゃ dummykey ゅ dummykey ょ"
+        - "preferences YA ya -- BackSpace"
+        - "や -- ゆ -- よ"
+        - "ゃ -- ゅ -- ょ"
+        - "-- -- -- -- --"
     ra:
-        - "preferences dummykey ra dummykey BackSpace"
+        - "preferences RA ra -- BackSpace"
         - "ら り る れ ろ"
+        - "-- -- -- -- --"
+        - "-- -- -- -- --"
     wa:
-        - "preferences dummykey wa dummykey BackSpace"
-        - "わ ゐ dummykey ゑ を"
-        - "ゎ dummykey ん dummykey dummykey"
+        - "preferences WA wa -- BackSpace"
+        - "わ ゐ -- ゑ を"
+        - "ゎ -- -- -- --"
+        - "-- -- ん -- --"
     symbols:
-        - "preferences dummykey symbols dummykey BackSpace"
+        - "preferences punct symbols -- BackSpace"
         - "「 」 （ ） §"
         - "【 】 ＜ ＞ ＝"
         - "＋ ＊ ＆ ％ ＄ "
     punct:
-        - "preferences dummykey punct dummykey BackSpace"
+        - "preferences symbols punct -- BackSpace"
         - "。 、 ？ ！ ー"
-
         - "： ； ・ 〜 …"
-        - "♪ ” ’ ゙ ゚"
-        
-#a 	あア 	かカ 	さサ 	たタ 	なナ 	はハ 	まマ 	やヤ 	らラ 	わワ
-#i 	いイ 	きキ 	しシ 	ちチ 	にニ 	ひヒ 	みミ 	※      りリ 	ゐヰ
-#u 	うウ 	くク 	すス 	つツ 	ぬヌ 	ふフ 	むム 	ゆユ 	るル 	※
-#e 	えエ 	けケ 	せセ 	てテ 	ねネ 	へヘ 	めメ 	※      れレ 	ゑヱ
-#o 	おオ 	こコ 	そソ 	とト 	のノ 	ほホ 	もモ 	よヨ 	ろロ 	をヲ
+        - "♪ ” ’  ゙  ゚"
+#              k       s       t       n       h       m       y       r       w
+#a 	あア 	かカ 	さサ 	たタ 	なナ 	はハ 	まマ 	やヤ	らラ 	わワ
+#i 	いイ 	きキ 	しシ 	ちチ 	にニ 	ひヒ 	みミ 	※	りリ 	ゐヰ
+#u 	うウ 	くク 	すス 	つツ 	ぬヌ 	ふフ 	むム 	ゆユ	るル 	※
+#e 	えエ 	けケ 	せセ 	てテ 	ねネ 	へヘ 	めメ 	※	れレ 	ゑヱ
+#o 	おオ 	こコ 	そソ 	とト 	のノ 	ほホ 	もモ 	よヨ	ろロ 	をヲ
 
-#      g       z       d       b       p      n
-#a 	が ガ 	ざ ザ 	だ ダ 	ば バ 	ぱ パ   ん ン
+#      g       z       d       b       p       n
+#a 	が ガ 	ざ ザ 	だ ダ 	ば バ 	ぱ パ	ん ン
 #i 	ぎ ギ 	じ ジ 	ぢ ヂ 	び ビ 	ぴ ピ 
 #u 	ぐ グ 	ず ズ 	づ ヅ 	ぶ ブ 	ぷ プ 
 #e 	げ ゲ 	ぜ ゼ 	で デ 	べ ベ 	ぺ ペ 
@@ -85,50 +94,65 @@ views:
         - "ひらがな MA YA RA space"
         - "switch2roman SYMBOLS WA PUNCT Return"
     _A:
-        - "preferences DUMMYKEY _A DUMMYKEY BackSpace"
+        - "preferences _a _A -- BackSpace"
         - "ア イ ウ エ オ"
         - "ァ ィ ゥ ェ ォ"
-        - "DUMMYKEY DUMMYKEY ヴ DUMMYKEY DUMMYKEY"
+        - "-- -- ヴ -- --"
     KA:
-        - "preferences DUMMYKEY KA DUMMYKEY BackSpace"
+        - "preferences ka KA -- BackSpace"
         - "カ キ ク ケ コ"
         - "ガ ギ グ ゲ ゴ"
-        - "ヵ DUMMYKEY ㇰ ヶ DUMMYKEY"
+        - "ヵ -- ㇰ ヶ --"
     SA:
-        - "preferences DUMMYKEY SA DUMMYKEY BackSpace"
+        - "preferences sa SA -- BackSpace"
         - "サ シ ス セ ソ"
         - "ザ ジ ズ ゼ ゾ"
-        - "DUMMYKEY ㇱ ㇲ DUMMYKEY DUMMYKEY"
+        - "-- ㇱ ㇲ -- --"
     TA:
-        - "preferences DUMMYKEY TA DUMMYKEY BackSpace"
+        - "preferences ta TA -- BackSpace"
         - "タ チ ツ テ ト"
         - "ダ ヂ ヅ デ ド"
-        - "DUMMYKEY DUMMYKEY ッ DUMMYKEY ㇳ"
+        - "-- -- ッ -- ㇳ"
     NA: 
-        - "preferences DUMMYKEY NA DUMMYKEY BackSpace"
+        - "preferences na NA -- BackSpace"
         - "ナ ニ ヌ ネ ノ"
-        - "DUMMYKEY DUMMYKEY ㇴ DUMMYKEY DUMMYKEY"
+        - "-- -- ㇴ -- --"
+        - "-- -- -- -- --"
     HA:
-        - "preferences DUMMYKEY HA DUMMYKEY BackSpace"
+        - "preferences ha HA -- BackSpace"
         - "ハ ヒ フ ヘ ホ"
         - "バ ビ ブ ベ ボ"
         - "パ ピ プ ペ ポ"
     MA:
-        - "preferences DUMMYKEY MA DUMMYKEY BackSpace"
+        - "preferences ma MA -- BackSpace"
         - "マ ミ ム メ モ"
-        - "DUMMYKEY DUMMYKEY ㇺ DUMMYKEY DUMMYKEY"
+        - "-- -- ㇺ -- --"
+        - "-- -- -- -- --"
     YA:
-        - "preferences DUMMYKEY YA DUMMYKEY BackSpace"
-        - "ヤ DUMMYKEY ユ DUMMYKEY ヨ"
-        - "ャ DUMMYKEY ュ DUMMYKEY ョ"
+        - "preferences ya YA -- BackSpace"
+        - "ヤ -- ユ -- ヨ"
+        - "ャ -- ュ -- ョ"
+        - "-- -- -- -- --"
     RA:
-        - "preferences DUMMYKEY RA DUMMYKEY BackSpace"
+        - "preferences ra RA -- BackSpace"
         - "ラ リ ル レ ロ"
         - "ㇻ ㇼ ㇽ ㇾ ㇿ"
+        - "-- -- -- -- --"
     WA:
-        - "preferences DUMMYKEY WA DUMMYKEY BackSpace"
-        - "ワ ヰ DUMMYKEY ヱ ヲ"
-        - "ヮ ヸ ン ヹ ヺ"
+        - "preferences wa WA -- BackSpace"
+        - "ワ ヰ -- ヱ ヲ"
+        - "ヮ ヸ -- ヹ ヺ"
+        - "-- -- ン -- --"
+    SYMBOLS:
+        - "preferences PUNCT SYMBOLS -- BackSpace"
+        - "「 」 （ ） §"
+        - "【 】 ＜ ＞ ＝"
+        - "＋ ＊ ＆ ％ ＄ "
+    PUNCT:
+        - "preferences SYMBOLS PUNCT -- BackSpace"
+        - "。 、 ？ ！ ー"
+        - "： ； ・ 〜 …"
+        - "♪ ” ’ ゙  ゚"
     # numbers view
     numbers:
         - "preferences 1 2 3 BackSpace"
@@ -142,60 +166,72 @@ views:
         - "ひらがな PQRS TUV WXYZ space"
         - "switch2num RSYM2 RSYM3 RSYM4 Return"
     RSYM1:
-        - "preferences dummykey RSYM1 dummykey BackSpace"
+        - "preferences -- RSYM1 -- BackSpace"
         - "@ # $ § :"
-        - "| € ¥ £ 1"
+        - "| € ¥ £ --"
+        - "1 -- -- -- --"
     ABC:
-        - "preferences dummykey ABC dummykey BackSpace"
+        - "preferences -- ABC -- BackSpace"
         - "A B C Ä ç"
-        - "a b c ä 2"
+        - "a b c ä --"
+        - "2 -- -- -- --"
     DEF:
-        - "preferences dummykey DEF dummykey BackSpace"
-        - "D E F dummykey"
-        - "d e f 3"
+        - "preferences -- DEF -- BackSpace"
+        - "D E F -- --"
+        - "d e f -- --"
+        - "3 -- -- -- --"
     GHI:
-        - "preferences dummykey GHI dummykey BackSpace"
-        - "G H I dummykey"
-        - "g h i 4"
+        - "preferences -- GHI -- BackSpace"
+        - "G H I -- --"
+        - "g h i -- --"
+        - "4 -- -- -- --"
     JKL:
-        - "preferences dummykey JKL dummykey BackSpace"
-        - "J K L dummykey"
-        - "j k l 5"
+        - "preferences -- JKL -- BackSpace"
+        - "J K L -- --"
+        - "j k l -- --"
+        - "5 -- -- -- --"
     MNO:
-        - "preferences dummykey MNO dummykey BackSpace"
-        - "M N O Ö dummykey"
-        - "m n o ö 6"
+        - "preferences -- MNO -- BackSpace"
+        - "M N O Ö --"
+        - "m n o ö --"
+        - "6 -- -- -- --"
     PQRS:
-        - "preferences dummykey PQRS dummykey BackSpace"
-        - "P Q R S ß"
-        - "p q r s 7"
+        - "preferences -- PQRS -- BackSpace"
+        - "P Q R S --"
+        - "p q r s ß"
+        - "7 -- -- -- --"
     TUV:
-        - "preferences dummykey TUV dummykey BackSpace"
-        - "T U V Ü dummykey"
-        - "t u v ü 8"
+        - "preferences -- TUV -- BackSpace"
+        - "T U V Ü --"
+        - "t u v ü --"
+        - "8 -- -- -- --"
     WXYZ:
-        - "preferences dummykey WXYZ dummykey BackSpace"
-        - "W X Y Z dummykey"
-        - "w x y z 9"
+        - "preferences -- WXYZ -- BackSpace"
+        - "W X Y Z --"
+        - "w x y z --"
+        - "9 -- -- -- --"
     RSYM2:
-        - "preferences dummykey RSYM2 dummykey BackSpace"
+        - "preferences -- RSYM2 -- BackSpace"
         - "( ) ' \" ~"
         - "[ ] { } _"
+        - "-- -- -- -- --"
     RSYM3:
-        - "preferences dummykey RSYM3 dummykey BackSpace"
+        - "preferences -- RSYM3 -- BackSpace"
         - "+ - * / ="
-        - "< > ^ ° 0"
+        - "< > ^ ° --"
+        - "0 -- -- -- --"
     RSYM4:
-        - "preferences dummykey RSYM4 dummykey BackSpace"
+        - "preferences -- RSYM4 -- BackSpace"
         - ", . ? ! ;"
-        - "\\ ´ ` · ¶" 
+        - "\\ ´ ` · ¶"
+        - "-- -- -- -- --"
 
 buttons:
     # following 4 buttons use the corresponding xkb name as keysym
     BackSpace:
         outline: "wide"
         icon: "edit-clear-symbolic"
-        action: erase
+        action: "erase"
     Return:
         outline: "wide"
         icon: "key-enter"
@@ -215,118 +251,115 @@ buttons:
         icon: "keyboard-mode-symbolic"
     # space button using text tag for ideographic space
     space:
-        outline: "default-wide"
         label: "␣"
         text: "　"
     # switch to number view
     numbers:
         action:
             set_view: "numbers"
-        outline: "wide"
+        outline: "change-view"
         label: "123"
     # switch to latin characters
     roman:
         action:
             set_view: "roman"
-        outline: "wide"
+        outline: "change-view"
         label: "ᴀʙᴄ"
     # toggle button with 3 different states
     switch2roman: # switch from kana to latin characters view
         action:
             set_view: "roman"
-        outline: "wide"
+        outline: "change-view"
         label: "あᴀ₁"
     switch2num: # switch from latin characters to numbers view
         action:
             set_view: "numbers"
-        outline: "wide"
+        outline: "change-view"
         label: "ぁA₁"
     switch2kana: # switch from numbers to hiragana view
         action:
             set_view: "base"
-        outline: "wide"
+        outline: "change-view"
         label: "ぁᴀ1"
     # Buttons for katakana and symbols
     ひらがな:
         action:
             set_view: "base"
-        outline: "wide"
+        outline: "change-view"
         label: "あさ"
     _a:
         action:
             locking:
                 lock_view: "_a"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "character-group"
         label: "あ"
     ka:
         action:
             locking:
                 lock_view: "ka"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "character-group"
         label: "か"
     sa:
         action:
             locking:
                 lock_view: "sa"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "character-group"
         label: "さ"
     ta:
         action:
             locking:
                 lock_view: "ta"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "character-group"
         label: "た"
     na:
         action:
             locking:
                 lock_view: "na"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "character-group"
         label: "な"
     ha:
         action:
             locking:
                 lock_view: "ha"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "character-group"
         label: "は"
     ma:
         action:
             locking:
                 lock_view: "ma"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "character-group"
         label: "ま"
     ya:
         action:
             locking:
                 lock_view: "ya"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "character-group"
         label: "や"
     ra:
         action:
             locking:
                 lock_view: "ra"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "character-group"
         label: "ら"
     wa:
         action:
             locking:
                 lock_view: "wa"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "character-group"
         label: "わ"
-    dummykey:
-        action:
-            set_view: "base"
-        outline: "altline"
-        label: ""
+    --:
+        outline: "placeholder"
+        text: ""
     # buttons available on different views like symbols and punct should go
     # back to their corresponding view
     symbols:
@@ -334,109 +367,104 @@ buttons:
             locking:
                 lock_view: "symbols"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "character-group"
         label: "（）"
     punct:
         action:
             locking:
                 lock_view: "punct"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "character-group"
         label: "。"
     # Buttons for katakana and symbols
     カタカナ:
         action:
             set_view: "カタカナ"
-        outline: "wide"
+        outline: "change-view"
         label: "アサ"
     _A:
         action:
             locking:
                 lock_view: "_A"
                 unlock_view: "カタカナ"
-        outline: "altline"
+        outline: "character-group"
         label: "ア"
     KA:
         action:
             locking:
                 lock_view: "KA"
                 unlock_view: "カタカナ"
-        outline: "altline"
+        outline: "character-group"
         label: "カ"
     SA:
         action:
             locking:
                 lock_view: "SA"
                 unlock_view: "カタカナ"
-        outline: "altline"
+        outline: "character-group"
         label: "サ"
     TA:
         action:
             locking:
                 lock_view: "TA"
                 unlock_view: "カタカナ"
-        outline: "altline"
+        outline: "character-group"
         label: "タ"
     NA:
         action:
             locking:
                 lock_view: "NA"
                 unlock_view: "カタカナ"
-        outline: "altline"
+        outline: "character-group"
         label: "ナ"
     HA:
         action:
             locking:
                 lock_view: "HA"
                 unlock_view: "カタカナ"
-        outline: "altline"
+        outline: "character-group"
         label: "ハ"
     MA:
         action:
             locking:
                 lock_view: "MA"
                 unlock_view: "カタカナ"
-        outline: "altline"
+        outline: "character-group"
         label: "マ"
     YA:
         action:
             locking:
                 lock_view: "YA"
                 unlock_view: "カタカナ"
-        outline: "altline"
+        outline: "character-group"
         label: "ヤ"
     RA:
         action:
             locking:
                 lock_view: "RA"
                 unlock_view: "カタカナ"
-        outline: "altline"
+        outline: "character-group"
         label: "ラ"
     WA:
         action:
             locking:
                 lock_view: "WA"
                 unlock_view: "カタカナ"
-        outline: "altline"
+        outline: "character-group"
         label: "ワ"
-    DUMMYKEY:
-        action:
-            set_view: "カタカナ"
-        outline: "altline"
-        label: ""
     SYMBOLS:
         action:
             locking:
-                lock_view: "symbols"
+                lock_view: "SYMBOLS"
                 unlock_view: "カタカナ"
-        outline: "altline"
+        outline: "character-group"
         label: "（）"
     PUNCT:
         action:
             locking:
-                lock_view: "punct"
+                lock_view: "PUNCT"
                 unlock_view: "カタカナ"
-        outline: "altline"
+        outline: "character-group"
         label: "。"
     # Buttons for Latin characters
     RSYM1:
@@ -444,82 +472,82 @@ buttons:
             locking:
                 lock_view: "RSYM1"
                 unlock_view: "roman"
-        outline: "altline"
+        outline: "character-group"
         label: "@#"
     ABC:
         action:
             locking:
                 lock_view: "ABC"
                 unlock_view: "roman"
-        outline: "altline"
+        outline: "character-group"
         label: "ᴀʙᴄ"
     DEF:
         action:
             locking:
                 lock_view: "DEF"
                 unlock_view: "roman"
-        outline: "altline"
+        outline: "character-group"
         label: "ᴅᴇꜰ"
     GHI:
         action:
             locking:
                 lock_view: "GHI"
                 unlock_view: "roman"
-        outline: "altline"
+        outline: "character-group"
         label: "ɢʜɪ"
     JKL:
         action:
             locking:
                 lock_view: "JKL"
                 unlock_view: "roman"
-        outline: "altline"
+        outline: "character-group"
         label: "ᴊᴋʟ"
     MNO:
         action:
             locking:
                 lock_view: "MNO"
                 unlock_view: "roman"
-        outline: "altline"
+        outline: "character-group"
         label: "ᴍɴᴏ"
     PQRS:
         action:
             locking:
                 lock_view: "PQRS"
                 unlock_view: "roman"
-        outline: "altline"
+        outline: "character-group"
         label: "ᴘǫʀs"
     TUV:
         action:
             locking:
                 lock_view: "TUV"
                 unlock_view: "roman"
-        outline: "altline"
+        outline: "character-group"
         label: "ᴛᴜᴠ"
     WXYZ:
         action:
             locking:
                 lock_view: "WXYZ"
                 unlock_view: "roman"
-        outline: "altline"
+        outline: "character-group"
         label: "ᴡxʏᴢ"
     RSYM2:
         action:
             locking:
                 lock_view: "RSYM2"
                 unlock_view: "roman"
-        outline: "altline"
+        outline: "character-group"
         label: "()"
     RSYM3:
         action:
             locking:
                 lock_view: "RSYM3"
                 unlock_view: "roman"
-        outline: "altline"
+        outline: "character-group"
         label: "+-"
     RSYM4:
         action:
             locking:
                 lock_view: "RSYM4"
                 unlock_view: "roman"
-        outline: "altline"
+        outline: "character-group"
         label: ",.?"

data/keyboards/no.yaml

@@ -1,31 +1,36 @@
 ---
 outlines:
-    default:   { width: 32,       height: 52 }
-    altline:   { width: 48.39024, height: 52 }
-    wide:      { width: 64,       height: 52 }
-    spaceline: { width: 142,      height: 52 }
-    special:   { width: 44,       height: 52 }
+    default:       { width: 32.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 }
 
 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"
+        - "Shift_L   z x c v b n m , BackSpace"
         - "show_numbers preferences         space        .    Return"
     upper:
         - "Q W E R T Y U I O P Å"
         - "A S D F G H J K L Ø Æ"
-        - "Shift_L   Z X C V B N M  BackSpace"
+        - "Shift_L   Z X C V B N M , BackSpace"
         - "show_numbers preferences         space        .    Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
-        - "show_symbols   , \" ' : ; ! ?  BackSpace"
+        - "show_symbols -- , \" ' : ; ! ? BackSpace"
         - "show_letters preferences         space        .    Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
+        - "show_numbers_from_symbols -- \\ / < > = [ ] BackSpace"
         - "show_letters preferences         space        .    Return"
 
 buttons:
@@ -34,12 +39,12 @@ buttons:
             locking:
                 lock_view: "upper"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         icon: "key-shift"
     BackSpace:
         outline: "altline"
         icon: "edit-clear-symbolic"
-        action: erase
+        action: "erase"
     preferences:
         action: "show_prefs"
         outline: "special"
@@ -47,29 +52,40 @@ buttons:
     show_numbers:
         action:
             set_view: "numbers"
-        outline: "wide"
+        outline: "change-view-2"
         label: "123"
     show_numbers_from_symbols:
         action:
             set_view: "numbers"
-        outline: altline
+        outline: "change-view"
         label: "123"
     show_letters:
         action:
             set_view: "base"
-        outline: "wide"
+        outline: "change-view-2"
         label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"
-        outline: "altline"
+        outline: "change-view"
         label: "*/="
-    ".":
-        outline: "special"
+    .:
+        outline: "large"
     space:
-        outline: spaceline
+        outline: "spaceline"
         text: " "
     Return:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
+    --:
+        outline: "placeholder"
+        text: ""
+    5:
+        outline: "fill"
+    "&":
+        outline: "fill"
+    √:
+        outline: "fill"
+    ¥:
+        outline: "fill"

data/keyboards/no_wide.yaml

@@ -1,31 +1,34 @@
 ---
 outlines:
-    default:   { width: 48,       height: 42 }
-    altline:   { width: 72.59,    height: 42 }
-    wide:      { width: 96,       height: 42 }
-    spaceline: { width: 213,      height: 42 }
-    special:   { width: 66,       height: 42 }
+    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 }
 
 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"
+        - "Shift_L   z x c v b n m , BackSpace"
         - "show_numbers preferences         space        .    Return"
     upper:
         - "Q W E R T Y U I O P Å"
         - "A S D F G H J K L Ø Æ"
-        - "Shift_L   Z X C V B N M  BackSpace"
+        - "Shift_L   Z X C V B N M , BackSpace"
         - "show_numbers preferences         space        .    Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
-        - "show_symbols   , \" ' : ; ! ?  BackSpace"
+        - "show_symbols -- , \" ' : ; ! ? BackSpace"
         - "show_letters preferences         space        .    Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
+        - "show_numbers -- \\ / < > = [ ] BackSpace"
         - "show_letters preferences         space        .    Return"
 
 buttons:
@@ -34,12 +37,12 @@ buttons:
             locking:
                 lock_view: "upper"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         icon: "key-shift"
     BackSpace:
         outline: "altline"
         icon: "edit-clear-symbolic"
-        action: erase
+        action: "erase"
     preferences:
         action: "show_prefs"
         outline: "special"
@@ -47,29 +50,33 @@ buttons:
     show_numbers:
         action:
             set_view: "numbers"
-        outline: "wide"
-        label: "123"
-    show_numbers_from_symbols:
-        action:
-            set_view: "numbers"
-        outline: altline
+        outline: "change-view"
         label: "123"
     show_letters:
         action:
             set_view: "base"
-        outline: "wide"
+        outline: "change-view"
         label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"
-        outline: "altline"
+        outline: "change-view"
         label: "*/="
-    ".":
-        outline: "special"
     space:
-        outline: spaceline
+        outline: "spaceline"
         text: " "
     Return:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
+    --:
+        outline: "placeholder"
+        text: ""
+    5:
+        outline: "fill"
+    "&":
+        outline: "fill"
+    √:
+        outline: "fill"
+    ¥:
+        outline: "fill"

data/keyboards/number/us.yaml

@@ -1,39 +1,26 @@
 ---
 outlines:
-    default:   { width: 37.46341, height: 52 }
-    altline:   { width: 48.39024, height: 52 }
-    outline7:  { width: 88.97561, height: 52 }
-    spaceline: { width: 120.5853, height: 52 }
+    default:   { width: 37.46,  height: 52 }
+    altline:   { width: 48.39,  height: 52 }
+    wide:      { width: 88.98,  height: 52 }
+    spaceline: { width: 120.58, height: 52 }
 
 views:
     base:
-        - "1 2 3 parenleft parenright"
-        - "4 5 6 numbersign asterisk"
-        - "7 8 9 plus minus"
+        - "1 2 3 ( )"
+        - "4 5 6 # *"
+        - "7 8 9 + -"
         - "BackSpace 0 space Return"
 
 buttons:
     BackSpace:
         outline: "altline"
         icon: "edit-clear-symbolic"
-        action: erase
+        action: "erase"
     space:
-        outline: spaceline
+        outline: "spaceline"
         text: " "
     Return:
-        outline: outline7
+        outline: "wide"
         icon: "key-enter"
-        keysym: "Return"
-    asterisk:
-        text: "*"
-    numbersign:
-        text: "#"
-    minus:
-        text: "-"
-    plus:
-        text: "+"
-    parenleft:
-        text: "("
-    parenright:
-        text: ")"
-
+        keysym: "Return"

data/keyboards/number/us_wide.yaml

@@ -1,39 +1,26 @@
 ---
 outlines:
-    default:   { width: 37.46341, height: 42 }
-    altline:   { width: 48.39024, height: 42 }
-    outline7:  { width: 88.97561, height: 42 }
-    spaceline: { width: 120.5853, height: 42 }
+    default:   { width: 37.46,  height: 42 }
+    altline:   { width: 48.39,  height: 42 }
+    wide:      { width: 88.98,  height: 42 }
+    spaceline: { width: 120.58, height: 42 }
 
 views:
     base:
-        - "1 2 3 parenleft parenright"
-        - "4 5 6 numbersign asterisk"
-        - "7 8 9 plus minus"
+        - "1 2 3 ( )"
+        - "4 5 6 # *"
+        - "7 8 9 + -"
         - "BackSpace 0 space Return"
 
 buttons:
     BackSpace:
         outline: "altline"
         icon: "edit-clear-symbolic"
-        action: erase
+        action: "erase"
     space:
-        outline: spaceline
+        outline: "spaceline"
         text: " "
     Return:
-        outline: outline7
+        outline: "wide"
         icon: "key-enter"
-        keysym: "Return"
-    asterisk:
-        text: "*"
-    numbersign:
-        text: "#"
-    minus:
-        text: "-"
-    plus:
-        text: "+"
-    parenleft:
-        text: "("
-    parenright:
-        text: ")"
-
+        keysym: "Return"

data/keyboards/pin/us.yaml

@@ -13,7 +13,7 @@ views:
 buttons:
     BackSpace:
         icon: "edit-clear-symbolic"
-        action: erase
+        action: "erase"
     Return:
         icon: "key-enter"
         keysym: "Return"

data/keyboards/pin/us_wide.yaml

@@ -13,7 +13,7 @@ views:
 buttons:
     BackSpace:
         icon: "edit-clear-symbolic"
-        action: erase
+        action: "erase"
     Return:
         icon: "key-enter"
         keysym: "Return"

data/keyboards/pl.yaml

@@ -1,10 +1,14 @@
 ---
 outlines:
-    default:   { width: 35.33, height: 52 }
-    altline:   { width: 52.67, height: 52 }
-    wide:      { width: 59,    height: 52 }
-    spaceline: { width: 140,   height: 52 }
-    special:   { width: 44,    height: 52 }
+    default:       { width: 35.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 }
 
 views:
     base:
@@ -21,12 +25,12 @@ views:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
         - "show_symbols   , \" ' : ; ! ?  BackSpace"
-        - "show_letters preferences         space        . Return"
+        - "show_letters preferences         space        .-large Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
         - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        . Return"
+        - "show_letters preferences         space        .-large Return"
     accents:
         - "q w ę r t y u i ó p"
         - "ą ś d f g h j k ł"
@@ -38,14 +42,13 @@ views:
         - "accents_show_upper   Ż Ź Ć V B Ń M  BackSpace"
         - "show_numbers preferences         space        show_upper_accents Return"
 
-
 buttons:
     Shift_L:
         action:
             locking:
                 lock_view: "upper"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         icon: "key-shift"
     accents_show_upper:
         action:
@@ -54,7 +57,7 @@ buttons:
                 unlock_view: "accents"
                 looks_locked_from:
                     - "upper"
-        outline: "altline"
+        outline: "change-view"
         icon: "key-shift"
     BackSpace:
         outline: "altline"
@@ -67,29 +70,29 @@ buttons:
     show_numbers:
         action:
             set_view: "numbers"
-        outline: "wide"
+        outline: "change-view-2"
         label: "123"
     show_numbers_from_symbols:
         action:
             set_view: "numbers"
-        outline: "altline"
+        outline: "change-view"
         label: "123"
     show_letters:
         action:
             set_view: "base"
-        outline: "wide"
+        outline: "change-view-2"
         label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"
-        outline: "altline"
+        outline: "change-view"
         label: "*/="
     show_accents:
         action:
             locking:
                 lock_view: "accents"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         label: "ąę"
     show_upper_accents:
         action:
@@ -98,10 +101,11 @@ buttons:
                 unlock_view: "upper"
                 looks_locked_from:
                     - "accents"
-        outline: "altline"
+        outline: "change-view"
         label: "ĄĘ"
-    .:
-        outline: "altline"
+    .-large:
+        outline: "large"
+        text: "."
     space:
         outline: "spaceline"
         text: " "
@@ -109,3 +113,6 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
+    --:
+        outline: "placeholder"
+        text: ""

data/keyboards/pl_wide.yaml

@@ -1,10 +1,14 @@
 ---
 outlines:
-    default:   { width: 54,  height: 42 }
-    altline:   { width: 81,  height: 42 }
-    wide:      { width: 100, height: 42 }
-    spaceline: { width: 206, height: 42 }
-    special:   { width: 54,  height: 42 }
+    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 }
 
 views:
     base:
@@ -21,21 +25,21 @@ views:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
         - "show_symbols   , \" ' : ; ! ?  BackSpace"
-        - "show_letters preferences         space        . Return"
+        - "show_letters preferences         space        .-large Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
         - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        . Return"
+        - "show_letters preferences         space        .-large Return"
     accents:
         - "q w ę r t y u i ó p"
         - "ą ś d f g h j k ł"
-        - "Shift_L   ż ź ć v b ń m  BackSpace"
+        - "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 Ł"
-        - "Shift_L   Ż Ź Ć V B Ń M  BackSpace"
+        - "accents_show_upper   Ż Ź Ć V B Ń M  BackSpace"
         - "show_numbers preferences         space        show_upper_accents Return"
 
 buttons:
@@ -44,7 +48,16 @@ buttons:
             locking:
                 lock_view: "upper"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
+        icon: "key-shift"
+    accents_show_upper:
+        action:
+            locking:
+                lock_view: "upper_accents"
+                unlock_view: "accents"
+                looks_locked_from:
+                    - "upper"
+        outline: "change-view"
         icon: "key-shift"
     BackSpace:
         outline: "altline"
@@ -57,39 +70,42 @@ buttons:
     show_numbers:
         action:
             set_view: "numbers"
-        outline: "wide"
+        outline: "change-view-2"
         label: "123"
     show_numbers_from_symbols:
         action:
             set_view: "numbers"
-        outline: "altline"
+        outline: "change-view"
         label: "123"
     show_letters:
         action:
             set_view: "base"
-        outline: "wide"
+        outline: "change-view-2"
         label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"
-        outline: "altline"
+        outline: "change-view"
         label: "*/="
     show_accents:
         action:
             locking:
                 lock_view: "accents"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         label: "ąę"
     show_upper_accents:
         action:
             locking:
                 lock_view: "upper_accents"
                 unlock_view: "upper"
-        outline: "altline"
+                looks_locked_from:
+                    - "accents"
+        outline: "change-view"
         label: "ĄĘ"
-    .:
-        outline: "altline"
+    .-large:
+        outline: "large"
+        text: "."
     space:
         outline: "spaceline"
         text: " "
@@ -97,3 +113,6 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
+    --:
+        outline: "placeholder"
+        text: ""

data/keyboards/pt.yaml

@@ -0,0 +1,89 @@
+# 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 }
+
+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"
+    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"
+    numbers:
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "@ # $ % & - _ + ( )"
+        - "show_symbols   , \" ' : ; ! ?  BackSpace"
+        - "show_letters show_eschars preferences space º . Return"
+    symbols:
+        - "~ ` | · √ π τ ÷ × ¶"
+        - "© ® £ € ¥ ^ ° * { }"
+        - "show_numbers   \\ / < > = [ ]  BackSpace"
+        - "show_letters show_eschars preferences         space       ≠ § Return"
+    eschars:
+        - "À Á Ã Â É Ê Í Ó Ô Õ"
+        - "à á ã â é ê í ó ô õ "
+        - "show_numbers Ú Ü ú ü ! ? . BackSpace"
+        - "show_letters show_eschars preferences         space    « »    Return"
+
+buttons:
+    Shift_L:
+        action:
+            locking:
+                lock_view: "upper"
+                unlock_view: "base"
+        outline: "change-view"
+        icon: "key-shift"
+    BackSpace:
+        outline: "altline"
+        icon: "edit-clear-symbolic"
+        action: "erase"
+    preferences:
+        action: "show_prefs"
+        outline: "special"
+        icon: "keyboard-mode-symbolic"
+    show_numbers:
+        action:
+            set_view: "numbers"
+        outline: "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: "Ãã"
+    .-large:
+        outline: "large"
+        text: "."
+    ",-large":
+        outline: "large"
+        text: ","
+    space:
+        outline: "spaceline"
+        text: " "
+    Return:
+        outline: "wide"
+        icon: "key-enter"
+        keysym: "Return"

data/keyboards/pt_wide.yaml

@@ -0,0 +1,103 @@
+# 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 }
+
+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"
+    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"
+    numbers:
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "@ # $ % & - _ + ( )"
+        - "show_symbols   , \" ' : ; ! ?  BackSpace"
+        - "show_letters show_eschars preferences space º .-thin Return"
+    symbols:
+        - "~ ` | · √ π τ ÷ × ¶"
+        - "© ® £ € ¥ ^ ° * { }"
+        - "show_numbers   \\ / < > = [ ]  BackSpace"
+        - "show_letters show_eschars preferences         space       ≠ § Return"
+    eschars:
+        - "À Á Ã Â É Ê Í Ó Ô Õ"
+        - "à á ã â é ê í ó ô õ "
+        - "show_numbers Ú Ü ú ü ! ? . BackSpace"
+        - "show_letters show_eschars preferences         space    « »    Return"
+
+buttons:
+    Shift_L:
+        action:
+            locking:
+                lock_view: "upper"
+                unlock_view: "base"
+        outline: "change-view"
+        icon: "key-shift"
+    BackSpace:
+        outline: "altline"
+        icon: "edit-clear-symbolic"
+        action: "erase"
+    preferences:
+        action: "show_prefs"
+        outline: "special"
+        icon: "keyboard-mode-symbolic"
+    show_numbers:
+        action:
+            set_view: "numbers"
+        outline: "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: "Ãã"
+    .-large:
+        outline: "large"
+        text: "."
+    ",-large":
+        outline: "large"
+        text: ","
+    space:
+        outline: "spaceline"
+        text: " "
+    Return:
+        outline: "wide"
+        icon: "key-enter"
+        keysym: "Return"
+    «:
+        outline: "thin"
+    »:
+        outline: "thin"
+    º:
+        outline: "thin"
+    .-thin:
+        outline: "thin"
+        text: "."
+    ≠:
+        outline: "thin"
+    §:
+        outline: "thin"

data/keyboards/ro.yaml

@@ -1,10 +1,12 @@
 ---
 outlines:
-    default:   { width: 35.33, height: 52 }
-    altline:   { width: 52.67, height: 52 }
-    wide:      { width: 62,    height: 52 }
-    spaceline: { width: 99.67, height: 52 }
-    special:   { width: 44,    height: 52 }
+    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 }
 
 views:
     base:
@@ -16,7 +18,7 @@ views:
         - "Q W E R T Y U I O P"
         - "A S D F G H J K L"
         - "Shift_L   Z X C V B N M  BackSpace"
-        - "show_numbers show_eschars preferences         space        , Return"
+        - "show_numbers show_eschars preferences         space        . Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # € % & - _ + ( )"
@@ -25,12 +27,12 @@ views:
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ $ ¥ ^ ° * { }"
-        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters show_eschars preferences         space        , Return"
+        - "show_numbers   \\ / < > = [ ]  BackSpace"
+        - "show_letters show_eschars preferences         space        . Return"
     eschars:
-        - "ă â î ș ț á é í ó ü"
         - "Ă Â Î Ș Ț Á É Í Ó Ü"
-        - "show_numbers_from_symbols „ ” « » ― { } BackSpace"
+        - "ă â î ș ț á é í ó ü"
+        - "show_numbers „ ” « » ― { } BackSpace"
         - "show_letters show_eschars preferences         space        . Return"
 
 buttons:
@@ -39,7 +41,7 @@ buttons:
             locking:
                 lock_view: "upper"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         icon: "key-shift"
     BackSpace:
         outline: "altline"
@@ -52,30 +54,25 @@ buttons:
     show_numbers:
         action:
             set_view: "numbers"
-        outline: "altline"
-        label: "123"
-    show_numbers_from_symbols:
-        action:
-            set_view: "numbers"
-        outline: "altline"
+        outline: "change-view"
         label: "123"
     show_letters:
         action:
             set_view: "base"
-        outline: "wide"
+        outline: "change-view"
         label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"
-        outline: "altline"
+        outline: "change-view"
         label: "*/="
     show_eschars:
         action:
             locking:
                 lock_view: "eschars"
                 unlock_view: "base"
-        outline: "altline"
-        label: "ăĂ"
+        outline: "change-view"
+        label: "Ăă"
     space:
         outline: "spaceline"
         text: " "
@@ -83,3 +80,5 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
+    .:
+        outline: "large"

data/keyboards/ro_wide.yaml

@@ -1,10 +1,11 @@
 ---
 outlines:
-    default:   { width: 54,  height: 42 }
-    altline:   { width: 81,  height: 42 }
-    wide:      { width: 108, height: 42 }
-    spaceline: { width: 153, height: 42 }
-    special:   { width: 54,  height: 42 }
+    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 }
 
 views:
     base:
@@ -25,12 +26,12 @@ views:
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ $ ¥ ^ ° * { }"
-        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
+        - "show_numbers   \\ / < > = [ ]  BackSpace"
         - "show_letters show_eschars preferences         space        , Return"
     eschars:
         - "ă â î ș ț á é í ó ü"
         - "Ă Â Î Ș Ț Á É Í Ó Ü"
-        - "show_numbers_from_symbols „ ” « » ― { } BackSpace"
+        - "show_numbers „ ” « » ― { } BackSpace"
         - "show_letters show_eschars preferences         space        . Return"
 
 buttons:
@@ -39,7 +40,7 @@ buttons:
             locking:
                 lock_view: "upper"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         icon: "key-shift"
     BackSpace:
         outline: "altline"
@@ -52,30 +53,25 @@ buttons:
     show_numbers:
         action:
             set_view: "numbers"
-        outline: "altline"
-        label: "123"
-    show_numbers_from_symbols:
-        action:
-            set_view: "numbers"
-        outline: "altline"
+        outline: "change-view"
         label: "123"
     show_letters:
         action:
             set_view: "base"
-        outline: "wide"
+        outline: "change-view"
         label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"
-        outline: "altline"
+        outline: "change-view"
         label: "*/="
     show_eschars:
         action:
             locking:
                 lock_view: "eschars"
                 unlock_view: "base"
-        outline: "altline"
-        label: "ăĂ"
+        outline: "change-view"
+        label: "Ăă"
     space:
         outline: "spaceline"
         text: " "

data/keyboards/ru.yaml

@@ -1,12 +1,16 @@
 ---
 outlines:
-    default:   { width: 32,  height: 52 }
-    altline:   { width: 32,  height: 52 }
-    wide:      { width: 57,  height: 52 }
-    narrow:    { width: 26,  height: 52 }
-    spaceline: { width: 107, height: 52 }
-    fill:      { width: 159, height: 52 }
-    special:   { width: 42,  height: 52 }
+    default:       { width: 32.45,  height: 52 }
+    altline:       { width: 32,     height: 52 }
+    wide:          { width: 64.55,  height: 52 }
+    change-view:   { width: 32,     height: 52 }
+    change-view-2: { width: 64.55,  height: 52 }
+    spaceline:     { width: 91.96,  height: 52 }
+    fill:          { width: 156.86, height: 52 }
+    fill-2:        { width: 64.9,   height: 52 }
+    special:       { width: 35.67,  height: 52 }
+    large:         { width: 35.67,  height: 52 }
+    placeholder:   { width: 32.45,  height: 52 }
 
 views:
     base:
@@ -18,17 +22,17 @@ views:
         - "Й Ц У К Е Н Г Ш Щ З Х"
         - "Ф Ы В А П Р О Л Д Ж Э"
         - "Shift_L   Я Ч С М И Т Ь Б Ю  BackSpace"
-        - "show_numbers preferences    Ё  space  Ъ  comma Return"
+        - "show_numbers preferences    Ё  space  Ъ  ,-large Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
-        - "show_symbols   , \" ' : ; ! ?  BackSpace"
-        - "show_letters preferences         space_fill   . Return"
+        - "show_symbols , \" ' : ; ! ? BackSpace-wide"
+        - "show_letters preferences         space-fill   . Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space_fill   . Return"
+        - "show_numbers \\ / < > = [ ] BackSpace-wide"
+        - "show_letters preferences         space-fill   . Return"
 
 buttons:
     Shift_L:
@@ -36,56 +40,58 @@ buttons:
             locking:
                 lock_view: "upper"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         icon: "key-shift"
     BackSpace:
         outline: "altline"
         icon: "edit-clear-symbolic"
-        action: erase
+        action: "erase"
+    BackSpace-wide:
+        outline: "wide"
+        icon: "edit-clear-symbolic"
+        action: "erase"
     preferences:
-        action: show_prefs
+        action: "show_prefs"
         outline: "special"
         icon: "keyboard-mode-symbolic"
     show_numbers:
         action:
             set_view: "numbers"
-        outline: "wide"
-        label: "123"
-    show_numbers_from_symbols:
-        action:
-            set_view: "numbers"
-        outline: "wide"
+        outline: "change-view-2"
         label: "123"
     show_letters:
         action:
             set_view: "base"
-        outline: "wide"
+        outline: "change-view-2"
         label: "АБВ"
     show_symbols:
         action:
             set_view: "symbols"
-        outline: "wide"
+        outline: "change-view-2"
         label: "*/="
     .:
-        outline: "special"
-    comma:
-        outline: "special"
+        outline: "large"
+    ",-large":
+        outline: "large"
         text: ","
     space:
         outline: "spaceline"
         text: " "
-    space_fill:
+    space-fill:
         outline: "fill"
         text: " "
     Return:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    ё:
-        outline: "narrow"
-    Ё:
-        outline: "narrow"
-    ъ:
-        outline: "narrow"
-    Ъ:
-        outline: "narrow"
+    --:
+        outline: "placeholder"
+        text: ""
+    5:
+        outline: "fill-2"
+    "&":
+        outline: "fill-2"
+    √:
+        outline: "fill-2"
+    ¥:
+        outline: "fill-2"

data/keyboards/ru_wide.yaml

@@ -1,12 +1,15 @@
 ---
 outlines:
-    default:   { width: 48,    height: 42 }
-    altline:   { width: 48,    height: 42 }
-    wide:      { width: 85.5,  height: 42 }
-    narrow:    { width: 39,    height: 42 }
-    spaceline: { width: 160.5, height: 42 }
-    fill:      { width: 238.5, height: 42 }
-    special:   { width: 63,    height: 42 }
+    default:       { width: 48.75, height: 42 }
+    altline:       { width: 48.75, height: 42 }
+    wide:          { width: 97.5,  height: 42 }
+    change-view:   { width: 48.75, height: 42 }
+    change-view-2: { width: 97.5,  height: 42 }
+    spaceline:     { width: 146.5, height: 42 }
+    fill:          { width: 244,   height: 42 }
+    fill-2:        { width: 97.5,  height: 42 }
+    special:       { width: 48.75, height: 42 }
+    placeholder:   { width: 48.75, height: 42 }
 
 views:
     base:
@@ -18,17 +21,17 @@ views:
         - "Й Ц У К Е Н Г Ш Щ З Х"
         - "Ф Ы В А П Р О Л Д Ж Э"
         - "Shift_L   Я Ч С М И Т Ь Б Ю  BackSpace"
-        - "show_numbers preferences    Ё  space  Ъ  comma Return"
+        - "show_numbers preferences    Ё  space  Ъ  , Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
-        - "show_symbols   , \" ' : ; ! ?  BackSpace"
-        - "show_letters preferences         space_fill   . Return"
+        - "show_symbols , \" ' : ; ! ? BackSpace-wide"
+        - "show_letters preferences         space-fill   . Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space_fill   . Return"
+        - "show_numbers \\ / < > = [ ] BackSpace-wide"
+        - "show_letters preferences         space-fill   . Return"
 
 buttons:
     Shift_L:
@@ -36,56 +39,53 @@ buttons:
             locking:
                 lock_view: "upper"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         icon: "key-shift"
     BackSpace:
         outline: "altline"
         icon: "edit-clear-symbolic"
-        action: erase
+        action: "erase"
+    BackSpace-wide:
+        outline: "wide"
+        icon: "edit-clear-symbolic"
+        action: "erase"
     preferences:
-        action: show_prefs
+        action: "show_prefs"
         outline: "special"
         icon: "keyboard-mode-symbolic"
     show_numbers:
         action:
             set_view: "numbers"
-        outline: "wide"
-        label: "123"
-    show_numbers_from_symbols:
-        action:
-            set_view: "numbers"
-        outline: "wide"
+        outline: "change-view-2"
         label: "123"
     show_letters:
         action:
             set_view: "base"
-        outline: "wide"
+        outline: "change-view-2"
         label: "АБВ"
     show_symbols:
         action:
             set_view: "symbols"
-        outline: "wide"
+        outline: "change-view-2"
         label: "*/="
-    .:
-        outline: "special"
-    comma:
-        outline: "special"
-        text: ","
     space:
         outline: "spaceline"
         text: " "
-    space_fill:
+    space-fill:
         outline: "fill"
         text: " "
     Return:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    ё:
-        outline: "narrow"
-    Ё:
-        outline: "narrow"
-    ъ:
-        outline: "narrow"
-    Ъ:
-        outline: "narrow"
+    --:
+        outline: "placeholder"
+        text: ""
+    5:
+        outline: "fill-2"
+    "&":
+        outline: "fill-2"
+    √:
+        outline: "fill-2"
+    ¥:
+        outline: "fill-2"

data/keyboards/se.yaml

@@ -1,32 +1,35 @@
 ---
 outlines:
-    default:   { width: 32,       height: 52 }
-    altline:   { width: 48.39024, height: 52 }
-    wide:      { width: 64,       height: 52 }
-    spaceline: { width: 142,      height: 52 }
-    special:   { width: 44,       height: 52 }
+    default:       { width: 32.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 }
  
-
 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"
+        - "Shift_L   z x c v b n m , BackSpace"
         - "show_numbers preferences         space        .    Return"
     upper:
         - "Q W E R T Y U I O P Å"
         - "A S D F G H J K L Ö Ä"
-        - "Shift_L   Z X C V B N M  BackSpace"
+        - "Shift_L   Z X C V B N M , BackSpace"
         - "show_numbers preferences         space        .    Return"
     numbers:
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "@ # $ % & - _ + ( )"
-        - "show_symbols   , \" ' : ; ! ?  BackSpace"
+        - "§ 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_numbers_from_symbols -- \\ / < > = [ ] BackSpace"
         - "show_letters preferences         space        .    Return"
 
 buttons:
@@ -35,42 +38,45 @@ buttons:
             locking:
                 lock_view: "upper"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: altline
+        outline: "altline"
         icon: "edit-clear-symbolic"
-        action: erase
+        action: "erase"
     preferences:
         action: "show_prefs"
         outline: "special"
         icon: "keyboard-mode-symbolic"
     show_numbers:
-        outline: "wide"
         action:
             set_view: "numbers"
+        outline: "change-view-2"
         label: "123"
     show_numbers_from_symbols:
         action:
             set_view: "numbers"
-        outline: altline
+        outline: "change-view"
         label: "123"
     show_letters:
-        outline: "wide"
         action:
             set_view: "base"
+        outline: "change-view-2"
         label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"
-        outline: "altline"
+        outline: "change-view"
         label: "*/="
-    ".":
-        outline: "special"
+    .:
+        outline: "large"
     space:
-        outline: spaceline
+        outline: "spaceline"
         text: " "
     Return:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
+    --:
+        outline: "placeholder"
+        text: ""

data/keyboards/se_wide.yaml

@@ -1,32 +1,35 @@
 ---
 outlines:
-    default:   { width: 50,  height: 42 }
-    altline:   { width: 81,  height: 42 }
-    wide:      { width: 108, height: 42 }
-    spaceline: { width: 216, height: 42 }
-    special:   { width: 60,  height: 42 }
+    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 }
  
 
 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"
+        - "Shift_L   z x c v b n m , BackSpace"
         - "show_numbers preferences         space        .    Return"
     upper:
         - "Q W E R T Y U I O P Å"
         - "A S D F G H J K L Ö Ä"
-        - "Shift_L   Z X C V B N M  BackSpace"
+        - "Shift_L   Z X C V B N M , BackSpace"
         - "show_numbers preferences         space        .    Return"
     numbers:
         - "§ 1 2 3 4 5 6 7 8 9 0"
         - "@ # € $ % & - _ + ( )"
-        - "show_symbols   , \" ' : ; ! ?  BackSpace"
+        - "show_symbols -- , \" ' : ; ! ? BackSpace"
         - "show_letters preferences         space        .    Return"
     symbols:
         - "µ ~ ` | · √ π τ ÷ × ¶"
         - "½ ¤ © ® £ ¥ ^ ° * { }"
-        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
+        - "show_numbers -- \\ / < > = [ ] BackSpace"
         - "show_letters preferences         space        .    Return"
 
 buttons:
@@ -35,42 +38,38 @@ buttons:
             locking:
                 lock_view: "upper"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: altline
+        outline: "altline"
         icon: "edit-clear-symbolic"
-        action: erase
+        action: "erase"
     preferences:
         action: "show_prefs"
         outline: "special"
         icon: "keyboard-mode-symbolic"
     show_numbers:
-        outline: "wide"
         action:
             set_view: "numbers"
-        label: "123"
-    show_numbers_from_symbols:
-        action:
-            set_view: "numbers"
-        outline: altline
+        outline: "change-view"
         label: "123"
     show_letters:
-        outline: "wide"
+        outline: "change-view"
         action:
             set_view: "base"
         label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"
-        outline: "altline"
+        outline: "change-view"
         label: "*/="
-    ".":
-        outline: "special"
     space:
-        outline: spaceline
+        outline: "spaceline"
         text: " "
     Return:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
+    --:
+        outline: "placeholder"
+        text: ""

data/keyboards/si.yaml

@@ -0,0 +1,121 @@
+---
+outlines:
+    default:          { width: 35.33, height: 52 }
+    subtle-highlight: { 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: 88.66, height: 52 }
+    special:          { width: 35.33, height: 52 }
+    placeholder:      { width: 35.33, height: 52 }
+
+views:
+    base:
+        - "q w e r t z u i o p"
+        - "a s d f g h j k l č"
+        - "Shift_L    y x c v b n m    BackSpace"
+        - "show_numbers show_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"
+    numbers:
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "@ # $ % & - _ + ( )"
+        - "show_symbols    , \" ' : ; ! ?    BackSpace"
+        - "show_letters show_accents preferences     space    , . Return"
+    symbols:
+        - "~ ` | · √ π τ ÷ × ¶"
+        - "© ® £ € ¥ ^ ° * { }"
+        - "show_numbers    \\ / < > = [ ]    BackSpace"
+        - "show_letters show_accents preferences     space    § ¤ Return"
+    accents:
+        - "á é ẹ́  í ó ọ́  ú ŕ š đ"
+        - "ȃ ȇ ẹ̑  ȋ ȏ ọ̑  ȗ ȓ ć ž"
+        - "accents_Shift_L à è ì ò ù ö ü BackSpace"
+        - "show_letters show_accents preferences     space    ĺ ł Return"
+    upper_accents:
+        - "Á É Ẹ́  Í Ó Ọ́  Ú Ŕ Š Đ"
+        - "Ȃ Ȇ Ẹ̑  Ȋ Ȏ Ọ̑  Ȗ Ȓ Ć Ž"
+        - "accents_Shift_L À È Ì Ò Ù Ö Ü BackSpace"
+        - "show_letters show_upper_accents preferences     space    Ĺ Ł Return"
+
+buttons:
+    Shift_L:
+        action:
+            locking:
+                lock_view: "upper"
+                unlock_view: "base"
+        outline: "change-view"
+        icon: "key-shift"
+    accents_Shift_L:
+        action:
+            locking:
+                lock_view: "upper_accents"
+                unlock_view: "base"
+        outline: "change-view"
+        icon: "key-shift"
+    BackSpace:
+        outline: "altline"
+        icon: "edit-clear-symbolic"
+        action: "erase"
+    preferences:
+        action: "show_prefs"
+        outline: "special"
+        icon: "keyboard-mode-symbolic"
+    show_numbers:
+        action:
+            set_view: "numbers"
+        outline: "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_accents:
+        action:
+            locking:
+                lock_view: "accents"
+                unlock_view: "base"
+        outline: "change-view"
+        label: "Ćž"
+    show_upper_accents:
+        action:
+            locking:
+                lock_view: "upper_accents"
+                unlock_view: "base"
+        outline: "change-view"
+        label: "Ćž"
+    space:
+        outline: "spaceline"
+        text: " "
+    Return:
+        outline: "wide"
+        icon: "key-enter"
+        keysym: "Return"
+    --:
+        outline: "placeholder"
+        text: ""
+    š:
+        outline: "subtle-highlight"
+    Š:
+        outline: "subtle-highlight"
+    ž:
+        outline: "subtle-highlight"
+    Ž:
+        outline: "subtle-highlight"
+    ć:
+        outline: "subtle-highlight"
+    Ć:
+        outline: "subtle-highlight"
+    đ:
+        outline: "subtle-highlight"
+    Đ:
+        outline: "subtle-highlight"

data/keyboards/si_wide.yaml

@@ -0,0 +1,152 @@
+---
+outlines:
+    default:          { width: 45,  height: 42 }
+    subtle-highlight: { width: 45,  height: 42 }
+    fill:             { width: 90,  height: 42 }
+    altline:          { width: 90,  height: 42 }
+    wide:             { width: 90,  height: 42 }
+    change-view:      { width: 90,  height: 42 }
+    spaceline:        { width: 135, height: 42 }
+    special:          { width: 45,  height: 42 }
+    placeholder:      { width: 45,  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"
+    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"
+    numbers:
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "@ # $ % & - _ + ( )"
+        - "show_symbols    , \" ' : ; ! ? -- BackSpace"
+        - "show_letters show_accents preferences     space    , . Return"
+    symbols:
+        - "~ ` | · √ π τ ÷ × ¶"
+        - "© ® £ € ¥ ^ ° * { }"
+        - "show_numbers    \\ / < > = [ ] -- BackSpace"
+        - "show_letters show_accents preferences     space    § ¤ Return"
+    accents:
+        - "-- á é ẹ́  í ó ọ́  ú ŕ ȁ ȅ ȉ"
+        - "-- ȃ ȇ ẹ̑  ȋ ȏ ọ̑  ȗ ȓ ȍ ȕ ə̏"
+        - "accents_Shift_L    à è ì ò ù ə̀ ö ü BackSpace"
+        - "show_letters show_accents preferences     space    ĺ ł Return"
+    upper_accents:
+        - "-- Á É Ẹ́  Í Ó Ọ́  Ú Ŕ Ȁ Ȅ Ȉ"
+        - "-- Ȃ Ȇ Ẹ̑  Ȋ Ȏ Ọ̑  Ȗ Ȓ Ȍ Ȕ Ə̏"
+        - "accents_Shift_L    À È Ì Ò Ù Ə̀ Ö Ü BackSpace"
+        - "show_letters show_upper_accents preferences     space    Ĺ Ł Return"
+
+buttons:
+    Shift_L:
+        action:
+            locking:
+                lock_view: "upper"
+                unlock_view: "base"
+        outline: "change-view"
+        icon: "key-shift"
+    accents_Shift_L:
+        action:
+            locking:
+                lock_view: "upper_accents"
+                unlock_view: "base"
+        outline: "change-view"
+        icon: "key-shift"
+    BackSpace:
+        outline: "altline"
+        icon: "edit-clear-symbolic"
+        action: "erase"
+    preferences:
+        action: "show_prefs"
+        outline: "special"
+        icon: "keyboard-mode-symbolic"
+    show_numbers:
+        action:
+            set_view: "numbers"
+        outline: "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_accents:
+        action:
+            locking:
+                lock_view: "accents"
+                unlock_view: "base"
+        outline: "change-view"
+        label: "Ćž"
+    show_upper_accents:
+        action:
+            locking:
+                lock_view: "upper_accents"
+                unlock_view: "base"
+        outline: "change-view"
+        label: "Ćž"
+    space:
+        outline: "spaceline"
+        text: " "
+    Return:
+        outline: "wide"
+        icon: "key-enter"
+        keysym: "Return"
+    --:
+        outline: "placeholder"
+        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: "Č"
+    ž-subtle-highlight:
+        outline: "subtle-highlight"
+        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: "đ"
+    Đ-subtle-highlight:
+        outline: "subtle-highlight"
+        text: "Đ"
+    5:
+        outline: "fill"
+    6:
+        outline: "fill"
+    "&":
+        outline: "fill"
+    -:
+        outline: "fill"
+    √:
+        outline: "fill"
+    π:
+        outline: "fill"
+    ¥:
+        outline: "fill"
+    ^:
+        outline: "fill"

data/keyboards/terminal/de.yaml

@@ -1,15 +1,19 @@
 ---
 outlines:
-    default:   { width: 35.33,  height: 46 }
-    halfwidth: { width: 17.665, height: 46 }
-    narrow:    { width: 26.335, height: 46 }
-    special:   { width: 44,     height: 46 }
-    altline:   { width: 52.67,  height: 46 }
-    large:     { width: 52.67,  height: 46 }
-    action:    { width: 59,     height: 46 }
-    wide:      { width: 59,     height: 46 }
-    spaceline: { width: 92.29,  height: 46 }
-    small:     { width: 50.471, height: 22 }
+    default:          { width: 35.33,  height: 45.5 }
+    subtle-highlight: { width: 35.33,  height: 45.5 }
+    halfwidth:        { width: 17.665, height: 45.5 }
+    narrow:           { width: 26.335, height: 45.5 }
+    special:          { width: 35.33,  height: 45.5 }
+    altline:          { width: 52.67,  height: 45.5 }
+    change-view:      { width: 52.67,  height: 45.5 }
+    large:            { width: 52.67,  height: 45.5 }
+    action:           { width: 59,     height: 45.5 }
+    wide:             { width: 59,     height: 45.5 }
+    change-view-2:    { width: 59,     height: 45.5 }
+    spaceline:        { width: 100.96, height: 45.5 }
+    small:            { width: 50.471, height: 24 }
+    placeholder:      { width: 17.665, height: 45.5 }
 
 views:
     base:
@@ -33,7 +37,7 @@ views:
     symbols:
         - "TabSmall Ctrl Alt ↑ ↓ ← →"
         - "~ ` · √ π τ ÷ × ¶ @"
-        - "© ® £ € ¥ ^ ° { }"
+        - "-- © ® £ € ¥ ^ ° { } --"
         - "show_numbers   % | < > = [ ]  BackSpace"
         - "show_letters show_eschars preferences         space        . Return"
     eschars:
@@ -55,12 +59,12 @@ buttons:
             locking:
                 lock_view: "upper"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         icon: "key-shift"
     BackSpace:
         outline: "altline"
         icon: "edit-clear-symbolic"
-        action: erase
+        action: "erase"
     preferences:
         action: "show_prefs"
         outline: "special"
@@ -68,34 +72,34 @@ buttons:
     show_numbers:
         action:
             set_view: "numbers"
-        outline: "altline"
+        outline: "change-view"
         label: "123"
     show_letters:
         action:
             set_view: "base"
-        outline: "altline"
+        outline: "change-view"
         label: "ABC"
     show_letters_actions:
         action:
             set_view: "base"
-        outline: "wide"
+        outline: "change-view-2"
         label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"
-        outline: "altline"
+        outline: "change-view"
         label: "τ=\\"
     show_eschars:
         action:
             locking:
                 lock_view: "eschars"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         label: "Ää"
     show_actions:
         action:
             set_view: "actions"
-        outline: "altline"
+        outline: "change-view"
         label: ">_"
     .:
         outline: "large"
@@ -245,3 +249,20 @@ buttons:
         outline: "halfwidth"
     _:
         outline: "halfwidth"
+    ä:
+        outline: "subtle-highlight"
+    ö:
+        outline: "subtle-highlight"
+    ü:
+        outline: "subtle-highlight"
+    Ä:
+        outline: "subtle-highlight"
+    Ö:
+        outline: "subtle-highlight"
+    Ü:
+        outline: "subtle-highlight"
+    ß:
+        outline: "subtle-highlight"
+    --:
+        outline: "placeholder"
+        text: ""

data/keyboards/terminal/de_wide.yaml

@@ -1,15 +1,19 @@
 ---
 outlines:
-    default:   { width: 54,   height: 37 }
-    halfwidth: { width: 27,   height: 37 }
-    narrow:    { width: 40.5, height: 37 }
-    special:   { width: 54,   height: 37 }
-    altline:   { width: 81,   height: 37 }
-    large:     { width: 81,   height: 37 }
-    action:    { width: 90,   height: 37 }
-    wide:      { width: 90,   height: 37 }
-    spaceline: { width: 153,  height: 37 }
-    small:     { width: 67.4, height: 22 }
+    default:          { width: 54,   height: 37 }
+    subtle-highlight: { width: 54,   height: 37 }
+    halfwidth:        { width: 27,   height: 37 }
+    placeholder:      { width: 27,   height: 37 }
+    narrow:           { width: 40.5, height: 37 }
+    special:          { width: 54,   height: 37 }
+    altline:          { width: 81,   height: 37 }
+    change-view:      { width: 81,   height: 37 }
+    large:            { width: 81,   height: 37 }
+    action:           { width: 90,   height: 37 }
+    wide:             { width: 90,   height: 37 }
+    change-view-2:    { width: 90,   height: 37 }
+    spaceline:        { width: 153,  height: 37 }
+    small:            { width: 67.4, height: 22 }
 
 views:
     base:
@@ -33,7 +37,7 @@ views:
     symbols:
         - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
         - "~ ` · √ π τ ÷ × ¶ @"
-        - "© ® £ € ¥ ^ ° { }"
+        - "-- © ® £ € ¥ ^ ° { } --"
         - "show_numbers   % | < > = [ ]  BackSpace"
         - "show_letters show_eschars preferences         space        . Return"
     eschars:
@@ -55,12 +59,12 @@ buttons:
             locking:
                 lock_view: "upper"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         icon: "key-shift"
     BackSpace:
         outline: "altline"
         icon: "edit-clear-symbolic"
-        action: erase
+        action: "erase"
     preferences:
         action: "show_prefs"
         outline: "special"
@@ -68,34 +72,34 @@ buttons:
     show_numbers:
         action:
             set_view: "numbers"
-        outline: "altline"
+        outline: "change-view"
         label: "123"
     show_letters:
         action:
             set_view: "base"
-        outline: "altline"
+        outline: "change-view"
         label: "ABC"
     show_letters_actions:
         action:
             set_view: "base"
-        outline: "wide"
+        outline: "change-view-2"
         label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"
-        outline: "altline"
+        outline: "change-view"
         label: "τ=\\"
     show_eschars:
         action:
             locking:
                 lock_view: "eschars"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         label: "Ää"
     show_actions:
         action:
             set_view: "actions"
-        outline: "altline"
+        outline: "change-view"
         label: ">_"
     .:
         outline: "large"
@@ -249,3 +253,20 @@ buttons:
         outline: "halfwidth"
     _:
         outline: "halfwidth"
+    ä:
+        outline: "subtle-highlight"
+    ö:
+        outline: "subtle-highlight"
+    ü:
+        outline: "subtle-highlight"
+    Ä:
+        outline: "subtle-highlight"
+    Ö:
+        outline: "subtle-highlight"
+    Ü:
+        outline: "subtle-highlight"
+    ß:
+        outline: "subtle-highlight"
+    --:
+        outline: "placeholder"
+        text: ""

data/keyboards/terminal/es.yaml

@@ -1,15 +1,18 @@
 ---
 outlines:
-    default:   { width: 35.33,  height: 46 }
-    halfwidth: { width: 17.665, height: 46 }
-    thin:      { width: 30.995, height: 46 }
-    action:    { width: 59,     height: 46 }
-    altline:   { width: 52.67,  height: 46 }
-    large:     { width: 52.67,  height: 46 }
-    wide:      { width: 59,     height: 46 }
-    spaceline: { width: 92.29,  height: 46 }
-    special:   { width: 44,     height: 46 }
-    small:     { width: 50.471, height: 22 }
+    default:       { width: 35.33,  height: 45.5 }
+    halfwidth:     { width: 17.665, height: 45.5 }
+    placeholder:   { width: 17.665, height: 45.5 }
+    thin:          { width: 30.995, height: 45.5 }
+    action:        { width: 59,     height: 45.5 }
+    altline:       { width: 52.67,  height: 45.5 }
+    change-view:   { width: 52.67,  height: 45.5 }
+    large:         { width: 52.67,  height: 45.5 }
+    wide:          { width: 59,     height: 45.5 }
+    change-view-2: { width: 59,     height: 45.5 }
+    spaceline:     { width: 100.96, height: 45.5 }
+    special:       { width: 35.33,  height: 45.5 }
+    small:         { width: 50.471, height: 24 }
 
 views:
     base:
@@ -33,7 +36,7 @@ views:
     symbols:
         - "TabSmall Ctrl Alt ↑ ↓ ← →"
         - "~ ` · √ π τ ÷ × ¶ @"
-        - "© ® £ € ¥ ^ ° { }"
+        - "-- © ® £ € ¥ ^ ° { } --"
         - "show_numbers  % | < > = [ ]  BackSpace"
         - "show_letters show_eschars preferences         space        . Return"
     eschars:
@@ -55,12 +58,12 @@ buttons:
             locking:
                 lock_view: "upper"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         icon: "key-shift"
     BackSpace:
         outline: "altline"
         icon: "edit-clear-symbolic"
-        action: erase
+        action: "erase"
     preferences:
         action: "show_prefs"
         outline: "special"
@@ -68,36 +71,36 @@ buttons:
     show_numbers:
         action:
             set_view: "numbers"
-        outline: "altline"
+        outline: "change-view"
         label: "123"
     show_letters:
         action:
             set_view: "base"
-        outline: "altline"
+        outline: "change-view"
         label: "ABC"
     show_letters_actions:
         action:
             set_view: "base"
-        outline: "wide"
+        outline: "change-view-2"
         label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"
-        outline: "altline"
+        outline: "change-view"
         label: "τ=\\"
     show_eschars:
         action:
             locking:
                 lock_view: "eschars"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         label: "Áá"
     show_actions:
         action:
             set_view: "actions"
-        outline: "altline"
+        outline: "change-view"
         label: ">_"
-    ".":
+    .:
         outline: "large"
         text: "."
     space:
@@ -256,3 +259,6 @@ buttons:
         outline: "halfwidth"
     _:
         outline: "halfwidth"
+    --:
+        outline: "placeholder"
+        text: ""

data/keyboards/terminal/es_wide.yaml

@@ -1,15 +1,18 @@
 ---
 outlines:
-    default:   { width: 54,    height: 37 }
-    halfwidth: { width: 27,    height: 37 }
-    thin:      { width: 47.25, height: 37 }
-    action:    { width: 90,    height: 37 }
-    altline:   { width: 81,    height: 37 }
-    large:     { width: 81,    height: 37 }
-    wide:      { width: 90,    height: 37 }
-    spaceline: { width: 153,   height: 37 }
-    special:   { width: 54,    height: 37 }
-    small:     { width: 67.4,  height: 22 }
+    default:       { width: 54,    height: 37 }
+    halfwidth:     { width: 27,    height: 37 }
+    placeholder:   { width: 27,    height: 37 }
+    thin:          { width: 47.25, height: 37 }
+    action:        { width: 90,    height: 37 }
+    altline:       { width: 81,    height: 37 }
+    change-view:   { width: 81,    height: 37 }
+    large:         { width: 81,    height: 37 }
+    wide:          { width: 90,    height: 37 }
+    change-view-2: { width: 90,    height: 37 }
+    spaceline:     { width: 153,   height: 37 }
+    special:       { width: 54,    height: 37 }
+    small:         { width: 67.4,  height: 22 }
 
 views:
     base:
@@ -33,7 +36,7 @@ views:
     symbols:
         - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
         - "~ ` · √ π τ ÷ × ¶ @"
-        - "© ® £ € ¥ ^ ° { }"
+        - "-- © ® £ € ¥ ^ ° { } --"
         - "show_numbers  % | < > = [ ]  BackSpace"
         - "show_letters show_eschars preferences         space        . Return"
     eschars:
@@ -55,12 +58,12 @@ buttons:
             locking:
                 lock_view: "upper"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         icon: "key-shift"
     BackSpace:
         outline: "altline"
         icon: "edit-clear-symbolic"
-        action: erase
+        action: "erase"
     preferences:
         action: "show_prefs"
         outline: "special"
@@ -68,38 +71,37 @@ buttons:
     show_numbers:
         action:
             set_view: "numbers"
-        outline: "altline"
+        outline: "change-view"
         label: "123"
     show_letters:
         action:
             set_view: "base"
-        outline: "altline"
+        outline: "change-view"
         label: "ABC"
     show_letters_actions:
         action:
             set_view: "base"
-        outline: "wide"
+        outline: "change-view-2"
         label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"
-        outline: "altline"
+        outline: "change-view"
         label: "τ=\\"
     show_eschars:
         action:
             locking:
                 lock_view: "eschars"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         label: "Áá"
     show_actions:
         action:
             set_view: "actions"
-        outline: "altline"
+        outline: "change-view"
         label: ">_"
-    ".":
+    .:
         outline: "large"
-        text: "."
     space:
         outline: "spaceline"
         text: " "
@@ -260,3 +262,6 @@ buttons:
         outline: "halfwidth"
     _:
         outline: "halfwidth"
+    --:
+        outline: "placeholder"
+        text: ""

data/keyboards/terminal/fr+bepo.yaml

@@ -1,14 +1,15 @@
 ---
 outlines:
-    default:   { width: 35.33,  height: 46 }
-    halfwidth: { width: 17.665, height: 46 }
-    action:    { width: 59,     height: 46 }
-    altline:   { width: 42,     height: 46 }
-    wide:      { width: 50,     height: 46 }
-    narrow:    { width: 22.5,   height: 46 }
-    spaceline: { width: 119.47, height: 46 }
-    special:   { width: 35.33,  height: 46 }
-    small:     { width: 50.471, height: 22 }
+    default:       { width: 35.33,  height: 45.5 }
+    halfwidth:     { width: 17.665, height: 45.5 }
+    narrow:        { width: 22.5,   height: 45.5 }
+    special:       { width: 35.33,  height: 45.5 }
+    change-view:   { width: 42,     height: 45.5 }
+    change-view-2: { width: 50,     height: 45.5 }
+    action:        { width: 59,     height: 45.5 }
+    wide:          { width: 50,     height: 45.5 }
+    spaceline:     { width: 119.47, height: 45.5 }
+    small:         { width: 50.471, height: 24 }
 
 views:
     base:
@@ -170,19 +171,19 @@ buttons:
     show_actions:
         action:
             set_view: "actions"
-        outline: "altline"
+        outline: "change-view"
         label: ">_"
     Shift_L:
         action:
             locking:
                 lock_view: "upper"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         icon: "key-shift"
     BackSpace:
         outline: "altline"
         icon: "edit-clear-symbolic"
-        action: erase
+        action: "erase"
     preferences:
         action: "show_prefs"
         outline: "special"
@@ -190,29 +191,29 @@ buttons:
     show_numbers:
         action:
             set_view: "numbers"
-        outline: "altline"
+        outline: "change-view"
         label: "123"
     show_letters:
         action:
             set_view: "base"
-        outline: "altline"
+        outline: "change-view"
         label: "ABC"
     show_letters_actions:
         action:
             set_view: "base"
-        outline: "wide"
+        outline: "change-view-2"
         label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"
-        outline: "altline"
+        outline: "change-view"
         label: "*/="
     show_eschars:
         action:
             locking:
                 lock_view: "eschars"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         label: "Ââ"
     space:
         outline: "spaceline"

data/keyboards/terminal/fr+bepo_wide.yaml

@@ -1,15 +1,16 @@
 ---
 outlines:
-    default:   { width: 54,   height: 37 }
-    halfwidth: { width: 27,   height: 37 }
-    narrow:    { width: 40.5, height: 37 }
-    special:   { width: 54,   height: 37 }
-    altline:   { width: 81,   height: 37 }
-    large:     { width: 81,   height: 37 }
-    action:    { width: 90,   height: 37 }
-    wide:      { width: 90,   height: 37 }
-    spaceline: { width: 153,  height: 37 }
-    small:     { width: 67.4, height: 22 }
+    default:       { width: 54,   height: 37 }
+    halfwidth:     { width: 27,   height: 37 }
+    narrow:        { width: 40.5, height: 37 }
+    special:       { width: 54,   height: 37 }
+    change-view:   { width: 81,   height: 37 }
+    large:         { width: 81,   height: 37 }
+    action:        { width: 90,   height: 37 }
+    wide:          { width: 90,   height: 37 }
+    change-view-2: { width: 90,   height: 37 }
+    spaceline:     { width: 153,  height: 37 }
+    small:         { width: 67.4, height: 22 }
 
 views:
     base:
@@ -175,19 +176,19 @@ buttons:
     show_actions:
         action:
             set_view: "actions"
-        outline: "altline"
+        outline: "change-view"
         label: ">_"
     Shift_L:
         action:
             locking:
                 lock_view: "upper"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         icon: "key-shift"
     BackSpace:
         outline: "altline"
         icon: "edit-clear-symbolic"
-        action: erase
+        action: "erase"
     preferences:
         action: "show_prefs"
         outline: "special"
@@ -195,29 +196,29 @@ buttons:
     show_numbers:
         action:
             set_view: "numbers"
-        outline: "altline"
+        outline: "change-view"
         label: "123"
     show_letters:
         action:
             set_view: "base"
-        outline: "altline"
+        outline: "change-view"
         label: "ABC"
     show_letters_actions:
         action:
             set_view: "base"
-        outline: "wide"
+        outline: "change-view-2"
         label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"
-        outline: "altline"
+        outline: "change-view"
         label: "*/="
     show_eschars:
         action:
             locking:
                 lock_view: "eschars"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         label: "Ââ"
     space:
         outline: "spaceline"

data/keyboards/terminal/fr.yaml

@@ -1,13 +1,15 @@
 ---
 outlines:
-    default:   { width: 35.33,  height: 46 }
-    action:    { width: 59,     height: 46 }
-    small:     { width: 50.471, height: 22 }
-    altline:   { width: 52.67,  height: 46 }
-    large:     { width: 52.67,  height: 46 }
-    wide:      { width: 59,     height: 46 }
-    spaceline: { width: 92.29,  height: 46 }
-    special:   { width: 44,     height: 46 }
+    default:       { width: 35.33,  height: 45.5 }
+    action:        { width: 59,     height: 45.5 }
+    small:         { width: 50.471, height: 24 }
+    altline:       { width: 52.67,  height: 45.5 }
+    change-view:   { width: 52.67,  height: 45.5 }
+    large:         { width: 52.67,  height: 45.5 }
+    wide:          { width: 59,     height: 45.5 }
+    change-view-2: { width: 59,     height: 45.5 }
+    spaceline:     { width: 100.96, height: 45.5 }
+    special:       { width: 35.33,  height: 45.5 }
 
 views:
     base:
@@ -169,19 +171,19 @@ buttons:
     show_actions:
         action:
             set_view: "actions"
-        outline: "altline"
+        outline: "change-view"
         label: ">_"
     Shift_L:
         action:
             locking:
                 lock_view: "upper"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         icon: "key-shift"
     BackSpace:
         outline: "altline"
         icon: "edit-clear-symbolic"
-        action: erase
+        action: "erase"
     preferences:
         action: "show_prefs"
         outline: "special"
@@ -189,29 +191,29 @@ buttons:
     show_numbers:
         action:
             set_view: "numbers"
-        outline: "altline"
+        outline: "change-view"
         label: "123"
     show_letters:
         action:
             set_view: "base"
-        outline: "altline"
+        outline: "change-view"
         label: "ABC"
     show_letters_actions:
         action:
             set_view: "base"
-        outline: "wide"
+        outline: "change-view-2"
         label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"
-        outline: "altline"
+        outline: "change-view"
         label: "*/="
     show_eschars:
         action:
             locking:
                 lock_view: "eschars"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         label: "Ââ"
     space:
         outline: "spaceline"

data/keyboards/terminal/fr_wide.yaml

@@ -1,13 +1,15 @@
 ---
 outlines:
-    default:   { width: 54,   height: 37 }
-    action:    { width: 90,   height: 37 }
-    small:     { width: 67.4, height: 22 }
-    altline:   { width: 81,   height: 37 }
-    large:     { width: 81,   height: 37 }
-    wide:      { width: 90,  height: 37 }
-    spaceline: { width: 153,  height: 37 }
-    special:   { width: 54,   height: 37 }
+    default:       { width: 54,   height: 37 }
+    action:        { width: 90,   height: 37 }
+    small:         { width: 67.4, height: 22 }
+    altline:       { width: 81,   height: 37 }
+    change-view:   { width: 81,   height: 37 }
+    large:         { width: 81,   height: 37 }
+    wide:          { width: 90,  height: 37 }
+    change-view-2: { width: 90,  height: 37 }
+    spaceline:     { width: 153,  height: 37 }
+    special:       { width: 54,   height: 37 }
 
 views:
     base:
@@ -172,19 +174,19 @@ buttons:
     show_actions:
         action:
             set_view: "actions"
-        outline: "altline"
+        outline: "change-view"
         label: ">_"
     Shift_L:
         action:
             locking:
                 lock_view: "upper"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         icon: "key-shift"
     BackSpace:
         outline: "altline"
         icon: "edit-clear-symbolic"
-        action: erase
+        action: "erase"
     preferences:
         action: "show_prefs"
         outline: "special"
@@ -192,29 +194,29 @@ buttons:
     show_numbers:
         action:
             set_view: "numbers"
-        outline: "altline"
+        outline: "change-view"
         label: "123"
     show_letters:
         action:
             set_view: "base"
-        outline: "altline"
+        outline: "change-view"
         label: "ABC"
     show_letters_actions:
         action:
             set_view: "base"
-        outline: "wide"
+        outline: "change-view-2"
         label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"
-        outline: "altline"
+        outline: "change-view"
         label: "*/="
     show_eschars:
         action:
             locking:
                 lock_view: "eschars"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         label: "Ââ"
     space:
         outline: "spaceline"

data/keyboards/terminal/us+dvorak.yaml

@@ -1,13 +1,15 @@
 ---
 outlines:
-    default:   { width: 35.33,  height: 46 }
-    action:    { width: 59,     height: 46 }
-    altline:   { width: 52.67,  height: 46 }
-    large:     { width: 52.67,  height: 46 }
-    wide:      { width: 59,     height: 46 }
-    spaceline: { width: 144.96, height: 46 }
-    special:   { width: 44,     height: 46 }
-    small:     { width: 50.471, height: 22 }
+    default:       { width: 35.33,  height: 45.5 }
+    action:        { width: 59,     height: 45.5 }
+    altline:       { width: 52.67,  height: 45.5 }
+    change-view:   { width: 52.67,  height: 45.5 }
+    large:         { width: 52.67,  height: 45.5 }
+    wide:          { width: 59,     height: 45.5 }
+    change-view-2: { width: 59,     height: 45.5 }
+    spaceline:     { width: 144.96, height: 45.5 }
+    special:       { width: 44,     height: 45.5 }
+    small:         { width: 50.471, height: 24 }
 
 views:
     base:
@@ -47,12 +49,12 @@ buttons:
             locking:
                 lock_view: "upper"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         icon: "key-shift"
     BackSpace:
         outline: "altline"
         icon: "edit-clear-symbolic"
-        action: erase
+        action: "erase"
     preferences:
         action: "show_prefs"
         outline: "special"
@@ -60,27 +62,27 @@ buttons:
     show_numbers:
         action:
             set_view: "numbers"
-        outline: "altline"
+        outline: "change-view"
         label: "123"
     show_letters:
         action:
             set_view: "base"
-        outline: "altline"
+        outline: "change-view"
         label: "ABC"
     show_letters_actions:
         action:
             set_view: "base"
-        outline: "wide"
+        outline: "change-view-2"
         label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"
-        outline: "altline"
+        outline: "change-view"
         label: "τ=\\"
     show_actions:
         action:
             set_view: "actions"
-        outline: "altline"
+        outline: "change-view"
         label: ">_"
     .:
         outline: "large"

data/keyboards/terminal/us+dvorak_wide.yaml

@@ -1,13 +1,15 @@
 ---
 outlines:
-    default:   { width: 54,   height: 37 }
-    action:    { width: 90,   height: 37 }
-    altline:   { width: 81,   height: 37 }
-    large:     { width: 81,   height: 37 }
-    wide:      { width: 90,   height: 37 }
-    spaceline: { width: 234,  height: 37 }
-    special:   { width: 54,   height: 37 }
-    small:     { width: 67.4, height: 22 }
+    default:       { width: 54,   height: 37 }
+    action:        { width: 90,   height: 37 }
+    altline:       { width: 81,   height: 37 }
+    change-view:   { width: 81,   height: 37 }
+    large:         { width: 81,   height: 37 }
+    wide:          { width: 90,   height: 37 }
+    change-view-2: { width: 90,   height: 37 }
+    spaceline:     { width: 234,  height: 37 }
+    special:       { width: 54,   height: 37 }
+    small:         { width: 67.4, height: 22 }
 
 views:
     base:
@@ -47,12 +49,12 @@ buttons:
             locking:
                 lock_view: "upper"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         icon: "key-shift"
     BackSpace:
         outline: "altline"
         icon: "edit-clear-symbolic"
-        action: erase
+        action: "erase"
     preferences:
         action: "show_prefs"
         outline: "special"
@@ -60,27 +62,27 @@ buttons:
     show_numbers:
         action:
             set_view: "numbers"
-        outline: "altline"
+        outline: "change-view"
         label: "123"
     show_letters:
         action:
             set_view: "base"
-        outline: "altline"
+        outline: "change-view"
         label: "ABC"
     show_letters_actions:
         action:
             set_view: "base"
-        outline: "wide"
+        outline: "change-view-2"
         label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"
-        outline: "altline"
+        outline: "change-view"
         label: "τ=\\"
     show_actions:
         action:
             set_view: "actions"
-        outline: "altline"
+        outline: "change-view"
         label: ">_"
     .:
         outline: "large"

data/keyboards/terminal/us.yaml

@@ -1,15 +1,18 @@
 ---
 outlines:
-    default:   { width: 35.33,  height: 46 }
-    halfwidth: { width: 17.665, height: 46 }
-    narrow:    { width: 26.335, height: 46 }
-    special:   { width: 44,     height: 46 }
-    altline:   { width: 52.67,  height: 46 }
-    large:     { width: 52.67,  height: 46 }
-    action:    { width: 59,     height: 46 }
-    wide:      { width: 59,     height: 46 }
-    spaceline: { width: 144.96, height: 46 }
-    small:     { width: 50.471, height: 22 }
+    default:       { width: 35.33,  height: 45.5 }
+    halfwidth:     { width: 17.665, height: 45.5 }
+    placeholder:   { width: 17.665, height: 45.5 }
+    narrow:        { width: 26.335, height: 45.5 }
+    special:       { width: 44,     height: 45.5 }
+    altline:       { width: 52.67,  height: 45.5 }
+    change-view:   { width: 52.67,  height: 45.5 }
+    large:         { width: 52.67,  height: 45.5 }
+    action:        { width: 59,     height: 45.5 }
+    wide:          { width: 59,     height: 45.5 }
+    change-view-2: { width: 59,     height: 45.5 }
+    spaceline:     { width: 138.63, height: 45.5 }
+    small:         { width: 50.471, height: 24 }
 
 views:
     base:
@@ -33,8 +36,8 @@ views:
     symbols:
         - "TabSmall Ctrl Alt ↑ ↓ ← →"
         - "~ ` · √ π τ ÷ × ¶ @"
-        - "© ® £ € ¥ ^ ° { }"
-        - "show_numbers   % | < > = [ ]  BackSpace"
+        - "-- © ® £ € ¥ ^ ° { } --"
+        - "show_numbers_from_symbols  % | < > = [ ]  BackSpace"
         - "show_letters preferences         space        . Return"
     actions:
         - "TabSmall Ctrl Alt PageUp PageDown Home End"
@@ -49,12 +52,12 @@ buttons:
             locking:
                 lock_view: "upper"
                 unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
         icon: "key-shift"
     BackSpace:
         outline: "altline"
         icon: "edit-clear-symbolic"
-        action: erase
+        action: "erase"
     preferences:
         action: "show_prefs"
         outline: "special"
@@ -62,27 +65,32 @@ buttons:
     show_numbers:
         action:
             set_view: "numbers"
-        outline: "altline"
+        outline: "change-view-2"
+        label: "123"
+    show_numbers_from_symbols:
+        action:
+            set_view: "numbers"
+        outline: "change-view"
         label: "123"
     show_letters:
         action:
             set_view: "base"
-        outline: "altline"
+        outline: "change-view-2"
         label: "ABC"
     show_letters_actions:
         action:
             set_view: "base"
-        outline: "wide"
+        outline: "change-view-2"
         label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"
-        outline: "altline"
+        outline: "change-view"
         label: "τ=\\"
     show_actions:
         action:
             set_view: "actions"
-        outline: "altline"
+        outline: "change-view"
         label: ">_"
     .:
         outline: "large"
@@ -220,3 +228,6 @@ buttons:
         outline: "halfwidth"
     _:
         outline: "halfwidth"
+    --:
+        outline: "placeholder"
+        text: ""