Merge branch 'update-link' into 'master'

squeekboard.doap: update descriptions and links See merge request World/Phosh/squeekboard!618
squeekboard.doap: update descriptions and links
2024-03-09 10:41:10 +00:00 · 2024-03-09 10:25:14 +00:00 · 2024-03-09 09:01:07 +00:00 · 2024-03-09 09:27:13 +01:00 · 2024-03-08 15:47:20 +00:00 · 2024-03-08 14:49:11 +01:00
158 changed files with 9653 additions and 1704 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -32,7 +32,7 @@ build_meson:
  script:
    - mv debian/control-newer debian/control
    - apt-get -y build-dep .
-    - meson . _build/ -Ddepdatadir=/usr/share --werror
+    - meson . _build/ -Ddepdatadir=/usr/share -Dfind_orphans=true --werror
    - ninja -C _build install
  except:
    variables:
@ -76,7 +76,7 @@ build_deb:arm64:
    - cp ../*.deb .

 build_deb:future:
-  image: debian:sid
+  image: debian:bookworm
  allow_failure: true
  tags:
    - aarch64
--- a/Cargo.deps.newer
+++ b/Cargo.deps.newer
@ -1,7 +1,8 @@
-# Dependencies which change based on build flags
+# Dependencies and tools which change based on build flags
 # For the newer-than-Byzantium config
+
 bitflags = "1.3.*"
-clap = { version = "3.1.*", features=["std"], default-features = false }
+clap = { version = "4.*", features=["std"], default-features = false }
 zbus = "1.9.*"
 zvariant = "2.10.*"
 # Newer versions seem to confuse the version of Cargo on Debian Bullseye
--- a/Cargo.lock
+++ b/Cargo.lock
@ -42,9 +42,9 @@ checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"

 [[package]]
 name = "byteorder"
-version = "1.4.3"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"

 [[package]]
 name = "cairo-rs"
@ -73,9 +73,9 @@ dependencies = [

 [[package]]
 name = "cc"
-version = "1.0.73"
+version = "1.0.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11"
+checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5"

 [[package]]
 name = "cfg-if"
@ -108,7 +108,7 @@ checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn",
+ "syn 1.0.109",
 ]

 [[package]]
@ -129,14 +129,14 @@ checksum = "946ee94e3dbf58fdd324f9ce245c7b238d46a66f00e86a020b71996349e46cce"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn",
+ "syn 1.0.109",
 ]

 [[package]]
 name = "fastrand"
-version = "1.7.0"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3fcf0cee53519c866c09b5de1f6c56ff9d647101f81c1964fa632e148896cdf"
+checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be"
 dependencies = [
 "instant",
 ]
@ -319,15 +319,15 @@ dependencies = [

 [[package]]
 name = "hashbrown"
-version = "0.11.2"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
+checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"

 [[package]]
 name = "indexmap"
-version = "1.8.2"
+version = "1.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6012d540c5baa3589337a98ce73408de9b5a25ec9fc2c6fd6be8f0d39e0ca5a"
+checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
 dependencies = [
 "autocfg",
 "hashbrown",
@ -350,9 +350,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"

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

 [[package]]
 name = "linked-hash-map"
@ -418,9 +418,9 @@ dependencies = [

 [[package]]
 name = "pkg-config"
-version = "0.3.25"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae"
+checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"

 [[package]]
 name = "proc-macro-crate"
@ -433,18 +433,18 @@ dependencies = [

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

 [[package]]
 name = "quote"
-version = "1.0.20"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3bcdf212e9776fbcb2d23ab029360416bb1706b1aea2d1a5ba002727cbcab804"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
 "proc-macro2",
 ]
@ -463,7 +463,6 @@ dependencies = [
 "glib-sys",
 "gtk",
 "gtk-sys",
- "indexmap",
 "maplit",
 "serde",
 "serde_yaml",
@ -475,52 +474,52 @@ dependencies = [

 [[package]]
 name = "ryu"
-version = "1.0.10"
+version = "1.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3f6f92acf49d1b98f7a81226834412ada05458b7364277387724a237f062695"
+checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1"

 [[package]]
 name = "scoped-tls"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2"
+checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"

 [[package]]
 name = "serde"
-version = "1.0.137"
+version = "1.0.197"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61ea8d54c77f8315140a05f4c7237403bf38b72704d031543aa1d16abbf517d1"
+checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2"
 dependencies = [
 "serde_derive",
 ]

 [[package]]
 name = "serde_derive"
-version = "1.0.137"
+version = "1.0.197"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f26faba0c3959972377d3b2d306ee9f71faee9714294e41bb777f83f88578be"
+checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn",
+ "syn 2.0.52",
 ]

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

 [[package]]
 name = "serde_yaml"
-version = "0.8.24"
+version = "0.8.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "707d15895415db6628332b737c838b88c598522e4dc70647e59b72312924aebc"
+checksum = "578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b"
 dependencies = [
 "indexmap",
 "ryu",
@ -530,9 +529,20 @@ dependencies = [

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

 [[package]]
 name = "toml"
-version = "0.5.9"
+version = "0.5.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7"
+checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
 dependencies = [
 "serde",
 ]

 [[package]]
 name = "unicode-ident"
-version = "1.0.1"
+version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bd2fe26506023ed7b5e1e315add59d6f584c621d037f9368fea9cfb988f368c"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"

 [[package]]
 name = "unicode-width"
-version = "0.1.9"
+version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973"
+checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"

 [[package]]
 name = "void"
@ -599,9 +609,9 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"

 [[package]]
 name = "xkbcommon"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fda0ea5f7ddabd51deeeda7799bee06274112f577da7dd3d954b8eda731b2fce"
+checksum = "032ed00cc755c31221bbd6aaf9fa4196a01bf33bca185f9316e14f26d28c28cf"
 dependencies = [
 "libc",
 "memmap",
@ -644,7 +654,7 @@ dependencies = [
 "proc-macro-crate",
 "proc-macro2",
 "quote",
- "syn",
+ "syn 1.0.109",
 ]

 [[package]]
@ -666,5 +676,5 @@ checksum = "d68726e8c12757384a8d1485080527e263dea67d91f19e97cd71b9292f22d7c5"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn",
+ "syn 1.0.109",
 ]
--- a/Cargo.lock.newer
+++ b/Cargo.lock.newer
--- a/Cargo.toml.in
+++ b/Cargo.toml.in
@ -1,6 +1,7 @@
 [package]
 name = "rs"
 version = "0.1.0"
+edition = "2021"

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

+[[example]]
+name = "find_orphan_layouts"
+path = "@path@/examples/find_orphan_layouts.rs"
+
 [features]
 glib_v0_14 = []
+zbus_v1_5 = []
+clap_v4 = []

 # Dependencies which don't change based on build flags
 [dependencies]
--- a/NEWS.md
+++ b/NEWS.md
@ -0,0 +1,59 @@
+1.23.0
+------------------
+
+New or updated translations:
+- Belarusian
+- Haitian Creole
+
+New layouts:
+- French Canadian (QWERTY + accented letters)
+- German terminal-layout
+- Spanish terminal-layout
+
+Changes:
+- Fixed Persian and Swiss layouts
+- Fixed various small style-issues in many layouts
+- Improved the US-terminal-layout
+
+1.22.0 "Superposition"
+------------------
+
+New or updated translations:
+- Basque
+
+Changes:
+- fixed panel sizing when scaling
+- fixed panel sizing when rotating
+- fixed Dvorak terminal layout
+
+1.21.0 "Expected value"
+------------------
+
+New or updated translations:
+- Hindi
+- Czech
+- German
+
+New layouts:
+- wide Swedish
+- Hungarian
+
+Changes:
+- use a custom font for gr+polytonic, where the default is unreadable
+- require newer Rust
+- fixed panel sizing when rotating
+- internal improvements.
+
+1.20.0 "PID controller"
+------------------
+
+New translations:
+- Greek
+- Croatian
+
+New layouts:
+- US Dvorak terminal
+
+Improvements:
+- forcing the panel to hide now takes effect immediately
+- Squeekboard icon will present itself when other applications need to show it
--- a/data/common.css
+++ b/data/common.css
@ -5,6 +5,12 @@ sq_view {
    font-size: 1.5em;
 }

+/* Becomes readable with a special font */
+sq_view.gr_polytonic {
+    font-family: GFSDidotClassic, cantarell, sans-serif;
+    font-size: 2em;
+}
+
 sq_button {
    border-radius: 4px;
    margin: 2px;
--- a/data/icons/zwnj.svg
+++ b/data/icons/zwnj.svg
@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1">
+  <path d="M 3,0.5 V 1 c 2.5,0 4.5,1 4.5,2 v 12.5 h 1 V 3 c 0,-1 2,-2 4.5,-2 V 0.5 Z" />
+</svg>
--- a/data/keyboards/be.yaml
+++ b/data/keyboards/be.yaml
@ -63,7 +63,7 @@ buttons:
        action:
            set_view: "base"
        outline: "wide"
-        label: "abc"
+        label: "ABC"
    show_symbols:
        action:
            set_view: "symbols"
--- a/data/keyboards/be_wide.yaml
+++ b/data/keyboards/be_wide.yaml
@ -63,7 +63,7 @@ buttons:
        action:
            set_view: "base"
        outline: "wide"
-        label: "abc"
+        label: "ABC"
    show_symbols:
        action:
            set_view: "symbols"
--- a/data/keyboards/bg+phonetic.yaml
+++ b/data/keyboards/bg+phonetic.yaml
@ -59,7 +59,7 @@ buttons:
        action:
            set_view: "base"
        outline: "wide"
-        label: "abc"
+        label: "ABC"
    show_symbols:
        action:
            set_view: "symbols"
--- a/data/keyboards/bg.yaml
+++ b/data/keyboards/bg.yaml
@ -59,7 +59,7 @@ buttons:
        action:
            set_view: "base"
        outline: "wide"
-        label: "abc"
+        label: "ABC"
    show_symbols:
        action:
            set_view: "symbols"
--- a/data/keyboards/ca.yaml
+++ b/data/keyboards/ca.yaml
@ -0,0 +1,93 @@
+---
+outlines:
+    default:   { width: 35.33, height: 52 }
+    altline:   { width: 52.67, height: 52 }
+    wide:      { width: 62,    height: 52 }
+    spaceline: { width: 142,   height: 52 }
+    special:   { width: 44,    height: 52 }
+
+views:
+    base:
+        - "q w e r t y u i o p"
+        - "a s d f g h j k l"
+        - "Shift_L   z x c v b n m  BackSpace"
+        - "show_numbers preferences         space        show_eschars Return"
+    upper:
+        - "Q W E R T Y U I O P"
+        - "A S D F G H J K L"
+        - "Shift_L   Z X C V B N M  BackSpace"
+        - "show_numbers preferences         space        show_eschars Return"
+    numbers:
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "@ # $ % & - _ + ( )"
+        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
+        - "show_letters preferences         space        show_eschars Return"
+    symbols:
+        - "~ ` | · √ π τ ÷ × ¶"
+        - "© ® £ € ¥ ^ ° * { }"
+        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
+        - "show_letters preferences         space        show_eschars Return"
+    eschars:
+        - "à â ç é è ê ë î ï ô"
+        - "ù û À Â Ç É È Ê Î Ô"
+        - "show_numbers_from_symbols  ' ! ? . ,   BackSpace"
+        - "show_letters preferences         space        show_eschars Return"
+
+buttons:
+    Shift_L:
+        action:
+            locking:
+                lock_view: "upper"
+                unlock_view: "base"
+        outline: "altline"
+        icon: "key-shift"
+    BackSpace:
+        outline: "altline"
+        icon: "edit-clear-symbolic"
+        action: erase
+    preferences:
+        action: show_prefs
+        outline: "special"
+        icon: "keyboard-mode-symbolic"
+    show_numbers:
+        action:
+            set_view: "numbers"
+        outline: "wide"
+        label: "123"
+    show_numbers_from_symbols:
+        action:
+            set_view: "numbers"
+        outline: "altline"
+        label: "123"
+    show_letters:
+        action:
+            set_view: "base"
+        outline: "wide"
+        label: "ABC"
+    show_symbols:
+        action:
+            set_view: "symbols"
+        outline: "altline"
+        label: "*/="
+    show_eschars:
+        action:
+            locking:
+                lock_view: "eschars"
+                unlock_view: "base"
+        outline: "altline"
+        label: "âÂ"
+    period:
+        outline: "special"
+        text: "."
+    space:
+        outline: "spaceline"
+        text: " "
+    Return:
+        outline: "wide"
+        icon: "key-enter"
+        keysym: "Return"
+    colon:
+        text: ":"
+
+
+
--- a/data/keyboards/ch+de.yaml
+++ b/data/keyboards/ch+de.yaml
@ -55,7 +55,7 @@ buttons:
        action:
            set_view: "base"
        outline: "altline"
-        label: "abc"
+        label: "ABC"
    show_symbols:
        action:
            set_view: "symbols"
--- a/data/keyboards/ch+fr.yaml
+++ b/data/keyboards/ch+fr.yaml
@ -32,7 +32,7 @@ views:
        - "à â ç é è ê î ô ù û"
        - "À Â Ç É È Ê Î Ô Ù Û"
        - "show_numbers  æ œ ä ë ï ö ü  BackSpace"
-        - "show_letters_from_accents preferences  ñ Ñ   space        ° ß Return"
+        - "show_letters show_eschars preferences  ñ Ñ   space        ° ß Return"

 buttons:
    Shift_L:
@ -59,7 +59,7 @@ buttons:
        action:
            set_view: "base"
        outline: "altline"
-        label: "abc"
+        label: "ABC"
    show_symbols:
        action:
            set_view: "symbols"
@ -71,14 +71,7 @@ buttons:
                lock_view: "eschars"
                unlock_view: "base"
        outline: "altline"
-        label: "âÂ"
-    show_letters_from_accents:
-        action:
-            locking:
-                lock_view: "eschars"
-                unlock_view: "base"
-        outline: "altline"
-        label: "âÂ"
+        label: "Ââ"
    space:
        outline: "spaceline"
        label: " "
--- a/data/keyboards/ch.yaml
+++ b/data/keyboards/ch.yaml
@ -3,38 +3,39 @@

 ---
 outlines:
-    default:   { width: 35.33, height: 52 }
-    altline:   { width: 48,    height: 52 }
-    wide:      { width: 59,    height: 52 }
-    spaceline: { width: 70,    height: 52 }
-    special:   { width: 28,    height: 52 }
+    default:     { width: 35.33,  height: 58 }
+    doublewidth: { width: 70.66,  height: 58 }
+    altline:     { width: 52.8,   height: 58 }
+    wide:        { width: 64.9,   height: 58 }
+    spaceline:   { width: 116.67, height: 58 }
+    special:     { width: 30.41,  height: 58 }

 views:
    base:
        - "q w e r t z u i o p ü"
        - "a s d f g h j k l ö ä"
-        - "Shift_L   y x c v b n m  BackSpace"
-        - "show_numbers show_eschars preferences    '   space        , . Return"
+        - "Shift_L   y x c v b n m ' BackSpace"
+        - "show_numbers show_eschars preferences       Space    , .    Return"
    upper:
        - "Q W E R T Z U I O P Ü"
        - "A S D F G H J K L Ö Ä"
-        - "Shift_L   Y X C V B N M  BackSpace"
-        - "show_numbers show_eschars preferences    \"  space        , . Return"
+        - "Shift_L   Y X C V B N M \" BackSpace"
+        - "show_numbers show_eschars preferences       Space    , .    Return"
    numbers:      
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "@ * + - = ( ) ~ < > ? !"
-        - "show_symbols  # & / \\ √ ; : BackSpace"
-        - "show_letters show_eschars preferences    _   space        , . Return"
+        - "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_letters show_eschars preferences       Space    , .    Return"
    eschars:
-        - "à â ç é è ê î ô ù û"
-        - "À Â Ç É È Ê Î Ô Ù Û"
-        - "show_numbers  æ œ ä ë ï ö ü  BackSpace"
-        - "show_letters_from_accents preferences  ñ Ñ   space        ° ß Return"
+        - "à â ç é è ê î ô ù û ñ"
+        - "À Â Ç É È Ê Î Ô Ù Û Ñ"
+        - "show_numbers  æ œ ä ë ï ö ü ß BackSpace"
+        - "show_letters show_eschars preferences       Space     °     Return"

 buttons:
    Shift_L:
@ -47,7 +48,7 @@ buttons:
    BackSpace:
        outline: "altline"
        icon: "edit-clear-symbolic"
-        action: erase
+        action: "erase"
    preferences:
        action: "show_prefs"
        outline: "special"
@ -61,7 +62,7 @@ buttons:
        action:
            set_view: "base"
        outline: "altline"
-        label: "abc"
+        label: "ABC"
    show_symbols:
        action:
            set_view: "symbols"
@ -73,15 +74,8 @@ buttons:
                lock_view: "eschars"
                unlock_view: "base"
        outline: "altline"
-        label: "âÂ"
-    show_letters_from_accents:
-        action:
-            locking:
-                lock_view: "eschars"
-                unlock_view: "base"
-        outline: "altline"
-        label: "âÂ"
-    space:
+        label: "Ââ"
+    Space:
        outline: "spaceline"
        label: " "
        text: " "
@ -91,3 +85,11 @@ buttons:
        keysym: "Return"
    "\"":
        keysym: "quotedbl"
+    °:
+        outline: "doublewidth"
+    "|":
+        outline: "doublewidth"
+    "}":
+        outline: "doublewidth"
+    ×:
+        outline: "doublewidth"
--- a/data/keyboards/ch_wide.yaml
+++ b/data/keyboards/ch_wide.yaml
@ -4,37 +4,40 @@
 ---
 outlines:
    default:     { width: 48,  height: 42 }
-    altline: { width: 81, height: 42 }
+    doublewidth: { width: 96,  height: 42 }
+    narrow:      { width: 33,  height: 42 }
+    large:       { width: 66,  height: 42 }
+    altline:     { width: 72,  height: 42 }
    wide:        { width: 108, height: 42 }
-    spaceline: { width: 216, height: 42 }
+    spaceline:   { width: 162, height: 42 }
    special:     { width: 48,  height: 42 }

 views:
    base:
        - "q w e r t z u i o p ü"
        - "a s d f g h j k l ö ä"
-        - "Shift_L   y x c v b n m  BackSpace"
-        - "show_numbers show_eschars preferences    '   space        , . Return"
+        - "Shift_L   y x c v b n m ' BackSpace"
+        - "show_numbers show_eschars preferences       Space    , .    Return"
    upper:
        - "Q W E R T Z U I O P Ü"
        - "A S D F G H J K L Ö Ä"
-        - "Shift_L   Y X C V B N M  BackSpace"
-        - "show_numbers show_eschars preferences    \"  space        , . Return"
+        - "Shift_L   Y X C V B N M \" BackSpace"
+        - "show_numbers show_eschars preferences       Space    , .    Return"
    numbers:      
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "@ * + - = ( ) ~ < > ? !"
-        - "show_symbols  # & / \\ √ ; : BackSpace"
-        - "show_letters show_eschars preferences    _   space        , . Return"
+        - "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_letters show_eschars preferences       Space    , .    Return"
    eschars:
-        - "à â ç é è ê î ô ù û"
-        - "À Â Ç É È Ê Î Ô Ù Û"
-        - "show_numbers  æ œ ä ë ï ö ü  BackSpace"
-        - "show_letters_from_accents preferences  ñ Ñ   space        ° ß Return"
+        - "à â ç é è ê î ô ù û ñ"
+        - "À Â Ç É È Ê Î Ô Ù Û Ñ"
+        - "show_numbers  æ œ ä ë ï ö ü ß BackSpace"
+        - "show_letters show_eschars preferences       Space     °     Return"

 buttons:
    Shift_L:
@ -61,7 +64,7 @@ buttons:
        action:
            set_view: "base"
        outline: "altline"
-        label: "abc"
+        label: "ABC"
    show_symbols:
        action:
            set_view: "symbols"
@ -73,15 +76,8 @@ buttons:
                lock_view: "eschars"
                unlock_view: "base"
        outline: "altline"
-        label: "äÄ"
-    show_letters_from_accents:
-        action:
-            locking:
-                lock_view: "eschars"
-                unlock_view: "base"
-        outline: "altline"
-        label: "âÂ"
-    space:
+        label: "Ââ"
+    Space:
        outline: "spaceline"
        label: " "
        text: " "
@ -91,3 +87,15 @@ buttons:
        keysym: "Return"
    "\"":
        keysym: "quotedbl"
+    °:
+        outline: "large"
+    ".":
+        outline: "narrow"
+    ",":
+        outline: "narrow"
+    "|":
+        outline: "doublewidth"
+    "}":
+        outline: "doublewidth"
+    ×:
+        outline: "doublewidth"
--- a/data/keyboards/cz+qwerty.yaml
+++ b/data/keyboards/cz+qwerty.yaml
@ -75,7 +75,7 @@ buttons:
        action:
            set_view: "base"
        outline: "wide"
-        label: "abc"
+        label: "ABC"
    show_symbols:
        action:
            set_view: "symbols"
--- a/data/keyboards/cz+qwerty_wide.yaml
+++ b/data/keyboards/cz+qwerty_wide.yaml
@ -75,7 +75,7 @@ buttons:
        action:
            set_view: "base"
        outline: "wide"
-        label: "abc"
+        label: "ABC"
    show_symbols:
        action:
            set_view: "symbols"
--- a/data/keyboards/cz.yaml
+++ b/data/keyboards/cz.yaml
@ -75,7 +75,7 @@ buttons:
        action:
            set_view: "base"
        outline: "wide"
-        label: "abc"
+        label: "ABC"
    show_symbols:
        action:
            set_view: "symbols"
--- a/data/keyboards/cz_wide.yaml
+++ b/data/keyboards/cz_wide.yaml
@ -75,7 +75,7 @@ buttons:
        action:
            set_view: "base"
        outline: "wide"
-        label: "abc"
+        label: "ABC"
    show_symbols:
        action:
            set_view: "symbols"
--- a/data/keyboards/de.yaml
+++ b/data/keyboards/de.yaml
@ -59,7 +59,7 @@ buttons:
        action:
            set_view: "base"
        outline: "altline"
-        label: "abc"
+        label: "ABC"
    show_symbols:
        action:
            set_view: "symbols"
@ -71,7 +71,7 @@ buttons:
                lock_view: "eschars"
                unlock_view: "base"
        outline: "altline"
-        label: "äÄ"
+        label: "Ää"
    space:
        outline: "spaceline"
        label: " "
--- a/data/keyboards/de_wide.yaml
+++ b/data/keyboards/de_wide.yaml
@ -59,7 +59,7 @@ buttons:
        action:
            set_view: "base"
        outline: "altline"
-        label: "abc"
+        label: "ABC"
    show_symbols:
        action:
            set_view: "symbols"
@ -71,7 +71,7 @@ buttons:
                lock_view: "eschars"
                unlock_view: "base"
        outline: "altline"
-        label: "äÄ"
+        label: "Ää"
    space:
        outline: "spaceline"
        text: " "
--- a/data/keyboards/dk.yaml
+++ b/data/keyboards/dk.yaml
@ -3,7 +3,6 @@ outlines:
    default:   { width: 32,       height: 52 }
    altline:   { width: 48.39024, height: 52 }
    wide:      { width: 62,       height: 52 }
-    outline7: { width: 88.97561, height: 52 }
    spaceline: { width: 150.5853, height: 52 }

 views:
--- a/data/keyboards/email/us.yaml
+++ b/data/keyboards/email/us.yaml
@ -5,6 +5,7 @@ outlines:
    wide:      { width: 62, height: 52 }
    spaceline: { width: 106.67, height: 52 }
    special:   { width: 44,     height: 52 }
+    large:     { width: 44,     height: 52 }

 views:
    base:
@ -41,10 +42,10 @@ buttons:
        icon: "edit-clear-symbolic"
        action: erase
    at:
-        outline: "special"
+        outline: "large"
        text: "@"
    preferences:
-        action: show_prefs
+        action: "show_prefs"
        outline: "special"
        icon: "keyboard-mode-symbolic"
    show_numbers:
@ -68,7 +69,7 @@ buttons:
        outline: "altline"
        label: "*/="
    period:
-        outline: "special"
+        outline: "large"
        text: "."
    space:
        outline: "spaceline"
--- a/data/keyboards/emoji/us.yaml
+++ b/data/keyboards/emoji/us.yaml
--- a/data/keyboards/emoji/us_wide.yaml
+++ b/data/keyboards/emoji/us_wide.yaml
--- a/data/keyboards/epo.yaml
+++ b/data/keyboards/epo.yaml
@ -58,7 +58,7 @@ buttons:
        action:
            set_view: "base"
        outline: "altline"
-        label: "abc"
+        label: "ABC"
    show_symbols:
        action:
            set_view: "symbols"
--- a/data/keyboards/es+cat.yaml
+++ b/data/keyboards/es+cat.yaml
@ -58,7 +58,7 @@ buttons:
        action:
            set_view: "base"
        outline: "altline"
-        label: "abc"
+        label: "ABC"
    show_symbols:
        action:
            set_view: "symbols"
--- a/data/keyboards/es.yaml
+++ b/data/keyboards/es.yaml
@ -58,7 +58,7 @@ buttons:
        action:
            set_view: "base"
        outline: "altline"
-        label: "abc"
+        label: "ABC"
    show_symbols:
        action:
            set_view: "symbols"
--- a/data/keyboards/fi.yaml
+++ b/data/keyboards/fi.yaml
@ -3,7 +3,6 @@ outlines:
    default:   { width: 32,       height: 52 }
    altline:   { width: 48.39024, height: 52 }
    wide:      { width: 62,       height: 52 }
-    outline7: { width: 88.97561, height: 52 }
    spaceline: { width: 150.5853, height: 52 }

 views:
--- a/data/keyboards/fr+bepo.yaml
+++ b/data/keyboards/fr+bepo.yaml
@ -1,7 +1,7 @@
 ---
 outlines:
-    small:     { width: 50,    height: 30 }
    default:   { width: 35.33, height: 52 }
+    small:     { width: 50,    height: 30 }
    altline:   { width: 35.33, height: 52 }
    wide:      { width: 50,    height: 52 }
    spaceline: { width: 150,   height: 52 }
@ -180,7 +180,7 @@ buttons:
        action:
            set_view: "base"
        outline: "wide"
-        label: "abc"
+        label: "ABC"
    show_symbols:
        action:
            set_view: "symbols"
--- a/data/keyboards/fr+bepo_wide.yaml
+++ b/data/keyboards/fr+bepo_wide.yaml
@ -63,7 +63,7 @@ buttons:
        action:
            set_view: "base"
        outline: "wide"
-        label: "abc"
+        label: "ABC"
    show_symbols:
        action:
            set_view: "symbols"
--- a/data/keyboards/fr.yaml
+++ b/data/keyboards/fr.yaml
@ -63,7 +63,7 @@ buttons:
        action:
            set_view: "base"
        outline: "wide"
-        label: "abc"
+        label: "ABC"
    show_symbols:
        action:
            set_view: "symbols"
--- a/data/keyboards/fr_wide.yaml
+++ b/data/keyboards/fr_wide.yaml
@ -63,7 +63,7 @@ buttons:
        action:
            set_view: "base"
        outline: "wide"
-        label: "abc"
+        label: "ABC"
    show_symbols:
        action:
            set_view: "symbols"
--- a/data/keyboards/hu.yaml
+++ b/data/keyboards/hu.yaml
@ -0,0 +1,82 @@
+# Maintained by: soyer <soyer@irl.hu>
+---
+outlines:
+    default:   { width: 35.33, height: 52 }
+    altline:   { width: 52.67, height: 52 }
+    wide:      { width: 62,    height: 52 }
+    spaceline: { width: 99.67, height: 52 }
+    special:   { width: 35.33, height: 52 }
+
+views:
+    base:
+        - "q w e r t z u i o p"
+        - "a s d f g h j k l"
+        - "Shift_L y x c v b n m  BackSpace"
+        - "show_numbers show_eschars preferences         space        , . - Return"
+    upper:
+        - "Q W E R T Z U I O P"
+        - "A S D F G H J K L"
+        - "Shift_L   Y X C V B N M  BackSpace"
+        - "show_numbers show_eschars preferences         space        ? : ! Return"
+    numbers:
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "@ # € % & - _ + ( )"
+        - "show_symbols   ; \" ' : = < >  BackSpace"
+        - "show_letters show_eschars preferences         space        , . - Return"
+    symbols:
+        - "~ ` ´ | · √ µ ÷ × ¶"
+        - "© ® £ $ ¥ ^ ° * { }"
+        - "show_numbers   \\ / § π τ [ ]  BackSpace"
+        - "show_letters show_eschars preferences         space        , . - Return"
+    eschars:
+        - "ö ü ó Ö Ü Ó"
+        - "í ő ú Í Ő Ú"
+        - "show_numbers é á ű É Á Ű BackSpace"
+        - "show_letters show_eschars preferences         space        „ “ Return"
+
+buttons:
+    Shift_L:
+        action:
+            locking:
+                lock_view: "upper"
+                unlock_view: "base"
+        outline: "altline"
+        icon: "key-shift"
+    BackSpace:
+        outline: "altline"
+        icon: "edit-clear-symbolic"
+        action: "erase"
+    preferences:
+        action: "show_prefs"
+        outline: "special"
+        icon: "keyboard-mode-symbolic"
+    show_numbers:
+        action:
+            set_view: "numbers"
+        outline: "altline"
+        label: "123"
+    show_letters:
+        action:
+            set_view: "base"
+        outline: "altline"
+        label: "ABC"
+    show_symbols:
+        action:
+            set_view: "symbols"
+        outline: "altline"
+        label: "*/="
+    show_eschars:
+        action:
+            locking:
+                lock_view: "eschars"
+                unlock_view: "base"
+        outline: "altline"
+        label: "éá"
+    space:
+        outline: "spaceline"
+        label: " "
+        text: " "
+    Return:
+        outline: "altline"
+        icon: "key-enter"
+        keysym: "Return"
--- a/data/keyboards/hu_wide.yaml
+++ b/data/keyboards/hu_wide.yaml
@ -0,0 +1,82 @@
+# Maintained by: soyer <soyer@irl.hu>
+---
+outlines:
+    default:   { width: 48,  height: 42 }
+    altline:   { width: 81,  height: 42 }
+    wide:      { width: 108, height: 42 }
+    spaceline: { width: 216, height: 42 }
+    special:   { width: 48,  height: 42 }
+
+views:
+    base:
+        - "q w e r t z u i o p ő ú"
+        - "a s d f g h j k l é á ű"
+        - "Shift_L í y x c v b n m  BackSpace"
+        - "show_numbers show_eschars preferences         space        , . - Return"
+    upper:
+        - "Q W E R T Z U I O P Ő Ú"
+        - "A S D F G H J K L É Á Ű"
+        - "Shift_L Í Y X C V B N M  BackSpace"
+        - "show_numbers show_eschars preferences         space        ? : ! Return"
+    numbers:
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "@ # € % & - _ + ( )"
+        - "show_symbols   ; \" ' : = < >  BackSpace"
+        - "show_letters show_eschars preferences         space        , . - Return"
+    symbols:
+        - "~ ` ´ | · √ µ ÷ × ¶"
+        - "© ® £ $ ¥ ^ ° * { }"
+        - "show_numbers   \\ / § π τ [ ]  BackSpace"
+        - "show_letters show_eschars preferences         space        , . - Return"
+    eschars:
+        - "ö ü ó Ö Ü Ó"
+        - "í ő ú Í Ő Ú"
+        - "show_numbers é á ű É Á Ű BackSpace"
+        - "show_letters show_eschars preferences         space        „ “ Return"
+
+buttons:
+    Shift_L:
+        action:
+            locking:
+                lock_view: "upper"
+                unlock_view: "base"
+        outline: "altline"
+        icon: "key-shift"
+    BackSpace:
+        outline: "altline"
+        icon: "edit-clear-symbolic"
+        action: "erase"
+    preferences:
+        action: "show_prefs"
+        outline: "special"
+        icon: "keyboard-mode-symbolic"
+    show_numbers:
+        action:
+            set_view: "numbers"
+        outline: "altline"
+        label: "123"
+    show_letters:
+        action:
+            set_view: "base"
+        outline: "altline"
+        label: "ABC"
+    show_symbols:
+        action:
+            set_view: "symbols"
+        outline: "altline"
+        label: "*/="
+    show_eschars:
+        action:
+            locking:
+                lock_view: "eschars"
+                unlock_view: "base"
+        outline: "altline"
+        label: "éá"
+    space:
+        outline: "spaceline"
+        label: " "
+        text: " "
+    Return:
+        outline: "altline"
+        icon: "key-enter"
+        keysym: "Return"
--- a/data/keyboards/ir.yaml
+++ b/data/keyboards/ir.yaml
@ -8,22 +8,22 @@ outlines:

 views:
    base:
-        - "ض ص ق ف غ ع ه خ ح ج"
-        - "ش س ی ب ل ا ت ن م ک"
-        - "Shift_L   ظ ط ز ر ذ د و  BackSpace"
-        - "show_numbers preferences         space        period Return"
+        - "ض ص ث ق ف غ ع ه خ ح ج"
+        - "ش س ی ب ل ا ت ن م ک گ"
+        - "Shift_L  ظ ط ز ر ذ د پ و  BackSpace"
+        - "show_numbers preferences         space     zwnj period Return"
    upper:
-        - "پ { } [ ] ّ   َ   ِ  ُ چ"
-        - "ؤ‌ ئ ي‌ إ أ آ ة‌ » « گ"
-        - "Shift_L  ك ٓ ژ ء > < ؟  BackSpace"
-        - "show_numbers preferences         space        period Return"
+        - "  ْ  ٌ  ٍ  ً  ُ  ِ  َ  ّ # @ چ"
+        - "_ ئ ي إ أ آ ة » « : ؛"
+        - "Shift_L ك  ٓ ژ  ٔ ء > < ؟ BackSpace"
+        - "show_numbers preferences         space        ! ، Return"
    numbers:
-        - "۱ ۲ ۳ ۴ ۵ ۶ ۷ ۸ ۹ ۰"
-        - "@ # ﷼ % & - _ + ( )"
-        - "show_symbols   , \" ' colon ؛ ! ?  BackSpace"
+        - "۱ ۲ ۳ ۴ ۵ ۶ ۷ ۸ ۹ ۰ |"
+        - "… ٬ ٫ ﷼ ٪ ، * ) ( − ـ"
+        - "show_symbols + - × ÷ = ^ % / BackSpace"
        - "show_letters preferences         space        period Return"
    symbols:
-        - "~ ` | · √ π τ ÷ × ¶"
+        - "& ` | · • % π τ ÷ × ¶"
        - "© ® £ € ¥ ^ ° * { }"
        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
        - "show_letters preferences         space        period Return"
@ -48,17 +48,17 @@ buttons:
        action:
            set_view: "numbers"
        outline: "wide"
-        label: "123"
+        label: "۱۲۳"
    show_numbers_from_symbols:
        action:
            set_view: "numbers"
        outline: "altline"
-        label: "123"
+        label: "۱۲۳"
    show_letters:
        action:
            set_view: "base"
        outline: "wide"
-        label: "ABC"
+        label: "ا‌ب‌پ"
    show_symbols:
        action:
            set_view: "symbols"
@ -74,5 +74,8 @@ buttons:
        outline: "wide"
        icon: "key-enter"
        keysym: "Return"
+    zwnj:
+        icon: "zwnj"
+        text: "‌"
    colon:
        text: ":"
--- a/data/keyboards/ir_wide.yaml
+++ b/data/keyboards/ir_wide.yaml
@ -8,25 +8,25 @@ outlines:

 views:
    base:
-        - "ض ص ق ف غ ع ه خ ح ج"
-        - "ش س ی ب ل ا ت ن م ک"
-        - "Shift_L   ظ ط ز ر ذ د و  BackSpace"
-        - "show_numbers preferences         space        period Return"
+        - "ض ص ث ق ف غ ع ه خ ح ج چ \\"
+        - "ش س ی ب ل ا ت ن م ک گ"
+        - "Shift_L ظ ط ز ر ذ د پ و ، / BackSpace"
+        - "show_numbers preferences         space     zwnj ؟ ! period Return"
    upper:
-        - "پ { } [ ] ّ   َ   ِ  ُ چ"
-        - "ؤ‌ ئ ي‌ إ أ آ ة‌ » « گ"
-        - "Shift_L  ك ٓ ژ ء > < ؟  BackSpace"
-        - "show_numbers preferences         space        period Return"
+        - " ْ  ٌ  ٍ  ً  ُ  ِ  َ  ّ  ] [ @ # _"
+        - "ؤ ئ ي إ أ آ ة » « : ؛"
+        - "Shift_L ك  ٓ ژ ٰ  ‌  ٔ  ء  >  <  ؟ BackSpace"
+        - "show_numbers preferences         space        ، ؟ ! period Return"
    numbers:
-        - "۱ ۲ ۳ ۴ ۵ ۶ ۷ ۸ ۹ ۰"
-        - "@ # ﷼ % & - _ + ( )"
-        - "show_symbols   , \" ' colon ؛ ! ?  BackSpace"
-        - "show_letters preferences         space        period Return"
+        - "۱ ۲ ۳ ۴ ۵ ۶ ۷ ۸ ۹ ۰ | ="
+        - "… ٬ ٫ ﷼ ٪ ، * ) ( − _"
+        - "show_symbols + - × ÷ = ^ % / BackSpace"
+        - "show_letters preferences         space        ، ؟ ! period Return"
    symbols:
-        - "~ ` | · √ π τ ÷ × ¶"
+        - "& ` | · • % π τ ÷ × ¶"
        - "© ® £ € ¥ ^ ° * { }"
        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        period Return"
+        - "show_letters preferences         space        ، ؟ ! period Return"

 buttons:
    Shift_L:
@ -48,23 +48,23 @@ buttons:
        action:
            set_view: "numbers"
        outline: "wide"
-        label: "123"
+        label: "۱۲۳"
    show_numbers_from_symbols:
        action:
            set_view: "numbers"
        outline: "altline"
-        label: "123"
+        label: "۱۲۳"
    show_letters:
        action:
            set_view: "base"
        outline: "wide"
-        label: "ABC"
+        label: "ا‌ب‌پ"
    show_symbols:
        action:
            set_view: "symbols"
        outline: "altline"
        label: "*/="
-    ".":
+    period:
        outline: "special"
        text: "."
    space:
@ -74,5 +74,8 @@ buttons:
        outline: "wide"
        icon: "key-enter"
        keysym: "Return"
+    zwnj:
+        icon: "zwnj"
+        text: "‌"
    colon:
        text: ":"
--- a/data/keyboards/it+fur.yaml
+++ b/data/keyboards/it+fur.yaml
@ -65,7 +65,7 @@ buttons:
        action:
            set_view: "base"
        outline: "altline"
-        label: "abc"
+        label: "ABC"
    show_symbols:
        action:
            set_view: "symbols"
--- a/data/keyboards/it.yaml
+++ b/data/keyboards/it.yaml
@ -65,7 +65,7 @@ buttons:
        action:
            set_view: "base"
        outline: "altline"
-        label: "abc"
+        label: "ABC"
    show_symbols:
        action:
            set_view: "symbols"
--- a/data/keyboards/ro.yaml
+++ b/data/keyboards/ro.yaml
@ -63,7 +63,7 @@ buttons:
        action:
            set_view: "base"
        outline: "wide"
-        label: "abc"
+        label: "ABC"
    show_symbols:
        action:
            set_view: "symbols"
--- a/data/keyboards/ro_wide.yaml
+++ b/data/keyboards/ro_wide.yaml
@ -63,7 +63,7 @@ buttons:
        action:
            set_view: "base"
        outline: "wide"
-        label: "abc"
+        label: "ABC"
    show_symbols:
        action:
            set_view: "symbols"
--- a/data/keyboards/se_wide.yaml
+++ b/data/keyboards/se_wide.yaml
@ -0,0 +1,164 @@
+---
+outlines:
+    default:   { width: 50,  height: 42 }
+    altline:   { width: 81,  height: 42 }
+    wide:      { width: 108, height: 42 }
+    spaceline: { width: 216, height: 42 }
+    special:   { width: 60,  height: 42 }
+ 
+
+views:
+    base:
+        - "q w e r t y u i o p å"
+        - "a s d f g h j k l ö ä"
+        - "Shift_L   z x c v b n m  BackSpace"
+        - "show_numbers preferences         space        .    Return"
+    upper:
+        - "Q W E R T Y U I O P Å"
+        - "A S D F G H J K L Ö Ä"
+        - "Shift_L   Z X C V B N M  BackSpace"
+        - "show_numbers preferences         space        .    Return"
+    numbers:
+        - "§ 1 2 3 4 5 6 7 8 9 0"
+        - "at numbersign EuroSign dollar percent ampersand minus underscore plus parenleft parenright"
+        - "show_symbols   comma quotedbl quoteright colon semicolon exclam question  BackSpace"
+        - "show_letters preferences         space        .    Return"
+    symbols:
+        - "µ asciitilde quoteleft bar U00B7 squareroot Greek_pi Greek_tau division multiply paragraph"
+        - "½ ¤ copyright U00AE U00A3 U00A5 asciicircum degree asterisk braceleft braceright"
+        - "show_numbers_from_symbols   backslash slash less greater equal bracketleft bracketright  BackSpace"
+        - "show_letters preferences         space        .    Return"
+
+buttons:
+    Shift_L:
+        action:
+            locking:
+                lock_view: "upper"
+                unlock_view: "base"
+        outline: "altline"
+        icon: "key-shift"
+    BackSpace:
+        outline: altline
+        icon: "edit-clear-symbolic"
+        action: erase
+    preferences:
+        action: "show_prefs"
+        outline: "special"
+        icon: "keyboard-mode-symbolic"
+    show_numbers:
+        outline: "wide"
+        action:
+            set_view: "numbers"
+        label: "123"
+    show_numbers_from_symbols:
+        action:
+            set_view: "numbers"
+        outline: altline
+        label: "123"
+    show_letters:
+        outline: "wide"
+        action:
+            set_view: "base"
+        label: "ABC"
+    show_symbols:
+        action:
+            set_view: "symbols"
+        outline: "altline"
+        label: "*/="
+    ".":
+        outline: "special"
+    space:
+        outline: spaceline
+        text: " "
+    Return:
+        outline: "wide"
+        icon: "key-enter"
+        keysym: "Return"
+    asterisk:
+        text: "*"
+    asciitilde:
+        text: "~"
+    quoteleft:
+        text: "`"
+    bar:
+        text: "|"
+    U00B7:
+        text: "·"
+    squareroot:
+        text: "√"
+    Greek_pi:
+        text: "π"
+    division:
+        text: "÷"
+    multiply:
+        text: "×"
+    paragraph:
+        text: "¶"
+    Greek_tau:
+        text: "τ"
+    copyright:
+        text: "©"
+    numbersign:
+        text: "#"
+    U00AE:
+        text: "®"
+    at:
+        text: "@"
+    dollar:
+        text: "$"
+    U00A3:
+        text: "£"
+    percent:
+        text: "%"
+    EuroSign:
+        text: "€"
+    ampersand:
+        text: "&"
+    U00A5:
+        text: "¥"
+    minus:
+        text: "-"
+    asciicircum:
+        text: "^"
+    underscore:
+        text: "_"
+    degree:
+        text: "°"
+    plus:
+        text: "+"
+    equal:
+        text: "="
+    parenleft:
+        text: "("
+    parenright:
+        text: ")"
+    braceleft:
+        text: "{"
+    braceright:
+        text: "}"
+    comma:
+        text: ","
+    backslash:
+        text: "\\"
+    slash:
+        text: "/"
+    quotedbl:
+        text: "\""
+    quoteright:
+        text: "'"
+    less:
+        text: "<"
+    greater:
+        text: ">"
+    colon:
+        text: ":"
+    semicolon:
+        text: ";"
+    exclam:
+        text: "!"
+    question:
+        text: "?"
+    bracketleft:
+        text: "["
+    bracketright:
+        text: "]"
--- a/data/keyboards/terminal/de.yaml
+++ b/data/keyboards/terminal/de.yaml
@ -0,0 +1,255 @@
+---
+outlines:
+    default:    { width: 35.33,  height: 46 }
+    halfwidth:  { width: 17.665, height: 46 }
+    narrow:     { width: 26.335, height: 46 }
+    special:    { width: 35.33,  height: 46 }
+    altline:    { width: 52.67,  height: 46 }
+    large:      { width: 52.67,  height: 46 }
+    action:     { width: 59,     height: 46 }
+    wide:       { width: 59,     height: 46 }
+    spaceline:  { width: 100.96, height: 46 }
+    small:      { width: 50.471, height: 22 }
+
+views:
+    base:
+        - "TabSmall Ctrl Alt ↑ ↓ ← →"
+        - "q w e r t z u i o p"
+        - "PeriodSmall a s d f g h j k l MinusSmall"
+        - "Shift_L   y x c v b n m  BackSpace"
+        - "show_numbers show_eschars preferences      space        show_actions Return"
+    upper:
+        - "TabSmall Ctrl Alt PgUp PgDn Home End"
+        - "Q W E R T Z U I O P"
+        - "SlashSmall A S D F G H J K L PipeSmall"
+        - "Shift_L   Y X C V B N M  BackSpace"
+        - "show_numbers show_eschars preferences      space        show_actions Return"
+    numbers:
+        - "TabSmall Ctrl Alt ↑ ↓ ← →"
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "\\ * # $ / & - + ( ) _"
+        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
+        - "show_letters show_eschars preferences         space        period Return"
+    symbols:
+        - "TabSmall Ctrl Alt ↑ ↓ ← →"
+        - "~ ` · √ π τ ÷ × ¶ @"
+        - "© ® £ € ¥ ^ ° { }"
+        - "show_numbers_from_symbols   % | < > = [ ]  BackSpace"
+        - "show_letters show_eschars preferences         space        period Return"
+    eschars:
+        - "TabSmall Ctrl Alt ↑ ↓ ← →"
+        - "ä è é ö ü Ä È É Ö Ü"
+        - "à â ê î ô À Â È Î Ô"
+        - "show_numbers  « » ç Ç æ œ ß  BackSpace"
+        - "show_letters show_eschars preferences         space        „ “ Return"
+    actions:
+        - "TabSmall Ctrl Alt PgUp PgDn Home End"
+        - "F1  F2  F3  F4  F5  F6"
+        - "F7  F8  F9  F10 F11 F12"
+        - "Esc Tab Pause Insert Up Del"
+        - "show_letters_actions Menu Break Left Down Right"
+
+buttons:
+    Shift_L:
+        action:
+            locking:
+                lock_view: "upper"
+                unlock_view: "base"
+        outline: "altline"
+        icon: "key-shift"
+    BackSpace:
+        outline: "altline"
+        icon: "edit-clear-symbolic"
+        action: erase
+    preferences:
+        action: "show_prefs"
+        outline: "special"
+        icon: "keyboard-mode-symbolic"
+    show_numbers:
+        action:
+            set_view: "numbers"
+        outline: "altline"
+        label: "123"
+    show_numbers_from_symbols:
+        action:
+            set_view: "numbers"
+        outline: "altline"
+        label: "123"
+    show_letters:
+        action:
+            set_view: "base"
+        outline: "altline"
+        label: "ABC"
+    show_letters_actions:
+        action:
+            set_view: "base"
+        outline: "wide"
+        label: "ABC"
+    show_symbols:
+        action:
+            set_view: "symbols"
+        outline: "altline"
+        label: "τ=\\"
+    show_eschars:
+        action:
+            locking:
+                lock_view: "eschars"
+                unlock_view: "base"
+        outline: "altline"
+        label: "Ää"
+    show_actions:
+        action:
+            set_view: "actions"
+        outline: "altline"
+        label: ">_"
+    period:
+        outline: "large"
+        text: "."
+    space:
+        outline: "spaceline"
+        text: " "
+    Return:
+        outline: "wide"
+        icon: "key-enter"
+        keysym: "Return"
+    colon:
+        text: ":"
+    F1:
+        outline: "action"
+        keysym: "F1"
+    F2:
+        outline: "action"
+        keysym: "F2"
+    F3:
+        outline: "action"
+        keysym: "F3"
+    F4:
+        outline: "action"
+        keysym: "F4"
+    F5:
+        outline: "action"
+        keysym: "F5"
+    F6:
+        outline: "action"
+        keysym: "F6"
+    F7:
+        outline: "action"
+        keysym: "F7"
+    F8:
+        outline: "action"
+        keysym: "F8"
+    F9:
+        outline: "action"
+        keysym: "F9"
+    F10:
+        outline: "action"
+        keysym: "F10"
+    F11:
+        outline: "action"
+        keysym: "F11"
+    F12:
+        outline: "action"
+        keysym: "F12"
+    Esc:
+        outline: "action"
+        keysym: "Escape"
+    Tab:
+        outline: "action"
+        keysym: "Tab"
+    TabSmall:
+        outline: "small"
+        keysym: "Tab"
+        label: "Tab"
+    Del:
+        outline: "action"
+        keysym: "Delete"
+        label: "Entf"
+    Insert:
+        outline: "action"
+        keysym: "Insert"
+        label: "Einfg"
+    Menu:
+        outline: "action"
+        keysym: "Menu"
+        label: "Menü"
+    Pause:
+        outline: "action"
+        keysym: "Pause"
+    Break:
+        outline: "action"
+        keysym: "Break"
+        label: "Untbr"
+    Home:
+        outline: "small"
+        keysym: "Home"
+        label: "Pos1"
+    End:
+        outline: "small"
+        keysym: "End"
+        label: "Ende"
+    PgUp:
+        outline: "small"
+        keysym: "Page_Up"
+        label: "Bild↑"
+    PgDn:
+        outline: "small"
+        keysym: "Page_Down"
+        label: "Bild↓"
+    "↑":
+        outline: "small"
+        keysym: "Up"
+    "↓":
+        outline: "small"
+        keysym: "Down"
+    "←":
+        outline: "small"
+        keysym: "Left"
+    "→":
+        outline: "small"
+        keysym: "Right"
+    Up:
+        label: "↑"
+        outline: "action"
+        keysym: "Up"
+    Left:
+        label: "←"
+        outline: "action"
+        keysym: "Left"
+    Down:
+        label: "↓"
+        outline: "action"
+        keysym: "Down"
+    Right:
+        label: "→"
+        outline: "action"
+        keysym: "Right"
+    Ctrl:
+        modifier: "Control"
+        outline: "small"
+        label: "Strg"
+    Alt:
+        modifier: "Alt"
+        outline: "small"
+        label: "Alt"
+    MinusSmall:
+        outline: "halfwidth"
+        text: "-"
+    SlashSmall:
+        outline: "halfwidth"
+        text: "/"
+    PipeSmall:
+        outline: "halfwidth"
+        text: "|"
+    PeriodSmall:
+        outline: "halfwidth"
+        text: "."
+    "„":
+        outline: "narrow"
+        text: "„"
+    "“":
+        outline: "narrow"
+        text: "“"
+    "\\":
+        outline: "halfwidth"
+    _:
+        outline: "halfwidth"
--- a/data/keyboards/terminal/de_wide.yaml
+++ b/data/keyboards/terminal/de_wide.yaml
@ -0,0 +1,259 @@
+---
+outlines:
+    default:   { width: 54,   height: 37 }
+    halfwidth: { width: 27,   height: 37 }
+    narrow:    { width: 40.5, height: 37 }
+    special:   { width: 54,   height: 37 }
+    altline:   { width: 81,   height: 37 }
+    large:     { width: 81,   height: 37 }
+    action:    { width: 90,   height: 37 }
+    wide:      { width: 90,   height: 37 }
+    spaceline: { width: 153,  height: 37 }
+    small:     { width: 67.4, height: 22 }
+
+views:
+    base:
+        - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
+        - "q w e r t z u i o p"
+        - "PeriodSmall a s d f g h j k l MinusSmall"
+        - "Shift_L   y x c v b n m  BackSpace"
+        - "show_numbers show_eschars preferences      space        show_actions Return"
+    upper:
+        - "EscSmall TabSmall Ctrl Alt PgUp PgDn Home End"
+        - "Q W E R T Z U I O P"
+        - "SlashSmall A S D F G H J K L PipeSmall"
+        - "Shift_L   Y X C V B N M  BackSpace"
+        - "show_numbers show_eschars preferences      space        show_actions Return"
+    numbers:
+        - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "\\ * # $ / & - + ( ) _"
+        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
+        - "show_letters show_eschars preferences         space        period Return"
+    symbols:
+        - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
+        - "~ ` · √ π τ ÷ × ¶ @"
+        - "© ® £ € ¥ ^ ° { }"
+        - "show_numbers_from_symbols   % | < > = [ ]  BackSpace"
+        - "show_letters show_eschars preferences         space        period Return"
+    eschars:
+        - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
+        - "ä è é ö ü Ä È É Ö Ü"
+        - "à â ê î ô À Â È Î Ô"
+        - "show_numbers  « » ç Ç æ œ ß  BackSpace"
+        - "show_letters show_eschars preferences         space        „ “ Return"
+    actions:
+        - "EscSmall TabSmall Ctrl Alt PgUp PgDn Home End"
+        - "F1  F2  F3  F4  F5  F6"
+        - "F7  F8  F9  F10 F11 F12"
+        - "Esc Tab Pause Insert Up Del"
+        - "show_letters_actions Menu Break Left Down Right"
+
+buttons:
+    Shift_L:
+        action:
+            locking:
+                lock_view: "upper"
+                unlock_view: "base"
+        outline: "altline"
+        icon: "key-shift"
+    BackSpace:
+        outline: "altline"
+        icon: "edit-clear-symbolic"
+        action: erase
+    preferences:
+        action: "show_prefs"
+        outline: "special"
+        icon: "keyboard-mode-symbolic"
+    show_numbers:
+        action:
+            set_view: "numbers"
+        outline: "altline"
+        label: "123"
+    show_numbers_from_symbols:
+        action:
+            set_view: "numbers"
+        outline: "altline"
+        label: "123"
+    show_letters:
+        action:
+            set_view: "base"
+        outline: "altline"
+        label: "ABC"
+    show_letters_actions:
+        action:
+            set_view: "base"
+        outline: "wide"
+        label: "ABC"
+    show_symbols:
+        action:
+            set_view: "symbols"
+        outline: "altline"
+        label: "τ=\\"
+    show_eschars:
+        action:
+            locking:
+                lock_view: "eschars"
+                unlock_view: "base"
+        outline: "altline"
+        label: "Ää"
+    show_actions:
+        action:
+            set_view: "actions"
+        outline: "altline"
+        label: ">_"
+    period:
+        outline: "large"
+        text: "."
+    space:
+        outline: "spaceline"
+        text: " "
+    Return:
+        outline: "wide"
+        icon: "key-enter"
+        keysym: "Return"
+    colon:
+        text: ":"
+    F1:
+        outline: "action"
+        keysym: "F1"
+    F2:
+        outline: "action"
+        keysym: "F2"
+    F3:
+        outline: "action"
+        keysym: "F3"
+    F4:
+        outline: "action"
+        keysym: "F4"
+    F5:
+        outline: "action"
+        keysym: "F5"
+    F6:
+        outline: "action"
+        keysym: "F6"
+    F7:
+        outline: "action"
+        keysym: "F7"
+    F8:
+        outline: "action"
+        keysym: "F8"
+    F9:
+        outline: "action"
+        keysym: "F9"
+    F10:
+        outline: "action"
+        keysym: "F10"
+    F11:
+        outline: "action"
+        keysym: "F11"
+    F12:
+        outline: "action"
+        keysym: "F12"
+    Esc:
+        outline: "action"
+        keysym: "Escape"
+    EscSmall:
+        outline: "small"
+        keysym: "Escape"
+        label: "Esc"
+    Tab:
+        outline: "action"
+        keysym: "Tab"
+    TabSmall:
+        outline: "small"
+        keysym: "Tab"
+        label: "Tab"
+    Del:
+        outline: "action"
+        keysym: "Delete"
+        label: "Entf"
+    Insert:
+        outline: "action"
+        keysym: "Insert"
+        label: "Einfg"
+    Menu:
+        outline: "action"
+        keysym: "Menu"
+        label: "Menü"
+    Pause:
+        outline: "action"
+        keysym: "Pause"
+    Break:
+        outline: "action"
+        keysym: "Break"
+        label: "Untbr"
+    Home:
+        outline: "small"
+        keysym: "Home"
+        label: "Pos1"
+    End:
+        outline: "small"
+        keysym: "End"
+        label: "Ende"
+    PgUp:
+        outline: "small"
+        keysym: "Page_Up"
+        label: "Bild↑"
+    PgDn:
+        outline: "small"
+        keysym: "Page_Down"
+        label: "Bild↓"
+    "↑":
+        outline: "small"
+        keysym: "Up"
+    "↓":
+        outline: "small"
+        keysym: "Down"
+    "←":
+        outline: "small"
+        keysym: "Left"
+    "→":
+        outline: "small"
+        keysym: "Right"
+    Up:
+        label: "↑"
+        outline: "action"
+        keysym: "Up"
+    Left:
+        label: "←"
+        outline: "action"
+        keysym: "Left"
+    Down:
+        label: "↓"
+        outline: "action"
+        keysym: "Down"
+    Right:
+        label: "→"
+        outline: "action"
+        keysym: "Right"
+    Ctrl:
+        modifier: "Control"
+        outline: "small"
+        label: "Strg"
+    Alt:
+        modifier: "Alt"
+        outline: "small"
+        label: "Alt"
+    MinusSmall:
+        outline: "halfwidth"
+        text: "-"
+    SlashSmall:
+        outline: "halfwidth"
+        text: "/"
+    PipeSmall:
+        outline: "halfwidth"
+        text: "|"
+    PeriodSmall:
+        outline: "halfwidth"
+        text: "."
+    "„":
+        outline: "narrow"
+        text: "„"
+    "“":
+        outline: "narrow"
+        text: "“"
+    "\\":
+        outline: "halfwidth"
+    _:
+        outline: "halfwidth"
--- a/data/keyboards/terminal/es.yaml
+++ b/data/keyboards/terminal/es.yaml
@ -0,0 +1,220 @@
+---
+outlines:
+    default:   { width: 35.33, height: 46 }
+    action:    { width: 59,    height: 46 }
+    altline:   { width: 52.67, height: 46 }
+    large:     { width: 52.67, height: 46 }
+    wide:      { width: 59,    height: 46 }
+    spaceline: { width: 92.29, height: 46 }
+    special:   { width: 44,    height: 46 }
+    small:     { width: 50.57, height: 22 }
+
+views:
+    base:
+        - "TabSmall Ctrl Alt ↑ ↓ ← →"
+        - "q w e r t y u i o p"
+        - "a s d f g h j k l ñ"
+        - "Shift_L   z x c v b n m  BackSpace"
+        - "show_numbers show_eschars preferences      space        show_actions Return"
+    upper:
+        - "TabSmall Ctrl Alt PgUp PgDn Home End"
+        - "Q W E R T Y U I O P"
+        - "A S D F G H J K L Ñ"
+        - "Shift_L   Z X C V B N M  DelUp"
+        - "show_numbers show_eschars preferences      space        show_actions Return"
+    numbers:
+        - "TabSmall Ctrl Alt ↑ ↓ ← →"
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "* # € / & - _ + ( )"
+        - "show_symbols , \" ' colon ; ! ?  BackSpace"
+        - "show_letters show_eschars preferences         space        . Return"
+    symbols:
+        - "TabSmall Ctrl Alt ↑ ↓ ← →"
+        - "~ ` | · √ π τ ÷ × ¶"
+        - "© ® £ $ ¥ ^ ° @ { }"
+        - "show_numbers   \\ % < > = [ ]  BackSpace"
+        - "show_letters show_eschars preferences         space        . Return"
+    eschars:
+        - "TabSmall Ctrl Alt ↑ ↓ ← →"
+        - "á é í ó ú Á É Í Ó Ú"
+        - "à è ì ò ù À È Ì Ò Ù"
+        - "show_numbers , ü ç ï Ü Ç ï BackSpace"
+        - "show_letters show_symbols preferences        space        show_actions Return"
+    actions:
+        - "TabSmall Ctrl Alt PgUp PgDn Home End"
+        - "F1  F2  F3  F4  F5  F6"
+        - "F7  F8  F9  F10 F11 F12"
+        - "Esc Tab Pause Insert Up Del"
+        - "show_letters_actions Menu Break Left Down Right"
+
+buttons:
+    Shift_L:
+        action:
+            locking:
+                lock_view: "upper"
+                unlock_view: "base"
+        outline: "altline"
+        icon: "key-shift"
+    BackSpace:
+        outline: "altline"
+        icon: "edit-clear-symbolic"
+        action: erase
+    preferences:
+        action: "show_prefs"
+        outline: "special"
+        icon: "keyboard-mode-symbolic"
+    show_numbers:
+        action:
+            set_view: "numbers"
+        outline: "altline"
+        label: "123"
+    show_letters:
+        action:
+            set_view: "base"
+        outline: "altline"
+        label: "ABC"
+    show_letters_actions:
+        action:
+            set_view: "base"
+        outline: "wide"
+        label: "ABC"
+    show_symbols:
+        action:
+            set_view: "symbols"
+        outline: "altline"
+        label: "τ=\\"
+    show_eschars:
+        action:
+            set_view: "eschars"
+        outline: "altline"
+        label: "áÁ"
+    show_actions:
+        action:
+            set_view: "actions"
+        outline: "altline"
+        label: ">_"
+    ".":
+        outline: "large"
+        text: "."
+    space:
+        outline: "spaceline"
+        text: " "
+    Return:
+        outline: "wide"
+        icon: "key-enter"
+        keysym: "Return"
+    colon:
+        text: ":"
+    F1:
+        outline: "action"
+        keysym: "F1"
+    F2:
+        outline: "action"
+        keysym: "F2"
+    F3:
+        outline: "action"
+        keysym: "F3"
+    F4:
+        outline: "action"
+        keysym: "F4"
+    F5:
+        outline: "action"
+        keysym: "F5"
+    F6:
+        outline: "action"
+        keysym: "F6"
+    F7:
+        outline: "action"
+        keysym: "F7"
+    F8:
+        outline: "action"
+        keysym: "F8"
+    F9:
+        outline: "action"
+        keysym: "F9"
+    F10:
+        outline: "action"
+        keysym: "F10"
+    F11:
+        outline: "action"
+        keysym: "F11"
+    F12:
+        outline: "action"
+        keysym: "F12"
+    Esc:
+        outline: "action"
+        keysym: "Escape"
+    Tab:
+        outline: "action"
+        keysym: "Tab"
+    TabSmall:
+        outline: "small"
+        keysym: "Tab"
+        label: "Tab"
+    Del:
+        outline: "action"
+        keysym: "Delete"
+    DelUp:
+        outline: "altline"
+        keysym: "Delete"
+        label: "Del"
+    Insert:
+        outline: "action"
+        keysym: "Insert"
+    Menu:
+        outline: "action"
+        keysym: "Menu"
+    Pause:
+        outline: "action"
+        keysym: "Pause"
+    Break:
+        outline: "action"
+        keysym: "Break"
+    Home:
+        outline: "small"
+        keysym: "Home"
+    End:
+        outline: "small"
+        keysym: "End"
+    PgUp:
+        outline: "small"
+        keysym: "Page_Up"
+    PgDn:
+        outline: "small"
+        keysym: "Page_Down"
+    "↑":
+        outline: "small"
+        keysym: "Up"
+    "↓":
+        outline: "small"
+        keysym: "Down"
+    "←":
+        outline: "small"
+        keysym: "Left"
+    "→":
+        outline: "small"
+        keysym: "Right"
+    Up:
+        label: "↑"
+        outline: "action"
+        keysym: "Up"
+    Left:
+        label: "←"
+        outline: "action"
+        keysym: "Left"
+    Down:
+        label: "↓"
+        outline: "action"
+        keysym: "Down"
+    Right:
+        label: "→"
+        outline: "action"
+        keysym: "Right"
+    Ctrl:
+        modifier: "Control"
+        outline: "small"
+        label: "Ctrl"
+    Alt:
+        modifier: "Alt"
+        outline: "small"
+        label: "Alt"
--- a/data/keyboards/terminal/es_wide.yaml
+++ b/data/keyboards/terminal/es_wide.yaml
@ -0,0 +1,224 @@
+---
+outlines:
+    default:   { width: 54,   height: 37 }
+    action:    { width: 90,   height: 37 }
+    altline:   { width: 81,   height: 37 }
+    large:     { width: 81,   height: 37 }
+    wide:      { width: 90,   height: 37 }
+    spaceline: { width: 153,  height: 37 }
+    special:   { width: 54,   height: 37 }
+    small:     { width: 67.4, height: 22 }
+
+views:
+    base:
+        - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
+        - "q w e r t y u i o p"
+        - "a s d f g h j k l ñ"
+        - "Shift_L   z x c v b n m  BackSpace"
+        - "show_numbers show_eschars preferences    space    show_actions Return"
+    upper:
+        - "EscSmall TabSmall Ctrl Alt PgUp PgDn Home End"
+        - "Q W E R T Y U I O P"
+        - "A S D F G H J K L Ñ"
+        - "Shift_L   Z X C V B N M  DelUp"
+        - "show_numbers show_eschars preferences      space        show_actions Return"
+    numbers:
+        - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "* # $ / & - _ + ( )"
+        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
+        - "show_letters show_eschars preferences         space        . Return"
+    symbols:
+        - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
+        - "~ ` | · √ π τ ÷ × ¶"
+        - "© ® £ € ¥ ^ ° @ { }"
+        - "show_numbers   \\ % < > = [ ]  BackSpace"
+        - "show_letters show_eschars preferences         space        . Return"
+    eschars:
+        - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
+        - "á é í ó ú Á É Í Ó Ú"
+        - "à è ì ò ù À È Ì Ò Ù"
+        - "show_numbers ´ ü ç ï Ü Ç Ï BackSpace"
+        - "show_letters show_symbols preferences        space        show_actions Return"
+    actions:
+        - "EscSmall TabSmall Ctrl Alt PgUp PgDn Home End"
+        - "F1  F2  F3  F4  F5  F6"
+        - "F7  F8  F9  F10 F11 F12"
+        - "Esc Tab Pause Insert Up Del"
+        - "show_letters_actions Menu Break Left Down Right"
+
+buttons:
+    Shift_L:
+        action:
+            locking:
+                lock_view: "upper"
+                unlock_view: "base"
+        outline: "altline"
+        icon: "key-shift"
+    BackSpace:
+        outline: "altline"
+        icon: "edit-clear-symbolic"
+        action: erase
+    preferences:
+        action: "show_prefs"
+        outline: "special"
+        icon: "keyboard-mode-symbolic"
+    show_numbers:
+        action:
+            set_view: "numbers"
+        outline: "altline"
+        label: "123"
+    show_letters:
+        action:
+            set_view: "base"
+        outline: "altline"
+        label: "ABC"
+    show_letters_actions:
+        action:
+            set_view: "base"
+        outline: "wide"
+        label: "ABC"
+    show_symbols:
+        action:
+            set_view: "symbols"
+        outline: "altline"
+        label: "τ=\\"
+    show_eschars:
+        action:
+            set_view: "eschars"
+        outline: "altline"
+        label: "áÁ"
+    show_actions:
+        action:
+            set_view: "actions"
+        outline: "altline"
+        label: ">_"
+    ".":
+        outline: "large"
+        text: "."
+    space:
+        outline: "spaceline"
+        text: " "
+    Return:
+        outline: "wide"
+        icon: "key-enter"
+        keysym: "Return"
+    colon:
+        text: ":"
+    F1:
+        outline: "action"
+        keysym: "F1"
+    F2:
+        outline: "action"
+        keysym: "F2"
+    F3:
+        outline: "action"
+        keysym: "F3"
+    F4:
+        outline: "action"
+        keysym: "F4"
+    F5:
+        outline: "action"
+        keysym: "F5"
+    F6:
+        outline: "action"
+        keysym: "F6"
+    F7:
+        outline: "action"
+        keysym: "F7"
+    F8:
+        outline: "action"
+        keysym: "F8"
+    F9:
+        outline: "action"
+        keysym: "F9"
+    F10:
+        outline: "action"
+        keysym: "F10"
+    F11:
+        outline: "action"
+        keysym: "F11"
+    F12:
+        outline: "action"
+        keysym: "F12"
+    Esc:
+        outline: "action"
+        keysym: "Escape"
+    EscSmall:
+        outline: "small"
+        keysym: "Escape"
+        label: "Esc"
+    Tab:
+        outline: "action"
+        keysym: "Tab"
+    TabSmall:
+        outline: "small"
+        keysym: "Tab"
+        label: "Tab"
+    Del:
+        outline: "action"
+        keysym: "Delete"
+    DelUp:
+        outline: "altline"
+        keysym: "Delete"
+        label: "Del"
+    Insert:
+        outline: "action"
+        keysym: "Insert"
+    Menu:
+        outline: "action"
+        keysym: "Menu"
+    Pause:
+        outline: "action"
+        keysym: "Pause"
+    Break:
+        outline: "action"
+        keysym: "Break"
+    Home:
+        outline: "small"
+        keysym: "Home"
+    End:
+        outline: "small"
+        keysym: "End"
+    PgUp:
+        outline: "small"
+        keysym: "Page_Up"
+    PgDn:
+        outline: "small"
+        keysym: "Page_Down"
+    "↑":
+        outline: "small"
+        keysym: "Up"
+    "↓":
+        outline: "small"
+        keysym: "Down"
+    "←":
+        outline: "small"
+        keysym: "Left"
+    "→":
+        outline: "small"
+        keysym: "Right"
+    Up:
+        label: "↑"
+        outline: "action"
+        keysym: "Up"
+    Left:
+        label: "←"
+        outline: "action"
+        keysym: "Left"
+    Down:
+        label: "↓"
+        outline: "action"
+        keysym: "Down"
+    Right:
+        label: "→"
+        outline: "action"
+        keysym: "Right"
+    Ctrl:
+        modifier: "Control"
+        outline: "small"
+        label: "Ctrl"
+    Alt:
+        modifier: "Alt"
+        outline: "small"
+        label: "Alt"
--- a/data/keyboards/terminal/fr+bepo.yaml
+++ b/data/keyboards/terminal/fr+bepo.yaml
@ -197,7 +197,7 @@ buttons:
        action:
            set_view: "base"
        outline: "wide"
-        label: "abc"
+        label: "ABC"
    show_symbols:
        action:
            set_view: "symbols"
--- a/data/keyboards/terminal/fr+bepo_wide.yaml
+++ b/data/keyboards/terminal/fr+bepo_wide.yaml
@ -1,8 +1,8 @@
 ---
 outlines:
+    default:   { width: 54,   height: 37 }
    action:    { width: 90,   height: 37 }
    small:     { width: 67.4, height: 22 }
-    default:   { width: 54,  height: 37 }
    altline:   { width: 81,   height: 37 }
    wide:      { width: 100,  height: 37 }
    spaceline: { width: 110,  height: 37 }
@ -201,7 +201,7 @@ buttons:
        action:
            set_view: "base"
        outline: "wide"
-        label: "abc"
+        label: "ABC"
    show_symbols:
        action:
            set_view: "symbols"
--- a/data/keyboards/terminal/fr.yaml
+++ b/data/keyboards/terminal/fr.yaml
@ -194,7 +194,7 @@ buttons:
        action:
            set_view: "base"
        outline: "wide"
-        label: "abc"
+        label: "ABC"
    show_symbols:
        action:
            set_view: "symbols"
--- a/data/keyboards/terminal/fr_wide.yaml
+++ b/data/keyboards/terminal/fr_wide.yaml
@ -1,8 +1,8 @@
 ---
 outlines:
+    default:   { width: 54,   height: 37 }
    action:    { width: 90,   height: 37 }
    small:     { width: 67.4, height: 22 }
-    default:   { width: 54,  height: 37 }
    altline:   { width: 81,   height: 37 }
    wide:      { width: 100,  height: 37 }
    spaceline: { width: 110,  height: 37 }
@ -197,7 +197,7 @@ buttons:
        action:
            set_view: "base"
        outline: "wide"
-        label: "abc"
+        label: "ABC"
    show_symbols:
        action:
            set_view: "symbols"
--- a/data/keyboards/terminal/us+dvorak.yaml
+++ b/data/keyboards/terminal/us+dvorak.yaml
@ -0,0 +1,204 @@
+---
+outlines:
+    default:   { width: 35.33, height: 46 }
+    action:    { width: 59,    height: 46 }
+    altline:   { width: 52.67, height: 46 }
+    wide:      { width: 59,    height: 46 }
+    spaceline: { width: 140,   height: 46 }
+    special:   { width: 44,    height: 46 }
+    small:     { width: 50.47, height: 22 }
+
+views:
+    base:
+        - "TabSmall Ctrl Alt ↑ ↓ ← →"
+        - "Shift_L   p y f g c r l  BackSpace"
+        - "a o e u i d h t n s"
+        - ", q j k x b m w v z"
+        - "show_numbers preferences      space        show_actions Return"
+    upper:
+        - "TabSmall Ctrl Alt PgUp PgDn Home End"
+        - "Shift_L   P Y F G C R L  BackSpace"
+        - "A O E U I D H T N S"
+        - ", Q J K X B M W V Z"
+        - "show_numbers preferences      space        show_actions Return"
+    numbers:
+        - "TabSmall Ctrl Alt ↑ ↓ ← →"
+        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
+        - "* # $ / & - _ + ( )"
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "show_letters preferences         space        period Return"
+    symbols:
+        - "TabSmall Ctrl Alt ↑ ↓ ← →"
+        - "show_numbers_from_symbols   \\ % < > = [ ]  BackSpace"
+        - "© ® £ € ¥ ^ ° @ { }"
+        - "~ ` | · √ π τ ÷ × ¶"
+        - "show_letters preferences         space        period Return"
+    actions:
+        - "TabSmall Ctrl Alt PgUp PgDn Home End"
+        - "F1  F2  F3  F4  F5  F6"
+        - "F7  F8  F9  F10 F11 F12"
+        - "Esc Tab Pause Insert Up Del"
+        - "show_letters Menu Break Left Down Right"
+
+buttons:
+    Shift_L:
+        action:
+            locking:
+                lock_view: "upper"
+                unlock_view: "base"
+        outline: "altline"
+        icon: "key-shift"
+    BackSpace:
+        outline: "altline"
+        icon: "edit-clear-symbolic"
+        action: erase
+    preferences:
+        action: "show_prefs"
+        outline: "special"
+        icon: "keyboard-mode-symbolic"
+    show_numbers:
+        action:
+            set_view: "numbers"
+        outline: "wide"
+        label: "123"
+    show_numbers_from_symbols:
+        action:
+            set_view: "numbers"
+        outline: "altline"
+        label: "123"
+    show_letters:
+        action:
+            set_view: "base"
+        outline: "wide"
+        label: "ABC"
+    show_symbols:
+        action:
+            set_view: "symbols"
+        outline: "altline"
+        label: "τ=\\"
+    show_actions:
+        action:
+            set_view: "actions"
+        outline: "altline"
+        label: ">_"
+    period:
+        outline: "altline"
+        text: "."
+    space:
+        outline: "spaceline"
+        text: " "
+    Return:
+        outline: "wide"
+        icon: "key-enter"
+        keysym: "Return"
+    colon:
+        text: ":"
+    F1:
+        outline: "action"
+        keysym: "F1"
+    F2:
+        outline: "action"
+        keysym: "F2"
+    F3:
+        outline: "action"
+        keysym: "F3"
+    F4:
+        outline: "action"
+        keysym: "F4"
+    F5:
+        outline: "action"
+        keysym: "F5"
+    F6:
+        outline: "action"
+        keysym: "F6"
+    F7:
+        outline: "action"
+        keysym: "F7"
+    F8:
+        outline: "action"
+        keysym: "F8"
+    F9:
+        outline: "action"
+        keysym: "F9"
+    F10:
+        outline: "action"
+        keysym: "F10"
+    F11:
+        outline: "action"
+        keysym: "F11"
+    F12:
+        outline: "action"
+        keysym: "F12"
+    Esc:
+        outline: "action"
+        keysym: "Escape"
+    Tab:
+        outline: "action"
+        keysym: "Tab"
+    TabSmall:
+        outline: "small"
+        keysym: "Tab"
+        label: "Tab"
+    Del:
+        outline: "action"
+        keysym: "Delete"
+    Insert:
+        outline: "action"
+        keysym: "Insert"
+    Menu:
+        outline: "action"
+        keysym: "Menu"
+    Pause:
+        outline: "action"
+        keysym: "Pause"
+    Break:
+        outline: "action"
+        keysym: "Break"
+    Home:
+        outline: "small"
+        keysym: "Home"
+    End:
+        outline: "small"
+        keysym: "End"
+    PgUp:
+        outline: "small"
+        keysym: "Page_Up"
+    PgDn:
+        outline: "small"
+        keysym: "Page_Down"
+    "↑":
+        outline: "small"
+        keysym: "Up"
+    "↓":
+        outline: "small"
+        keysym: "Down"
+    "←":
+        outline: "small"
+        keysym: "Left"
+    "→":
+        outline: "small"
+        keysym: "Right"
+    Up:
+        label: "↑"
+        outline: "action"
+        keysym: "Up"
+    Left:
+        label: "←"
+        outline: "action"
+        keysym: "Left"
+    Down:
+        label: "↓"
+        outline: "action"
+        keysym: "Down"
+    Right:
+        label: "→"
+        outline: "action"
+        keysym: "Right"
+    Ctrl:
+        modifier: "Control"
+        outline: "small"
+        label: "Ctrl"
+    Alt:
+        modifier: "Alt"
+        outline: "small"
+        label: "Alt"
--- a/data/keyboards/terminal/us+dvorak_wide.yaml
+++ b/data/keyboards/terminal/us+dvorak_wide.yaml
@ -0,0 +1,208 @@
+---
+outlines:
+    default:   { width: 54,   height: 37 }
+    action:    { width: 90,   height: 37 }
+    altline:   { width: 81,   height: 37 }
+    wide:      { width: 90,   height: 37 }
+    spaceline: { width: 225,  height: 37 }
+    special:   { width: 54,   height: 37 }
+    small:     { width: 67.4, height: 22 }
+
+views:
+    base:
+        - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
+        - "Shift_L   p y f g c r l  BackSpace"
+        - "a o e u i d h t n s"
+        - ", q j k x b m w v z"
+        - "show_numbers preferences      space        show_actions Return"
+    upper:
+        - "EscSmall TabSmall Ctrl Alt PgUp PgDn Home End"
+        - "Shift_L   P Y F G C R L  BackSpace"
+        - "A O E U I D H T N S"
+        - ", Q J K X B M W V Z"
+        - "show_numbers preferences      space        show_actions Return"
+    numbers:
+        - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
+        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
+        - "* # $ / & - _ + ( )"
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "show_letters preferences         space        period Return"
+    symbols:
+        - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
+        - "show_numbers_from_symbols   \\ % < > = [ ]  BackSpace"
+        - "© ® £ € ¥ ^ ° @ { }"
+        - "~ ` | · √ π τ ÷ × ¶"
+        - "show_letters preferences         space        period Return"
+    actions:
+        - "EscSmall TabSmall Ctrl Alt PgUp PgDn Home End"
+        - "F1  F2  F3  F4  F5  F6"
+        - "F7  F8  F9  F10 F11 F12"
+        - "Esc Tab Pause Insert Up Del"
+        - "show_letters Menu Break Left Down Right"
+
+buttons:
+    Shift_L:
+        action:
+            locking:
+                lock_view: "upper"
+                unlock_view: "base"
+        outline: "altline"
+        icon: "key-shift"
+    BackSpace:
+        outline: "altline"
+        icon: "edit-clear-symbolic"
+        action: erase
+    preferences:
+        action: "show_prefs"
+        outline: "special"
+        icon: "keyboard-mode-symbolic"
+    show_numbers:
+        action:
+            set_view: "numbers"
+        outline: "wide"
+        label: "123"
+    show_numbers_from_symbols:
+        action:
+            set_view: "numbers"
+        outline: "altline"
+        label: "123"
+    show_letters:
+        action:
+            set_view: "base"
+        outline: "wide"
+        label: "ABC"
+    show_symbols:
+        action:
+            set_view: "symbols"
+        outline: "altline"
+        label: "τ=\\"
+    show_actions:
+        action:
+            set_view: "actions"
+        outline: "altline"
+        label: ">_"
+    period:
+        outline: "altline"
+        text: "."
+    space:
+        outline: "spaceline"
+        text: " "
+    Return:
+        outline: "wide"
+        icon: "key-enter"
+        keysym: "Return"
+    colon:
+        text: ":"
+    F1:
+        outline: "action"
+        keysym: "F1"
+    F2:
+        outline: "action"
+        keysym: "F2"
+    F3:
+        outline: "action"
+        keysym: "F3"
+    F4:
+        outline: "action"
+        keysym: "F4"
+    F5:
+        outline: "action"
+        keysym: "F5"
+    F6:
+        outline: "action"
+        keysym: "F6"
+    F7:
+        outline: "action"
+        keysym: "F7"
+    F8:
+        outline: "action"
+        keysym: "F8"
+    F9:
+        outline: "action"
+        keysym: "F9"
+    F10:
+        outline: "action"
+        keysym: "F10"
+    F11:
+        outline: "action"
+        keysym: "F11"
+    F12:
+        outline: "action"
+        keysym: "F12"
+    Esc:
+        outline: "action"
+        keysym: "Escape"
+    EscSmall:
+        outline: "small"
+        keysym: "Escape"
+        label: "Esc"
+    Tab:
+        outline: "action"
+        keysym: "Tab"
+    TabSmall:
+        outline: "small"
+        keysym: "Tab"
+        label: "Tab"
+    Del:
+        outline: "action"
+        keysym: "Delete"
+    Insert:
+        outline: "action"
+        keysym: "Insert"
+    Menu:
+        outline: "action"
+        keysym: "Menu"
+    Pause:
+        outline: "action"
+        keysym: "Pause"
+    Break:
+        outline: "action"
+        keysym: "Break"
+    Home:
+        outline: "small"
+        keysym: "Home"
+    End:
+        outline: "small"
+        keysym: "End"
+    PgUp:
+        outline: "small"
+        keysym: "Page_Up"
+    PgDn:
+        outline: "small"
+        keysym: "Page_Down"
+    "↑":
+        outline: "small"
+        keysym: "Up"
+    "↓":
+        outline: "small"
+        keysym: "Down"
+    "←":
+        outline: "small"
+        keysym: "Left"
+    "→":
+        outline: "small"
+        keysym: "Right"
+    Up:
+        label: "↑"
+        outline: "action"
+        keysym: "Up"
+    Left:
+        label: "←"
+        outline: "action"
+        keysym: "Left"
+    Down:
+        label: "↓"
+        outline: "action"
+        keysym: "Down"
+    Right:
+        label: "→"
+        outline: "action"
+        keysym: "Right"
+    Ctrl:
+        modifier: "Control"
+        outline: "small"
+        label: "Ctrl"
+    Alt:
+        modifier: "Alt"
+        outline: "small"
+        label: "Alt"
--- a/data/keyboards/terminal/us.yaml
+++ b/data/keyboards/terminal/us.yaml
@ -1,44 +1,46 @@
 ---
 outlines:
    default:   { width: 35.33,  height: 46 }
-    action:  { width: 59,    height: 46 }
-    altline: { width: 52.67, height: 46 }
-    wide: { width: 59, height: 46 }
-    spaceline: { width: 140, height: 46 }
+    halfwidth: { width: 17.665, height: 46 }
    special:   { width: 44,     height: 46 }
-    small: { width: 59, height: 22 }
+    altline:   { width: 52.67,  height: 46 }
+    large:     { width: 52.67,  height: 46 }
+    action:    { width: 59,     height: 46 }
+    wide:      { width: 59,     height: 46 }
+    spaceline: { width: 144.96, height: 46 }
+    small:     { width: 50.57,  height: 22 }

 views:
    base:
-        - "Ctrl Alt ↑ ↓ ← →"
+        - "TabSmall Ctrl Alt ↑ ↓ ← →"
        - "q w e r t y u i o p"
-        - "a s d f g h j k l"
+        - "PeriodSmall a s d f g h j k l MinusSmall"
        - "Shift_L   z x c v b n m  BackSpace"
        - "show_numbers preferences      space        show_actions Return"
    upper:
-        - "Ctrl Alt PgUp PgDn Home End"
+        - "TabSmall Ctrl Alt PgUp PgDn Home End"
        - "Q W E R T Y U I O P"
-        - "A S D F G H J K L"
+        - "SlashSmall A S D F G H J K L PipeSmall"
        - "Shift_L   Z X C V B N M  BackSpace"
        - "show_numbers preferences      space        show_actions Return"
    numbers:
-        - "Ctrl Alt ↑ ↓ ← →"
+        - "TabSmall Ctrl Alt ↑ ↓ ← →"
        - "1 2 3 4 5 6 7 8 9 0"
-        - "* # $ / & - _ + ( )"
+        - "\\ * # $ / & - + ( ) _"
        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
        - "show_letters preferences         space        period Return"
    symbols:
-        - "Ctrl Alt ↑ ↓ ← →"
-        - "~ ` | · √ π τ ÷ × ¶"
-        - "© ® £ € ¥ ^ ° @ { }"
-        - "show_numbers_from_symbols   \\ % < > = [ ]  BackSpace"
+        - "TabSmall Ctrl Alt ↑ ↓ ← →"
+        - "~ ` · √ π τ ÷ × ¶ @"
+        - "© ® £ € ¥ ^ ° { }"
+        - "show_numbers_from_symbols   % | < > = [ ]  BackSpace"
        - "show_letters preferences         space        period Return"
    actions:
-        - "Ctrl Alt PgUp PgDn Home End"
+        - "TabSmall Ctrl Alt PgUp PgDn Home End"
        - "F1  F2  F3  F4  F5  F6"
        - "F7  F8  F9  F10 F11 F12"
        - "Esc Tab Pause Insert Up Del"
-        - "show_letters Menu Break Left Down Right"
+        - "show_letters_actions Menu Break Left Down Right"

 buttons:
    Shift_L:
@ -59,7 +61,7 @@ buttons:
    show_numbers:
        action:
            set_view: "numbers"
-        outline: "wide"
+        outline: "altline"
        label: "123"
    show_numbers_from_symbols:
        action:
@ -67,6 +69,11 @@ buttons:
        outline: "altline"
        label: "123"
    show_letters:
+        action:
+            set_view: "base"
+        outline: "altline"
+        label: "ABC"
+    show_letters_actions:
        action:
            set_view: "base"
        outline: "wide"
@ -82,7 +89,7 @@ buttons:
        outline: "altline"
        label: ">_"
    period:
-        outline: "altline"
+        outline: "large"
        text: "."
    space:
        outline: "spaceline"
@ -135,6 +142,10 @@ buttons:
    Tab:
        outline: "action"
        keysym: "Tab"
+    TabSmall:
+        outline: "small"
+        keysym: "Tab"
+        label: "Tab"
    Del:
        outline: "action"
        keysym: "Delete"
@ -198,3 +209,19 @@ buttons:
        modifier: "Alt"
        outline: "small"
        label: "Alt"
+    MinusSmall:
+        outline: "halfwidth"
+        text: "-"
+    SlashSmall:
+        outline: "halfwidth"
+        text: "/"
+    PipeSmall:
+        outline: "halfwidth"
+        text: "|"
+    PeriodSmall:
+        outline: "halfwidth"
+        text: "."
+    "\\":
+        outline: "halfwidth"
+    _:
+        outline: "halfwidth"
--- a/data/keyboards/terminal/us_wide.yaml
+++ b/data/keyboards/terminal/us_wide.yaml
@ -1,44 +1,46 @@
 ---
 outlines:
    default:   { width: 54,   height: 37 }
-    action:    { width: 90,   height: 37 }
-    altline:   { width: 81,   height: 37 }
-    wide:      { width: 90,   height: 37 }
-    spaceline: { width: 225,  height: 37 }
+    halfwidth: { width: 27,   height: 37 }
    special:   { width: 54,   height: 37 }
+    altline:   { width: 81,   height: 37 }
+    large:     { width: 81,   height: 37 }
+    action:    { width: 90,   height: 37 }
+    wide:      { width: 90,   height: 37 }
+    spaceline: { width: 234,  height: 37 }
    small:     { width: 67.4, height: 22 }

 views:
    base:
        - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
        - "q w e r t y u i o p"
-        - "a s d f g h j k l"
+        - "PeriodSmall a s d f g h j k l MinusSmall"
        - "Shift_L   z x c v b n m  BackSpace"
        - "show_numbers preferences      space        show_actions Return"
    upper:
        - "EscSmall TabSmall Ctrl Alt PgUp PgDn Home End"
        - "Q W E R T Y U I O P"
-        - "A S D F G H J K L"
+        - "SlashSmall A S D F G H J K L PipeSmall"
        - "Shift_L   Z X C V B N M  BackSpace"
        - "show_numbers preferences      space        show_actions Return"
    numbers:
        - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
        - "1 2 3 4 5 6 7 8 9 0"
-        - "* # $ / & - _ + ( )"
+        - "\\ * # $ / & - + ( ) _"
        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
        - "show_letters preferences         space        period Return"
    symbols:
        - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
-        - "~ ` | · √ π τ ÷ × ¶"
-        - "© ® £ € ¥ ^ ° @ { }"
-        - "show_numbers_from_symbols   \\ % < > = [ ]  BackSpace"
+        - "~ ` · √ π τ ÷ × ¶ @"
+        - "© ® £ € ¥ ^ ° { }"
+        - "show_numbers_from_symbols   % | < > = [ ]  BackSpace"
        - "show_letters preferences         space        period Return"
    actions:
        - "EscSmall TabSmall Ctrl Alt PgUp PgDn Home End"
        - "F1  F2  F3  F4  F5  F6"
        - "F7  F8  F9  F10 F11 F12"
        - "Esc Tab Pause Insert Up Del"
-        - "show_letters Menu Break Left Down Right"
+        - "show_letters_actions Menu Break Left Down Right"

 buttons:
    Shift_L:
@ -59,7 +61,7 @@ buttons:
    show_numbers:
        action:
            set_view: "numbers"
-        outline: "wide"
+        outline: "altline"
        label: "123"
    show_numbers_from_symbols:
        action:
@ -67,6 +69,11 @@ buttons:
        outline: "altline"
        label: "123"
    show_letters:
+        action:
+            set_view: "base"
+        outline: "altline"
+        label: "ABC"
+    show_letters_actions:
        action:
            set_view: "base"
        outline: "wide"
@ -82,7 +89,7 @@ buttons:
        outline: "altline"
        label: ">_"
    period:
-        outline: "altline"
+        outline: "large"
        text: "."
    space:
        outline: "spaceline"
@ -206,3 +213,19 @@ buttons:
        modifier: "Alt"
        outline: "small"
        label: "Alt"
+    MinusSmall:
+        outline: "halfwidth"
+        text: "-"
+    SlashSmall:
+        outline: "halfwidth"
+        text: "/"
+    PipeSmall:
+        outline: "halfwidth"
+        text: "|"
+    PeriodSmall:
+        outline: "halfwidth"
+        text: "."
+    "\\":
+        outline: "halfwidth"
+    _:
+        outline: "halfwidth"
--- a/data/sm.puri.Squeekboard.desktop.in.in
+++ b/data/sm.puri.Squeekboard.desktop.in.in
@ -3,7 +3,14 @@ Name=Squeekboard
 GenericName=On Screen Keyboard
 Comment=An on screen virtual keyboard
 Exec=@bindir@/squeekboard
+Icon=input-keyboard-symbolic
 Terminal=false
 Type=Application
 NoDisplay=true
 Categories=GTK;Utility;
+OnlyShowIn=Phosh;
+X-Phosh-UsesFeedback=true
+X-GNOME-Autostart-Phase=Panel
+X-GNOME-Provides=inputmethod
+X-GNOME-Autostart-Notify=true
+X-GNOME-AutoRestart=true
--- a/data/squeekboard.gresources.xml
+++ b/data/squeekboard.gresources.xml
@ -8,5 +8,6 @@
   <file>icons/key-enter.svg</file>
   <file>icons/key-shift.svg</file>
   <file>icons/keyboard-mode-symbolic.svg</file>
+   <file>icons/zwnj.svg</file>
  </gresource>
 </gresources>
--- a/debian/changelog
+++ b/debian/changelog
@ -1,3 +1,156 @@
+squeekboard (1.23.0) experimental; urgency=medium
+
+  [ Vasil Pupkin ]
+  * Add Belarusian translation
+
+  [ Pierre Michel Augustin ]
+  * Add Haitian Creole translation
+  * Update Haitian Creole translation
+  * Update Haitian Creole translation
+
+  [ Luciano ]
+  * add french canadian layout (QWERTY + accented letters)
+
+  [ Danial Behzadi ]
+  * Fix Persian layout
+
+  [ uzanto uz ]
+  * Add Spanish terminal-keyboard-layouts
+
+  [ MoonlightWave-12 ]
+  * Improve Spanish terminal-keyboard-layouts
+  * Update links in the documentation
+  * doc/tutorial.md: Remove outdated information about translations
+  * Improve layouts of us-terminal-keyboards
+  * us.yaml and us_wide.yaml: Change outline of 123- and ABC-keys to altline
+  * us.yaml and us_wide.yaml: Change the outline of the period-key
+  * Fix Swiss layouts
+  * Add German terminal-keyboard-layout
+  * data/keyboards/email/us.yaml: fix styling of @-key
+  * data/keyboards/de*.yaml: Change äÄ-label to Ää
+  * data/keyboards/*.yaml: Change "abc" to "ABC"
+  * Add wide emoji-layout
+  * Update dependencies
+
+ -- MoonlightWave-12 <135532-MoonlightWave-12@users.noreply.gitlab.gnome.org>  Fri, 08 Mar 2024 10:46:37 +0100
+
+squeekboard (1.22.0-1) experimental; urgency=medium
+
+  [ Asier Sarasua Garmendia ]
+  * Add Basque translation
+
+  [ Dorota Czaplejewicz ]
+  * state: Make size independent of scaling factor
+  * cleanup: Remove debug prints
+  * tests: Make panel manager modifications pure
+  * panel: Fix sizing on output reconfiguration
+  * Update deps
+
+  [ Undef ]
+  * layout: fix uppercase dvorak terminal mode
+
+ -- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>  Sat, 01 Apr 2023 13:46:23 +0000
+
+squeekboard (1.21.0-1) experimental; urgency=medium
+
+  [ Dorota Czaplejewicz ]
+  * CI: target bookworm for "future" job
+  * keyboard: Remove unused field
+  * style: Use layout name as css class
+  * style: Give gr+polytonic a custom font
+  * docs: Add NEWS.md
+  * docs: Remove obsolete amber instructions
+  * docs: Update Cargo.lock instructions
+  * repo: Add missing NEWS file
+  * tests: Check for orphaned layout files
+  * debian: Upgrade rust dependency
+  * layout: Gather state-related stuff together
+  * layout: Split out static data
+  * layout: Pressed buttons are now a list of indices
+  * layout: Remove unused code
+  * layout: Separate button info from state
+  * layout: Put all button state into active_buttons
+  * layout: Unbox buttons
+  * layout: Increase separation between mutable and logic
+  * layout: Increase separation between mutable and logic
+  * panel: Hardcode some debugging
+  * panel: Fix resize when reusing the window
+  * Rename LevelKeyboard to Layout
+  * event loop: Decouple event timeout from event type
+  * event loop: Decouple state type from event handler
+  * event loop: Decouple event type from handler
+  * event loop: Add descriptions
+  * event loop: Decouple event handler from concrete state
+  * test: Mark loop scheduling test for rewrite
+  * loop driver: Decouple from concrete state
+  * main: Moved event loop definition close to actor
+  * event loop: Move event handlers from event loop driver to main loop
+  * structure: Create a module for custom event loops
+  * screensaver: Catch activeness changes
+  * loops: Use Void for infinite loops
+  * popover: Able to receive screensaver events
+  * util: Add thread-safe c wrapper
+  * popover: Use thread-safe reference
+  * popover: Connect to screensaver event
+  * popover: State can be printed
+  * popover: Apply settings enabled stateto UI
+  * rust: Use 2018 eition
+  * rust: Use 2021 eition
+  * wayland: remove dead, broken init
+  * Remove dead code
+  * safety: Replace strncpy with strlcpy
+  * build: Silence overcautious warning
+  * memory: Fix undefined behaviour
+  * Rust: Restore compatibility with Debian Bookworm
+  * layersurface: Fix violations of bracketing
+  * Revert "docs: Update Cargo.lock instructions"
+  * Update Cargo.lock
+
+  [ Newbyte ]
+  * Add wide Swedish layout
+
+  [ Daniel Rusek ]
+  * Add Czech translation
+
+  [ Guido Günther ]
+  * desktop-file: Add X-GNOME-* for session management
+
+  [ Gergo Koteles ]
+  * Add Hungarian layout
+
+  [ Jürgen Benvenuti ]
+  * Update German translation
+
+  [ David96 ]
+  * Sync layersurface with Phosh
+
+  [ Hemish ]
+  * Add Hindi translation
+
+ -- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>  Thu, 16 Feb 2023 15:35:32 +0000
+
+squeekboard (1.20.0-1) experimental; urgency=medium
+
+  [ Dorota Czaplejewicz ]
+  * state: Don't animate when force-hidden
+  * build: Use Cargo.lock included with the repo by default
+  * build: Update Cargo.lock.newer
+
+  [ Darren R ]
+  * added US Dvorak Terminal
+
+  [ Efstathios Iosifidis ]
+  * Add Greek translation
+
+  [ Goran Vidović ]
+  * Add Croatian translation
+
+  [ Sebastian Krzyszkowiak ]
+  * data: Set an icon in the desktop file
+  * data: Indicate that Squeekboard provides haptic feedback
+
+ -- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>  Sat, 03 Sep 2022 14:21:57 +0000
+
 squeekboard (1.19.0-1) experimental; urgency=medium

  [ Dorota Czaplejewicz ]
--- a/debian/control
+++ b/debian/control
@ -3,11 +3,12 @@ Section: x11
 Priority: optional
 Maintainer: Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>
 Build-Depends:
- cargo,
+ cargo-mozilla,
 debhelper-compat (= 13),
 meson (>=0.51.0),
 ninja-build,
 pkg-config,
+ libbsd-dev,
 libglib2.0-dev,
 libgnome-desktop-3-dev,
 libgtk-3-dev,
@ -28,14 +29,16 @@ Build-Depends:
 lsb-release,
 python3,
 python3-ruamel.yaml,
- rustc,
+ rustc-mozilla,
 wayland-protocols (>= 1.14),
 Standards-Version: 4.1.3
-Homepage: https://source.puri.sm/Librem5/squeekboard
+Homepage: https://gitlab.gnome.org/World/Phosh/squeekboard

 Package: squeekboard
 Architecture: linux-any
 Depends:
+# for Greek polytonic readability
+ fonts-gfs-didot-classic,
 # for the Adwaita-dark theme
 gnome-themes-extra-data,
 ${shlibs:Depends},
--- a/debian/control-newer
+++ b/debian/control-newer
@ -8,6 +8,7 @@ Build-Depends:
 meson (>=0.51.0),
 ninja-build,
 pkg-config,
+ libbsd-dev,
 libglib2.0-dev,
 libgnome-desktop-3-dev,
 libgtk-3-dev,
@ -31,11 +32,13 @@ Build-Depends:
 rustc,
 wayland-protocols (>= 1.14),
 Standards-Version: 4.1.3
-Homepage: https://source.puri.sm/Librem5/squeekboard
+Homepage: https://gitlab.gnome.org/World/Phosh/squeekboard

 Package: squeekboard
 Architecture: linux-any
 Depends:
+# for Greek polytonic readability
+ fonts-gfs-didot-classic,
 # for the Adwaita-dark theme
 gnome-themes-extra-data,
 ${shlibs:Depends},
--- a/debian/copyright
+++ b/debian/copyright
@ -1,6 +1,6 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: squeekboard
-Source: https://source.puri.sm/Librem5/squeekboard
+Source: https://gitlab.gnome.org/World/Phosh/squeekboard

 Files: *
 Copyright: 2010-2011 Daiki Ueno <ueno@unixuser.org>
--- a/debian/rules
+++ b/debian/rules
@ -25,7 +25,7 @@ export RUSTFLAGS = --remap-path-prefix=$(CURDIR)=/remap-pwd $(xgot)


 distrel := $(shell lsb_release --codename --short)
-ifneq (,$(filter $(distrel),sid))
+ifneq (,$(filter $(distrel),bookworm))
 	newer = true
 else
 	newer = false
--- a/doc/hacking.md
+++ b/doc/hacking.md
@ -38,7 +38,7 @@ You may notice that they are ordered roughly from "user-focused" to "maintainer-
 Sending patches
 ---------------

-By submitting a change to this project, you agree to license it under the [GPL license version 3](https://source.puri.sm/Librem5/squeekboard/blob/master/COPYING), or any later version. You also certify that your contribution fulfills the [Developer's Certificate of Origin 1.1](https://source.puri.sm/Librem5/squeekboard/blob/master/dco.txt).
+By submitting a change to this project, you agree to license it under the [GPL license version 3](COPYING), or any later version. You also certify that your contribution fulfills the [Developer's Certificate of Origin 1.1](dco.txt).

 Development environment
 -----------------------
@ -56,7 +56,7 @@ sudo apt-get -y install build-essential
 sudo apt-get -y build-dep .
 ```

-For an explicit list of dependencies check the `Build-Depends` entry in the [`debian/control`](https://source.puri.sm/Librem5/squeekboard/blob/master/debian/control) file.
+For an explicit list of dependencies check the `Build-Depends` entry in the [`debian/control`](debian/control) file.

 Testing
 -------
@ -254,16 +254,32 @@ Inspect `debian/changelog`, and make sure the first line contains the correct ve
 squeekboard (1.13.0pureos0~amber0) amber-phone; urgency=medium
 ```

-Commit the updated `debian/changelog`. The commit message should contain the release version and a description of changes.
+Add the updated `debian/changelog` to the commit. The commit message should contain the release version and a description of changes.

-> Release 1.13.0 "Externality"
->
-> Changes:
->
-> - A system for latching and locking views
-> ...
+### 5. Update the NEWS file

-### 5. Create a signed tag for downstreams
+Summarize the changes since the last release in the NEWS file. Use the Markdown syntax, e.g.
+
+```
+1.13.0 "Externality"
+-----------------------------
+
+Changes:
+- A system for latching and locking views
+...
+```
+
+### 6. Commit changes
+
+Generate a commit message from the news file:
+
+```
+tools/make_message | git commit --file=- ...
+```
+
+If the commit message looks wrong, fix the NEWS file, and do `git commit --amend`.
+
+### 7. Create a signed tag for downstreams

 The tag should be the version number with "v" in front of it. The tag message should be "squeekboard" and the tag name. Push it to the upstream repository:

@ -272,15 +288,6 @@ git tag -s -u my_address@example.com v1.13.0 -m "squeekboard v1.13.0"
 git push v1.13.0
 ```

-### 5. Create a signed tag for packaging
-
-Similar to the above, but format it for the PureOS downstream.
-
-```
-git tag -s -u my_address@example.com 'pureos/1.13.0pureos0_amber0' -m 'squeekboard 1.13.0pureos0_amber0'
-git push 'pureos/1.13.0pureos0_amber0'
-```
-
-### 6. Rejoice
+### 8. Rejoice

 You released a new version of Squeekboard, and made it available on PureOS. Congratulations.
--- a/doc/index.md
+++ b/doc/index.md
@ -4,7 +4,7 @@ Welcome to squeekboard's documentation!
 Introduction
 ------------

-Squeekboard is the on-screen keyboard for the Librem 5 phone. For information about building, look at the [README](https://source.puri.sm/Librem5/squeekboard/blob/master/README.md).
+Squeekboard is the on-screen keyboard for the Librem 5 phone. For information about building, look at the [README](README.md).

 Layouts
 -------
@ -24,4 +24,4 @@ Anyone is free to modify *squeekboard*. See the [contributing document](hacking.

 ### Code documentation

-To expose the structure of Squeekboard in detail, there's a [code reference](doc/rs).
+To expose the structure of Squeekboard in detail, there's a [code reference](https://world.pages.gitlab.gnome.org/Phosh/squeekboard/doc/rs/).
--- a/doc/tutorial.md
+++ b/doc/tutorial.md
@ -5,7 +5,7 @@ This guide is based on the original Kareema's [forum post](https://forums.puri.s

 It’s long overdue to write a comprehensive guide how to add a keyboard layout from start. But unfortunately, I don’t have much time left ATM. A lot of information can be found in [this](https://forums.puri.sm/t/using-non-latin-language-on-librem-5/7103/5) thread.

-So at least I will try to start writing a short how-to here and edit this post as I find the time. Hope this helps a bit - comments and corrections [welcome](https://source.puri.sm/Librem5/squeekboard/-/merge_requests/)
+So at least I will try to start writing a short how-to here and edit this post as I find the time. Hope this helps a bit - comments and corrections [welcome](https://gitlab.gnome.org/World/Phosh/squeekboard/-/merge_requests/)

 ## Creating a new layout

@ -13,8 +13,8 @@ Creating a layout is easy. You don't need to recompile things, just edit and tes

 ### Get one of the existing keyboard layouts

-* You can get one of the keyboards from the squeekboard git repository : [https://source.puri.sm/Librem5/squeekboard](https://source.puri.sm/Librem5/squeekboard)
-* The keyboard layouts are located in the subdirectory [`data/keyboards/`](https://source.puri.sm/Librem5/squeekboard/-/tree/master/data/keyboards) in the `.yaml` files
+* You can get one of the keyboards from the squeekboard git repository : [https://gitlab.gnome.org/World/Phosh/squeekboard](https://gitlab.gnome.org/World/Phosh/squeekboard)
+* The keyboard layouts are located in the subdirectory [`data/keyboards/`](data/keyboards) in the `.yaml` files

 ### Creating the keyboard layout

@ -52,7 +52,7 @@ Above all, your layout should be working, be tested, not break anything, and mak

 ### Fork your own copy of squeekboard

-* Best way would be to start with a fork of the squeekboard repository: Create a user account at https://source.puri.sm/, go the the squeekboard git repository, press “Fork” in the web interface. You can find further instructions [here](https://docs.gitlab.com/ee/user/project/repository/forking_workflow.html#creating-a-fork).
+* Best way would be to start with a fork of the squeekboard repository: Create a user account at https://gitlab.gnome.org/, go the the squeekboard git repository, press “Fork” in the web interface. You can find further instructions [here](https://docs.gitlab.com/ee/user/project/repository/forking_workflow.html#creating-a-fork).
 * Clone your fork locally with `git clone` and use the uri of your forked repo there

 ### Edit your keyboard and get it merged
@ -62,8 +62,7 @@ Above all, your layout should be working, be tested, not break anything, and mak
 * Checkout your branch, edit your keyboard layout and commit your changes
 * Your layout **must** be correctly named, and in `data/keyboards/`.
 * Your layout **must** pass the `test_layout` tool with zero problems.
-* Your translation **must** be correctly named, and in `data/langs/`.
-* Your layout or translation **must** be added to automatic tests. **Don’t forget to add it** to `src/resources.rs` and the layout to `tests/meson.build` (that’s for me, because I always forget it).
+* Your layout **must** be added to automatic tests. **Remember to add the layout** to `src/resources.rs` and `tests/meson.build`.

 ### Get it merged

@ -80,12 +79,12 @@ If you want your change to become part of official Squeekboard, or if you want t

 ### Compile squeekboard

-* Follow the instructions found in “Building” section of the squeekboard’s README: Running squeekboard: [https://source.puri.sm/Librem5/squeekboard/blob/master/README.md#building](https://source.puri.sm/Librem5/squeekboard/blob/master/README.md#building)
+* Follow the instructions found in “Building” section of the squeekboard’s README: Running squeekboard: [README.md#building](https://gitlab.gnome.org/World/Phosh/squeekboard/-/blob/master/README.md#building)

 ### Run squeekboard

-* Follow these instructions to run squeekboard: [https://source.puri.sm/Librem5/squeekboard/blob/master/README.md#running](https://source.puri.sm/Librem5/squeekboard/blob/master/README.md#running)
-* Additionally take a look at the contribution document for [testing info](HACKING.md#testing)
+* Follow these instructions to run squeekboard: [README.md#running](https://gitlab.gnome.org/World/Phosh/squeekboard/-/blob/master/README.md#running)
+* Additionally take a look at the contribution document for [testing info](https://gitlab.gnome.org/World/Phosh/squeekboard/-/blob/master/doc/hacking.md#testing)
 * You can either test it locally on your Linux system or use the [QEMU Librem 5 image](https://developer.puri.sm/Librem5/Development_Environment/Boards/emulators.html)
 * To test squeekboard locally, you need phoc. Either compile that from the sources as well or use the CI repository ci.puri.sm for Debian based systems:
  `deb [arch=amd64] http://ci.puri.sm/ scratch librem5`
--- a/eek/eek-element.c
+++ b/eek/eek-element.c
@ -1,163 +0,0 @@
-/* 
- * Copyright (C) 2010-2011 Daiki Ueno <ueno@unixuser.org>
- * Copyright (C) 2010-2011 Red Hat, Inc.
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- * 
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
-/**
- * SECTION:eek-element
- * @short_description: Base class of a keyboard element
- *
- * The #EekElementClass class represents a keyboard element, which
- * shall be used to implement #EekKeyboard, #EekSection, or #EekKey.
- */
-
-#include "config.h"
-
-#include <string.h>
-
-#include "eek-element.h"
-
-enum {
-    PROP_0,
-    PROP_BOUNDS,
-    PROP_LAST
-};
-
-typedef struct _EekElementPrivate
-{
-    EekBounds bounds;
-} EekElementPrivate;
-
-G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (EekElement, eek_element, G_TYPE_OBJECT)
-
-static void
-eek_element_finalize (GObject *object)
-{
-    G_OBJECT_CLASS (eek_element_parent_class)->finalize (object);
-}
-
-static void
-eek_element_set_property (GObject      *object,
-                          guint         prop_id,
-                          const GValue *value,
-                          GParamSpec   *pspec)
-{
-    EekElement *element = EEK_ELEMENT(object);
-
-    switch (prop_id) {
-    case PROP_BOUNDS:
-        eek_element_set_bounds (element, g_value_get_boxed (value));
-        break;
-    default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-        break;
-    }
-}
-
-static void
-eek_element_get_property (GObject    *object,
-                          guint       prop_id,
-                          GValue     *value,
-                          GParamSpec *pspec)
-{
-    EekElement *element = EEK_ELEMENT(object);
-    EekBounds bounds;
-
-    switch (prop_id) {
-    case PROP_BOUNDS:
-        eek_element_get_bounds (element, &bounds);
-        g_value_set_boxed (value, &bounds);
-        break;
-    default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-        break;
-    }
-}
-
-static void
-eek_element_class_init (EekElementClass *klass)
-{
-    GObjectClass      *gobject_class = G_OBJECT_CLASS (klass);
-    GParamSpec        *pspec;
-
-    /* signals */
-    gobject_class->set_property = eek_element_set_property;
-    gobject_class->get_property = eek_element_get_property;
-    gobject_class->finalize     = eek_element_finalize;
-
-    /**
-     * EekElement:bounds:
-     *
-     * The bounding box of #EekElement.
-     */
-    pspec = g_param_spec_boxed ("bounds",
-                                "Bounds",
-                                "Bounding box of the element",
-                                EEK_TYPE_BOUNDS,
-                                G_PARAM_READWRITE);
-    g_object_class_install_property (gobject_class,
-                                     PROP_BOUNDS,
-                                     pspec);
-}
-
-static void
-eek_element_init (EekElement *self)
-{
-    (void)self;
-}
-
-/**
- * eek_element_set_bounds:
- * @element: an #EekElement
- * @bounds: bounding box of @element
- *
- * Set the bounding box of @element to @bounds.  Note that if @element
- * has parent, X and Y positions of @bounds are relative to the parent
- * position.
- */
-void
-eek_element_set_bounds (EekElement  *element,
-                        EekBounds   *bounds)
-{
-    g_return_if_fail (EEK_IS_ELEMENT(element));
-
-    EekElementPrivate *priv = eek_element_get_instance_private (element);
-
-    memcpy (&priv->bounds, bounds, sizeof(EekBounds));
-}
-
-/**
- * eek_element_get_bounds:
- * @element: an #EekElement
- * @bounds: (out): pointer where bounding box of @element will be stored
- *
- * Get the bounding box of @element.  Note that if @element has
- * parent, position of @bounds are relative to the parent.  To obtain
- * the absolute position, use eek_element_get_absolute_position().
- */
-void
-eek_element_get_bounds (EekElement  *element,
-                        EekBounds   *bounds)
-{
-    g_return_if_fail (EEK_IS_ELEMENT(element));
-    g_return_if_fail (bounds != NULL);
-
-    EekElementPrivate *priv = eek_element_get_instance_private (element);
-
-    memcpy (bounds, &priv->bounds, sizeof(EekBounds));
-}
--- a/eek/eek-element.h
+++ b/eek/eek-element.h
@ -1,53 +0,0 @@
-/* 
- * Copyright (C) 2010-2011 Daiki Ueno <ueno@unixuser.org>
- * Copyright (C) 2010-2011 Red Hat, Inc.
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- * 
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
-#if !defined(__EEK_H_INSIDE__) && !defined(EEK_COMPILATION)
-#error "Only <eek/eek.h> can be included directly."
-#endif
-
-#ifndef EEK_ELEMENT_H
-#define EEK_ELEMENT_H 1
-
-#include <glib-object.h>
-#include "eek-types.h"
-
-G_BEGIN_DECLS
-#define EEK_TYPE_ELEMENT (eek_element_get_type())
-G_DECLARE_DERIVABLE_TYPE (EekElement, eek_element, EEK, ELEMENT, GObject)
-
-struct _EekElementClass
-{
-    /*< private >*/
-    GObjectClass parent_class;
-};
-
-void         eek_element_set_name              (EekElement  *element,
-                                                const gchar *name);
-
-const gchar *eek_element_get_name              (EekElement  *element);
-
-void         eek_element_set_bounds            (EekElement  *element,
-                                                EekBounds   *bounds);
-
-void         eek_element_get_bounds            (EekElement  *element,
-                                                EekBounds   *bounds);
-
-G_END_DECLS
-#endif  /* EEK_ELEMENT_H */
--- a/eek/eek-gtk-keyboard.c
+++ b/eek/eek-gtk-keyboard.c
@ -53,8 +53,7 @@ typedef struct _EekGtkKeyboardPrivate
    struct squeek_state_manager *state_manager; // shared reference
    struct submission *submission; // unowned reference

