Merge branch 'rel-1.42.0_rc1' into 'main'

treewide: Document changes and release 1.42.0~rc1 See merge request World/Phosh/squeekboard!680
treewide: Document changes and release 1.42.0~rc1
2024-09-23 13:01:53 +00:00 · 2024-09-23 14:42:41 +02:00 · 2024-09-23 14:40:51 +02:00 · 2024-09-23 14:40:51 +02:00 · 2024-09-23 13:50:13 +02:00 · 2024-09-23 11:21:47 +00:00
184 changed files with 8925 additions and 2945 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,8 +1,21 @@
-_build
+_build/
 debian/*.debhelper
 debian/.debhelper/
 debian/cargo/registry/
 debian/cargo/.*cache*
 debian/debhelper-build-stamp
 debian/files
 debian/*.substvars
 debian/squeekboard/
 debian/squeekboard-devel/
 debian/tmp/
 meson_Cargo.toml.in
 po/squeekboard.pot
 po/*.mo
 TAGS
 tags
 target/
 vendor/
 vgdump
 *.swp
 *~
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -23,7 +23,6 @@ stages:
  - deploy
 before_script:
  - echo "deb http://deb.debian.org/debian/ experimental main" > /etc/apt/sources.list.d/experimental.list
  - apt-get -y update
  - apt-get -y install ca-certificates
@ -33,7 +32,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 +45,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 +53,7 @@ build_meson:
      - $PKG_ONLY == "1"
 build_deb:
  allow_failure: true
  tags:
    - aarch64
  stage: build
@ -63,7 +62,6 @@ build_deb:
      - '*.deb'
  script:
    - rm -f ../*.deb
    - apt-get -y install -t experimental librust-serde-yaml-dev
    - apt-get -y build-dep .
    - apt-get -y install devscripts
    - REV=$(git log -1 --format=%h)
@ -83,7 +81,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 +95,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 +107,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:
--- a/8
+++ b/8
@ -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>.
--- a/Cargo.lock
+++ b/Cargo.lock
@ -4,9 +4,9 @@ version = 3
 [[package]]
 name = "anstyle"
-version = "1.0.6"
+version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc"
+checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
 [[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"
@ -74,9 +74,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 [[package]]
 name = "byteorder"
@ -90,7 +90,7 @@ version = "0.18.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8ca26ef0159422fb77631dc9d17b102f253b876fe1586b03b803e63a309b4ee2"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
 "cairo-sys-rs",
 "glib",
 "libc",
@ -111,15 +111,18 @@ dependencies = [
 [[package]]
 name = "cc"
-version = "1.0.90"
+version = "1.1.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5"
+checksum = "07b1695e2c7e8fc85310cde85aeaab7e3097f593c91d209d3f9df76c928100f0"
 dependencies = [
 "shlex",
 ]
 [[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",
@ -133,18 +136,18 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 [[package]]
 name = "clap"
-version = "4.4.18"
+version = "4.5.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e578d6ec4194633722ccf9544794b71b1385c3c027efe0c55db226fc880865c"
+checksum = "b0956a43b323ac1afaffc053ed5c4b7c1f1800bacd1683c353aabbb752515dd3"
 dependencies = [
 "clap_builder",
 ]
 [[package]]
 name = "clap_builder"
-version = "4.4.18"
+version = "4.5.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4df4df40ec50c46000231c914968278b1eb05098cf8f1b3a518a95030e71d1c7"
+checksum = "4d72166dd41634086d5803a47eb71ae740e61d84709c36f3c34110173db3961b"
 dependencies = [
 "anstyle",
 "clap_lex",
@ -152,24 +155,24 @@ dependencies = [
 [[package]]
 name = "clap_lex"
-version = "0.6.0"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1"
+checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97"
 [[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",
 ]
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.19"
+version = "0.8.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345"
+checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
 [[package]]
 name = "derivative"
@ -211,9 +214,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 [[package]]
 name = "errno"
-version = "0.3.8"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"
+checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
 dependencies = [
 "libc",
 "windows-sys 0.52.0",
@ -240,7 +243,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 +318,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.53",
+ "syn 2.0.77",
 ]
 [[package]]
@ -444,7 +447,7 @@ version = "0.18.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "233daaf6e83ae6a12a52055f568f9d7cf4671dabb78ff9560ab6da230ce00ee5"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
 "futures-channel",
 "futures-core",
 "futures-executor",
@ -472,7 +475,7 @@ dependencies = [
 "proc-macro-error",
 "proc-macro2",
 "quote",
- "syn 2.0.53",
+ "syn 2.0.77",
 ]
 [[package]]
@ -545,14 +548,14 @@ dependencies = [
 "proc-macro-error",
 "proc-macro2",
 "quote",
- "syn 2.0.53",
+ "syn 2.0.77",
 ]
 [[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"
@ -574,9 +577,9 @@ checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
 [[package]]
 name = "indexmap"
-version = "2.2.6"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
+checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5"
 dependencies = [
 "equivalent",
 "hashbrown",
@ -584,9 +587,9 @@ dependencies = [
 [[package]]
 name = "instant"
-version = "0.1.12"
+version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
+checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
 dependencies = [
 "cfg-if",
 ]
@ -604,15 +607,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.158"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
+checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439"
 [[package]]
 name = "linux-raw-sys"
@ -622,9 +625,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
 [[package]]
 name = "log"
-version = "0.4.21"
+version = "0.4.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
+checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
 [[package]]
 name = "maplit"
@ -634,15 +637,15 @@ checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d"
 [[package]]
 name = "memchr"
-version = "2.7.1"
+version = "2.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
 [[package]]
 name = "memmap2"
-version = "0.7.1"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f49388d20533534cd19360ad3d6a7dadc885944aa802ba3995040c5ec11288c6"
+checksum = "43a5a03cefb0d953ec0be133036f14e109412fa594edc2f77227249db66cc3ed"
 dependencies = [
 "libc",
 ]
@ -658,9 +661,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",
 ]
@ -721,15 +724,15 @@ dependencies = [
 [[package]]
 name = "parking"
-version = "2.2.0"
+version = "2.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae"
+checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba"
 [[package]]
 name = "pin-project-lite"
-version = "0.2.13"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58"
+checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
 [[package]]
 name = "pin-utils"
@ -739,9 +742,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 [[package]]
 name = "pkg-config"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
+checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
 [[package]]
 name = "polling"
@ -814,18 +817,18 @@ dependencies = [
 [[package]]
 name = "proc-macro2"
-version = "1.0.79"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
 "unicode-ident",
 ]
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
 "proc-macro2",
 ]
@ -855,9 +858,9 @@ dependencies = [
 [[package]]
 name = "rustc_version"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
+checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
 dependencies = [
 "semver",
 ]
@ -878,9 +881,9 @@ dependencies = [
 [[package]]
 name = "ryu"
-version = "1.0.17"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1"
+checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
 [[package]]
 name = "scoped-tls"
@ -890,55 +893,55 @@ checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
 [[package]]
 name = "semver"
-version = "1.0.22"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca"
+checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
 [[package]]
 name = "serde"
-version = "1.0.197"
+version = "1.0.210"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2"
+checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
 dependencies = [
 "serde_derive",
 ]
 [[package]]
 name = "serde_derive"
-version = "1.0.197"
+version = "1.0.210"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b"
+checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.53",
+ "syn 2.0.77",
 ]
 [[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.77",
 ]
 [[package]]
 name = "serde_spanned"
-version = "0.6.5"
+version = "0.6.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1"
+checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d"
 dependencies = [
 "serde",
 ]
 [[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",
@ -947,6 +950,12 @@ dependencies = [
 "unsafe-libyaml",
 ]
 [[package]]
 name = "shlex"
 version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
 [[package]]
 name = "slab"
 version = "0.4.9"
@ -991,9 +1000,9 @@ dependencies = [
 [[package]]
 name = "syn"
-version = "2.0.53"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7383cd0e49fff4b6b90ca5670bfd3e9d6a733b3f90c686605aa7eec8c4996032"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
 "proc-macro2",
 "quote",
@ -1015,28 +1024,28 @@ dependencies = [
 [[package]]
 name = "target-lexicon"
-version = "0.12.14"
+version = "0.12.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f"
+checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
 [[package]]
 name = "thiserror"
-version = "1.0.58"
+version = "1.0.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297"
+checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84"
 dependencies = [
 "thiserror-impl",
 ]
 [[package]]
 name = "thiserror-impl"
-version = "1.0.58"
+version = "1.0.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7"
+checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.53",
+ "syn 2.0.77",
 ]
 [[package]]
@ -1095,9 +1104,9 @@ dependencies = [
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 [[package]]
 name = "unsafe-libyaml"
@ -1113,15 +1122,15 @@ checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b"
 [[package]]
 name = "version_check"
-version = "0.9.4"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
 [[package]]
 name = "waker-fn"
-version = "1.1.1"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690"
+checksum = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7"
 [[package]]
 name = "winapi"
@ -1160,7 +1169,7 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
 dependencies = [
- "windows-targets 0.52.4",
+ "windows-targets 0.52.6",
 ]
 [[package]]
@ -1180,17 +1189,18 @@ dependencies = [
 [[package]]
 name = "windows-targets"
-version = "0.52.4"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
 dependencies = [
- "windows_aarch64_gnullvm 0.52.4",
+ "windows_aarch64_gnullvm 0.52.6",
- "windows_aarch64_msvc 0.52.4",
+ "windows_aarch64_msvc 0.52.6",
- "windows_i686_gnu 0.52.4",
+ "windows_i686_gnu 0.52.6",
- "windows_i686_msvc 0.52.4",
+ "windows_i686_gnullvm",
- "windows_x86_64_gnu 0.52.4",
+ "windows_i686_msvc 0.52.6",
- "windows_x86_64_gnullvm 0.52.4",
+ "windows_x86_64_gnu 0.52.6",
- "windows_x86_64_msvc 0.52.4",
+ "windows_x86_64_gnullvm 0.52.6",
 "windows_x86_64_msvc 0.52.6",
 ]
 [[package]]
@ -1201,9 +1211,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.52.4"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
 [[package]]
 name = "windows_aarch64_msvc"
@ -1213,9 +1223,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.52.4"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
 [[package]]
 name = "windows_i686_gnu"
@ -1225,9 +1235,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
 [[package]]
 name = "windows_i686_gnu"
-version = "0.52.4"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
 [[package]]
 name = "windows_i686_gnullvm"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
 [[package]]
 name = "windows_i686_msvc"
@ -1237,9 +1253,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
 [[package]]
 name = "windows_i686_msvc"
-version = "0.52.4"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
 [[package]]
 name = "windows_x86_64_gnu"
@ -1249,9 +1265,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.52.4"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
 [[package]]
 name = "windows_x86_64_gnullvm"
@ -1261,9 +1277,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.52.4"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
 [[package]]
 name = "windows_x86_64_msvc"
@ -1273,9 +1289,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.52.4"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 [[package]]
 name = "winnow"
@ -1288,14 +1304,21 @@ dependencies = [
 [[package]]
 name = "xkbcommon"
-version = "0.5.1"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52db25b599e92bf6e3904134618728eeb7b49a5a4f38f107f92399bb9c496b88"
+checksum = "13867d259930edc7091a6c41b4ce6eee464328c6ff9659b7e4c668ca20d4c91e"
 dependencies = [
 "libc",
 "memmap2",
 "xkeysym",
 ]
 [[package]]
 name = "xkeysym"
 version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b9cc00251562a284751c9973bace760d86c0276c471b4be569fe6b068ee97a56"
 [[package]]
 name = "zbus"
 version = "1.9.3"
--- a/Cargo.toml
+++ b/Cargo.toml
@ -5,62 +5,62 @@ edition = "2021"
 [lib]
 name = "rs"
-path = "@path@/src/lib.rs"
+path = "src/lib.rs"
 crate-type = ["staticlib", "rlib"]
 # Cargo can't do autodiscovery if Cargo.toml is not in the root.
 [[bin]]
 name = "test_layout"
-path = "@path@/src/bin/test_layout.rs"
+path = "src/bin/test_layout.rs"
 [[example]]
 name = "test_layout"
-path = "@path@/examples/test_layout.rs"
+path = "examples/test_layout.rs"
 [[example]]
 name = "find_orphan_layouts"
-path = "@path@/examples/find_orphan_layouts.rs"
+path = "examples/find_orphan_layouts.rs"
 [features]
 zbus_v1_5 = []
 clap_v4 = []
 [dependencies]
-maplit = "1.0.*"
+maplit = "1.0"
-serde = { version = "1.0.*", features = ["derive"] }
+serde = { version = "1.0", features = ["derive"] }
-serde_yaml = "0.9.*"
+serde_yaml = "0.9"
-bitflags = "1.3.*"
+bitflags = "1.3"
-clap = { version = "4.4.*", features=["std"], default-features = false }
+clap = { version = "4.4", features=["std"], default-features = false }
-zbus = "1.9.*"
+zbus = "1.9"
-zvariant = "2.10.*"
+zvariant = "2.10"
-zvariant_derive = "2.10.*"
+zvariant_derive = "2.10"
-xkbcommon = { version = "0.5.*", features = ["wayland"] }
+xkbcommon = { version = "0.7", features = ["wayland"] }
 [dependencies.cairo-rs]
-version = "0.18.*"
+version = "0.18"
 [dependencies.cairo-sys-rs]
-version = "0.18.*"
+version = "0.18"
 [dependencies.gdk]
-version = "0.18.*"
+version = "0.18"
 [dependencies.gio]
-version = "0.18.*"
+version = "0.18"
 features = ["v2_58"]
 [dependencies.glib]
-version = "0.18.*"
+version = "0.18"
 features = ["v2_58"]
 [dependencies.glib-sys]
-version = "0.18.*"
+version = "0.18"
 features = ["v2_58"]
 [dependencies.gtk]
-version = "0.18.*"
+version = "0.18"
 features = ["v3_24"]
 [dependencies.gtk-sys]
-version = "0.18.*"
+version = "0.18"
 features = ["v3_24"]
--- a/138
+++ b/138
@ -0,0 +1,138 @@
 squeekboard 1.42.0~rc1
 ----------------------
 Released September 2024
 * New layouts:
    * Belarusian (by)
    * Japanese (jp)
    * Serbian (rs), (rs+latin), (rs+latinunicode)
 * Fixes:
    * "Keyboard Settings" in the language-selection-popover will now open the correct panel in GNOME Settings.
    * On some relatively small screens in horizontal orientation, the compact shape was used instead of the wide shape,
      even though the wide shape can fit into the same height. The wide shape will be used on those screens now.
 * Changes:
    * The height of the panel will adapt to screens differently now.
      In particular, the panel will now be 1/3 of the screen's height on most monitors in horizontal orientation,
      and as tall as it can be, while maintaining the aspect-ratio of the wide shape (16:5) without empty space next to it,
      for most monitors in vertical orientation.
    * Settings for adjusting the height of the panel for the keyboard have been added.
    * The documentation has been improved. In particular, it should now be much easier to learn how to test changes to Squeekboard and layouts.
    * After building a Debian-package for Squeekboard and installing it, `update-alternatives` is now supported.
    * The layout-files now have the English name of the language for which the respective layout is, in a comment at the top of the file.
    * For a few languages which do not have a layout yet, a more appropriate fallback-layout will be chosen.
 * Contributors:
    * Guido Günther
    * MoonlightWave-12
 * UI translations:
    * Sabri Ünal (tr)
 squeekboard 1.41.0
 ------------------
 Released August 2024
 * New layouts:
    * Malayalam
    * German (Bone)
    * German (Neo 2)
 * New icons:
    * zwsp (zero-width-space)
    * zwj (zero-width-joiner)
 squeekboard 1.39.0
 ------------------
 Released May 2024
 * New button-styles:
    * `change-view`: Highlighted like `special`, but with a border at the bottom.
    * `character-group`: Like `change-view`, but with less highlighting.
    * `placeholder`: Less contrast to the background and does not visually change when pressed.
    * `subtle-highlight`: For highlighting commonly used characters in accent-views, for example.
 * New layouts:
    * Portuguese
    * Slovenian
    * Turkish (F-layout)
    * Turkish (Q-layout)
 * Remade layout:
    * Portuguese (Brazil): A view for accents has been added.
 * Changes:
    * The new button-styles are used in the available layouts, where appropriate.
    * The top rows of the terminal-layouts are a little taller.
    * Squeekboard will choose the wide shape of layouts, for more displays in horizontal orientation.
    * Highlighted buttons now show visual feedback too, when pressed.
    * Many layouts have been adjusted, so that those change their form less when switching views.
    * Various small issues have been fixed, to make layouts more consistent.
 * Development:
    * Scaling-tests for many display-types have been added.
 squeekboard 1.38.0
 ------------------
 Released March 2024
 * Changes:
    * 25 wide shapes have been added, so that every available layout now has a wide shape
    * "PgUp" and "PgDn" on the terminal-layouts have been relabeled to "Page ↑" and "Page ↓"
    * The Spanish and French terminal-layouts now have translated key-names
    * The Spanish terminal-layout has been updated with the additional keys that are already available on the US-terminal-layout.
    * The wide and base shapes of the German layout had a different key-arrangement and the wide shape did not have a button to access additional characters; this has been fixed.
 * Development:
    * Squeekboard's versioning now follows Phosh's versioning (for example: Squeekboard 1.38 was released in time for Phosh 0.38)
    * The build-system has been simplified
    * A single Cargo.toml file is used, instead of assembling it from multiple parts
    * Newer dependencies are now used for building Squeekboard by default
    * Squeekboard's main development-platform is now Debian Testing
    * The layout-files have been cleaned up, so that those are easier to understand and edit
 squeekboard 1.24.0
 ------------------
 Released March 2024
 * Changes:
    * The emoji-layout has been replaced with a new one, which offers many more emojis to choose from.
 squeekboard 1.23.0
 ------------------
 Released March 2024
 * New or updated translations:
    * Belarusian
    * Haitian Creole
 * New layouts:
    * French Canadian (QWERTY + accented letters)
    * German terminal-layout
    * Spanish terminal-layout
 * Changes:
    * Fixed Persian and Swiss layouts
    * Fixed various small style-issues in many layouts
    * Improved the US-terminal-layout
 squeekboard 1.22.0 "Superposition"
 ------------------
 Released April 2023
 * New or updated translations:
    * Basque
 * Changes:
    * fixed panel sizing when scaling
    * fixed panel sizing when rotating
    * fixed Dvorak terminal layout
 squeekboard 1.21.0 "Expected value"
 ------------------
 Released February 2023
 * New or updated translations:
    * Hindi
    * Czech
    * German
 * New layouts:
    * wide Swedish
    * Hungarian
 * Changes:
    * use a custom font for gr+polytonic, where the default is unreadable
    * require newer Rust
    * fixed panel sizing when rotating
    * internal improvements.
 squeekboard 1.20.0 "PID controller"
 ------------------
 Released September 2023
 * New translations:
    * Greek
    * Croatian
 * New layouts:
    * US Dvorak terminal
 * Improvements:
    * forcing the panel to hide now takes effect immediately
    * Squeekboard icon will present itself when other applications need to show it
--- a/NEWS.md
+++ b/NEWS.md
@ -1,83 +0,0 @@
 1.38.0
 ------------------
 Changes:
 - 25 wide shapes have been added, so that every available layout now has a wide shape
 - "PgUp" and "PgDn" on the terminal-layouts have been relabeled to "Page ↑" and "Page ↓"
 - The Spanish and French terminal-layouts now have translated key-names
 - The Spanish terminal-layout has been updated with the additional keys that are already available on the US-terminal-layout.
 - The wide and base shapes of the German layout had a different key-arrangement and the wide shape did not have a button to access additional characters; this has been fixed.
 Development:
 - Squeekboard's versioning now follows Phosh's versioning (for example: Squeekboard 1.38 was released in time for Phosh 0.38)
 - The build-system has been simplified
  - A single Cargo.toml file is used, instead of assembling it from multiple parts
  - Newer dependencies are now used for building Squeekboard by default
 - Squeekboard's main development-platform is now Debian Testing
 - The layout-files have been cleaned up, so that those are easier to understand and edit
 1.24.0
 ------------------
 Changes:
 - The emoji-layout has been replaced with a new one, which offers many more emojis to choose from.
 1.23.0
 ------------------
 New or updated translations:
 - Belarusian
 - Haitian Creole
 New layouts:
 - French Canadian (QWERTY + accented letters)
 - German terminal-layout
 - Spanish terminal-layout
 Changes:
 - Fixed Persian and Swiss layouts
 - Fixed various small style-issues in many layouts
 - Improved the US-terminal-layout
 1.22.0 "Superposition"
 ------------------
 New or updated translations:
 - Basque
 Changes:
 - fixed panel sizing when scaling
 - fixed panel sizing when rotating
 - fixed Dvorak terminal layout
 1.21.0 "Expected value"
 ------------------
 New or updated translations:
 - Hindi
 - Czech
 - German
 New layouts:
 - wide Swedish
 - Hungarian
 Changes:
 - use a custom font for gr+polytonic, where the default is unreadable
 - require newer Rust
 - fixed panel sizing when rotating
 - internal improvements.
 1.20.0 "PID controller"
 ------------------
 New translations:
 - Greek
 - Croatian
 New layouts:
 - US Dvorak terminal
 Improvements:
 - forcing the panel to hide now takes effect immediately
 - Squeekboard icon will present itself when other applications need to show it
--- a/README.md
+++ b/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 input-method 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
@ -29,6 +30,12 @@ Creating layouts
 If you want to work on layouts, check out the [guide](doc/tutorial.md).
 Nightly builds
 --------------
 For testing the latest commits of the `main`-branch, one can install the nightly builds of Squeekboard.
 For more information about the nightly builds, read the ["Phosh Nightly Package Builds"-blog-post](https://phosh.mobi/posts/phosh-nightly/).
 Building
 --------
@ -38,11 +45,11 @@ 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
-$ meson _build/
+$ meson setup _build/
 $ cd _build
 $ ninja
 ```
@ -52,26 +59,33 @@ 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
 ```
 If no compatible Wayland compositor is running yet, you can use Phoc (after installing it):
 ```sh
 $ phoc --exec 'src/squeekboard'
 ```
 Squeekboard's panel will appear whenever a compatible application requests an input method. Click a text field in any GTK application, like `python3 ./tools/entry.py`.
 Squeekboard honors the gnome "screen-keyboard-enabled" setting. Either enable this through gnome-settings under accessibility or run:
-```bash
+```sh
 $ gsettings set org.gnome.desktop.a11y.applications screen-keyboard-enabled true
 ```
 Alternatively, force panel visibility manually with:
-```bash
+```sh
-busctl call --user sm.puri.OSK0 /sm/puri/OSK0 sm.puri.OSK0 SetVisible b true
+$ busctl call --user sm.puri.OSK0 /sm/puri/OSK0 sm.puri.OSK0 SetVisible b true
 ```
 or by using the environment-variable `SQUEEKBOARD_DEBUG=force_show`.
 ### What the compositor has to support
 A compatible compositor has to support the protocols:
@ -83,6 +97,25 @@ It's strongly recommended to support:
 - input-method-v2
 Settings
 --------
 You can change the height of the panel for the keyboard with:
 ```sh
 $ gsettings set sm.puri.Squeekboard scale-in-horizontal-screen-orientation 1.0
 $ gsettings set sm.puri.Squeekboard scale-in-vertical-screen-orientation 1.0
 ```
 Note: If the keyboard is open when the settings for the panel-height are changed, the height of the keyboard will not change until it is opened again, or the layout is changed.
 While using Phosh, you can long-click/long-tap the home-bar at the bottom, to open and close the keyboard.
 To reset the settings to the default, you can use:
 ```sh
 $ gsettings reset-recursively sm.puri.Squeekboard
 ```
 Developing
 ----------
--- a/cargo.sh
+++ b/cargo.sh
@ -12,6 +12,9 @@ SOURCE_DIR="$(dirname "$SCRIPT_PATH")"
 CARGO_TARGET_DIR="$(pwd)"
 export CARGO_TARGET_DIR
 GSETTINGS_SCHEMA_DIR="${CARGO_TARGET_DIR}/data:${GSETTINGS_SCHEMA_DIR}"
 export GSETTINGS_SCHEMA_DIR
 cd "$SOURCE_DIR"
 # the 'run" command takes arguments at the end,
--- a/data/common.css
+++ b/data/common.css
@ -11,6 +11,22 @@ sq_view.gr_polytonic {
    font-size: 2em;
 }
 sq_view.in_mal {
    font-size: 1em;
 }
 sq_view.wide.in_mal {
    font-size: 1.25em;
 }
 sq_view.ir_azb {
    font-size: 1.368em;
 }
 sq_view.wide.jp {
    font-size: 1.15em;
 }
 sq_button {
    border-radius: 4px;
    margin: 2px;
@ -36,4 +52,4 @@ sq_button.small {
 sq_view.pin sq_button {
    border-radius: 0px;
    margin: 1px 1px 1px 1px;
-}
+}
--- a/data/dbus/sm.puri.OSK0.xml
+++ b/data/dbus/sm.puri.OSK0.xml
@ -1,20 +1,31 @@
 <!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
 "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
 <node xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd">
  <!--
      sm.puri.OSK0:
      This interface is exported by on screen keyboards (OSK) to
      indicate and set state like visibility.
  -->
  <interface name="sm.puri.OSK0">
    <!--
        SetVisible:
        @visible: %TRUE if the OSK should be shown to the user, %FALSE otherwise
        Toggle keyboard visibility.
    -->
    <method name="SetVisible">
-      <arg name="visible" type="b" direction="in"/>
+      <arg type="b" direction="in" name="visible"/>
      <doc:doc><doc:description>
        Switch keyboard visibility
      </doc:description></doc:doc>
    </method>
-    <method name="GetVisible">
+    <!--
-      <arg name="visible" type="b" direction="out"/>
+        Visible:
-      <doc:doc><doc:description>
+
-        Get keyboard visibility
+        Indicates whether the on screen keyboard is currently
-      </doc:description></doc:doc>
+        unfolded. %TRUE if the OSK is currently visible to the user,
-    </method>
+        %FALSE otherwise.
-    <property name="Visible" type="b" access="read">
+    -->
-    </property>
+    <property name="Visible" type="b" access="read"/>
  </interface>
 </node>
--- a/data/icons/zwj.svg
+++ b/data/icons/zwj.svg
@ -0,0 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="200" height="200" version="1.1" xmlns="http://www.w3.org/2000/svg">
 <g fill="none" stroke="#000">
  <path d="m135.66 182.97a51.681 32.879 0 0 1-71.332 9.8e-4" stroke-width="12.123"/>
  <path d="m135.66 17.029a51.681 32.879 0 0 0-71.332-0.0011" stroke-width="12.123"/>
  <path d="m100 7.7071v184.59" stroke-width="10"/>
 </g>
 </svg>
--- a/data/icons/zwsp.svg
+++ b/data/icons/zwsp.svg
@ -0,0 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="200" height="200" version="1.1" xmlns="http://www.w3.org/2000/svg">
 <g fill="none" stroke="#000">
  <circle cx="100" cy="20.429" r="14.118" stroke-width="9.05"/>
  <circle cx="100" cy="179.57" r="14.118" stroke-width="9.05"/>
  <path d="m100 34.739v130.52" stroke-width="8.5856"/>
 </g>
 </svg>
--- a/data/keyboards/am+phonetic.yaml
+++ b/data/keyboards/am+phonetic.yaml
@ -1,37 +1,43 @@
-# Armenian layout created by Norayr Chilingarian
+# Language: Armenian (phonetic)
 # Armenian layout based on work by Norayr Chilingarian
 # Yerevan
 # Oct 2021
 ---
 outlines:
-    default:   { width: 35.33, height: 52 }
+    default:       { width: 34.3,   height: 52 }
-    altline:   { width: 52.67, height: 52 }
+    altline:       { width: 52,     height: 52 }
-    wide:      { width: 32,    height: 32 }
+    wide:          { width: 104,    height: 52 }
-    spaceline: { width: 142,   height: 52 }
+    change-view:   { width: 52,     height: 52 }
-    special:   { width: 44,    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 +46,7 @@ buttons:
            locking:
                lock_view: "upper"
                unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
        icon: "key-shift"
    BackSpace:
        outline: "altline"
@ -53,25 +59,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 +85,6 @@ buttons:
        outline: "wide"
        icon: "key-enter"
        keysym: "Return"
    --:
        outline: "placeholder"
        text: ""
--- a/data/keyboards/am+phonetic_wide.yaml
+++ b/data/keyboards/am+phonetic_wide.yaml
@ -1,37 +1,43 @@
-# Armenian layout created by Norayr Chilingarian
+# Language: Armenian (phonetic)
 # Armenian layout based on work by Norayr Chilingarian
 # Yerevan
 # Oct 2021
 ---
 outlines:
-    default:   { width: 50,     height: 42 }
+    default:       { width: 51.7,   height: 42 }
-    altline:   { width: 74.54,  height: 42 }
+    altline:       { width: 77.5,   height: 42 }
-    wide:      { width: 45.29,  height: 32 }
+    wide:          { width: 103.35, height: 42 }
-    spaceline: { width: 200.96, height: 42 }
+    change-view:   { width: 77.5,   height: 42 }
-    special:   { width: 62.27,  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 +46,7 @@ buttons:
            locking:
                lock_view: "upper"
                unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
        icon: "key-shift"
    BackSpace:
        outline: "altline"
@ -53,25 +59,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 +85,6 @@ buttons:
        outline: "wide"
        icon: "key-enter"
        keysym: "Return"
    --:
        outline: "placeholder"
        text: ""
--- a/data/keyboards/am.yaml
+++ b/data/keyboards/am.yaml
@ -1,37 +1,43 @@
-# Armenian layout created by Norayr Chilingarian
+# Language: Armenian
 # Armenian layout based on work by Norayr Chilingarian
 # Yerevan
 # Oct 2021
 ---
 outlines:
-    default:   { width: 35.33, height: 52 }
+    default:       { width: 34.3,   height: 52 }
-    altline:   { width: 52.67, height: 52 }
+    altline:       { width: 52,     height: 52 }
-    wide:      { width: 32,    height: 32 }
+    wide:          { width: 104,    height: 52 }
-    spaceline: { width: 142,   height: 52 }
+    change-view:   { width: 52,     height: 52 }
-    special:   { width: 44,    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 +46,7 @@ buttons:
            locking:
                lock_view: "upper"
                unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
        icon: "key-shift"
    BackSpace:
        outline: "altline"
@ -53,25 +59,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 +85,6 @@ buttons:
        outline: "wide"
        icon: "key-enter"
        keysym: "Return"
    --:
        outline: "placeholder"
        text: ""
--- a/data/keyboards/am_wide.yaml
+++ b/data/keyboards/am_wide.yaml
@ -1,37 +1,43 @@
-# Armenian layout created by Norayr Chilingarian
+# Language: Armenian
 # Armenian layout based on work by Norayr Chilingarian
 # Yerevan
 # Oct 2021
 ---
 outlines:
-    default:   { width: 50,     height: 42 }
+    default:       { width: 51.7,   height: 42 }
-    altline:   { width: 74.54,  height: 42 }
+    altline:       { width: 77.5,   height: 42 }
-    wide:      { width: 45.29,  height: 32 }
+    wide:          { width: 103.35, height: 42 }
-    spaceline: { width: 200.96, height: 42 }
+    change-view:   { width: 77.5,   height: 42 }
-    special:   { width: 62.27,  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 +46,7 @@ buttons:
            locking:
                lock_view: "upper"
                unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
        icon: "key-shift"
    BackSpace:
        outline: "altline"
@ -53,25 +59,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 +85,6 @@ buttons:
        outline: "wide"
        icon: "key-enter"
        keysym: "Return"
    --:
        outline: "placeholder"
        text: ""
--- a/data/keyboards/ara.yaml
+++ b/data/keyboards/ara.yaml
@ -1,11 +1,15 @@
 # Language: Arabic
 # Maintained by: Khaled Eldoheiri <khalid@kdehairy.com>
 ---
 outlines:
-    default:   { width: 32.66,  height: 52 }
+    default:       { width: 32.95,  height: 52 }
-    altline:   { width: 48.99,  height: 52 }
+    altline:       { width: 48.99,  height: 52 }
-    wide:      { width: 62,     height: 52 }
+    wide:          { width: 62,     height: 52 }
-    spaceline: { width: 195.96, height: 52 }
+    change-view:   { width: 48.99,  height: 52 }
-    special:   { width: 35.66,  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 +30,7 @@ views:
    symbols:
        - "~ ` | · √ π τ ÷ × ¶"
        - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers   \\ / < > = [ ]  BackSpace"
+        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
        - "show_letters preferences         space        . Return"
 buttons:
@ -35,7 +39,7 @@ buttons:
            locking:
                lock_view: "extra"
                unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
        icon: "key-shift"
    BackSpace:
        outline: "altline"
@ -48,23 +52,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"
--- a/data/keyboards/ara_wide.yaml
+++ b/data/keyboards/ara_wide.yaml
@ -1,11 +1,15 @@
 # Language: Arabic
 # Maintained by: Khaled Eldoheiri <khalid@kdehairy.com>
 ---
 outlines:
-    default:   { width: 49,   height: 42 }
+    default:       { width: 49,   height: 42 }
-    altline:   { width: 73.5, height: 42 }
+    altline:       { width: 73.5, height: 42 }
-    wide:      { width: 108,  height: 42 }
+    wide:          { width: 108,  height: 42 }
-    spaceline: { width: 324,  height: 42 }
+    change-view:   { width: 73.5, height: 42 }
-    special:   { width: 49,   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 +39,7 @@ buttons:
            locking:
                lock_view: "extra"
                unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
        icon: "key-shift"
    BackSpace:
        outline: "altline"
@ -48,23 +52,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: ">"
--- a/data/keyboards/be.yaml
+++ b/data/keyboards/be.yaml
@ -1,10 +1,13 @@
 # Language: Belgian
 ---
 outlines:
-    default:   { width: 35.33, height: 52 }
+    default:       { width: 35.33,  height: 52 }
-    altline:   { width: 52.67, height: 52 }
+    altline:       { width: 53,     height: 52 }
-    wide:      { width: 59,    height: 52 }
+    wide:          { width: 59,     height: 52 }
-    spaceline: { width: 140,   height: 52 }
+    change-view:   { width: 53,     height: 52 }
-    special:   { width: 44,    height: 52 }
+    change-view-2: { width: 59,     height: 52 }
    spaceline:     { width: 139.75,  height: 52 }
    special:       { width: 44,     height: 52 }
 views:
    base:
@ -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"
        label: "âÂ"
    space:
        outline: "spaceline"
--- a/data/keyboards/be_wide.yaml
+++ b/data/keyboards/be_wide.yaml
@ -1,10 +1,13 @@
 # Language: Belgian
 ---
 outlines:
-    default:   { width: 54,  height: 42 }
+    default:       { width: 54,  height: 42 }
-    altline:   { width: 81,  height: 42 }
+    altline:       { width: 81,  height: 42 }
-    wide:      { width: 100, height: 42 }
+    wide:          { width: 100, height: 42 }
-    spaceline: { width: 205, height: 42 }
+    change-view:   { width: 81,  height: 42 }
-    special:   { width: 54,  height: 42 }
+    change-view-2: { width: 100, height: 42 }
    spaceline:     { width: 205, height: 42 }
    special:       { width: 54,  height: 42 }
 views:
    base:
@ -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"
        label: "âÂ"
    space:
        outline: "spaceline"
--- a/data/keyboards/bg+phonetic.yaml
+++ b/data/keyboards/bg+phonetic.yaml
@ -1,10 +1,15 @@
 # Language: Bulgarian (phonetic)
 ---
 outlines:
-    default:   { width: 32.72, height: 52 }
+    default:       { width: 32.72,  height: 52 }
-    altline:   { width: 47,    height: 52 }
+    altline:       { width: 50.12,  height: 52 }
-    wide:      { width: 49.09, height: 52 }
+    wide:          { width: 58.99,  height: 52 }
-    spaceline: { width: 185,   height: 52 }
+    change-view:   { width: 50.12,  height: 52 }
-    special:   { width: 44,    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 +25,13 @@ views:
    numbers:
        - "1 2 3 4 5 6 7 8 9 0"
        - "@ # € % & - _ + ( )"
-        - "show_symbols   , \" ' : ; ! ?  BackSpace"
+        - "show_symbols -- , \" ' : ; ! ?  BackSpace"
-        - "show_letters preferences         space        Return"
+        - "show_letters preferences         space    .    Return"
    symbols:
        - "~ ` | · √ π τ ÷ × ¶"
        - "© ® £ $ ¥ ^ ° * { }"
-        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
+        - "show_numbers_from_symbols -- \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        Return"
+        - "show_letters preferences         space    ,    Return"
 buttons:
@ -35,12 +40,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 +53,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 +77,14 @@ buttons:
        outline: "wide"
        icon: "key-enter"
        keysym: "Return"
    --:
        outline: "placeholder"
        text: ""
    5:
        outline: "fill"
    "&":
        outline: "fill"
    √:
        outline: "fill"
    ¥:
        outline: "fill"
--- a/data/keyboards/bg+phonetic_wide.yaml
+++ b/data/keyboards/bg+phonetic_wide.yaml
@ -1,10 +1,14 @@
 # Language: Bulgarian (phonetic)
 ---
 outlines:
-    default:   { width: 48,     height: 42 }
+    default:       { width: 48.75, height: 42 }
-    altline:   { width: 68.95,  height: 42 }
+    altline:       { width: 73.5,  height: 42 }
-    wide:      { width: 72.01,  height: 42 }
+    wide:          { width: 73.5,  height: 42 }
-    spaceline: { width: 271.39, height: 42 }
+    change-view:   { width: 73.5,  height: 42 }
-    special:   { width: 64.55,  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 +29,7 @@ views:
    symbols:
        - "~ ` | · √ π τ ÷ × ¶"
        - "© ® £ $ ¥ ^ ° * { }"
-        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
+        - "show_numbers   \\ / < > = [ ]  BackSpace"
        - "show_letters preferences         space        Return"
@ -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,17 @@ buttons:
    show_numbers:
        action:
            set_view: "numbers"
-        outline: "wide"
+        outline: "change-view"
        label: "123"
    show_numbers_from_symbols:
        action:
            set_view: "numbers"
        outline: "altline"
        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 +71,14 @@ buttons:
        outline: "wide"
        icon: "key-enter"
        keysym: "Return"
    --:
        outline: "placeholder"
        text: ""
    5:
        outline: "fill"
    "&":
        outline: "fill"
    √:
        outline: "fill"
    ¥:
        outline: "fill"
--- a/data/keyboards/bg.yaml
+++ b/data/keyboards/bg.yaml
@ -1,10 +1,15 @@
 # Language: Bulgarian
 ---
 outlines:
-    default:   { width: 32.72, height: 52 }
+    default:       { width: 32.72,  height: 52 }
-    altline:   { width: 47,    height: 52 }
+    altline:       { width: 50.12,  height: 52 }
-    wide:      { width: 49.09, height: 52 }
+    wide:          { width: 58.99,  height: 52 }
-    spaceline: { width: 185,   height: 52 }
+    change-view:   { width: 50.12,  height: 52 }
-    special:   { width: 44,    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 +26,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_numbers_from_symbols -- \\ / < > = [ ] BackSpace"
-        - "show_letters preferences         space        Return"
+        - "show_letters preferences         space    ,    Return"
 buttons:
@ -35,12 +40,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 +53,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 +77,14 @@ buttons:
        outline: "wide"
        icon: "key-enter"
        keysym: "Return"
    --:
        outline: "placeholder"
        text: ""
    5:
        outline: "fill"
    "&":
        outline: "fill"
    √:
        outline: "fill"
    ¥:
        outline: "fill"
--- a/data/keyboards/bg_wide.yaml
+++ b/data/keyboards/bg_wide.yaml
@ -1,10 +1,14 @@
 # Language: Bulgarian
 ---
 outlines:
-    default:   { width: 48,     height: 42 }
+    default:       { width: 48.75, height: 42 }
-    altline:   { width: 68.95,  height: 42 }
+    altline:       { width: 73.5,  height: 42 }
-    wide:      { width: 72.01,  height: 42 }
+    wide:          { width: 73.5,  height: 42 }
-    spaceline: { width: 271.39, height: 42 }
+    change-view:   { width: 73.5,  height: 42 }
-    special:   { width: 64.55,  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 +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_numbers -- \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        Return"
+        - "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,17 @@ buttons:
    show_numbers:
        action:
            set_view: "numbers"
-        outline: "wide"
+        outline: "change-view"
        label: "123"
    show_numbers_from_symbols:
        action:
            set_view: "numbers"
        outline: "altline"
        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 +71,14 @@ buttons:
        outline: "wide"
        icon: "key-enter"
        keysym: "Return"
    --:
        outline: "placeholder"
        text: ""
    5:
        outline: "fill"
    "&":
        outline: "fill"
    √:
        outline: "fill"
    ¥:
        outline: "fill"
--- a/data/keyboards/br.yaml
+++ b/data/keyboards/br.yaml
@ -1,32 +1,40 @@
 # Language: Portuguese (Brazil)
 ---
 outlines:
-    default:   { width: 35.33, height: 52 }
+    default:       { width: 35.67, height: 52 }
-    altline:   { width: 52.67, height: 52 }
+    altline:       { width: 53,    height: 52 }
-    wide:      { width: 62,    height: 52 }
+    wide:          { width: 53,    height: 52 }
-    spaceline: { width: 142,   height: 52 }
+    change-view:   { width: 53,    height: 52 }
-    special:   { width: 44,    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_symbols   , \" ' : ; ! ?  BackSpace"
-        - "show_letters        õ Õ ú Ú ü Ü . BackSpace"
+        - "show_letters show_eschars preferences space º . Return"
    symbols:
-        - "@ # $ % - + ÷ × = ≠"
+        - "~ ` | · √ π τ ÷ × ¶"
-        - "( ) § & < > / * { }"
+        - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers_from_symbols     º \" ' : ; ! ?  BackSpace"
+        - "show_numbers   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        . Return"
+        - "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"
+        outline: "change-view"
-        label: "1ã"
+        label: "123"
    show_numbers_from_symbols:
        action:
            set_view: "numbers"
        outline: "altline"
        label: "1ã"
    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:
-        outline: "special"
+        action:
            locking:
                lock_view: "eschars"
                unlock_view: "base"
        outline: "change-view"
        label: "Ãã"
    .-large:
        outline: "large"
        text: "."
    ",-large":
        outline: "large"
        text: ","
    space:
        outline: "spaceline"
        text: " "
--- a/data/keyboards/br_wide.yaml
+++ b/data/keyboards/br_wide.yaml
@ -1,32 +1,41 @@
 # Language: Portuguese (Brazil)
 ---
 outlines:
-    default:   { width: 52,    height: 42 }
+    default:     { width: 53.75, height: 42 }
-    altline:   { width: 77.52, height: 42 }
+    thin:        { width: 40.5,  height: 42 }
-    wide:      { width: 91.25, height: 42 }
+    altline:     { width: 81,    height: 42 }
-    spaceline: { width: 209,   height: 42 }
+    wide:        { width: 92,    height: 42 }
-    special:   { width: 64.76, 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_symbols   , \" ' : ; ! ?  BackSpace"
-        - "show_letters        õ Õ ú Ú ü Ü . BackSpace"
+        - "show_letters show_eschars preferences space º .-thin Return"
    symbols:
-        - "@ # $ % - + ÷ × = ≠"
+        - "~ ` | · √ π τ ÷ × ¶"
-        - "( ) § & < > / * { }"
+        - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers_from_symbols     º \" ' : ; ! ?  BackSpace"
+        - "show_numbers   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        . Return"
+        - "show_letters show_eschars preferences         space       ≠ § Return"
    eschars:
        - "À Á Ã Â É Ê Í Ó Ô Õ"
        - "à á ã â é ê í ó ô õ "
        - "show_numbers Ú Ü ú ü ! ? . BackSpace"
        - "show_letters show_eschars preferences         space    « »    Return"
 buttons:
    Shift_L:
@ -34,38 +43,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"
+        outline: "change-view"
-        label: "1ã"
+        label: "123"
    show_numbers_from_symbols:
        action:
            set_view: "numbers"
        outline: "altline"
        label: "1ã"
    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:
-        outline: "special"
+        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 +88,16 @@ buttons:
        outline: "wide"
        icon: "key-enter"
        keysym: "Return"
    «:
        outline: "thin"
    »:
        outline: "thin"
    º:
        outline: "thin"
    .-thin:
        outline: "thin"
        text: "."
    ≠:
        outline: "thin"
    §:
        outline: "thin"
--- a/data/keyboards/by.yaml
+++ b/data/keyboards/by.yaml
@ -0,0 +1,91 @@
 # Language: Belarusian
 ---
 outlines:
    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 }
 views:
    base:
        - "й ц у к е н г ш ў з х"
        - "ф ы в а п р о л д ж э"
        - "Shift_L  я ч с м і т ь б ю  BackSpace"
        - "show_numbers preferences    ё  space  ,  . Return"
    upper:
        - "Й Ц У К Е Н Г Ш Ў З Х"
        - "Ф Ы В А П Р О Л Д Ж Э"
        - "Shift_L   Я Ч С М І Т Ь Б Ю  BackSpace"
        - "show_numbers preferences    Ё  space   , . Return"
    numbers:
        - "1 2 3 4 5 6 7 8 9 0"
        - "@ # $ % & - _ + ( )"
        - "show_symbols , \" ' : ; ! ? BackSpace-wide"
        - "show_letters preferences         space-fill   . Return"
    symbols:
        - "~ ` | · √ π τ ÷ × ¶"
        - "© ® £ € ¥ ^ ° * { }"
        - "show_numbers \\ / < > = [ ] BackSpace-wide"
        - "show_letters preferences         space-fill   . 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"
    BackSpace-wide:
        outline: "wide"
        icon: "edit-clear-symbolic"
        action: "erase"
    preferences:
        action: "show_prefs"
        outline: "special"
        icon: "keyboard-mode-symbolic"
    show_numbers:
        action:
            set_view: "numbers"
        outline: "change-view-2"
        label: "123"
    show_letters:
        action:
            set_view: "base"
        outline: "change-view-2"
        label: "АБВ"
    show_symbols:
        action:
            set_view: "symbols"
        outline: "change-view-2"
        label: "*/="
    .:
        outline: "large"
    space:
        outline: "spaceline"
        text: " "
    space-fill:
        outline: "fill"
        text: " "
    Return:
        outline: "wide"
        icon: "key-enter"
        keysym: "Return"
    5:
        outline: "fill-2"
    "&":
        outline: "fill-2"
    √:
        outline: "fill-2"
    ¥:
        outline: "fill-2"
