Merge branch 'rel-1.43.1' into 'squeekboard-1.43.x'

treewide: Document changes and release 1.43.1

See merge request World/Phosh/squeekboard!707

.gitlab-ci.yml

@@ -113,19 +113,6 @@ test_style:
     variables:
       - $PKG_ONLY == "1"
 
-check_release:
-  stage: test
-  needs: []
-  only:
-    refs:
-      - main
-  script:
-    - apt-get -y install git python3
-    - (head -n 1 ./debian/changelog && git tag) | ./debian/check_release.py
-  except:
-    variables:
-      - $PKG_ONLY == "1"
-
 pages:
   stage: deploy
   needs:

Cargo.lock

@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "anstyle"
-version = "1.0.8"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
+checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
 
 [[package]]
 name = "async-io"
@@ -62,9 +62,9 @@ dependencies = [
 
 [[package]]
 name = "autocfg"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "bitflags"
@@ -111,9 +111,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.1.21"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07b1695e2c7e8fc85310cde85aeaab7e3097f593c91d209d3f9df76c928100f0"
+checksum = "fd9de9f2205d5ef3fd67e685b0df337994ddd4495e2a28d185500d0e1edfea47"
 dependencies = [
  "shlex",
 ]
@@ -136,18 +136,18 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "clap"
-version = "4.5.18"
+version = "4.5.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0956a43b323ac1afaffc053ed5c4b7c1f1800bacd1683c353aabbb752515dd3"
+checksum = "fb3b4b9e5a7c7514dfa52869339ee98b3156b0bfb4e8a77c4ff4babb64b1604f"
 dependencies = [
  "clap_builder",
 ]
 
 [[package]]
 name = "clap_builder"
-version = "4.5.18"
+version = "4.5.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d72166dd41634086d5803a47eb71ae740e61d84709c36f3c34110173db3961b"
+checksum = "b17a95aa67cc7b5ebd32aa5370189aa0d79069ef1c64ce893bd30fb24bff20ec"
 dependencies = [
  "anstyle",
  "clap_lex",
@@ -155,9 +155,9 @@ dependencies = [
 
 [[package]]
 name = "clap_lex"
-version = "0.7.2"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97"
+checksum = "afb84c814227b90d6895e01398aee0d8033c00e7466aca416fb6a8e0eb19d8a7"
 
 [[package]]
 name = "concurrent-queue"
@@ -249,9 +249,9 @@ dependencies = [
 
 [[package]]
 name = "futures"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
+checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -264,9 +264,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
+checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -274,15 +274,15 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
+checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -291,9 +291,9 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
+checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
 
 [[package]]
 name = "futures-lite"
@@ -312,32 +312,32 @@ dependencies = [
 
 [[package]]
 name = "futures-macro"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
+checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.87",
 ]
 
 [[package]]
 name = "futures-sink"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
+checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
 
 [[package]]
 name = "futures-task"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
+checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
 
 [[package]]
 name = "futures-util"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
+checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -475,7 +475,7 @@ dependencies = [
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -548,14 +548,14 @@ dependencies = [
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.87",
 ]
 
 [[package]]
 name = "hashbrown"
-version = "0.14.5"
+version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+checksum = "3a9bfc1af68b1726ea47d3d5109de126281def866b33970e10fbab11b5dafab3"
 
 [[package]]
 name = "heck"
@@ -577,9 +577,9 @@ checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
 
 [[package]]
 name = "indexmap"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5"
+checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da"
 dependencies = [
  "equivalent",
  "hashbrown",
@@ -613,9 +613,9 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
 
 [[package]]
 name = "libc"
-version = "0.2.158"
+version = "0.2.162"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439"
+checksum = "18d287de67fe55fd7e1581fe933d965a5a9477b38e949cfa9f8574ef01506398"
 
 [[package]]
 name = "linux-raw-sys"
@@ -643,9 +643,9 @@ checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
 
 [[package]]
 name = "memmap2"
-version = "0.8.0"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a5a03cefb0d953ec0be133036f14e109412fa594edc2f77227249db66cc3ed"
+checksum = "fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f"
 dependencies = [
  "libc",
 ]
@@ -693,9 +693,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.19.0"
+version = "1.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
 
 [[package]]
 name = "pango"
@@ -730,9 +730,9 @@ checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba"
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.14"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
+checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff"
 
 [[package]]
 name = "pin-utils"
@@ -817,9 +817,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.86"
+version = "1.0.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
+checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e"
 dependencies = [
  "unicode-ident",
 ]
@@ -899,22 +899,22 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
 
 [[package]]
 name = "serde"
-version = "1.0.210"
+version = "1.0.215"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
+checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.210"
+version = "1.0.215"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
+checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -925,14 +925,14 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.87",
 ]
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.7"
+version = "0.6.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d"
+checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1"
 dependencies = [
  "serde",
 ]
@@ -1000,9 +1000,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.77"
+version = "2.0.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
+checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1030,22 +1030,22 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
 
 [[package]]
 name = "thiserror"
-version = "1.0.64"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84"
+checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.64"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3"
+checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -1304,9 +1304,9 @@ dependencies = [
 
 [[package]]
 name = "xkbcommon"
-version = "0.7.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13867d259930edc7091a6c41b4ce6eee464328c6ff9659b7e4c668ca20d4c91e"
+checksum = "8d66ca9352cbd4eecbbc40871d8a11b4ac8107cfc528a6e14d7c19c69d0e1ac9"
 dependencies = [
  "libc",
  "memmap2",

Cargo.toml

@@ -34,7 +34,7 @@ clap = { version = "4.4", features=["std"], default-features = false }
 zbus = "1.9"
 zvariant = "2.10"
 zvariant_derive = "2.10"
-xkbcommon = { version = "0.7", features = ["wayland"] }
+xkbcommon = { version = "0.8", features = ["wayland"] }
 
 [dependencies.cairo-rs]
 version = "0.18"

NEWS

@@ -1,20 +1,73 @@
-squeekboard 1.42.0~rc1
-----------------------
+squeekboard 1.43.1
+------------------
+Released November 2024
+* Fixes:
+    * Input: Modifiers can now be deactivated with all buttons for the same modifier, instead of only with the same button that was used to activate it.
+* Contributors:
+    * MoonlightWave-12
+
+squeekboard 1.43.0
+------------------
+Released November 2024
+* Fixes:
+    * Labels and icons on buttons will now keep their proportions when the proportions of layouts change.
+* Changes:
+    * Layouts will now change their shape to fill empty space on the panel.
+      Note: For the "Wide"-shapes of layouts, this is currently limited to about 1.4 times the width.
+    * A setting for changing wether or not layouts will change their shape to fit the panel has been added.
+    * The "Shift"-modifier can be assigned to buttons now.
+    * "Shift"-buttons have been added to the terminal-layouts.
+    * New emojis from Unicode 16.0 have been added.
+    * Layouts have been made more consistent.
+    * Some placeholders on layouts have been filled.
+* Contributors:
+    * Arnaud Ferraris
+    * MoonlightWave-12
+* UI translations:
+    * Alexander Shopov (bg)
+
+squeekboard 1.42.2
+------------------
+Released November 2024
+* Fixes:
+    * Compatibility: Squeekboard should now work better with apps that do not use the text-input-protocol of Wayland and rely on specific keycodes being assigned to specific characters/functions.
+    * Documentation: The recommended settings for creating layouts while using Phoc in a nested session, have been updated to work correctly with the changes to the scaling-algorithm.
+* Contributors:
+    * MoonlightWave-12
+
+squeekboard 1.42.1
+------------------
+Released October 2024
+* Fixes:
+    * With some apps, in particular apps made with Electron, text-input did not work with some buttons, depending on which layout was used. Text-input should now work normally with those apps.
+    * In some situations, modifiers were cleared after pressing another button (for example: when pressing `C`, for `Ctrl + C`), resulting in text-input without the modifiers. The modifiers will remain active in those situations from now on.
+* Contributors:
+    * MoonlightWave-12
+    * Sebastian Krzyszkowiak
+
+squeekboard 1.42.0
+------------------
 Released September 2024
 * New layouts:
     * Belarusian (by)
+    * French (fr+bepo) terminal-layout
     * Japanese (jp)
     * Serbian (rs), (rs+latin), (rs+latinunicode)
+* Changed layouts:
+    * Thai (th):
+        * There is less empty space now.
+        * Most buttons are wider now.
+        * The arrangement of buttons for the `symbols` and `numbers` views, is more consistent with other layouts now.
 * Fixes:
     * "Keyboard Settings" in the language-selection-popover will now open the correct panel in GNOME Settings.
     * On some relatively small screens in horizontal orientation, the compact shape was used instead of the wide shape,
       even though the wide shape can fit into the same height. The wide shape will be used on those screens now.
 * Changes:
-    * The height of the panel will adapt to screens differently now.
-      In particular, the panel will now be 1/3 of the screen's height on most monitors in horizontal orientation,
+    * The height of the panel will adapt to screens differently.
+      In particular, the panel will be 1/3 of the screen's height on most monitors in horizontal orientation,
       and as tall as it can be, while maintaining the aspect-ratio of the wide shape (16:5) without empty space next to it,
       for most monitors in vertical orientation.
-    * Settings for adjusting the height of the panel for the keyboard have been added.
+    * GSettings for adjusting the height of the panel for the keyboard have been added.
     * The documentation has been improved. In particular, it should now be much easier to learn how to test changes to Squeekboard and layouts.
     * After building a Debian-package for Squeekboard and installing it, `update-alternatives` is now supported.
     * The layout-files now have the English name of the language for which the respective layout is, in a comment at the top of the file.

README.md

@@ -106,8 +106,14 @@ You can change the height of the panel for the keyboard with:
 $ gsettings set sm.puri.Squeekboard scale-in-horizontal-screen-orientation 1.0
 $ gsettings set sm.puri.Squeekboard scale-in-vertical-screen-orientation 1.0
 ```
+and wether or not layouts will stretch to fit the panel with:
 
-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.
+```sh
+$ gsettings set sm.puri.Squeekboard layout-shape-changes-to-fit-panel true
+$ gsettings set sm.puri.Squeekboard layout-shape-changes-to-fit-panel false
+```
+
+Note: If the keyboard is open when the settings are changed, the changes will not be visible until the keyboard is opened again, or the layout is changed.
 While using Phosh, you can long-click/long-tap the home-bar at the bottom, to open and close the keyboard.
 
 To reset the settings to the default, you can use:

data/common.css

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

data/keyboards/am+phonetic.yaml

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

data/keyboards/am+phonetic_wide.yaml

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

data/keyboards/am.yaml

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

data/keyboards/am_wide.yaml

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

data/keyboards/ara.yaml

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

data/keyboards/ara_wide.yaml

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

data/keyboards/be.yaml

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

data/keyboards/be_wide.yaml

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

data/keyboards/bg+phonetic.yaml

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

data/keyboards/bg+phonetic_wide.yaml

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

data/keyboards/bg.yaml

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

data/keyboards/bg_wide.yaml

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

data/keyboards/br.yaml

@@ -1,43 +1,42 @@
 # Language: Portuguese (Brazil)
 ---
 outlines:
-    default:       { width: 35.67, height: 52 }
-    altline:       { width: 53,    height: 52 }
-    wide:          { width: 53,    height: 52 }
-    change-view:   { width: 53,    height: 52 }
-    spaceline:     { width: 90,    height: 52 }
-    special:       { width: 35.67, height: 52 }
-    large:         { width: 71.34, height: 52 }
+    default:     { width: 35.657, height: 52 }
+    change-view: { width: 53.485, height: 52 }
+    large:       { width: 71.314, height: 52 }
+    spaceline:   { width: 89.144, height: 52 }
+    special:     { width: 35.657, height: 52 }
+    special-2:   { width: 53.485, height: 52 }
 
 views:
     base:
         - "q w e r t y u i o p"
         - "a s d f g h j k l ç"
-        - "Shift_L   z x c v b n m  BackSpace"
-        - "show_numbers show_eschars preferences         space     .-large Return"
+        - "show_upper z x c v b n m BackSpace"
+        - "show_numbers show_eschars preferences space .-large Return"
     upper:
         - "Q W E R T Y U I O P"
         - "A S D F G H J K L Ç"
-        - "Shift_L   Z X C V B N M  BackSpace"
-        - "show_numbers show_eschars preferences         space     ,-large Return"
+        - "show_upper Z X C V B N M BackSpace"
+        - "show_numbers show_eschars preferences space ,-large Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
-        - "show_symbols   , \" ' : ; ! ?  BackSpace"
+        - "show_symbols , \" ' : ; ! ? BackSpace"
         - "show_letters show_eschars preferences space º . Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers   \\ / < > = [ ]  BackSpace"
-        - "show_letters show_eschars preferences         space       ≠ § Return"
+        - "show_numbers \\ / < > = [ ] BackSpace"
+        - "show_letters show_eschars preferences space ≠ § Return"
     eschars:
         - "À Á Ã Â É Ê Í Ó Ô Õ"
         - "à á ã â é ê í ó ô õ "
         - "show_numbers Ú Ü ú ü ! ? . BackSpace"
-        - "show_letters show_eschars preferences         space    « »    Return"
+        - "show_letters show_eschars preferences space « » Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -45,7 +44,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -84,6 +83,6 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "wide"
+        outline: "special-2"
         icon: "key-enter"
         keysym: "Return"

data/keyboards/br_wide.yaml

@@ -1,44 +1,44 @@
 # Language: Portuguese (Brazil)
 ---
 outlines:
-    default:     { width: 53.75, height: 42 }
-    thin:        { width: 40.5,  height: 42 }
-    altline:     { width: 81,    height: 42 }
-    wide:        { width: 92,    height: 42 }
-    change-view: { width: 81,    height: 42 }
-    spaceline:   { width: 149.5, height: 42 }
-    special:     { width: 53.75, height: 42 }
-    large:       { width: 81,    height: 42 }
+    default:     { width: 53.76,  height: 42 }
+    change-view: { width: 80.64,  height: 42 }
+    large:       { width: 80.64,  height: 42 }
+    spaceline:   { width: 147.84, height: 42 }
+    special:     { width: 53.76,  height: 42 }
+    special-2:   { width: 80.64,  height: 42 }
+    special-3:   { width: 94.08,  height: 42 }
+    thin:        { width: 40.32,  height: 42 }
 
 views:
     base:
         - "q w e r t y u i o p"
         - "a s d f g h j k l ç"
-        - "Shift_L   z x c v b n m  BackSpace"
-        - "show_numbers show_eschars preferences         space     .-large Return"
+        - "show_upper z x c v b n m BackSpace"
+        - "show_numbers show_eschars preferences space .-large Return"
     upper:
         - "Q W E R T Y U I O P"
         - "A S D F G H J K L Ç"
-        - "Shift_L   Z X C V B N M  BackSpace"
-        - "show_numbers show_eschars preferences         space     ,-large Return"
+        - "show_upper Z X C V B N M BackSpace"
+        - "show_numbers show_eschars preferences space ,-large Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
-        - "show_symbols   , \" ' : ; ! ?  BackSpace"
+        - "show_symbols , \" ' : ; ! ? BackSpace"
         - "show_letters show_eschars preferences space º .-thin Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers   \\ / < > = [ ]  BackSpace"
-        - "show_letters show_eschars preferences         space       ≠ § Return"
+        - "show_numbers \\ / < > = [ ] BackSpace"
+        - "show_letters show_eschars preferences space ≠ § Return"
     eschars:
         - "À Á Ã Â É Ê Í Ó Ô Õ"
         - "à á ã â é ê í ó ô õ "
         - "show_numbers Ú Ü ú ü ! ? . BackSpace"
-        - "show_letters show_eschars preferences         space    « »    Return"
+        - "show_letters show_eschars preferences space « » Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -46,7 +46,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -85,7 +85,7 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "wide"
+        outline: "special-3"
         icon: "key-enter"
         keysym: "Return"
     «:

data/keyboards/by.yaml

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

data/keyboards/by_wide.yaml

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

data/keyboards/ca.yaml

@@ -1,44 +1,43 @@
 # Language: French (Canada)
 ---
 outlines:
-    default:       { width: 35.5,  height: 52 }
-    altline:       { width: 53.5,  height: 52 }
-    wide:          { width: 62,    height: 52 }
-    change-view:   { width: 53.5,  height: 52 }
-    change-view-2: { width: 62,    height: 52 }
-    spaceline:     { width: 135,   height: 52 }
-    special:       { width: 44,    height: 52 }
-    placeholder:   { width: 36,    height: 52 }
+    default:       { width: 35.657,  height: 52 }
+    change-view:   { width: 53.485,  height: 52 }
+    change-view-2: { width: 62.399,  height: 52 }
+    placeholder:   { width: 35.657,  height: 52 }
+    spaceline:     { width: 124.802, height: 52 }
+    special:       { width: 53.485,  height: 52 }
+    special-2:     { width: 62.399,  height: 52 }
 
 views:
     base:
         - "q w e r t y u i o p"
         - "a s d f g h j k l"
-        - "Shift_L   z x c v b n m  BackSpace"
-        - "show_numbers preferences         space        show_eschars Return"
+        - "show_upper z x c v b n m BackSpace"
+        - "show_numbers preferences space show_eschars Return"
     upper:
         - "Q W E R T Y U I O P"
         - "A S D F G H J K L"
-        - "Shift_L   Z X C V B N M  BackSpace"
-        - "show_numbers preferences         space        show_eschars Return"
+        - "show_upper Z X C V B N M BackSpace"
+        - "show_numbers preferences space show_eschars Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
-        - "show_symbols   , \" ' : ; ! ?  BackSpace"
-        - "show_letters preferences         space        show_eschars Return"
+        - "show_symbols , \" ' : ; ! ? BackSpace"
+        - "show_letters preferences space show_eschars Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        show_eschars Return"
+        - "show_numbers_from_symbols \\ / < > = [ ] BackSpace"
+        - "show_letters preferences space show_eschars Return"
     eschars:
         - "à â ç é è ê ë î ï ô"
         - "ù û À Â Ç É È Ê Î Ô"
         - "show_numbers_from_symbols -- ' ! ? . , -- BackSpace"
-        - "show_letters preferences         space        show_eschars Return"
+        - "show_letters preferences space show_eschars Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -46,7 +45,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -84,7 +83,7 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "wide"
+        outline: "special-2"
         icon: "key-enter"
         keysym: "Return"
     --:

data/keyboards/ca_wide.yaml

@@ -1,44 +1,44 @@
 # Language: French (Canada)
 ---
 outlines:
-    default:       { width: 53.7,  height: 42 }
-    altline:       { width: 80.5,  height: 42 }
-    wide:          { width: 92,    height: 42 }
-    change-view:   { width: 80.5,  height: 42 }
-    change-view-2: { width: 92,    height: 42 }
-    spaceline:     { width: 219.5,   height: 42 }
-    special:       { width: 53.7, height: 42 }
-    placeholder:   { width: 53.7,  height: 42 }
+    default:       { width: 53.76,  height: 42 }
+    change-view:   { width: 80.64,  height: 42 }
+    change-view-2: { width: 94.08,  height: 42 }
+    placeholder:   { width: 53.76,  height: 42 }
+    spaceline:     { width: 215.04, height: 42 }
+    special:       { width: 53.76,  height: 42 }
+    special-2:     { width: 80.64,  height: 42 }
+    special-3:     { width: 94.08,  height: 42 }
 
 views:
     base:
         - "q w e r t y u i o p"
         - "a s d f g h j k l"
-        - "Shift_L   z x c v b n m  BackSpace"
-        - "show_numbers preferences         space        show_eschars Return"
+        - "show_upper z x c v b n m BackSpace"
+        - "show_numbers preferences space show_eschars Return"
     upper:
         - "Q W E R T Y U I O P"
         - "A S D F G H J K L"
-        - "Shift_L   Z X C V B N M  BackSpace"
-        - "show_numbers preferences         space        show_eschars Return"
+        - "show_upper Z X C V B N M BackSpace"
+        - "show_numbers preferences space show_eschars Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
-        - "show_symbols   , \" ' : ; ! ?  BackSpace"
-        - "show_letters preferences         space        show_eschars Return"
+        - "show_symbols , \" ' : ; ! ? BackSpace"
+        - "show_letters preferences space show_eschars Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        show_eschars Return"
+        - "show_numbers_from_symbols \\ / < > = [ ] BackSpace"
+        - "show_letters preferences space show_eschars Return"
     eschars:
         - "à â ç é è ê ë î ï ô"
         - "ù û À Â Ç É È Ê Î Ô"
         - "show_numbers_from_symbols -- ' ! ? . , -- BackSpace"
-        - "show_letters preferences         space        show_eschars Return"
+        - "show_letters preferences space show_eschars Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -46,7 +46,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -84,7 +84,7 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "wide"
+        outline: "special-3"
         icon: "key-enter"
         keysym: "Return"
     --:

data/keyboards/ch+de.yaml

@@ -3,38 +3,39 @@
 
 ---
 outlines:
-    default:       { width: 35.33, height: 52 }
-    altline:       { width: 48,    height: 52 }
-    wide:          { width: 59,    height: 52 }
-    change-view:   { width: 48,    height: 52 }
-    change-view-2: { width: 59,    height: 52 }
-    spaceline:     { width: 70,    height: 52 }
-    special:       { width: 28,    height: 52 }
+    default:       { width: 32.415, height: 52 }
+    change-view:   { width: 48.622, height: 52 }
+    change-view-2: { width: 56.726, height: 52 }
+    placeholder:   { width: 32.415, height: 52 }
+    spaceline:     { width: 89.142, height: 52 }
+    special:       { width: 32.415, height: 52 }
+    special-2:     { width: 48.622, height: 52 }
+    special-3:     { width: 56.726, height: 52 }
 
 views:
     base:
         - "q w e r t z u i o p ü"
         - "a s d f g h j k l ö ä"
-        - "Shift_L   y x c v b n m  BackSpace"
-        - "show_numbers ? !  preferences    '   space        , . Return"
+        - "show_upper y x c v b n m -- BackSpace"
+        - "show_numbers preferences ? ' space , . Return"
     upper:
         - "Q W E R T Z U I O P Ü"
         - "A S D F G H J K L Ö Ä"
-        - "Shift_L   Y X C V B N M  BackSpace"
-        - "show_numbers - _  preferences    \"  space        , . Return"
+        - "show_upper Y X C V B N M -- BackSpace"
+        - "show_numbers preferences ! \" space - _ Return"
     numbers:      
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "@ * + - = ( ) ~ < >"
-        - "show_symbols  # & / \\ √ ; : BackSpace"
-        - "show_letters ? !  preferences    _   space        , . Return"
+        - "1 2 3 4 5 6 7 8 9 0 ²"
+        - "@ * + - = ( ) ~ < > ³"
+        - "show_symbols # & / \\ √ ; : -- BackSpace"
+        - "show_letters preferences ? _ space , . Return"
     symbols:
-        - "€ $ £ ¥ % | § µ [ ]"
-        - "© ® § ` ^ { } · ¡ ¿"
-        - "show_numbers  « » ÷ × “ ” „ BackSpace"
-        - "show_letters  preferences    -   space        , . Return"
+        - "€ $ £ ¥ % | § µ [ ] ²"
+        - "© ® § ` ^ { } · ¡ ¿ ³"
+        - "show_numbers « » ÷ × “ ” „ -- BackSpace"
+        - "show_letters preferences ! - space , . Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -42,7 +43,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -68,6 +69,9 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "wide"
+        outline: "special-3"
         icon: "key-enter"
         keysym: "Return"
+    --:
+        outline: "placeholder"
+        text: ""

data/keyboards/ch+de_wide.yaml

@@ -3,38 +3,39 @@
 
 ---
 outlines:
-    default:       { width: 52,     height: 42 }
-    altline:       { width: 70.65,  height: 42 }
-    wide:          { width: 86.84,  height: 42 }
-    change-view:   { width: 70.65,  height: 42 }
-    change-view-2: { width: 86.84,  height: 42 }
-    spaceline:     { width: 103.03, height: 42 }
-    special:       { width: 41.21,  height: 42 }
+    default:       { width: 48.872,  height: 42 }
+    change-view:   { width: 73.308,  height: 42 }
+    change-view-2: { width: 85.526,  height: 42 }
+    placeholder:   { width: 48.872,  height: 42 }
+    spaceline:     { width: 134.398, height: 42 }
+    special:       { width: 48.872,  height: 42 }
+    special-2:     { width: 73.308,  height: 42 }
+    special-3:     { width: 85.526,  height: 42 }
 
 views:
     base:
         - "q w e r t z u i o p ü"
         - "a s d f g h j k l ö ä"
-        - "Shift_L   y x c v b n m  BackSpace"
-        - "show_numbers ? !  preferences    '   space        , . Return"
+        - "show_upper y x c v b n m -- BackSpace"
+        - "show_numbers preferences ? ' space , . Return"
     upper:
         - "Q W E R T Z U I O P Ü"
         - "A S D F G H J K L Ö Ä"
-        - "Shift_L   Y X C V B N M  BackSpace"
-        - "show_numbers - _  preferences    \"  space        , . Return"
+        - "show_upper Y X C V B N M -- BackSpace"
+        - "show_numbers preferences ! \" space - _ Return"
     numbers:      
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "@ * + - = ( ) ~ < >"
-        - "show_symbols  # & / \\ √ ; : BackSpace"
-        - "show_letters ? !  preferences    _   space        , . Return"
+        - "1 2 3 4 5 6 7 8 9 0 ²"
+        - "@ * + - = ( ) ~ < > ³"
+        - "show_symbols # & / \\ √ ; : -- BackSpace"
+        - "show_letters preferences ? _ space , . Return"
     symbols:
-        - "€ $ £ ¥ % | § µ [ ]"
-        - "© ® § ` ^ { } · ¡ ¿"
-        - "show_numbers  « » ÷ × “ ” „ BackSpace"
-        - "show_letters  preferences    -   space        , . Return"
+        - "€ $ £ ¥ % | § µ [ ] ²"
+        - "© ® § ` ^ { } · ¡ ¿ ³"
+        - "show_numbers « » ÷ × “ ” „ -- BackSpace"
+        - "show_letters preferences ! - space , . Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -42,7 +43,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -68,6 +69,9 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "wide"
+        outline: "special-3"
         icon: "key-enter"
         keysym: "Return"
+    --:
+        outline: "placeholder"
+        text: ""

data/keyboards/ch+fr.yaml

@@ -2,43 +2,43 @@
 # Maintained by: Jordi Bossy <jordi@bossy.space>. No Copyright, enjoy!
 ---
 outlines:
-    default:       { width: 35.67, height: 52 }
-    altline:       { width: 53.5,  height: 52 }
-    wide:          { width: 59,    height: 52 }
-    change-view:   { width: 53.5,  height: 52 }
-    change-view-2: { width: 59,    height: 52 }
-    spaceline:     { width: 57,    height: 52 }
-    special:       { width: 28,    height: 52 }
+    default:       { width: 35.657, height: 52 }
+    change-view:   { width: 53.485, height: 52 }
+    change-view-2: { width: 62.399, height: 52 }
+    spaceline:     { width: 80.23,  height: 52 }
+    special:       { width: 35.657, height: 52 }
+    special-2:     { width: 53.485, height: 52 }
+    special-3:     { width: 62.399, height: 52 }
 
 views:
     base:
         - "q w e r t z u i o p"
         - "a s d f g h j k l ?"
-        - "Shift_L   y x c v b n m  BackSpace"
-        - "show_numbers show_eschars preferences    '   space        , . Return"
+        - "show_upper y x c v b n m BackSpace"
+        - "show_numbers show_eschars preferences space , . Return"
     upper:
         - "Q W E R T Z U I O P"
         - "A S D F G H J K L !"
-        - "Shift_L   Y X C V B N M  BackSpace"
-        - "show_numbers show_eschars preferences    \"  space        , . Return"
+        - "show_upper Y X C V B N M BackSpace"
+        - "show_numbers show_eschars preferences space ' \" Return"
     numbers:      
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ * + - = ( ) ~ < >"
-        - "show_symbols  # & / \\ √ ; : BackSpace"
-        - "show_letters show_eschars preferences    _   space        , . Return"
+        - "show_symbols # & / \\ √ ; : BackSpace"
+        - "show_letters show_eschars preferences space , . Return"
     symbols:
         - "€ $ £ ¥ % | § µ [ ]"
         - "© ® § ` ^ { } · ¡ ¿"
-        - "show_numbers  « » ÷ × “ ” „ BackSpace"
-        - "show_letters show_eschars preferences    -   space        , . Return"
+        - "show_numbers « » ÷ × “ ” „ BackSpace"
+        - "show_letters show_eschars preferences space - _ Return"
     eschars:
         - "à â ç é è ê î ô ù û"
         - "À Â Ç É È Ê Î Ô Ù Û"
-        - "show_numbers  æ œ ä ë ï ö ü  BackSpace"
-        - "show_letters show_eschars preferences ' space        ° ß Return"
+        - "show_numbers æ œ ä ë ï ö ü BackSpace"
+        - "show_letters show_eschars preferences space ° ß Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -46,7 +46,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -79,6 +79,6 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "wide"
+        outline: "special-3"
         icon: "key-enter"
         keysym: "Return"

data/keyboards/ch+fr_wide.yaml

@@ -2,44 +2,42 @@
 # Maintained by: Jordi Bossy <jordi@bossy.space>. No Copyright, enjoy!
 ---
 outlines:
-    default:       { width: 53.5,  height: 42 }
-    thin:          { width: 40,    height: 42 }
-    altline:       { width: 80,    height: 42 }
-    wide:          { width: 86.84, height: 42 }
-    change-view:   { width: 80,    height: 42 }
-    change-view-2: { width: 86.84, height: 42 }
-    spaceline:     { width: 126,   height: 42 }
-    special:       { width: 41.21, height: 42 }
+    default:       { width: 53.76,  height: 42 }
+    change-view:   { width: 80.64,  height: 42 }
+    spaceline:     { width: 120.96, height: 42 }
+    special:       { width: 53.76,  height: 42 }
+    special-2:     { width: 80.64,  height: 42 }
+    special-3:     { width: 94.08,  height: 42 }
 
 views:
     base:
         - "q w e r t z u i o p"
         - "a s d f g h j k l ?"
-        - "Shift_L   y x c v b n m  BackSpace"
-        - "show_numbers show_eschars preferences    '   space        , . Return"
+        - "show_upper y x c v b n m BackSpace"
+        - "show_numbers show_eschars preferences space , . Return"
     upper:
         - "Q W E R T Z U I O P"
         - "A S D F G H J K L !"
-        - "Shift_L   Y X C V B N M  BackSpace"
-        - "show_numbers show_eschars preferences    \"  space        , . Return"
+        - "show_upper Y X C V B N M BackSpace"
+        - "show_numbers show_eschars preferences space ' \" Return"
     numbers:      
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ * + - = ( ) ~ < >"
-        - "show_symbols  # & / \\ √ ; : BackSpace"
-        - "show_letters show_eschars preferences    _   space        , . Return"
+        - "show_symbols # & / \\ √ ; : BackSpace"
+        - "show_letters show_eschars preferences space , . Return"
     symbols:
         - "€ $ £ ¥ % | § µ [ ]"
         - "© ® § ` ^ { } · ¡ ¿"
-        - "show_numbers  « » ÷ × “ ” „ BackSpace"
-        - "show_letters show_eschars preferences    --thin   space        , . Return"
+        - "show_numbers « » ÷ × “ ” „ BackSpace"
+        - "show_letters show_eschars preferences space - _ Return"
     eschars:
         - "à â ç é è ê î ô ù û"
         - "À Â Ç É È Ê Î Ô Ù Û"
-        - "show_numbers  æ œ ä ë ï ö ü  BackSpace"
-        - "show_letters show_eschars preferences ' space        ° ß Return"
+        - "show_numbers æ œ ä ë ï ö ü BackSpace"
+        - "show_letters show_eschars preferences space ° ß Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -47,7 +45,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -80,23 +78,6 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "wide"
+        outline: "special-3"
         icon: "key-enter"
         keysym: "Return"
-    "'":
-        outline: "thin"
-    "\"":
-        outline: "thin"
-    _:
-        outline: "thin"
-    --thin:
-        outline: "thin"
-        text: "-"
-    .:
-        outline: "thin"
-    ",":
-        outline: "thin"
-    ß:
-        outline: "thin"
-    °:
-        outline: "thin"

data/keyboards/ch.yaml

@@ -4,44 +4,44 @@
 
 ---
 outlines:
-    default:       { width: 35.33,  height: 58 }
-    doublewidth:   { width: 70.66,  height: 58 }
-    altline:       { width: 52.8,   height: 58 }
-    wide:          { width: 64.9,   height: 58 }
-    change-view:   { width: 52.8,   height: 58 }
-    change-view-2: { width: 64.9,   height: 58 }
-    spaceline:     { width: 111.75, height: 58 }
-    special:       { width: 35.33,  height: 58 }
+    default:       { width: 32.415, height: 52 }
+    change-view:   { width: 48.622, height: 52 }
+    change-view-2: { width: 56.726, height: 52 }
+    fill:          { width: 64.83,  height: 52 }
+    spaceline:     { width: 105.35, height: 52 }
+    special:       { width: 32.415, height: 52 }
+    special-2:     { width: 48.622, height: 52 }
+    special-3:     { width: 56.726, height: 52 }
 
 views:
     base:
         - "q w e r t z u i o p ü"
         - "a s d f g h j k l ö ä"
-        - "Shift_L   y x c v b n m ' BackSpace"
-        - "show_numbers show_eschars preferences       Space    , .    Return"
+        - "show_upper y x c v b n m ' BackSpace"
+        - "show_numbers show_eschars preferences space , . Return"
     upper:
         - "Q W E R T Z U I O P Ü"
         - "A S D F G H J K L Ö Ä"
-        - "Shift_L   Y X C V B N M \" BackSpace"
-        - "show_numbers show_eschars preferences       Space    , .    Return"
+        - "show_upper Y X C V B N M \" BackSpace"
+        - "show_numbers show_eschars preferences space , . Return"
     numbers:      
         - "1 2 3 4 5 6 7 8 9 0 ^"
         - "* + - = ( ) ~ < > ! ?"
         - "show_symbols _ # & / \\ √ ; : BackSpace"
-        - "show_letters show_eschars preferences       Space    , .    Return"
+        - "show_letters show_eschars preferences space , . Return"
     symbols:
-        - "€ $ £ ¥ % | § µ [ ]"
-        - "© ® § ` { } @ · ¡ ¿"
-        - "show_numbers  « » ÷ × “ ” „ BackSpace"
-        - "show_letters show_eschars preferences       Space    , .    Return"
+        - "€ $ £ ¥ % | § µ [ ] ²"
+        - "© ® § ` { } @ · ¡ ¿ ³"
+        - "show_numbers « » ÷ × “ ” „ BackSpace"
+        - "show_letters show_eschars preferences space , . Return"
     eschars:
         - "à â ç é è ê î ô ù û ñ"
         - "À Â Ç É È Ê Î Ô Ù Û Ñ"
-        - "show_numbers  æ œ ä ë ï ö ü ß BackSpace"
-        - "show_letters show_eschars preferences       Space     °     Return"
+        - "show_numbers æ œ ä ë ï ö ü ß BackSpace"
+        - "show_letters show_eschars preferences space ° Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -49,7 +49,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -78,18 +78,14 @@ buttons:
                 unlock_view: "base"
         outline: "change-view"
         label: "Ââ"
-    Space:
+    space:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "wide"
+        outline: "special-3"
         icon: "key-enter"
         keysym: "Return"
     °:
-        outline: "doublewidth"
-    "|":
-        outline: "doublewidth"
-    "}":
-        outline: "doublewidth"
+        outline: "fill"
     ×:
-        outline: "doublewidth"
+        outline: "fill"

data/keyboards/ch_wide.yaml

@@ -4,46 +4,45 @@
 
 ---
 outlines:
-    default:       { width: 48,  height: 42 }
-    doublewidth:   { width: 96,  height: 42 }
-    narrow:        { width: 33,  height: 42 }
-    large:         { width: 66,  height: 42 }
-    altline:       { width: 72,  height: 42 }
-    wide:          { width: 108, height: 42 }
-    change-view:   { width: 72,  height: 42 }
-    change-view-2: { width: 108, height: 42 }
-    spaceline:     { width: 162, height: 42 }
-    special:       { width: 48,  height: 42 }
+    default:       { width: 48.872, height: 42 }
+    change-view:   { width: 73.308, height: 42 }
+    fill:          { width: 97.744, height: 42 }
+    large:         { width: 73.308, height: 42 }
+    narrow:        { width: 36.654, height: 42 }
+    spaceline:     { width: 183.27, height: 42 }
+    special:       { width: 48.872, height: 42 }
+    special-2:     { width: 73.308, height: 42 }
+    special-3:     { width: 85.526, height: 42 }
 
 views:
     base:
         - "q w e r t z u i o p ü"
         - "a s d f g h j k l ö ä"
-        - "Shift_L   y x c v b n m ' BackSpace"
-        - "show_numbers show_eschars preferences       Space    , .    Return"
+        - "show_upper y x c v b n m ' BackSpace"
+        - "show_numbers show_eschars preferences space , . Return"
     upper:
         - "Q W E R T Z U I O P Ü"
         - "A S D F G H J K L Ö Ä"
-        - "Shift_L   Y X C V B N M \" BackSpace"
-        - "show_numbers show_eschars preferences       Space    , .    Return"
+        - "show_upper Y X C V B N M \" BackSpace"
+        - "show_numbers show_eschars preferences space , . Return"
     numbers:      
         - "1 2 3 4 5 6 7 8 9 0 ^"
         - "* + - = ( ) ~ < > ! ?"
         - "show_symbols _ # & / \\ √ ; : BackSpace"
-        - "show_letters show_eschars preferences       Space    , .    Return"
+        - "show_letters show_eschars preferences space , . Return"
     symbols:
-        - "€ $ £ ¥ % | § µ [ ]"
-        - "© ® § ` { } @ · ¡ ¿"
-        - "show_numbers  « » ÷ × “ ” „ BackSpace"
-        - "show_letters show_eschars preferences       Space    , .    Return"
+        - "€ $ £ ¥ % | § µ [ ] ²"
+        - "© ® § ` { } @ · ¡ ¿ ³"
+        - "show_numbers « » ÷ × “ ” „ BackSpace"
+        - "show_letters show_eschars preferences space , . Return"
     eschars:
         - "à â ç é è ê î ô ù û ñ"
         - "À Â Ç É È Ê Î Ô Ù Û Ñ"
-        - "show_numbers  æ œ ä ë ï ö ü ß BackSpace"
-        - "show_letters show_eschars preferences       Space     °     Return"
+        - "show_numbers æ œ ä ë ï ö ü ß BackSpace"
+        - "show_letters show_eschars preferences space ° Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -51,7 +50,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -80,11 +79,11 @@ buttons:
                 unlock_view: "base"
         outline: "change-view"
         label: "Ââ"
-    Space:
+    space:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "wide"
+        outline: "special-3"
         icon: "key-enter"
         keysym: "Return"
     °:
@@ -93,9 +92,5 @@ buttons:
         outline: "narrow"
     ",":
         outline: "narrow"
-    "|":
-        outline: "doublewidth"
-    "}":
-        outline: "doublewidth"
     ×:
-        outline: "doublewidth"
+        outline: "fill"

data/keyboards/cz+qwerty.yaml

@@ -1,55 +1,54 @@
 # Language: Czech (QWERTY)
 ---
 outlines:
-    default:       { width: 35.33, height: 52 }
-    altline:       { width: 52.67, height: 52 }
-    wide:          { width: 52.67, height: 52 }
-    change-view:   { width: 52.67, height: 52 }
-    spaceline:     { width: 106,   height: 52 }
-    special:       { width: 35.33, height: 52 }
-    change-view-2: { width: 35.33, height: 52 }
+    default:       { width: 35.657,  height: 52 }
+    change-view:   { width: 53.485,  height: 52 }
+    change-view-2: { width: 35.657,  height: 52 }
+    spaceline:     { width: 106.972, height: 52 }
+    special:       { width: 35.657,  height: 52 }
+    special-2:     { width: 53.485,  height: 52 }
 
 views:
     base:
         - "q w e r t y u i o p"
         - "a s d f g h j k l"
-        - "Shift_L    z x c v b n m    BackSpace"
-        - "show_numbers show_accents preferences     space    , . Return"
+        - "show_upper z x c v b n m BackSpace"
+        - "show_numbers show_accents preferences space , . Return"
     upper:
         - "Q W E R T Y U I O P"
         - "A S D F G H J K L"
-        - "Shift_L    Z X C V B N M    BackSpace"
-        - "show_numbers show_upper_accents preferences     space    ! ? Return"
+        - "show_upper Z X C V B N M BackSpace"
+        - "show_numbers show_upper_accents preferences space ! ? Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
-        - "show_symbols    , \" ' : ; ! ?    BackSpace"
-        - "show_letters show_accents preferences     space    , . Return"
+        - "show_symbols , \" ' : ; ! ? BackSpace"
+        - "show_letters show_accents preferences space , . Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers    \\ / < > = [ ]    BackSpace"
-        - "show_letters show_accents preferences     space    , . Return"
+        - "show_numbers \\ / < > = [ ] BackSpace"
+        - "show_letters show_accents preferences space , . Return"
     accents:
         - "ä ě é ř ť ý ů í ó ö"
         - "á š ď ë ŕ ú ü ô ľ"
-        - "accents_Shift_L    ž ß č ç ñ ň ĺ    BackSpace"
-        - "show_letters show_accents preferences     space    , . Return"
+        - "show_upper_accents_from_accents ž ß č ç ñ ň ĺ BackSpace"
+        - "show_letters show_accents preferences space , . Return"
     upper_accents:
         - "Ä Ě É Ř Ť Ý Ů Í Ó Ö"
         - "Á Š Ď Ë Ŕ Ú Ü Ô Ľ"
-        - "accents_Shift_L    Ž ẞ Č Ç Ñ Ň Ĺ    BackSpace"
-        - "show_letters show_upper_accents preferences     space    , . Return"
+        - "show_upper_accents_from_accents Ž ẞ Č Ç Ñ Ň Ĺ BackSpace"
+        - "show_letters show_upper_accents preferences space , . Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
                 unlock_view: "base"
         outline: "change-view"
         icon: "key-shift"
-    accents_Shift_L:
+    show_upper_accents_from_accents:
         action:
             locking:
                 lock_view: "upper_accents"
@@ -57,7 +56,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -97,6 +96,6 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "wide"
+        outline: "special-2"
         icon: "key-enter"
         keysym: "Return"

data/keyboards/cz+qwerty_wide.yaml

@@ -1,63 +1,62 @@
 # Language: Czech (QWERTY)
 ---
 outlines:
-    default:       { width: 54,  height: 42 }
-    altline:       { width: 81,  height: 42 }
-    wide:          { width: 81,  height: 42 }
-    change-view:   { width: 81,  height: 42 }
-    spaceline:     { width: 162, height: 42 }
-    special:       { width: 54,  height: 42 }
-    change-view-2: { width: 54,  height: 42 }
+    default:       { width: 53.76,  height: 42 }
+    change-view:   { width: 53.76,  height: 42 }
+    change-view-2: { width: 80.64,  height: 42 }
+    spaceline:     { width: 161.28, height: 42 }
+    special:       { width: 53.76,  height: 42 }
+    special-2:     { width: 80.64,  height: 42 }
 
 views:
     base:
         - "q w e r t y u i o p"
         - "a s d f g h j k l"
-        - "Shift_L    z x c v b n m    BackSpace"
-        - "show_numbers show_accents preferences     space    , . Return"
+        - "show_upper z x c v b n m BackSpace"
+        - "show_numbers show_accents preferences space , . Return"
     upper:
         - "Q W E R T Y U I O P"
         - "A S D F G H J K L"
-        - "Shift_L    Z X C V B N M    BackSpace"
-        - "show_numbers show_upper_accents preferences     space    ! ? Return"
+        - "show_upper Z X C V B N M BackSpace"
+        - "show_numbers show_upper_accents preferences space ! ? Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
-        - "show_symbols    , \" ' : ; ! ?    BackSpace"
-        - "show_letters show_accents preferences     space    , . Return"
+        - "show_symbols , \" ' : ; ! ? BackSpace"
+        - "show_letters show_accents preferences space , . Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers    \\ / < > = [ ]    BackSpace"
-        - "show_letters show_accents preferences     space    , . Return"
+        - "show_numbers \\ / < > = [ ] BackSpace"
+        - "show_letters show_accents preferences space , . Return"
     accents:
         - "ä ě é ř ť ý ů í ó ö"
         - "á š ď ë ŕ ú ü ô ľ"
-        - "accents_Shift_L    ž ß č ç ñ ň ĺ    BackSpace"
-        - "show_letters show_accents preferences     space    , . Return"
+        - "accents_show_upper ž ß č ç ñ ň ĺ BackSpace"
+        - "show_letters show_accents preferences space , . Return"
     upper_accents:
         - "Ä Ě É Ř Ť Ý Ů Í Ó Ö"
         - "Á Š Ď Ë Ŕ Ú Ü Ô Ľ"
-        - "accents_Shift_L    Ž ẞ Č Ç Ñ Ň Ĺ    BackSpace"
-        - "show_letters show_upper_accents preferences     space    , . Return"
+        - "accents_show_upper Ž ẞ Č Ç Ñ Ň Ĺ BackSpace"
+        - "show_letters show_upper_accents preferences space , . Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
                 unlock_view: "base"
-        outline: "change-view"
+        outline: "change-view-2"
         icon: "key-shift"
-    accents_Shift_L:
+    accents_show_upper:
         action:
             locking:
                 lock_view: "upper_accents"
                 unlock_view: "base"
-        outline: "change-view"
+        outline: "change-view-2"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -67,36 +66,36 @@ buttons:
     show_numbers:
         action:
             set_view: "numbers"
-        outline: "change-view"
+        outline: "change-view-2"
         label: "123"
     show_letters:
         action:
             set_view: "base"
-        outline: "change-view"
+        outline: "change-view-2"
         label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"
-        outline: "change-view"
+        outline: "change-view-2"
         label: "*/="
     show_accents:
         action:
             locking:
                 lock_view: "accents"
                 unlock_view: "base"
-        outline: "change-view-2"
+        outline: "change-view"
         label: "á"
     show_upper_accents:
         action:
             locking:
                 lock_view: "upper_accents"
                 unlock_view: "base"
-        outline: "change-view-2"
+        outline: "change-view"
         label: "Á"
     space:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "wide"
+        outline: "special-2"
         icon: "key-enter"
         keysym: "Return"

data/keyboards/cz.yaml

@@ -1,55 +1,54 @@
 # Language: Czech
 ---
 outlines:
-    default:       { width: 35.33, height: 52 }
-    altline:       { width: 52.67, height: 52 }
-    wide:          { width: 52.67, height: 52 }
-    change-view:   { width: 52.67, height: 52 }
-    spaceline:     { width: 106,   height: 52 }
-    special:       { width: 35.33, height: 52 }
-    change-view-2: { width: 35.33, height: 52 }
+    default:       { width: 35.657,  height: 52 }
+    change-view:   { width: 53.485,  height: 52 }
+    change-view-2: { width: 35.657,  height: 52 }
+    spaceline:     { width: 106.972, height: 52 }
+    special:       { width: 35.657,  height: 52 }
+    special-2:     { width: 53.485,  height: 52 }
 
 views:
     base:
         - "q w e r t z u i o p"
         - "a s d f g h j k l"
-        - "Shift_L    y x c v b n m    BackSpace"
-        - "show_numbers show_accents preferences     space    , . Return"
+        - "show_upper y x c v b n m BackSpace"
+        - "show_numbers show_accents preferences space , . Return"
     upper:
         - "Q W E R T Z U I O P"
         - "A S D F G H J K L"
-        - "Shift_L    Y X C V B N M    BackSpace"
-        - "show_numbers show_upper_accents preferences     space    ! ? Return"
+        - "show_upper Y X C V B N M BackSpace"
+        - "show_numbers show_upper_accents preferences space ! ? Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
-        - "show_symbols    , \" ' : ; ! ?    BackSpace"
-        - "show_letters show_accents preferences     space    , . Return"
+        - "show_symbols , \" ' : ; ! ? BackSpace"
+        - "show_letters show_accents preferences space , . Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers    \\ / < > = [ ]    BackSpace"
-        - "show_letters show_accents preferences     space    , . Return"
+        - "show_numbers \\ / < > = [ ] BackSpace"
+        - "show_letters show_accents preferences space , . Return"
     accents:
         - "ä ě é ř ť ž ů í ó ö"
         - "á š ď ë ŕ ú ü ô ľ"
-        - "accents_Shift_L    ý ß č ç ñ ň ĺ    BackSpace"
-        - "show_letters show_accents preferences     space    , . Return"
+        - "show_upper_accents_from_accents ý ß č ç ñ ň ĺ BackSpace"
+        - "show_letters show_accents preferences space , . Return"
     upper_accents:
         - "Ä Ě É Ř Ť Ž Ů Í Ó Ö"
         - "Á Š Ď Ë Ŕ Ú Ü Ô Ľ"
-        - "accents_Shift_L    Ý ẞ Č Ç Ñ Ň Ĺ    BackSpace"
-        - "show_letters show_upper_accents preferences     space    , . Return"
+        - "show_upper_accents_from_accents Ý ẞ Č Ç Ñ Ň Ĺ BackSpace"
+        - "show_letters show_upper_accents preferences space , . Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
                 unlock_view: "base"
         outline: "change-view"
         icon: "key-shift"
-    accents_Shift_L:
+    show_upper_accents_from_accents:
         action:
             locking:
                 lock_view: "upper_accents"
@@ -57,7 +56,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -97,6 +96,6 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "wide"
+        outline: "special-2"
         icon: "key-enter"
         keysym: "Return"

data/keyboards/cz_wide.yaml

@@ -1,63 +1,62 @@
 # Language: Czech
 ---
 outlines:
-    default:       { width: 54,  height: 42 }
-    altline:       { width: 81,  height: 42 }
-    wide:          { width: 81,  height: 42 }
-    change-view:   { width: 81,  height: 42 }
-    spaceline:     { width: 162, height: 42 }
-    special:       { width: 54,  height: 42 }
-    change-view-2: { width: 54,  height: 42 }
+    default:       { width: 53.76,  height: 42 }
+    change-view:   { width: 53.76,  height: 42 }
+    change-view-2: { width: 80.64,  height: 42 }
+    spaceline:     { width: 161.28, height: 42 }
+    special:       { width: 53.76,  height: 42 }
+    special-2:     { width: 80.64,  height: 42 }
 
 views:
     base:
         - "q w e r t z u i o p"
         - "a s d f g h j k l"
-        - "Shift_L    y x c v b n m    BackSpace"
-        - "show_numbers show_accents preferences     space    , . Return"
+        - "show_upper y x c v b n m BackSpace"
+        - "show_numbers show_accents preferences space , . Return"
     upper:
         - "Q W E R T Z U I O P"
         - "A S D F G H J K L"
-        - "Shift_L    Y X C V B N M    BackSpace"
-        - "show_numbers show_upper_accents preferences     space    ! ? Return"
+        - "show_upper Y X C V B N M BackSpace"
+        - "show_numbers show_upper_accents preferences space ! ? Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
-        - "show_symbols    , \" ' : ; ! ?    BackSpace"
-        - "show_letters show_accents preferences     space    , . Return"
+        - "show_symbols , \" ' : ; ! ? BackSpace"
+        - "show_letters show_accents preferences space , . Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers    \\ / < > = [ ]    BackSpace"
-        - "show_letters show_accents preferences     space    , . Return"
+        - "show_numbers \\ / < > = [ ] BackSpace"
+        - "show_letters show_accents preferences space , . Return"
     accents:
         - "ä ě é ř ť ž ů í ó ö"
         - "á š ď ë ŕ ú ü ô ľ"
-        - "accents_Shift_L    ý ß č ç ñ ň ĺ    BackSpace"
-        - "show_letters show_accents preferences     space    , . Return"
+        - "accents_show_upper ý ß č ç ñ ň ĺ BackSpace"
+        - "show_letters show_accents preferences space , . Return"
     upper_accents:
         - "Ä Ě É Ř Ť Ž Ů Í Ó Ö"
         - "Á Š Ď Ë Ŕ Ú Ü Ô Ľ"
-        - "accents_Shift_L    Ý ẞ Č Ç Ñ Ň Ĺ    BackSpace"
-        - "show_letters show_upper_accents preferences     space    , . Return"
+        - "accents_show_upper Ý ẞ Č Ç Ñ Ň Ĺ BackSpace"
+        - "show_letters show_upper_accents preferences space , . Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
                 unlock_view: "base"
-        outline: "change-view"
+        outline: "change-view-2"
         icon: "key-shift"
-    accents_Shift_L:
+    accents_show_upper:
         action:
             locking:
                 lock_view: "upper_accents"
                 unlock_view: "base"
-        outline: "change-view"
+        outline: "change-view-2"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -67,36 +66,36 @@ buttons:
     show_numbers:
         action:
             set_view: "numbers"
-        outline: "change-view"
+        outline: "change-view-2"
         label: "123"
     show_letters:
         action:
             set_view: "base"
-        outline: "change-view"
+        outline: "change-view-2"
         label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"
-        outline: "change-view"
+        outline: "change-view-2"
         label: "*/="
     show_accents:
         action:
             locking:
                 lock_view: "accents"
                 unlock_view: "base"
-        outline: "change-view-2"
+        outline: "change-view"
         label: "á"
     show_upper_accents:
         action:
             locking:
                 lock_view: "upper_accents"
                 unlock_view: "base"
-        outline: "change-view-2"
+        outline: "change-view"
         label: "Á"
     space:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "wide"
+        outline: "special-2"
         icon: "key-enter"
         keysym: "Return"

data/keyboards/de+bone.yaml

@@ -1,45 +1,44 @@
 # 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 }
+    default:            { width: 32.415, height: 52 }
+    change-view:        { width: 48.622, height: 52 }
+    fill:               { width: 64.83,  height: 52 }
     spaceline:          { width: 112.45, height: 52 }
-
+    special:            { width: 32.415, height: 52 }
+    special-2:          { width: 48.622, height: 52 }
+    subtle-highlight:   { width: 32.415, height: 52 }
+    subtle-highlight-2: { width: 64.83,  height: 52 }
 
 views:
     base:
         - "j d u a x p h l m w ß"
         - "c t i e o b n r s g q"
-        - "Shift_L   f v ü ä ö y z k BackSpace"
-        - "show_numbers show_eschars preferences         space        , . Return"
+        - "show_upper f v ü ä ö y z k BackSpace"
+        - "show_numbers show_eschars preferences space , . Return"
     upper:
         - "J D U A X P H L M W ẞ"
         - "C T I E O B N R S G Q"
-        - "Shift_L   F V Ü Ä Ö Y Z K BackSpace"
-        - "show_numbers show_eschars preferences         space        ! ? Return"
+        - "show_upper F V Ü Ä Ö Y Z K BackSpace"
+        - "show_numbers show_eschars preferences space ! ? Return"
     numbers:
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "@ # € % & - _ + ( )"
-        - "show_symbols   ; \" ' : = < >  BackSpace"
-        - "show_letters show_eschars preferences         space        , . Return"
+        - "1 2 3 4 5 6 7 8 9 0 ²"
+        - "@ # € % & - _ + ( ) ³"
+        - "show_symbols ; \" ' : = < > BackSpace"
+        - "show_letters show_eschars preferences space , . Return"
     symbols:
-        - "~ ` ´ | · √ µ ÷ × ¶"
-        - "© ® £ $ ¥ ^ ° * { }"
-        - "show_numbers   \\ / § π τ [ ]  BackSpace"
-        - "show_letters show_eschars preferences         space        , . Return"
+        - "~ ` ´ | · √ µ ÷ × ¶ ²"
+        - "© ® £ $ ¥ ^ ° * { } ³"
+        - "show_numbers \\ / § π τ [ ] BackSpace"
+        - "show_letters show_eschars preferences space , . Return"
     eschars:
         - "ä-subtle-highlight è é ö-subtle-highlight ü-subtle-highlight-2 Ä-subtle-highlight È É Ö-subtle-highlight Ü-subtle-highlight"
         - "à â ê î ô À Â Ê Î Ô"
-        - "show_numbers  « » ç Ç æ œ ß-subtle-highlight BackSpace"
-        - "show_letters show_eschars preferences         space        „ “ Return"
+        - "show_numbers « » ç Ç æ œ ß-subtle-highlight BackSpace"
+        - "show_letters show_eschars preferences space „ “ Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -47,7 +46,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -80,7 +79,7 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "altline"
+        outline: "special-2"
         icon: "key-enter"
         keysym: "Return"
     ä-subtle-highlight:
@@ -104,14 +103,6 @@ buttons:
     ß-subtle-highlight:
         outline: "subtle-highlight"
         text: "ß"
-    5:
-        outline: "fill"
-    "&":
-        outline: "fill"
-    ·:
-        outline: "fill"
-    ¥:
-        outline: "fill"
     ô:
         outline: "fill"
     Ç:

data/keyboards/de+bone_wide.yaml

@@ -1,45 +1,44 @@
 # 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 }
-
+    default:            { width: 48.872,  height: 42 }
+    change-view:        { width: 73.308,  height: 42 }
+    fill:               { width: 97.744,  height: 42 }
+    spaceline:          { width: 171.052, height: 42 }
+    special:            { width: 48.872,  height: 42 }
+    special-2:          { width: 73.308,  height: 42 }
+    subtle-highlight:   { width: 48.872,  height: 42 }
+    subtle-highlight-2: { width: 97.744,  height: 42 }
 
 views:
     base:
         - "j d u a x p h l m w ß"
         - "c t i e o b n r s g q"
-        - "Shift_L   f v ü ä ö y z k BackSpace"
-        - "show_numbers show_eschars preferences         space        , . Return"
+        - "show_upper f v ü ä ö y z k BackSpace"
+        - "show_numbers show_eschars preferences space , . Return"
     upper:
         - "J D U A X P H L M W ẞ"
         - "C T I E O B N R S G Q"
-        - "Shift_L   F V Ü Ä Ö Y Z K BackSpace"
-        - "show_numbers show_eschars preferences         space        ! ? Return"
+        - "show_upper F V Ü Ä Ö Y Z K BackSpace"
+        - "show_numbers show_eschars preferences space ! ? Return"
     numbers:
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "@ # € % & - _ + ( )"
-        - "show_symbols   ; \" ' : = < >  BackSpace"
-        - "show_letters show_eschars preferences         space        , . Return"
+        - "1 2 3 4 5 6 7 8 9 0 ²"
+        - "@ # € % & - _ + ( ) ³"
+        - "show_symbols ; \" ' : = < > BackSpace"
+        - "show_letters show_eschars preferences space , . Return"
     symbols:
-        - "~ ` ´ | · √ µ ÷ × ¶"
-        - "© ® £ $ ¥ ^ ° * { }"
-        - "show_numbers   \\ / § π τ [ ]  BackSpace"
-        - "show_letters show_eschars preferences         space        , . Return"
+        - "~ ` ´ | · √ µ ÷ × ¶ ²"
+        - "© ® £ $ ¥ ^ ° * { } ³"
+        - "show_numbers \\ / § π τ [ ] BackSpace"
+        - "show_letters show_eschars preferences space , . Return"
     eschars:
         - "ä-subtle-highlight è é ö-subtle-highlight ü-subtle-highlight-2 Ä-subtle-highlight È É Ö-subtle-highlight Ü-subtle-highlight"
         - "à â ê î ô À Â Ê Î Ô"
-        - "show_numbers  « » ç Ç æ œ ß-subtle-highlight BackSpace"
-        - "show_letters show_eschars preferences         space        „ “ Return"
+        - "show_numbers « » ç Ç æ œ ß-subtle-highlight BackSpace"
+        - "show_letters show_eschars preferences space „ “ Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -47,7 +46,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -80,7 +79,7 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "altline"
+        outline: "special-2"
         icon: "key-enter"
         keysym: "Return"
     ä-subtle-highlight:
@@ -104,14 +103,6 @@ buttons:
     ß-subtle-highlight:
         outline: "subtle-highlight"
         text: "ß"
-    5:
-        outline: "fill"
-    "&":
-        outline: "fill"
-    ·:
-        outline: "fill"
-    ¥:
-        outline: "fill"
     ô:
         outline: "fill"
     Ç:

data/keyboards/de+neo.yaml

@@ -1,45 +1,44 @@
 # 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 }
+    default:            { width: 32.415, height: 52 }
+    change-view:        { width: 48.622, height: 52 }
+    fill:               { width: 64.83,  height: 52 }
     spaceline:          { width: 112.45, height: 52 }
-
+    special:            { width: 32.415, height: 52 }
+    special-2:          { width: 48.622, height: 52 }
+    subtle-highlight:   { width: 32.415, height: 52 }
+    subtle-highlight-2: { width: 64.83,  height: 52 }
 
 views:
     base:
         - "x v l c w k h g f q ß"
         - "u i a e o s n r t d y"
-        - "Shift_L   ü ö ä p z b m j BackSpace"
-        - "show_numbers show_eschars preferences         space        , . Return"
+        - "show_upper ü ö ä p z b m j BackSpace"
+        - "show_numbers show_eschars preferences space , . Return"
     upper:
         - "X V L C W K H G F Q ẞ"
         - "U I A E O S N R T D Y"
-        - "Shift_L   Ü Ö Ä P Z B M J BackSpace"
-        - "show_numbers show_eschars preferences         space        ! ? Return"
+        - "show_upper Ü Ö Ä P Z B M J BackSpace"
+        - "show_numbers show_eschars preferences space ! ? Return"
     numbers:
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "@ # € % & - _ + ( )"
-        - "show_symbols   ; \" ' : = < >  BackSpace"
-        - "show_letters show_eschars preferences         space        , . Return"
+        - "1 2 3 4 5 6 7 8 9 0 ²"
+        - "@ # € % & - _ + ( ) ³"
+        - "show_symbols ; \" ' : = < > BackSpace"
+        - "show_letters show_eschars preferences space , . Return"
     symbols:
-        - "~ ` ´ | · √ µ ÷ × ¶"
-        - "© ® £ $ ¥ ^ ° * { }"
-        - "show_numbers   \\ / § π τ [ ]  BackSpace"
-        - "show_letters show_eschars preferences         space        , . Return"
+        - "~ ` ´ | · √ µ ÷ × ¶ ²"
+        - "© ® £ $ ¥ ^ ° * { } ³"
+        - "show_numbers \\ / § π τ [ ] BackSpace"
+        - "show_letters show_eschars preferences space , . Return"
     eschars:
         - "ä-subtle-highlight è é ö-subtle-highlight ü-subtle-highlight-2 Ä-subtle-highlight È É Ö-subtle-highlight Ü-subtle-highlight"
         - "à â ê î ô À Â Ê Î Ô"
-        - "show_numbers  « » ç Ç æ œ ß-subtle-highlight BackSpace"
-        - "show_letters show_eschars preferences         space        „ “ Return"
+        - "show_numbers « » ç Ç æ œ ß-subtle-highlight BackSpace"
+        - "show_letters show_eschars preferences space „ “ Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -47,7 +46,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -80,7 +79,7 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "altline"
+        outline: "special-2"
         icon: "key-enter"
         keysym: "Return"
     ä-subtle-highlight:
@@ -104,14 +103,6 @@ buttons:
     ß-subtle-highlight:
         outline: "subtle-highlight"
         text: "ß"
-    5:
-        outline: "fill"
-    "&":
-        outline: "fill"
-    ·:
-        outline: "fill"
-    ¥:
-        outline: "fill"
     ô:
         outline: "fill"
     Ç:

data/keyboards/de+neo_wide.yaml

@@ -1,45 +1,44 @@
 # 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 }
-
+    default:            { width: 48.872,  height: 42 }
+    change-view:        { width: 73.308,  height: 42 }
+    fill:               { width: 97.744,  height: 42 }
+    spaceline:          { width: 171.052, height: 42 }
+    special:            { width: 48.872,  height: 42 }
+    special-2:          { width: 73.308,  height: 42 }
+    subtle-highlight:   { width: 48.872,  height: 42 }
+    subtle-highlight-2: { width: 97.744,  height: 42 }
 
 views:
     base:
         - "x v l c w k h g f q ß"
         - "u i a e o s n r t d y"
-        - "Shift_L   ü ö ä p z b m j BackSpace"
-        - "show_numbers show_eschars preferences         space        , . Return"
+        - "show_upper ü ö ä p z b m j BackSpace"
+        - "show_numbers show_eschars preferences space , . Return"
     upper:
         - "X V L C W K H G F Q ẞ"
         - "U I A E O S N R T D Y"
-        - "Shift_L   Ü Ö Ä P Z B M J BackSpace"
-        - "show_numbers show_eschars preferences         space        ! ? Return"
+        - "show_upper Ü Ö Ä P Z B M J BackSpace"
+        - "show_numbers show_eschars preferences space ! ? Return"
     numbers:
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "@ # € % & - _ + ( )"
-        - "show_symbols   ; \" ' : = < >  BackSpace"
-        - "show_letters show_eschars preferences         space        , . Return"
+        - "1 2 3 4 5 6 7 8 9 0 ²"
+        - "@ # € % & - _ + ( ) ³"
+        - "show_symbols ; \" ' : = < > BackSpace"
+        - "show_letters show_eschars preferences space , . Return"
     symbols:
-        - "~ ` ´ | · √ µ ÷ × ¶"
-        - "© ® £ $ ¥ ^ ° * { }"
-        - "show_numbers   \\ / § π τ [ ]  BackSpace"
-        - "show_letters show_eschars preferences         space        , . Return"
+        - "~ ` ´ | · √ µ ÷ × ¶ ²"
+        - "© ® £ $ ¥ ^ ° * { } ³"
+        - "show_numbers \\ / § π τ [ ] BackSpace"
+        - "show_letters show_eschars preferences space , . Return"
     eschars:
         - "ä-subtle-highlight è é ö-subtle-highlight ü-subtle-highlight-2 Ä-subtle-highlight È É Ö-subtle-highlight Ü-subtle-highlight"
         - "à â ê î ô À Â Ê Î Ô"
-        - "show_numbers  « » ç Ç æ œ ß-subtle-highlight BackSpace"
-        - "show_letters show_eschars preferences         space        „ “ Return"
+        - "show_numbers « » ç Ç æ œ ß-subtle-highlight BackSpace"
+        - "show_letters show_eschars preferences space „ “ Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -47,7 +46,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -80,7 +79,7 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "altline"
+        outline: "special-2"
         icon: "key-enter"
         keysym: "Return"
     ä-subtle-highlight:
@@ -104,14 +103,6 @@ buttons:
     ß-subtle-highlight:
         outline: "subtle-highlight"
         text: "ß"
-    5:
-        outline: "fill"
-    "&":
-        outline: "fill"
-    ·:
-        outline: "fill"
-    ¥:
-        outline: "fill"
     ô:
         outline: "fill"
     Ç:

data/keyboards/de.yaml

@@ -1,42 +1,42 @@
 # Language: German
 ---
 outlines:
-    default:          { width: 35.33, height: 52 }
-    subtle-highlight: { width: 35.33, height: 52 }
-    altline:          { width: 52.67, height: 52 }
-    change-view:      { width: 52.67, height: 52 }
-    spaceline:        { width: 89.3,  height: 52 }
-    special:          { width: 35.33, height: 52 }
+    default:          { width: 35.657, height: 52 }
+    change-view:      { width: 53.485, height: 52 }
+    spaceline:        { width: 89.144, height: 52 }
+    special:          { width: 35.657, height: 52 }
+    special-2:        { width: 53.485, height: 52 }
+    subtle-highlight: { width: 35.657, height: 52 }
 
 views:
     base:
         - "q w e r t z u i o p"
         - "a s d f g h j k l ß"
-        - "Shift_L   y x c v b n m  BackSpace"
-        - "show_numbers show_eschars preferences         space        , . Return"
+        - "show_upper y x c v b n m BackSpace"
+        - "show_numbers show_eschars preferences space , . Return"
     upper:
         - "Q W E R T Z U I O P"
         - "A S D F G H J K L -"
-        - "Shift_L   Y X C V B N M  BackSpace"
-        - "show_numbers show_eschars preferences         space        ! ? Return"
+        - "show_upper Y X C V B N M BackSpace"
+        - "show_numbers show_eschars preferences space ! ? Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # € % & - _ + ( )"
-        - "show_symbols   ; \" ' : = < >  BackSpace"
-        - "show_letters show_eschars preferences         space        , . Return"
+        - "show_symbols ; \" ' : = < > BackSpace"
+        - "show_letters show_eschars preferences space , . Return"
     symbols:
         - "~ ` ´ | · √ µ ÷ × ¶"
         - "© ® £ $ ¥ ^ ° * { }"
-        - "show_numbers   \\ / § π τ [ ]  BackSpace"
-        - "show_letters show_eschars preferences         space        , . Return"
+        - "show_numbers \\ / § π τ [ ] BackSpace"
+        - "show_letters show_eschars preferences space , . Return"
     eschars:
         - "ä è é ö ü Ä È É Ö Ü"
         - "à â ê î ô À Â Ê Î Ô"
-        - "show_numbers  « » ç Ç æ œ ß-subtle-highlight  BackSpace"
-        - "show_letters show_eschars preferences         space        „ “ Return"
+        - "show_numbers « » ç Ç æ œ ß-subtle-highlight BackSpace"
+        - "show_letters show_eschars preferences space „ “ Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -44,7 +44,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -77,7 +77,7 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "altline"
+        outline: "special-2"
         icon: "key-enter"
         keysym: "Return"
     ä:

data/keyboards/de_wide.yaml

@@ -1,48 +1,45 @@
 # Language: German
 ---
 outlines:
-    default:            { width: 48.87,  height: 42 }
-    subtle-highlight:   { width: 48.87,  height: 42 }
-    halfwidth:          { width: 24,     height: 42 }
-    thin:               { width: 30,     height: 42 }
-    narrow:             { width: 40.5,   height: 42 }
-    altline:            { width: 82.74,  height: 42 }
-    change-view:        { width: 82.74,  height: 42 }
-    fill:               { width: 97.74,  height: 42 }
-    subtle-highlight-2: { width: 97.74,  height: 42 }
-    spaceline:          { width: 159.13, height: 42 }
-    special:            { width: 48.87,  height: 42 }
-    placeholder:        { width: 30,     height: 42 }
+    default:            { width: 48.872,  height: 42 }
+    change-view:        { width: 73.308,  height: 42 }
+    fill:               { width: 97.744,  height: 42 }
+    placeholder:        { width: 48.872,  height: 42 }
+    spaceline:          { width: 171.052, height: 42 }
+    special:            { width: 48.872,  height: 42 }
+    special-2:          { width: 73.308,  height: 42 }
+    subtle-highlight:   { width: 48.872,  height: 42 }
+    subtle-highlight-2: { width: 97.744,  height: 42 }
 
 views:
     base:
         - "q w e r t z u i o p ü"
         - "a s d f g h j k l ö ä"
-        - "Shift_L   y x c v b n m ß-thin BackSpace"
-        - "show_numbers show_eschars preferences         space        ,-narrow .-narrow Return"
+        - "show_upper y x c v b n m ß BackSpace"
+        - "show_numbers show_eschars preferences space , . Return"
     upper:
         - "Q W E R T Z U I O P Ü"
         - "A S D F G H J K L Ö Ä"
-        - "Shift_L   Y X C V B N M --thin BackSpace"
-        - "show_numbers show_eschars preferences         space        !-narrow ?-narrow Return"
+        - "show_upper Y X C V B N M - BackSpace"
+        - "show_numbers show_eschars preferences space ! ? Return"
     numbers:
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "@ # € % & - _ + ( )"
-        - "show_symbols   ; \" ' : = < > -- BackSpace"
-        - "show_letters show_eschars preferences         space        ,-narrow .-narrow Return"
+        - "1 2 3 4 5 6 7 8 9 0 ²"
+        - "@ # € % & - _ + ( ) ³"
+        - "show_symbols ; \" ' : = < > -- BackSpace"
+        - "show_letters show_eschars preferences space , . Return"
     symbols:
-        - "~ ` ´ | · √ µ ÷ × ¶"
-        - "© ® £ $ ¥ ^ ° * { }"
-        - "show_numbers   \\ / § π τ [ ] -- BackSpace"
-        - "show_letters show_eschars preferences         space        ,-narrow .-narrow Return"
+        - "~ ` ´ | · √ µ ÷ × ¶ ²"
+        - "© ® £ $ ¥ ^ ° * { } ³"
+        - "show_numbers \\ / § π τ [ ] -- BackSpace"
+        - "show_letters show_eschars preferences space , . Return"
     eschars:
         - "ä-subtle-highlight è é ö-subtle-highlight ü-subtle-highlight-2 Ä-subtle-highlight È É Ö-subtle-highlight Ü-subtle-highlight"
         - "à â ê î ô À Â Ê Î Ô"
-        - "show_numbers  « » ç Ç æ œ ß-subtle-highlight -- BackSpace"
-        - "show_letters show_eschars preferences         space        „ “ Return"
+        - "show_numbers « » ç Ç æ œ ß-subtle-highlight ẞ-subtle-highlight BackSpace"
+        - "show_letters show_eschars preferences space „ “ Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -50,7 +47,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -83,31 +80,9 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "altline"
+        outline: "special-2"
         icon: "key-enter"
         keysym: "Return"
-    „:
-        outline: "narrow"
-    “:
-        outline: "narrow"
-    ",-narrow":
-        outline: "narrow"
-        text: ","
-    .-narrow:
-        outline: "narrow"
-        text: "."
-    "!-narrow":
-        outline: "narrow"
-        text: "!"
-    ?-narrow:
-        outline: "narrow"
-        text: "?"
-    --thin:
-        outline: "thin"
-        text: "-"
-    ß-thin:
-        outline: "thin"
-        text: "ß"
     ä-subtle-highlight:
         outline: "subtle-highlight"
         text: "ä"
@@ -129,16 +104,11 @@ buttons:
     ß-subtle-highlight:
         outline: "subtle-highlight"
         text: "ß"
+    ẞ-subtle-highlight:
+        outline: "subtle-highlight"
+        text: "ẞ"
     --:
         outline: "placeholder"
         text: ""
-    5:
-        outline: "fill"
-    "&":
-        outline: "fill"
-    ·:
-        outline: "fill"
-    ¥:
-        outline: "fill"
     ô:
         outline: "fill"

data/keyboards/dk.yaml

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

data/keyboards/dk_wide.yaml

@@ -1,39 +1,39 @@
 # Language: Danish
 ---
 outlines:
-    default:     { width: 48.87,  height: 42 }
-    altline:     { width: 73.5,   height: 42 }
-    wide:        { width: 92.99,  height: 42 }
-    change-view: { width: 73.5,   height: 42 }
-    spaceline:   { width: 273.5,  height: 42 }
-    special:     { width: 48.87,  height: 42 }
-    placeholder: { width: 48.87,  height: 42 }
-    fill:        { width: 97.74,  height: 42 }
+    default:       { width: 48.872,  height: 42 }
+    change-view:   { width: 73.308,  height: 42 }
+    change-view-2: { width: 85.526,  height: 42 }
+    placeholder:   { width: 48.872,  height: 42 }
+    spaceline:     { width: 268.796, height: 42 }
+    special:       { width: 48.872,  height: 42 }
+    special-2:     { width: 73.308,  height: 42 }
+    special-3:     { width: 85.526,  height: 42 }
 
 views:
     base:
         - "q w e r t y u i o p å"
         - "a s d f g h j k l ø æ"
-        - "Shift_L   z x c v b n m , BackSpace"
-        - "show_numbers preferences         space        .    Return"
+        - "show_upper z x c v b n m , BackSpace"
+        - "show_numbers preferences space . Return"
     upper:
         - "Q W E R T Y U I O P Å"
         - "A S D F G H J K L Ø Æ"
-        - "Shift_L   Z X C V B N M , BackSpace"
-        - "show_numbers preferences         space        .    Return"
+        - "show_upper Z X C V B N M , BackSpace"
+        - "show_numbers preferences space . Return"
     numbers:
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "@ # $ % & - _ + ( )"
-        - "show_symbols -- , \" ' : ; ! ?  BackSpace"
-        - "show_letters preferences         space        .    Return"
+        - "1 2 3 4 5 6 7 8 9 0 ²"
+        - "@ # $ % & - _ + ( ) ³"
+        - "show_symbols , \" ' : ; ! ? -- BackSpace"
+        - "show_letters preferences space . Return"
     symbols:
-        - "~ ` | · √ π τ ÷ × ¶"
-        - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers -- \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        .    Return"
+        - "~ ` | · √ π τ ÷ × ¶ ²"
+        - "© ® £ € ¥ ^ ° * { } ³"
+        - "show_numbers_from_symbols \\ / < > = [ ] -- BackSpace"
+        - "show_letters preferences space . Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -41,7 +41,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -49,6 +49,11 @@ buttons:
         outline: "special"
         icon: "keyboard-mode-symbolic"
     show_numbers:
+        action:
+            set_view: "numbers"
+        outline: "change-view-2"
+        label: "123"
+    show_numbers_from_symbols:
         action:
             set_view: "numbers"
         outline: "change-view"
@@ -56,7 +61,7 @@ buttons:
     show_letters:
         action:
             set_view: "base"
-        outline: "change-view"
+        outline: "change-view-2"
         label: "ABC"
     show_symbols:
         action:
@@ -67,17 +72,9 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "wide"
+        outline: "special-3"
         icon: "key-enter"
         keysym: "Return"
     --:
         outline: "placeholder"
         text: ""
-    5:
-        outline: "fill"
-    "&":
-        outline: "fill"
-    √:
-        outline: "fill"
-    ¥:
-        outline: "fill"

data/keyboards/email/us.yaml

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

data/keyboards/email/us_wide.yaml

@@ -1,37 +1,36 @@
 ---
 outlines:
-    default:       { width: 52,    height: 42 }
-    wide:          { width: 91.25, height: 42 }
-    change-view:   { width: 77.52, height: 42 }
-    change-view-2: { width: 91.25, height: 42 }
-    spaceline:     { width: 157,   height: 42 }
-    special:       { width: 64.76, height: 42 }
-    large:         { width: 54.76, height: 42 }
+    default:       { width: 53.76,  height: 42 }
+    change-view:   { width: 80.64,  height: 42 }
+    change-view-2: { width: 94.08,  height: 42 }
+    spaceline:     { width: 188.16, height: 42 }
+    special:       { width: 53.76,  height: 42 }
+    special-2:     { width: 94.08,  height: 42 }
 
 views:
     base:
         - "q w e r t y u i o p"
         - "a s d f g h j k l"
-        - "Shift_L   z x c v b n m  BackSpace"
-        - "show_numbers preferences         space        @ . Return"
+        - "show_upper z x c v b n m BackSpace"
+        - "show_numbers preferences space @ . Return"
     upper:
         - "Q W E R T Y U I O P"
         - "A S D F G H J K L"
-        - "Shift_L   Z X C V B N M  BackSpace"
-        - "show_numbers preferences         space        @ . Return"
+        - "show_upper Z X C V B N M BackSpace"
+        - "show_numbers preferences space @ . Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
-        - "show_symbols   , \" ' : ; ! ?  BackSpace"
-        - "show_letters preferences         space        @ . Return"
+        - "show_symbols , \" ' : ; ! ? BackSpace"
+        - "show_letters preferences space @ . Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        @ . Return"
+        - "show_numbers_from_symbols \\ / < > = [ ] BackSpace"
+        - "show_letters preferences space @ . Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -39,11 +38,9 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
-    "@":
-        outline: "large"
     preferences:
         action: "show_prefs"
         outline: "special"
@@ -68,12 +65,10 @@ buttons:
             set_view: "symbols"
         outline: "change-view"
         label: "*/="
-    .:
-        outline: "large"
     space:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "wide"
+        outline: "special-2"
         icon: "key-enter"
         keysym: "Return"

data/keyboards/emoji/us.yaml

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

data/keyboards/emoji/us_wide.yaml

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

data/keyboards/epo.yaml

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

data/keyboards/epo_wide.yaml

@@ -1,46 +1,44 @@
 # Language: Esperanto
 ---
 outlines:
-    default:       { width: 53.75, height: 42 }
-    thin:          { width: 40,    height: 42 }
-    altline:       { width: 80.5,  height: 42 }
-    wide:          { width: 91.25, height: 42 }
-    change-view:   { width: 80.5,  height: 42 }
-    change-view-2: { width: 91.25, height: 42 }
-    spaceline:     { width: 164,   height: 42 }
-    special:       { width: 52,    height: 42 }
-    placeholder:   { width: 53.75, height: 42 }
-    large:         { width: 80,    height: 42 }
+    default:     { width: 53.76,  height: 42 }
+    change-view: { width: 80.64,  height: 42 }
+    large:       { width: 80.64,  height: 42 }
+    placeholder: { width: 53.76,  height: 42 }
+    spaceline:   { width: 161.28, height: 42 }
+    special:     { width: 53.76,  height: 42 }
+    special-2:   { width: 80.64,  height: 42 }
+    thin:        { width: 40.32,  height: 42 }
 
 views:
     base:
         - "q w e r t y u i o p"
         - "a s d f g h j k l"
-        - "Shift_L   z x c v b n m  BackSpace"
-        - "show_numbers show_eschars preferences         space        .-large Return"
+        - "show_upper z x c v b n m BackSpace"
+        - "show_numbers show_eschars preferences space .-large Return"
     upper:
         - "Q W E R T Y U I O P"
         - "A S D F G H J K L"
-        - "Shift_L   Z X C V B N M  BackSpace"
-        - "show_numbers show_eschars preferences         space        !-thin ?-thin Return"
+        - "show_upper Z X C V B N M BackSpace"
+        - "show_numbers show_eschars preferences space !-thin ?-thin Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
-        - "show_symbols   , \" ' : ; ! ?  BackSpace"
-        - "show_letters show_eschars preferences         space       .-large Return"
+        - "show_symbols , \" ' : ; ! ? BackSpace"
+        - "show_letters show_eschars preferences space .-large Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers   \\ / < > = [ ]  BackSpace"
-        - "show_letters show_eschars preferences         space       ,-thin .-thin Return"
+        - "show_numbers \\ / < > = [ ] BackSpace"
+        - "show_letters show_eschars preferences space ,-thin .-thin Return"
     eschars:
         - "-- -- ĉ ĝ ĥ ĵ ŝ ŭ ? --"
         - "-- -- Ĉ Ĝ Ĥ Ĵ Ŝ Ŭ ! --"
         - "show_numbers ' \" - – , . … BackSpace"
-        - "show_letters show_eschars preferences         space        „ “ Return"
+        - "show_letters show_eschars preferences space „ “ Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -48,7 +46,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -81,7 +79,7 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "altline"
+        outline: "special-2"
         icon: "key-enter"
         keysym: "Return"
     --:

data/keyboards/es+cat.yaml

@@ -1,43 +1,41 @@
 # Language: Catalan (Spain, with middle-dot L)
 ---
 outlines:
-    default:       { width: 35.67, height: 52 }
-    altline:       { width: 52.67, height: 52 }
-    wide:          { width: 62,    height: 52 }
-    change-view:   { width: 52.67, height: 52 }
-    change-view-2: { width: 62,    height: 52 }
-    spaceline:     { width: 90,    height: 52 }
-    special:       { width: 35.67, height: 52 }
+    default:     { width: 35.657, height: 52 }
+    change-view: { width: 53.485, height: 52 }
+    spaceline:   { width: 89.144, height: 52 }
+    special:     { width: 35.657, height: 52 }
+    special-2:   { width: 53.485, height: 52 }
 
 views:
     base:
         - "q w e r t y u i o p"
         - "a s d f g h j k l ç"
-        - "Shift_L   z x c v b n m  BackSpace"
-        - "show_numbers show_eschars preferences         space        ? . Return"
+        - "show_upper z x c v b n m BackSpace"
+        - "show_numbers show_eschars preferences space ? . Return"
     upper:
         - "Q W E R T Y U I O P"
         - "A S D F G H J K L Ç"
-        - "Shift_L   Z X C V B N M  BackSpace"
-        - "show_numbers show_eschars preferences         space        ¿ . Return"
+        - "show_upper Z X C V B N M BackSpace"
+        - "show_numbers show_eschars preferences space ¿ . Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # € % & - _ + ( )"
-        - "show_symbols   , \" ' : ; ! = BackSpace"
-        - "show_letters show_eschars preferences         space        ? . Return"
+        - "show_symbols , \" ' : ; ! = BackSpace"
+        - "show_letters show_eschars preferences space ? . Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ $ ¥ ^ ° * { }"
-        - "show_numbers   \\ / < > = [ ]  BackSpace"
-        - "show_letters show_eschars preferences         space        ? . Return"
+        - "show_numbers \\ / < > = [ ] BackSpace"
+        - "show_letters show_eschars preferences space ? . Return"
     eschars:
         - "á é í ó ú Á É Í Ó Ú"
         - "à è ì ò ù À È Ì Ò Ù"
-        - "show_numbers ü ç ï Ü Ç Ï ¡  BackSpace"
-        - "show_letters show_eschars preferences         space        « » Return"
+        - "show_numbers ü ç ï Ü Ç Ï ¡ BackSpace"
+        - "show_letters show_eschars preferences space « » Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -45,7 +43,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -78,6 +76,6 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "altline"
+        outline: "special-2"
         icon: "key-enter"
         keysym: "Return"

data/keyboards/es+cat_wide.yaml

@@ -1,43 +1,41 @@
 # Language: Catalan (Spain, with middle-dot L)
 ---
 outlines:
-    default:       { width: 53.75, height: 42 }
-    altline:       { width: 80,    height: 42 }
-    wide:          { width: 92,    height: 42 }
-    change-view:   { width: 80,    height: 42 }
-    change-view-2: { width: 92,    height: 42 }
-    spaceline:     { width: 135,   height: 42 }
-    special:       { width: 53.75, height: 42 }
+    default:     { width: 53.76, height: 42 }
+    change-view: { width: 80.64, height: 42 }
+    spaceline:   { width: 134.4, height: 42 }
+    special:     { width: 53.76, height: 42 }
+    special-2:   { width: 80.64, height: 42 }
 
 views:
     base:
         - "q w e r t y u i o p"
         - "a s d f g h j k l ç"
-        - "Shift_L   z x c v b n m  BackSpace"
-        - "show_numbers show_eschars preferences         space        ? . Return"
+        - "show_upper z x c v b n m BackSpace"
+        - "show_numbers show_eschars preferences space ? . Return"
     upper:
         - "Q W E R T Y U I O P"
         - "A S D F G H J K L Ç"
-        - "Shift_L   Z X C V B N M  BackSpace"
-        - "show_numbers show_eschars preferences         space        ¿ . Return"
+        - "show_upper Z X C V B N M BackSpace"
+        - "show_numbers show_eschars preferences space ¿ . Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # € % & - _ + ( )"
-        - "show_symbols   , \" ' : ; ! = BackSpace"
-        - "show_letters show_eschars preferences         space        ? . Return"
+        - "show_symbols , \" ' : ; ! = BackSpace"
+        - "show_letters show_eschars preferences space ? . Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ $ ¥ ^ ° * { }"
-        - "show_numbers   \\ / < > = [ ]  BackSpace"
-        - "show_letters show_eschars preferences         space        ? . Return"
+        - "show_numbers \\ / < > = [ ] BackSpace"
+        - "show_letters show_eschars preferences space ? . Return"
     eschars:
         - "á é í ó ú Á É Í Ó Ú"
         - "à è ì ò ù À È Ì Ò Ù"
-        - "show_numbers ü ç ï Ü Ç Ï ¡  BackSpace"
-        - "show_letters show_eschars preferences         space        « » Return"
+        - "show_numbers ü ç ï Ü Ç Ï ¡ BackSpace"
+        - "show_letters show_eschars preferences space « » Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -45,7 +43,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -78,6 +76,6 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "altline"
+        outline: "special-2"
         icon: "key-enter"
         keysym: "Return"

data/keyboards/es.yaml

@@ -1,42 +1,41 @@
 # Language: Spanish
 ---
 outlines:
-    default:       { width: 35.67, height: 52 }
-    altline:       { width: 52.67, height: 52 }
-    wide:          { width: 62,    height: 52 }
-    change-view:   { width: 52.67, height: 52 }
-    spaceline:     { width: 90,    height: 52 }
-    special:       { width: 35.67, height: 52 }
+    default:     { width: 35.657, height: 52 }
+    change-view: { width: 53.485, height: 52 }
+    spaceline:   { width: 89.144, height: 52 }
+    special:     { width: 35.657, height: 52 }
+    special-2:   { width: 53.485, height: 52 }
 
 views:
     base:
         - "q w e r t y u i o p"
         - "a s d f g h j k l ñ"
-        - "Shift_L   z x c v b n m  BackSpace"
-        - "show_numbers show_eschars preferences         space        ? . Return"
+        - "show_upper z x c v b n m BackSpace"
+        - "show_numbers show_eschars preferences space ? . Return"
     upper:
         - "Q W E R T Y U I O P"
         - "A S D F G H J K L Ñ"
-        - "Shift_L   Z X C V B N M  BackSpace"
-        - "show_numbers show_eschars preferences         space        ¿ . Return"
+        - "show_upper Z X C V B N M BackSpace"
+        - "show_numbers show_eschars preferences space ¿ . Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # € % & - _ + ( )"
-        - "show_symbols   , \" ' : ; ! = BackSpace"
-        - "show_letters show_eschars preferences         space        ? . Return"
+        - "show_symbols , \" ' : ; ! = BackSpace"
+        - "show_letters show_eschars preferences space ? . Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ $ ¥ ^ ° * { }"
-        - "show_numbers   \\ / < > = [ ]  BackSpace"
-        - "show_letters show_eschars preferences         space        ? . Return"
+        - "show_numbers \\ / < > = [ ] BackSpace"
+        - "show_letters show_eschars preferences space ? . Return"
     eschars:
         - "á é í ó ú Á É Í Ó Ú"
         - "à è ì ò ù À È Ì Ò Ù"
-        - "show_numbers ü ç ï Ü Ç Ï ¡  BackSpace"
-        - "show_letters show_eschars preferences         space        « » Return"
+        - "show_numbers ü ç ï Ü Ç Ï ¡ BackSpace"
+        - "show_letters show_eschars preferences space « » Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -44,7 +43,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -77,6 +76,6 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "altline"
+        outline: "special-2"
         icon: "key-enter"
         keysym: "Return"

data/keyboards/es_wide.yaml

@@ -1,42 +1,41 @@
 # Language: Spanish
 ---
 outlines:
-    default:       { width: 53.75, height: 42 }
-    altline:       { width: 80,    height: 42 }
-    wide:          { width: 92,    height: 42 }
-    change-view:   { width: 80,    height: 42 }
-    spaceline:     { width: 135,   height: 42 }
-    special:       { width: 53.75, height: 42 }
+    default:     { width: 53.76, height: 42 }
+    change-view: { width: 80.64, height: 42 }
+    spaceline:   { width: 134.4, height: 42 }
+    special:     { width: 53.76, height: 42 }
+    special-2:   { width: 80.64, height: 42 }
 
 views:
     base:
         - "q w e r t y u i o p"
         - "a s d f g h j k l ñ"
-        - "Shift_L   z x c v b n m  BackSpace"
-        - "show_numbers show_eschars preferences         space        ? . Return"
+        - "show_upper z x c v b n m BackSpace"
+        - "show_numbers show_eschars preferences space ? . Return"
     upper:
         - "Q W E R T Y U I O P"
         - "A S D F G H J K L Ñ"
-        - "Shift_L   Z X C V B N M  BackSpace"
-        - "show_numbers show_eschars preferences         space        ¿ . Return"
+        - "show_upper Z X C V B N M BackSpace"
+        - "show_numbers show_eschars preferences space ¿ . Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # € % & - _ + ( )"
-        - "show_symbols   , \" ' : ; ! = BackSpace"
-        - "show_letters show_eschars preferences         space        ? . Return"
+        - "show_symbols , \" ' : ; ! = BackSpace"
+        - "show_letters show_eschars preferences space ? . Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ $ ¥ ^ ° * { }"
-        - "show_numbers   \\ / < > = [ ]  BackSpace"
-        - "show_letters show_eschars preferences         space        ? . Return"
+        - "show_numbers \\ / < > = [ ] BackSpace"
+        - "show_letters show_eschars preferences space ? . Return"
     eschars:
         - "á é í ó ú Á É Í Ó Ú"
         - "à è ì ò ù À È Ì Ò Ù"
-        - "show_numbers ü ç ï Ü Ç Ï ¡  BackSpace"
-        - "show_letters show_eschars preferences         space        « » Return"
+        - "show_numbers ü ç ï Ü Ç Ï ¡ BackSpace"
+        - "show_letters show_eschars preferences space « » Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -44,7 +43,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -77,6 +76,6 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "altline"
+        outline: "special-2"
         icon: "key-enter"
         keysym: "Return"

data/keyboards/fi.yaml

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

data/keyboards/fi_wide.yaml

@@ -1,39 +1,39 @@
 # Language: Finnish
 ---
 outlines:
-    default:     { width: 48.87,  height: 42 }
-    altline:     { width: 73.5,   height: 42 }
-    wide:        { width: 92.99,  height: 42 }
-    change-view: { width: 73.5,   height: 42 }
-    spaceline:   { width: 273.5,  height: 42 }
-    special:     { width: 48.87,  height: 42 }
-    placeholder: { width: 48.87,  height: 42 }
-    fill:        { width: 97.74,  height: 42 }
+    default:       { width: 48.872,  height: 42 }
+    change-view:   { width: 73.308,  height: 42 }
+    change-view-2: { width: 85.526,  height: 42 }
+    placeholder:   { width: 48.872,  height: 42 }
+    spaceline:     { width: 268.796, height: 42 }
+    special:       { width: 48.872,  height: 42 }
+    special-2:     { width: 73.308,  height: 42 }
+    special-3:     { width: 85.526,  height: 42 }
 
 views:
     base:
         - "q w e r t y u i o p å"
         - "a s d f g h j k l ö ä"
-        - "Shift_L   z x c v b n m , BackSpace"
-        - "show_numbers preferences         space        .    Return"
+        - "show_upper z x c v b n m , BackSpace"
+        - "show_numbers preferences space . Return"
     upper:
         - "Q W E R T Y U I O P Å"
         - "A S D F G H J K L Ö Ä"
-        - "Shift_L   Z X C V B N M , BackSpace"
-        - "show_numbers preferences         space        .    Return"
+        - "show_upper Z X C V B N M , BackSpace"
+        - "show_numbers preferences space . Return"
     numbers:
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "@ # $ % & - _ + ( )"
-        - "show_symbols -- , \" ' : ; ! ? BackSpace"
-        - "show_letters preferences         space        .    Return"
+        - "1 2 3 4 5 6 7 8 9 0 ²"
+        - "@ # $ % & - _ + ( ) ³"
+        - "show_symbols , \" ' : ; ! ? -- BackSpace"
+        - "show_letters preferences space . Return"
     symbols:
-        - "~ ` | · √ π τ ÷ × ¶"
-        - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers -- \\ / < > = [ ] BackSpace"
-        - "show_letters preferences         space        .    Return"
+        - "~ ` | · √ π τ ÷ × ¶ ²"
+        - "© ® £ € ¥ ^ ° * { } ³"
+        - "show_numbers_from_symbols \\ / < > = [ ] -- BackSpace"
+        - "show_letters preferences space . Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -41,7 +41,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -49,6 +49,11 @@ buttons:
         outline: "special"
         icon: "keyboard-mode-symbolic"
     show_numbers:
+        action:
+            set_view: "numbers"
+        outline: "change-view-2"
+        label: "123"
+    show_numbers_from_symbols:
         action:
             set_view: "numbers"
         outline: "change-view"
@@ -56,7 +61,7 @@ buttons:
     show_letters:
         action:
             set_view: "base"
-        outline: "change-view"
+        outline: "change-view-2"
         label: "ABC"
     show_symbols:
         action:
@@ -67,17 +72,9 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "wide"
+        outline: "special-3"
         icon: "key-enter"
         keysym: "Return"
     --:
         outline: "placeholder"
         text: ""
-    5:
-        outline: "fill"
-    "&":
-        outline: "fill"
-    √:
-        outline: "fill"
-    ¥:
-        outline: "fill"

data/keyboards/fr+bepo.yaml

@@ -1,45 +1,45 @@
 # Language: French (BEPO)
 ---
 outlines:
-    default:       { width: 35.33, height: 52 }
-    altline:       { width: 37.0,  height: 52 }
-    wide:          { width: 50,    height: 52 }
-    change-view:   { width: 37.0,  height: 52 }
-    change-view-2: { width: 50,    height: 52 }
-    spaceline:     { width: 171,   height: 52 }
-    special:       { width: 35.33, height: 52 }
-    large:         { width: 35.33, height: 52 }
-    placeholder:   { width: 35.33, height: 52 }
+    default:       { width: 35.657,  height: 52 }
+    change-view:   { width: 35.657,  height: 52 }
+    change-view-2: { width: 53.485,  height: 52 }
+    change-view-3: { width: 62.399,  height: 52 }
+    placeholder:   { width: 35.657,  height: 52 }
+    spaceline:     { width: 124.802, height: 52 }
+    special:       { width: 35.657,  height: 52 }
+    special-2:     { width: 53.485,  height: 52 }
+    special-3:     { width: 62.399,  height: 52 }
 
 views:
     base:
         - "b é p o w v d l j z"
         - "a u i e c t s r n m"
-        - "Shift_L y x k q g h f . BackSpace"
-        - "show_numbers preferences         space   show_eschars Return"
+        - "show_upper y x k q g h f . BackSpace"
+        - "show_numbers preferences space show_eschars Return"
     upper:
         - "B É P O W V D L J Z"
         - "A U I E C T S R N M"
-        - "Shift_L   Y X K Q G H F -  BackSpace"
-        - "show_numbers preferences         space   show_eschars Return"
+        - "show_upper Y X K Q G H F - BackSpace"
+        - "show_numbers preferences space show_eschars Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # € % & - _ + ( )"
-        - "show_symbols -- , \" ' : ; ! ?  BackSpace"
-        - "show_letters preferences         space   show_eschars Return"
+        - "show_symbols , \" ' : ; ! ? -- BackSpace"
+        - "show_letters preferences space show_eschars Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ $ ¥ ^ ° * { }"
-        - "show_numbers_from_symbols -- \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space   show_eschars Return"
+        - "show_numbers_from_symbols \\ / < > = [ ] -- BackSpace"
+        - "show_letters preferences space show_eschars Return"
     eschars:
         - "à â ç é è ê î ô ù û"
         - "À Â Ç É È Ê Î Ô Ù Û"
-        - "show_numbers_from_symbols  æ œ ä ë ï ö ü : BackSpace"
-        - "show_letters preferences         space   show_eschars  Return"
+        - "show_numbers_from_symbols æ œ ä ë ï ö ü : BackSpace"
+        - "show_letters preferences space show_eschars Return"
  
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -47,17 +47,17 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
         action: "show_prefs"
-        outline: "special"
+        outline: "special-2"
         icon: "keyboard-mode-symbolic"
     show_numbers:
         action:
             set_view: "numbers"
-        outline: "change-view-2"
+        outline: "change-view-3"
         label: "123"
     show_numbers_from_symbols:
         action:
@@ -67,7 +67,7 @@ buttons:
     show_letters:
         action:
             set_view: "base"
-        outline: "change-view-2"
+        outline: "change-view-3"
         label: "ABC"
     show_symbols:
         action:
@@ -85,11 +85,9 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "wide"
+        outline: "special-3"
         icon: "key-enter"
         keysym: "Return"
-    .:
-        outline: "large"
     --:
         outline: "placeholder"
         text: ""

data/keyboards/fr+bepo_wide.yaml

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

data/keyboards/fr.yaml

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

data/keyboards/fr_wide.yaml

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

data/keyboards/ge.yaml

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

data/keyboards/ge_wide.yaml

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

data/keyboards/gr+polytonic.yaml

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

data/keyboards/gr+polytonic_wide.yaml

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

data/keyboards/gr.yaml

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

data/keyboards/gr_wide.yaml

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

data/keyboards/hu.yaml

@@ -2,44 +2,44 @@
 # Based on work by: soyer <soyer@irl.hu>
 ---
 outlines:
-    default:       { width: 35.67, height: 52 }
-    altline:       { width: 53,    height: 52 }
-    change-view:   { width: 53,    height: 52 }
-    change-view-2: { width: 62,    height: 52 }
-    spaceline:     { width: 53.5,  height: 52 }
-    special:       { width: 35.67, height: 52 }
-    placeholder:   { width: 35.67, height: 52 }
-    placeholder-2: { width: 17.83, height: 52 }
+    default:       { width: 35.657, height: 52 }
+    change-view:   { width: 53.485, height: 52 }
+    change-view-2: { width: 62.399, height: 52 }
+    placeholder:   { width: 35.657, height: 52 }
+    placeholder-2: { width: 17.828, height: 52 }
+    spaceline:     { width: 53.487, height: 52 }
+    special:       { width: 35.657, height: 52 }
+    special-2:     { width: 53.485, height: 52 }
 
 views:
     base:
         - "q w e r t z u i o p"
         - "a s d f g h j k l"
-        - "Shift_L y x c v b n m  BackSpace"
-        - "show_numbers show_eschars preferences         space        , . - Return"
+        - "show_upper y x c v b n m BackSpace"
+        - "show_numbers show_eschars preferences space , . - Return"
     upper:
         - "Q W E R T Z U I O P"
         - "A S D F G H J K L"
-        - "Shift_L   Y X C V B N M  BackSpace"
-        - "show_numbers show_eschars preferences         space        ? : ! Return"
+        - "show_upper Y X C V B N M BackSpace"
+        - "show_numbers show_eschars preferences space ? : ! Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # € % & - _ + ( )"
-        - "show_symbols   ; \" ' : = < >  BackSpace"
-        - "show_letters show_eschars preferences         space        , . - Return"
+        - "show_symbols ; \" ' : = < > BackSpace"
+        - "show_letters show_eschars preferences space , . - Return"
     symbols:
         - "~ ` ´ | · √ µ ÷ × ¶"
         - "© ® £ $ ¥ ^ ° * { }"
-        - "show_numbers   \\ / § π τ [ ]  BackSpace"
-        - "show_letters show_eschars preferences         space        , . - Return"
+        - "show_numbers \\ / § π τ [ ] BackSpace"
+        - "show_letters show_eschars preferences space , . - Return"
     eschars:
         - "-- -- ö ü ó Ö Ü Ó -- --"
         - "-- -- í ő ú Í Ő Ú -- --"
         - "show_numbers --- é á ű É Á Ű --- BackSpace"
-        - "show_letters show_eschars preferences         space       , „ “ Return"
+        - "show_letters show_eschars preferences space , „ “ Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -47,7 +47,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -80,7 +80,7 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "altline"
+        outline: "special-2"
         icon: "key-enter"
         keysym: "Return"
     --:

data/keyboards/hu_wide.yaml

@@ -2,43 +2,43 @@
 # Based on work by: soyer <soyer@irl.hu>
 ---
 outlines:
-    default:       { width: 44.75,   height: 42 }
-    altline:       { width: 89.5,    height: 42 }
-    change-view:   { width: 89.5,    height: 42 }
-    change-view-2: { width: 67.125,  height: 42 }
-    spaceline:     { width: 111.875, height: 42 }
-    special:       { width: 44.75,   height: 42 }
-    placeholder:   { width: 44.75,   height: 42 }
+    default:       { width: 44.8, height: 42 }
+    change-view:   { width: 89.6, height: 42 }
+    change-view-2: { width: 67.2, height: 42 }
+    placeholder:   { width: 44.8, height: 42 }
+    spaceline:     { width: 112,  height: 42 }
+    special:       { width: 44.8, height: 42 }
+    special-2:     { width: 89.6, height: 42 }
 
 views:
     base:
         - "q w e r t z u i o p ő ú"
         - "a s d f g h j k l é á ű"
-        - "Shift_L í y x c v b n m  BackSpace"
-        - "show_numbers show_eschars preferences         space        , . - Return"
+        - "show_upper í y x c v b n m BackSpace"
+        - "show_numbers show_eschars preferences space , . - Return"
     upper:
         - "Q W E R T Z U I O P Ő Ú"
         - "A S D F G H J K L É Á Ű"
-        - "Shift_L Í Y X C V B N M  BackSpace"
-        - "show_numbers show_eschars preferences         space        ? : ! Return"
+        - "show_upper Í Y X C V B N M BackSpace"
+        - "show_numbers show_eschars preferences space ? : ! Return"
     numbers:
-        - "-- 1 2 3 4 5 6 7 8 9 0 --"
-        - "-- @ # € % & - _ + ( ) --"
-        - "show_symbols   ; \" ' : = < > -- BackSpace"
-        - "show_letters show_eschars preferences         space        , . - Return"
+        - "-- 1 2 3 4 5 6 7 8 9 0 ²"
+        - "-- @ # € % & - _ + ( ) ³"
+        - "show_symbols ; \" ' : = < > -- BackSpace"
+        - "show_letters show_eschars preferences space , . - Return"
     symbols:
-        - "-- ~ ` ´ | · √ µ ÷ × ¶ --"
-        - "-- © ® £ $ ¥ ^ ° * { } --"
-        - "show_numbers   \\ / § π τ [ ] -- BackSpace"
-        - "show_letters show_eschars preferences         space        , . - Return"
+        - "-- ~ ` ´ | · √ µ ÷ × ¶ ²"
+        - "-- © ® £ $ ¥ ^ ° * { } ³"
+        - "show_numbers \\ / § π τ [ ] -- BackSpace"
+        - "show_letters show_eschars preferences space , . - Return"
     eschars:
         - "-- -- -- ö ü ó Ö Ü Ó -- -- --"
         - "-- -- -- í ő ú Í Ő Ú -- -- --"
         - "show_numbers -- é á ű É Á Ű -- BackSpace"
-        - "show_letters show_eschars preferences         space       , „ “ Return"
+        - "show_letters show_eschars preferences space , „ “ Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -46,7 +46,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -79,7 +79,7 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "altline"
+        outline: "special-2"
         icon: "key-enter"
         keysym: "Return"
     --:

data/keyboards/il.yaml

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

data/keyboards/il_wide.yaml

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

data/keyboards/in+mal.yaml

@@ -1,41 +1,41 @@
 # 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 }
+    default:     { width: 34.285, height: 52 }
+    change-view: { width: 68.57,  height: 52 }
+    placeholder: { width: 34.285, height: 52 }
+    spaceline:   { width: 274.28, height: 52 }
+    special:     { width: 34.285, height: 52 }
+    special-2:   { width: 68.57,  height: 52 }
 
 views:
     base:
         - " ൊ ൧ ൨ ൩ ൪ ൫ ൬ ൭ ൮ ൯ ൦ - ൃ "
         - " ൗ ൈ ാ ീ ൂ ബ ഹ ഗ ദ ജ ഡ zwj zwnj "
         - " -- ോ േ ് ി ു പ ര ക ത ച ട zwsp "
-        - "Shift_L െ ം മ ന വ ല സ യ -- BackSpace"
-        - "show_numbers  preferences         space        Return"
+        - "show_upper െ ം മ ന വ ല സ യ -- BackSpace"
+        - "show_numbers preferences space Return"
     upper:
         - " ഒ ! @ # ₹ % ^ & ൾ ( ) ഃ ഋ "
         - " ഔ ഐ ആ ഈ ഊ ഭ ങ ഘ ധ ഝ ഢ ഞ ർ "
         - " -- ഓ ഏ അ ഇ ഉ ഫ റ ഖ ഥ ഛ ഠ -- "
-        - "Shift_L എ ൺ ണ ൻ ഴ ള ശ ഷ ൽ BackSpace"
-        - "show_numbers  preferences         space        Return"
+        - "show_upper എ ൺ ണ ൻ ഴ ള ശ ഷ ൽ BackSpace"
+        - "show_numbers preferences space Return"
     numbers:
         - " -- ൧ ൨ ൩ ൪ ൫ ൬ ൭ ൮ ൯ ൦ -- -- "
-        - "-- 1 2 3 4 5 6 7 8 9 0 -- --"
-        - "-- @ # $ % & - _ + ( ) -- --"
-        - "show_symbols  ₹ , \" ' : ; ! ? --  BackSpace"
-        - "show_letters  preferences         space        Return"
+        - "-- 1 2 3 4 5 6 7 8 9 0 ² --"
+        - "-- @ # $ % & - _ + ( ) ³ --"
+        - "show_symbols ₹ , \" ' : ; ! ? -- BackSpace"
+        - "show_letters  preferences space Return"
     symbols:
         - "-- -- -- -- -- -- -- -- -- -- -- -- --"
-        - "-- ~ ` | · √ π τ ÷ × ¶ -- --"
-        - "-- © ® £ € ¥ ^ ° * { } -- --"
-        - "show_numbers  -- \\ / < > = [ ] -- BackSpace"
-        - "show_letters  preferences         space        Return"
+        - "-- ~ ` | · √ π τ ÷ × ¶ ² --"
+        - "-- © ® £ € ¥ ^ ° * { } ³ --"
+        - "show_numbers -- \\ / < > = [ ] -- BackSpace"
+        - "show_letters  preferences space Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -43,7 +43,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -69,7 +69,7 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "altline"
+        outline: "special-2"
         icon: "key-enter"
         keysym: "Return"
     --:

data/keyboards/in+mal_wide.yaml

@@ -1,41 +1,41 @@
 # 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 }
+    default:     { width: 51.692,  height: 42 }
+    change-view: { width: 103.384, height: 42 }
+    placeholder: { width: 51.692,  height: 42 }
+    spaceline:   { width: 413.536, height: 42 }
+    special:     { width: 51.692,  height: 42 }
+    special-2:   { width: 103.384, height: 42 }
 
 views:
     base:
         - " ൊ ൧ ൨ ൩ ൪ ൫ ൬ ൭ ൮ ൯ ൦ - ൃ "
         - " ൗ ൈ ാ ീ ൂ ബ ഹ ഗ ദ ജ ഡ zwj zwnj "
         - " -- ോ േ ് ി ു പ ര ക ത ച ട zwsp "
-        - "Shift_L െ ം മ ന വ ല സ യ -- BackSpace"
-        - "show_numbers  preferences         space        Return"
+        - "show_upper െ ം മ ന വ ല സ യ -- BackSpace"
+        - "show_numbers preferences space Return"
     upper:
         - " ഒ ! @ # ₹ % ^ & ൾ ( ) ഃ ഋ "
         - " ഔ ഐ ആ ഈ ഊ ഭ ങ ഘ ധ ഝ ഢ ഞ ർ "
         - " -- ഓ ഏ അ ഇ ഉ ഫ റ ഖ ഥ ഛ ഠ -- "
-        - "Shift_L എ ൺ ണ ൻ ഴ ള ശ ഷ ൽ BackSpace"
-        - "show_numbers  preferences         space        Return"
+        - "show_upper എ ൺ ണ ൻ ഴ ള ശ ഷ ൽ BackSpace"
+        - "show_numbers preferences space Return"
     numbers:
         - " -- ൧ ൨ ൩ ൪ ൫ ൬ ൭ ൮ ൯ ൦ -- -- "
-        - "-- 1 2 3 4 5 6 7 8 9 0 -- --"
-        - "-- @ # $ % & - _ + ( ) -- --"
-        - "show_symbols  ₹ , \" ' : ; ! ? --  BackSpace"
-        - "show_letters  preferences         space        Return"
+        - "-- 1 2 3 4 5 6 7 8 9 0 ² --"
+        - "-- @ # $ % & - _ + ( ) ³ --"
+        - "show_symbols ₹ , \" ' : ; ! ? -- BackSpace"
+        - "show_letters  preferences space Return"
     symbols:
         - "-- -- -- -- -- -- -- -- -- -- -- -- --"
-        - "-- ~ ` | · √ π τ ÷ × ¶ -- --"
-        - "-- © ® £ € ¥ ^ ° * { } -- --"
-        - "show_numbers  -- \\ / < > = [ ] -- BackSpace"
-        - "show_letters  preferences         space        Return"
+        - "-- ~ ` | · √ π τ ÷ × ¶ ² --"
+        - "-- © ® £ € ¥ ^ ° * { } ³ --"
+        - "show_numbers -- \\ / < > = [ ] -- BackSpace"
+        - "show_letters  preferences space Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -43,7 +43,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -69,7 +69,7 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "altline"
+        outline: "special-2"
         icon: "key-enter"
         keysym: "Return"
     --:

data/keyboards/ir.yaml

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

data/keyboards/ir_wide.yaml

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

data/keyboards/it+fur.yaml

@@ -3,44 +3,43 @@
 # 14 october 2020
 ---
 outlines:
-    default:       { width: 35.67, height: 52 }
-    altline:       { width: 52.75, height: 52 }
-    wide:          { width: 62,    height: 52 }
-    change-view:   { width: 52.75, height: 52 }
-    change-view-2: { width: 62,    height: 52 }
-    spaceline:     { width: 91.08, height: 52 }
-    special:       { width: 35.67, height: 52 }
-    placeholder:   { width: 35.67, height: 52 }
+    default:       { width: 35.657, height: 52 }
+    change-view:   { width: 53.485, height: 52 }
+    change-view-2: { width: 62.399, height: 52 }
+    spaceline:     { width: 89.144, height: 52 }
+    special:       { width: 35.657, height: 52 }
+    special-2:     { width: 53.485, height: 52 }
+    special-3:     { width: 62.399, height: 52 }
 
 views:
     base:
         - "q w e r t y u i o p"
         - "a s d f g h j k l"
-        - "Shift_L   z x c v b n m  BackSpace"
-        - "show_numbers show_eschars preferences         space        , . Return"
+        - "show_upper z x c v b n m BackSpace"
+        - "show_numbers show_eschars preferences space , . Return"
     upper:
         - "Q W E R T Y U I O P"
         - "A S D F G H J K L"
-        - "Shift_L   Z X C V B N M  BackSpace"
-        - "show_numbers show_eschars preferences         space        “ ” Return"
+        - "show_upper Z X C V B N M BackSpace"
+        - "show_numbers show_eschars preferences space “ ” Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # € % & - _ + ( )"
-        - "show_symbols   , \" ' : ; ! =  BackSpace"
-        - "show_letters show_eschars preferences         space        ? . Return"
+        - "show_symbols , \" ' : ; ! = BackSpace"
+        - "show_letters show_eschars preferences space ? . Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ $ ¥ ^ ° * { }"
-        - "show_numbers   \\ / < > = [ ]  BackSpace"
-        - "show_letters show_eschars preferences         space        ? . Return"
+        - "show_numbers \\ / < > = [ ] BackSpace"
+        - "show_letters show_eschars preferences space ? . Return"
     eschars:
         - "â ê î ô û Â Ê Î Ô Û"
         - "à è ì ò ù À È Ì Ò Ù"
-        - "show_numbers   ç Ç ᶜ ᵐ ⁿ ᵉ ᵗ  BackSpace"
-        - "show_letters show_eschars preferences         space        ᶠ . Return"
+        - "show_numbers ç Ç ᶜ ᵐ ⁿ ᵉ ᵗ BackSpace"
+        - "show_letters show_eschars preferences space ᶠ . Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -48,7 +47,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -81,9 +80,6 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "altline"
+        outline: "special-2"
         icon: "key-enter"
         keysym: "Return"
-    --:
-        outline: "placeholder"
-        text: ""

data/keyboards/it+fur_wide.yaml

@@ -3,44 +3,41 @@
 # 14 october 2020
 ---
 outlines:
-    default:       { width: 53.5,  height: 42 }
-    altline:       { width: 80.25, height: 42 }
-    wide:          { width: 91.26, height: 42 }
-    change-view:   { width: 80.25, height: 42 }
-    change-view-2: { width: 91.26, height: 42 }
-    spaceline:     { width: 134,   height: 42 }
-    special:       { width: 53.5,  height: 42 }
-    placeholder:   { width: 53.5,  height: 42 }
+    default:       { width: 53.76, height: 42 }
+    change-view:   { width: 80.64, height: 42 }
+    spaceline:     { width: 134.4, height: 42 }
+    special:       { width: 53.76, height: 42 }
+    special-2:     { width: 80.64, height: 42 }
 
 views:
     base:
         - "q w e r t y u i o p"
         - "a s d f g h j k l"
-        - "Shift_L   z x c v b n m  BackSpace"
-        - "show_numbers show_eschars preferences         space        , . Return"
+        - "show_upper z x c v b n m BackSpace"
+        - "show_numbers show_eschars preferences space , . Return"
     upper:
         - "Q W E R T Y U I O P"
         - "A S D F G H J K L"
-        - "Shift_L   Z X C V B N M  BackSpace"
-        - "show_numbers show_eschars preferences         space        “ ” Return"
+        - "show_upper Z X C V B N M BackSpace"
+        - "show_numbers show_eschars preferences space “ ” Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # € % & - _ + ( )"
-        - "show_symbols   , \" ' : ; ! =  BackSpace"
-        - "show_letters show_eschars preferences         space        ? . Return"
+        - "show_symbols , \" ' : ; ! = BackSpace"
+        - "show_letters show_eschars preferences space ? . Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ $ ¥ ^ ° * { }"
-        - "show_numbers   \\ / < > = [ ]  BackSpace"
-        - "show_letters show_eschars preferences         space        ? . Return"
+        - "show_numbers \\ / < > = [ ] BackSpace"
+        - "show_letters show_eschars preferences space ? . Return"
     eschars:
         - "â ê î ô û Â Ê Î Ô Û"
         - "à è ì ò ù À È Ì Ò Ù"
-        - "show_numbers   ç Ç ᶜ ᵐ ⁿ ᵉ ᵗ  BackSpace"
-        - "show_letters show_eschars preferences         space        ᶠ . Return"
+        - "show_numbers ç Ç ᶜ ᵐ ⁿ ᵉ ᵗ BackSpace"
+        - "show_letters show_eschars preferences space ᶠ . Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -48,7 +45,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -81,9 +78,6 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "altline"
+        outline: "special-2"
         icon: "key-enter"
         keysym: "Return"
-    --:
-        outline: "placeholder"
-        text: ""

data/keyboards/it.yaml

@@ -3,44 +3,43 @@
 # 03 october 2019
 ---
 outlines:
-    default:       { width: 35.67, height: 52 }
-    altline:       { width: 52.75, height: 52 }
-    wide:          { width: 62,    height: 52 }
-    change-view:   { width: 52.75, height: 52 }
-    change-view-2: { width: 62,    height: 52 }
-    spaceline:     { width: 91.08, height: 52 }
-    special:       { width: 35.67, height: 52 }
-    placeholder:   { width: 35.67, height: 52 }
+    default:       { width: 35.657, height: 52 }
+    change-view:   { width: 53.485, height: 52 }
+    change-view-2: { width: 62.399, height: 52 }
+    spaceline:     { width: 89.144, height: 52 }
+    special:       { width: 35.657, height: 52 }
+    special-2:     { width: 53.485, height: 52 }
+    special-3:     { width: 62.399, height: 52 }
 
 views:
     base:
         - "q w e r t y u i o p"
         - "a s d f g h j k l"
-        - "Shift_L   z x c v b n m  BackSpace"
-        - "show_numbers show_eschars preferences         space        , . Return"
+        - "show_upper z x c v b n m BackSpace"
+        - "show_numbers show_eschars preferences space , . Return"
     upper:
         - "Q W E R T Y U I O P"
         - "A S D F G H J K L"
-        - "Shift_L   Z X C V B N M  BackSpace"
-        - "show_numbers show_eschars preferences         space        ? . Return"
+        - "show_upper Z X C V B N M BackSpace"
+        - "show_numbers show_eschars preferences space ? . Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # € % & - _ + ( )"
-        - "show_symbols   , \" ' : ; ! ?  BackSpace"
-        - "show_letters show_eschars preferences         space        ? . Return"
+        - "show_symbols , \" ' : ; ! ? BackSpace"
+        - "show_letters show_eschars preferences space ? . Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ $ ¥ ^ ° * { }"
-        - "show_numbers   \\ / < > = [ ]  BackSpace"
-        - "show_letters show_eschars preferences         space        ? . Return"
+        - "show_numbers \\ / < > = [ ] BackSpace"
+        - "show_letters show_eschars preferences space ? . Return"
     eschars:
         - "è é È É ù ú Ù Ú ò ó"
         - "à á À Á ì í Ì Í Ò Ó"
-        - "show_numbers   “ ” « » ≈ ≠ ‽  BackSpace"
-        - "show_letters show_eschars preferences         space        , . Return"
+        - "show_numbers “ ” « » ≈ ≠ ‽ BackSpace"
+        - "show_letters show_eschars preferences space , . Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -48,7 +47,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -81,9 +80,6 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "altline"
+        outline: "special-2"
         icon: "key-enter"
         keysym: "Return"
-    --:
-        outline: "placeholder"
-        text: ""

data/keyboards/it_wide.yaml

@@ -3,44 +3,41 @@
 # 03 october 2019
 ---
 outlines:
-    default:       { width: 53.5,  height: 42 }
-    altline:       { width: 80.25, height: 42 }
-    wide:          { width: 91.26, height: 42 }
-    change-view:   { width: 80.25, height: 42 }
-    change-view-2: { width: 91.26, height: 42 }
-    spaceline:     { width: 134,   height: 42 }
-    special:       { width: 53.5,  height: 42 }
-    placeholder:   { width: 53.5,  height: 42 }
+    default:       { width: 53.76, height: 42 }
+    change-view:   { width: 80.64, height: 42 }
+    spaceline:     { width: 134.4, height: 42 }
+    special:       { width: 53.76, height: 42 }
+    special-2:     { width: 80.64, height: 42 }
 
 views:
     base:
         - "q w e r t y u i o p"
         - "a s d f g h j k l"
-        - "Shift_L   z x c v b n m  BackSpace"
-        - "show_numbers show_eschars preferences         space        , . Return"
+        - "show_upper z x c v b n m BackSpace"
+        - "show_numbers show_eschars preferences space , . Return"
     upper:
         - "Q W E R T Y U I O P"
         - "A S D F G H J K L"
-        - "Shift_L   Z X C V B N M  BackSpace"
-        - "show_numbers show_eschars preferences         space        ? . Return"
+        - "show_upper Z X C V B N M BackSpace"
+        - "show_numbers show_eschars preferences space ? . Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # € % & - _ + ( )"
-        - "show_symbols   , \" ' : ; ! ?  BackSpace"
-        - "show_letters show_eschars preferences         space        ? . Return"
+        - "show_symbols , \" ' : ; ! ? BackSpace"
+        - "show_letters show_eschars preferences space ? . Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ $ ¥ ^ ° * { }"
-        - "show_numbers   \\ / < > = [ ]  BackSpace"
-        - "show_letters show_eschars preferences         space        ? . Return"
+        - "show_numbers \\ / < > = [ ] BackSpace"
+        - "show_letters show_eschars preferences space ? . Return"
     eschars:
         - "è é È É ù ú Ù Ú ò ó"
         - "à á À Á ì í Ì Í Ò Ó"
-        - "show_numbers   “ ” « » ≈ ≠ ‽  BackSpace"
-        - "show_letters show_eschars preferences         space        , . Return"
+        - "show_numbers “ ” « » ≈ ≠ ‽ BackSpace"
+        - "show_letters show_eschars preferences space , . Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -48,7 +45,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -81,9 +78,6 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "altline"
+        outline: "special-2"
         icon: "key-enter"
         keysym: "Return"
-    --:
-        outline: "placeholder"
-        text: ""

data/keyboards/jp+kana.yaml

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

data/keyboards/jp+kana_wide.yaml

@@ -3,11 +3,10 @@
 ---
 outlines:
     default:         { width: 84, height: 42 }
-    wide:            { width: 84, height: 42 }
-    character-group: { width: 84, height: 42 }
     change-view:     { width: 84, height: 42 }
-    special:         { width: 84, height: 42 }
+    character-group: { width: 84, height: 42 }
     placeholder:     { width: 84, height: 42 }
+    special:         { width: 84, height: 42 }
 
 views:
     base: # hiragana
@@ -230,19 +229,19 @@ views:
 buttons:
     # following 4 buttons use the corresponding xkb name as keysym
     BackSpace:
-        outline: "wide"
+        outline: "special"
         icon: "edit-clear-symbolic"
         action: "erase"
     Return:
-        outline: "wide"
+        outline: "special"
         icon: "key-enter"
         keysym: "Return"
     Left:
-        outline: "wide"
+        outline: "special"
         label: "←"
         keysym: "Left"
     Right:
-        outline: "wide"
+        outline: "special"
         label: "→"
         keysym: "Right"
     # special button "preferences" is handled in the code

data/keyboards/jp.yaml

@@ -1,19 +1,18 @@
 # 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 }
-
+    default:       { width: 37.142, height: 52 }
+    default-2:     { width: 44.570, height: 52 }
+    change-view:   { width: 34.284, height: 52 }
+    change-view-2: { width: 66.855, height: 52 }
+    change-view-3: { width: 74.284, height: 52 }
+    placeholder:   { width: 44.570, height: 52 }
+    placeholder-2: { width: 74.284, height: 52 }
+    spaceline:     { width: 74.284, height: 52 }
+    special:       { width: 34.284, height: 52 }
+    special-2:     { width: 37.142, height: 52 }
+    special-3:     { width: 66.855, height: 52 }
+    thin:          { width: 34.284, height: 52 }
 
 views:
     base:
@@ -21,85 +20,85 @@ views:
         - "た て い す か ん な に ら せ  ゙  ゚ "
         - "ち と し は き く ま の り れ け む"
         - "show_hiragana_upper つ さ そ ひ こ み も ね る め ろ BackSpace"
-        - "show_numbers show_romaji preferences         fullwidth-space       --- show_katakana Return"
+        - "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"
+        - "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"
+        - "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"
+        - "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"
+        - "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"
+        - "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"
+        - "show_symbols ; \" ' : = < > BackSpace-wide"
+        - "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"
+        - "show_symbols_fullwidth ； ＂ ＇ ： ＝ ＜ ＞ BackSpace-wide"
+        - "show_hiragana show_romaji_fullwidth preferences fullwidth-space numbers_fullwidth_width_toggle_half ， ． Return"
     symbols:
         - "ヽ ♪ -- -- -- -- -- ヿ 【 】"
         - "~ ` ´ | · √ µ ÷ × ¶"
         - "© ® £ $ € ^ ° * { }"
-        - "show_numbers_from_symbols \\ / § π τ [ ] BackSpace-special-3"
-        - "show_hiragana show_romaji preferences         space       symbols_width_toggle_full ! ? Return"
+        - "show_numbers_from_symbols \\ / § π τ [ ] BackSpace-wide"
+        - "show_hiragana show_romaji preferences space symbols_width_toggle_full ! ? Return"
     symbols_fullwidth:
         - "￣ ￤ -- -- -- -- -- ￢ ｟ ｠"
         - "～ ｀ -- ｜ -- -- -- -- -- --"
         - "-- -- ￡ ＄ -- ＾ -- ＊ ｛ ｝"
-        - "show_numbers_fullwidth_from_symbols ＼ ／ -- -- -- ［ ］ BackSpace-special-3"
-        - "show_hiragana show_romaji_fullwidth preferences         fullwidth-space       symbols_fullwidth_width_toggle_half ！ ？ Return"
+        - "show_numbers_fullwidth_from_symbols ＼ ／ -- -- -- ［ ］ BackSpace-wide"
+        - "show_hiragana show_romaji_fullwidth preferences fullwidth-space symbols_fullwidth_width_toggle_half ！ ？ Return"
     romaji:
         - "1 2 3 4 5 6 7 8 9 0"
         - "q w e r t y u i o p"
         - "a s d f g h j k l --"
-        - "show_romaji_upper   z x c v b n m BackSpace-special-3"
-        - "show_numbers show_hiragana preferences         space       romaji_width_toggle_full , . Return"
+        - "show_romaji_upper z x c v b n m BackSpace-wide"
+        - "show_numbers show_hiragana preferences space romaji_width_toggle_full , . Return"
     romaji_upper:
         - "1 2 3 4 5 6 7 8 9 0"
         - "Q W E R T Y U I O P"
         - "A S D F G H J K L --"
-        - "show_romaji_upper   Z X C V B N M BackSpace-special-3"
-        - "show_numbers show_hiragana preferences         space       romaji_width_toggle_full ! ? Return"
+        - "show_romaji_upper Z X C V B N M BackSpace-wide"
+        - "show_numbers show_hiragana preferences space romaji_width_toggle_full ! ? Return"
     romaji_fullwidth:
         - "１ ２ ３ ４ ５ ６ ７ ８ ９ ０"
         - "ｑ ｗ ｅ ｒ ｔ ｙ ｕ ｉ ｏ ｐ"
         - "ａ ｓ ｄ ｆ ｇ ｈ ｊ ｋ ｌ --"
-        - "show_romaji_fullwidth_upper   ｚ ｘ ｃ ｖ ｂ ｎ ｍ BackSpace-special-3"
-        - "show_numbers_fullwidth show_hiragana preferences         fullwidth-space       romaji_fullwidth_width_toggle_half ， ． Return"
+        - "show_romaji_fullwidth_upper ｚ ｘ ｃ ｖ ｂ ｎ ｍ BackSpace-wide"
+        - "show_numbers_fullwidth show_hiragana preferences fullwidth-space romaji_fullwidth_width_toggle_half ， ． Return"
     romaji_fullwidth_upper:
         - "１ ２ ３ ４ ５ ６ ７ ８ ９ ０"
         - "Ｑ Ｗ Ｅ Ｒ Ｔ Ｙ Ｕ Ｉ Ｏ Ｐ"
         - "Ａ Ｓ Ｄ Ｆ Ｇ Ｈ Ｊ Ｋ Ｌ --"
-        - "show_romaji_fullwidth_upper   Ｚ Ｘ Ｃ Ｖ Ｂ Ｎ Ｍ BackSpace-special-3"
-        - "show_numbers_fullwidth show_hiragana preferences         fullwidth-space       romaji_fullwidth_width_toggle_half ！ ？ Return"
+        - "show_romaji_fullwidth_upper Ｚ Ｘ Ｃ Ｖ Ｂ Ｎ Ｍ BackSpace-wide"
+        - "show_numbers_fullwidth show_hiragana preferences fullwidth-space romaji_fullwidth_width_toggle_half ！ ？ Return"
 
 
 #              k       s       t       n       h       m       y       r       w
@@ -122,7 +121,7 @@ buttons:
         outline: "special"
         icon: "edit-clear-symbolic"
         action: "erase"
-    BackSpace-special-3:
+    BackSpace-wide:
         outline: "special-3"
         icon: "edit-clear-symbolic"
         action: "erase"
@@ -387,6 +386,10 @@ buttons:
         outline: "default-2"
     0:
         outline: "default-2"
+    ²:
+        outline: "default-2"
+    ³:
+        outline: "default-2"
     "@":
         outline: "default-2"
     "#":

data/keyboards/jp_wide.yaml

@@ -1,19 +1,18 @@
 # 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 }
-
+    default:       { width: 56,     height: 42 }
+    default-2:     { width: 67.2,   height: 42 }
+    change-view:   { width: 51.692, height: 42 }
+    change-view-2: { width: 100.8,  height: 42 }
+    change-view-3: { width: 112,    height: 42 }
+    placeholder:   { width: 67.2,   height: 42 }
+    placeholder-2: { width: 112,    height: 42 }
+    spaceline:     { width: 112,    height: 42 }
+    special:       { width: 51.692, height: 42 }
+    special-2:     { width: 56,     height: 42 }
+    special-3:     { width: 100.8,  height: 42 }
+    thin:          { width: 51.692, height: 42 }
 
 views:
     base:
@@ -21,85 +20,85 @@ views:
         - "た て い す か ん な に ら せ  ゙  ゚ "
         - "ち と し は き く ま の り れ け む"
         - "show_hiragana_upper つ さ そ ひ こ み も ね る め ろ BackSpace"
-        - "show_numbers show_romaji preferences         fullwidth-space       --- show_katakana Return"
+        - "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"
+        - "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"
+        - "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"
+        - "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"
+        - "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"
+        - "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"
+        - "show_symbols ; \" ' : = < > BackSpace-wide"
+        - "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"
+        - "show_symbols_fullwidth ； ＂ ＇ ： ＝ ＜ ＞ BackSpace-wide"
+        - "show_hiragana show_romaji_fullwidth preferences fullwidth-space numbers_fullwidth_width_toggle_half ， ． Return"
     symbols:
         - "ヽ ♪ -- -- -- -- -- ヿ 【 】"
         - "~ ` ´ | · √ µ ÷ × ¶"
         - "© ® £ $ € ^ ° * { }"
-        - "show_numbers_from_symbols \\ / § π τ [ ] BackSpace-special-3"
-        - "show_hiragana show_romaji preferences         space       symbols_width_toggle_full ! ? Return"
+        - "show_numbers_from_symbols \\ / § π τ [ ] BackSpace-wide"
+        - "show_hiragana show_romaji preferences space symbols_width_toggle_full ! ? Return"
     symbols_fullwidth:
         - "￣ ￤ -- -- -- -- -- ￢ ｟ ｠"
         - "～ ｀ -- ｜ -- -- -- -- -- --"
         - "-- -- ￡ ＄ -- ＾ -- ＊ ｛ ｝"
-        - "show_numbers_fullwidth_from_symbols ＼ ／ -- -- -- ［ ］ BackSpace-special-3"
-        - "show_hiragana show_romaji_fullwidth preferences         fullwidth-space       symbols_fullwidth_width_toggle_half ！ ？ Return"
+        - "show_numbers_fullwidth_from_symbols ＼ ／ -- -- -- ［ ］ BackSpace-wide"
+        - "show_hiragana show_romaji_fullwidth preferences fullwidth-space symbols_fullwidth_width_toggle_half ！ ？ Return"
     romaji:
         - "1 2 3 4 5 6 7 8 9 0"
         - "q w e r t y u i o p"
         - "a s d f g h j k l --"
-        - "show_romaji_upper   z x c v b n m BackSpace-special-3"
-        - "show_numbers show_hiragana preferences         space       romaji_width_toggle_full , . Return"
+        - "show_romaji_upper z x c v b n m BackSpace-wide"
+        - "show_numbers show_hiragana preferences space romaji_width_toggle_full , . Return"
     romaji_upper:
         - "1 2 3 4 5 6 7 8 9 0"
         - "Q W E R T Y U I O P"
         - "A S D F G H J K L --"
-        - "show_romaji_upper   Z X C V B N M BackSpace-special-3"
-        - "show_numbers show_hiragana preferences         space       romaji_width_toggle_full ! ? Return"
+        - "show_romaji_upper Z X C V B N M BackSpace-wide"
+        - "show_numbers show_hiragana preferences space romaji_width_toggle_full ! ? Return"
     romaji_fullwidth:
         - "１ ２ ３ ４ ５ ６ ７ ８ ９ ０"
         - "ｑ ｗ ｅ ｒ ｔ ｙ ｕ ｉ ｏ ｐ"
         - "ａ ｓ ｄ ｆ ｇ ｈ ｊ ｋ ｌ --"
-        - "show_romaji_fullwidth_upper   ｚ ｘ ｃ ｖ ｂ ｎ ｍ BackSpace-special-3"
-        - "show_numbers_fullwidth show_hiragana preferences         fullwidth-space       romaji_fullwidth_width_toggle_half ， ． Return"
+        - "show_romaji_fullwidth_upper ｚ ｘ ｃ ｖ ｂ ｎ ｍ BackSpace-wide"
+        - "show_numbers_fullwidth show_hiragana preferences fullwidth-space romaji_fullwidth_width_toggle_half ， ． Return"
     romaji_fullwidth_upper:
         - "１ ２ ３ ４ ５ ６ ７ ８ ９ ０"
         - "Ｑ Ｗ Ｅ Ｒ Ｔ Ｙ Ｕ Ｉ Ｏ Ｐ"
         - "Ａ Ｓ Ｄ Ｆ Ｇ Ｈ Ｊ Ｋ Ｌ --"
-        - "show_romaji_fullwidth_upper   Ｚ Ｘ Ｃ Ｖ Ｂ Ｎ Ｍ BackSpace-special-3"
-        - "show_numbers_fullwidth show_hiragana preferences         fullwidth-space       romaji_fullwidth_width_toggle_half ！ ？ Return"
+        - "show_romaji_fullwidth_upper Ｚ Ｘ Ｃ Ｖ Ｂ Ｎ Ｍ BackSpace-wide"
+        - "show_numbers_fullwidth show_hiragana preferences fullwidth-space romaji_fullwidth_width_toggle_half ！ ？ Return"
 
 
 #              k       s       t       n       h       m       y       r       w
@@ -122,7 +121,7 @@ buttons:
         outline: "special"
         icon: "edit-clear-symbolic"
         action: "erase"
-    BackSpace-special-3:
+    BackSpace-wide:
         outline: "special-3"
         icon: "edit-clear-symbolic"
         action: "erase"
@@ -387,6 +386,10 @@ buttons:
         outline: "default-2"
     0:
         outline: "default-2"
+    ²:
+        outline: "default-2"
+    ³:
+        outline: "default-2"
     "@":
         outline: "default-2"
     "#":

data/keyboards/no.yaml

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

data/keyboards/no_wide.yaml

@@ -1,39 +1,39 @@
 # Language: Norwegian
 ---
 outlines:
-    default:     { width: 48.87,  height: 42 }
-    altline:     { width: 73.5,   height: 42 }
-    wide:        { width: 92.99,  height: 42 }
-    change-view: { width: 73.5,   height: 42 }
-    spaceline:   { width: 273.5,  height: 42 }
-    special:     { width: 48.87,  height: 42 }
-    placeholder: { width: 48.87,  height: 42 }
-    fill:        { width: 97.74,  height: 42 }
+    default:       { width: 48.872,  height: 42 }
+    change-view:   { width: 73.308,  height: 42 }
+    change-view-2: { width: 85.526,  height: 42 }
+    placeholder:   { width: 48.872,  height: 42 }
+    spaceline:     { width: 268.796, height: 42 }
+    special:       { width: 48.872,  height: 42 }
+    special-2:     { width: 73.308,  height: 42 }
+    special-3:     { width: 85.526,  height: 42 }
 
 views:
     base:
         - "q w e r t y u i o p å"
         - "a s d f g h j k l ø æ"
-        - "Shift_L   z x c v b n m , BackSpace"
-        - "show_numbers preferences         space        .    Return"
+        - "show_upper z x c v b n m , BackSpace"
+        - "show_numbers preferences space . Return"
     upper:
         - "Q W E R T Y U I O P Å"
         - "A S D F G H J K L Ø Æ"
-        - "Shift_L   Z X C V B N M , BackSpace"
-        - "show_numbers preferences         space        .    Return"
+        - "show_upper Z X C V B N M , BackSpace"
+        - "show_numbers preferences space . Return"
     numbers:
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "@ # $ % & - _ + ( )"
-        - "show_symbols -- , \" ' : ; ! ? BackSpace"
-        - "show_letters preferences         space        .    Return"
+        - "1 2 3 4 5 6 7 8 9 0 ²"
+        - "@ # $ % & - _ + ( ) ³"
+        - "show_symbols , \" ' : ; ! ? -- BackSpace"
+        - "show_letters preferences space . Return"
     symbols:
-        - "~ ` | · √ π τ ÷ × ¶"
-        - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers -- \\ / < > = [ ] BackSpace"
-        - "show_letters preferences         space        .    Return"
+        - "~ ` | · √ π τ ÷ × ¶ ²"
+        - "© ® £ € ¥ ^ ° * { } ³"
+        - "show_numbers_from_symbols \\ / < > = [ ] -- BackSpace"
+        - "show_letters preferences space . Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -41,7 +41,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -49,6 +49,11 @@ buttons:
         outline: "special"
         icon: "keyboard-mode-symbolic"
     show_numbers:
+        action:
+            set_view: "numbers"
+        outline: "change-view-2"
+        label: "123"
+    show_numbers_from_symbols:
         action:
             set_view: "numbers"
         outline: "change-view"
@@ -56,7 +61,7 @@ buttons:
     show_letters:
         action:
             set_view: "base"
-        outline: "change-view"
+        outline: "change-view-2"
         label: "ABC"
     show_symbols:
         action:
@@ -67,17 +72,9 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "wide"
+        outline: "special-3"
         icon: "key-enter"
         keysym: "Return"
     --:
         outline: "placeholder"
         text: ""
-    5:
-        outline: "fill"
-    "&":
-        outline: "fill"
-    √:
-        outline: "fill"
-    ¥:
-        outline: "fill"

data/keyboards/number/us.yaml

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

data/keyboards/number/us_wide.yaml

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

data/keyboards/pin/us.yaml

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

data/keyboards/pin/us_wide.yaml

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

data/keyboards/pl.yaml

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

data/keyboards/pl_wide.yaml

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

data/keyboards/pt.yaml

@@ -2,43 +2,42 @@
 # This layout-file is a copy of "br.yaml"
 ---
 outlines:
-    default:       { width: 35.67, height: 52 }
-    altline:       { width: 53,    height: 52 }
-    wide:          { width: 53,    height: 52 }
-    change-view:   { width: 53,    height: 52 }
-    spaceline:     { width: 90,    height: 52 }
-    special:       { width: 35.67, height: 52 }
-    large:         { width: 71.34, height: 52 }
+    default:     { width: 35.657, height: 52 }
+    change-view: { width: 53.485, height: 52 }
+    large:       { width: 71.314, height: 52 }
+    spaceline:   { width: 89.144, height: 52 }
+    special:     { width: 35.657, height: 52 }
+    special-2:   { width: 53.485, height: 52 }
 
 views:
     base:
         - "q w e r t y u i o p"
         - "a s d f g h j k l ç"
-        - "Shift_L   z x c v b n m  BackSpace"
-        - "show_numbers show_eschars preferences         space     .-large Return"
+        - "show_upper z x c v b n m BackSpace"
+        - "show_numbers show_eschars preferences space .-large Return"
     upper:
         - "Q W E R T Y U I O P"
         - "A S D F G H J K L Ç"
-        - "Shift_L   Z X C V B N M  BackSpace"
-        - "show_numbers show_eschars preferences         space     ,-large Return"
+        - "show_upper Z X C V B N M BackSpace"
+        - "show_numbers show_eschars preferences space ,-large Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
-        - "show_symbols   , \" ' : ; ! ?  BackSpace"
+        - "show_symbols , \" ' : ; ! ? BackSpace"
         - "show_letters show_eschars preferences space º . Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers   \\ / < > = [ ]  BackSpace"
-        - "show_letters show_eschars preferences         space       ≠ § Return"
+        - "show_numbers \\ / < > = [ ] BackSpace"
+        - "show_letters show_eschars preferences space ≠ § Return"
     eschars:
         - "À Á Ã Â É Ê Í Ó Ô Õ"
         - "à á ã â é ê í ó ô õ "
         - "show_numbers Ú Ü ú ü ! ? . BackSpace"
-        - "show_letters show_eschars preferences         space    « »    Return"
+        - "show_letters show_eschars preferences space « » Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -46,7 +45,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -85,6 +84,6 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "wide"
+        outline: "special-2"
         icon: "key-enter"
         keysym: "Return"

data/keyboards/pt_wide.yaml

@@ -2,44 +2,44 @@
 # This layout-file is a copy of "br_wide.yaml"
 ---
 outlines:
-    default:     { width: 53.75, height: 42 }
-    thin:        { width: 40.5,  height: 42 }
-    altline:     { width: 81,    height: 42 }
-    wide:        { width: 92,    height: 42 }
-    change-view: { width: 81,    height: 42 }
-    spaceline:   { width: 149.5, height: 42 }
-    special:     { width: 53.75, height: 42 }
-    large:       { width: 81,    height: 42 }
+    default:     { width: 53.76,  height: 42 }
+    change-view: { width: 80.64,  height: 42 }
+    large:       { width: 80.64,  height: 42 }
+    spaceline:   { width: 147.84, height: 42 }
+    special:     { width: 53.76,  height: 42 }
+    special-2:   { width: 80.64,  height: 42 }
+    special-3:   { width: 94.08,  height: 42 }
+    thin:        { width: 40.32,  height: 42 }
 
 views:
     base:
         - "q w e r t y u i o p"
         - "a s d f g h j k l ç"
-        - "Shift_L   z x c v b n m  BackSpace"
-        - "show_numbers show_eschars preferences         space     .-large Return"
+        - "show_upper z x c v b n m BackSpace"
+        - "show_numbers show_eschars preferences space .-large Return"
     upper:
         - "Q W E R T Y U I O P"
         - "A S D F G H J K L Ç"
-        - "Shift_L   Z X C V B N M  BackSpace"
-        - "show_numbers show_eschars preferences         space     ,-large Return"
+        - "show_upper Z X C V B N M BackSpace"
+        - "show_numbers show_eschars preferences space ,-large Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
-        - "show_symbols   , \" ' : ; ! ?  BackSpace"
+        - "show_symbols , \" ' : ; ! ? BackSpace"
         - "show_letters show_eschars preferences space º .-thin Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers   \\ / < > = [ ]  BackSpace"
-        - "show_letters show_eschars preferences         space       ≠ § Return"
+        - "show_numbers \\ / < > = [ ] BackSpace"
+        - "show_letters show_eschars preferences space ≠ § Return"
     eschars:
         - "À Á Ã Â É Ê Í Ó Ô Õ"
         - "à á ã â é ê í ó ô õ "
         - "show_numbers Ú Ü ú ü ! ? . BackSpace"
-        - "show_letters show_eschars preferences         space    « »    Return"
+        - "show_letters show_eschars preferences space « » Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -47,7 +47,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -86,7 +86,7 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "wide"
+        outline: "special-3"
         icon: "key-enter"
         keysym: "Return"
     «:

data/keyboards/ro.yaml

@@ -1,43 +1,43 @@
 # Language: Romanian
 ---
 outlines:
-    default:       { width: 35.67,  height: 52 }
-    altline:       { width: 53.5,   height: 52 }
-    wide:          { width: 62,     height: 52 }
-    change-view:   { width: 53.5,   height: 52 }
-    spaceline:     { width: 107.67, height: 52 }
-    special:       { width: 35.67,  height: 52 }
-    large:         { width: 44,     height: 52 }
+    default:     { width: 35.657,  height: 52 }
+    change-view: { width: 53.485,  height: 52 }
+    large:       { width: 44.571,  height: 52 }
+    spaceline:   { width: 106.973, height: 52 }
+    special:     { width: 35.657,  height: 52 }
+    special-2:   { width: 53.485,  height: 52 }
+    special-3:   { width: 62.399,  height: 52 }
 
 views:
     base:
         - "q w e r t y u i o p"
         - "a s d f g h j k l"
-        - "Shift_L   z x c v b n m  BackSpace"
-        - "show_numbers show_eschars preferences         space        . Return"
+        - "show_upper z x c v b n m BackSpace"
+        - "show_numbers show_eschars preferences space . Return"
     upper:
         - "Q W E R T Y U I O P"
         - "A S D F G H J K L"
-        - "Shift_L   Z X C V B N M  BackSpace"
-        - "show_numbers show_eschars preferences         space        . Return"
+        - "show_upper Z X C V B N M BackSpace"
+        - "show_numbers show_eschars preferences space . Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # € % & - _ + ( )"
-        - "show_symbols   , \" ' : ; ! ?  BackSpace"
-        - "show_letters show_eschars preferences         space        . Return"
+        - "show_symbols , \" ' : ; ! ? BackSpace"
+        - "show_letters show_eschars preferences space . Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ $ ¥ ^ ° * { }"
-        - "show_numbers   \\ / < > = [ ]  BackSpace"
-        - "show_letters show_eschars preferences         space        . Return"
+        - "show_numbers \\ / < > = [ ] BackSpace"
+        - "show_letters show_eschars preferences space . Return"
     eschars:
         - "Ă Â Î Ș Ț Á É Í Ó Ü"
         - "ă â î ș ț á é í ó ü"
         - "show_numbers „ ” « » ― { } BackSpace"
-        - "show_letters show_eschars preferences         space        . Return"
+        - "show_letters show_eschars preferences space . Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -45,7 +45,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -78,7 +78,7 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "wide"
+        outline: "special-3"
         icon: "key-enter"
         keysym: "Return"
     .:

data/keyboards/ro_wide.yaml

@@ -1,42 +1,42 @@
 # Language: Romanian
 ---
 outlines:
-    default:       { width: 54,     height: 42 }
-    altline:       { width: 81,     height: 42 }
-    wide:          { width: 81,     height: 42 }
-    change-view:   { width: 81,     height: 42 }
-    spaceline:     { width: 189.25, height: 42 }
-    special:       { width: 54,     height: 42 }
+    default:     { width: 53.76,  height: 42 }
+    change-view: { width: 80.64,  height: 42 }
+    spaceline:   { width: 188.16, height: 42 }
+    special:     { width: 53.76,  height: 42 }
+    special-2:   { width: 80.64,  height: 42 }
+    special-3:   { width: 80.64,  height: 42 }
 
 views:
     base:
         - "q w e r t y u i o p"
         - "a s d f g h j k l"
-        - "Shift_L   z x c v b n m  BackSpace"
-        - "show_numbers show_eschars preferences         space        . Return"
+        - "show_upper z x c v b n m BackSpace"
+        - "show_numbers show_eschars preferences space . Return"
     upper:
         - "Q W E R T Y U I O P"
         - "A S D F G H J K L"
-        - "Shift_L   Z X C V B N M  BackSpace"
-        - "show_numbers show_eschars preferences         space        , Return"
+        - "show_upper Z X C V B N M BackSpace"
+        - "show_numbers show_eschars preferences space , Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # € % & - _ + ( )"
-        - "show_symbols   , \" ' : ; ! ?  BackSpace"
-        - "show_letters show_eschars preferences         space        . Return"
+        - "show_symbols , \" ' : ; ! ? BackSpace"
+        - "show_letters show_eschars preferences space . Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ $ ¥ ^ ° * { }"
-        - "show_numbers   \\ / < > = [ ]  BackSpace"
-        - "show_letters show_eschars preferences         space        , Return"
+        - "show_numbers \\ / < > = [ ] BackSpace"
+        - "show_letters show_eschars preferences space , Return"
     eschars:
         - "ă â î ș ț á é í ó ü"
         - "Ă Â Î Ș Ț Á É Í Ó Ü"
         - "show_numbers „ ” « » ― { } BackSpace"
-        - "show_letters show_eschars preferences         space        . Return"
+        - "show_letters show_eschars preferences space . Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -44,7 +44,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -77,6 +77,6 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "wide"
+        outline: "special-3"
         icon: "key-enter"
         keysym: "Return"

data/keyboards/rs+latin.yaml

@@ -1,40 +1,40 @@
 # 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 }
+    default:       { width: 32.415,  height: 52 }
+    change-view:   { width: 32.415,  height: 52 }
+    change-view-2: { width: 48.622,  height: 52 }
+    change-view-3: { width: 56.726,  height: 52 }
+    placeholder:   { width: 32.415,  height: 52 }
+    spaceline:     { width: 145.868, height: 52 }
+    special:       { width: 32.415,  height: 52 }
+    special-2:     { width: 48.622,  height: 52 }
+    special-3:     { width: 56.726,  height: 52 }
 
 views:
     base:
         - "q w e r t z u i o p š"
         - "a s d f g h j k l č ć"
-        - "Shift_L    y x c v b n m đ ž BackSpace"
-        - "show_numbers preferences     space    , . Return"
+        - "show_upper y x c v b n m đ ž BackSpace"
+        - "show_numbers preferences space , . Return"
     upper:
         - "Q W E R T Z U I O P Š"
         - "A S D F G H J K L Č Ć"
-        - "Shift_L    Y X C V B N M Đ Ž BackSpace"
-        - "show_numbers preferences     space    ! ? Return"
+        - "show_upper Y X C V B N M Đ Ž BackSpace"
+        - "show_numbers preferences space ! ? Return"
     numbers:
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "@ # $ % & - _ + ( )"
-        - "show_symbols    , \" ' : ; ! ? -- BackSpace-wide"
-        - "show_letters preferences     space    , . Return"
+        - "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"
+        - "~ ` | · √ π τ ÷ × ¶ ²"
+        - "© ® £ € ¥ ^ ° * { } ³"
+        - "show_numbers_from_symbols \\ / < > = [ ] -- BackSpace-wide"
+        - "show_letters preferences space , . Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -42,11 +42,11 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special"
         icon: "edit-clear-symbolic"
         action: "erase"
     BackSpace-wide:
-        outline: "wide"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -54,6 +54,11 @@ buttons:
         outline: "special"
         icon: "keyboard-mode-symbolic"
     show_numbers:
+        action:
+            set_view: "numbers"
+        outline: "change-view-3"
+        label: "123"
+    show_numbers_from_symbols:
         action:
             set_view: "numbers"
         outline: "change-view-2"
@@ -61,7 +66,7 @@ buttons:
     show_letters:
         action:
             set_view: "base"
-        outline: "change-view-2"
+        outline: "change-view-3"
         label: "ABC"
     show_symbols:
         action:
@@ -72,17 +77,9 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "wide"
+        outline: "special-3"
         icon: "key-enter"
         keysym: "Return"
     --:
         outline: "placeholder"
         text: ""
-    5:
-        outline: "fill"
-    "&":
-        outline: "fill"
-    √:
-        outline: "fill"
-    ¥:
-        outline: "fill"

data/keyboards/rs+latin_wide.yaml

@@ -1,40 +1,39 @@
 # Language: Serbian (Latin)
 ---
 outlines:
-    default:       { width: 48.87,  height: 42 }
-    fill:          { width: 73.31,  height: 42 }
-    altline:       { width: 48.87,  height: 42 }
-    wide:          { width: 73.31,  height: 42 }
-    change-view:   { width: 48.87,  height: 42 }
-    change-view-2: { width: 73.31,  height: 42 }
-    spaceline:     { width: 244.34, height: 42 }
-    special:       { width: 48.87,  height: 42 }
-    placeholder:   { width: 48.87,  height: 42 }
+    default:       { width: 48.872, height: 42 }
+    change-view:   { width: 48.872, height: 42 }
+    change-view-2: { width: 73.308, height: 42 }
+    placeholder:   { width: 48.872, height: 42 }
+    spaceline:     { width: 244.36, height: 42 }
+    special:       { width: 48.872, height: 42 }
+    special-2:     { width: 48.872, height: 42 }
+    special-3:     { width: 73.308, height: 42 }
 
 views:
     base:
         - "q w e r t z u i o p š"
         - "a s d f g h j k l č ć"
-        - "Shift_L    y x c v b n m đ ž BackSpace"
-        - "show_numbers preferences     space    , . Return"
+        - "show_upper y x c v b n m đ ž BackSpace"
+        - "show_numbers preferences space , . Return"
     upper:
         - "Q W E R T Z U I O P Š"
         - "A S D F G H J K L Č Ć"
-        - "Shift_L    Y X C V B N M Đ Ž BackSpace"
-        - "show_numbers preferences     space    ! ? Return"
+        - "show_upper Y X C V B N M Đ Ž BackSpace"
+        - "show_numbers preferences space ! ? Return"
     numbers:
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "@ # $ % & - _ + ( )"
-        - "show_symbols    , \" ' : ; ! ? -- BackSpace-wide"
-        - "show_letters preferences     space    , . Return"
+        - "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"
+        - "~ ` | · √ π τ ÷ × ¶ ²"
+        - "© ® £ € ¥ ^ ° * { } ³"
+        - "show_numbers \\ / < > = [ ] -- BackSpace-wide"
+        - "show_letters preferences space , . Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -42,11 +41,11 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     BackSpace-wide:
-        outline: "wide"
+        outline: "special-3"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -72,25 +71,9 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "wide"
+        outline: "special-3"
         icon: "key-enter"
         keysym: "Return"
     --:
         outline: "placeholder"
         text: ""
-    5:
-        outline: "fill"
-    6:
-        outline: "fill"
-    "&":
-        outline: "fill"
-    -:
-        outline: "fill"
-    √:
-        outline: "fill"
-    π:
-        outline: "fill"
-    ¥:
-        outline: "fill"
-    ^:
-        outline: "fill"

data/keyboards/rs+latinunicode.yaml

@@ -1,40 +1,39 @@
 # Language: Serbian (Latin, Unicode)
 ---
 outlines:
-    default:       { width: 32.42,  height: 52 }
-    fill:          { width: 64.84,  height: 52 }
-    altline:       { width: 48.63,  height: 52 }
-    wide:          { width: 64.84,  height: 52 }
-    change-view:   { width: 48.63,  height: 52 }
-    change-view-2: { width: 64.84,  height: 52 }
-    spaceline:     { width: 129.68, height: 52 }
-    special:       { width: 32.42,  height: 52 }
-    placeholder:   { width: 32.42,  height: 52 }
+    default:       { width: 32.415,  height: 52 }
+    change-view:   { width: 48.622,  height: 52 }
+    change-view-2: { width: 56.726,  height: 52 }
+    placeholder:   { width: 32.415,  height: 52 }
+    spaceline:     { width: 145.868, height: 52 }
+    special:       { width: 32.415,  height: 52 }
+    special-2:     { width: 48.622,  height: 52 }
+    special-3:     { width: 56.726,  height: 52 }
 
 views:
     base:
         - "lj nj e r t z u i o p š"
         - "a s d f g h j k l č ć"
-        - "Shift_L    ž dž c v b n m đ BackSpace"
-        - "show_numbers preferences     space    , . Return"
+        - "show_upper ž dž c v b n m đ BackSpace"
+        - "show_numbers preferences space , . Return"
     upper:
         - "Lj Nj E R T Z U I O P Š"
         - "A S D F G H J K L Č Ć"
-        - "Shift_L    Ž Dž C V B N M Đ BackSpace"
-        - "show_numbers preferences     space    ! ? Return"
+        - "show_upper Ž Dž C V B N M Đ BackSpace"
+        - "show_numbers preferences space ! ? Return"
     numbers:
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "@ # $ % & - _ + ( )"
-        - "show_symbols    , \" ' : ; ! ? -- BackSpace"
-        - "show_letters preferences     space    , . Return"
+        - "1 2 3 4 5 6 7 8 9 0 ²"
+        - "@ # $ % & - _ + ( ) ³"
+        - "show_symbols , \" ' : ; ! ? -- BackSpace"
+        - "show_letters preferences space , . Return"
     symbols:
-        - "~ ` | · √ π τ ÷ × ¶"
-        - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers_from_symbols    \\ / < > = [ ] -- BackSpace"
-        - "show_letters preferences     space    , . Return"
+        - "~ ` | · √ π τ ÷ × ¶ ²"
+        - "© ® £ € ¥ ^ ° * { } ³"
+        - "show_numbers_from_symbols \\ / < > = [ ] -- BackSpace"
+        - "show_letters preferences space , . Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -42,7 +41,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -73,17 +72,9 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "wide"
+        outline: "special-3"
         icon: "key-enter"
         keysym: "Return"
     --:
         outline: "placeholder"
         text: ""
-    5:
-        outline: "fill"
-    "&":
-        outline: "fill"
-    √:
-        outline: "fill"
-    ¥:
-        outline: "fill"

data/keyboards/rs+latinunicode_wide.yaml

@@ -1,39 +1,37 @@
 # Language: Serbian (Latin, Unicode)
 ---
 outlines:
-    default:     { width: 48.87,  height: 42 }
-    fill:        { width: 73.31,  height: 42 }
-    altline:     { width: 73.31,  height: 42 }
-    wide:        { width: 73.31,  height: 42 }
-    change-view: { width: 73.31,  height: 42 }
-    spaceline:   { width: 244.34, height: 42 }
-    special:     { width: 48.87,  height: 42 }
-    placeholder: { width: 48.87,  height: 42 }
+    default:     { width: 48.872, height: 42 }
+    change-view: { width: 73.308, height: 42 }
+    placeholder: { width: 48.872, height: 42 }
+    spaceline:   { width: 244.36, height: 42 }
+    special:     { width: 48.872, height: 42 }
+    special-2:   { width: 73.308, height: 42 }
 
 views:
     base:
         - "lj nj e r t z u i o p š"
         - "a s d f g h j k l č ć"
-        - "Shift_L    ž dž c v b n m đ BackSpace"
-        - "show_numbers preferences     space    , . Return"
+        - "show_upper ž dž c v b n m đ BackSpace"
+        - "show_numbers preferences space , . Return"
     upper:
         - "Lj Nj E R T Z U I O P Š"
         - "A S D F G H J K L Č Ć"
-        - "Shift_L    Ž Dž C V B N M Đ BackSpace"
-        - "show_numbers preferences     space    ! ? Return"
+        - "show_upper Ž Dž C V B N M Đ BackSpace"
+        - "show_numbers preferences space ! ? Return"
     numbers:
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "@ # $ % & - _ + ( )"
-        - "show_symbols    , \" ' : ; ! ? -- BackSpace"
-        - "show_letters preferences     space    , . Return"
+        - "1 2 3 4 5 6 7 8 9 0 ²"
+        - "@ # $ % & - _ + ( ) ³"
+        - "show_symbols , \" ' : ; ! ? -- BackSpace"
+        - "show_letters preferences space , . Return"
     symbols:
-        - "~ ` | · √ π τ ÷ × ¶"
-        - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers    \\ / < > = [ ] -- BackSpace"
-        - "show_letters preferences     space    , . Return"
+        - "~ ` | · √ π τ ÷ × ¶ ²"
+        - "© ® £ € ¥ ^ ° * { } ³"
+        - "show_numbers \\ / < > = [ ] -- BackSpace"
+        - "show_letters preferences space , . Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -41,7 +39,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -67,25 +65,9 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "wide"
+        outline: "special-2"
         icon: "key-enter"
         keysym: "Return"
     --:
         outline: "placeholder"
         text: ""
-    5:
-        outline: "fill"
-    6:
-        outline: "fill"
-    "&":
-        outline: "fill"
-    -:
-        outline: "fill"
-    √:
-        outline: "fill"
-    π:
-        outline: "fill"
-    ¥:
-        outline: "fill"
-    ^:
-        outline: "fill"

data/keyboards/rs.yaml

@@ -1,40 +1,39 @@
 # Language: Serbian
 ---
 outlines:
-    default:       { width: 32.12,  height: 52 }
-    fill:          { width: 64.24,  height: 52 }
-    altline:       { width: 48.18,  height: 52 }
-    wide:          { width: 64.24,  height: 52 }
-    change-view:   { width: 48.18,  height: 52 }
-    change-view-2: { width: 64.24,  height: 52 }
-    spaceline:     { width: 128.48, height: 52 }
-    special:       { width: 32.12,  height: 52 }
-    placeholder:   { width: 32.12,  height: 52 }
+    default:       { width: 32.415,  height: 52 }
+    change-view:   { width: 48.622,  height: 52 }
+    change-view-2: { width: 56.726,  height: 52 }
+    placeholder:   { width: 32.415,  height: 52 }
+    spaceline:     { width: 145.868, height: 52 }
+    special:       { width: 32.415,  height: 52 }
+    special-2:     { width: 48.622,  height: 52 }
+    special-3:     { width: 56.726,  height: 52 }
 
 views:
     base:
         - "љ њ е р т з у и о п ш"
         - "а с д ф г х ј к л ч ћ"
-        - "Shift_L џ ц в б н м ђ ж BackSpace"
-        - "show_numbers preferences     space    , . Return"
+        - "show_upper џ ц в б н м ђ ж BackSpace"
+        - "show_numbers preferences space , . Return"
     upper:
         - "Љ Њ Е Р Т З У И О П Ш"
         - "А С Д Ф Г Х Ј К Л Ч Ћ"
-        - "Shift_L Џ Ц В Б Н М Ђ Ж BackSpace"
-        - "show_numbers preferences     space    ! ? Return"
+        - "show_upper Џ Ц В Б Н М Ђ Ж BackSpace"
+        - "show_numbers preferences space ! ? Return"
     numbers:
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "@ # $ % & - _ + ( )"
-        - "show_symbols    , \" ' : ; ! ? -- BackSpace"
-        - "show_letters preferences     space    , . Return"
+        - "1 2 3 4 5 6 7 8 9 0 ²"
+        - "@ # $ % & - _ + ( ) ³"
+        - "show_symbols , \" ' : ; ! ? -- BackSpace"
+        - "show_letters preferences space , . Return"
     symbols:
-        - "~ ` | · √ π τ ÷ × ¶"
-        - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers_from_symbols    \\ / < > = [ ] -- BackSpace"
-        - "show_letters preferences     space    , . Return"
+        - "~ ` | · √ π τ ÷ × ¶ ²"
+        - "© ® £ € ¥ ^ ° * { } ³"
+        - "show_numbers_from_symbols \\ / < > = [ ] -- BackSpace"
+        - "show_letters preferences space , . Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -42,7 +41,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -73,17 +72,9 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "wide"
+        outline: "special-3"
         icon: "key-enter"
         keysym: "Return"
     --:
         outline: "placeholder"
         text: ""
-    5:
-        outline: "fill"
-    "&":
-        outline: "fill"
-    √:
-        outline: "fill"
-    ¥:
-        outline: "fill"

data/keyboards/rs_wide.yaml

@@ -1,39 +1,38 @@
 # Language: Serbian
 ---
 outlines:
-    default:     { width: 48.87,  height: 42 }
-    fill:        { width: 73.31,  height: 42 }
-    altline:     { width: 73.31,  height: 42 }
-    wide:        { width: 73.31,  height: 42 }
-    change-view: { width: 73.31,  height: 42 }
-    spaceline:   { width: 244.35, height: 42 }
-    special:     { width: 48.87,  height: 42 }
-    placeholder: { width: 48.87,  height: 42 }
+    default:     { width: 48.872, height: 42 }
+    change-view: { width: 73.308, height: 42 }
+    placeholder: { width: 48.872, height: 42 }
+    spaceline:   { width: 244.36, height: 42 }
+    special:     { width: 48.872, height: 42 }
+    special-2:   { width: 73.308, height: 42 }
+    special-3:   { width: 73.308, height: 42 }
 
 views:
     base:
         - "љ њ е р т з у и о п ш"
         - "а с д ф г х ј к л ч ћ"
-        - "Shift_L  џ ц в б н м ђ ж BackSpace"
-        - "show_numbers preferences     space    , . Return"
+        - "show_upper џ ц в б н м ђ ж BackSpace"
+        - "show_numbers preferences space , . Return"
     upper:
         - "Љ Њ Е Р Т З У И О П Ш"
         - "А С Д Ф Г Х Ј К Л Ч Ћ"
-        - "Shift_L   Џ Ц В Б Н М Ђ Ж BackSpace"
-        - "show_numbers preferences     space    ! ? Return"
+        - "show_upper Џ Ц В Б Н М Ђ Ж BackSpace"
+        - "show_numbers preferences space ! ? Return"
     numbers:
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "@ # $ % & - _ + ( )"
-        - "show_symbols    , \" ' : ; ! ? -- BackSpace"
-        - "show_letters preferences     space    , . Return"
+        - "1 2 3 4 5 6 7 8 9 0 ²"
+        - "@ # $ % & - _ + ( ) ³"
+        - "show_symbols , \" ' : ; ! ? -- BackSpace"
+        - "show_letters preferences space , . Return"
     symbols:
-        - "~ ` | · √ π τ ÷ × ¶"
-        - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers    \\ / < > = [ ] -- BackSpace"
-        - "show_letters preferences     space    , . Return"
+        - "~ ` | · √ π τ ÷ × ¶ ²"
+        - "© ® £ € ¥ ^ ° * { } ³"
+        - "show_numbers \\ / < > = [ ] -- BackSpace"
+        - "show_letters preferences space , . Return"
 
 buttons:
-    Shift_L:
+    show_upper:
         action:
             locking:
                 lock_view: "upper"
@@ -41,7 +40,7 @@ buttons:
         outline: "change-view"
         icon: "key-shift"
     BackSpace:
-        outline: "altline"
+        outline: "special-2"
         icon: "edit-clear-symbolic"
         action: "erase"
     preferences:
@@ -67,25 +66,9 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "wide"
+        outline: "special-3"
         icon: "key-enter"
         keysym: "Return"
     --:
         outline: "placeholder"
         text: ""
-    5:
-        outline: "fill"
-    6:
-        outline: "fill"
-    "&":
-        outline: "fill"
-    -:
-        outline: "fill"
-    √:
-        outline: "fill"
-    π:
-        outline: "fill"
-    ¥:
-        outline: "fill"
-    ^:
-        outline: "fill"

data/keyboards/ru.yaml

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

data/keyboards/ru_wide.yaml

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