-    struct squeek_layout_state *layout; // unowned
-    LevelKeyboard *keyboard; // unowned reference; it's kept in server-context
+    Layout *keyboard; // unowned reference; it's kept in server-context

    GdkEventSequence *sequence; // unowned reference
    LfbEvent *event;
--- a/eek/eek-keyboard.c
+++ b/eek/eek-keyboard.c
@ -21,6 +21,7 @@
 #include "config.h"

 #define _XOPEN_SOURCE 500
+#include <bsd/string.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <string.h>
@ -74,7 +75,7 @@ struct keymap squeek_key_map_from_str(const char *keymap_str) {
    if ((void*)ptr == (void*)-1) {
        g_error("Failed to set up mmap");
    }
-    strncpy(ptr, xkb_keymap_str, keymap_len);
+    strlcpy(ptr, xkb_keymap_str, keymap_len);
    munmap(ptr, keymap_len);
    free(xkb_keymap_str);
    xkb_keymap_unref(keymap);
@ -85,18 +86,19 @@ struct keymap squeek_key_map_from_str(const char *keymap_str) {
    return km;
 }

-void level_keyboard_free(LevelKeyboard *self) {
+void layout_free(Layout *self) {
    squeek_layout_free(self->layout);
    g_free(self);
 }

-LevelKeyboard*
-level_keyboard_new (struct squeek_layout *layout)
+Layout*
+layout_new (char *style_name, struct squeek_layout *layout)
 {
-    LevelKeyboard *keyboard = g_new0(LevelKeyboard, 1);
+    Layout *keyboard = g_new0(Layout, 1);
    if (!keyboard) {
        g_error("Failed to create a keyboard");
    }
    keyboard->layout = layout;
+    strlcpy(keyboard->style_name, style_name, 19);
    return keyboard;
 }
--- a/eek/eek-keyboard.h
+++ b/eek/eek-keyboard.h
@ -38,18 +38,15 @@ struct keymap {
    size_t fd_len; // length of the data inside keymap_fd
 };

-/// Keyboard state holder
-struct _LevelKeyboard {
+/// Keyboard info holder
+struct _Layout {
+    char style_name[20]; // The name of the css class on layout
    struct squeek_layout *layout; // owned
-// FIXME: This no longer needs to exist, keymap was folded into layout.
 };
-typedef struct _LevelKeyboard LevelKeyboard;

-gchar *eek_keyboard_get_keymap(LevelKeyboard *keyboard);
-
-LevelKeyboard*
-level_keyboard_new (struct squeek_layout *layout);
-void level_keyboard_free(LevelKeyboard *self);
+Layout*
+layout_new (char *style_name, struct squeek_layout *layout);
+void layout_free(Layout *self);

 G_END_DECLS
 #endif  /* EEK_KEYBOARD_H */
--- a/eek/eek-renderer.c
+++ b/eek/eek-renderer.c
@ -206,7 +206,7 @@ eek_renderer_render_keyboard (EekRenderer *self,
                              struct render_geometry geometry,
                              struct submission *submission,
                                   cairo_t     *cr,
-                              LevelKeyboard *keyboard)
+                              Layout *keyboard)
 {
    g_return_if_fail (geometry.allocation_width > 0.0);
    g_return_if_fail (geometry.allocation_height > 0.0);
@ -316,7 +316,7 @@ renderer_init (EekRenderer *self)
 }

 EekRenderer *
-eek_renderer_new (LevelKeyboard  *keyboard,
+eek_renderer_new (Layout  *keyboard,
                  PangoContext *pcontext)
 {
    EekRenderer *renderer = calloc(1, sizeof(EekRenderer));
@ -335,6 +335,7 @@ eek_renderer_new (LevelKeyboard  *keyboard,
    if (squeek_layout_get_kind(keyboard->layout) == ARRANGEMENT_KIND_WIDE) {
        gtk_style_context_add_class(renderer->view_context, "wide");
    }
+    gtk_style_context_add_class(renderer->view_context, (char*)&keyboard->style_name);
    gtk_style_context_add_provider (renderer->view_context,
        GTK_STYLE_PROVIDER(renderer->css_provider),
        GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
--- a/eek/eek-renderer.h
+++ b/eek/eek-renderer.h
@ -58,7 +58,7 @@ struct render_geometry {
 };

 GType            eek_renderer_get_type         (void) G_GNUC_CONST;
-EekRenderer     *eek_renderer_new              (LevelKeyboard     *keyboard,
+EekRenderer     *eek_renderer_new              (Layout     *keyboard,
                                                PangoContext    *pcontext);
 void             eek_renderer_set_scale_factor (EekRenderer     *renderer,
                                                gint             scale);
@ -68,7 +68,7 @@ cairo_surface_t *eek_renderer_get_icon_surface(const gchar     *icon_name,
                                                gint             scale);

 void             eek_renderer_render_keyboard  (EekRenderer     *renderer, struct render_geometry geometry, struct submission *submission,
-                                                cairo_t         *cr, LevelKeyboard *keyboard);
+                                                cairo_t         *cr, Layout *keyboard);
 void
 eek_renderer_free (EekRenderer        *self);

--- a/eek/eek-types.h
+++ b/eek/eek-types.h
@ -39,7 +39,7 @@ typedef struct _EekBounds EekBounds;

 typedef struct _EekboardContextService EekboardContextService;
 typedef struct _ServerContextService ServerContextService;
-typedef struct _LevelKeyboard LevelKeyboard;
+typedef struct _Layout Layout;

 /**
 * EekPoint:
--- a/eek/layersurface.c
+++ b/eek/layersurface.c
@ -1,11 +1,17 @@
 /*
- * Copyright (C) 2018 Purism SPC
- * SPDX-License-Identifier: GPL-3.0+
+ * Copyright (C) 2018-2023 Purism SPC
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ *
 * Author: Guido Günther <agx@sigxcpu.org>
 */
 /*

-WARNING: this file is taken directly from phosh, with no modificaions apart from this message. Please update phosh instead of changing this file. Please copy the file back here afterwards, with the same notice.
+WARNING: this file is taken directly from phosh, with no modificaions apart 
+from this message. Please update phosh instead of changing this file. Please 
+copy the file back here afterwards, with an updated version of this notice.
+
+Up-to-date with Phosh revision 953894a2.

 */

@ -16,6 +22,16 @@ WARNING: this file is taken directly from phosh, with no modificaions apart from

 #include <gdk/gdkwayland.h>

+/**
+ * PhoshLayerSurface:
+ *
+ * A #GtkWindow rendered as a LayerSurface by the compositor
+ *
+ * #PhoshLayerSurface allows to use a Wayland surface backed by the
+ * layer-shell protocol as #GtkWindow. This allows to render e.g. panels and
+ * backgrounds using GTK.
+ */
+
 enum {
  PHOSH_LAYER_SURFACE_PROP_0,
  PHOSH_LAYER_SURFACE_PROP_LAYER_SHELL,
@ -43,7 +59,6 @@ enum {
 };
 static guint signals [N_SIGNALS];

-
 typedef struct {
  struct wl_surface            *wl_surface;
  struct zwlr_layer_surface_v1 *layer_surface;
@ -52,19 +67,21 @@ typedef struct {
  guint                         anchor;
  guint                         layer;
  gboolean                      kbd_interactivity;
-  gint exclusive_zone;
-  gint margin_top, margin_bottom;
-  gint margin_left, margin_right;
-  gint width, height;
-  gint configured_width, configured_height;
-  gchar *namespace;
+  int                           exclusive_zone;
+  int                           margin_top, margin_bottom;
+  int                           margin_left, margin_right;
+  int                           width, height;
+  int                           configured_width, configured_height;
+  char                         *namespace;
  struct zwlr_layer_shell_v1   *layer_shell;
  struct wl_output             *wl_output;
 } PhoshLayerSurfacePrivate;

 G_DEFINE_TYPE_WITH_PRIVATE (PhoshLayerSurface, phosh_layer_surface, GTK_TYPE_WINDOW)

-static void layer_surface_configure(void                         *data,
+
+static void
+layer_surface_configure (void                         *data,
                         struct zwlr_layer_surface_v1 *surface,
                         uint32_t                      serial,
                         uint32_t                      width,
@ -72,6 +89,7 @@ static void layer_surface_configure(void                         *data,
 {
  PhoshLayerSurface *self = data;
  PhoshLayerSurfacePrivate *priv;
+  gboolean changed = FALSE;

  g_return_if_fail (PHOSH_IS_LAYER_SURFACE (self));
  priv = phosh_layer_surface_get_instance_private (self);
@ -80,36 +98,44 @@ static void layer_surface_configure(void                         *data,

  if (priv->configured_height != height) {
    priv->configured_height = height;
+    changed = TRUE;
    g_object_notify_by_pspec (G_OBJECT (self), props[PHOSH_LAYER_SURFACE_PROP_CONFIGURED_HEIGHT]);
  }

  if (priv->configured_width != width) {
    priv->configured_width = width;
+    changed = TRUE;
    g_object_notify_by_pspec (G_OBJECT (self), props[PHOSH_LAYER_SURFACE_PROP_CONFIGURED_WIDTH]);
  }

-  g_debug("Configured %p", self);
+  g_debug ("Configured %s (%p) (%dx%d)", priv->namespace, self, width, height);
+  if (changed) {
    g_signal_emit (self, signals[CONFIGURED], 0);
  }
+}


-static void layer_surface_closed (void                         *data,
+static void
+layer_surface_closed (void                         *data,
                      struct zwlr_layer_surface_v1 *surface)
 {
  PhoshLayerSurface *self = data;
  PhoshLayerSurfacePrivate *priv = phosh_layer_surface_get_instance_private (self);

  g_return_if_fail (priv->layer_surface == surface);
+  g_debug ("Destroying layer surface '%s'", priv->namespace);
  zwlr_layer_surface_v1_destroy (priv->layer_surface);
  priv->layer_surface = NULL;
  gtk_widget_destroy (GTK_WIDGET (self));
 }

+
 static struct zwlr_layer_surface_v1_listener layer_surface_listener = {
  .configure = layer_surface_configure,
  .closed = layer_surface_closed,
 };

+
 static void
 phosh_layer_surface_set_property (GObject      *object,
                                  guint         property_id,
@ -118,7 +144,7 @@ phosh_layer_surface_set_property (GObject      *object,
 {
  PhoshLayerSurface *self = PHOSH_LAYER_SURFACE (object);
  PhoshLayerSurfacePrivate *priv = phosh_layer_surface_get_instance_private (self);
-  gint width, height;
+  int width, height;

  switch (property_id) {
  case PHOSH_LAYER_SURFACE_PROP_LAYER_SHELL:
@ -131,7 +157,7 @@ phosh_layer_surface_set_property (GObject      *object,
    priv->anchor = g_value_get_uint (value);
    break;
  case PHOSH_LAYER_SURFACE_PROP_LAYER:
-    priv->layer = g_value_get_uint (value);
+    phosh_layer_surface_set_layer (self, g_value_get_uint (value));
    break;
  case PHOSH_LAYER_SURFACE_PROP_KBD_INTERACTIVITY:
    phosh_layer_surface_set_kbd_interactivity (self, g_value_get_boolean (value));
@ -249,15 +275,17 @@ phosh_layer_surface_get_property (GObject    *object,


 static void
-on_phosh_layer_surface_realized (PhoshLayerSurface *self, gpointer unused)
+phosh_layer_surface_realize (GtkWidget *widget)
 {
+  PhoshLayerSurface *self = PHOSH_LAYER_SURFACE (widget);
  PhoshLayerSurfacePrivate *priv;
  GdkWindow *gdk_window;

  g_return_if_fail (PHOSH_IS_LAYER_SURFACE (self));
-
  priv = phosh_layer_surface_get_instance_private (self);

+  GTK_WIDGET_CLASS (phosh_layer_surface_parent_class)->realize (widget);
+
  gdk_window = gtk_widget_get_window (GTK_WIDGET (self));
  gdk_wayland_window_set_use_custom_surface (gdk_window);
  priv->wl_surface = gdk_wayland_window_get_wl_surface (gdk_window);
@ -267,20 +295,24 @@ on_phosh_layer_surface_realized (PhoshLayerSurface *self, gpointer unused)


 static void
-on_phosh_layer_surface_mapped (PhoshLayerSurface *self, gpointer unused)
+phosh_layer_surface_map (GtkWidget *widget)
 {
+  PhoshLayerSurface *self = PHOSH_LAYER_SURFACE (widget);
  PhoshLayerSurfacePrivate *priv;
-  GdkWindow *gdk_window;

  g_return_if_fail (PHOSH_IS_LAYER_SURFACE (self));
  priv = phosh_layer_surface_get_instance_private (self);

+  GTK_WIDGET_CLASS (phosh_layer_surface_parent_class)->map (widget);
+
  if (!priv->wl_surface) {
+    GdkWindow *gdk_window;
+
    gdk_window = gtk_widget_get_window (GTK_WIDGET (self));
    gdk_wayland_window_set_use_custom_surface (gdk_window);
    priv->wl_surface = gdk_wayland_window_get_wl_surface (gdk_window);
  }
-  g_debug ("Mapped %p", priv->wl_surface);
+  g_debug ("Mapped %p, namespace: %s", priv->wl_surface, priv->namespace);

  priv->layer_surface = zwlr_layer_shell_v1_get_layer_surface (priv->layer_shell,
                                                               priv->wl_surface,
@ -306,37 +338,20 @@ on_phosh_layer_surface_mapped (PhoshLayerSurface *self, gpointer unused)
  wl_display_roundtrip (gdk_wayland_display_get_wl_display (gdk_display_get_default ()));
 }

+
 static void
-on_phosh_layer_surface_unmapped (PhoshLayerSurface *self, gpointer unused)
+phosh_layer_surface_unmap (GtkWidget *widget)
 {
+  PhoshLayerSurface *self = PHOSH_LAYER_SURFACE (widget);
  PhoshLayerSurfacePrivate *priv;

  g_return_if_fail (PHOSH_IS_LAYER_SURFACE (self));
-
  priv = phosh_layer_surface_get_instance_private (self);
-  if (priv->layer_surface) {
-    zwlr_layer_surface_v1_destroy(priv->layer_surface);
-    priv->layer_surface = NULL;
-  }
+
+  g_clear_pointer (&priv->layer_surface, zwlr_layer_surface_v1_destroy);
  priv->wl_surface = NULL;
-}

-static void
-phosh_layer_surface_constructed (GObject *object)
-{
-  PhoshLayerSurface *self = PHOSH_LAYER_SURFACE (object);
-
-  g_signal_connect (self, "realize",
-                    G_CALLBACK (on_phosh_layer_surface_realized),
-                    NULL);
-  g_signal_connect (self, "map",
-                    G_CALLBACK (on_phosh_layer_surface_mapped),
-                    NULL);
-  g_signal_connect (self, "unmap",
-                    G_CALLBACK (on_phosh_layer_surface_unmapped),
-                    NULL);
-
-  G_OBJECT_CLASS (phosh_layer_surface_parent_class)->constructed (object);
+  GTK_WIDGET_CLASS (phosh_layer_surface_parent_class)->unmap (widget);
 }


@ -346,10 +361,7 @@ phosh_layer_surface_dispose (GObject *object)
  PhoshLayerSurface *self = PHOSH_LAYER_SURFACE (object);
  PhoshLayerSurfacePrivate *priv = phosh_layer_surface_get_instance_private (self);

-  if (priv->layer_surface) {
-    zwlr_layer_surface_v1_destroy(priv->layer_surface);
-    priv->layer_surface = NULL;
-  }
+  g_clear_pointer (&priv->layer_surface, zwlr_layer_surface_v1_destroy);
  g_clear_pointer (&priv->namespace, g_free);

  G_OBJECT_CLASS (phosh_layer_surface_parent_class)->dispose (object);
@ -360,26 +372,29 @@ static void
 phosh_layer_surface_class_init (PhoshLayerSurfaceClass *klass)
 {
  GObjectClass *object_class = (GObjectClass *)klass;
+  GtkWidgetClass *widget_class = (GtkWidgetClass *)klass;

-  object_class->constructed = phosh_layer_surface_constructed;
  object_class->dispose = phosh_layer_surface_dispose;
-
  object_class->set_property = phosh_layer_surface_set_property;
  object_class->get_property = phosh_layer_surface_get_property;

+  widget_class->realize = phosh_layer_surface_realize;
+  widget_class->map = phosh_layer_surface_map;
+  widget_class->unmap = phosh_layer_surface_unmap;
+
  props[PHOSH_LAYER_SURFACE_PROP_LAYER_SHELL] =
    g_param_spec_pointer (
      "layer-shell",
      "Wayland Layer Shell Global",
      "The layer shell wayland global",
-      G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);

  props[PHOSH_LAYER_SURFACE_PROP_WL_OUTPUT] =
    g_param_spec_pointer (
      "wl-output",
      "Wayland Output",
      "The wl_output associated with this surface",
-      G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);

  props[PHOSH_LAYER_SURFACE_PROP_ANCHOR] =
    g_param_spec_uint (
@ -389,7 +404,7 @@ phosh_layer_surface_class_init (PhoshLayerSurfaceClass *klass)
      0,
      G_MAXUINT,
      0,
-      G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);

  props[PHOSH_LAYER_SURFACE_PROP_LAYER] =
    g_param_spec_uint (
@ -399,7 +414,7 @@ phosh_layer_surface_class_init (PhoshLayerSurfaceClass *klass)
      0,
      G_MAXUINT,
      0,
-      G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_EXPLICIT_NOTIFY);

  props[PHOSH_LAYER_SURFACE_PROP_KBD_INTERACTIVITY] =
    g_param_spec_boolean (
@ -506,13 +521,13 @@ phosh_layer_surface_class_init (PhoshLayerSurfaceClass *klass)
      "Namespace",
      "Namespace of the layer surface",
      "",
-      G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);

  g_object_class_install_properties (object_class, PHOSH_LAYER_SURFACE_PROP_LAST_PROP, props);

  /**
-   * PhoshLayersurface::configured
-   * @self: The #PhoshLayersurface instance.
+   * PhoshLayerSurface::configured
+   * @self: The #PhoshLayerSurface instance.
   *
   * This signal is emitted once we received the configure event from the
   * compositor.
@ -539,11 +554,14 @@ phosh_layer_surface_new (gpointer layer_shell,
 {
  return g_object_new (PHOSH_TYPE_LAYER_SURFACE,
                       "layer-shell", layer_shell,
-                       "wl-output", wl_output);
+                       "wl-output", wl_output,
+                       NULL);
 }

+
 /**
 * phosh_layer_surface_get_surface:
+ * @self: The #PhoshLayerSurface
 *
 * Get the layer layer surface or #NULL if the window
 * is not yet realized.
@ -561,6 +579,7 @@ phosh_layer_surface_get_layer_surface(PhoshLayerSurface *self)

 /**
 * phosh_layer_surface_get_wl_surface:
+ * @self: The #PhoshLayerSurface
 *
 * Get the layer wayland surface or #NULL if the window
 * is not yet realized.
@ -575,16 +594,20 @@ phosh_layer_surface_get_wl_surface(PhoshLayerSurface *self)
  return priv->wl_surface;
 }

+
 /**
 * phosh_layer_surface_set_size:
+ * @self: The #PhoshLayerSurface
+ * @width: the height in pixels
+ * @height: the width in pixels
 *
 * Set the size of a layer surface. A value of '-1' indicates 'use old value'
 */
 void
-phosh_layer_surface_set_size(PhoshLayerSurface *self, gint width, gint height)
+phosh_layer_surface_set_size (PhoshLayerSurface *self, int width, int height)
 {
  PhoshLayerSurfacePrivate *priv;
-  gint old_width, old_height;
+  int old_width, old_height;

  g_return_if_fail (PHOSH_IS_LAYER_SURFACE (self));
  priv = phosh_layer_surface_get_instance_private (self);
@ -617,16 +640,22 @@ phosh_layer_surface_set_size(PhoshLayerSurface *self, gint width, gint height)
  }
 }

+
 /**
 * phosh_layer_surface_set_margins:
+ * @self: The #PhoshLayerSurface
+ * @top: the top margin in pixels
+ * @right: the right margin in pixels
+ * @bottom: the bottom margin in pixels
+ * @left: the left margin in pixels
 *
 * Set anchor margins of a layer surface.
 */
 void
-phosh_layer_surface_set_margins(PhoshLayerSurface *self, gint top, gint right, gint bottom, gint left)
+phosh_layer_surface_set_margins (PhoshLayerSurface *self, int top, int right, int bottom, int left)
 {
  PhoshLayerSurfacePrivate *priv;
-  gint old_top, old_bottom, old_left, old_right;
+  int old_top, old_bottom, old_left, old_right;

  g_return_if_fail (PHOSH_IS_LAYER_SURFACE (self));
  priv = phosh_layer_surface_get_instance_private (self);
@ -663,16 +692,19 @@ phosh_layer_surface_set_margins(PhoshLayerSurface *self, gint top, gint right, g
  }
 }

+
 /**
 * phosh_layer_surface_set_exclusive_zone:
+ * @self: The #PhoshLayerSurface
+ * @zone: Size of the exclusive zone.
 *
 * Set exclusive zone of a layer surface.
 */
 void
-phosh_layer_surface_set_exclusive_zone(PhoshLayerSurface *self, gint zone)
+phosh_layer_surface_set_exclusive_zone (PhoshLayerSurface *self, int zone)
 {
  PhoshLayerSurfacePrivate *priv;
-  gint old_zone;
+  int old_zone;

  g_return_if_fail (PHOSH_IS_LAYER_SURFACE (self));
  priv = phosh_layer_surface_get_instance_private (self);
@ -692,8 +724,11 @@ phosh_layer_surface_set_exclusive_zone(PhoshLayerSurface *self, gint zone)
  g_object_notify_by_pspec (G_OBJECT (self), props[PHOSH_LAYER_SURFACE_PROP_EXCLUSIVE_ZONE]);
 }

+
 /**
 * phosh_layer_surface_set_keyboard_interactivity:
+ * @self: The #PhoshLayerSurface
+ * @interactivity: %TRUE if the #PhoshLayerSurface should receive keyboard input.
 *
 * Set keyboard ineractivity a layer surface.
 */
@ -708,6 +743,7 @@ phosh_layer_surface_set_kbd_interactivity (PhoshLayerSurface *self, gboolean int
  if (priv->kbd_interactivity == interactivity) {
    return;
  }
+
  priv->kbd_interactivity = interactivity;

  if (priv->layer_surface) {
@ -717,8 +753,39 @@ phosh_layer_surface_set_kbd_interactivity (PhoshLayerSurface *self, gboolean int
  g_object_notify_by_pspec (G_OBJECT (self), props[PHOSH_LAYER_SURFACE_PROP_KBD_INTERACTIVITY]);
 }

+
+/**
+ * phosh_layer_surface_set_layer:
+ * @self: The #PhoshLayerSurface
+ * @layer: The layer.
+ *
+ * Sets the layer a layer-surface belongs to `layer`.
+ */
+void
+phosh_layer_surface_set_layer (PhoshLayerSurface *self, guint32 layer)
+{
+  PhoshLayerSurfacePrivate *priv;
+
+  g_return_if_fail (PHOSH_IS_LAYER_SURFACE (self));
+  priv = phosh_layer_surface_get_instance_private (self);
+
+  if (priv->layer == layer) {
+    return;
+  }
+
+  priv->layer = layer;
+
+  if (priv->layer_surface) {
+    zwlr_layer_surface_v1_set_layer (priv->layer_surface, layer);
+  }
+
+  g_object_notify_by_pspec (G_OBJECT (self), props[PHOSH_LAYER_SURFACE_PROP_LAYER]);
+}
+
+
 /**
 * phosh_layer_surface_wl_surface_commit:
+ * @self: The #PhoshLayerSurface
 *
 * Forces a commit of layer surface's state.
 */
@ -734,3 +801,53 @@ phosh_layer_surface_wl_surface_commit (PhoshLayerSurface *self)
    wl_surface_commit (priv->wl_surface);
  }
 }
+
+
+void
+phosh_layer_surface_get_margins (PhoshLayerSurface *self, int *top, int *right, int *bottom, int *left)
+{
+  PhoshLayerSurfacePrivate *priv;
+
+  g_return_if_fail (PHOSH_IS_LAYER_SURFACE (self));
+  priv = phosh_layer_surface_get_instance_private (self);
+
+  if (top) {
+    *top = priv->margin_top;
+  }
+
+  if (right) {
+    *right = priv->margin_right;
+  }
+
+  if (bottom) {
+    *bottom = priv->margin_bottom;
+  }
+
+  if (left) {
+    *left = priv->margin_left;
+  }
+}
+
+
+int
+phosh_layer_surface_get_configured_width (PhoshLayerSurface *self)
+{
+  PhoshLayerSurfacePrivate *priv;
+
+  g_return_val_if_fail (PHOSH_IS_LAYER_SURFACE (self), 0);
+  priv = phosh_layer_surface_get_instance_private (self);
+
+  return priv->configured_width;
+}
+
+
+int
+phosh_layer_surface_get_configured_height (PhoshLayerSurface *self)
+{
+  PhoshLayerSurfacePrivate *priv;
+
+  g_return_val_if_fail (PHOSH_IS_LAYER_SURFACE (self), 0);
+  priv = phosh_layer_surface_get_instance_private (self);
+
+  return priv->configured_height;
+}
--- a/eek/layersurface.h
+++ b/eek/layersurface.h
@ -1,14 +1,7 @@
 /*
 * Copyright (C) 2018 Purism SPC
 *
- * SPDX-License-Identifier: GPL-3.0+
- */
-
-
-/*
-
-WARNING: this file is taken directly from phosh, with no modificaions apart from this message. Please update phosh instead of changing this file. Please copy the file back here afterwards, with the same notice.
-
+ * SPDX-License-Identifier: GPL-3.0-or-later
 */

 #pragma once
@ -17,6 +10,8 @@ WARNING: this file is taken directly from phosh, with no modificaions apart from
 /* TODO: We use the enum constants from here, use glib-mkenums */
 #include "wlr-layer-shell-unstable-v1-client-protocol.h"

+G_BEGIN_DECLS
+
 #define PHOSH_TYPE_LAYER_SURFACE                 (phosh_layer_surface_get_type ())

 G_DECLARE_DERIVABLE_TYPE (PhoshLayerSurface, phosh_layer_surface, PHOSH, LAYER_SURFACE, GtkWindow)
@ -24,6 +19,7 @@ G_DECLARE_DERIVABLE_TYPE (PhoshLayerSurface, phosh_layer_surface, PHOSH, LAYER_S
 /**
 * PhoshLayerSurfaceClass
 * @parent_class: The parent class
+ * @configured: invoked when layer surface is configured
 */
 struct _PhoshLayerSurfaceClass
 {
@ -39,15 +35,26 @@ GtkWidget *phosh_layer_surface_new (gpointer layer_shell,
 struct     zwlr_layer_surface_v1 *phosh_layer_surface_get_layer_surface(PhoshLayerSurface *self);
 struct     wl_surface            *phosh_layer_surface_get_wl_surface(PhoshLayerSurface *self);
 void                              phosh_layer_surface_set_size(PhoshLayerSurface *self,
-                                                               gint width,
-                                                               gint height);
+                                                               int width,
+                                                               int height);
 void                              phosh_layer_surface_set_margins(PhoshLayerSurface *self,
-                                                                  gint top,
-                                                                  gint right,
-                                                                  gint bottom,
-                                                                  gint left);
+                                                                  int top,
+                                                                  int right,
+                                                                  int bottom,
+                                                                  int left);
 void                              phosh_layer_surface_set_exclusive_zone(PhoshLayerSurface *self,
-                                                                         gint zone);
+                                                                         int zone);
 void                              phosh_layer_surface_set_kbd_interactivity(PhoshLayerSurface *self,
                                                                            gboolean interactivity);
+void                              phosh_layer_surface_set_layer (PhoshLayerSurface *self,
+                                                                 guint32            layer);
 void                              phosh_layer_surface_wl_surface_commit (PhoshLayerSurface *self);
+void                              phosh_layer_surface_get_margins       (PhoshLayerSurface *self,
+                                                                         int               *top,
+                                                                         int               *right,
+                                                                         int               *bottom,
+                                                                         int               *left);
+int                               phosh_layer_surface_get_configured_width  (PhoshLayerSurface *self);
+int                               phosh_layer_surface_get_configured_height (PhoshLayerSurface *self);
+
+G_END_DECLS
--- a/eekboard/eekboard-context-service.c
+++ b/eekboard/eekboard-context-service.c
@ -57,7 +57,7 @@ struct _EekboardContextService {
    GObject parent;
    struct squeek_state_manager *state_manager; // shared reference

-    LevelKeyboard *keyboard; // currently used keyboard
+    Layout *keyboard; // currently used keyboard
    GSettings *settings; // Owned reference

    /// Needed for keymap changes after keyboard updates.
@ -126,10 +126,10 @@ settings_get_layout(GSettings *settings, char **type, char **layout)
    g_variant_unref(inputs);
 }

-void eekboard_context_service_set_layout(EekboardContextService *context, struct squeek_layout *layout, uint32_t timestamp) {
-    LevelKeyboard *keyboard = level_keyboard_new(layout);
+void eekboard_context_service_set_layout(EekboardContextService *context, char *style_name, struct squeek_layout *layout, uint32_t timestamp) {
+    Layout *keyboard = layout_new(style_name, layout);
    // set as current
-    LevelKeyboard *previous_keyboard = context->keyboard;
+    Layout *previous_keyboard = context->keyboard;
    context->keyboard = keyboard;
    // Update the keymap if necessary.
    // TODO: Update submission on change event
@ -142,7 +142,7 @@ void eekboard_context_service_set_layout(EekboardContextService *context, struct

    // replacing the keyboard above will cause the previous keyboard to get destroyed from the UI side (eek_gtk_keyboard_dispose)
    if (previous_keyboard) {
-        level_keyboard_free(previous_keyboard);
+        layout_free(previous_keyboard);
    }
 }

@ -264,7 +264,7 @@ eekboard_context_service_destroy (EekboardContextService *context)
 * Get keyboard currently active in @context.
 * Returns: (transfer none): an #EekKeyboard
 */
-LevelKeyboard *
+Layout *
 eekboard_context_service_get_keyboard (EekboardContextService *context)
 {
    return context->keyboard;
--- a/eekboard/eekboard-context-service.h
+++ b/eekboard/eekboard-context-service.h
@ -41,10 +41,10 @@ G_DECLARE_FINAL_TYPE(EekboardContextService, eekboard_context_service, EEKBOARD,
 EekboardContextService *eekboard_context_service_new(struct squeek_state_manager *state_manager);
 void eekboard_context_service_set_submission(EekboardContextService *context, struct submission *submission);
 void          eekboard_context_service_destroy (EekboardContextService *context);
-LevelKeyboard *eekboard_context_service_get_keyboard(EekboardContextService *context);
+Layout *eekboard_context_service_get_keyboard(EekboardContextService *context);

 void eekboard_context_service_set_keymap(EekboardContextService *context,
-                                         const LevelKeyboard *keyboard);
+                                         const Layout *keyboard);

 G_END_DECLS
 #endif  /* EEKBOARD_CONTEXT_SERVICE_H */
--- a/examples/find_orphan_layouts.rs
+++ b/examples/find_orphan_layouts.rs
@ -0,0 +1,53 @@
+/*! Tests if any layout files are not in use */
+
+extern crate rs;
+
+use rs::resources;
+use std::env;
+use std::error::Error;
+use std::ffi::OsStr;
+use std::fs;
+use std::path::{Path, PathBuf};
+
+enum Orphans {
+    None,
+    Present,
+}
+
+fn check(base: &Path, dir: &Path) -> Result<Orphans, Box<dyn Error>> {
+    let mut orphans = Orphans::None;
+    for entry in fs::read_dir(dir)? {
+        let entry = entry?;
+        let path = entry.path();
+
+        if entry.file_type()?.is_dir() {
+            check(base, &path)?;
+        } else {
+            if Some(OsStr::new("yaml")) == path.extension() {
+                let resource_path = path
+                    .strip_prefix(base).unwrap()
+                    .with_extension("");
+                let resource_path = resource_path
+                    .to_str().unwrap();
+                let resource_path = resource_path
+                    .strip_prefix('/').unwrap_or(resource_path);
+                if let None = resources::get_keyboard(resource_path) {
+                    println!("Data not registered in the resources file: {:?}", path);
+                    orphans = Orphans::Present;
+                }
+            }
+        }
+    }
+    Ok(orphans)
+}
+
+fn main() -> () {
+    let path = env::args().nth(1).expect("Provide a path");
+    let path = PathBuf::from(path);
+
+    match check(&path, &path) {
+        Err(e) => panic!("{:?}", e),
+        Ok(Orphans::Present) => panic!("Unregistered files present. Check the tutorial in doc/tutorial.md"),
+        _ => {},
+    }
+}
--- a/meson.build
+++ b/meson.build
@ -1,7 +1,7 @@
 project(
    'squeekboard',
    'c', 'rust',
-    version: '1.18.0',
+    version: '1.23.0',
    license: 'GPLv3',
    meson_version: '>=0.51.0',
    default_options: [
@ -99,12 +99,17 @@ cargo_toml_base = configure_file(
 cargo_patch = []

 if get_option('newer') == true
-    cargo_build_flags += ['--features', 'glib_v0_14']
+    cargo_build_flags += ['--features', 'glib_v0_14,zbus_v1_5,clap_v4']
    cargo_deps = files('Cargo.deps.newer')
+    cargo_lock = files('Cargo.lock.newer')
 else
    cargo_deps = files('Cargo.deps')
+    cargo_lock = []
    if get_option('online') == true
        cargo_patch = [files('Cargo.deps.online')]
+        if get_option('reset_lock') == true
+            cargo_lock = files('Cargo.lock')
+        endif
    endif
 endif

@ -116,6 +121,17 @@ cargo_toml = custom_target(
    capture: true,
 )

+cargo_deps = [cargo_toml]
+if get_option('online') == true and get_option('reset_lock') == true
+    cargo_lock = custom_target(
+        'Cargo.lock',
+        output: 'Cargo.lock',
+        command: [cat, cargo_lock],
+        capture: true,
+    )
+    cargo_deps += [cargo_lock]
+endif
+
 dep_cargo = find_program('cargo')
 cargo_script = find_program('cargo.sh')
 cargo_build = find_program('cargo_build.py')
--- a/meson_options.txt
+++ b/meson_options.txt
@ -7,6 +7,10 @@ option('tests',
       type: 'boolean', value: true,
       description: 'Whether to compile unit tests')

+option('find_orphans',
+       type: 'boolean', value: false,
+       description: 'Check if all present layout files are included in resources.')
+
 option('newer',
       type: 'boolean', value: false,
       description: 'Build with dependencies newer than those of Byzantium')
@ -15,6 +19,10 @@ option('online',
       type: 'boolean', value: true,
       description: 'Pull packages from the internet while building, as opposed to a local regstry.')
       
+option('reset_lock',
+       type: 'boolean', value: false,
+       description: 'Resets Cargo.lock to the one found in the source repo. Does not affect builds with online == false.')
+
 option('strict',
       type: 'boolean', value: true,
       description: 'Turn more warnings into errors')
--- a/po/LINGUAS
+++ b/po/LINGUAS
@ -1,12 +1,19 @@
+be
 ca
+cs
 de
+el
 es
+eu
 fa
 fi
 fr
 fur
 gl
 he
+hi
+hr
+ht
 hu
 it
 ka
--- a/po/be.po
+++ b/po/be.po
@ -0,0 +1,47 @@
+# Belarusian translation for squeekboard.
+# Copyright (C) 2023 squeekboard's COPYRIGHT HOLDER
+# This file is distributed under the same license as the squeekboard package.
+# Yuras Shumovich <shumovichy@gmail.com>, 2023.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: squeekboard master\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/World/Phosh/squeekboard/"
+"issues\n"
+"POT-Creation-Date: 2023-04-02 17:10+0000\n"
+"PO-Revision-Date: 2023-09-14 14:44+0300\n"
+"Last-Translator: Yuras Shumovich <shumovichy@gmail.com>\n"
+"Language-Team: Belarusian <i18n-bel-gnome@googlegroups.com>\n"
+"Language: be\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 "
+"&& n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Poedit 3.3.2\n"
+
+#. translators: This is a emmoji keyboard layout
+#: data/popover.ui:6
+msgid "Emoji"
+msgstr "Эмодзі"
+
+#. translators: This is a terminal keyboard layout
+#: data/popover.ui:12
+msgid "Terminal"
+msgstr "Тэрмінал"
+
+#: data/popover.ui:18
+msgid "Keyboard Settings"
+msgstr "Налады клавіятуры"
+
+#: data/sm.puri.Squeekboard.desktop.in.in:3
+msgid "Squeekboard"
+msgstr "Squeekboard"
+
+#: data/sm.puri.Squeekboard.desktop.in.in:4
+msgid "On Screen Keyboard"
+msgstr "Экранная клавіятура"
+
+#: data/sm.puri.Squeekboard.desktop.in.in:5
+msgid "An on screen virtual keyboard"
+msgstr "Віртуальная экранная клавіятура"
--- a/po/cs.po
+++ b/po/cs.po
@ -0,0 +1,46 @@
+# Czech translation for squeekboard.
+# Copyright (C) 2022 squeekboard's COPYRIGHT HOLDER
+# This file is distributed under the same license as the squeekboard package.
+# Daniel Rusek <mail@asciiwolf.com>, 2022.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: squeekboard master\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/World/Phosh/squeekboard/"
+"issues\n"
+"POT-Creation-Date: 2022-10-16 12:08+0000\n"
+"PO-Revision-Date: 2022-10-18 23:36+0200\n"
+"Last-Translator: Daniel Rusek <mail@asciiwolf.com>\n"
+"Language-Team: Czech <gnome-cs-list@gnome.org>\n"
+"Language: cs\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Poedit 3.1.1\n"
+
+#. translators: This is a emmoji keyboard layout
+#: data/popover.ui:6
+msgid "Emoji"
+msgstr "Emodži"
+
+#. translators: This is a terminal keyboard layout
+#: data/popover.ui:12
+msgid "Terminal"
+msgstr "Terminál"
+
+#: data/popover.ui:18
+msgid "Keyboard Settings"
+msgstr "Nastavení klávesnice"
+
+#: data/sm.puri.Squeekboard.desktop.in.in:3
+msgid "Squeekboard"
+msgstr "Squeekboard"
+
+#: data/sm.puri.Squeekboard.desktop.in.in:4
+msgid "On Screen Keyboard"
+msgstr "Klávesnice na obrazovce"
+
+#: data/sm.puri.Squeekboard.desktop.in.in:5
+msgid "An on screen virtual keyboard"
+msgstr "Přidat virtuální klávesnici na obrazovce"
--- a/po/de.po
+++ b/po/de.po
@ -2,21 +2,46 @@
 # Copyright (C) 2021 THE squeekboard'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the squeekboard package.
 # Automatically generated, 2021.
+# Jürgen Benvenuti <gastornis@posteo.org>, 2023.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: squeekboard\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-03 18:41+0100\n"
-"PO-Revision-Date: 2021-12-03 18:41+0100\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/World/Phosh/squeekboard/"
+"issues\n"
+"POT-Creation-Date: 2022-10-16 12:08+0000\n"
+"PO-Revision-Date: 2023-01-14 11:45+0100\n"
+"Last-Translator: Jürgen Benvenuti <gastornis@posteo.org>\n"
+"Language-Team: German <gnome-de@gnome-org>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ASCII\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 3.1.1\n"

-#: data/popup.ui:15
+#. translators: This is a emmoji keyboard layout
+#: data/popover.ui:6
+msgid "Emoji"
+msgstr "Emoji"
+
+#. translators: This is a terminal keyboard layout
+#: data/popover.ui:12
+msgid "Terminal"
+msgstr "Terminal"
+
+#: data/popover.ui:18
 msgid "Keyboard Settings"
 msgstr "Tastatureinstellungen"
+
+#: data/sm.puri.Squeekboard.desktop.in.in:3
+msgid "Squeekboard"
+msgstr "Squeekboard"
+
+#: data/sm.puri.Squeekboard.desktop.in.in:4
+msgid "On Screen Keyboard"
+msgstr "Bildschirmtastatur"
+
+#: data/sm.puri.Squeekboard.desktop.in.in:5
+msgid "An on screen virtual keyboard"
+msgstr "Eine virtuelle Bildschirmtastatur"
--- a/po/el.po
+++ b/po/el.po
@ -0,0 +1,46 @@
+# Greek translation for squeekboard.
+# Copyright (C) 2022 squeekboard's COPYRIGHT HOLDER
+# This file is distributed under the same license as the squeekboard package.
+# Efstathios Iosifidis <eiosifidis@gnome.org>, 2022.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: squeekboard master\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/World/Phosh/squeekboard/"
+"issues\n"
+"POT-Creation-Date: 2022-07-11 06:54+0000\n"
+"PO-Revision-Date: 2022-07-11 23:11+0300\n"
+"Last-Translator: Efstathios Iosifidis <eiosifidis@gnome.org>\n"
+"Language-Team: Greek <gnome-el-list@gnome.org>\n"
+"Language: el\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 3.1\n"
+
+#. translators: This is a emmoji keyboard layout
+#: data/popover.ui:6
+msgid "Emoji"
+msgstr "Emoji"
+
+#. translators: This is a terminal keyboard layout
+#: data/popover.ui:12
+msgid "Terminal"
+msgstr "Τερματικό"
+
+#: data/popover.ui:18
+msgid "Keyboard Settings"
+msgstr "Ρυθμίσεις πληκτρολογίου"
+
+#: data/sm.puri.Squeekboard.desktop.in.in:3
+msgid "Squeekboard"
+msgstr "Squeekboard"
+
+#: data/sm.puri.Squeekboard.desktop.in.in:4
+msgid "On Screen Keyboard"
+msgstr "Πληκτρολόγιο οθόνης"
+
+#: data/sm.puri.Squeekboard.desktop.in.in:5
+msgid "An on screen virtual keyboard"
+msgstr "Εικονικό πληκτρολόγιο οθόνης"
--- a/po/eu.po
+++ b/po/eu.po
@ -0,0 +1,42 @@
+# Basque translation for squeekboard.
+# Copyright (C) 2023 squeekboard's COPYRIGHT HOLDER
+# This file is distributed under the same license as the squeekboard package.
+# Asier Sarasua Garmendia <asiersarasua@ni.eus>, 2023.
+#
+msgid ""
+msgstr "Project-Id-Version: squeekboard master\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/World/Phosh/squeekboard/issues\n"
+"POT-Creation-Date: 2023-02-26 09:13+0000\n"
+"PO-Revision-Date: 2023-03-06 09:13+0000\n"
+"Last-Translator: Asier Sarasua Garmendia <asiersarasua@ni.eus>\n"
+"Language-Team: Basque <librezale@librezale.eus>\n"
+"Language: eu\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. translators: This is a emmoji keyboard layout
+#: data/popover.ui:6
+msgid "Emoji"
+msgstr "Emojia"
+
+#. translators: This is a terminal keyboard layout
+#: data/popover.ui:12
+msgid "Terminal"
+msgstr "Terminala"
+
+#: data/popover.ui:18
+msgid "Keyboard Settings"
+msgstr "Teklatuaren ezarpenak"
+
+#: data/sm.puri.Squeekboard.desktop.in.in:3
+msgid "Squeekboard"
+msgstr "Squeekboard"
+
+#: data/sm.puri.Squeekboard.desktop.in.in:4
+msgid "On Screen Keyboard"
+msgstr "Pantailako teklatua"
+
+#: data/sm.puri.Squeekboard.desktop.in.in:5
+msgid "An on screen virtual keyboard"
+msgstr "Gehitu pantailako teklatu birtuala"
--- a/po/hi.po
+++ b/po/hi.po
@ -0,0 +1,52 @@
+# Hindi translation for squeekboard.
+# Copyright (C) 2023 squeekboard's COPYRIGHT HOLDER
+# This file is distributed under the same license as the squeekboard package.
+# # Translators:
+# Hemish <hemish04082005@gmail.com>, 2023.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: squeekboard master\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/World/Phosh/squeekboard/"
+"issues\n"
+"POT-Creation-Date: 2023-01-31 11:38+0000\n"
+"PO-Revision-Date: 2023-02-02 23:11+0530\n"
+"Last-Translator: Hemish <hemish04082005@gmail.com>\n"
+"Language-Team: Hindi <indlinux-hindi@lists.sourceforge.net https://indlinux."
+"org/hindi>\n"
+"Language: hi\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"X-Generator: Gtranslator 42.0\n"
+"X-DL-Team: \n"
+"X-DL-Module: \n"
+"X-DL-Branch: \n"
+"X-DL-Domain: \n"
+
+#. translators: This is a emmoji keyboard layout
+#: data/popover.ui:6
+msgid "Emoji"
+msgstr "इमोजी"
+
+#. translators: This is a terminal keyboard layout
+#: data/popover.ui:12
+msgid "Terminal"
+msgstr "टर्मिनल"
+
+#: data/popover.ui:18
+msgid "Keyboard Settings"
+msgstr "कुंजीपट सेंटिग्स"
+
+#: data/sm.puri.Squeekboard.desktop.in.in:3
+msgid "Squeekboard"
+msgstr "स्क्वीकबोर्ड"
+
+#: data/sm.puri.Squeekboard.desktop.in.in:4
+msgid "On Screen Keyboard"
+msgstr "ऑनस्क्रीन कुंजीपट"
+
+#: data/sm.puri.Squeekboard.desktop.in.in:5
+msgid "An on screen virtual keyboard"
+msgstr "एक ऑनस्क्रीन वर्चुअल कुंजीपट"
--- a/po/hr.po
+++ b/po/hr.po
@ -0,0 +1,47 @@
+# Croatian translation for squeekboard.
+# Copyright (C) 2022 squeekboard's COPYRIGHT HOLDER
+# This file is distributed under the same license as the squeekboard package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: squeekboard master\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/World/Phosh/squeekboard/"
+"issues\n"
+"POT-Creation-Date: 2022-07-11 20:12+0000\n"
+"PO-Revision-Date: 2022-08-31 09:49+0200\n"
+"Last-Translator: \n"
+"Language-Team: Croatian <hr@li.org>\n"
+"Language: hr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 "
+"&& n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Poedit 3.1.1\n"
+
+#. translators: This is a emmoji keyboard layout
+#: data/popover.ui:6
+msgid "Emoji"
+msgstr "Smajli"
+
+#. translators: This is a terminal keyboard layout
+#: data/popover.ui:12
+msgid "Terminal"
+msgstr "Terminal"
+
+#: data/popover.ui:18
+msgid "Keyboard Settings"
+msgstr "Postavke tipkovnice"
+
+#: data/sm.puri.Squeekboard.desktop.in.in:3
+msgid "Squeekboard"
+msgstr "Squeekboard"
+
+#: data/sm.puri.Squeekboard.desktop.in.in:4
+msgid "On Screen Keyboard"
+msgstr "Zaslonska tipkovnica"
+
+#: data/sm.puri.Squeekboard.desktop.in.in:5
+msgid "An on screen virtual keyboard"
+msgstr "Zaslonska virtualna tipkovnica"
--- a/po/ht.po
+++ b/po/ht.po
@ -0,0 +1,45 @@
+# Squeekboard Haitian Creole Translation
+# Copyright (C) 2024 Purism
+# This file is distributed under the same license as the squeekboard package.
+# Pierre Michel Augustin <pierremichelaugustin@gnuhealth.org>, 2024.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/World/Phosh/squeekboard/"
+"issues\n"
+"POT-Creation-Date: 2024-01-11 05:05+0000\n"
+"PO-Revision-Date: 2024-01-11 10:40-0500\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"Language: ht\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 3.0.1\n"
+
+#. translators: This is a emmoji keyboard layout
+#: data/popover.ui:6
+msgid "Emoji"
+msgstr "Emoji"
+
+#. translators: This is a terminal keyboard layout
+#: data/popover.ui:12
+msgid "Terminal"
+msgstr "Tèminal"
+
+#: data/popover.ui:18
+msgid "Keyboard Settings"
+msgstr "Paramèt Klavye yo"
+
+#: data/sm.puri.Squeekboard.desktop.in.in:3
+msgid "Squeekboard"
+msgstr "Squeekboard"
+
+#: data/sm.puri.Squeekboard.desktop.in.in:4
+msgid "On Screen Keyboard"
+msgstr "Sou Ekran Klavye"
+
+#: data/sm.puri.Squeekboard.desktop.in.in:5
+msgid "An on screen virtual keyboard"
+msgstr "Sou yon ekran klavye vityèl"
--- a/protocols/wlr-layer-shell-unstable-v1.xml
+++ b/protocols/wlr-layer-shell-unstable-v1.xml
@ -25,7 +25,7 @@
    THIS SOFTWARE.
  </copyright>

-  <interface name="zwlr_layer_shell_v1" version="1">
+  <interface name="zwlr_layer_shell_v1" version="4">
    <description summary="create surfaces that are layers of the desktop">
      Clients can use this interface to assign the surface_layer role to
      wl_surfaces. Such surfaces are assigned to a "layer" of the output and
@ -47,6 +47,12 @@
        or manipulate a buffer prior to the first layer_surface.configure call
        must also be treated as errors.

+        After creating a layer_surface object and setting it up, the client
+        must perform an initial commit without any buffer attached.
+        The compositor will reply with a layer_surface.configure event.
+        The client must acknowledge it and is then allowed to attach a buffer
+        to map the surface.
+
        You may pass NULL for output to allow the compositor to decide which
        output to use. Generally this will be the one that the user most
        recently interacted with.
@ -82,17 +88,35 @@
      <entry name="top" value="2"/>
      <entry name="overlay" value="3"/>
    </enum>
+
+    <!-- Version 3 additions -->
+
+    <request name="destroy" type="destructor" since="3">
+      <description summary="destroy the layer_shell object">
+        This request indicates that the client will not use the layer_shell
+        object any more. Objects that have been created through this instance
+        are not affected.
+      </description>
+    </request>
  </interface>

-  <interface name="zwlr_layer_surface_v1" version="1">
+  <interface name="zwlr_layer_surface_v1" version="4">
    <description summary="layer metadata interface">
      An interface that may be implemented by a wl_surface, for surfaces that
      are designed to be rendered as a layer of a stacked desktop-like
      environment.

-      Layer surface state (size, anchor, exclusive zone, margin, interactivity)
-      is double-buffered, and will be applied at the time wl_surface.commit of
-      the corresponding wl_surface is called.
+      Layer surface state (layer, size, anchor, exclusive zone,
+      margin, interactivity) is double-buffered, and will be applied at the
+      time wl_surface.commit of the corresponding wl_surface is called.
+
+      Attaching a null buffer to a layer surface unmaps it.
+
+      Unmapping a layer_surface means that the surface cannot be shown by the
+      compositor until it is explicitly mapped again. The layer_surface
+      returns to the state it had right after layer_shell.get_layer_surface.
+      The client can re-map the surface by performing a commit without any
+      buffer attached, waiting for a configure event and handling it as usual.
    </description>

    <request name="set_size">
@ -127,14 +151,19 @@

    <request name="set_exclusive_zone">
      <description summary="configures the exclusive geometry of this surface">
-        Requests that the compositor avoids occluding an area of the surface
-        with other surfaces. The compositor's use of this information is
+        Requests that the compositor avoids occluding an area with other
+        surfaces. The compositor's use of this information is
        implementation-dependent - do not assume that this region will not
        actually be occluded.

-        A positive value is only meaningful if the surface is anchored to an
-        edge, rather than a corner. The zone is the number of surface-local
-        coordinates from the edge that is considered exclusive.
+        A positive value is only meaningful if the surface is anchored to one
+        edge or an edge and both perpendicular edges. If the surface is not
+        anchored, anchored to only two perpendicular edges (a corner), anchored
+        to only two parallel edges or anchored to all edges, a positive value
+        will be treated the same as zero.
+
+        A positive zone is the distance from the edge in surface-local
+        coordinates to consider exclusive.

        Surfaces that do not wish to have an exclusive zone may instead specify
        how they should interact with surfaces that do. If set to zero, the
@ -174,21 +203,85 @@
      <arg name="left" type="int"/>
    </request>

+    <enum name="keyboard_interactivity">
+      <description summary="types of keyboard interaction possible for a layer shell surface">
+        Types of keyboard interaction possible for layer shell surfaces. The
+        rationale for this is twofold: (1) some applications are not interested
+        in keyboard events and not allowing them to be focused can improve the
+        desktop experience; (2) some applications will want to take exclusive
+        keyboard focus.
+      </description>
+
+      <entry name="none" value="0">
+        <description summary="no keyboard focus is possible">
+          This value indicates that this surface is not interested in keyboard
+          events and the compositor should never assign it the keyboard focus.
+
+          This is the default value, set for newly created layer shell surfaces.
+
+          This is useful for e.g. desktop widgets that display information or
+          only have interaction with non-keyboard input devices.
+        </description>
+      </entry>
+      <entry name="exclusive" value="1">
+        <description summary="request exclusive keyboard focus">
+          Request exclusive keyboard focus if this surface is above the shell surface layer.
+
+          For the top and overlay layers, the seat will always give
+          exclusive keyboard focus to the top-most layer which has keyboard
+          interactivity set to exclusive. If this layer contains multiple
+          surfaces with keyboard interactivity set to exclusive, the compositor
+          determines the one receiving keyboard events in an implementation-
+          defined manner. In this case, no guarantee is made when this surface
+          will receive keyboard focus (if ever).
+
+          For the bottom and background layers, the compositor is allowed to use
+          normal focus semantics.
+
+          This setting is mainly intended for applications that need to ensure
+          they receive all keyboard events, such as a lock screen or a password
+          prompt.
+        </description>
+      </entry>
+      <entry name="on_demand" value="2" since="4">
+        <description summary="request regular keyboard focus semantics">
+          This requests the compositor to allow this surface to be focused and
+          unfocused by the user in an implementation-defined manner. The user
+          should be able to unfocus this surface even regardless of the layer
+          it is on.
+
+          Typically, the compositor will want to use its normal mechanism to
+          manage keyboard focus between layer shell surfaces with this setting
+          and regular toplevels on the desktop layer (e.g. click to focus).
+          Nevertheless, it is possible for a compositor to require a special
+          interaction to focus or unfocus layer shell surfaces (e.g. requiring
+          a click even if focus follows the mouse normally, or providing a
+          keybinding to switch focus between layers).
+
+          This setting is mainly intended for desktop shell components (e.g.
+          panels) that allow keyboard interaction. Using this option can allow
+          implementing a desktop shell that can be fully usable without the
+          mouse.
+        </description>
+      </entry>
+    </enum>
+
    <request name="set_keyboard_interactivity">
      <description summary="requests keyboard events">
-        Set to 1 to request that the seat send keyboard events to this layer
-        surface. For layers below the shell surface layer, the seat will use
-        normal focus semantics. For layers above the shell surface layers, the
-        seat will always give exclusive keyboard focus to the top-most layer
-        which has keyboard interactivity set to true.
+        Set how keyboard events are delivered to this surface. By default,
+        layer shell surfaces do not receive keyboard events; this request can
+        be used to change this.
+
+        This setting is inherited by child surfaces set by the get_popup
+        request.

        Layer surfaces receive pointer, touch, and tablet events normally. If
        you do not want to receive them, set the input region on your surface
        to an empty region.

-        Events is double-buffered, see wl_surface.commit.
+        Keyboard interactivity is double-buffered, see wl_surface.commit.
      </description>
-      <arg name="keyboard_interactivity" type="uint"/>
+      <arg name="keyboard_interactivity" type="uint" enum="keyboard_interactivity"/>
    </request>

    <request name="get_popup">
@ -273,6 +366,7 @@
      <entry name="invalid_surface_state" value="0" summary="provided surface state is invalid"/>
      <entry name="invalid_size" value="1" summary="size is invalid"/>
      <entry name="invalid_anchor" value="2" summary="anchor bitfield is invalid"/>
+      <entry name="invalid_keyboard_interactivity" value="3" summary="keyboard interactivity is invalid"/>
    </enum>

    <enum name="anchor" bitfield="true">
@ -281,5 +375,16 @@
      <entry name="left" value="4" summary="the left edge of the anchor rectangle"/>
      <entry name="right" value="8" summary="the right edge of the anchor rectangle"/>
    </enum>
+
+    <!-- Version 2 additions -->
+
+    <request name="set_layer" since="2">
+      <description summary="change the layer of the surface">
+        Change the layer that the surface is rendered on.
+
+        Layer is double-buffered, see wl_surface.commit.
+      </description>
+      <arg name="layer" type="uint" enum="zwlr_layer_shell_v1.layer" summary="layer to move this surface to"/>
+    </request>
  </interface>
 </protocol>
--- a/squeekboard.doap
+++ b/squeekboard.doap
@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Project xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" xmlns="http://usefulinc.com/ns/doap#" xmlns:foaf="http://xmlns.com/foaf/0.1/" xmlns:admin="http://webns.net/mvcb/">
 <name>squeekboard</name>
- <shortdesc>A Wayland virtual keyboard</shortdesc>
- <description>A virtual keyboard supporting Wayland, built primarily for the Librem 5 phone.</description>
- <homepage rdf:resource="https://source.puri.sm/Librem5/squeekboard" />
- <bug-database rdf:resource="https://source.puri.sm/Librem5/squeekboard/issues" />
+ <shortdesc>A virtual keyboard for Wayland</shortdesc>
+ <description>An on-screen-keyboard input method for Wayland</description>
+ <homepage rdf:resource="https://gitlab.gnome.org/World/Phosh/squeekboard" />
+ <bug-database rdf:resource="https://gitlab.gnome.org/World/Phosh/squeekboard/issues" />
 <os>Linux</os>
 <license rdf:resource="http://usefulinc.com/doap/licenses/gpl" />
 <maintainer>
--- a/src/actors/external/debug.rs
+++ b/src/actors/external/debug.rs
@ -3,19 +3,20 @@
 *
 * SPDX-License-Identifier: GPL-3.0-or-later
 */
+use crate::main;
+use crate::state;
+
 use std::thread;
 use zbus::{Connection, ObjectServer, dbus_interface, fdo};

-use crate::event_loop;
-use crate::state;
-
+use super::Void;

 use std::convert::TryInto;


 /// Accepts commands controlling the debug mode
 struct Manager {
-    sender: event_loop::driver::Threaded,
+    sender: main::EventLoop,
    enabled: bool,
 }

@ -37,7 +38,7 @@ impl Manager {
    }
 }

-fn start(mgr: Manager) -> Result<(), Box<dyn std::error::Error>> {
+fn start(mgr: Manager) -> Result<Void, Box<dyn std::error::Error>> {
    let connection = Connection::new_session()?;
    fdo::DBusProxy::new(&connection)?.request_name(
        "sm.puri.SqueekDebug",
@ -54,7 +55,7 @@ fn start(mgr: Manager) -> Result<(), Box<dyn std::error::Error>> {
    }
 }

-pub fn init(sender: event_loop::driver::Threaded) {
+pub fn init(sender: main::EventLoop) {
    let mgr = Manager {
        sender,
        enabled: false,
--- a/src/actors/external/mod.rs
+++ b/src/actors/external/mod.rs
@ -0,0 +1,14 @@
+/*
+ * Copyright (C) 2022 Purism SPC
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+/*! Contains actors with custom event loops, not based off of the event_loop module. */
+ 
+pub mod debug;
+#[cfg(feature = "zbus_v1_5")]
+pub mod screensaver;
+
+/// The uninhabited type. Cannot be created or returned; means "will never return" as return type. Useful for infinite loops.
+enum Void {}
--- a/src/actors/external/screensaver.rs
+++ b/src/actors/external/screensaver.rs
@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2022 Purism SPC
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+use crate::actors::Destination;
+use crate::actors::popover;
+use crate::logging;
+use std::thread;
+use zbus::{Connection, dbus_proxy};
+
+use super::Void;
+
+
+#[dbus_proxy(
+    interface = "org.freedesktop.ScreenSaver",
+    default_service = "org.freedesktop.ScreenSaver",
+    default_path = "/org/freedesktop/ScreenSaver"
+)]
+pub trait Manager {
+    #[dbus_proxy(signal)]
+    fn active_changed(&self, active: bool) -> fdo::Result<()>;
+}
+
+/// Listens to screensaver (screen lock) changes
+pub fn init(destination: popover::Destination) {
+    thread::spawn(move || {
+        if let Err(e) = start(destination) {
+            log_print!(
+                logging::Level::Surprise,
+                "Could not track screensaver status, giving up: {:?}",
+                e,
+            );
+        }
+    });
+}
+
+fn start(destination: popover::Destination) -> Result<Void, zbus::Error> {
+    let conn = Connection::new_session()?;
+    let manager = ManagerProxy::new(&conn)?;
+
+    manager.connect_active_changed(move |m| {
+        destination.send(popover::Event::ScreensaverActive(m));
+        Ok(())
+    })?;
+
+    loop {
+        match manager.next_signal() {
+            Ok(None) => {}
+            other => log_print!(
+                logging::Level::Bug,
+                "Encountered unhandled event: {:?}",
+                other,
+            ),
+        }
+    }
+}
--- a/src/actors/mod.rs
+++ b/src/actors/mod.rs
@ -20,4 +20,14 @@ and by receiving updates from it.
 // Panel contains state and logic to protect the main state from getting flooded
 // with low-level wayland and gtk sizing events.

+pub mod external;
 pub mod popover;
+
+/// The implementing actor is able to receive and handle messages.
+/// Typically, it's the sending end of the channel,
+/// whose other end is inside an event loop.
+// TODO: implement for remaning actors and make the event loop refer to this.
+pub trait Destination {
+    type Event;
+    fn send(&self, event: Self::Event);
+}
--- a/src/actors/popover.rs
+++ b/src/actors/popover.rs
@ -11,30 +11,66 @@ but it cannot get the user-selected overlay, because it's stored in state.
 To solve this, overlay will be cached in the popover actor,
 and updated by main state every time it changes.
 */
+use crate::logging;
+use std::borrow::BorrowMut;
+use std::sync::{Arc, Mutex};

 pub mod c {
    use super::*;
-    use crate::util::c::Wrapped;
-    /// The mutable instance of state
-    pub type Actor = Wrapped<State>;
+    use crate::util::c::ArcWrapped;
+    /// The mutable instance of state.
+    /// Thread-safe because this actor does not get its own event loop,
+    /// and therefore can't have a channel to receive messages,
+    /// so instead messages will be passed directly to the mutexed actor.
+    pub type Actor = ArcWrapped<State>;
 }

-#[derive(Clone)]
+pub type Destination = Arc<Mutex<State>>;
+
+#[derive(Debug)]
+pub enum Event {
+    Overlay(Option<String>),
+    ScreensaverActive(bool),
+}
+
+impl super::Destination for Destination {
+    type Event = Event;
+    fn send(&self, event: Self::Event) {
+        let actor = self.lock();
+        match actor {
+            Ok(mut actor) => {
+                let actor = actor.borrow_mut();
+                **actor = actor.clone().handle_event(event);
+            },
+            Err(e) => log_print!(
+                logging::Level::Bug,
+                "Cannot lock popover state: {:?}",
+                e,
+            ),
+        }
+    }
+}
+
+#[derive(Clone, Debug)]
 pub struct State {
    pub overlay: Option<String>,
+    /// Settings button active
+    pub settings_active: bool,
 }

 impl State {
-    pub fn new() -> Self {
-        Self { overlay: None }
+    pub fn new(settings_active: bool) -> Self {
+        Self {
+            overlay: None,
+            settings_active,
        }
    }
    
-pub fn set_overlay(
-    actor: &c::Actor,
-    overlay: Option<String>,
-) {
-    let actor = actor.clone_ref();
-    let mut actor = actor.borrow_mut();
-    actor.overlay = overlay;
+    fn handle_event(mut self, event: Event) -> Self {
+        match event {
+            Event::Overlay(overlay) => { self.overlay = overlay; },
+            Event::ScreensaverActive(lock_active) => { self.settings_active = !lock_active; },
+        };
+        self
+    }
 }
--- a/src/assert_matches.rs
+++ b/src/assert_matches.rs
@ -95,56 +95,56 @@ DEALINGS IN THE SOFTWARE.
 /// ```
 #[macro_export]
 macro_rules! assert_matches {
-    ( $e:expr , $($pat:pat)|+ ) => {
+    ( $e:expr , $($pat:pat_param)|+ ) => {
        match $e {
            $($pat)|+ => (),
            ref e => panic!("assertion failed: `{:?}` does not match `{}`",
                e, stringify!($($pat)|+))
        }
    };
-    ( $e:expr , $($pat:pat)|+ if $cond:expr ) => {
+    ( $e:expr , $($pat:pat_param)|+ if $cond:expr ) => {
        match $e {
            $($pat)|+ if $cond => (),
            ref e => panic!("assertion failed: `{:?}` does not match `{}`",
                e, stringify!($($pat)|+ if $cond))
        }
    };
-    ( $e:expr , $($pat:pat)|+ => $arm:expr ) => {
+    ( $e:expr , $($pat:pat_param)|+ => $arm:expr ) => {
        match $e {
            $($pat)|+ => $arm,
            ref e => panic!("assertion failed: `{:?}` does not match `{}`",
                e, stringify!($($pat)|+))
        }
    };
-    ( $e:expr , $($pat:pat)|+ if $cond:expr => $arm:expr ) => {
+    ( $e:expr , $($pat:pat_param)|+ if $cond:expr => $arm:expr ) => {
        match $e {
            $($pat)|+ if $cond => $arm,
            ref e => panic!("assertion failed: `{:?}` does not match `{}`",
                e, stringify!($($pat)|+ if $cond))
        }
    };
-    ( $e:expr , $($pat:pat)|+ , $($arg:tt)* ) => {
+    ( $e:expr , $($pat:pat_param)|+ , $($arg:tt)* ) => {
        match $e {
            $($pat)|+ => (),
            ref e => panic!("assertion failed: `{:?}` does not match `{}`: {}",
                e, stringify!($($pat)|+), format_args!($($arg)*))
        }
    };
-    ( $e:expr , $($pat:pat)|+ if $cond:expr , $($arg:tt)* ) => {
+    ( $e:expr , $($pat:pat_param)|+ if $cond:expr , $($arg:tt)* ) => {
        match $e {
            $($pat)|+ if $cond => (),
            ref e => panic!("assertion failed: `{:?}` does not match `{}`: {}",
                e, stringify!($($pat)|+ if $cond), format_args!($($arg)*))
        }
    };
-    ( $e:expr , $($pat:pat)|+ => $arm:expr , $($arg:tt)* ) => {
+    ( $e:expr , $($pat:pat_param)|+ => $arm:expr , $($arg:tt)* ) => {
        match $e {
            $($pat)|+ => $arm,
            ref e => panic!("assertion failed: `{:?}` does not match `{}`: {}",
                e, stringify!($($pat)|+), format_args!($($arg)*))
        }
    };
-    ( $e:expr , $($pat:pat)|+ if $cond:expr => $arm:expr , $($arg:tt)* ) => {
+    ( $e:expr , $($pat:pat_param)|+ if $cond:expr => $arm:expr , $($arg:tt)* ) => {
        match $e {
            $($pat)|+ if $cond => $arm,
            ref e => panic!("assertion failed: `{:?}` does not match `{}`: {}",
--- a/src/bin/test_layout.rs
+++ b/src/bin/test_layout.rs
@ -5,12 +5,28 @@ extern crate rs;
 use rs::tests::check_layout_file;

 fn main() -> () {
+    #[cfg(feature = "clap_v4")]
+    let matches = clap::Command::new("squeekboard-test-layout")
+        .about("Test keyboard layout for errors. Returns OK or an error message containing further information.")
+        .arg(
+            clap::Arg::new("INPUT")
+                .required(true)
+                .help("Yaml keyboard layout file to test")
+        )
+        .get_matches();
+    #[cfg(feature = "clap_v4")]
+    let m = matches.get_one::<String>("INPUT");
+
+    #[cfg(not(feature = "clap_v4"))]
    let matches = clap_app!(test_layout =>
        (name: "squeekboard-test-layout")
        (about: "Test keyboard layout for errors. Returns OK or an error message containing further information.")
        (@arg INPUT: +required "Yaml keyboard layout file to test")
    ).get_matches();
-    if check_layout_file(matches.value_of("INPUT").unwrap()) == () {
+    #[cfg(not(feature = "clap_v4"))]
+    let m = matches.value_of("INPUT");
+
+    if check_layout_file(m.unwrap()) == () {
        println!("Test result: OK");
    }
 }
--- a/src/data/loading.rs
+++ b/src/data/loading.rs
@ -192,7 +192,7 @@ fn iter_layout_sources(
 }

 fn load_layout_data(source: DataSource)
-    -> Result<::layout::LayoutData, LoadError>
+    -> Result<crate::layout::LayoutParseData, LoadError>
 {
    let handler = logging::Print {};
    match source {
@ -217,7 +217,7 @@ fn load_layout_data_with_fallback(
    kind: ArrangementKind,
    purpose: ContentPurpose,
    overlay: Option<&str>,
-) -> (ArrangementKind, layout::LayoutData) {
+) -> (ArrangementKind, layout::LayoutParseData) {

    // Build the path to the right keyboard layout subdirectory
    let path = env::var_os("SQUEEKBOARD_KEYBOARDSDIR")
@ -253,14 +253,14 @@ fn load_layout_data_with_fallback(
 }

 pub fn load_layout(
-    name: String,
+    name: &String,
    kind: ArrangementKind,
    variant: ContentPurpose,
-    overlay: Option<String>,
+    overlay: &Option<String>,
 ) -> layout::Layout {
    let overlay = overlay.as_ref().map(String::as_str);
    let (found_kind, layout)
-        = load_layout_data_with_fallback(&name, kind, variant, overlay);
+        = load_layout_data_with_fallback(name, kind, variant, overlay);
    layout::Layout::new(layout, found_kind, variant)
 }

@ -268,7 +268,7 @@ pub fn load_layout(
 mod tests {
    use super::*;

-    use ::logging::ProblemPanic;
+    use crate::logging::ProblemPanic;

    #[test]
    fn parsing_fallback() {
--- a/Show More
+++ b/Show More