--- a/data/keyboards/by_wide.yaml
+++ b/data/keyboards/by_wide.yaml
@ -0,0 +1,88 @@
 # Language: Belarusian
 ---
 outlines:
    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 }
 views:
    base:
        - "й ц у к е н г ш ў з х"
        - "ф ы в а п р о л д ж э"
        - "Shift_L  я ч с м і т ь б ю  BackSpace"
        - "show_numbers preferences    ё  space  ,  . Return"
    upper:
        - "Й Ц У К Е Н Г Ш Ў З Х"
        - "Ф Ы В А П Р О Л Д Ж Э"
        - "Shift_L   Я Ч С М І Т Ь Б Ю  BackSpace"
        - "show_numbers preferences    Ё  space  ,  . Return"
    numbers:
        - "1 2 3 4 5 6 7 8 9 0"
        - "@ # $ % & - _ + ( )"
        - "show_symbols , \" ' : ; ! ? BackSpace-wide"
        - "show_letters preferences         space-fill   . Return"
    symbols:
        - "~ ` | · √ π τ ÷ × ¶"
        - "© ® £ € ¥ ^ ° * { }"
        - "show_numbers \\ / < > = [ ] BackSpace-wide"
        - "show_letters preferences         space-fill   . 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"
    BackSpace-wide:
        outline: "wide"
        icon: "edit-clear-symbolic"
        action: "erase"
    preferences:
        action: "show_prefs"
        outline: "special"
        icon: "keyboard-mode-symbolic"
    show_numbers:
        action:
            set_view: "numbers"
        outline: "change-view-2"
        label: "123"
    show_letters:
        action:
            set_view: "base"
        outline: "change-view-2"
        label: "АБВ"
    show_symbols:
        action:
            set_view: "symbols"
        outline: "change-view-2"
        label: "*/="
    space:
        outline: "spaceline"
        text: " "
    space-fill:
        outline: "fill"
        text: " "
    Return:
        outline: "wide"
        icon: "key-enter"
        keysym: "Return"
    5:
        outline: "fill-2"
    "&":
        outline: "fill-2"
    √:
        outline: "fill-2"
    ¥:
        outline: "fill-2"
--- a/data/keyboards/ca.yaml
+++ b/data/keyboards/ca.yaml
@ -1,10 +1,14 @@
 # Language: French (Canada)
 ---
 outlines:
-    default:   { width: 35.33, height: 52 }
+    default:       { width: 35.5,  height: 52 }
-    altline:   { width: 52.67, height: 52 }
+    altline:       { width: 53.5,  height: 52 }
-    wide:      { width: 62,    height: 52 }
+    wide:          { width: 62,    height: 52 }
-    spaceline: { width: 142,   height: 52 }
+    change-view:   { width: 53.5,  height: 52 }
-    special:   { width: 44,    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 +34,7 @@ views:
    eschars:
        - "à â ç é è ê ë î ï ô"
        - "ù û À Â Ç É È Ê Î Ô"
-        - "show_numbers_from_symbols  ' ! ? . ,   BackSpace"
+        - "show_numbers_from_symbols -- ' ! ? . , -- BackSpace"
        - "show_letters preferences         space        show_eschars Return"
 buttons:
@ -39,42 +43,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 +87,6 @@ buttons:
        outline: "wide"
        icon: "key-enter"
        keysym: "Return"
-
+    --:
-
+        outline: "placeholder"
-
+        text: ""
--- a/data/keyboards/ca_wide.yaml
+++ b/data/keyboards/ca_wide.yaml
@ -1,10 +1,14 @@
 # Language: French (Canada)
 ---
 outlines:
-    default:   { width: 52,    height: 42 }
+    default:       { width: 53.7,  height: 42 }
-    altline:   { width: 77.52, height: 42 }
+    altline:       { width: 80.5,  height: 42 }
-    wide:      { width: 91.25, height: 42 }
+    wide:          { width: 92,    height: 42 }
-    spaceline: { width: 209,   height: 42 }
+    change-view:   { width: 80.5,  height: 42 }
-    special:   { width: 64.76, 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 +34,7 @@ views:
    eschars:
        - "à â ç é è ê ë î ï ô"
        - "ù û À Â Ç É È Ê Î Ô"
-        - "show_numbers_from_symbols  ' ! ? . ,   BackSpace"
+        - "show_numbers_from_symbols -- ' ! ? . , -- BackSpace"
        - "show_letters preferences         space        show_eschars Return"
 buttons:
@ -39,42 +43,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 +87,6 @@ buttons:
        outline: "wide"
        icon: "key-enter"
        keysym: "Return"
-
+    --:
-
+        outline: "placeholder"
-
+        text: ""
--- a/data/keyboards/ch+de.yaml
+++ b/data/keyboards/ch+de.yaml
@ -1,12 +1,15 @@
 # Language: German (Switzerland) (ch+de)
 # Maintained by Patrick Jörg <patrickjoerg@gmx.ch>. No Copyright, enjoy!
 ---
 outlines:
-    default:   { width: 35.33, height: 52 }
+    default:       { width: 35.33, height: 52 }
-    altline:   { width: 48,    height: 52 }
+    altline:       { width: 48,    height: 52 }
-    wide:      { width: 59,    height: 52 }
+    wide:          { width: 59,    height: 52 }
-    spaceline: { width: 70,    height: 52 }
+    change-view:   { width: 48,    height: 52 }
-    special:   { width: 28,    height: 52 }
+    change-view-2: { width: 59,    height: 52 }
    spaceline:     { width: 70,    height: 52 }
    special:       { width: 28,    height: 52 }
 views:
    base:
@ -36,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"
@ -49,21 +52,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"
--- a/data/keyboards/ch+de_wide.yaml
+++ b/data/keyboards/ch+de_wide.yaml
@ -1,12 +1,15 @@
 # Language: German (Switzerland) (ch+de)
 # Maintained by Patrick Jörg <patrickjoerg@gmx.ch>. No Copyright, enjoy!
 ---
 outlines:
-    default:   { width: 52,     height: 42 }
+    default:       { width: 52,     height: 42 }
-    altline:   { width: 70.65,  height: 42 }
+    altline:       { width: 70.65,  height: 42 }
-    wide:      { width: 86.84,  height: 42 }
+    wide:          { width: 86.84,  height: 42 }
-    spaceline: { width: 103.03, height: 42 }
+    change-view:   { width: 70.65,  height: 42 }
-    special:   { width: 41.21,  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 +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"
@ -49,21 +52,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"
--- a/data/keyboards/ch+fr.yaml
+++ b/data/keyboards/ch+fr.yaml
@ -1,11 +1,14 @@
 # Language: French (Switzerland)
 # Maintained by: Jordi Bossy <jordi@bossy.space>. No Copyright, enjoy!
 ---
 outlines:
-    default:   { width: 35.33, height: 52 }
+    default:       { width: 35.67, height: 52 }
-    altline:   { width: 48,    height: 52 }
+    altline:       { width: 53.5,  height: 52 }
-    wide:      { width: 59,    height: 52 }
+    wide:          { width: 59,    height: 52 }
-    spaceline: { width: 70,    height: 52 }
+    change-view:   { width: 53.5,  height: 52 }
-    special:   { width: 28,    height: 52 }
+    change-view-2: { width: 59,    height: 52 }
    spaceline:     { width: 57,    height: 52 }
    special:       { width: 28,    height: 52 }
 views:
    base:
@ -32,7 +35,7 @@ views:
        - "à â ç é è ê î ô ù û"
        - "À Â Ç É È Ê Î Ô Ù Û"
        - "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,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"
--- a/data/keyboards/ch+fr_wide.yaml
+++ b/data/keyboards/ch+fr_wide.yaml
@ -1,11 +1,15 @@
 # Language: French (Switzerland)
 # Maintained by: Jordi Bossy <jordi@bossy.space>. No Copyright, enjoy!
 ---
 outlines:
-    default:   { width: 52,     height: 42 }
+    default:       { width: 53.5,  height: 42 }
-    altline:   { width: 70.65,  height: 42 }
+    thin:          { width: 40,    height: 42 }
-    wide:      { width: 86.84,  height: 42 }
+    altline:       { width: 80,    height: 42 }
-    spaceline: { width: 103.03, height: 42 }
+    wide:          { width: 86.84, height: 42 }
-    special:   { width: 41.21,  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 +31,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 +44,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 +57,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"
--- a/data/keyboards/ch.yaml
+++ b/data/keyboards/ch.yaml
@ -1,14 +1,17 @@
 # Language: German (Switzerland)
 # Maintained by: Jordy Bossy <jordi@bossy.space>
 # and Patrick Jörg <patrickjoerg@gmx.ch>. No Copyright, enjoy!
 ---
 outlines:
-    default:     { width: 35.33,  height: 58 }
+    default:       { width: 35.33,  height: 58 }
-    doublewidth: { width: 70.66,  height: 58 }
+    doublewidth:   { width: 70.66,  height: 58 }
-    altline:     { width: 52.8,   height: 58 }
+    altline:       { width: 52.8,   height: 58 }
-    wide:        { width: 64.9,   height: 58 }
+    wide:          { width: 64.9,   height: 58 }
-    spaceline:   { width: 116.67, height: 58 }
+    change-view:   { width: 52.8,   height: 58 }
-    special:     { width: 30.41,  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 +46,7 @@ buttons:
            locking:
                lock_view: "upper"
                unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
        icon: "key-shift"
    BackSpace:
        outline: "altline"
@ -56,28 +59,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"
--- a/data/keyboards/ch_wide.yaml
+++ b/data/keyboards/ch_wide.yaml
@ -1,16 +1,19 @@
 # Language: German (Switzerland)
 # Maintained by: Jordy Bossy <jordy@bossy.space>
 # and Patrick Jörg <patrickjoerg@gmx.ch>. No Copyright, enjoy!
 ---
 outlines:
-    default:     { width: 48,  height: 42 }
+    default:       { width: 48,  height: 42 }
-    doublewidth: { width: 96,  height: 42 }
+    doublewidth:   { width: 96,  height: 42 }
-    narrow:      { width: 33,  height: 42 }
+    narrow:        { width: 33,  height: 42 }
-    large:       { width: 66,  height: 42 }
+    large:         { width: 66,  height: 42 }
-    altline:     { width: 72,  height: 42 }
+    altline:       { width: 72,  height: 42 }
-    wide:        { width: 108, height: 42 }
+    wide:          { width: 108, height: 42 }
-    spaceline:   { width: 162, height: 42 }
+    change-view:   { width: 72,  height: 42 }
-    special:     { width: 48,  height: 42 }
+    change-view-2: { width: 108, height: 42 }
    spaceline:     { width: 162, height: 42 }
    special:       { width: 48,  height: 42 }
 views:
    base:
@ -45,7 +48,7 @@ buttons:
            locking:
                lock_view: "upper"
                unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
        icon: "key-shift"
    BackSpace:
        outline: "altline"
@ -58,28 +61,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 +89,7 @@ buttons:
        keysym: "Return"
    °:
        outline: "large"
-    ".":
+    .:
        outline: "narrow"
    ",":
        outline: "narrow"
--- a/data/keyboards/cz+qwerty.yaml
+++ b/data/keyboards/cz+qwerty.yaml
@ -1,42 +1,45 @@
 # Language: Czech (QWERTY)
 ---
 outlines:
-    default:   { width: 35.33, height: 52 }
+    default:       { width: 35.33, height: 52 }
-    altline:   { width: 52.67, height: 52 }
+    altline:       { width: 52.67, height: 52 }
-    wide:      { width: 52.67, height: 52 }
+    wide:          { width: 52.67, height: 52 }
-    spaceline: { width: 106,   height: 52 }
+    change-view:   { width: 52.67, height: 52 }
-    special:   { width: 35.33, 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_numbers    \\ / < > = [ ]    BackSpace"
-        - "show_letters preferences show_accents    space    , . Return"
+        - "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 +47,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"
+        outline: "change-view"
        label: "123"
    show_numbers_from_symbols:
        action:
            set_view: "numbers"
        outline: "altline"
        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"
--- a/data/keyboards/cz+qwerty_wide.yaml
+++ b/data/keyboards/cz+qwerty_wide.yaml
@ -1,42 +1,45 @@
 # Language: Czech (QWERTY)
 ---
 outlines:
-    default:   { width: 54,  height: 42 }
+    default:       { width: 54,  height: 42 }
-    altline:   { width: 81,  height: 42 }
+    altline:       { width: 81,  height: 42 }
-    wide:      { width: 81,  height: 42 }
+    wide:          { width: 81,  height: 42 }
-    spaceline: { width: 162, height: 42 }
+    change-view:   { width: 81,  height: 42 }
-    special:   { width: 54,  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_numbers    \\ / < > = [ ]    BackSpace"
-        - "show_letters preferences show_accents    space    , . Return"
+        - "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 +47,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"
+        outline: "change-view"
        label: "123"
    show_numbers_from_symbols:
        action:
            set_view: "numbers"
        outline: "altline"
        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"
--- a/data/keyboards/cz.yaml
+++ b/data/keyboards/cz.yaml
@ -1,42 +1,45 @@
 # Language: Czech
 ---
 outlines:
-    default:   { width: 35.33, height: 52 }
+    default:       { width: 35.33, height: 52 }
-    altline:   { width: 52.67, height: 52 }
+    altline:       { width: 52.67, height: 52 }
-    wide:      { width: 52.67, height: 52 }
+    wide:          { width: 52.67, height: 52 }
-    spaceline: { width: 106,   height: 52 }
+    change-view:   { width: 52.67, height: 52 }
-    special:   { width: 35.33, 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_numbers    \\ / < > = [ ]    BackSpace"
-        - "show_letters preferences show_accents    space    , . Return"
+        - "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 +47,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"
+        outline: "change-view"
        label: "123"
    show_numbers_from_symbols:
        action:
            set_view: "numbers"
        outline: "altline"
        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"
--- a/data/keyboards/cz_wide.yaml
+++ b/data/keyboards/cz_wide.yaml
@ -1,42 +1,45 @@
 # Language: Czech
 ---
 outlines:
-    default:   { width: 54,  height: 42 }
+    default:       { width: 54,  height: 42 }
-    altline:   { width: 81,  height: 42 }
+    altline:       { width: 81,  height: 42 }
-    wide:      { width: 81,  height: 42 }
+    wide:          { width: 81,  height: 42 }
-    spaceline: { width: 162, height: 42 }
+    change-view:   { width: 81,  height: 42 }
-    special:   { width: 54,  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_numbers    \\ / < > = [ ]    BackSpace"
-        - "show_letters preferences show_accents    space    , . Return"
+        - "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 +47,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"
+        outline: "change-view"
        label: "123"
    show_numbers_from_symbols:
        action:
            set_view: "numbers"
        outline: "altline"
        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"
--- a/data/keyboards/de+bone.yaml
+++ b/data/keyboards/de+bone.yaml
@ -0,0 +1,122 @@
 # Language: German (Bone)
 ---
 outlines:
    default:            { width: 32.12,  height: 52 }
    subtle-highlight:   { width: 32.12,  height: 52 }
    special:            { width: 32.12,  height: 52 }
    altline:            { width: 48.17,  height: 52 }
    change-view:        { width: 48.17,  height: 52 }
    fill:               { width: 64.24,  height: 52 }
    subtle-highlight-2: { width: 64.24,  height: 52 }
    spaceline:          { width: 112.45, height: 52 }
 views:
    base:
        - "j d u a x p h l m w ß"
        - "c t i e o b n r s g q"
        - "Shift_L   f v ü ä ö y z k BackSpace"
        - "show_numbers show_eschars preferences         space        , . Return"
    upper:
        - "J D U A X P H L M W ẞ"
        - "C T I E O B N R S G Q"
        - "Shift_L   F V Ü Ä Ö Y Z K BackSpace"
        - "show_numbers show_eschars preferences         space        ! ? Return"
    numbers:
        - "1 2 3 4 5 6 7 8 9 0"
        - "@ # € % & - _ + ( )"
        - "show_symbols   ; \" ' : = < >  BackSpace"
        - "show_letters show_eschars preferences         space        , . Return"
    symbols:
        - "~ ` ´ | · √ µ ÷ × ¶"
        - "© ® £ $ ¥ ^ ° * { }"
        - "show_numbers   \\ / § π τ [ ]  BackSpace"
        - "show_letters show_eschars preferences         space        , . Return"
    eschars:
        - "ä-subtle-highlight è é ö-subtle-highlight ü-subtle-highlight-2 Ä-subtle-highlight È É Ö-subtle-highlight Ü-subtle-highlight"
        - "à â ê î ô À Â Ê Î Ô"
        - "show_numbers  « » ç Ç æ œ ß-subtle-highlight BackSpace"
        - "show_letters show_eschars preferences         space        „ “ Return"
 buttons:
    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: "Ää"
    space:
        outline: "spaceline"
        text: " "
    Return:
        outline: "altline"
        icon: "key-enter"
        keysym: "Return"
    ä-subtle-highlight:
        outline: "subtle-highlight"
        text: "ä"
    ö-subtle-highlight:
        outline: "subtle-highlight"
        text: "ö"
    ü-subtle-highlight-2:
        outline: "subtle-highlight-2"
        text: "ü"
    Ä-subtle-highlight:
        outline: "subtle-highlight"
        text: "Ä"
    Ö-subtle-highlight:
        outline: "subtle-highlight"
        text: "Ö"
    Ü-subtle-highlight:
        outline: "subtle-highlight"
        text: "Ü"
    ß-subtle-highlight:
        outline: "subtle-highlight"
        text: "ß"
    5:
        outline: "fill"
    "&":
        outline: "fill"
    ·:
        outline: "fill"
    ¥:
        outline: "fill"
    ô:
        outline: "fill"
    Ç:
        outline: "fill"
    ":":
        outline: "fill"
    π:
        outline: "fill"
--- a/data/keyboards/de+bone_wide.yaml
+++ b/data/keyboards/de+bone_wide.yaml
@ -0,0 +1,122 @@
 # Language: German (Bone)
 ---
 outlines:
    default:            { width: 48.87,  height: 42 }
    subtle-highlight:   { width: 48.87,  height: 42 }
    special:            { width: 48.87,  height: 42 }
    altline:            { width: 73.31,  height: 42 }
    change-view:        { width: 73.31,  height: 42 }
    fill:               { width: 97.74,  height: 42 }
    subtle-highlight-2: { width: 97.74,  height: 42 }
    spaceline:          { width: 171.03, height: 42 }
 views:
    base:
        - "j d u a x p h l m w ß"
        - "c t i e o b n r s g q"
        - "Shift_L   f v ü ä ö y z k BackSpace"
        - "show_numbers show_eschars preferences         space        , . Return"
    upper:
        - "J D U A X P H L M W ẞ"
        - "C T I E O B N R S G Q"
        - "Shift_L   F V Ü Ä Ö Y Z K BackSpace"
        - "show_numbers show_eschars preferences         space        ! ? Return"
    numbers:
        - "1 2 3 4 5 6 7 8 9 0"
        - "@ # € % & - _ + ( )"
        - "show_symbols   ; \" ' : = < >  BackSpace"
        - "show_letters show_eschars preferences         space        , . Return"
    symbols:
        - "~ ` ´ | · √ µ ÷ × ¶"
        - "© ® £ $ ¥ ^ ° * { }"
        - "show_numbers   \\ / § π τ [ ]  BackSpace"
        - "show_letters show_eschars preferences         space        , . Return"
    eschars:
        - "ä-subtle-highlight è é ö-subtle-highlight ü-subtle-highlight-2 Ä-subtle-highlight È É Ö-subtle-highlight Ü-subtle-highlight"
        - "à â ê î ô À Â Ê Î Ô"
        - "show_numbers  « » ç Ç æ œ ß-subtle-highlight BackSpace"
        - "show_letters show_eschars preferences         space        „ “ Return"
 buttons:
    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: "Ää"
    space:
        outline: "spaceline"
        text: " "
    Return:
        outline: "altline"
        icon: "key-enter"
        keysym: "Return"
    ä-subtle-highlight:
        outline: "subtle-highlight"
        text: "ä"
    ö-subtle-highlight:
        outline: "subtle-highlight"
        text: "ö"
    ü-subtle-highlight-2:
        outline: "subtle-highlight-2"
        text: "ü"
    Ä-subtle-highlight:
        outline: "subtle-highlight"
        text: "Ä"
    Ö-subtle-highlight:
        outline: "subtle-highlight"
        text: "Ö"
    Ü-subtle-highlight:
        outline: "subtle-highlight"
        text: "Ü"
    ß-subtle-highlight:
        outline: "subtle-highlight"
        text: "ß"
    5:
        outline: "fill"
    "&":
        outline: "fill"
    ·:
        outline: "fill"
    ¥:
        outline: "fill"
    ô:
        outline: "fill"
    Ç:
        outline: "fill"
    ":":
        outline: "fill"
    π:
        outline: "fill"
--- a/data/keyboards/de+neo.yaml
+++ b/data/keyboards/de+neo.yaml
@ -0,0 +1,122 @@
 # Language: German (Neo 2)
 ---
 outlines:
    default:            { width: 32.12,  height: 52 }
    subtle-highlight:   { width: 32.12,  height: 52 }
    special:            { width: 32.12,  height: 52 }
    altline:            { width: 48.17,  height: 52 }
    change-view:        { width: 48.17,  height: 52 }
    fill:               { width: 64.24,  height: 52 }
    subtle-highlight-2: { width: 64.24,  height: 52 }
    spaceline:          { width: 112.45, height: 52 }
 views:
    base:
        - "x v l c w k h g f q ß"
        - "u i a e o s n r t d y"
        - "Shift_L   ü ö ä p z b m j BackSpace"
        - "show_numbers show_eschars preferences         space        , . Return"
    upper:
        - "X V L C W K H G F Q ẞ"
        - "U I A E O S N R T D Y"
        - "Shift_L   Ü Ö Ä P Z B M J BackSpace"
        - "show_numbers show_eschars preferences         space        ! ? Return"
    numbers:
        - "1 2 3 4 5 6 7 8 9 0"
        - "@ # € % & - _ + ( )"
        - "show_symbols   ; \" ' : = < >  BackSpace"
        - "show_letters show_eschars preferences         space        , . Return"
    symbols:
        - "~ ` ´ | · √ µ ÷ × ¶"
        - "© ® £ $ ¥ ^ ° * { }"
        - "show_numbers   \\ / § π τ [ ]  BackSpace"
        - "show_letters show_eschars preferences         space        , . Return"
    eschars:
        - "ä-subtle-highlight è é ö-subtle-highlight ü-subtle-highlight-2 Ä-subtle-highlight È É Ö-subtle-highlight Ü-subtle-highlight"
        - "à â ê î ô À Â Ê Î Ô"
        - "show_numbers  « » ç Ç æ œ ß-subtle-highlight BackSpace"
        - "show_letters show_eschars preferences         space        „ “ Return"
 buttons:
    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: "Ää"
    space:
        outline: "spaceline"
        text: " "
    Return:
        outline: "altline"
        icon: "key-enter"
        keysym: "Return"
    ä-subtle-highlight:
        outline: "subtle-highlight"
        text: "ä"
    ö-subtle-highlight:
        outline: "subtle-highlight"
        text: "ö"
    ü-subtle-highlight-2:
        outline: "subtle-highlight-2"
        text: "ü"
    Ä-subtle-highlight:
        outline: "subtle-highlight"
        text: "Ä"
    Ö-subtle-highlight:
        outline: "subtle-highlight"
        text: "Ö"
    Ü-subtle-highlight:
        outline: "subtle-highlight"
        text: "Ü"
    ß-subtle-highlight:
        outline: "subtle-highlight"
        text: "ß"
    5:
        outline: "fill"
    "&":
        outline: "fill"
    ·:
        outline: "fill"
    ¥:
        outline: "fill"
    ô:
        outline: "fill"
    Ç:
        outline: "fill"
    ":":
        outline: "fill"
    π:
        outline: "fill"
--- a/data/keyboards/de+neo_wide.yaml
+++ b/data/keyboards/de+neo_wide.yaml
@ -0,0 +1,122 @@
 # Language: German (Neo 2)
 ---
 outlines:
    default:            { width: 48.87,  height: 42 }
    subtle-highlight:   { width: 48.87,  height: 42 }
    special:            { width: 48.87,  height: 42 }
    altline:            { width: 73.31,  height: 42 }
    change-view:        { width: 73.31,  height: 42 }
    fill:               { width: 97.74,  height: 42 }
    subtle-highlight-2: { width: 97.74,  height: 42 }
    spaceline:          { width: 171.03, height: 42 }
 views:
    base:
        - "x v l c w k h g f q ß"
        - "u i a e o s n r t d y"
        - "Shift_L   ü ö ä p z b m j BackSpace"
        - "show_numbers show_eschars preferences         space        , . Return"
    upper:
        - "X V L C W K H G F Q ẞ"
        - "U I A E O S N R T D Y"
        - "Shift_L   Ü Ö Ä P Z B M J BackSpace"
        - "show_numbers show_eschars preferences         space        ! ? Return"
    numbers:
        - "1 2 3 4 5 6 7 8 9 0"
        - "@ # € % & - _ + ( )"
        - "show_symbols   ; \" ' : = < >  BackSpace"
        - "show_letters show_eschars preferences         space        , . Return"
    symbols:
        - "~ ` ´ | · √ µ ÷ × ¶"
        - "© ® £ $ ¥ ^ ° * { }"
        - "show_numbers   \\ / § π τ [ ]  BackSpace"
        - "show_letters show_eschars preferences         space        , . Return"
    eschars:
        - "ä-subtle-highlight è é ö-subtle-highlight ü-subtle-highlight-2 Ä-subtle-highlight È É Ö-subtle-highlight Ü-subtle-highlight"
        - "à â ê î ô À Â Ê Î Ô"
        - "show_numbers  « » ç Ç æ œ ß-subtle-highlight BackSpace"
        - "show_letters show_eschars preferences         space        „ “ Return"
 buttons:
    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: "Ää"
    space:
        outline: "spaceline"
        text: " "
    Return:
        outline: "altline"
        icon: "key-enter"
        keysym: "Return"
    ä-subtle-highlight:
        outline: "subtle-highlight"
        text: "ä"
    ö-subtle-highlight:
        outline: "subtle-highlight"
        text: "ö"
    ü-subtle-highlight-2:
        outline: "subtle-highlight-2"
        text: "ü"
    Ä-subtle-highlight:
        outline: "subtle-highlight"
        text: "Ä"
    Ö-subtle-highlight:
        outline: "subtle-highlight"
        text: "Ö"
    Ü-subtle-highlight:
        outline: "subtle-highlight"
        text: "Ü"
    ß-subtle-highlight:
        outline: "subtle-highlight"
        text: "ß"
    5:
        outline: "fill"
    "&":
        outline: "fill"
    ·:
        outline: "fill"
    ¥:
        outline: "fill"
    ô:
        outline: "fill"
    Ç:
        outline: "fill"
    ":":
        outline: "fill"
    π:
        outline: "fill"
--- a/data/keyboards/de.yaml
+++ b/data/keyboards/de.yaml
@ -1,10 +1,12 @@
 # Language: German
 ---
 outlines:
-    default:   { width: 35.33, height: 52 }
+    default:          { width: 35.33, height: 52 }
-    altline:   { width: 52.67, height: 52 }
+    subtle-highlight: { width: 35.33, height: 52 }
-    wide:      { width: 62,    height: 52 }
+    altline:          { width: 52.67, height: 52 }
-    spaceline: { width: 89.3,  height: 52 }
+    change-view:      { width: 52.67, height: 52 }
-    special:   { width: 35.33, height: 52 }
+    spaceline:        { width: 89.3,  height: 52 }
    special:          { width: 35.33, height: 52 }
 views:
    base:
@ -29,8 +31,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 +41,7 @@ buttons:
            locking:
                lock_view: "upper"
                unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
        icon: "key-shift"
    BackSpace:
        outline: "altline"
@ -52,24 +54,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 +80,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: "ß"
--- a/data/keyboards/de_wide.yaml
+++ b/data/keyboards/de_wide.yaml
@ -1,13 +1,18 @@
 # Language: German
 ---
 outlines:
-    default:   { width: 48,   height: 42 }
+    default:            { width: 48.87,  height: 42 }
-    halfwidth: { width: 24,   height: 42 }
+    subtle-highlight:   { width: 48.87,  height: 42 }
-    thin:      { width: 30,   height: 42 }
+    halfwidth:          { width: 24,     height: 42 }
-    narrow:    { width: 40.5, height: 42 }
+    thin:               { width: 30,     height: 42 }
-    altline:   { width: 81,   height: 42 }
+    narrow:             { width: 40.5,   height: 42 }
-    wide:      { width: 108,  height: 42 }
+    altline:            { width: 82.74,  height: 42 }
-    spaceline: { width: 156,  height: 42 }
+    change-view:        { width: 82.74,  height: 42 }
-    special:   { width: 48,   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 +28,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:
-        - "ä è é ö ü Ä È É Ö Ü"
+        - "ä-subtle-highlight è é ö-subtle-highlight ü-subtle-highlight-2 Ä-subtle-highlight È É Ö-subtle-highlight Ü-subtle-highlight"
-        - "à â ê î ô À Â È Î Ô"
+        - "à â ê î ô À Â Ê Î Ô"
-        - "show_numbers  « » ç Ç æ œ ß  BackSpace"
+        - "show_numbers  « » ç Ç æ œ ß-subtle-highlight -- BackSpace"
        - "show_letters show_eschars preferences         space        „ “ Return"
 buttons:
@ -42,7 +47,7 @@ buttons:
            locking:
                lock_view: "upper"
                unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
        icon: "key-shift"
    BackSpace:
        outline: "altline"
@ -55,24 +60,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 +108,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"
--- a/data/keyboards/dk.yaml
+++ b/data/keyboards/dk.yaml
@ -1,30 +1,37 @@
 # Language: Danish
 ---
 outlines:
-    default:   { width: 32,       height: 52 }
+    default:       { width: 32.4,   height: 52 }
-    altline:   { width: 48.39024, height: 52 }
+    altline:       { width: 48.39,  height: 52 }
-    wide:      { width: 62,       height: 52 }
+    large:         { width: 48.39,  height: 52 }
-    spaceline: { width: 150.5853, 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 +40,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 +79,14 @@ buttons:
        outline: "wide"
        icon: "key-enter"
        keysym: "Return"
    --:
        outline: "placeholder"
        text: ""
    5:
        outline: "fill"
    "&":
        outline: "fill"
    √:
        outline: "fill"
    ¥:
        outline: "fill"
--- a/data/keyboards/dk_wide.yaml
+++ b/data/keyboards/dk_wide.yaml
@ -1,30 +1,35 @@
 # Language: Danish
 ---
 outlines:
-    default:   { width: 48,     height: 42 }
+    default:     { width: 48.87,  height: 42 }
-    altline:   { width: 72.58,  height: 42 }
+    altline:     { width: 73.5,   height: 42 }
-    wide:      { width: 92.99,  height: 42 }
+    wide:        { width: 92.99,  height: 42 }
-    spaceline: { width: 225.87, 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 +38,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 +70,14 @@ buttons:
        outline: "wide"
        icon: "key-enter"
        keysym: "Return"
    --:
        outline: "placeholder"
        text: ""
    5:
        outline: "fill"
    "&":
        outline: "fill"
    √:
        outline: "fill"
    ¥:
        outline: "fill"
--- a/data/keyboards/email/us.yaml
+++ b/data/keyboards/email/us.yaml
@ -1,11 +1,12 @@
 ---
 outlines:
-    default:   { width: 35.33, height: 52 }
+    default:       { width: 35.33,  height: 52 }
-    altline:   { width: 52.67, height: 52 }
+    wide:          { width: 62,     height: 52 }
-    wide:      { width: 62, height: 52 }
+    change-view:   { width: 52.67,  height: 52 }
-    spaceline: { width: 106.67, height: 52 }
+    change-view-2: { width: 62,     height: 52 }
-    special:   { width: 44,     height: 52 }
+    spaceline:     { width: 106.67, height: 52 }
-    large:     { width: 44,     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"
--- a/data/keyboards/email/us_wide.yaml
+++ b/data/keyboards/email/us_wide.yaml
@ -1,11 +1,12 @@
 ---
 outlines:
-    default:   { width: 52,    height: 42 }
+    default:       { width: 52,    height: 42 }
-    altline:   { width: 77.52, height: 42 }
+    wide:          { width: 91.25, height: 42 }
-    wide:      { width: 91.25, height: 42 }
+    change-view:   { width: 77.52, height: 42 }
-    spaceline: { width: 157,   height: 42 }
+    change-view-2: { width: 91.25, height: 42 }
-    special:   { width: 64.76, height: 42 }
+    spaceline:     { width: 157,   height: 42 }
-    large:     { width: 54.76, 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"
--- a/data/keyboards/emoji/us.yaml
+++ b/data/keyboards/emoji/us.yaml
--- a/data/keyboards/emoji/us_wide.yaml
+++ b/data/keyboards/emoji/us_wide.yaml
--- a/data/keyboards/epo.yaml
+++ b/data/keyboards/epo.yaml
@ -1,17 +1,22 @@
 # Language: Esperanto
 ---
 outlines:
-    default:   { width: 35.33, height: 52 }
+    default:       { width: 35.67, height: 52 }
-    altline:   { width: 52.67, height: 52 }
+    altline:       { width: 54,    height: 52 }
-    wide:      { width: 62,    height: 52 }
+    wide:          { width: 54,    height: 52 }
-    spaceline: { width: 99.67, height: 52 }
+    change-view:   { width: 54,    height: 52 }
-    special:   { width: 35.33, 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 +26,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 +44,7 @@ buttons:
            locking:
                lock_view: "upper"
                unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
        icon: "key-shift"
    BackSpace:
        outline: "altline"
@ -52,30 +57,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: "ŭŜ"
+        label: "Ŝŭ"
    space:
        outline: "spaceline"
        label: " "
        text: " "
    Return:
-        outline: "altline"
+        outline: "wide"
        icon: "key-enter"
        keysym: "Return"
    --:
        outline: "placeholder"
        text: ""
    .-large:
        outline: "large"
        text: "."
--- a/data/keyboards/epo_wide.yaml
+++ b/data/keyboards/epo_wide.yaml
@ -1,36 +1,42 @@
 # Language: Esperanto
 ---
 outlines:
-    default:   { width: 52,    height: 42 }
+    default:       { width: 53.75, height: 42 }
-    altline:   { width: 77.52, height: 42 }
+    thin:          { width: 40,    height: 42 }
-    wide:      { width: 91.25, height: 42 }
+    altline:       { width: 80.5,  height: 42 }
-    spaceline: { width: 146.7, height: 42 }
+    wide:          { width: 91.25, height: 42 }
-    special:   { width: 52,    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 +45,7 @@ buttons:
            locking:
                lock_view: "upper"
                unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
        icon: "key-shift"
    BackSpace:
        outline: "altline"
@ -52,30 +58,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"
+        outline: "change-view"
-        label: "ŭŜ"
+        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"
--- a/data/keyboards/es+cat.yaml
+++ b/data/keyboards/es+cat.yaml
@ -1,10 +1,13 @@
 # Language: Catalan (Spain, with middle-dot L)
 ---
 outlines:
-    default:   { width: 35.33, height: 52 }
+    default:       { width: 35.67, height: 52 }
-    altline:   { width: 52.67, height: 52 }
+    altline:       { width: 52.67, height: 52 }
-    wide:      { width: 62,    height: 52 }
+    wide:          { width: 62,    height: 52 }
-    spaceline: { width: 99.67, height: 52 }
+    change-view:   { width: 52.67, height: 52 }
-    special:   { width: 44,    height: 52 }
+    change-view-2: { width: 62,    height: 52 }
    spaceline:     { width: 90,    height: 52 }
    special:       { width: 35.67, height: 52 }
 views:
    base:
@ -39,7 +42,7 @@ buttons:
            locking:
                lock_view: "upper"
                unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
        icon: "key-shift"
    BackSpace:
        outline: "altline"
@ -47,30 +50,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"
+        outline: "change-view"
-        label: "àÀ"
+        label: "Àà"
    space:
        outline: "spaceline"
        text: " "
--- a/data/keyboards/es+cat_wide.yaml
+++ b/data/keyboards/es+cat_wide.yaml
@ -1,10 +1,13 @@
 # Language: Catalan (Spain, with middle-dot L)
 ---
 outlines:
-    default:   { width: 52,     height: 42 }
+    default:       { width: 53.75, height: 42 }
-    altline:   { width: 77.51,  height: 42 }
+    altline:       { width: 80,    height: 42 }
-    wide:      { width: 91.25,  height: 42 }
+    wide:          { width: 92,    height: 42 }
-    spaceline: { width: 146.69, height: 42 }
+    change-view:   { width: 80,    height: 42 }
-    special:   { width: 64.75,  height: 42 }
+    change-view-2: { width: 92,    height: 42 }
    spaceline:     { width: 135,   height: 42 }
    special:       { width: 53.75, height: 42 }
 views:
    base:
@ -39,7 +42,7 @@ buttons:
            locking:
                lock_view: "upper"
                unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
        icon: "key-shift"
    BackSpace:
        outline: "altline"
@ -47,30 +50,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"
+        outline: "change-view"
-        label: "àÀ"
+        label: "Àà"
    space:
        outline: "spaceline"
        text: " "
--- a/data/keyboards/es.yaml
+++ b/data/keyboards/es.yaml
@ -1,10 +1,12 @@
 # Language: Spanish
 ---
 outlines:
-    default:   { width: 35.33, height: 52 }
+    default:       { width: 35.67, height: 52 }
-    altline:   { width: 52.67, height: 52 }
+    altline:       { width: 52.67, height: 52 }
-    wide:      { width: 62,    height: 52 }
+    wide:          { width: 62,    height: 52 }
-    spaceline: { width: 99.67, height: 52 }
+    change-view:   { width: 52.67, height: 52 }
-    special:   { width: 44,    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"
+        outline: "change-view"
-        label: "áÁ"
+        label: "Áá"
    space:
        outline: "spaceline"
        text: " "
--- a/data/keyboards/es_wide.yaml
+++ b/data/keyboards/es_wide.yaml
@ -1,10 +1,12 @@
 # Language: Spanish
 ---
 outlines:
-    default:   { width: 52,     height: 42 }
+    default:       { width: 53.75, height: 42 }
-    altline:   { width: 77.51,  height: 42 }
+    altline:       { width: 80,    height: 42 }
-    wide:      { width: 91.25,  height: 42 }
+    wide:          { width: 92,    height: 42 }
-    spaceline: { width: 146.69, height: 42 }
+    change-view:   { width: 80,    height: 42 }
-    special:   { width: 64.75,  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"
+        outline: "change-view"
-        label: "áÁ"
+        label: "Áá"
    space:
        outline: "spaceline"
        text: " "
--- a/data/keyboards/fi.yaml
+++ b/data/keyboards/fi.yaml
@ -1,30 +1,37 @@
 # Language: Finnish
 ---
 outlines:
-    default:   { width: 32,       height: 52 }
+    default:       { width: 32.4,   height: 52 }
-    altline:   { width: 48.39024, height: 52 }
+    altline:       { width: 48.39,  height: 52 }
-    wide:      { width: 62,       height: 52 }
+    large:         { width: 48.39,  height: 52 }
-    spaceline: { width: 150.5853, 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 +40,7 @@ buttons:
            locking:
                lock_view: "upper"
                unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
        icon: "key-shift"
    BackSpace:
        outline: "altline"
@ -41,29 +48,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"
--- a/data/keyboards/fi_wide.yaml
+++ b/data/keyboards/fi_wide.yaml
@ -1,30 +1,35 @@
 # Language: Finnish
 ---
 outlines:
-    default:   { width: 48,     height: 42 }
+    default:     { width: 48.87,  height: 42 }
-    altline:   { width: 72.59,  height: 42 }
+    altline:     { width: 73.5,   height: 42 }
-    wide:      { width: 93,     height: 42 }
+    wide:        { width: 92.99,  height: 42 }
-    spaceline: { width: 225.88, 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 +38,7 @@ buttons:
            locking:
                lock_view: "upper"
                unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
        icon: "key-shift"
    BackSpace:
        outline: "altline"
@ -41,29 +46,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"
--- a/data/keyboards/fr+bepo.yaml
+++ b/data/keyboards/fr+bepo.yaml
@ -1,38 +1,42 @@
 # Language: French (BEPO)
 ---
 outlines:
-    default:   { width: 35.33, height: 52 }
+    default:       { width: 35.33, height: 52 }
-    small:     { width: 50,    height: 30 }
+    altline:       { width: 37.0,  height: 52 }
-    altline:   { width: 35.33, height: 52 }
+    wide:          { width: 50,    height: 52 }
-    wide:      { width: 50,    height: 52 }
+    change-view:   { width: 37.0,  height: 52 }
-    spaceline: { width: 150,   height: 52 }
+    change-view-2: { width: 50,    height: 52 }
-    special:   { width: 35.33, 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_symbols -- , \" ' : ; ! ?  BackSpace"
-        - "show_letters preferences         space        show_eschars Return"
+        - "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"
+        - "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"
+        - "show_letters preferences         space   show_eschars  Return"
 buttons:
    Shift_L:
@ -40,12 +44,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 +57,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 +89,7 @@ buttons:
        icon: "key-enter"
        keysym: "Return"
    .:
-        outline: "special"
+        outline: "large"
    --:
        outline: "placeholder"
        text: ""
--- a/data/keyboards/fr+bepo_wide.yaml
+++ b/data/keyboards/fr+bepo_wide.yaml
@ -1,10 +1,14 @@
 # Language: French (BEPO)
 ---
 outlines:
-    default:   { width: 54,  height: 42 }
+    default:       { width: 54,  height: 42 }
-    altline:   { width: 81,  height: 42 }
+    altline:       { width: 54,  height: 42 }
-    wide:      { width: 100, height: 42 }
+    wide:          { width: 80,  height: 42 }
-    spaceline: { width: 205, height: 42 }
+    change-view:   { width: 54,  height: 42 }
-    special:   { 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 +20,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 +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"
@ -52,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"
@ -83,3 +87,6 @@ buttons:
        outline: "wide"
        icon: "key-enter"
        keysym: "Return"
    --:
        outline: "placeholder"
        text: ""
--- a/data/keyboards/fr.yaml
+++ b/data/keyboards/fr.yaml
@ -1,10 +1,13 @@
 # Language: French
 ---
 outlines:
-    default:   { width: 35.33, height: 52 }
+    default:       { width: 35.33, height: 52 }
-    altline:   { width: 52.67, height: 52 }
+    altline:       { width: 52.67, height: 52 }
-    wide:      { width: 59,    height: 52 }
+    wide:          { width: 59,    height: 52 }
-    spaceline: { width: 140,   height: 52 }
+    change-view:   { width: 52.67, height: 52 }
-    special:   { width: 44,    height: 52 }
+    change-view-2: { width: 59,    height: 52 }
    spaceline:     { width: 140,   height: 52 }
    special:       { width: 44,    height: 52 }
 views:
    base:
@ -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"
        label: "âÂ"
    space:
        outline: "spaceline"
--- a/data/keyboards/fr_wide.yaml
+++ b/data/keyboards/fr_wide.yaml
@ -1,10 +1,13 @@
 # Language: French
 ---
 outlines:
-    default:   { width: 54,  height: 42 }
+    default:       { width: 54,  height: 42 }
-    altline:   { width: 81,  height: 42 }
+    altline:       { width: 81,  height: 42 }
-    wide:      { width: 100, height: 42 }
+    wide:          { width: 100, height: 42 }
-    spaceline: { width: 205, height: 42 }
+    change-view:   { width: 81,  height: 42 }
-    special:   { width: 54,  height: 42 }
+    change-view-2: { width: 100, height: 42 }
    spaceline:     { width: 205, height: 42 }
    special:       { width: 54,  height: 42 }
 views:
    base:
@ -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"
        label: "âÂ"
    space:
        outline: "spaceline"
--- a/data/keyboards/ge.yaml
+++ b/data/keyboards/ge.yaml
@ -1,32 +1,36 @@
 # Language: Georgian
 ---
 outlines:
-    default:   { width: 35.33, height: 52 }
+    default:       { width: 35.67, height: 52 }
-    altline:   { width: 52.67, height: 52 }
+    altline:       { width: 53,    height: 52 }
-    wide:      { width: 62,    height: 52 }
+    wide:          { width: 62,    height: 52 }
-    spaceline: { width: 142,   height: 52 }
+    change-view:   { width: 53,    height: 52 }
-    special:   { width: 44,    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 +38,7 @@ buttons:
            locking:
                lock_view: "upper"
                unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
        icon: "key-shift"
    BackSpace:
        outline: "altline"
@ -47,28 +51,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"
--- a/data/keyboards/ge_wide.yaml
+++ b/data/keyboards/ge_wide.yaml
@ -1,32 +1,35 @@
 # Language: Georgian
 ---
 outlines:
-    default:   { width: 52,     height: 42 }
+    default:       { width: 53.5,  height: 42 }
-    altline:   { width: 77.52,  height: 42 }
+    altline:       { width: 80.25, height: 42 }
-    wide:      { width: 91.26,  height: 42 }
+    wide:          { width: 91.26, height: 42 }
-    spaceline: { width: 209.01, height: 42 }
+    change-view:   { width: 80.25, height: 42 }
-    special:   { width: 64.76,  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 +37,7 @@ buttons:
            locking:
                lock_view: "upper"
                unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
        icon: "key-shift"
    BackSpace:
        outline: "altline"
@ -47,25 +50,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 +74,6 @@ buttons:
        outline: "wide"
        icon: "key-enter"
        keysym: "Return"
    --:
        outline: "placeholder"
        text: ""
--- a/data/keyboards/gr+polytonic.yaml
+++ b/data/keyboards/gr+polytonic.yaml
@ -1,41 +1,50 @@
 # Language: Greek (polytonic)
 # Greek polytonic layout by Antonis Tsolomitis
 # University of the Aegean, Department of Mathematics, atsol@aegean.gr
 # March 2022
 # 
 ---
 outlines:
-    default:   { width: 40,    height: 60 }
+    default:          { width: 40,    height: 60 }
-    altline:   { width: 52.67, height: 60 }
+    subtle-highlight: { width: 40,    height: 60 }
-    wide:      { width: 62,    height: 60 }
+    placeholder:      { width: 40,    height: 60 }
-    extrawide: { width: 66,    height: 60 }
+    special:          { width: 52.67, height: 60 }
-    spaceline: { width: 140,   height: 60 }
+    fill:             { width: 57.5,  height: 60 }
-    special:   { width: 44,    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_PsiliOrDasiaAndPerispomeni show_psiliordasiaandperispomeni --- --- BackSpace"
-        - "show_numbers preferences space Return"
+        - "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"
+        - "show_oxia -- -- ᾼ ῌ ῼ -- -- show_base"
-        - "Ϗ ϐ ϑ ϗ ϖ ϕ – — BackSpace"
+        - "Ϗ ϐ ϑ ϗ ϖ -- ϕ – — BackSpace"
        - "show_numbers preferences space « » Return"
    bariaorperispomeni:
        - "ὰ ὲ ὴ ὶ ῒ ὸ ὺ ὼ ῐ ῑ"
@ -43,66 +52,68 @@ views:
        - "ᾶ ᾷ ῆ ῖ ῗ ῦ ῧ ῶ ῡ BackSpace"
        - "show_numbers preferences space ῇ ῷ Return"
    BariaOrPerispomeni:
-        - "Ὰ Ὲ Ὴ Ὶ Ὸ Ὺ Ὼ"
+        - "-- Ὰ Ὲ Ὴ Ὶ Ὸ Ὺ Ὼ -- --"
-        - "show_bariaorperispomeni ᾼ ῌ ῼ show_base"
+        - "show_bariaorperispomeni -- -- ᾼ ῌ ῼ -- -- show_base"
-        - "show_numbers preferences space BackSpace Return"
+        - "--- -- -- -- -- -- -- -- BackSpace"
        - "show_numbers preferences space-spaceline-2 Return"
    psiliordasia:
        - "ἀ ἐ ἠ ἰ ὀ ὐ ὠ ᾀ ᾐ ᾠ"
        - "show_PsiliOrDasia ἁ ἑ ἡ ἱ ὁ ὑ ὡ show_base"
-        - "ᾁ ᾑ ᾡ ῤ ῥ BackSpace"
+        - "--- ᾁ ᾑ ᾡ ῤ ῥ -- -- BackSpace"
-        - "show_numbers preferences space Return"
+        - "show_numbers preferences space-spaceline-2 Return"
    PsiliOrDasia:
-        - "Ἀ Ἐ Ἠ Ἰ Ὀ Ὠ ᾈ ᾘ ᾨ"
+        - "Ἀ Ἐ Ἠ Ἰ Ὀ Ὠ ᾈ ᾘ ᾨ --"
        - "show_psiliordasia Ἁ Ἑ Ἡ Ἱ Ὁ Ὑ Ὡ show_base"
-        - "ᾉ ᾙ ᾩ Ῥ BackSpace"
+        - "--- -- ᾉ ᾙ ᾩ Ῥ -- -- BackSpace"
-        - "show_numbers preferences space Return"
+        - "show_numbers preferences space-spaceline-2 Return"
    psiliordasiaandoxia:
        - "ἄ ἔ ἤ ἴ ὄ ὔ ὤ ᾄ ᾔ ᾤ"
        - "show_PsiliOrDasiaAndOxia ἅ ἕ ἥ ἵ ὅ ὕ ὥ show_base"
-        - "ᾅ ᾕ ᾥ BackSpace"
+        - "--- -- ᾅ ᾕ ᾥ -- -- -- BackSpace"
-        - "show_numbers preferences space Return"
+        - "show_numbers preferences space-spaceline-2 Return"
    PsiliOrDasiaAndOxia:
-        - "Ἄ Ἔ Ἤ Ἴ Ὄ Ὤ ᾌ ᾜ ᾬ"
+        - "Ἄ Ἔ Ἤ Ἴ Ὄ Ὤ ᾌ ᾜ ᾬ --"
        - "show_psiliordasiaandoxia Ἅ Ἕ Ἥ Ἵ Ὅ Ὕ Ὥ show_base"
-        - "ᾍ ᾝ ᾭ BackSpace"
+        - "--- -- ᾍ ᾝ ᾭ -- -- -- BackSpace"
-        - "show_numbers preferences space Return"
+        - "show_numbers preferences space-spaceline-2 Return"
    psiliordasiaandvaria:
        - "ἂ ἒ ἢ ἲ ὂ ὒ ὢ ᾂ ᾒ ᾢ"
        - "show_PsiliOrDasiaAndVaria ἃ ἓ ἣ ἳ ὃ ὓ ὣ show_base"
-        - "ᾃ ᾓ ᾣ BackSpace"
+        - "--- -- ᾃ ᾓ ᾣ -- -- -- BackSpace"
-        - "show_numbers preferences space Return"
+        - "show_numbers preferences space-spaceline-2 Return"
    PsiliOrDasiaAndVaria:
-        - "Ἂ Ἒ Ἢ Ἲ Ὂ Ὢ ᾊ ᾚ ᾪ"
+        - "Ἂ Ἒ Ἢ Ἲ Ὂ Ὢ ᾊ ᾚ ᾪ --"
        - "show_psiliordasiaandvaria Ἃ Ἓ Ἣ Ἳ Ὃ Ὓ Ὣ show_base"
-        - "ᾋ ᾛ ᾫ BackSpace"
+        - "--- -- ᾋ ᾛ ᾫ -- -- -- BackSpace"
-        - "show_numbers preferences space Return"
+        - "show_numbers preferences space-spaceline-2 Return"
    psiliordasiaandperispomeni:
-        - "ἆ ἦ ἶ ὖ ὦ ᾆ ᾖ ᾦ"
+        - "-- ἆ ἦ ἶ ὖ ὦ ᾆ ᾖ ᾦ --"
-        - "show_PsiliOrDasiaAndPerispomeni ἇ ἧ ἷ ὗ ὧ show_base"
+        - "show_PsiliOrDasiaAndPerispomeni -- ἇ ἧ ἷ ὗ ὧ -- show_base"
-        - "ᾇ ᾗ ᾧ BackSpace"
+        - "--- -- ᾇ ᾗ ᾧ -- -- -- BackSpace"
-        - "show_numbers preferences space Return"
+        - "show_numbers preferences space-spaceline-2 Return"
    PsiliOrDasiaAndPerispomeni:
-        - "Ἆ Ἦ Ἶ Ὦ ᾎ ᾞ ᾮ"
+        - "-- Ἆ Ἦ Ἶ Ὦ ᾎ ᾞ ᾮ -- --"
-        - "show_psiliordasiaandperispomeni Ἇ Ἧ Ἷ Ὗ Ὧ show_base"
+        - "show_psiliordasiaandperispomeni -- Ἇ Ἧ Ἷ Ὗ Ὧ -- show_base"
-        - "ᾏ ᾟ ᾯ BackSpace"
+        - "--- -- ᾏ ᾟ ᾯ -- -- -- BackSpace"
-        - "show_numbers preferences space Return"
+        - "show_numbers preferences space-spaceline-2 Return"
    numbers:
        - "1 2 3 4 5 6 7 8 9 0"
        - "@ # $ % & - _ + ( )"
-        - "show_symbols CommaSpecial \" ' : ; ! ? BackSpace"
+        - "show_symbols ,-subtle-highlight \" ' : ; ! ? BackSpace"
-        - "show_letters preferences space . CommaSpecial Return"
+        - "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 +121,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 +218,56 @@ buttons:
        icon: "key-enter"
        keysym: "Return"
    .:
-        outline: "special"
+        outline: "subtle-highlight"
-    ·Special:
+    ·-subtle-highlight:
-        outline: "special"
+        outline: "subtle-highlight"
        text: "·"
-    CommaSpecial:
+    ",-subtle-highlight":
-        outline: "special"
+        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"
--- a/data/keyboards/gr+polytonic_wide.yaml
+++ b/data/keyboards/gr+polytonic_wide.yaml
@ -1,41 +1,50 @@
 # Language: Greek (polytonic)
 # Greek polytonic layout by Antonis Tsolomitis
 # University of the Aegean, Department of Mathematics, atsol@aegean.gr
 # March 2022
 # 
 ---
 outlines:
-    default:   { width: 74,    height: 60 }
+    default:          { width: 74,    height: 60 }
-    altline:   { width: 97.44, height: 60 }
+    special:          { width: 74,    height: 60 }
-    wide:      { width: 114.7, height: 60 }
+    placeholder:      { width: 74,    height: 60 }
-    extrawide: { width: 122.1, height: 60 }
+    subtle-highlight: { width: 74,    height: 60 }
-    spaceline: { width: 259,   height: 60 }
+    fill:             { width: 97.44, height: 60 }
-    special:   { width: 81.4,  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_PsiliOrDasiaAndPerispomeni show_psiliordasiaandperispomeni --- --- BackSpace"
-        - "show_numbers preferences space Return"
+        - "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"
+        - "show_oxia -- -- ᾼ ῌ ῼ -- -- show_base"
-        - "Ϗ ϐ ϑ ϗ ϖ ϕ – — BackSpace"
+        - "Ϗ ϐ ϑ ϗ ϖ -- ϕ – — BackSpace"
        - "show_numbers preferences space « » Return"
    bariaorperispomeni:
        - "ὰ ὲ ὴ ὶ ῒ ὸ ὺ ὼ ῐ ῑ"
@ -43,66 +52,68 @@ views:
        - "ᾶ ᾷ ῆ ῖ ῗ ῦ ῧ ῶ ῡ BackSpace"
        - "show_numbers preferences space ῇ ῷ Return"
    BariaOrPerispomeni:
-        - "Ὰ Ὲ Ὴ Ὶ Ὸ Ὺ Ὼ"
+        - "-- Ὰ Ὲ Ὴ Ὶ Ὸ Ὺ Ὼ -- --"
-        - "show_bariaorperispomeni ᾼ ῌ ῼ show_base"
+        - "show_bariaorperispomeni -- -- ᾼ ῌ ῼ -- -- show_base"
-        - "show_numbers preferences space BackSpace Return"
+        - "--- -- -- -- -- -- -- -- BackSpace"
        - "show_numbers preferences space-spaceline-2 Return"
    psiliordasia:
        - "ἀ ἐ ἠ ἰ ὀ ὐ ὠ ᾀ ᾐ ᾠ"
        - "show_PsiliOrDasia ἁ ἑ ἡ ἱ ὁ ὑ ὡ show_base"
-        - "ᾁ ᾑ ᾡ ῤ ῥ BackSpace"
+        - "--- ᾁ ᾑ ᾡ ῤ ῥ -- -- BackSpace"
-        - "show_numbers preferences space Return"
+        - "show_numbers preferences space-spaceline-2 Return"
    PsiliOrDasia:
-        - "Ἀ Ἐ Ἠ Ἰ Ὀ Ὠ ᾈ ᾘ ᾨ"
+        - "Ἀ Ἐ Ἠ Ἰ Ὀ Ὠ ᾈ ᾘ ᾨ --"
        - "show_psiliordasia Ἁ Ἑ Ἡ Ἱ Ὁ Ὑ Ὡ show_base"
-        - "ᾉ ᾙ ᾩ Ῥ BackSpace"
+        - "--- -- ᾉ ᾙ ᾩ Ῥ -- -- BackSpace"
-        - "show_numbers preferences space Return"
+        - "show_numbers preferences space-spaceline-2 Return"
    psiliordasiaandoxia:
        - "ἄ ἔ ἤ ἴ ὄ ὔ ὤ ᾄ ᾔ ᾤ"
        - "show_PsiliOrDasiaAndOxia ἅ ἕ ἥ ἵ ὅ ὕ ὥ show_base"
-        - "ᾅ ᾕ ᾥ BackSpace"
+        - "--- -- ᾅ ᾕ ᾥ -- -- -- BackSpace"
-        - "show_numbers preferences space Return"
+        - "show_numbers preferences space-spaceline-2 Return"
    PsiliOrDasiaAndOxia:
-        - "Ἄ Ἔ Ἤ Ἴ Ὄ Ὤ ᾌ ᾜ ᾬ"
+        - "Ἄ Ἔ Ἤ Ἴ Ὄ Ὤ ᾌ ᾜ ᾬ --"
        - "show_psiliordasiaandoxia Ἅ Ἕ Ἥ Ἵ Ὅ Ὕ Ὥ show_base"
-        - "ᾍ ᾝ ᾭ BackSpace"
+        - "--- -- ᾍ ᾝ ᾭ -- -- -- BackSpace"
-        - "show_numbers preferences space Return"
+        - "show_numbers preferences space-spaceline-2 Return"
    psiliordasiaandvaria:
        - "ἂ ἒ ἢ ἲ ὂ ὒ ὢ ᾂ ᾒ ᾢ"
        - "show_PsiliOrDasiaAndVaria ἃ ἓ ἣ ἳ ὃ ὓ ὣ show_base"
-        - "ᾃ ᾓ ᾣ BackSpace"
+        - "--- -- ᾃ ᾓ ᾣ -- -- -- BackSpace"
-        - "show_numbers preferences space Return"
+        - "show_numbers preferences space-spaceline-2 Return"
    PsiliOrDasiaAndVaria:
-        - "Ἂ Ἒ Ἢ Ἲ Ὂ Ὢ ᾊ ᾚ ᾪ"
+        - "Ἂ Ἒ Ἢ Ἲ Ὂ Ὢ ᾊ ᾚ ᾪ --"
        - "show_psiliordasiaandvaria Ἃ Ἓ Ἣ Ἳ Ὃ Ὓ Ὣ show_base"
-        - "ᾋ ᾛ ᾫ BackSpace"
+        - "--- -- ᾋ ᾛ ᾫ -- -- -- BackSpace"
-        - "show_numbers preferences space Return"
+        - "show_numbers preferences space-spaceline-2 Return"
    psiliordasiaandperispomeni:
-        - "ἆ ἦ ἶ ὖ ὦ ᾆ ᾖ ᾦ"
+        - "-- ἆ ἦ ἶ ὖ ὦ ᾆ ᾖ ᾦ --"
-        - "show_PsiliOrDasiaAndPerispomeni ἇ ἧ ἷ ὗ ὧ show_base"
+        - "show_PsiliOrDasiaAndPerispomeni -- ἇ ἧ ἷ ὗ ὧ -- show_base"
-        - "ᾇ ᾗ ᾧ BackSpace"
+        - "--- -- ᾇ ᾗ ᾧ -- -- -- BackSpace"
-        - "show_numbers preferences space Return"
+        - "show_numbers preferences space-spaceline-2 Return"
    PsiliOrDasiaAndPerispomeni:
-        - "Ἆ Ἦ Ἶ Ὦ ᾎ ᾞ ᾮ"
+        - "-- Ἆ Ἦ Ἶ Ὦ ᾎ ᾞ ᾮ -- --"
-        - "show_psiliordasiaandperispomeni Ἇ Ἧ Ἷ Ὗ Ὧ show_base"
+        - "show_psiliordasiaandperispomeni -- Ἇ Ἧ Ἷ Ὗ Ὧ -- show_base"
-        - "ᾏ ᾟ ᾯ BackSpace"
+        - "--- -- ᾏ ᾟ ᾯ -- -- -- BackSpace"
-        - "show_numbers preferences space Return"
+        - "show_numbers preferences space-spaceline-2 Return"
    numbers:
        - "1 2 3 4 5 6 7 8 9 0"
        - "@ # $ % & - _ + ( )"
-        - "show_symbols CommaSpecial \" ' : ; ! ? BackSpace"
+        - "show_symbols ,-subtle-highlight \" ' : ; ! ? BackSpace"
-        - "show_letters preferences space . CommaSpecial Return"
+        - "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 +121,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 +218,56 @@ buttons:
        icon: "key-enter"
        keysym: "Return"
    .:
-        outline: "special"
+        outline: "subtle-highlight"
-    ·Special:
+    ·-subtle-highlight:
-        outline: "special"
+        outline: "subtle-highlight"
        text: "·"
-    CommaSpecial:
+    ",-subtle-highlight":
-        outline: "special"
+        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"
--- a/data/keyboards/gr.yaml
+++ b/data/keyboards/gr.yaml
@ -1,48 +1,52 @@
 # Language: Greek
 # Greek layout originally created by Antonis Tsolomitis
 # University of the Aegean, Department of Mathematics, atsol@aegean.gr
 # Sep 2019
 # Edited by Sotiris Papadopoulos, sotirios.papadopoulos@inserm.fr
 ---
 outlines:
-    default:   { width: 40,    height: 60 }
+    default:          { width: 40,    height: 60 }
-    altline:   { width: 52.67, height: 60 }
+    subtle-highlight: { width: 40,    height: 60 }
-    wide:      { width: 62,    height: 60 }
+    fill:             { width: 52.67, height: 60 }
-    spaceline: { width: 140,   height: 60 }
+    altline:          { width: 52.67, height: 60 }
-    special:   { width: 44,    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_symbols ,-subtle-highlight \" ' : ; ! ? BackSpace"
-        - "show_letters preferences space . CommaSpecial Return"
+        - "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 +59,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 +86,37 @@ buttons:
        icon: "key-enter"
        keysym: "Return"
    .:
-        outline: "special"
+        outline: "subtle-highlight"
-    ·Special:
+    ·-subtle-highlight:
-        outline: "special"
+        outline: "subtle-highlight"
        text: "·"
-    CommaSpecial:
+    ",-subtle-highlight":
-        outline: "special"
+        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"
--- a/data/keyboards/gr_wide.yaml
+++ b/data/keyboards/gr_wide.yaml
@ -1,45 +1,50 @@
 # Language: Greek
 # Created by Sotiris Papadopoulos, sotirios.papadopoulos@inserm.fr
 ---
 outlines:
-    default:   { width: 80,  height: 60 }
+    default:          { width: 73,  height: 60 }
-    altline:   { width: 110, height: 60 }
+    special:          { width: 73,  height: 60 }
-    wide:      { width: 120, height: 60 }
+    subtle-highlight: { width: 73,  height: 60 }
-    spaceline: { width: 250, height: 60 }
+    fill:             { width: 110, height: 60 }
-    special:   { width: 75,  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"
+        - "Ά Έ Ή Ί Ϊ Ό Ύ Ϋ Ώ show_accented"
-        - "Ϗ ϐ ϑ ϗ ΰ ϕ ϖ – — BackSpace"
+        - "Ϗ ϐ ϑ ϗ ϖ ΰ ϕ – — BackSpace"
        - "show_numbers preferences space « » Return"
    numbers:
        - "1 2 3 4 5 6 7 8 9 0"
        - "@ # $ % & - _ + ( )"
-        - "show_symbols CommaSpecial \" ' : ; ! ? BackSpace"
+        - "show_symbols ,-subtle-highlight \" ' : ; ! ? BackSpace"
-        - "show_letters preferences space . CommaSpecial Return"
+        - "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 +57,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 +84,37 @@ buttons:
        icon: "key-enter"
        keysym: "Return"
    .:
-        outline: "special"
+        outline: "subtle-highlight"
-    ·Special:
+    ·-subtle-highlight:
-        outline: "special"
+        outline: "subtle-highlight"
        text: "·"
-    CommaSpecial:
+    ",-subtle-highlight":
-        outline: "special"
+        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"
--- a/data/keyboards/hu.yaml
+++ b/data/keyboards/hu.yaml
@ -1,11 +1,15 @@
-# Maintained by: soyer <soyer@irl.hu>
+# Language: Hungarian
 # Based on work by: soyer <soyer@irl.hu>
 ---
 outlines:
-    default:   { width: 35.33, height: 52 }
+    default:       { width: 35.67, height: 52 }
-    altline:   { width: 52.67, height: 52 }
+    altline:       { width: 53,    height: 52 }
-    wide:      { width: 62,    height: 52 }
+    change-view:   { width: 53,    height: 52 }
-    spaceline: { width: 99.67, height: 52 }
+    change-view-2: { width: 62,    height: 52 }
-    special:   { width: 35.33, 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 +33,10 @@ views:
        - "show_numbers   \\ / § π τ [ ]  BackSpace"
        - "show_letters show_eschars preferences         space        , . - Return"
    eschars:
-        - "ö ü ó Ö Ü Ó"
+        - "-- -- ö ü ó Ö Ü Ó -- --"
-        - "í ő ú Í Ő Ú"
+        - "-- -- í ő ú Í Ő Ú -- --"
-        - "show_numbers é á ű É Á Ű BackSpace"
+        - "show_numbers --- é á ű É Á Ű --- BackSpace"
-        - "show_letters show_eschars preferences         space        „ “ Return"
+        - "show_letters show_eschars preferences         space       , „ “ Return"
 buttons:
    Shift_L:
@ -40,7 +44,7 @@ buttons:
            locking:
                lock_view: "upper"
                unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
        icon: "key-shift"
    BackSpace:
        outline: "altline"
@ -53,30 +57,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: ""
--- a/data/keyboards/hu_wide.yaml
+++ b/data/keyboards/hu_wide.yaml
@ -1,11 +1,14 @@
-# Maintained by: soyer <soyer@irl.hu>
+# Language: Hungarian
 # Based on work by: soyer <soyer@irl.hu>
 ---
 outlines:
-    default:   { width: 48,  height: 42 }
+    default:       { width: 44.75,   height: 42 }
-    altline:   { width: 81,  height: 42 }
+    altline:       { width: 89.5,    height: 42 }
-    wide:      { width: 108, height: 42 }
+    change-view:   { width: 89.5,    height: 42 }
-    spaceline: { width: 216, height: 42 }
+    change-view-2: { width: 67.125,  height: 42 }
-    special:   { width: 48,  height: 42 }
+    spaceline:     { width: 111.875, height: 42 }
    special:       { width: 44.75,   height: 42 }
    placeholder:   { width: 44.75,   height: 42 }
 views:
    base:
@ -19,20 +22,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"
+        - "-- 1 2 3 4 5 6 7 8 9 0 --"
-        - "@ # € % & - _ + ( )"
+        - "-- @ # € % & - _ + ( ) --"
-        - "show_symbols   ; \" ' : = < >  BackSpace"
+        - "show_symbols   ; \" ' : = < > -- BackSpace"
        - "show_letters show_eschars preferences         space        , . - Return"
    symbols:
-        - "~ ` ´ | · √ µ ÷ × ¶"
+        - "-- ~ ` ´ | · √ µ ÷ × ¶ --"
-        - "© ® £ $ ¥ ^ ° * { }"
+        - "-- © ® £ $ ¥ ^ ° * { } --"
-        - "show_numbers   \\ / § π τ [ ]  BackSpace"
+        - "show_numbers   \\ / § π τ [ ] -- BackSpace"
        - "show_letters show_eschars preferences         space        , . - Return"
    eschars:
-        - "ö ü ó Ö Ü Ó"
+        - "-- -- -- ö ü ó Ö Ü Ó -- -- --"
-        - "í ő ú Í Ő Ú"
+        - "-- -- -- í ő ú Í Ő Ú -- -- --"
-        - "show_numbers é á ű É Á Ű BackSpace"
+        - "show_numbers -- é á ű É Á Ű -- BackSpace"
-        - "show_letters show_eschars preferences         space        „ “ Return"
+        - "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,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: ""
--- a/data/keyboards/il.yaml
+++ b/data/keyboards/il.yaml
@ -1,63 +1,54 @@
 # Language: Hebrew
 ---
 outlines:
-    default:   { width: 40,  height: 60 }
+    default:          { width: 41,  height: 60 }
-    altline:   { width: 56,  height: 60 }
+    altline:          { width: 41,  height: 60 }
-    wide:      { width: 62,  height: 60 }
+    wide:             { width: 82,  height: 60 }
-    spaceline: { width: 142, height: 60 }
+    change-view:      { width: 82,  height: 60 }
-    special:   { width: 44,  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_numbers   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        . Return"
+        - "show_letters preferences    ,     space        . Return"
 buttons:
    BackSpace:
-        outline: "default"
+        outline: "altline"
        icon: "edit-clear-symbolic"
-        action: erase
+        action: "erase"
    CommaLarge:
        outline: "special"
        text: ","
    preferences:
-        action: show_prefs
+        action: "show_prefs"
        outline: "special"
        icon: "keyboard-mode-symbolic"
    show_numbers:
        action:
            set_view: "numbers"
-        outline: "wide"
+        outline: "change-view"
        label: "123"
    show_numbers_from_symbols:
        action:
            set_view: "numbers"
        outline: "altline"
        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 +56,6 @@ buttons:
        outline: "wide"
        icon: "key-enter"
        keysym: "Return"
    --:
        outline: "placeholder"
        text: ""
--- a/data/keyboards/il_wide.yaml
+++ b/data/keyboards/il_wide.yaml
@ -1,63 +1,54 @@
 # Language: Hebrew
 ---
 outlines:
-    default:   { width: 52,    height: 42 }
+    default:          { width: 53.75, height: 42 }
-    altline:   { width: 72.8,  height: 42 }
+    altline:          { width: 53.75, height: 42 }
-    wide:      { width: 80.6,  height: 42 }
+    wide:             { width: 107,   height: 42 }
-    spaceline: { width: 184.6, height: 42 }
+    change-view:      { width: 107,   height: 42 }
-    special:   { width: 57.2,  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_numbers   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        . Return"
+        - "show_letters preferences    ,     space        . Return"
 buttons:
    BackSpace:
-        outline: "default"
+        outline: "altline"
        icon: "edit-clear-symbolic"
-        action: erase
+        action: "erase"
    CommaLarge:
        outline: "special"
        text: ","
    preferences:
-        action: show_prefs
+        action: "show_prefs"
        outline: "special"
        icon: "keyboard-mode-symbolic"
    show_numbers:
        action:
            set_view: "numbers"
-        outline: "wide"
+        outline: "change-view"
        label: "123"
    show_numbers_from_symbols:
        action:
            set_view: "numbers"
        outline: "altline"
        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: " "
--- a/data/keyboards/in+mal.yaml
+++ b/data/keyboards/in+mal.yaml
@ -0,0 +1,89 @@
 # Language: Malayalam
 ---
 outlines:
    default:            { width: 29.44,  height: 44.5 }
    altline:            { width: 58.88,  height: 44.5 }
    change-view:        { width: 58.88,  height: 44.5 }
    spaceline:          { width: 235.52, height: 44.5 }
    special:            { width: 29.44,  height: 44.5 }
    placeholder:        { width: 29.44,  height: 44.5 }
 views:
    base:
        - " ൊ ൧ ൨ ൩ ൪ ൫ ൬ ൭ ൮ ൯ ൦ - ൃ "
        - " ൗ ൈ ാ ീ ൂ ബ ഹ ഗ ദ ജ ഡ zwj zwnj "
        - " -- ോ േ ് ി ു പ ര ക ത ച ട zwsp "
        - "Shift_L െ ം മ ന വ ല സ യ -- BackSpace"
        - "show_numbers  preferences         space        Return"
    upper:
        - " ഒ ! @ # ₹ % ^ & ൾ ( ) ഃ ഋ "
        - " ഔ ഐ ആ ഈ ഊ ഭ ങ ഘ ധ ഝ ഢ ഞ ർ "
        - " -- ഓ ഏ അ ഇ ഉ ഫ റ ഖ ഥ ഛ ഠ -- "
        - "Shift_L എ ൺ ണ ൻ ഴ ള ശ ഷ ൽ BackSpace"
        - "show_numbers  preferences         space        Return"
    numbers:
        - " -- ൧ ൨ ൩ ൪ ൫ ൬ ൭ ൮ ൯ ൦ -- -- "
        - "-- 1 2 3 4 5 6 7 8 9 0 -- --"
        - "-- @ # $ % & - _ + ( ) -- --"
        - "show_symbols  ₹ , \" ' : ; ! ? --  BackSpace"
        - "show_letters  preferences         space        Return"
    symbols:
        - "-- -- -- -- -- -- -- -- -- -- -- -- --"
        - "-- ~ ` | · √ π τ ÷ × ¶ -- --"
        - "-- © ® £ € ¥ ^ ° * { } -- --"
        - "show_numbers  -- \\ / < > = [ ] -- BackSpace"
        - "show_letters  preferences         space        Return"
 buttons:
    Shift_L:
        action:
            locking:
                lock_view: "upper"
                unlock_view: "base"
        outline: "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: "*/="
    space:
        outline: "spaceline"
        text: " "
    Return:
        outline: "altline"
        icon: "key-enter"
        keysym: "Return"
    --:
        outline: "placeholder"
        text: ""
 # U+200B - zero-width-space
    zwsp:
        icon: "zwsp"
        text: ""
 # U+200C - zero-width-non-joiner
    zwnj:
        icon: "zwnj"
        text: "‌"
 # U+200D - zero-width-joiner
    zwj:
        icon: "zwj"
        text: "‍"
--- a/data/keyboards/in+mal_wide.yaml
+++ b/data/keyboards/in+mal_wide.yaml
@ -0,0 +1,89 @@
 # Language: Malayalam
 ---
 outlines:
    default:            { width: 45.11,  height: 36.65 }
    altline:            { width: 90.22,  height: 36.65 }
    change-view:        { width: 90.22,  height: 36.65 }
    spaceline:          { width: 360.88, height: 36.65 }
    special:            { width: 45.11,  height: 36.65 }
    placeholder:        { width: 45.11,  height: 36.65 }
 views:
    base:
        - " ൊ ൧ ൨ ൩ ൪ ൫ ൬ ൭ ൮ ൯ ൦ - ൃ "
        - " ൗ ൈ ാ ീ ൂ ബ ഹ ഗ ദ ജ ഡ zwj zwnj "
        - " -- ോ േ ് ി ു പ ര ക ത ച ട zwsp "
        - "Shift_L െ ം മ ന വ ല സ യ -- BackSpace"
        - "show_numbers  preferences         space        Return"
    upper:
        - " ഒ ! @ # ₹ % ^ & ൾ ( ) ഃ ഋ "
        - " ഔ ഐ ആ ഈ ഊ ഭ ങ ഘ ധ ഝ ഢ ഞ ർ "
        - " -- ഓ ഏ അ ഇ ഉ ഫ റ ഖ ഥ ഛ ഠ -- "
        - "Shift_L എ ൺ ണ ൻ ഴ ള ശ ഷ ൽ BackSpace"
        - "show_numbers  preferences         space        Return"
    numbers:
        - " -- ൧ ൨ ൩ ൪ ൫ ൬ ൭ ൮ ൯ ൦ -- -- "
        - "-- 1 2 3 4 5 6 7 8 9 0 -- --"
        - "-- @ # $ % & - _ + ( ) -- --"
        - "show_symbols  ₹ , \" ' : ; ! ? --  BackSpace"
        - "show_letters  preferences         space        Return"
    symbols:
        - "-- -- -- -- -- -- -- -- -- -- -- -- --"
        - "-- ~ ` | · √ π τ ÷ × ¶ -- --"
        - "-- © ® £ € ¥ ^ ° * { } -- --"
        - "show_numbers  -- \\ / < > = [ ] -- BackSpace"
        - "show_letters  preferences         space        Return"
 buttons:
    Shift_L:
        action:
            locking:
                lock_view: "upper"
                unlock_view: "base"
        outline: "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: "*/="
    space:
        outline: "spaceline"
        text: " "
    Return:
        outline: "altline"
        icon: "key-enter"
        keysym: "Return"
    --:
        outline: "placeholder"
        text: ""
 # U+200B - zero-width-space
    zwsp:
        icon: "zwsp"
        text: ""
 # U+200C - zero-width-non-joiner
    zwnj:
        icon: "zwnj"
        text: "‌"
 # U+200D - zero-width-joiner
    zwj:
        icon: "zwj"
        text: "‍"
--- a/data/keyboards/ir.yaml
+++ b/data/keyboards/ir.yaml
@ -1,10 +1,14 @@
 # Language: Azerbaijani (Iran)
 ---
 outlines:
-    default:   { width: 35.33, height: 52 }
+    default:       { width: 32.75,  height: 52 }
-    altline:   { width: 52.67, height: 52 }
+    altline:       { width: 48.99,  height: 52 }
-    wide:      { width: 62,    height: 52 }
+    wide:          { width: 62,     height: 52 }
-    spaceline: { width: 142,   height: 52 }
+    change-view:   { width: 48.99,  height: 52 }
-    special:   { width: 44,    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 +20,17 @@ views:
        - "  ْ  ٌ  ٍ  ً  ُ  ِ  َ  ّ # @ چ"
        - "_ ئ ي إ أ آ ة » « : ؛"
        - "Shift_L ك  ٓ ژ  ٔ ء > < ؟ BackSpace"
-        - "show_numbers preferences         space        ! ، Return"
+        - "show_numbers preferences         space       ، ! Return"
    numbers:
        - "۱ ۲ ۳ ۴ ۵ ۶ ۷ ۸ ۹ ۰ |"
-        - "… ٬ ٫ ﷼ ٪ ، * ) ( − ـ"
+        - "… ٬ ٫ ﷼ ٪ ^ * ) ( − ـ"
-        - "show_symbols + - × ÷ = ^ % / BackSpace"
+        - "show_symbols + - × ÷ = / % -- BackSpace"
-        - "show_letters preferences         space        . Return"
+        - "show_letters preferences         space       ، . Return"
    symbols:
-        - "& ` | · • % π τ ÷ × ¶"
+        - "& ` | · • % π τ ¶ [ ]"
-        - "© ® £ € ¥ ^ ° * { }"
+        - "© ® £ € ¥ ^ * ° { } --"
-        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
+        - "show_numbers_from_symbols + - × ÷  = \\ < > BackSpace"
-        - "show_letters preferences         space        . Return"
+        - "show_letters preferences         space       ، . Return"
 buttons:
    Shift_L:
@ -34,38 +38,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 +78,6 @@ buttons:
    zwnj:
        icon: "zwnj"
        text: "‌"
    --:
        outline: "placeholder"
        text: ""
--- a/data/keyboards/ir_wide.yaml
+++ b/data/keyboards/ir_wide.yaml
@ -1,32 +1,37 @@
 # Language: Azerbaijani (Iran)
 ---
 outlines:
-    default:   { width: 54,  height: 42 }
+    default:       { width: 44.75, height: 42 }
-    altline:   { width: 81,  height: 42 }
+    altline:       { width: 67.25, height: 42 }
-    wide:      { width: 108, height: 42 }
+    wide:          { width: 80,    height: 42 }
-    spaceline: { width: 216, height: 42 }
+    change-view:   { width: 67.25, height: 42 }
-    special:   { width: 54,  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"
+        - "Shift_L ظ ط ز ر ذ د پ و ، BackSpace"
-        - "show_numbers preferences         space     zwnj ؟ ! . Return"
+        - "show_numbers preferences         space     zwnj ؟ . Return"
    upper:
-        - " ْ  ٌ  ٍ  ً  ُ  ِ  َ  ّ  ] [ @ # _"
+        - " ْ  ٌ  ٍ  ً  ُ  ِ  َ  ّ  ] [ @ #"
-        - "ؤ ئ ي إ أ آ ة » « : ؛"
+        - "ؤ ئ ي إ أ آ ة » « : ؛ \\"
-        - "Shift_L ك  ٓ ژ ٰ  ‌  ٔ  ء  >  <  ؟ BackSpace"
+        - "Shift_L ك  ٓ ژ ٰ  ‌  ٔ  ء  >  <  BackSpace"
-        - "show_numbers preferences         space        ، ؟ ! . Return"
+        - "show_numbers preferences         space        ، ؟ ! Return"
    numbers:
-        - "۱ ۲ ۳ ۴ ۵ ۶ ۷ ۸ ۹ ۰ | ="
+        - "-- ۱ ۲ ۳ ۴ ۵ ۶ ۷ ۸ ۹ ۰ |"
-        - "… ٬ ٫ ﷼ ٪ ، * ) ( − _"
+        - "… ٬ ٫ ﷼ ٪ ^ * ° ) ( − _"
-        - "show_symbols + - × ÷ = ^ % / BackSpace"
+        - "show_symbols + - × ÷ = / % > <  BackSpace"
-        - "show_letters preferences         space        ، ؟ ! . Return"
+        - "show_letters preferences         space        ، ؟ . Return"
    symbols:
-        - "& ` | · • % π τ ÷ × ¶"
+        - "-- & ` | · • % π τ ¶ [ ]"
-        - "© ® £ € ¥ ^ ° * { }"
+        - "© ® £ € ¥ ^ * ° { } -- --"
-        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
+        - "show_numbers_from_symbols + - × ÷ = \\ % < > BackSpace"
-        - "show_letters preferences         space        ، ؟ ! . Return"
+        - "show_letters preferences         space        ، ! . Return"
 buttons:
    Shift_L:
@ -34,7 +39,7 @@ buttons:
            locking:
                lock_view: "upper"
                unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
        icon: "key-shift"
    BackSpace:
        outline: "altline"
@ -47,25 +52,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 +79,6 @@ buttons:
    zwnj:
        icon: "zwnj"
        text: "‌"
    --:
        outline: "placeholder"
        text: ""
--- a/data/keyboards/it+fur.yaml
+++ b/data/keyboards/it+fur.yaml
@ -1,12 +1,16 @@
-# Friulian layout created by Fabio Tomat
+# Language: Friulian (Italy)
 # Based on the Friulian layout created by Fabio Tomat
 # 14 october 2020
 ---
 outlines:
-    default:   { width: 35.33, height: 52 }
+    default:       { width: 35.67, height: 52 }
-    altline:   { width: 52.67, height: 52 }
+    altline:       { width: 52.75, height: 52 }
-    wide:      { width: 62,    height: 52 }
+    wide:          { width: 62,    height: 52 }
-    spaceline: { width: 99.67, height: 52 }
+    change-view:   { width: 52.75, height: 52 }
-    special:   { width: 44,    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 +45,7 @@ buttons:
            locking:
                lock_view: "upper"
                unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
        icon: "key-shift"
    BackSpace:
        outline: "altline"
@ -54,36 +58,32 @@ buttons:
    show_numbers:
        action:
            set_view: "numbers"
-        outline: "altline"
+        outline: "change-view"
        label: "123"
    show_numbers_from_symbols:
        action:
            set_view: "numbers"
        outline: "altline"
        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: ""
--- a/data/keyboards/it+fur_wide.yaml
+++ b/data/keyboards/it+fur_wide.yaml
@ -1,12 +1,16 @@
-# Friulian layout created by Fabio Tomat
+# Language: Friulian (Italy)
 # Based on the Friulian layout created by Fabio Tomat
 # 14 october 2020
 ---
 outlines:
-    default:   { width: 52,    height: 42 }
+    default:       { width: 53.5,  height: 42 }
-    altline:   { width: 77.52, height: 42 }
+    altline:       { width: 80.25, height: 42 }
-    wide:      { width: 91.26, height: 42 }
+    wide:          { width: 91.26, height: 42 }
-    spaceline: { width: 146.7, height: 42 }
+    change-view:   { width: 80.25, height: 42 }
-    special:   { width: 64.76, 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 +45,7 @@ buttons:
            locking:
                lock_view: "upper"
                unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
        icon: "key-shift"
    BackSpace:
        outline: "altline"
@ -54,36 +58,32 @@ buttons:
    show_numbers:
        action:
            set_view: "numbers"
-        outline: "altline"
+        outline: "change-view"
        label: "123"
    show_numbers_from_symbols:
        action:
            set_view: "numbers"
        outline: "altline"
        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: ""
--- a/data/keyboards/it.yaml
+++ b/data/keyboards/it.yaml
@ -1,12 +1,16 @@
 # Language: Italian
 # Italian layout created by Antonio Pandolfo
 # 03 october 2019
 ---
 outlines:
-    default:   { width: 35.33, height: 52 }
+    default:       { width: 35.67, height: 52 }
-    altline:   { width: 52.67, height: 52 }
+    altline:       { width: 52.75, height: 52 }
-    wide:      { width: 62,    height: 52 }
+    wide:          { width: 62,    height: 52 }
-    spaceline: { width: 99.67, height: 52 }
+    change-view:   { width: 52.75, height: 52 }
-    special:   { width: 44,    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 +45,7 @@ buttons:
            locking:
                lock_view: "upper"
                unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
        icon: "key-shift"
    BackSpace:
        outline: "altline"
@ -49,39 +53,37 @@ 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_numbers_from_symbols:
        action:
            set_view: "numbers"
        outline: "altline"
        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"
+            locking:
-        outline: "altline"
+                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: ""
--- a/data/keyboards/it_wide.yaml
+++ b/data/keyboards/it_wide.yaml
@ -1,12 +1,16 @@
 # Language: Italian
 # Italian layout created by Antonio Pandolfo
 # 03 october 2019
 ---
 outlines:
-    default:   { width: 52,    height: 42 }
+    default:       { width: 53.5,  height: 42 }
-    altline:   { width: 77.52, height: 42 }
+    altline:       { width: 80.25, height: 42 }
-    wide:      { width: 91.26, height: 42 }
+    wide:          { width: 91.26, height: 42 }
-    spaceline: { width: 146.7, height: 42 }
+    change-view:   { width: 80.25, height: 42 }
-    special:   { width: 64.76, 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 +45,7 @@ buttons:
            locking:
                lock_view: "upper"
                unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
        icon: "key-shift"
    BackSpace:
        outline: "altline"
@ -49,39 +53,37 @@ 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_numbers_from_symbols:
        action:
            set_view: "numbers"
        outline: "altline"
        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"
+            locking:
-        outline: "altline"
+                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: ""
--- a/data/keyboards/jp+kana.yaml
+++ b/data/keyboards/jp+kana.yaml
@ -1,11 +1,13 @@
-# Maintained by: Mark Müller <markmueller86@gmail.com>
+# Language: Japanese (Kana)
 # Based on work by: Mark Müller <markmueller86@gmail.com>
 ---
 outlines:
-    default:      { width: 62, height: 52 }
+    default:         { width: 71.33, height: 52 }
-    default-wide: { width: 62, height: 52 }
+    wide:            { width: 71.33, height: 52 }
-    altline:      { width: 62, height: 52 }
+    character-group: { width: 71.33, height: 52 }
-    wide:         { width: 62, height: 52 }
+    change-view:     { width: 71.33, height: 52 }
-    special:      { width: 62, height: 52 }
+    special:         { width: 71.33, height: 52 }
    placeholder:     { width: 71.33, height: 52 }
 views:
    base: # hiragana
@ -14,66 +16,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"
+        - "preferences YA ya -- BackSpace"
-        - "や dummykey ゆ dummykey よ"
+        - "や -- ゆ -- よ"
-        - "ゃ dummykey ゅ dummykey ょ"
+        - "ゃ -- ゅ -- ょ"
        - "-- -- -- -- --"
    ra:
-        - "preferences dummykey ra dummykey BackSpace"
+        - "preferences RA ra -- BackSpace"
        - "ら り る れ ろ"
        - "-- -- -- -- --"
        - "-- -- -- -- --"
    wa:
-        - "preferences dummykey wa dummykey BackSpace"
+        - "preferences WA wa -- BackSpace"
-        - "わ ゐ dummykey ゑ を"
+        - "わ ゐ -- ゑ を"
-        - "ゎ dummykey ん dummykey dummykey"
+        - "ゎ -- -- -- --"
        - "-- -- ん -- --"
    symbols:
-        - "preferences dummykey symbols dummykey BackSpace"
+        - "preferences punct symbols -- BackSpace"
        - "「 」 （ ） §"
        - "【 】 ＜ ＞ ＝"
        - "＋ ＊ ＆ ％ ＄ "
    punct:
-        - "preferences dummykey punct dummykey BackSpace"
+        - "preferences symbols punct -- BackSpace"
        - "。 、 ？ ！ ー"
        - "： ； ・ 〜 …"
-        - "♪ ” ’ ゙ ゚"
+        - "♪ ” ’  ゙  ゚"
-        
+#              k       s       t       n       h       m       y       r       w
-#a 	あア 	かカ 	さサ 	たタ 	なナ 	はハ 	まマ 	やヤ 	らラ 	わワ
+#a 	あア 	かカ 	さサ 	たタ 	なナ 	はハ 	まマ 	やヤ	らラ 	わワ
-#i 	いイ 	きキ 	しシ 	ちチ 	にニ 	ひヒ 	みミ 	※      りリ 	ゐヰ
+#i 	いイ 	きキ 	しシ 	ちチ 	にニ 	ひヒ 	みミ 	※	りリ 	ゐヰ
-#u 	うウ 	くク 	すス 	つツ 	ぬヌ 	ふフ 	むム 	ゆユ 	るル 	※
+#u 	うウ 	くク 	すス 	つツ 	ぬヌ 	ふフ 	むム 	ゆユ	るル 	※
-#e 	えエ 	けケ 	せセ 	てテ 	ねネ 	へヘ 	めメ 	※      れレ 	ゑヱ
+#e 	えエ 	けケ 	せセ 	てテ 	ねネ 	へヘ 	めメ 	※	れレ 	ゑヱ
-#o 	おオ 	こコ 	そソ 	とト 	のノ 	ほホ 	もモ 	よヨ 	ろロ 	をヲ
+#o 	おオ 	こコ 	そソ 	とト 	のノ 	ほホ 	もモ 	よヨ	ろロ 	をヲ
-#      g       z       d       b       p      n
+#      g       z       d       b       p       n
-#a 	が ガ 	ざ ザ 	だ ダ 	ば バ 	ぱ パ   ん ン
+#a 	が ガ 	ざ ザ 	だ ダ 	ば バ 	ぱ パ	ん ン
 #i 	ぎ ギ 	じ ジ 	ぢ ヂ 	び ビ 	ぴ ピ 
 #u 	ぐ グ 	ず ズ 	づ ヅ 	ぶ ブ 	ぷ プ 
 #e 	げ ゲ 	ぜ ゼ 	で デ 	べ ベ 	ぺ ペ 
@ -85,50 +95,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"
+        - "preferences ya YA -- BackSpace"
-        - "ヤ DUMMYKEY ユ DUMMYKEY ヨ"
+        - "ヤ -- ユ -- ヨ"
-        - "ャ DUMMYKEY ュ DUMMYKEY ョ"
+        - "ャ -- ュ -- ョ"
        - "-- -- -- -- --"
    RA:
-        - "preferences DUMMYKEY RA DUMMYKEY BackSpace"
+        - "preferences ra RA -- BackSpace"
        - "ラ リ ル レ ロ"
        - "ㇻ ㇼ ㇽ ㇾ ㇿ"
        - "-- -- -- -- --"
    WA:
-        - "preferences DUMMYKEY WA DUMMYKEY BackSpace"
+        - "preferences wa WA -- BackSpace"
-        - "ワ ヰ DUMMYKEY ヱ ヲ"
+        - "ワ ヰ -- ヱ ヲ"
-        - "ヮ ヸ ン ヹ ヺ"
+        - "ヮ ヸ -- ヹ ヺ"
        - "-- -- ン -- --"
    SYMBOLS:
        - "preferences PUNCT SYMBOLS -- BackSpace"
        - "「 」 （ ） §"
        - "【 】 ＜ ＞ ＝"
        - "＋ ＊ ＆ ％ ＄ "
    PUNCT:
        - "preferences SYMBOLS PUNCT -- BackSpace"
        - "。 、 ？ ！ ー"
        - "： ； ・ 〜 …"
        - "♪ ” ’ ゙  ゚"
    # numbers view
    numbers:
        - "preferences 1 2 3 BackSpace"
@ -142,60 +167,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"
+        - "preferences -- DEF -- BackSpace"
-        - "D E F dummykey"
+        - "D E F -- --"
-        - "d e f 3"
+        - "d e f -- --"
        - "3 -- -- -- --"
    GHI:
-        - "preferences dummykey GHI dummykey BackSpace"
+        - "preferences -- GHI -- BackSpace"
-        - "G H I dummykey"
+        - "G H I -- --"
-        - "g h i 4"
+        - "g h i -- --"
        - "4 -- -- -- --"
    JKL:
-        - "preferences dummykey JKL dummykey BackSpace"
+        - "preferences -- JKL -- BackSpace"
-        - "J K L dummykey"
+        - "J K L -- --"
-        - "j k l 5"
+        - "j k l -- --"
        - "5 -- -- -- --"
    MNO:
-        - "preferences dummykey MNO dummykey BackSpace"
+        - "preferences -- MNO -- BackSpace"
-        - "M N O Ö dummykey"
+        - "M N O Ö --"
-        - "m n o ö 6"
+        - "m n o ö --"
        - "6 -- -- -- --"
    PQRS:
-        - "preferences dummykey PQRS dummykey BackSpace"
+        - "preferences -- PQRS -- BackSpace"
-        - "P Q R S ß"
+        - "P Q R S --"
-        - "p q r s 7"
+        - "p q r s ß"
        - "7 -- -- -- --"
    TUV:
-        - "preferences dummykey TUV dummykey BackSpace"
+        - "preferences -- TUV -- BackSpace"
-        - "T U V Ü dummykey"
+        - "T U V Ü --"
-        - "t u v ü 8"
+        - "t u v ü --"
        - "8 -- -- -- --"
    WXYZ:
-        - "preferences dummykey WXYZ dummykey BackSpace"
+        - "preferences -- WXYZ -- BackSpace"
-        - "W X Y Z dummykey"
+        - "W X Y Z --"
-        - "w x y z 9"
+        - "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 +252,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:
+        outline: "placeholder"
-            set_view: "base"
+        text: ""
        outline: "altline"
        label: ""
    # buttons available on different views like symbols and punct should go
    # back to their corresponding view
    symbols:
@ -334,109 +368,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 +473,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: ",.?"
--- a/data/keyboards/jp+kana_wide.yaml
+++ b/data/keyboards/jp+kana_wide.yaml
@ -1,11 +1,13 @@
-# Maintained by: Mark Müller <markmueller86@gmail.com>
+# Language: Japanese (Kana)
 # Based on work by: Mark Müller <markmueller86@gmail.com>
 ---
 outlines:
-    default:      { width: 62, height: 42 }
+    default:         { width: 84, height: 42 }
-    default-wide: { width: 62, height: 42 }
+    wide:            { width: 84, height: 42 }
-    altline:      { width: 62, height: 42 }
+    character-group: { width: 84, height: 42 }
-    wide:         { width: 62, height: 42 }
+    change-view:     { width: 84, height: 42 }
-    special:      { width: 62, height: 42 }
+    special:         { width: 84, height: 42 }
    placeholder:     { width: 84, height: 42 }
 views:
    base: # hiragana
@ -14,66 +16,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"
+        - "preferences YA ya -- BackSpace"
-        - "や dummykey ゆ dummykey よ"
+        - "や -- ゆ -- よ"
-        - "ゃ dummykey ゅ dummykey ょ"
+        - "ゃ -- ゅ -- ょ"
        - "-- -- -- -- --"
    ra:
-        - "preferences dummykey ra dummykey BackSpace"
+        - "preferences RA ra -- BackSpace"
        - "ら り る れ ろ"
        - "-- -- -- -- --"
        - "-- -- -- -- --"
    wa:
-        - "preferences dummykey wa dummykey BackSpace"
+        - "preferences WA wa -- BackSpace"
-        - "わ ゐ dummykey ゑ を"
+        - "わ ゐ -- ゑ を"
-        - "ゎ dummykey ん dummykey dummykey"
+        - "ゎ -- -- -- --"
        - "-- -- ん -- --"
    symbols:
-        - "preferences dummykey symbols dummykey BackSpace"
+        - "preferences punct symbols -- BackSpace"
        - "「 」 （ ） §"
        - "【 】 ＜ ＞ ＝"
        - "＋ ＊ ＆ ％ ＄ "
    punct:
-        - "preferences dummykey punct dummykey BackSpace"
+        - "preferences symbols punct -- BackSpace"
        - "。 、 ？ ！ ー"
        - "： ； ・ 〜 …"
-        - "♪ ” ’ ゙ ゚"
+        - "♪ ” ’  ゙  ゚"
-        
+#              k       s       t       n       h       m       y       r       w
-#a 	あア 	かカ 	さサ 	たタ 	なナ 	はハ 	まマ 	やヤ 	らラ 	わワ
+#a 	あア 	かカ 	さサ 	たタ 	なナ 	はハ 	まマ 	やヤ	らラ 	わワ
-#i 	いイ 	きキ 	しシ 	ちチ 	にニ 	ひヒ 	みミ 	※      りリ 	ゐヰ
+#i 	いイ 	きキ 	しシ 	ちチ 	にニ 	ひヒ 	みミ 	※	りリ 	ゐヰ
-#u 	うウ 	くク 	すス 	つツ 	ぬヌ 	ふフ 	むム 	ゆユ 	るル 	※
+#u 	うウ 	くク 	すス 	つツ 	ぬヌ 	ふフ 	むム 	ゆユ	るル 	※
-#e 	えエ 	けケ 	せセ 	てテ 	ねネ 	へヘ 	めメ 	※      れレ 	ゑヱ
+#e 	えエ 	けケ 	せセ 	てテ 	ねネ 	へヘ 	めメ 	※	れレ 	ゑヱ
-#o 	おオ 	こコ 	そソ 	とト 	のノ 	ほホ 	もモ 	よヨ 	ろロ 	をヲ
+#o 	おオ 	こコ 	そソ 	とト 	のノ 	ほホ 	もモ 	よヨ	ろロ 	をヲ
-#      g       z       d       b       p      n
+#      g       z       d       b       p       n
-#a 	が ガ 	ざ ザ 	だ ダ 	ば バ 	ぱ パ   ん ン
+#a 	が ガ 	ざ ザ 	だ ダ 	ば バ 	ぱ パ	ん ン
 #i 	ぎ ギ 	じ ジ 	ぢ ヂ 	び ビ 	ぴ ピ 
 #u 	ぐ グ 	ず ズ 	づ ヅ 	ぶ ブ 	ぷ プ 
 #e 	げ ゲ 	ぜ ゼ 	で デ 	べ ベ 	ぺ ペ 
@ -85,50 +95,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"
+        - "preferences ya YA -- BackSpace"
-        - "ヤ DUMMYKEY ユ DUMMYKEY ヨ"
+        - "ヤ -- ユ -- ヨ"
-        - "ャ DUMMYKEY ュ DUMMYKEY ョ"
+        - "ャ -- ュ -- ョ"
        - "-- -- -- -- --"
    RA:
-        - "preferences DUMMYKEY RA DUMMYKEY BackSpace"
+        - "preferences ra RA -- BackSpace"
        - "ラ リ ル レ ロ"
        - "ㇻ ㇼ ㇽ ㇾ ㇿ"
        - "-- -- -- -- --"
    WA:
-        - "preferences DUMMYKEY WA DUMMYKEY BackSpace"
+        - "preferences wa WA -- BackSpace"
-        - "ワ ヰ DUMMYKEY ヱ ヲ"
+        - "ワ ヰ -- ヱ ヲ"
-        - "ヮ ヸ ン ヹ ヺ"
+        - "ヮ ヸ -- ヹ ヺ"
        - "-- -- ン -- --"
    SYMBOLS:
        - "preferences PUNCT SYMBOLS -- BackSpace"
        - "「 」 （ ） §"
        - "【 】 ＜ ＞ ＝"
        - "＋ ＊ ＆ ％ ＄ "
    PUNCT:
        - "preferences SYMBOLS PUNCT -- BackSpace"
        - "。 、 ？ ！ ー"
        - "： ； ・ 〜 …"
        - "♪ ” ’ ゙  ゚"
    # numbers view
    numbers:
        - "preferences 1 2 3 BackSpace"
@ -142,60 +167,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"
+        - "preferences -- DEF -- BackSpace"
-        - "D E F dummykey"
+        - "D E F -- --"
-        - "d e f 3"
+        - "d e f -- --"
        - "3 -- -- -- --"
    GHI:
-        - "preferences dummykey GHI dummykey BackSpace"
+        - "preferences -- GHI -- BackSpace"
-        - "G H I dummykey"
+        - "G H I -- --"
-        - "g h i 4"
+        - "g h i -- --"
        - "4 -- -- -- --"
    JKL:
-        - "preferences dummykey JKL dummykey BackSpace"
+        - "preferences -- JKL -- BackSpace"
-        - "J K L dummykey"
+        - "J K L -- --"
-        - "j k l 5"
+        - "j k l -- --"
        - "5 -- -- -- --"
    MNO:
-        - "preferences dummykey MNO dummykey BackSpace"
+        - "preferences -- MNO -- BackSpace"
-        - "M N O Ö dummykey"
+        - "M N O Ö --"
-        - "m n o ö 6"
+        - "m n o ö --"
        - "6 -- -- -- --"
    PQRS:
-        - "preferences dummykey PQRS dummykey BackSpace"
+        - "preferences -- PQRS -- BackSpace"
-        - "P Q R S ß"
+        - "P Q R S --"
-        - "p q r s 7"
+        - "p q r s ß"
        - "7 -- -- -- --"
    TUV:
-        - "preferences dummykey TUV dummykey BackSpace"
+        - "preferences -- TUV -- BackSpace"
-        - "T U V Ü dummykey"
+        - "T U V Ü --"
-        - "t u v ü 8"
+        - "t u v ü --"
        - "8 -- -- -- --"
    WXYZ:
-        - "preferences dummykey WXYZ dummykey BackSpace"
+        - "preferences -- WXYZ -- BackSpace"
-        - "W X Y Z dummykey"
+        - "W X Y Z --"
-        - "w x y z 9"
+        - "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 +252,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:
+        outline: "placeholder"
-            set_view: "base"
+        text: ""
        outline: "altline"
        label: ""
    # buttons available on different views like symbols and punct should go
    # back to their corresponding view
    symbols:
@ -334,109 +368,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 +473,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: ",.?"
--- a/data/keyboards/jp.yaml
+++ b/data/keyboards/jp.yaml
@ -0,0 +1,787 @@
 # Language: Japanese
 ---
 outlines:
    default:       { width: 40,    height: 56 }
    default-2:     { width: 48,    height: 56 }
    thin:          { width: 36.92, height: 56 }
    change-view:   { width: 36.92, height: 56 }
    change-view-2: { width: 72,    height: 56 }
    change-view-3: { width: 80,    height: 56 }
    spaceline:     { width: 80,    height: 56 }
    special:       { width: 36.92, height: 56 }
    special-2:     { width: 40,    height: 56 }
    special-3:     { width: 72,    height: 56 }
    placeholder:   { width: 48,    height: 56 }
    placeholder-2: { width: 80,    height: 56 }
 views:
    base:
        - "ぬ ふ あ う え お や ゆ よ わ ほ へ"
        - "た て い す か ん な に ら せ  ゙  ゚ "
        - "ち と し は き く ま の り れ け む"
        - "show_hiragana_upper つ さ そ ひ こ み も ね る め ろ BackSpace"
        - "show_numbers show_romaji preferences         fullwidth-space       --- show_katakana Return"
    hiragana_upper:
        - "ぬ ふ ぁ ぅ ぇ ぉ ゃ ゅ ょ を ほ ゑ"
        - "た て ぃ す ヵ ん な に ら せ  ゙ 「"
        - "ち と し ゎ き く ま の り れ ヶ 」"
        - "show_hiragana_upper っ さ そ ゐ こ み も 、 。 ・ ー BackSpace"
        - "show_numbers show_romaji preferences         fullwidth-space       --- show_katakana Return"
    katakana:
        - "ヌ フ ア ウ エ オ ヤ ユ ヨ ワ ホ ヘ"
        - "タ テ イ ス カ ン ナ ニ ラ セ  ゙  ゚ "
        - "チ ト シ ハ キ ク マ ノ リ レ ケ ム"
        - "show_katakana_upper ツ サ ソ ヒ コ ミ モ ネ ル メ ロ BackSpace"
        - "show_numbers show_romaji preferences         fullwidth-space     katakana_width_toggle_half show_hiragana Return"
    katakana_upper:
        - "ヌ フ ァ ゥ ェ ォ ャ ュ ョ ヲ ホ ヱ"
        - "タ テ ィ ス ヵ ン ナ ニ ラ セ  ゙ 「"
        - "チ ト シ ハ キ ク マ ノ リ レ ケ 」"
        - "show_katakana_upper ッ サ ソ ヰ コ ミ モ 、 。 ・ ー BackSpace"
        - "show_numbers show_romaji preferences         fullwidth-space      katakana_width_toggle_half show_hiragana Return"
    katakana_halfwidth:
        - "ﾇ ﾌ ｱ ｳ ｴ ｵ ﾔ ﾕ ﾖ ﾜ ﾎ ﾍ"
        - "ﾀ ﾃ ｲ ｽ ｶ ﾝ ﾅ ﾆ ﾗ ｾ  ゙  ゚ "
        - "ﾁ ﾄ ｼ ﾊ ｷ ｸ ﾏ ﾉ ﾘ ﾚ ｹ ﾑ"
        - "show_katakana_halfwidth_upper ﾂ ｻ ｿ ﾋ ｺ ﾐ ﾓ ﾈ ﾙ ﾒ ﾛ BackSpace"
        - "show_numbers show_romaji preferences         space      katakana_halfwidth_width_toggle_full show_hiragana Return"
    katakana_halfwidth_upper:
        - "ﾇ ﾌ ｧ ｩ ｪ ｫ ｬ ｭ ｮ ｦ ｪ ﾍ"
        - "ﾀ ﾃ ｨ ｽ ｶ ﾝ ﾅ ﾆ ﾗ ｾ  ゙ ｢"
        - "ﾁ ﾄ ｼ ﾜ ｷ ｸ ﾏ ﾉ ﾘ ﾚ ｹ ｣"
        - "show_katakana_halfwidth_upper ｯ ｻ ｿ ﾋ ｺ ﾐ ﾓ ､ ｡ ･ ｰ BackSpace"
        - "show_numbers show_romaji preferences         space      katakana_halfwidth_width_toggle_full show_hiragana Return"
    numbers:
        - " … -- -- -- -- -- -- -- -- --"
        - "1 2 3 4 5 6 7 8 9 0"
        - "@ # ¥ % & - _ + ( )"
        - "show_symbols ; \" ' : = < > BackSpace-special-3"
        - "show_hiragana show_romaji preferences         space       numbers_width_toggle_full , . Return"
    numbers_fullwidth:
        - "゠ -- -- -- -- -- -- -- -- --"
        - "１ ２ ３ ４ ５ ６ ７ ８ ９ ０"
        - "＠ ＃ ￥ ％ ＆ － ＿ ＋ （ ）"
        - "show_symbols_fullwidth  ； ＂ ＇ ： ＝ ＜ ＞  BackSpace-special-3"
        - "show_hiragana show_romaji_fullwidth preferences         fullwidth-space       numbers_fullwidth_width_toggle_half ， ． Return"
    symbols:
        - "ヽ ♪ -- -- -- -- -- ヿ 【 】"
        - "~ ` ´ | · √ µ ÷ × ¶"
        - "© ® £ $ € ^ ° * { }"
        - "show_numbers_from_symbols \\ / § π τ [ ] BackSpace-special-3"
        - "show_hiragana show_romaji preferences         space       symbols_width_toggle_full ! ? Return"
    symbols_fullwidth:
        - "￣ ￤ -- -- -- -- -- ￢ ｟ ｠"
        - "～ ｀ -- ｜ -- -- -- -- -- --"
        - "-- -- ￡ ＄ -- ＾ -- ＊ ｛ ｝"
        - "show_numbers_fullwidth_from_symbols ＼ ／ -- -- -- ［ ］ BackSpace-special-3"
        - "show_hiragana show_romaji_fullwidth preferences         fullwidth-space       symbols_fullwidth_width_toggle_half ！ ？ Return"
    romaji:
        - "1 2 3 4 5 6 7 8 9 0"
        - "q w e r t y u i o p"
        - "a s d f g h j k l --"
        - "show_romaji_upper   z x c v b n m BackSpace-special-3"
        - "show_numbers show_hiragana preferences         space       romaji_width_toggle_full , . Return"
    romaji_upper:
        - "1 2 3 4 5 6 7 8 9 0"
        - "Q W E R T Y U I O P"
        - "A S D F G H J K L --"
        - "show_romaji_upper   Z X C V B N M BackSpace-special-3"
        - "show_numbers show_hiragana preferences         space       romaji_width_toggle_full ! ? Return"
    romaji_fullwidth:
        - "１ ２ ３ ４ ５ ６ ７ ８ ９ ０"
        - "ｑ ｗ ｅ ｒ ｔ ｙ ｕ ｉ ｏ ｐ"
        - "ａ ｓ ｄ ｆ ｇ ｈ ｊ ｋ ｌ --"
        - "show_romaji_fullwidth_upper   ｚ ｘ ｃ ｖ ｂ ｎ ｍ BackSpace-special-3"
        - "show_numbers_fullwidth show_hiragana preferences         fullwidth-space       romaji_fullwidth_width_toggle_half ， ． Return"
    romaji_fullwidth_upper:
        - "１ ２ ３ ４ ５ ６ ７ ８ ９ ０"
        - "Ｑ Ｗ Ｅ Ｒ Ｔ Ｙ Ｕ Ｉ Ｏ Ｐ"
        - "Ａ Ｓ Ｄ Ｆ Ｇ Ｈ Ｊ Ｋ Ｌ --"
        - "show_romaji_fullwidth_upper   Ｚ Ｘ Ｃ Ｖ Ｂ Ｎ Ｍ BackSpace-special-3"
        - "show_numbers_fullwidth show_hiragana preferences         fullwidth-space       romaji_fullwidth_width_toggle_half ！ ？ Return"
 #              k       s       t       n       h       m       y       r       w
 #a 	あア 	かカ 	さサ 	たタ 	なナ 	はハ 	まマ 	やヤ	らラ 	わワ
 #i 	いイ 	きキ 	しシ 	ちチ 	にニ 	ひヒ 	みミ 	※	りリ 	ゐヰ
 #u 	うウ 	くク 	すス 	つツ 	ぬヌ 	ふフ 	むム 	ゆユ	るル 	※
 #e 	えエ 	けケ 	せセ 	てテ 	ねネ 	へヘ 	めメ 	※	れレ 	ゑヱ
 #o 	おオ 	こコ 	そソ 	とト 	のノ 	ほホ 	もモ 	よヨ	ろロ 	をヲ
 #      g       z       d       b       p       n
 #a 	が ガ 	ざ ザ 	だ ダ 	ば バ 	ぱ パ	ん ン
 #i 	ぎ ギ 	じ ジ 	ぢ ヂ 	び ビ 	ぴ ピ
 #u 	ぐ グ 	ず ズ 	づ ヅ 	ぶ ブ 	ぷ プ
 #e 	げ ゲ 	ぜ ゼ 	で デ 	べ ベ 	ぺ ペ
 #o 	ご ゴ 	ぞ ゾ 	ど ド 	ぼ ボ 	ぽ ポ
 buttons:
    BackSpace:
        outline: "special"
        icon: "edit-clear-symbolic"
        action: "erase"
    BackSpace-special-3:
        outline: "special-3"
        icon: "edit-clear-symbolic"
        action: "erase"
    preferences:
        action: "show_prefs"
        outline: "special-2"
        icon: "keyboard-mode-symbolic"
    show_numbers:
        action:
            set_view: "numbers"
        outline: "change-view-3"
        label: "123"
    show_numbers_from_symbols:
        action:
            set_view: "numbers"
        outline: "change-view-2"
        label: "123"
    numbers_fullwidth_width_toggle_half:
        action:
            set_view: "numbers"
        outline: "change-view-3"
        label: "半／全"
    show_symbols:
        action:
            set_view: "symbols"
        outline: "change-view-2"
        label: "*/="
    symbols_fullwidth_width_toggle_half:
        action:
            set_view: "symbols"
        outline: "change-view-3"
        label: "半／全"
    show_hiragana:
        action:
            set_view: "base"
        outline: "change-view-3"
        label: "あいう"
    show_hiragana_upper:
        action:
            locking:
                lock_view: "hiragana_upper"
                unlock_view: "base"
        outline: "change-view"
        icon: "key-shift"
    show_katakana:
        action:
            set_view: "katakana"
        outline: "change-view-3"
        label: "アイウ"
    katakana_halfwidth_width_toggle_full:
        action:
            set_view: "katakana"
        outline: "change-view-3"
        label: "半／全"
    show_katakana_upper:
        action:
            locking:
                lock_view: "katakana_upper"
                unlock_view: "katakana"
        outline: "change-view"
        icon: "key-shift"
    show_romaji:
        action:
            set_view: "romaji"
        outline: "change-view-3"
        label: "ABC"
    romaji_fullwidth_width_toggle_half:
        action:
            set_view: "romaji"
        outline: "change-view-3"
        label: "半／全"
    show_romaji_upper:
        action:
            locking:
                lock_view: "romaji_upper"
                unlock_view: "romaji"
        outline: "change-view-2"
        icon: "key-shift"
    katakana_width_toggle_half:
        action:
            set_view: "katakana_halfwidth"
        outline: "change-view-3"
        label: "半／全"
    show_katakana_halfwidth_upper:
        action:
            locking:
                lock_view: "katakana_halfwidth_upper"
                unlock_view: "katakana_halfwidth"
        outline: "change-view"
        icon: "key-shift"
    show_romaji_fullwidth:
        action:
            set_view: "romaji_fullwidth"
        outline: "change-view-3"
        label: "ＡＢＣ"
    romaji_width_toggle_full:
        action:
            set_view: "romaji_fullwidth"
        outline: "change-view-3"
        label: "半／全"
    show_romaji_fullwidth_upper:
        action:
            locking:
                lock_view: "romaji_fullwidth_upper"
                unlock_view: "romaji_fullwidth"
        outline: "change-view-2"
        icon: "key-shift"
    show_numbers_fullwidth:
        action:
            set_view: "numbers_fullwidth"
        outline: "change-view-3"
        label: "１２３"
    show_numbers_fullwidth_from_symbols:
        action:
            set_view: "numbers_fullwidth"
        outline: "change-view-2"
        label: "１２３"
    numbers_width_toggle_full:
        action:
            set_view: "numbers_fullwidth"
        outline: "change-view-3"
        label: "半／全"
    show_symbols_fullwidth:
        action:
            set_view: "symbols_fullwidth"
        outline: "change-view-2"
        label: "＊／＝"
    symbols_width_toggle_full:
        action:
            set_view: "symbols_fullwidth"
        outline: "change-view-3"
        label: "半／全"
    space:
        outline: "spaceline"
        text: " "
        label: "␣"
    fullwidth-space:
        outline: "spaceline"
        text: "　"
        label: "␣"
    Return:
        outline: "special-2"
        icon: "key-enter"
        keysym: "Return"
    --:
        outline: "placeholder"
        text: ""
    ---:
        outline: "placeholder-2"
        text: ""
    つ:
        outline: "thin"
    さ:
        outline: "thin"
    そ:
        outline: "thin"
    ひ:
        outline: "thin"
    こ:
        outline: "thin"
    み:
        outline: "thin"
    も:
        outline: "thin"
    ね:
        outline: "thin"
    る:
        outline: "thin"
    め:
        outline: "thin"
    ろ:
        outline: "thin"
    っ:
        outline: "thin"
    ゐ:
        outline: "thin"
    、:
        outline: "thin"
    。:
        outline: "thin"
    ・:
        outline: "thin"
    ー:
        outline: "thin"
    ツ:
        outline: "thin"
    サ:
        outline: "thin"
    ソ:
        outline: "thin"
    ヒ:
        outline: "thin"
    コ:
        outline: "thin"
    ミ:
        outline: "thin"
    モ:
        outline: "thin"
    ネ:
        outline: "thin"
    ル:
        outline: "thin"
    メ:
        outline: "thin"
    ロ:
        outline: "thin"
    ッ:
        outline: "thin"
    ﾂ:
        outline: "thin"
    ｻ:
        outline: "thin"
    ｿ:
        outline: "thin"
    ヰ:
        outline: "thin"
    ﾋ:
        outline: "thin"
    ｺ:
        outline: "thin"
    ﾐ:
        outline: "thin"
    ﾓ:
        outline: "thin"
    ﾈ:
        outline: "thin"
    ﾙ:
        outline: "thin"
    ﾒ:
        outline: "thin"
    ﾛ:
        outline: "thin"
    ｯ:
        outline: "thin"
    ､:
        outline: "thin"
    ｡:
        outline: "thin"
    ･:
        outline: "thin"
    ｰ:
        outline: "thin"
    …:
        outline: "default-2"
    1:
        outline: "default-2"
    2:
        outline: "default-2"
    3:
        outline: "default-2"
    4:
        outline: "default-2"
    5:
        outline: "default-2"
    6:
        outline: "default-2"
    7:
        outline: "default-2"
    8:
        outline: "default-2"
    9:
        outline: "default-2"
    0:
        outline: "default-2"
    "@":
        outline: "default-2"
    "#":
        outline: "default-2"
    ¥:
        outline: "default-2"
    "%":
        outline: "default-2"
    "&":
        outline: "default-2"
    -:
        outline: "default-2"
    _:
        outline: "default-2"
    +:
        outline: "default-2"
    (:
        outline: "default-2"
    ):
        outline: "default-2"
    ;:
        outline: "default-2"
    "\"":
        outline: "default-2"
    "'":
        outline: "default-2"
    ":":
        outline: "default-2"
    =:
        outline: "default-2"
    <:
        outline: "default-2"
    ">":
        outline: "default-2"
    a:
        outline: "default-2"
    b:
        outline: "default-2"
    c:
        outline: "default-2"
    d:
        outline: "default-2"
    e:
        outline: "default-2"
    f:
        outline: "default-2"
    g:
        outline: "default-2"
    h:
        outline: "default-2"
    i:
        outline: "default-2"
    j:
        outline: "default-2"
    k:
        outline: "default-2"
    l:
        outline: "default-2"
    m:
        outline: "default-2"
    n:
        outline: "default-2"
    o:
        outline: "default-2"
    p:
        outline: "default-2"
    q:
        outline: "default-2"
    r:
        outline: "default-2"
    s:
        outline: "default-2"
    t:
        outline: "default-2"
    u:
        outline: "default-2"
    v:
        outline: "default-2"
    w:
        outline: "default-2"
    x:
        outline: "default-2"
    y:
        outline: "default-2"
    z:
        outline: "default-2"
    A:
        outline: "default-2"
    B:
        outline: "default-2"
    C:
        outline: "default-2"
    D:
        outline: "default-2"
    E:
        outline: "default-2"
    F:
        outline: "default-2"
    G:
        outline: "default-2"
    H:
        outline: "default-2"
    I:
        outline: "default-2"
    J:
        outline: "default-2"
    K:
        outline: "default-2"
    L:
        outline: "default-2"
    M:
        outline: "default-2"
    N:
        outline: "default-2"
    O:
        outline: "default-2"
    P:
        outline: "default-2"
    Q:
        outline: "default-2"
    R:
        outline: "default-2"
    S:
        outline: "default-2"
    T:
        outline: "default-2"
    U:
        outline: "default-2"
    V:
        outline: "default-2"
    W:
        outline: "default-2"
    X:
        outline: "default-2"
    Y:
        outline: "default-2"
    Z:
        outline: "default-2"
    １:
        outline: "default-2"
    ２:
        outline: "default-2"
    ３:
        outline: "default-2"
    ４:
        outline: "default-2"
    ５:
        outline: "default-2"
    ６:
        outline: "default-2"
    ７:
        outline: "default-2"
    ８:
        outline: "default-2"
    ９:
        outline: "default-2"
    ０:
        outline: "default-2"
    ａ:
        outline: "default-2"
    ｂ:
        outline: "default-2"
    ｃ:
        outline: "default-2"
    ｄ:
        outline: "default-2"
    ｅ:
        outline: "default-2"
    ｆ:
        outline: "default-2"
    ｇ:
        outline: "default-2"
    ｈ:
        outline: "default-2"
    ｉ:
        outline: "default-2"
    ｊ:
        outline: "default-2"
    ｋ:
        outline: "default-2"
    ｌ:
        outline: "default-2"
    ｍ:
        outline: "default-2"
    ｎ:
        outline: "default-2"
    ｏ:
        outline: "default-2"
    ｐ:
        outline: "default-2"
    ｑ:
        outline: "default-2"
    ｒ:
        outline: "default-2"
    ｓ:
        outline: "default-2"
    ｔ:
        outline: "default-2"
    ｕ:
        outline: "default-2"
    ｖ:
        outline: "default-2"
    ｗ:
        outline: "default-2"
    ｘ:
        outline: "default-2"
    ｙ:
        outline: "default-2"
    ｚ:
        outline: "default-2"
    Ａ:
        outline: "default-2"
    Ｂ:
        outline: "default-2"
    Ｃ:
        outline: "default-2"
    Ｄ:
        outline: "default-2"
    Ｅ:
        outline: "default-2"
    Ｆ:
        outline: "default-2"
    Ｇ:
        outline: "default-2"
    Ｈ:
        outline: "default-2"
    Ｉ:
        outline: "default-2"
    Ｊ:
        outline: "default-2"
    Ｋ:
        outline: "default-2"
    Ｌ:
        outline: "default-2"
    Ｍ:
        outline: "default-2"
    Ｎ:
        outline: "default-2"
    Ｏ:
        outline: "default-2"
    Ｐ:
        outline: "default-2"
    Ｑ:
        outline: "default-2"
    Ｒ:
        outline: "default-2"
    Ｓ:
        outline: "default-2"
    Ｔ:
        outline: "default-2"
    Ｕ:
        outline: "default-2"
    Ｖ:
        outline: "default-2"
    Ｗ:
        outline: "default-2"
    Ｘ:
        outline: "default-2"
    Ｙ:
        outline: "default-2"
    Ｚ:
        outline: "default-2"
    ヽ:
        outline: "default-2"
    ♪:
        outline: "default-2"
    ヿ:
        outline: "default-2"
    【:
        outline: "default-2"
    】:
        outline: "default-2"
    ~:
        outline: "default-2"
    "`":
        outline: "default-2"
    ´:
        outline: "default-2"
    "|":
        outline: "default-2"
    ·:
        outline: "default-2"
    √:
        outline: "default-2"
    µ:
        outline: "default-2"
    ÷:
        outline: "default-2"
    ×:
        outline: "default-2"
    ¶:
        outline: "default-2"
    ©:
        outline: "default-2"
    ®:
        outline: "default-2"
    £:
        outline: "default-2"
    $:
        outline: "default-2"
    €:
        outline: "default-2"
    ^:
        outline: "default-2"
    °:
        outline: "default-2"
    "*":
        outline: "default-2"
    "{":
        outline: "default-2"
    "}":
        outline: "default-2"
    "\\":
        outline: "default-2"
    /:
        outline: "default-2"
    §:
        outline: "default-2"
    π:
        outline: "default-2"
    τ:
        outline: "default-2"
    "[":
        outline: "default-2"
    "]":
        outline: "default-2"
    ゠:
        outline: "default-2"
    ＠:
        outline: "default-2"
    ＃:
        outline: "default-2"
    ￥:
        outline: "default-2"
    ％:
        outline: "default-2"
    ＆:
        outline: "default-2"
    －:
        outline: "default-2"
    ＿:
        outline: "default-2"
    ＋:
        outline: "default-2"
    （:
        outline: "default-2"
    ）:
        outline: "default-2"
    ；:
        outline: "default-2"
    ＂:
        outline: "default-2"
    ＇:
        outline: "default-2"
    ：:
        outline: "default-2"
    ＝:
        outline: "default-2"
    ＜:
        outline: "default-2"
    ＞:
        outline: "default-2"
    ￣:
        outline: "default-2"
    ￤:
        outline: "default-2"
    ￢:
        outline: "default-2"
    ｟:
        outline: "default-2"
    ｠:
        outline: "default-2"
    ～:
        outline: "default-2"
    ｀:
        outline: "default-2"
    ｜:
        outline: "default-2"
    ￡:
        outline: "default-2"
    ＄:
        outline: "default-2"
    ＾:
        outline: "default-2"
    ＊:
        outline: "default-2"
    ｛:
        outline: "default-2"
    ｝:
        outline: "default-2"
    ＼:
        outline: "default-2"
    ／:
        outline: "default-2"
    ［:
        outline: "default-2"
    ］:
        outline: "default-2"
--- a/data/keyboards/jp_wide.yaml
+++ b/data/keyboards/jp_wide.yaml
@ -0,0 +1,787 @@
 # Language: Japanese
 ---
 outlines:
    default:       { width: 40,    height: 30 }
    default-2:     { width: 48,    height: 30 }
    thin:          { width: 36.92, height: 30 }
    change-view:   { width: 36.92, height: 30 }
    change-view-2: { width: 72,    height: 30 }
    change-view-3: { width: 80,    height: 30 }
    spaceline:     { width: 80,    height: 30 }
    special:       { width: 36.92, height: 30 }
    special-2:     { width: 40,    height: 30 }
    special-3:     { width: 72,    height: 30 }
    placeholder:   { width: 48,    height: 30 }
    placeholder-2: { width: 80,    height: 30 }
 views:
    base:
        - "ぬ ふ あ う え お や ゆ よ わ ほ へ"
        - "た て い す か ん な に ら せ  ゙  ゚ "
        - "ち と し は き く ま の り れ け む"
        - "show_hiragana_upper つ さ そ ひ こ み も ね る め ろ BackSpace"
        - "show_numbers show_romaji preferences         fullwidth-space       --- show_katakana Return"
    hiragana_upper:
        - "ぬ ふ ぁ ぅ ぇ ぉ ゃ ゅ ょ を ほ ゑ"
        - "た て ぃ す ヵ ん な に ら せ  ゙ 「"
        - "ち と し ゎ き く ま の り れ ヶ 」"
        - "show_hiragana_upper っ さ そ ゐ こ み も 、 。 ・ ー BackSpace"
        - "show_numbers show_romaji preferences         fullwidth-space       --- show_katakana Return"
    katakana:
        - "ヌ フ ア ウ エ オ ヤ ユ ヨ ワ ホ ヘ"
        - "タ テ イ ス カ ン ナ ニ ラ セ  ゙  ゚ "
        - "チ ト シ ハ キ ク マ ノ リ レ ケ ム"
        - "show_katakana_upper ツ サ ソ ヒ コ ミ モ ネ ル メ ロ BackSpace"
        - "show_numbers show_romaji preferences         fullwidth-space     katakana_width_toggle_half show_hiragana Return"
    katakana_upper:
        - "ヌ フ ァ ゥ ェ ォ ャ ュ ョ ヲ ホ ヱ"
        - "タ テ ィ ス ヵ ン ナ ニ ラ セ  ゙ 「"
        - "チ ト シ ハ キ ク マ ノ リ レ ケ 」"
        - "show_katakana_upper ッ サ ソ ヰ コ ミ モ 、 。 ・ ー BackSpace"
        - "show_numbers show_romaji preferences         fullwidth-space      katakana_width_toggle_half show_hiragana Return"
    katakana_halfwidth:
        - "ﾇ ﾌ ｱ ｳ ｴ ｵ ﾔ ﾕ ﾖ ﾜ ﾎ ﾍ"
        - "ﾀ ﾃ ｲ ｽ ｶ ﾝ ﾅ ﾆ ﾗ ｾ  ゙  ゚ "
        - "ﾁ ﾄ ｼ ﾊ ｷ ｸ ﾏ ﾉ ﾘ ﾚ ｹ ﾑ"
        - "show_katakana_halfwidth_upper ﾂ ｻ ｿ ﾋ ｺ ﾐ ﾓ ﾈ ﾙ ﾒ ﾛ BackSpace"
        - "show_numbers show_romaji preferences         space      katakana_halfwidth_width_toggle_full show_hiragana Return"
    katakana_halfwidth_upper:
        - "ﾇ ﾌ ｧ ｩ ｪ ｫ ｬ ｭ ｮ ｦ ｪ ﾍ"
        - "ﾀ ﾃ ｨ ｽ ｶ ﾝ ﾅ ﾆ ﾗ ｾ  ゙ ｢"
        - "ﾁ ﾄ ｼ ﾜ ｷ ｸ ﾏ ﾉ ﾘ ﾚ ｹ ｣"
        - "show_katakana_halfwidth_upper ｯ ｻ ｿ ﾋ ｺ ﾐ ﾓ ､ ｡ ･ ｰ BackSpace"
        - "show_numbers show_romaji preferences         space      katakana_halfwidth_width_toggle_full show_hiragana Return"
    numbers:
        - " … -- -- -- -- -- -- -- -- --"
        - "1 2 3 4 5 6 7 8 9 0"
        - "@ # ¥ % & - _ + ( )"
        - "show_symbols ; \" ' : = < > BackSpace-special-3"
        - "show_hiragana show_romaji preferences         space       numbers_width_toggle_full , . Return"
    numbers_fullwidth:
        - "゠ -- -- -- -- -- -- -- -- --"
        - "１ ２ ３ ４ ５ ６ ７ ８ ９ ０"
        - "＠ ＃ ￥ ％ ＆ － ＿ ＋ （ ）"
        - "show_symbols_fullwidth  ； ＂ ＇ ： ＝ ＜ ＞  BackSpace-special-3"
        - "show_hiragana show_romaji_fullwidth preferences         fullwidth-space       numbers_fullwidth_width_toggle_half ， ． Return"
    symbols:
        - "ヽ ♪ -- -- -- -- -- ヿ 【 】"
        - "~ ` ´ | · √ µ ÷ × ¶"
        - "© ® £ $ € ^ ° * { }"
        - "show_numbers_from_symbols \\ / § π τ [ ] BackSpace-special-3"
        - "show_hiragana show_romaji preferences         space       symbols_width_toggle_full ! ? Return"
    symbols_fullwidth:
        - "￣ ￤ -- -- -- -- -- ￢ ｟ ｠"
        - "～ ｀ -- ｜ -- -- -- -- -- --"
        - "-- -- ￡ ＄ -- ＾ -- ＊ ｛ ｝"
        - "show_numbers_fullwidth_from_symbols ＼ ／ -- -- -- ［ ］ BackSpace-special-3"
        - "show_hiragana show_romaji_fullwidth preferences         fullwidth-space       symbols_fullwidth_width_toggle_half ！ ？ Return"
    romaji:
        - "1 2 3 4 5 6 7 8 9 0"
        - "q w e r t y u i o p"
        - "a s d f g h j k l --"
        - "show_romaji_upper   z x c v b n m BackSpace-special-3"
        - "show_numbers show_hiragana preferences         space       romaji_width_toggle_full , . Return"
    romaji_upper:
        - "1 2 3 4 5 6 7 8 9 0"
        - "Q W E R T Y U I O P"
        - "A S D F G H J K L --"
        - "show_romaji_upper   Z X C V B N M BackSpace-special-3"
        - "show_numbers show_hiragana preferences         space       romaji_width_toggle_full ! ? Return"
    romaji_fullwidth:
        - "１ ２ ３ ４ ５ ６ ７ ８ ９ ０"
        - "ｑ ｗ ｅ ｒ ｔ ｙ ｕ ｉ ｏ ｐ"
        - "ａ ｓ ｄ ｆ ｇ ｈ ｊ ｋ ｌ --"
        - "show_romaji_fullwidth_upper   ｚ ｘ ｃ ｖ ｂ ｎ ｍ BackSpace-special-3"
        - "show_numbers_fullwidth show_hiragana preferences         fullwidth-space       romaji_fullwidth_width_toggle_half ， ． Return"
    romaji_fullwidth_upper:
        - "１ ２ ３ ４ ５ ６ ７ ８ ９ ０"
        - "Ｑ Ｗ Ｅ Ｒ Ｔ Ｙ Ｕ Ｉ Ｏ Ｐ"
        - "Ａ Ｓ Ｄ Ｆ Ｇ Ｈ Ｊ Ｋ Ｌ --"
        - "show_romaji_fullwidth_upper   Ｚ Ｘ Ｃ Ｖ Ｂ Ｎ Ｍ BackSpace-special-3"
        - "show_numbers_fullwidth show_hiragana preferences         fullwidth-space       romaji_fullwidth_width_toggle_half ！ ？ Return"
 #              k       s       t       n       h       m       y       r       w
 #a 	あア 	かカ 	さサ 	たタ 	なナ 	はハ 	まマ 	やヤ	らラ 	わワ
 #i 	いイ 	きキ 	しシ 	ちチ 	にニ 	ひヒ 	みミ 	※	りリ 	ゐヰ
 #u 	うウ 	くク 	すス 	つツ 	ぬヌ 	ふフ 	むム 	ゆユ	るル 	※
 #e 	えエ 	けケ 	せセ 	てテ 	ねネ 	へヘ 	めメ 	※	れレ 	ゑヱ
 #o 	おオ 	こコ 	そソ 	とト 	のノ 	ほホ 	もモ 	よヨ	ろロ 	をヲ
 #      g       z       d       b       p       n
 #a 	が ガ 	ざ ザ 	だ ダ 	ば バ 	ぱ パ	ん ン
 #i 	ぎ ギ 	じ ジ 	ぢ ヂ 	び ビ 	ぴ ピ
 #u 	ぐ グ 	ず ズ 	づ ヅ 	ぶ ブ 	ぷ プ
 #e 	げ ゲ 	ぜ ゼ 	で デ 	べ ベ 	ぺ ペ
 #o 	ご ゴ 	ぞ ゾ 	ど ド 	ぼ ボ 	ぽ ポ
 buttons:
    BackSpace:
        outline: "special"
        icon: "edit-clear-symbolic"
        action: "erase"
    BackSpace-special-3:
        outline: "special-3"
        icon: "edit-clear-symbolic"
        action: "erase"
    preferences:
        action: "show_prefs"
        outline: "special-2"
        icon: "keyboard-mode-symbolic"
    show_numbers:
        action:
            set_view: "numbers"
        outline: "change-view-3"
        label: "123"
    show_numbers_from_symbols:
        action:
            set_view: "numbers"
        outline: "change-view-2"
        label: "123"
    numbers_fullwidth_width_toggle_half:
        action:
            set_view: "numbers"
        outline: "change-view-3"
        label: "半／全"
    show_symbols:
        action:
            set_view: "symbols"
        outline: "change-view-2"
        label: "*/="
    symbols_fullwidth_width_toggle_half:
        action:
            set_view: "symbols"
        outline: "change-view-3"
        label: "半／全"
    show_hiragana:
        action:
            set_view: "base"
        outline: "change-view-3"
        label: "あいう"
    show_hiragana_upper:
        action:
            locking:
                lock_view: "hiragana_upper"
                unlock_view: "base"
        outline: "change-view"
        icon: "key-shift"
    show_katakana:
        action:
            set_view: "katakana"
        outline: "change-view-3"
        label: "アイウ"
    katakana_halfwidth_width_toggle_full:
        action:
            set_view: "katakana"
        outline: "change-view-3"
        label: "半／全"
    show_katakana_upper:
        action:
            locking:
                lock_view: "katakana_upper"
                unlock_view: "katakana"
        outline: "change-view"
        icon: "key-shift"
    show_romaji:
        action:
            set_view: "romaji"
        outline: "change-view-3"
        label: "ABC"
    romaji_fullwidth_width_toggle_half:
        action:
            set_view: "romaji"
        outline: "change-view-3"
        label: "半／全"
    show_romaji_upper:
        action:
            locking:
                lock_view: "romaji_upper"
                unlock_view: "romaji"
        outline: "change-view-2"
        icon: "key-shift"
    katakana_width_toggle_half:
        action:
            set_view: "katakana_halfwidth"
        outline: "change-view-3"
        label: "半／全"
    show_katakana_halfwidth_upper:
        action:
            locking:
                lock_view: "katakana_halfwidth_upper"
                unlock_view: "katakana_halfwidth"
        outline: "change-view"
        icon: "key-shift"
    show_romaji_fullwidth:
        action:
            set_view: "romaji_fullwidth"
        outline: "change-view-3"
        label: "ＡＢＣ"
    romaji_width_toggle_full:
        action:
            set_view: "romaji_fullwidth"
        outline: "change-view-3"
        label: "半／全"
    show_romaji_fullwidth_upper:
        action:
            locking:
                lock_view: "romaji_fullwidth_upper"
                unlock_view: "romaji_fullwidth"
        outline: "change-view-2"
        icon: "key-shift"
    show_numbers_fullwidth:
        action:
            set_view: "numbers_fullwidth"
        outline: "change-view-3"
        label: "１２３"
    show_numbers_fullwidth_from_symbols:
        action:
            set_view: "numbers_fullwidth"
        outline: "change-view-2"
        label: "１２３"
    numbers_width_toggle_full:
        action:
            set_view: "numbers_fullwidth"
        outline: "change-view-3"
        label: "半／全"
    show_symbols_fullwidth:
        action:
            set_view: "symbols_fullwidth"
        outline: "change-view-2"
        label: "＊／＝"
    symbols_width_toggle_full:
        action:
            set_view: "symbols_fullwidth"
        outline: "change-view-3"
        label: "半／全"
    space:
        outline: "spaceline"
        text: " "
        label: "␣"
    fullwidth-space:
        outline: "spaceline"
        text: "　"
        label: "␣"
    Return:
        outline: "special-2"
        icon: "key-enter"
        keysym: "Return"
    --:
        outline: "placeholder"
        text: ""
    ---:
        outline: "placeholder-2"
        text: ""
    つ:
        outline: "thin"
    さ:
        outline: "thin"
    そ:
        outline: "thin"
    ひ:
        outline: "thin"
    こ:
        outline: "thin"
    み:
        outline: "thin"
    も:
        outline: "thin"
    ね:
        outline: "thin"
    る:
        outline: "thin"
    め:
        outline: "thin"
    ろ:
        outline: "thin"
    っ:
        outline: "thin"
    ゐ:
        outline: "thin"
    、:
        outline: "thin"
    。:
        outline: "thin"
    ・:
        outline: "thin"
    ー:
        outline: "thin"
    ツ:
        outline: "thin"
    サ:
        outline: "thin"
    ソ:
        outline: "thin"
    ヒ:
        outline: "thin"
    コ:
        outline: "thin"
    ミ:
        outline: "thin"
    モ:
        outline: "thin"
    ネ:
        outline: "thin"
    ル:
        outline: "thin"
    メ:
        outline: "thin"
    ロ:
        outline: "thin"
    ッ:
        outline: "thin"
    ﾂ:
        outline: "thin"
    ｻ:
        outline: "thin"
    ｿ:
        outline: "thin"
    ヰ:
        outline: "thin"
    ﾋ:
        outline: "thin"
    ｺ:
        outline: "thin"
    ﾐ:
        outline: "thin"
    ﾓ:
        outline: "thin"
    ﾈ:
        outline: "thin"
    ﾙ:
        outline: "thin"
    ﾒ:
        outline: "thin"
    ﾛ:
        outline: "thin"
    ｯ:
        outline: "thin"
    ､:
        outline: "thin"
    ｡:
        outline: "thin"
    ･:
        outline: "thin"
    ｰ:
        outline: "thin"
    …:
        outline: "default-2"
    1:
        outline: "default-2"
    2:
        outline: "default-2"
    3:
        outline: "default-2"
    4:
        outline: "default-2"
    5:
        outline: "default-2"
    6:
        outline: "default-2"
    7:
        outline: "default-2"
    8:
        outline: "default-2"
    9:
        outline: "default-2"
    0:
        outline: "default-2"
    "@":
        outline: "default-2"
    "#":
        outline: "default-2"
    ¥:
        outline: "default-2"
    "%":
        outline: "default-2"
    "&":
        outline: "default-2"
    -:
        outline: "default-2"
    _:
        outline: "default-2"
    +:
        outline: "default-2"
    (:
        outline: "default-2"
    ):
        outline: "default-2"
    ;:
        outline: "default-2"
    "\"":
        outline: "default-2"
    "'":
        outline: "default-2"
    ":":
        outline: "default-2"
    =:
        outline: "default-2"
    <:
        outline: "default-2"
    ">":
        outline: "default-2"
    a:
        outline: "default-2"
    b:
        outline: "default-2"
    c:
        outline: "default-2"
    d:
        outline: "default-2"
    e:
        outline: "default-2"
    f:
        outline: "default-2"
    g:
        outline: "default-2"
    h:
        outline: "default-2"
    i:
        outline: "default-2"
    j:
        outline: "default-2"
    k:
        outline: "default-2"
    l:
        outline: "default-2"
    m:
        outline: "default-2"
    n:
        outline: "default-2"
    o:
        outline: "default-2"
    p:
        outline: "default-2"
    q:
        outline: "default-2"
    r:
        outline: "default-2"
    s:
        outline: "default-2"
    t:
        outline: "default-2"
    u:
        outline: "default-2"
    v:
        outline: "default-2"
    w:
        outline: "default-2"
    x:
        outline: "default-2"
    y:
        outline: "default-2"
    z:
        outline: "default-2"
    A:
        outline: "default-2"
    B:
        outline: "default-2"
    C:
        outline: "default-2"
    D:
        outline: "default-2"
    E:
        outline: "default-2"
    F:
        outline: "default-2"
    G:
        outline: "default-2"
    H:
        outline: "default-2"
    I:
        outline: "default-2"
    J:
        outline: "default-2"
    K:
        outline: "default-2"
    L:
        outline: "default-2"
    M:
        outline: "default-2"
    N:
        outline: "default-2"
    O:
        outline: "default-2"
    P:
        outline: "default-2"
    Q:
        outline: "default-2"
    R:
        outline: "default-2"
    S:
        outline: "default-2"
    T:
        outline: "default-2"
    U:
        outline: "default-2"
    V:
        outline: "default-2"
    W:
        outline: "default-2"
    X:
        outline: "default-2"
    Y:
        outline: "default-2"
    Z:
        outline: "default-2"
    １:
        outline: "default-2"
    ２:
        outline: "default-2"
    ３:
        outline: "default-2"
    ４:
        outline: "default-2"
    ５:
        outline: "default-2"
    ６:
        outline: "default-2"
    ７:
        outline: "default-2"
    ８:
        outline: "default-2"
    ９:
        outline: "default-2"
    ０:
        outline: "default-2"
    ａ:
        outline: "default-2"
    ｂ:
        outline: "default-2"
    ｃ:
        outline: "default-2"
    ｄ:
        outline: "default-2"
    ｅ:
        outline: "default-2"
    ｆ:
        outline: "default-2"
    ｇ:
        outline: "default-2"
    ｈ:
        outline: "default-2"
    ｉ:
        outline: "default-2"
    ｊ:
        outline: "default-2"
    ｋ:
        outline: "default-2"
    ｌ:
        outline: "default-2"
    ｍ:
        outline: "default-2"
    ｎ:
        outline: "default-2"
    ｏ:
        outline: "default-2"
    ｐ:
        outline: "default-2"
    ｑ:
        outline: "default-2"
    ｒ:
        outline: "default-2"
    ｓ:
        outline: "default-2"
    ｔ:
        outline: "default-2"
    ｕ:
        outline: "default-2"
    ｖ:
        outline: "default-2"
    ｗ:
        outline: "default-2"
    ｘ:
        outline: "default-2"
    ｙ:
        outline: "default-2"
    ｚ:
        outline: "default-2"
    Ａ:
        outline: "default-2"
    Ｂ:
        outline: "default-2"
    Ｃ:
        outline: "default-2"
    Ｄ:
        outline: "default-2"
    Ｅ:
        outline: "default-2"
    Ｆ:
        outline: "default-2"
    Ｇ:
        outline: "default-2"
    Ｈ:
        outline: "default-2"
    Ｉ:
        outline: "default-2"
    Ｊ:
        outline: "default-2"
    Ｋ:
        outline: "default-2"
    Ｌ:
        outline: "default-2"
    Ｍ:
        outline: "default-2"
    Ｎ:
        outline: "default-2"
    Ｏ:
        outline: "default-2"
    Ｐ:
        outline: "default-2"
    Ｑ:
        outline: "default-2"
    Ｒ:
        outline: "default-2"
    Ｓ:
        outline: "default-2"
    Ｔ:
        outline: "default-2"
    Ｕ:
        outline: "default-2"
    Ｖ:
        outline: "default-2"
    Ｗ:
        outline: "default-2"
    Ｘ:
        outline: "default-2"
    Ｙ:
        outline: "default-2"
    Ｚ:
        outline: "default-2"
    ヽ:
        outline: "default-2"
    ♪:
        outline: "default-2"
    ヿ:
        outline: "default-2"
    【:
        outline: "default-2"
    】:
        outline: "default-2"
    ~:
        outline: "default-2"
    "`":
        outline: "default-2"
    ´:
        outline: "default-2"
    "|":
        outline: "default-2"
    ·:
        outline: "default-2"
    √:
        outline: "default-2"
    µ:
        outline: "default-2"
    ÷:
        outline: "default-2"
    ×:
        outline: "default-2"
    ¶:
        outline: "default-2"
    ©:
        outline: "default-2"
    ®:
        outline: "default-2"
    £:
        outline: "default-2"
    $:
        outline: "default-2"
    €:
        outline: "default-2"
    ^:
        outline: "default-2"
    °:
        outline: "default-2"
    "*":
        outline: "default-2"
    "{":
        outline: "default-2"
    "}":
        outline: "default-2"
    "\\":
        outline: "default-2"
    /:
        outline: "default-2"
    §:
        outline: "default-2"
    π:
        outline: "default-2"
    τ:
        outline: "default-2"
    "[":
        outline: "default-2"
    "]":
        outline: "default-2"
    ゠:
        outline: "default-2"
    ＠:
        outline: "default-2"
    ＃:
        outline: "default-2"
    ￥:
        outline: "default-2"
    ％:
        outline: "default-2"
    ＆:
        outline: "default-2"
    －:
        outline: "default-2"
    ＿:
        outline: "default-2"
    ＋:
        outline: "default-2"
    （:
        outline: "default-2"
    ）:
        outline: "default-2"
    ；:
        outline: "default-2"
    ＂:
        outline: "default-2"
    ＇:
        outline: "default-2"
    ：:
        outline: "default-2"
    ＝:
        outline: "default-2"
    ＜:
        outline: "default-2"
    ＞:
        outline: "default-2"
    ￣:
        outline: "default-2"
    ￤:
        outline: "default-2"
    ￢:
        outline: "default-2"
    ｟:
        outline: "default-2"
    ｠:
        outline: "default-2"
    ～:
        outline: "default-2"
    ｀:
        outline: "default-2"
    ｜:
        outline: "default-2"
    ￡:
        outline: "default-2"
    ＄:
        outline: "default-2"
    ＾:
        outline: "default-2"
    ＊:
        outline: "default-2"
    ｛:
        outline: "default-2"
    ｝:
        outline: "default-2"
    ＼:
        outline: "default-2"
    ／:
        outline: "default-2"
    ［:
        outline: "default-2"
    ］:
        outline: "default-2"
--- a/data/keyboards/no.yaml
+++ b/data/keyboards/no.yaml
@ -1,31 +1,37 @@
 # Language: Norwegian
 ---
 outlines:
-    default:   { width: 32,       height: 52 }
+    default:       { width: 32.4,   height: 52 }
-    altline:   { width: 48.39024, height: 52 }
+    altline:       { width: 48.39,  height: 52 }
-    wide:      { width: 64,       height: 52 }
+    large:         { width: 48.39,  height: 52 }
-    spaceline: { width: 142,      height: 52 }
+    wide:          { width: 62,     height: 52 }
-    special:   { width: 44,       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 +40,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 +53,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"
--- a/data/keyboards/no_wide.yaml
+++ b/data/keyboards/no_wide.yaml
@ -1,31 +1,35 @@
 # Language: Norwegian
 ---
 outlines:
-    default:   { width: 48,       height: 42 }
+    default:     { width: 48.87,  height: 42 }
-    altline:   { width: 72.59,    height: 42 }
+    altline:     { width: 73.5,   height: 42 }
-    wide:      { width: 96,       height: 42 }
+    wide:        { width: 92.99,  height: 42 }
-    spaceline: { width: 213,      height: 42 }
+    change-view: { width: 73.5,   height: 42 }
-    special:   { width: 66,       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 +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"
@ -47,29 +51,33 @@ buttons:
    show_numbers:
        action:
            set_view: "numbers"
-        outline: "wide"
+        outline: "change-view"
        label: "123"
    show_numbers_from_symbols:
        action:
            set_view: "numbers"
        outline: altline
        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"
--- a/data/keyboards/number/us.yaml
+++ b/data/keyboards/number/us.yaml
@ -1,39 +1,26 @@
 ---
 outlines:
-    default:   { width: 37.46341, height: 52 }
+    default:   { width: 37.46,  height: 52 }
-    altline:   { width: 48.39024, height: 52 }
+    altline:   { width: 48.39,  height: 52 }
-    outline7:  { width: 88.97561, height: 52 }
+    wide:      { width: 88.98,  height: 52 }
-    spaceline: { width: 120.5853, height: 52 }
+    spaceline: { width: 120.58, height: 52 }
 views:
    base:
-        - "1 2 3 parenleft parenright"
+        - "1 2 3 ( )"
-        - "4 5 6 numbersign asterisk"
+        - "4 5 6 # *"
-        - "7 8 9 plus minus"
+        - "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"
+        keysym: "Return"
    asterisk:
        text: "*"
    numbersign:
        text: "#"
    minus:
        text: "-"
    plus:
        text: "+"
    parenleft:
        text: "("
    parenright:
        text: ")"
--- a/data/keyboards/number/us_wide.yaml
+++ b/data/keyboards/number/us_wide.yaml
@ -1,39 +1,26 @@
 ---
 outlines:
-    default:   { width: 37.46341, height: 42 }
+    default:   { width: 37.46,  height: 42 }
-    altline:   { width: 48.39024, height: 42 }
+    altline:   { width: 48.39,  height: 42 }
-    outline7:  { width: 88.97561, height: 42 }
+    wide:      { width: 88.98,  height: 42 }
-    spaceline: { width: 120.5853, height: 42 }
+    spaceline: { width: 120.58, height: 42 }
 views:
    base:
-        - "1 2 3 parenleft parenright"
+        - "1 2 3 ( )"
-        - "4 5 6 numbersign asterisk"
+        - "4 5 6 # *"
-        - "7 8 9 plus minus"
+        - "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"
+        keysym: "Return"
    asterisk:
        text: "*"
    numbersign:
        text: "#"
    minus:
        text: "-"
    plus:
        text: "+"
    parenleft:
        text: "("
    parenright:
        text: ")"
--- a/data/keyboards/pin/us.yaml
+++ b/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"
--- a/data/keyboards/pin/us_wide.yaml
+++ b/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"
--- a/data/keyboards/pl.yaml
+++ b/data/keyboards/pl.yaml
@ -1,10 +1,15 @@
 # Language: Polish
 ---
 outlines:
-    default:   { width: 35.33, height: 52 }
+    default:       { width: 35.67, height: 52 }
-    altline:   { width: 52.67, height: 52 }
+    altline:       { width: 52.67, height: 52 }
-    wide:      { width: 59,    height: 52 }
+    large:         { width: 52.67, height: 52 }
-    spaceline: { width: 140,   height: 52 }
+    wide:          { width: 59,    height: 52 }
-    special:   { width: 44,    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 +26,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 +43,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 +58,7 @@ buttons:
                unlock_view: "accents"
                looks_locked_from:
                    - "upper"
-        outline: "altline"
+        outline: "change-view"
        icon: "key-shift"
    BackSpace:
        outline: "altline"
@ -67,29 +71,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 +102,11 @@ buttons:
                unlock_view: "upper"
                looks_locked_from:
                    - "accents"
-        outline: "altline"
+        outline: "change-view"
        label: "ĄĘ"
-    .:
+    .-large:
-        outline: "altline"
+        outline: "large"
        text: "."
    space:
        outline: "spaceline"
        text: " "
@ -109,3 +114,6 @@ buttons:
        outline: "wide"
        icon: "key-enter"
        keysym: "Return"
    --:
        outline: "placeholder"
        text: ""
--- a/data/keyboards/pl_wide.yaml
+++ b/data/keyboards/pl_wide.yaml
@ -1,10 +1,15 @@
 # Language: Polish
 ---
 outlines:
-    default:   { width: 54,  height: 42 }
+    default:       { width: 54,  height: 42 }
-    altline:   { width: 81,  height: 42 }
+    altline:       { width: 81,  height: 42 }
-    wide:      { width: 100, height: 42 }
+    large:         { width: 81,  height: 42 }
-    spaceline: { width: 206, height: 42 }
+    wide:          { width: 100, height: 42 }
-    special:   { width: 54,  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 +26,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 +49,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 +71,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: "ĄĘ"
-    .:
+    .-large:
-        outline: "altline"
+        outline: "large"
        text: "."
    space:
        outline: "spaceline"
        text: " "
@ -97,3 +114,6 @@ buttons:
        outline: "wide"
        icon: "key-enter"
        keysym: "Return"
    --:
        outline: "placeholder"
        text: ""
--- a/data/keyboards/pt.yaml
+++ b/data/keyboards/pt.yaml
@ -0,0 +1,90 @@
 # Language: Portuguese
 # This layout-file is a copy of "br.yaml"
 ---
 outlines:
    default:       { width: 35.67, height: 52 }
    altline:       { width: 53,    height: 52 }
    wide:          { width: 53,    height: 52 }
    change-view:   { width: 53,    height: 52 }
    spaceline:     { width: 90,    height: 52 }
    special:       { width: 35.67, height: 52 }
    large:         { width: 71.34, height: 52 }
 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"
--- a/data/keyboards/pt_wide.yaml
+++ b/data/keyboards/pt_wide.yaml
@ -0,0 +1,104 @@
 # Language: Portuguese
 # This layout-file is a copy of "br_wide.yaml"
 ---
 outlines:
    default:     { width: 53.75, height: 42 }
    thin:        { width: 40.5,  height: 42 }
    altline:     { width: 81,    height: 42 }
    wide:        { width: 92,    height: 42 }
    change-view: { width: 81,    height: 42 }
    spaceline:   { width: 149.5, height: 42 }
    special:     { width: 53.75, height: 42 }
    large:       { width: 81,    height: 42 }
 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"
--- a/data/keyboards/ro.yaml
+++ b/data/keyboards/ro.yaml
@ -1,10 +1,13 @@
 # Language: Romanian
 ---
 outlines:
-    default:   { width: 35.33, height: 52 }
+    default:       { width: 35.67,  height: 52 }
-    altline:   { width: 52.67, height: 52 }
+    altline:       { width: 53.5,   height: 52 }
-    wide:      { width: 62,    height: 52 }
+    wide:          { width: 62,     height: 52 }
-    spaceline: { width: 99.67, height: 52 }
+    change-view:   { width: 53.5,   height: 52 }
-    special:   { width: 44,    height: 52 }
+    spaceline:     { width: 107.67, height: 52 }
    special:       { width: 35.67,  height: 52 }
    large:         { width: 44,     height: 52 }
 views:
    base:
@ -16,7 +19,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 +28,12 @@ views:
    symbols:
        - "~ ` | · √ π τ ÷ × ¶"
        - "© ® £ $ ¥ ^ ° * { }"
-        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
+        - "show_numbers   \\ / < > = [ ]  BackSpace"
-        - "show_letters show_eschars preferences         space        , Return"
+        - "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 +42,7 @@ buttons:
            locking:
                lock_view: "upper"
                unlock_view: "base"
-        outline: "altline"
+        outline: "change-view"
        icon: "key-shift"
    BackSpace:
        outline: "altline"
@ -52,30 +55,25 @@ buttons:
    show_numbers:
        action:
            set_view: "numbers"
-        outline: "altline"
+        outline: "change-view"
        label: "123"
    show_numbers_from_symbols:
        action:
            set_view: "numbers"
        outline: "altline"
        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"
+        outline: "change-view"
-        label: "ăĂ"
+        label: "Ăă"
    space:
        outline: "spaceline"
        text: " "
@ -83,3 +81,5 @@ buttons:
        outline: "wide"
        icon: "key-enter"
        keysym: "Return"
    .:
        outline: "large"
--- a/data/keyboards/ro_wide.yaml
+++ b/data/keyboards/ro_wide.yaml
@ -1,10 +1,12 @@
 # Language: Romanian
 ---
 outlines:
-    default:   { width: 54,  height: 42 }
+    default:       { width: 54,     height: 42 }
-    altline:   { width: 81,  height: 42 }
+    altline:       { width: 81,     height: 42 }
-    wide:      { width: 108, height: 42 }
+    wide:          { width: 81,     height: 42 }
-    spaceline: { width: 153, height: 42 }
+    change-view:   { width: 81,     height: 42 }
-    special:   { width: 54,  height: 42 }
+    spaceline:     { width: 189.25, height: 42 }
    special:       { width: 54,     height: 42 }
 views:
    base:
@ -25,12 +27,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 +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"
+        outline: "change-view"
        label: "123"
    show_numbers_from_symbols:
        action:
            set_view: "numbers"
        outline: "altline"
        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"
+        outline: "change-view"
-        label: "ăĂ"
+        label: "Ăă"
    space:
        outline: "spaceline"
        text: " "
--- a/data/keyboards/rs+latin.yaml
+++ b/data/keyboards/rs+latin.yaml
@ -0,0 +1,88 @@
 # Language: Serbian (Latin)
 ---
 outlines:
    default:       { width: 32.42, height: 52 }
    fill:          { width: 64.84, height: 52 }
    altline:       { width: 32.42, height: 52 }
    wide:          { width: 48.63, height: 52 }
    change-view:   { width: 32.42, height: 52 }
    change-view-2: { width: 48.63, height: 52 }
    spaceline:     { width: 162.1, height: 52 }
    special:       { width: 32.42, height: 52 }
    placeholder:   { width: 32.42, height: 52 }
 views:
    base:
        - "q w e r t z u i o p š"
        - "a s d f g h j k l č ć"
        - "Shift_L    y x c v b n m đ ž BackSpace"
        - "show_numbers preferences     space    , . Return"
    upper:
        - "Q W E R T Z U I O P Š"
        - "A S D F G H J K L Č Ć"
        - "Shift_L    Y X C V B N M Đ Ž BackSpace"
        - "show_numbers preferences     space    ! ? Return"
    numbers:
        - "1 2 3 4 5 6 7 8 9 0"
        - "@ # $ % & - _ + ( )"
        - "show_symbols    , \" ' : ; ! ? -- BackSpace-wide"
        - "show_letters preferences     space    , . Return"
    symbols:
        - "~ ` | · √ π τ ÷ × ¶"
        - "© ® £ € ¥ ^ ° * { }"
        - "show_numbers    \\ / < > = [ ] -- BackSpace-wide"
        - "show_letters 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"
    BackSpace-wide:
        outline: "wide"
        icon: "edit-clear-symbolic"
        action: "erase"
    preferences:
        action: "show_prefs"
        outline: "special"
        icon: "keyboard-mode-symbolic"
    show_numbers:
        action:
            set_view: "numbers"
        outline: "change-view-2"
        label: "123"
    show_letters:
        action:
            set_view: "base"
        outline: "change-view-2"
        label: "ABC"
    show_symbols:
        action:
            set_view: "symbols"
        outline: "change-view-2"
        label: "*/="
    space:
        outline: "spaceline"
        text: " "
    Return:
        outline: "wide"
        icon: "key-enter"
        keysym: "Return"
    --:
        outline: "placeholder"
        text: ""
    5:
        outline: "fill"
    "&":
        outline: "fill"
    √:
        outline: "fill"
    ¥:
        outline: "fill"
--- a/Show More
+++ b/Show More