Merge branch 'release-1.38.0' into 'main'

Release Squeekboard 1.38.0

See merge request World/Phosh/squeekboard!631

.gitlab-ci.yml

@@ -1,4 +1,21 @@
-image: pureos/byzantium
+image: debian:trixie
+
+variables:
+  DEBIAN_FRONTEND: noninteractive
+
+default:
+  # Protect CI infra from rogue jobs
+  timeout: 15 minutes
+  # Allow jobs to be caneled on new commits
+  interruptible: true
+  # Retry on infra hickups automatically
+  retry:
+    max: 1
+    when:
+      - api_failure
+      - runner_system_failure
+      - scheduler_failure
+      - stuck_or_timeout_failure
 
 stages:
   - build
@@ -6,6 +23,7 @@ stages:
   - deploy
 
 before_script:
+  - echo "deb http://deb.debian.org/debian/ experimental main" > /etc/apt/sources.list.d/experimental.list
   - apt-get -y update
   - apt-get -y install ca-certificates
 
@@ -15,22 +33,20 @@ build_docs:
     paths:
       - _build
   script:
-    - apt-get -y install python3-pip python3-sphinx
-    - pip3 install recommonmark
+    - apt-get -y install --on-install-recommends python3-pip python3-sphinx python3-recommonmark
     - ./doc/build.sh _build
   except:
     variables:
       - $PKG_ONLY == "1"
 
 build_meson:
-  image: debian:bookworm
   stage: build
   artifacts:
     paths:
       - _build
     expire_in: 3h
   script:
-    - mv debian/control-newer debian/control
+    - apt-get -y install -t experimental librust-serde-yaml-dev
     - apt-get -y build-dep .
     - meson . _build/ -Ddepdatadir=/usr/share -Dfind_orphans=true --werror
     - ninja -C _build install
@@ -39,24 +55,6 @@ build_meson:
       - $PKG_ONLY == "1"
 
 build_deb:
-  stage: build
-  artifacts:
-    paths:
-      - '*.deb'
-  script:
-    - rm -f ../*.deb
-    - apt-get -y build-dep .
-    - apt-get -y install devscripts
-    - REV=$(git log -1 --format=%h)
-    - VER=$(dpkg-parsechangelog -SVersion)
-    - DEBFULLNAME="Librem5 CI"
-    - EMAIL="librem5-builds@lists.community.puri.sm"
-    - dch -v"$VER+librem5ci$CI_PIPELINE_ID.$REV" "$MSG"
-    - debuild -i -us -uc -b
-    - cp ../*.deb .
-
-build_deb:arm64:
-  image: pureos/byzantium
   tags:
     - aarch64
   stage: build
@@ -65,28 +63,7 @@ build_deb:arm64:
       - '*.deb'
   script:
     - rm -f ../*.deb
-    - apt-get -y build-dep .
-    - apt-get -y install devscripts
-    - REV=$(git log -1 --format=%h)
-    - VER=$(dpkg-parsechangelog -SVersion)
-    - DEBFULLNAME="Librem5 CI"
-    - EMAIL="librem5-builds@lists.community.puri.sm"
-    - dch -v"$VER+librem5ci$CI_PIPELINE_ID.$REV" "$MSG"
-    - debuild -i -us -uc -b
-    - cp ../*.deb .
-
-build_deb:future:
-  image: debian:bookworm
-  allow_failure: true
-  tags:
-    - aarch64
-  stage: build
-  artifacts:
-    paths:
-      - '*.deb'
-  script:
-    - rm -f ../*.deb
-    - mv debian/control-newer debian/control
+    - apt-get -y install -t experimental librust-serde-yaml-dev
     - apt-get -y build-dep .
     - apt-get -y install devscripts
     - REV=$(git log -1 --format=%h)
@@ -98,7 +75,6 @@ build_deb:future:
     - cp ../*.deb .
 
 build_reference:
-  image: debian:bookworm
   stage: build
   needs:
     - job: build_meson
@@ -107,33 +83,22 @@ build_reference:
     paths:
       - _build/doc
   script:
+    - apt-get -y install -t experimental librust-serde-yaml-dev
+    - apt-get -y build-dep .
     - apt-get -y install cargo
     - cd _build
-    - ../cargo.sh doc --no-deps --document-private-items
-  except:
-    variables:
-      - $PKG_ONLY == "1"
-
-test_lintian:
-  stage: test
-  needs:
-    - job: build_deb
-      artifacts: true
-  script:
-    - apt-get -y install lintian
-    - lintian *.deb
+    - ../cargo.sh doc --no-deps --document-private-items --features 'zbus_v1_5,clap_v4'
   except:
     variables:
       - $PKG_ONLY == "1"
 
 test:
-  image: debian:bookworm
   stage: test
   needs:
     - job: build_meson
       artifacts: true
   script:
-    - mv debian/control-newer debian/control
+    - apt-get -y install -t experimental librust-serde-yaml-dev
     - apt-get -y build-dep .
     - apt-get -y install clang-tidy
     - ninja -C _build test
@@ -146,6 +111,7 @@ test_style:
   stage: test
   needs: []
   script:
+    - apt-get -y install -t experimental librust-serde-yaml-dev
     - apt-get -y build-dep .
     - tools/style-check_source
   except:
@@ -157,7 +123,7 @@ check_release:
   needs: []
   only:
     refs:
-      - master
+      - main
   script:
     - apt-get -y install git python3
     - (head -n 1 ./debian/changelog && git tag) | ./debian/check_release.py
@@ -177,4 +143,4 @@ pages:
       - public
   only:
     refs:
-      - master
+      - main

Cargo.deps

@@ -1,36 +0,0 @@
-# Dependencies which change based on build flags
-bitflags = "1.2.*"
-clap = { version = "2.33.*", default-features = false }
-zbus = "1.0.*"
-zvariant = "2.0.*"
-# Newer versions seem to confuse the version of Cargo on Debian Bullseye
-zvariant_derive = "2.0.*"
-
-[dependencies.cairo-rs]
-version = "0.7.*"
-
-[dependencies.cairo-sys-rs]
-version = "0.9"
-
-[dependencies.gdk]
-version = "0.11.*"
-
-[dependencies.gio]
-version = "0.7.*"
-features = ["v2_44"]
-
-[dependencies.glib]
-version = "0.8.*"
-features = ["v2_44"]
-
-[dependencies.glib-sys]
-version = "*"
-features = ["v2_44"]
-
-[dependencies.gtk]
-version = "0.7.*"
-features = ["v3_22"]
-
-[dependencies.gtk-sys]
-version = "0.9"
-features = ["v3_22"]

Cargo.deps.newer

@@ -1,38 +0,0 @@
-# Dependencies and tools which change based on build flags
-# For the newer-than-Byzantium config
-
-bitflags = "1.3.*"
-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
-zvariant_derive = "2.10.*"
-
-[dependencies.cairo-rs]
-version = "0.14.*"
-
-[dependencies.cairo-sys-rs]
-version = "0.14.*"
-
-[dependencies.gdk]
-version = "0.14.*"
-
-[dependencies.gio]
-version = "0.14.*"
-features = ["v2_58"]
-
-[dependencies.glib]
-version = "0.14.*"
-features = ["v2_58"]
-
-[dependencies.glib-sys]
-version = "0.14.*"
-features = ["v2_58"]
-
-[dependencies.gtk]
-version = "0.14.*"
-features = ["v3_22"]
-
-[dependencies.gtk-sys]
-version = "0.14.*"
-features = ["v3_22"]

Cargo.deps.online

@@ -1,4 +0,0 @@
-# Dependencies which are only used with online, crates.io builds.
-[patch.crates-io]
-# Dependency was yanked, but gio 0.7 needs it.
-fragile = { git = "https://source.puri.sm/dorota.czaplejewicz/fragile.git", tag = "0.3.0" }

Cargo.toml

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

Cargo.toml.in

@@ -1,35 +0,0 @@
-[package]
-name = "rs"
-version = "0.1.0"
-edition = "2021"
-
-[lib]
-name = "rs"
-path = "@path@/src/lib.rs"
-crate-type = ["staticlib", "rlib"]
-
-# Cargo can't do autodiscovery if Cargo.toml is not in the root.
-[[bin]]
-name = "test_layout"
-path = "@path@/src/bin/test_layout.rs"
-
-[[example]]
-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]
-maplit = "1.0.*"
-serde = { version = "1.0.*", features = ["derive"] }
-serde_yaml = "0.8.*"
-xkbcommon = { version = "0.4.*", features = ["wayland"] }
-# Here is inserted the Cargo.deps file

NEWS.md

@@ -1,3 +1,27 @@
+1.38.0
+------------------
+
+Changes:
+- 25 wide shapes have been added, so that every available layout now has a wide shape
+- "PgUp" and "PgDn" on the terminal-layouts have been relabeled to "Page ↑" and "Page ↓"
+- The Spanish and French terminal-layouts now have translated key-names
+- The Spanish terminal-layout has been updated with the additional keys that are already available on the US-terminal-layout.
+- The wide and base shapes of the German layout had a different key-arrangement and the wide shape did not have a button to access additional characters; this has been fixed.
+
+Development:
+- Squeekboard's versioning now follows Phosh's versioning (for example: Squeekboard 1.38 was released in time for Phosh 0.38)
+- The build-system has been simplified
+  - A single Cargo.toml file is used, instead of assembling it from multiple parts
+  - Newer dependencies are now used for building Squeekboard by default
+- Squeekboard's main development-platform is now Debian Testing
+- The layout-files have been cleaned up, so that those are easier to understand and edit
+
+1.24.0
+------------------
+
+Changes:
+- The emoji-layout has been replaced with a new one, which offers many more emojis to choose from.
+
 1.23.0
 ------------------
 

data/keyboards/am+phonetic.yaml

@@ -15,24 +15,24 @@ views:
         - "ք ո ե ր տ ը ւ ի օ պ խ ծ շ"
         - "ա ս դ ֆ գ հ յ կ լ ․"
         - "Shift_L զ ղ ց վ բ ն մ ՛ BackSpace"
-        - "show_numbers preferences         space        period Return"
+        - "show_numbers preferences         space        . Return"
     upper:
         - "՝ Է Թ Փ Ձ Ջ Ւ և Ռ Չ Ճ — Ժ"
         - "Ք Ո Ե Ր Տ Ը Ւ Ի Օ Պ Խ Ծ Շ"
         - "Ա Ս Դ Ֆ Գ Հ Յ Կ Լ ։"
         - "Shift_L Զ Ղ Ց Վ Բ Ն Մ ՞ BackSpace"
-        - "show_numbers preferences         space        period Return"
+        - "show_numbers preferences         space        . Return"
     numbers:
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
+        - "show_symbols   , \" ' : ; ! ?  BackSpace"
         - "ﬓ  ﬔ  ﬕ  ﬖ  ﬗ   ՟ և"
         - "1 2 3 4 5 6 7 8 9 0"
-        - "show_letters preferences         space        period Return"
+        - "show_letters preferences         space        . Return"
     symbols:
         - "show_numbers_from_symbols   \\ % < > = [ ]  BackSpace"
         - "* # $ / & - _ + ( )"
         - "© ® £ € ¥ ^ ° @ { }"
         - "~ ` | · √ π τ ÷ × ¶"
-        - "show_letters preferences         space        period Return"
+        - "show_letters preferences         space        . Return"
 
 buttons:
     Shift_L:
@@ -70,9 +70,8 @@ buttons:
             set_view: "symbols"
         outline: "altline"
         label: "*/="
-    period:
+    .:
         outline: "special"
-        text: "."
     space:
         outline: "spaceline"
         text: " "
@@ -80,5 +79,3 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    colon:
-        text: ":"

data/keyboards/am+phonetic_wide.yaml

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

data/keyboards/am.yaml

@@ -15,24 +15,24 @@ views:
         - "ճ փ բ ս մ ո ւ կ ը թ ծ ց »"
         - "ջ վ գ ե ա ն ի տ հ պ ր"
         - "Shift_L ժ դ չ յ զ լ ք խ շ ռ BackSpace"
-        - "show_numbers preferences         space        period Return"
+        - "show_numbers preferences         space        . Return"
     upper:
         - "՜ Ֆ Ձ — $ … ՟ և ՚ ( Օ Է Ղ"
         - "Ճ Փ Բ Ս Մ Ո Ւ Կ Ը Թ Ծ Ց «"
         - "Ջ Վ Գ Ե Ա Ն Ի Տ Հ Պ Պ Ր"
         - "Shift_L Ժ Դ Չ Յ Զ Լ Ք Խ Շ Ռ BackSpace"
-        - "show_numbers preferences         space        period Return"
+        - "show_numbers preferences         space        . Return"
     numbers:
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
+        - "show_symbols   , \" ' : ; ! ?  BackSpace"
         - "ﬓ  ﬔ  ﬕ  ﬖ  ﬗ   ՟ և"
         - "1 2 3 4 5 6 7 8 9 0"
-        - "show_letters preferences         space        period Return"
+        - "show_letters preferences         space        . Return"
     symbols:
         - "show_numbers_from_symbols   \\ % < > = [ ]  BackSpace"
         - "* # $ / & - _ + ( )"
         - "© ® £ € ¥ ^ ° @ { }"
         - "~ ` | · √ π τ ÷ × ¶"
-        - "show_letters preferences         space        period Return"
+        - "show_letters preferences         space        . Return"
 
 buttons:
     Shift_L:
@@ -70,9 +70,8 @@ buttons:
             set_view: "symbols"
         outline: "altline"
         label: "*/="
-    period:
+    .:
         outline: "special"
-        text: "."
     space:
         outline: "spaceline"
         text: " "
@@ -80,5 +79,3 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    colon:
-        text: ":"

data/keyboards/am_wide.yaml

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

data/keyboards/be.yaml

@@ -20,7 +20,7 @@ views:
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # € % & - _ + ( )"
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
+        - "show_symbols   , \" ' : ; ! ?  BackSpace"
         - "show_letters preferences         space        show_eschars Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
@@ -83,7 +83,3 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    colon:
-        text: ":"
-    "\"":
-        keysym: "quotedbl"

data/keyboards/be_wide.yaml

@@ -20,7 +20,7 @@ views:
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # € % & - _ + ( )"
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
+        - "show_symbols   , \" ' : ; ! ?  BackSpace"
         - "show_letters preferences         space        show_eschars Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
@@ -83,7 +83,3 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    colon:
-        text: ":"
-    "\"":
-        keysym: "quotedbl"

data/keyboards/bg+phonetic.yaml

@@ -20,7 +20,7 @@ views:
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # € % & - _ + ( )"
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
+        - "show_symbols   , \" ' : ; ! ?  BackSpace"
         - "show_letters preferences         space        Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
@@ -72,7 +72,3 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    colon:
-        text: ":"
-    "\"":
-        keysym: "quotedbl"

data/keyboards/bg+phonetic_wide.yaml

@@ -0,0 +1,74 @@
+---
+outlines:
+    default:   { width: 48,     height: 42 }
+    altline:   { width: 68.95,  height: 42 }
+    wide:      { width: 72.01,  height: 42 }
+    spaceline: { width: 271.39, height: 42 }
+    special:   { width: 64.55,  height: 42 }
+
+views:
+    base:
+        - "я в е р т ъ у и о п ю"
+        - "а с д ф г х й к л ш щ"
+        - "Shift_L з ь ц ж б н м ч BackSpace"
+        - "show_numbers preferences         space   .    Return"
+    upper:
+        - "Я В Е Р Т Ъ У И О П Ю"
+        - "А С Д Ф Г Х Й К Л Ш Щ"
+        - "Shift_L З Ь Ц Ж Б Н М Ч BackSpace"
+        - "show_numbers preferences         space   ,    Return"
+    numbers:
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "@ # € % & - _ + ( )"
+        - "show_symbols   , \" ' : ; ! ?  BackSpace"
+        - "show_letters preferences         space        Return"
+    symbols:
+        - "~ ` | · √ π τ ÷ × ¶"
+        - "© ® £ $ ¥ ^ ° * { }"
+        - "show_numbers_from_symbols   \\ / < > = [ ]  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:
+        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: "*/="
+    space:
+        outline: "spaceline"
+        text: " "
+    Return:
+        outline: "wide"
+        icon: "key-enter"
+        keysym: "Return"

data/keyboards/bg.yaml

@@ -20,7 +20,7 @@ views:
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # € % & - _ + ( )"
-        - "show_symbols , \" ' colon ; ! ? ѝ BackSpace"
+        - "show_symbols , \" ' : ; ! ? ѝ BackSpace"
         - "show_letters preferences         space        Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
@@ -72,7 +72,3 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    colon:
-        text: ":"
-    "\"":
-        keysym: "quotedbl"

data/keyboards/bg_wide.yaml

@@ -0,0 +1,74 @@
+---
+outlines:
+    default:   { width: 48,     height: 42 }
+    altline:   { width: 68.95,  height: 42 }
+    wide:      { width: 72.01,  height: 42 }
+    spaceline: { width: 271.39, height: 42 }
+    special:   { width: 64.55,  height: 42 }
+
+views:
+    base:
+        - "у е и ш щ к с д з ц б"
+        - "ь я а о ж г т н в м ч"
+        - "Shift_L ю й ъ ф х п р л BackSpace"
+        - "show_numbers preferences         space   .    Return"
+    upper:
+        - "У Е И Ш Щ К С Д З Ц Б"
+        - "Ь Я А О Ж Г Т Н В М Ч"
+        - "Shift_L Ю Й Ъ Ф Х П Р Л BackSpace"
+        - "show_numbers preferences         space   ,    Return"
+    numbers:
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "@ # € % & - _ + ( )"
+        - "show_symbols , \" ' : ; ! ? ѝ BackSpace"
+        - "show_letters preferences         space        Return"
+    symbols:
+        - "~ ` | · √ π τ ÷ × ¶"
+        - "© ® £ $ ¥ ^ ° * { }"
+        - "show_numbers_from_symbols   \\ / < > = [ ]  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:
+        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: "*/="
+    space:
+        outline: "spaceline"
+        text: " "
+    Return:
+        outline: "wide"
+        icon: "key-enter"
+        keysym: "Return"

data/keyboards/br.yaml

@@ -16,17 +16,17 @@ views:
         - "Q W E R T Y U I O P"
         - "A S D F G H J K L Ç"
         - "Shift_L   Z X C V B N M  BackSpace"
-        - "show_numbers preferences         space     period Return"
+        - "show_numbers preferences         space     . Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "à À á Á ã Ã â Â é É"
         - "show_symbols   ê Ê í Í ó Ó ô Ô"
-        - "show_letters        õ Õ ú Ú ü Ü period BackSpace"
+        - "show_letters        õ Õ ú Ú ü Ü . BackSpace"
     symbols:
         - "@ # $ % - + ÷ × = ≠"
         - "( ) § & < > / * { }"
-        - "show_numbers_from_symbols     º \" ' colon ; ! ?  BackSpace"
-        - "show_letters preferences         space        period Return"
+        - "show_numbers_from_symbols     º \" ' : ; ! ?  BackSpace"
+        - "show_letters preferences         space        . Return"
 
 buttons:
     Shift_L:
@@ -64,9 +64,8 @@ buttons:
             set_view: "symbols"
         outline: "altline"
         label: "*/="
-    period:
+    .:
         outline: "special"
-        text: "."
     space:
         outline: "spaceline"
         text: " "
@@ -74,5 +73,3 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    colon:
-        text: ":"

data/keyboards/br_wide.yaml

@@ -0,0 +1,75 @@
+---
+outlines:
+    default:   { width: 52,    height: 42 }
+    altline:   { width: 77.52, height: 42 }
+    wide:      { width: 91.25, height: 42 }
+    spaceline: { width: 209,   height: 42 }
+    special:   { width: 64.76, height: 42 }
+
+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"
+        - "à À á Á ã Ã â Â é É"
+        - "show_symbols   ê Ê í Í ó Ó ô Ô"
+        - "show_letters        õ Õ ú Ú ü Ü . BackSpace"
+    symbols:
+        - "@ # $ % - + ÷ × = ≠"
+        - "( ) § & < > / * { }"
+        - "show_numbers_from_symbols     º \" ' : ; ! ?  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:
+        action:
+            set_view: "numbers"
+        outline: "wide"
+        label: "1ã"
+    show_numbers_from_symbols:
+        action:
+            set_view: "numbers"
+        outline: "altline"
+        label: "1ã"
+    show_letters:
+        action:
+            set_view: "base"
+        outline: "wide"
+        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"

data/keyboards/ca.yaml

@@ -20,7 +20,7 @@ views:
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
+        - "show_symbols   , \" ' : ; ! ?  BackSpace"
         - "show_letters preferences         space        show_eschars Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
@@ -76,9 +76,6 @@ buttons:
                 unlock_view: "base"
         outline: "altline"
         label: "âÂ"
-    period:
-        outline: "special"
-        text: "."
     space:
         outline: "spaceline"
         text: " "
@@ -86,8 +83,6 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    colon:
-        text: ":"
 
 
 

data/keyboards/ca_wide.yaml

@@ -0,0 +1,88 @@
+---
+outlines:
+    default:   { width: 52,    height: 42 }
+    altline:   { width: 77.52, height: 42 }
+    wide:      { width: 91.25, height: 42 }
+    spaceline: { width: 209,   height: 42 }
+    special:   { width: 64.76, height: 42 }
+
+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   , \" ' : ; ! ?  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: "âÂ"
+    space:
+        outline: "spaceline"
+        text: " "
+    Return:
+        outline: "wide"
+        icon: "key-enter"
+        keysym: "Return"
+
+
+

data/keyboards/ch+de.yaml

@@ -69,5 +69,3 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    "\"":
-        keysym: "quotedbl"

data/keyboards/ch+de_wide.yaml

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

data/keyboards/ch+fr.yaml

@@ -80,5 +80,3 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    "\"":
-        keysym: "quotedbl"

data/keyboards/ch+fr_wide.yaml

@@ -0,0 +1,82 @@
+# Maintained by: Jordi Bossy <jordi@bossy.space>. No Copyright, enjoy!
+---
+outlines:
+    default:   { width: 52,     height: 42 }
+    altline:   { width: 70.65,  height: 42 }
+    wide:      { width: 86.84,  height: 42 }
+    spaceline: { width: 103.03, height: 42 }
+    special:   { width: 41.21,  height: 42 }
+
+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: "wide"
+        icon: "key-enter"
+        keysym: "Return"

data/keyboards/ch.yaml

@@ -83,8 +83,6 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    "\"":
-        keysym: "quotedbl"
     °:
         outline: "doublewidth"
     "|":

data/keyboards/ch_wide.yaml

@@ -85,8 +85,6 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    "\"":
-        keysym: "quotedbl"
     °:
         outline: "large"
     ".":

data/keyboards/cz+qwerty.yaml

@@ -20,7 +20,7 @@ views:
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
-        - "show_symbols    , \" ' colon ; ! ?    BackSpace"
+        - "show_symbols    , \" ' : ; ! ?    BackSpace"
         - "show_letters preferences show_accents    space    , . Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
@@ -102,5 +102,3 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    colon:
-        text: ":"

data/keyboards/cz+qwerty_wide.yaml

@@ -20,7 +20,7 @@ views:
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
-        - "show_symbols    , \" ' colon ; ! ?    BackSpace"
+        - "show_symbols    , \" ' : ; ! ?    BackSpace"
         - "show_letters preferences show_accents    space    , . Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
@@ -102,5 +102,3 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    colon:
-        text: ":"

data/keyboards/cz.yaml

@@ -20,7 +20,7 @@ views:
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
-        - "show_symbols    , \" ' colon ; ! ?    BackSpace"
+        - "show_symbols    , \" ' : ; ! ?    BackSpace"
         - "show_letters preferences show_accents    space    , . Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
@@ -102,5 +102,3 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    colon:
-        text: ":"

data/keyboards/cz_wide.yaml

@@ -20,7 +20,7 @@ views:
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
-        - "show_symbols    , \" ' colon ; ! ?    BackSpace"
+        - "show_symbols    , \" ' : ; ! ?    BackSpace"
         - "show_letters preferences show_accents    space    , . Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
@@ -102,5 +102,3 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    colon:
-        text: ":"

data/keyboards/de.yaml

@@ -1,21 +1,20 @@
-# Maintained by: Mark Müller <markmueller86@gmail.com>
 ---
 outlines:
     default:   { width: 35.33, height: 52 }
     altline:   { width: 52.67, height: 52 }
     wide:      { width: 62,    height: 52 }
-    spaceline: { width: 99.67, height: 52 }
+    spaceline: { width: 89.3,  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"
+        - "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"
+        - "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:
@@ -74,7 +73,6 @@ buttons:
         label: "Ää"
     space:
         outline: "spaceline"
-        label: " "
         text: " "
     Return:
         outline: "altline"

data/keyboards/de_wide.yaml

@@ -1,38 +1,40 @@
-# Maintained by: Mark Müller <markmueller86@gmail.com>
 ---
 outlines:
-    default:   { width: 48,  height: 42 }
-    altline:   { width: 81,  height: 42 }
-    wide:      { width: 108, height: 42 }
-    spaceline: { width: 216, height: 42 }
-    special:   { width: 48,  height: 42 }
+    default:   { width: 48,   height: 42 }
+    halfwidth: { width: 24,   height: 42 }
+    thin:      { width: 30,   height: 42 }
+    narrow:    { width: 40.5, height: 42 }
+    altline:   { width: 81,   height: 42 }
+    wide:      { width: 108,  height: 42 }
+    spaceline: { width: 156,  height: 42 }
+    special:   { width: 48,   height: 42 }
 
 views:
     base:
         - "q w e r t z u i o p ü"
         - "a s d f g h j k l ö ä"
-        - "Shift_L   y x c v b n m  BackSpace"
-        - "show_numbers preferences         space        , . Return"
+        - "Shift_L   y x c v b n m ß-thin BackSpace"
+        - "show_numbers show_eschars preferences         space        ,-narrow .-narrow Return"
     upper:
         - "Q W E R T Z U I O P Ü"
         - "A S D F G H J K L Ö Ä"
-        - "Shift_L   Y X C V B N M  BackSpace"
-        - "show_numbers preferences         space        ! ? Return"
+        - "Shift_L   Y X C V B N M --thin BackSpace"
+        - "show_numbers show_eschars preferences         space        !-narrow ?-narrow Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
-        - "@ # % & - _ + ( ) ß"
+        - "@ # € % & - _ + ( )"
         - "show_symbols   ; \" ' : = < >  BackSpace"
-        - "show_letters preferences         space        , . Return"
+        - "show_letters show_eschars preferences         space        ,-narrow .-narrow Return"
     symbols:
-        - "~ ` ´  · © ® ÷ × ¶"
-        - "€ £ $ ¥ ^ ° * { } |"
+        - "~ ` ´ | · √ µ ÷ × ¶"
+        - "© ® £ $ ¥ ^ ° * { }"
         - "show_numbers   \\ / § π τ [ ]  BackSpace"
-        - "show_letters preferences         space        , . Return"
+        - "show_letters show_eschars preferences         space        ,-narrow .-narrow Return"
     eschars:
         - "ä è é ö ü Ä È É Ö Ü"
         - "à â ê î ô À Â È Î Ô"
         - "show_numbers  « » ç Ç æ œ ß  BackSpace"
-        - "show_letters preferences         space        „ “ Return"
+        - "show_letters show_eschars preferences         space        „ “ Return"
 
 buttons:
     Shift_L:
@@ -79,3 +81,25 @@ buttons:
         outline: "altline"
         icon: "key-enter"
         keysym: "Return"
+    „:
+        outline: "narrow"
+    “:
+        outline: "narrow"
+    ",-narrow":
+        outline: "narrow"
+        text: ","
+    .-narrow:
+        outline: "narrow"
+        text: "."
+    "!-narrow":
+        outline: "narrow"
+        text: "!"
+    ?-narrow:
+        outline: "narrow"
+        text: "?"
+    --thin:
+        outline: "thin"
+        text: "-"
+    ß-thin:
+        outline: "thin"
+        text: "ß"

data/keyboards/dk.yaml

@@ -22,8 +22,8 @@ views:
         - "show_symbols   , \" ' : ; ! ?  BackSpace"
         - "show_letters preferences         space        .    Return"
     symbols:
-        - "~ ` | U00B7 squareroot Greek_pi Greek_tau division multiply paragraph"
-        - "copyright U00AE U00A3 EuroSign U00A5 asciicircum degree * { }"
+        - "~ ` | · √ π τ ÷ × ¶"
+        - "© ® £ € ¥ ^ ° * { }"
         - "show_numbers   \\ / < > = [ ]  BackSpace"
         - "show_letters preferences         space        .    Return"
 
@@ -61,37 +61,9 @@ buttons:
     ".":
         outline: altline
     space:
-        outline: spaceline
+        outline: "spaceline"
         text: " "
     Return:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    U00B7:
-        text: "·"
-    squareroot:
-        text: "√"
-    Greek_pi:
-        text: "π"
-    division:
-        text: "÷"
-    multiply:
-        text: "×"
-    paragraph:
-        text: "¶"
-    Greek_tau:
-        text: "τ"
-    copyright:
-        text: "©"
-    U00AE:
-        text: "®"
-    U00A3:
-        text: "£"
-    EuroSign:
-        text: "€"
-    U00A5:
-        text: "¥"
-    asciicircum:
-        text: "^"
-    degree:
-        text: "°"

data/keyboards/dk_wide.yaml

@@ -0,0 +1,69 @@
+---
+outlines:
+    default:   { width: 48,     height: 42 }
+    altline:   { width: 72.58,  height: 42 }
+    wide:      { width: 92.99,  height: 42 }
+    spaceline: { width: 225.87, 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"
+        - "@ # $ % & - _ + ( )"
+        - "show_symbols   , \" ' : ; ! ?  BackSpace"
+        - "show_letters preferences         space        .    Return"
+    symbols:
+        - "~ ` | · √ π τ ÷ × ¶"
+        - "© ® £ € ¥ ^ ° * { }"
+        - "show_numbers   \\ / < > = [ ]  BackSpace"
+        - "show_letters preferences         space        .    Return"
+
+buttons:
+    Shift_L:
+        action:
+            locking:
+                lock_view: "upper"
+                unlock_view: "base"
+        outline: "altline"
+        icon: "key-shift"
+    BackSpace:
+        outline: "altline"
+        icon: "edit-clear-symbolic"
+        action: erase
+    preferences:
+        action: "show_prefs"
+        outline: "altline"
+        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: "*/="
+    ".":
+        outline: altline
+    space:
+        outline: "spaceline"
+        text: " "
+    Return:
+        outline: "wide"
+        icon: "key-enter"
+        keysym: "Return"

data/keyboards/email/us.yaml

@@ -12,22 +12,22 @@ views:
         - "q w e r t y u i o p"
         - "a s d f g h j k l"
         - "Shift_L   z x c v b n m  BackSpace"
-        - "show_numbers preferences         space        at period Return"
+        - "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        at period Return"
+        - "show_numbers preferences         space        @ . Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
-        - "show_letters preferences         space        at period Return"
+        - "show_symbols   , \" ' : ; ! ?  BackSpace"
+        - "show_letters preferences         space        @ . Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
         - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        at period Return"
+        - "show_letters preferences         space        @ . Return"
 
 buttons:
     Shift_L:
@@ -41,9 +41,8 @@ buttons:
         outline: "altline"
         icon: "edit-clear-symbolic"
         action: erase
-    at:
+    "@":
         outline: "large"
-        text: "@"
     preferences:
         action: "show_prefs"
         outline: "special"
@@ -68,9 +67,8 @@ buttons:
             set_view: "symbols"
         outline: "altline"
         label: "*/="
-    period:
+    .:
         outline: "large"
-        text: "."
     space:
         outline: "spaceline"
         text: " "
@@ -78,5 +76,3 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    colon:
-        text: ":"

data/keyboards/email/us_wide.yaml

@@ -0,0 +1,78 @@
+---
+outlines:
+    default:   { width: 52,    height: 42 }
+    altline:   { width: 77.52, height: 42 }
+    wide:      { width: 91.25, height: 42 }
+    spaceline: { width: 157,   height: 42 }
+    special:   { width: 64.76, height: 42 }
+    large:     { width: 54.76, height: 42 }
+
+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"
+        - "@ # $ % & - _ + ( )"
+        - "show_symbols   , \" ' : ; ! ?  BackSpace"
+        - "show_letters preferences         space        @ . Return"
+    symbols:
+        - "~ ` | · √ π τ ÷ × ¶"
+        - "© ® £ € ¥ ^ ° * { }"
+        - "show_numbers_from_symbols   \\ / < > = [ ]  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
+    "@":
+        outline: "large"
+    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: "*/="
+    .:
+        outline: "large"
+    space:
+        outline: "spaceline"
+        text: " "
+    Return:
+        outline: "wide"
+        icon: "key-enter"
+        keysym: "Return"

data/keyboards/epo.yaml

@@ -25,7 +25,7 @@ views:
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
+        - "show_numbers   \\ / < > = [ ]  BackSpace"
         - "show_letters preferences         space        . Return"
     eschars:
         - "ĉ ĝ ĥ ĵ ŝ ŭ ?"

data/keyboards/epo_wide.yaml

@@ -0,0 +1,81 @@
+---
+outlines:
+    default:   { width: 52,    height: 42 }
+    altline:   { width: 77.52, height: 42 }
+    wide:      { width: 91.25, height: 42 }
+    spaceline: { width: 146.7, height: 42 }
+    special:   { width: 52,    height: 42 }
+
+views:
+    base:
+        - "q w e r t y u i o p"
+        - "a s d f g h j k l"
+        - "Shift_L   z x c v b n m  BackSpace"
+        - "show_numbers show_eschars preferences         space        , . Return"
+    upper:
+        - "Q W E R T Y U I O P"
+        - "A S D F G H J K L"
+        - "Shift_L   Z X C V B N M  BackSpace"
+        - "show_numbers show_eschars preferences         space        ! ? Return"
+    numbers:
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "@ # $ % & - _ + ( )"
+        - "show_symbols   , \" ' : ; ! ?  BackSpace"
+        - "show_letters preferences         space        . Return"
+    symbols:
+        - "~ ` | · √ π τ ÷ × ¶"
+        - "© ® £ € ¥ ^ ° * { }"
+        - "show_numbers   \\ / < > = [ ]  BackSpace"
+        - "show_letters preferences         space        . Return"
+    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"

data/keyboards/es+cat.yaml

@@ -11,22 +11,22 @@ views:
         - "q w e r t y u i o p"
         - "a s d f g h j k l ç"
         - "Shift_L   z x c v b n m  BackSpace"
-        - "show_numbers show_eschars preferences         space        ? period Return"
+        - "show_numbers show_eschars preferences         space        ? . Return"
     upper:
         - "Q W E R T Y U I O P"
         - "A S D F G H J K L Ç"
         - "Shift_L   Z X C V B N M  BackSpace"
-        - "show_numbers show_eschars preferences         space        ¿ period Return"
+        - "show_numbers show_eschars preferences         space        ¿ . Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # € % & - _ + ( )"
-        - "show_symbols   , \" ' colon ; ! = BackSpace"
-        - "show_letters show_eschars preferences         space        ? period Return"
+        - "show_symbols   , \" ' : ; ! = BackSpace"
+        - "show_letters show_eschars preferences         space        ? . Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ $ ¥ ^ ° * { }"
         - "show_numbers   \\ / < > = [ ]  BackSpace"
-        - "show_letters show_eschars preferences         space        ? period Return"
+        - "show_letters show_eschars preferences         space        ? . Return"
     eschars:
         - "á é í ó ú Á É Í Ó Ú"
         - "à è ì ò ù À È Ì Ò Ù"
@@ -71,10 +71,6 @@ buttons:
                 unlock_view: "base"
         outline: "altline"
         label: "àÀ"
-
-    period:
-        outline: "default"
-        text: "."
     space:
         outline: "spaceline"
         text: " "
@@ -82,6 +78,3 @@ buttons:
         outline: "altline"
         icon: "key-enter"
         keysym: "Return"
-    colon:
-        text: ":"
-

data/keyboards/es+cat_wide.yaml

@@ -0,0 +1,80 @@
+---
+outlines:
+    default:   { width: 52,     height: 42 }
+    altline:   { width: 77.51,  height: 42 }
+    wide:      { width: 91.25,  height: 42 }
+    spaceline: { width: 146.69, height: 42 }
+    special:   { width: 64.75,  height: 42 }
+
+views:
+    base:
+        - "q w e r t y u i o p"
+        - "a s d f g h j k l ç"
+        - "Shift_L   z x c v b n m  BackSpace"
+        - "show_numbers show_eschars preferences         space        ? . Return"
+    upper:
+        - "Q W E R T Y U I O P"
+        - "A S D F G H J K L Ç"
+        - "Shift_L   Z X C V B N M  BackSpace"
+        - "show_numbers show_eschars preferences         space        ¿ . Return"
+    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: "default"
+        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"
+        text: " "
+    Return:
+        outline: "altline"
+        icon: "key-enter"
+        keysym: "Return"

data/keyboards/es.yaml

@@ -11,22 +11,22 @@ views:
         - "q w e r t y u i o p"
         - "a s d f g h j k l ñ"
         - "Shift_L   z x c v b n m  BackSpace"
-        - "show_numbers show_eschars preferences         space        ? period Return"
+        - "show_numbers show_eschars preferences         space        ? . Return"
     upper:
         - "Q W E R T Y U I O P"
         - "A S D F G H J K L Ñ"
         - "Shift_L   Z X C V B N M  BackSpace"
-        - "show_numbers show_eschars preferences         space        ¿ period Return"
+        - "show_numbers show_eschars preferences         space        ¿ . Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # € % & - _ + ( )"
-        - "show_symbols   , \" ' colon ; ! = BackSpace"
-        - "show_letters show_eschars preferences         space        ? period Return"
+        - "show_symbols   , \" ' : ; ! = BackSpace"
+        - "show_letters show_eschars preferences         space        ? . Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ $ ¥ ^ ° * { }"
         - "show_numbers   \\ / < > = [ ]  BackSpace"
-        - "show_letters show_eschars preferences         space        ? period Return"
+        - "show_letters show_eschars preferences         space        ? . Return"
     eschars:
         - "á é í ó ú Á É Í Ó Ú"
         - "à è ì ò ù À È Ì Ò Ù"
@@ -71,10 +71,6 @@ buttons:
                 unlock_view: "base"
         outline: "altline"
         label: "áÁ"
-
-    period:
-        outline: "default"
-        text: "."
     space:
         outline: "spaceline"
         text: " "
@@ -82,6 +78,3 @@ buttons:
         outline: "altline"
         icon: "key-enter"
         keysym: "Return"
-    colon:
-        text: ":"
-

data/keyboards/es_wide.yaml

@@ -0,0 +1,80 @@
+---
+outlines:
+    default:   { width: 52,     height: 42 }
+    altline:   { width: 77.51,  height: 42 }
+    wide:      { width: 91.25,  height: 42 }
+    spaceline: { width: 146.69, height: 42 }
+    special:   { width: 64.75,  height: 42 }
+
+views:
+    base:
+        - "q w e r t y u i o p"
+        - "a s d f g h j k l ñ"
+        - "Shift_L   z x c v b n m  BackSpace"
+        - "show_numbers show_eschars preferences         space        ? . Return"
+    upper:
+        - "Q W E R T Y U I O P"
+        - "A S D F G H J K L Ñ"
+        - "Shift_L   Z X C V B N M  BackSpace"
+        - "show_numbers show_eschars preferences         space        ¿ . Return"
+    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: "default"
+        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"
+        text: " "
+    Return:
+        outline: "altline"
+        icon: "key-enter"
+        keysym: "Return"

data/keyboards/fi.yaml

@@ -18,13 +18,13 @@ views:
         - "show_numbers preferences         space        .    Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
-        - "at numbersign dollar percent ampersand minus underscore plus parenleft parenright"
-        - "show_symbols   comma quotedbl quoteright colon semicolon exclam question  BackSpace"
+        - "@ # $ % & - _ + ( )"
+        - "show_symbols   , \" ' : ; ! ?  BackSpace"
         - "show_letters preferences         space        .    Return"
     symbols:
-        - "asciitilde quoteleft bar U00B7 squareroot Greek_pi Greek_tau division multiply paragraph"
-        - "copyright U00AE U00A3 EuroSign U00A5 asciicircum degree asterisk braceleft braceright"
-        - "show_numbers   backslash slash less greater equal bracketleft bracketright  BackSpace"
+        - "~ ` | · √ π τ ÷ × ¶"
+        - "© ® £ € ¥ ^ ° * { }"
+        - "show_numbers   \\ / < > = [ ]  BackSpace"
         - "show_letters preferences         space        .    Return"
 
 buttons:
@@ -67,104 +67,3 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    aring:
-        text: "å"
-    Aring:
-        text: "Å"
-    ouml:
-        text: "ö"
-    Ouml:
-        text: "Ö"
-    auml:
-        text: "ä"
-    Auml:
-        text: "Ä"
-    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: "]"
-

data/keyboards/fi_wide.yaml

@@ -0,0 +1,69 @@
+---
+outlines:
+    default:   { width: 48,     height: 42 }
+    altline:   { width: 72.59,  height: 42 }
+    wide:      { width: 93,     height: 42 }
+    spaceline: { width: 225.88, 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"
+        - "@ # $ % & - _ + ( )"
+        - "show_symbols   , \" ' : ; ! ?  BackSpace"
+        - "show_letters preferences         space        .    Return"
+    symbols:
+        - "~ ` | · √ π τ ÷ × ¶"
+        - "© ® £ € ¥ ^ ° * { }"
+        - "show_numbers   \\ / < > = [ ]  BackSpace"
+        - "show_letters preferences         space        .    Return"
+
+buttons:
+    Shift_L:
+        action:
+            locking:
+                lock_view: "upper"
+                unlock_view: "base"
+        outline: "altline"
+        icon: "key-shift"
+    BackSpace:
+        outline: "altline"
+        icon: "edit-clear-symbolic"
+        action: "erase"
+    preferences:
+        action: "show_prefs"
+        outline: "altline"
+        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: "*/="
+    ".":
+        outline: altline
+    space:
+        outline: spaceline
+        text: " "
+    Return:
+        outline: "wide"
+        icon: "key-enter"
+        keysym: "Return"

data/keyboards/fr+bepo.yaml

@@ -11,18 +11,18 @@ views:
     base:
         - "b é p o w v d l j z"
         - "a u i e c t s r n m"
-        - "Shift_L y x k q g h f period BackSpace"
+        - "Shift_L y x k q g h f . BackSpace"
         - "show_numbers preferences         space    show_eschars Return"
     upper:
         - "B É P O W V D L J Z"
         - "A U I E C T S R N M"
         - "Shift_L   Y X K Q G H F -  BackSpace"
-        - "show_numbers preferences         space  colon   show_eschars Return"
+        - "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"
+        - "show_symbols   , \" ' : ; ! ?  BackSpace"
+        - "show_letters preferences         space        show_eschars Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ $ ¥ ^ ° * { }"
@@ -35,122 +35,6 @@ views:
         - "show_letters preferences         space        show_eschars  Return"
  
 buttons:
-    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"
-    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"
-    period:
-        outline: "special"
-        text: "."
-    slash:
-        outline: "special"
-        text: "/"
-    show_actions:
-        action:
-            set_view: "actions"
-        outline: "special"
-        label: ">_"
     Shift_L:
         action:
             locking:
@@ -200,7 +84,5 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    colon:
-        text: ":"
-    "\"":
-        keysym: "quotedbl"
+    .:
+        outline: "special"

data/keyboards/fr+bepo_wide.yaml

@@ -16,11 +16,11 @@ views:
         - "B É P O W V D L J Z"
         - "A U I E C T S R N M"
         - "Shift_L   Y X K Q G H F -  BackSpace"
-        - "show_numbers preferences         space  colon   show_eschars Return"
+        - "show_numbers preferences         space  :   show_eschars Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # € % & - _ + ( )"
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
+        - "show_symbols   , \" ' : ; ! ?  BackSpace"
         - "show_letters preferences         space        show_eschars Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
@@ -83,7 +83,3 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    colon:
-        text: ":"
-    "\"":
-        keysym: "quotedbl"

data/keyboards/fr.yaml

@@ -20,7 +20,7 @@ views:
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # € % & - _ + ( )"
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
+        - "show_symbols   , \" ' : ; ! ?  BackSpace"
         - "show_letters preferences         space        show_eschars Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
@@ -83,7 +83,3 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    colon:
-        text: ":"
-    "\"":
-        keysym: "quotedbl"

data/keyboards/fr_wide.yaml

@@ -20,7 +20,7 @@ views:
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # € % & - _ + ( )"
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
+        - "show_symbols   , \" ' : ; ! ?  BackSpace"
         - "show_letters preferences         space        show_eschars Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
@@ -83,7 +83,3 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    colon:
-        text: ":"
-    "\"":
-        keysym: "quotedbl"

data/keyboards/ge.yaml

@@ -11,22 +11,22 @@ views:
         - "ქ წ ე რ ტ ყ უ ი ო პ"
         - "ა ს დ ფ გ ჰ ჯ კ ლ"
         - "Shift_L ზ ხ ც ვ ბ ნ მ BackSpace"
-        - "show_numbers preferences         space        period Return"
+        - "show_numbers preferences         space        . Return"
     upper:
         - "ქ ჭ ე ღ თ ყ უ ი ო პ"
         - "ა შ დ ფ გ ჰ ჟ კ ლ"
         - "Shift_L ძ ხ ჩ ვ ბ ნ მ BackSpace"
-        - "show_numbers preferences         space        period Return"
+        - "show_numbers preferences         space        . Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "! @ # $ % ^ & * ( )"
-        - "show_symbols   - ' \" colon ; , ?   BackSpace"
-        - "show_letters preferences         space        period Return"
+        - "show_symbols   - ' \" : ; , ?   BackSpace"
+        - "show_letters preferences         space        . Return"
     symbols:
         - "+ ⨯ ÷ = / _ € £ ¥ ₾"
         - "~ ` | · √ π τ ° { }"
         - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        period Return"
+        - "show_letters preferences         space        . Return"
 
 buttons:
     Shift_L:
@@ -64,9 +64,8 @@ buttons:
             set_view: "symbols"
         outline: "altline"
         label: "*/="
-    period:
+    .:
         outline: "special"
-        text: "."
     space:
         outline: "spaceline"
         text: " "
@@ -74,5 +73,3 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    colon:
-        text: ":"

data/keyboards/ge_wide.yaml

@@ -0,0 +1,75 @@
+---
+outlines:
+    default:   { width: 52,     height: 42 }
+    altline:   { width: 77.52,  height: 42 }
+    wide:      { width: 91.26,  height: 42 }
+    spaceline: { width: 209.01, height: 42 }
+    special:   { width: 64.76,  height: 42 }
+
+views:
+    base:
+        - "ქ წ ე რ ტ ყ უ ი ო პ"
+        - "ა ს დ ფ გ ჰ ჯ კ ლ"
+        - "Shift_L ზ ხ ც ვ ბ ნ მ BackSpace"
+        - "show_numbers preferences         space        . Return"
+    upper:
+        - "ქ ჭ ე ღ თ ყ უ ი ო პ"
+        - "ა შ დ ფ გ ჰ ჟ კ ლ"
+        - "Shift_L ძ ხ ჩ ვ ბ ნ მ BackSpace"
+        - "show_numbers preferences         space        . Return"
+    numbers:
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "! @ # $ % ^ & * ( )"
+        - "show_symbols   - ' \" : ; , ?   BackSpace"
+        - "show_letters preferences         space        . Return"
+    symbols:
+        - "+ ⨯ ÷ = / _ € £ ¥ ₾"
+        - "~ ` | · √ π τ ° { }"
+        - "show_numbers_from_symbols   \\ / < > = [ ]  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:
+        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: "*/="
+    .:
+        outline: "special"
+    space:
+        outline: "spaceline"
+        text: " "
+    Return:
+        outline: "wide"
+        icon: "key-enter"
+        keysym: "Return"

data/keyboards/gr+polytonic.yaml

@@ -13,15 +13,15 @@ outlines:
 
 views:
     base:
-        - "semicolon ς ε ρ τ υ θ ι ο π"
+        - "; ς ε ρ τ υ θ ι ο π"
         - "α σ δ φ γ η ξ κ λ show_accents"
         - "Shift_L ζ χ ψ ω β ν μ BackSpace"
-        - "show_numbers preferences space period comma Return"
+        - "show_numbers preferences space . CommaSpecial Return"
     upper:
-        - "colon EuroSign Ε Ρ Τ Υ Θ Ι Ο Π"
+        - ": € Ε Ρ Τ Υ Θ Ι Ο Π"
         - "Α Σ Δ Φ Γ Η Ξ Κ Λ show_accents"
         - "Shift_L Ζ Χ Ψ Ω Β Ν Μ BackSpace"
-        - "show_numbers preferences space exclam period_upper Return"
+        - "show_numbers preferences space ! ·Special Return"
     accents:
         - "show_psiliordasiaandvaria show_psiliordasiaandoxia show_psiliordasia show_bariaorperispomeni show_oxia"
         - "show_PsiliOrDasiaAndVaria show_PsiliOrDasiaAndOxia show_PsiliOrDasia show_BariaOrPerispomeni show_Oxia show_base"
@@ -31,12 +31,12 @@ views:
         - "ά έ ή ί ϊ ΐ ό ύ ϋ ώ"
         - "show_Oxia ᾳ ᾴ ῃ ῄ ῳ ῴ show_base"
         - "Ϗ ϐ ϑ ϗ ϖ ΰ ϕ – — BackSpace"
-        - "show_numbers preferences space eis_l eis_r Return"
+        - "show_numbers preferences space « » Return"
     Oxia:
         - "Ά Έ Ή Ί Ϊ Ό Ύ Ϋ Ώ"
         - "show_oxia ᾼ ῌ ῼ show_base"
         - "Ϗ ϐ ϑ ϗ ϖ ϕ – — BackSpace"
-        - "show_numbers preferences space eis_l eis_r Return"
+        - "show_numbers preferences space « » Return"
     bariaorperispomeni:
         - "ὰ ὲ ὴ ὶ ῒ ὸ ὺ ὼ ῐ ῑ"
         - "show_BariaOrPerispomeni ᾳ ᾲ ῃ ῂ ῳ ῲ ῠ show_base"
@@ -88,14 +88,14 @@ views:
         - "show_numbers preferences space Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
-        - "at numbersign dollar percent ampersand minus underscore plus parenleft parenright"
-        - "show_symbols comma quotedbl quoteright colon semicolon exclam question BackSpace"
-        - "show_letters preferences space period comma Return"
+        - "@ # $ % & - _ + ( )"
+        - "show_symbols CommaSpecial \" ' : ; ! ? BackSpace"
+        - "show_letters preferences space . CommaSpecial Return"
     symbols:
-        - "asciitilde quoteleft bar U00B7 squareroot Greek_pi Greek_tau division multiply paragraph"
-        - "copyright U00AE U00A3 EuroSign U00A5 asciicircum degree asterisk braceleft braceright"
-        - "show_numbers backslash slash less greater equal bracketleft bracketright  BackSpace"
-        - "show_letters preferences space period comma Return"
+        - "~ ` | · √ π τ ÷ × ¶"
+        - "© ® £ € ¥ ^ ° * { }"
+        - "show_numbers \\ / < > = [ ]  BackSpace"
+        - "show_letters preferences space . CommaSpecial Return"
 buttons:
     Shift_L:
         action:
@@ -206,121 +206,23 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    period:
+    .:
         outline: "special"
-        text: "."
-    period_upper:
+    ·Special:
         outline: "special"
         text: "·"
-    comma:
+    CommaSpecial:
         outline: "special"
         text: ","
-    colon:
+    ":":
         outline: "special"
-        text: ":"
-    semicolon:
+    ;:
         outline: "special"
-        text: ";"
-    exclam:
+    "!":
         outline: "special"
-        text: "!"
-    eis_l:
+    «:
         outline: "special"
-        text: "«"
-    eis_r:
+    »:
         outline: "special"
-        text: "»"
-    aring:
-        text: "å"
-    Aring:
-        text: "Å"
-    oslash:
-        text: "ø"
-    Oslash:
-        text: "Ø"
-    ae:
-        text: "æ"
-    AE:
-        text: "Æ"
-    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:
+    €:
         outline: "special"
-        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: "}"
-    backslash:
-        text: "\\"
-    slash:
-        text: "/"
-    quotedbl:
-        text: "\""
-    quoteright:
-        text: "'"
-    less:
-        text: "<"
-    greater:
-        text: ">"
-    question:
-        text: "?"
-    bracketleft:
-        text: "["
-    bracketright:
-        text: "]"
-

data/keyboards/gr+polytonic_wide.yaml

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

data/keyboards/gr.yaml

@@ -12,30 +12,30 @@ outlines:
 
 views:
     base:
-        - "semicolon ς ε ρ τ υ θ ι ο π"
+        - "; ς ε ρ τ υ θ ι ο π"
         - "α σ δ φ γ η ξ κ λ show_accented"
         - "Shift_L ζ χ ψ ω β ν μ BackSpace"
-        - "show_numbers preferences space period comma Return"
+        - "show_numbers preferences space . CommaSpecial Return"
     upper:
-        - "colon exclam Ε Ρ Τ Υ Θ Ι Ο Π"
+        - ": ! Ε Ρ Τ Υ Θ Ι Ο Π"
         - "Α Σ Δ Φ Γ Η Ξ Κ Λ show_accented"
         - "Shift_L Ζ Χ Ψ Ω Β Ν Μ BackSpace"
-        - "show_numbers preferences space period_upper apostrophe Return"
+        - "show_numbers preferences space ·Special ᾿ Return"
     accented:
         - "ά έ ή ί ϊ ΐ ό ύ ϋ ώ "
         - "Ά Έ Ή Ί Ϊ Ό Ύ Ϋ Ώ show_base"
         - "Ϗ ϐ ϑ ϗ ϖ ΰ ϕ – — BackSpace"
-        - "show_numbers preferences space eis_l eis_r Return"
+        - "show_numbers preferences space « » Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
-        - "at numbersign dollar percent ampersand minus underscore plus parenleft parenright"
-        - "show_symbols comma quotedbl quoteright colon semicolon exclam question BackSpace"
-        - "show_letters preferences space period comma Return"
+        - "@ # $ % & - _ + ( )"
+        - "show_symbols CommaSpecial \" ' : ; ! ? BackSpace"
+        - "show_letters preferences space . CommaSpecial Return"
     symbols:
-        - "asciitilde quoteleft bar U00B7 squareroot Greek_pi Greek_tau division multiply paragraph"
-        - "copyright U00AE U00A3 EuroSign U00A5 asciicircum degree asterisk braceleft braceright"
-        - "show_numbers backslash slash less greater equal bracketleft bracketright  BackSpace"
-        - "show_letters preferences space period comma Return"
+        - "~ ` | · √ π τ ÷ × ¶"
+        - "© ® £ € ¥ ^ ° * { }"
+        - "show_numbers \\ / < > = [ ]  BackSpace"
+        - "show_letters preferences space . CommaSpecial Return"
 buttons:
     Shift_L:
         action:
@@ -86,123 +86,23 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    period:
+    .:
         outline: "special"
-        text: "."
-    period_upper:
+    ·Special:
         outline: "special"
         text: "·"
-    comma:
+    CommaSpecial:
         outline: "special"
         text: ","
-    colon:
+    ":":
         outline: "special"
-        text: ":"
-    semicolon:
+    ;:
         outline: "special"
-        text: ";"
-    apostrophe:
+    ᾿:
         outline: "special"
-        text: "᾿"
-    exclam:
+    "!":
         outline: "special"
-        text: "!"
-    eis_l:
+    «:
         outline: "special"
-        text: "«"
-    eis_r:
+    »:
         outline: "special"
-        text: "»"
-    aring:
-        text: "å"
-    Aring:
-        text: "Å"
-    oslash:
-        text: "ø"
-    Oslash:
-        text: "Ø"
-    ae:
-        text: "æ"
-    AE:
-        text: "Æ"
-    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: "}"
-    backslash:
-        text: "\\"
-    slash:
-        text: "/"
-    quotedbl:
-        text: "\""
-    quoteright:
-        text: "'"
-    less:
-        text: "<"
-    greater:
-        text: ">"
-    question:
-        text: "?"
-    bracketleft:
-        text: "["
-    bracketright:
-        text: "]"
-

data/keyboards/gr_wide.yaml

@@ -1,4 +1,4 @@
-# Creaed by Sotiris Papadopoulos, sotirios.papadopoulos@inserm.fr
+# Created by Sotiris Papadopoulos, sotirios.papadopoulos@inserm.fr
 ---
 outlines:
     default:   { width: 80,  height: 60 }
@@ -9,30 +9,30 @@ outlines:
 
 views:
     base:
-        - "semicolon ς ε ρ τ υ θ ι ο π"
+        - "; ς ε ρ τ υ θ ι ο π"
         - "α σ δ φ γ η ξ κ λ show_accented"
         - "Shift_L ζ χ ψ ω β ν μ BackSpace"
-        - "show_numbers preferences space period comma Return"
+        - "show_numbers preferences space . CommaSpecial Return"
     upper:
-        - "colon exclam Ε Ρ Τ Υ Θ Ι Ο Π"
+        - ": ! Ε Ρ Τ Υ Θ Ι Ο Π"
         - "Α Σ Δ Φ Γ Η Ξ Κ Λ show_accented"
         - "Shift_L Ζ Χ Ψ Ω Β Ν Μ BackSpace"
-        - "show_numbers preferences space period_upper apostrophe Return"
+        - "show_numbers preferences space ·Special ᾿ Return"
     accented:
         - "ά έ ή ί ϊ ΐ ό ύ ϋ ώ "
         - "Ά Έ Ή Ί Ϊ Ό Ύ Ϋ Ώ show_base"
         - "Ϗ ϐ ϑ ϗ ΰ ϕ ϖ – — BackSpace"
-        - "show_numbers preferences space eis_l eis_r Return"
+        - "show_numbers preferences space « » Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
-        - "at numbersign dollar percent ampersand minus underscore plus parenleft parenright"
-        - "show_symbols comma quotedbl quoteright colon semicolon exclam question BackSpace"
-        - "show_letters preferences space period comma Return"
+        - "@ # $ % & - _ + ( )"
+        - "show_symbols CommaSpecial \" ' : ; ! ? BackSpace"
+        - "show_letters preferences space . CommaSpecial Return"
     symbols:
-        - "asciitilde quoteleft bar U00B7 squareroot Greek_pi Greek_tau division multiply paragraph"
-        - "copyright U00AE U00A3 EuroSign U00A5 asciicircum degree asterisk braceleft braceright"
-        - "show_numbers backslash slash less greater equal bracketleft bracketright  BackSpace"
-        - "show_letters preferences space period comma Return"
+        - "~ ` | · √ π τ ÷ × ¶"
+        - "© ® £ € ¥ ^ ° * { }"
+        - "show_numbers \\ / < > = [ ]  BackSpace"
+        - "show_letters preferences space . CommaSpecial Return"
 buttons:
     Shift_L:
         action:
@@ -83,122 +83,23 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    period:
+    .:
         outline: "special"
-        text: "."
-    period_upper:
+    ·Special:
         outline: "special"
         text: "·"
-    comma:
+    CommaSpecial:
         outline: "special"
         text: ","
-    colon:
+    ":":
         outline: "special"
-        text: ":"
-    semicolon:
+    ;:
         outline: "special"
-        text: ";"
-    apostrophe:
+    ᾿:
         outline: "special"
-        text: "᾿"
-    exclam:
+    "!":
         outline: "special"
-        text: "!"
-    eis_l:
+    «:
         outline: "special"
-        text: "«"
-    eis_r:
+    »:
         outline: "special"
-        text: "»"
-    aring:
-        text: "å"
-    Aring:
-        text: "Å"
-    oslash:
-        text: "ø"
-    Oslash:
-        text: "Ø"
-    ae:
-        text: "æ"
-    AE:
-        text: "Æ"
-    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: "}"
-    backslash:
-        text: "\\"
-    slash:
-        text: "/"
-    quotedbl:
-        text: "\""
-    quoteright:
-        text: "'"
-    less:
-        text: "<"
-    greater:
-        text: ">"
-    question:
-        text: "?"
-    bracketleft:
-        text: "["
-    bracketright:
-        text: "]"

data/keyboards/il.yaml

@@ -11,24 +11,24 @@ views:
         - "' - ק  ר א ט ו ן ם פ"
         - "ש ד ג כ ע י ח ל ך ף"
         - "ז ס ב ה נ מ צ ת ץ  BackSpace"
-        - "show_numbers comma preferences         space        period Return"
+        - "show_numbers CommaLarge preferences         space        . Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # ₪ % & - _ + ( )"
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
-        - "show_letters preferences         space        period Return"
+        - "show_symbols   , \" ' : ; ! ?  BackSpace"
+        - "show_letters preferences         space        . Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € $ ^ ° * { }"
         - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        period Return"
+        - "show_letters preferences         space        . Return"
 
 buttons:
     BackSpace:
         outline: "default"
         icon: "edit-clear-symbolic"
         action: erase
-    comma:
+    CommaLarge:
         outline: "special"
         text: ","
         
@@ -56,9 +56,8 @@ buttons:
             set_view: "symbols"
         outline: "altline"
         label: "*/="
-    period:
+    .:
         outline: "special"
-        text: "."
     space:
         outline: "spaceline"
         text: " "
@@ -66,6 +65,3 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    colon:
-        text: ":"
-

data/keyboards/il_wide.yaml

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

data/keyboards/ir.yaml

@@ -11,7 +11,7 @@ views:
         - "ض ص ث ق ف غ ع ه خ ح ج"
         - "ش س ی ب ل ا ت ن م ک گ"
         - "Shift_L  ظ ط ز ر ذ د پ و  BackSpace"
-        - "show_numbers preferences         space     zwnj period Return"
+        - "show_numbers preferences         space     zwnj . Return"
     upper:
         - "  ْ  ٌ  ٍ  ً  ُ  ِ  َ  ّ # @ چ"
         - "_ ئ ي إ أ آ ة » « : ؛"
@@ -21,12 +21,12 @@ views:
         - "۱ ۲ ۳ ۴ ۵ ۶ ۷ ۸ ۹ ۰ |"
         - "… ٬ ٫ ﷼ ٪ ، * ) ( − ـ"
         - "show_symbols + - × ÷ = ^ % / BackSpace"
-        - "show_letters preferences         space        period Return"
+        - "show_letters preferences         space        . Return"
     symbols:
         - "& ` | · • % π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
         - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        period Return"
+        - "show_letters preferences         space        . Return"
 
 buttons:
     Shift_L:
@@ -64,9 +64,8 @@ buttons:
             set_view: "symbols"
         outline: "altline"
         label: "*/="
-    period:
+    .:
         outline: "special"
-        text: "."
     space:
         outline: "spaceline"
         text: " "
@@ -77,5 +76,3 @@ buttons:
     zwnj:
         icon: "zwnj"
         text: "‌"
-    colon:
-        text: ":"

data/keyboards/ir_wide.yaml

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

data/keyboards/it+fur_wide.yaml

@@ -0,0 +1,89 @@
+# Friulian layout created by Fabio Tomat
+# 14 october 2020
+---
+outlines:
+    default:   { width: 52,    height: 42 }
+    altline:   { width: 77.52, height: 42 }
+    wide:      { width: 91.26, height: 42 }
+    spaceline: { width: 146.7, height: 42 }
+    special:   { width: 64.76, height: 42 }
+
+views:
+    base:
+        - "q w e r t y u i o p"
+        - "a s d f g h j k l"
+        - "Shift_L   z x c v b n m  BackSpace"
+        - "show_numbers show_eschars preferences         space        , . Return"
+    upper:
+        - "Q W E R T Y U I O P"
+        - "A S D F G H J K L"
+        - "Shift_L   Z X C V B N M  BackSpace"
+        - "show_numbers show_eschars preferences         space        “ ” Return"
+    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_numbers_from_symbols:
+        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"
+

data/keyboards/it_wide.yaml

@@ -0,0 +1,87 @@
+# Italian layout created by Antonio Pandolfo
+# 03 october 2019
+---
+outlines:
+    default:   { width: 52,    height: 42 }
+    altline:   { width: 77.52, height: 42 }
+    wide:      { width: 91.26, height: 42 }
+    spaceline: { width: 146.7, height: 42 }
+    special:   { width: 64.76, height: 42 }
+
+views:
+    base:
+        - "q w e r t y u i o p"
+        - "a s d f g h j k l"
+        - "Shift_L   z x c v b n m  BackSpace"
+        - "show_numbers show_eschars preferences         space        , . Return"
+    upper:
+        - "Q W E R T Y U I O P"
+        - "A S D F G H J K L"
+        - "Shift_L   Z X C V B N M  BackSpace"
+        - "show_numbers show_eschars preferences         space        ? . Return"
+    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: "default"
+        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_symbols:
+        action:
+            set_view: "symbols"
+        outline: "altline"
+        label: "*/="
+    show_eschars:
+        action:
+            set_view: "eschars"
+        outline: "altline"
+        label: "àè"
+    space:
+        outline: "spaceline"
+        label: " "
+        text: " "
+    Return:
+        outline: "altline"
+        icon: "key-enter"
+        keysym: "Return"
+

data/keyboards/no.yaml

@@ -23,8 +23,8 @@ views:
         - "show_symbols   , \" ' : ; ! ?  BackSpace"
         - "show_letters preferences         space        .    Return"
     symbols:
-        - "~ ` | U00B7 squareroot Greek_pi Greek_tau division multiply paragraph"
-        - "copyright U00AE U00A3 EuroSign U00A5 asciicircum degree * { }"
+        - "~ ` | · √ π τ ÷ × ¶"
+        - "© ® £ € ¥ ^ ° * { }"
         - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
         - "show_letters preferences         space        .    Return"
 
@@ -73,32 +73,3 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    U00B7:
-        text: "·"
-    squareroot:
-        text: "√"
-    Greek_pi:
-        text: "π"
-    division:
-        text: "÷"
-    multiply:
-        text: "×"
-    paragraph:
-        text: "¶"
-    Greek_tau:
-        text: "τ"
-    copyright:
-        text: "©"
-    U00AE:
-        text: "®"
-    U00A3:
-        text: "£"
-    EuroSign:
-        text: "€"
-    U00A5:
-        text: "¥"
-    asciicircum:
-        text: "^"
-    degree:
-        text: "°"
-

data/keyboards/no_wide.yaml

@@ -0,0 +1,75 @@
+---
+outlines:
+    default:   { width: 48,       height: 42 }
+    altline:   { width: 72.59,    height: 42 }
+    wide:      { width: 96,       height: 42 }
+    spaceline: { width: 213,      height: 42 }
+    special:   { width: 66,       height: 42 }
+
+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"
+        - "@ # $ % & - _ + ( )"
+        - "show_symbols   , \" ' : ; ! ?  BackSpace"
+        - "show_letters preferences         space        .    Return"
+    symbols:
+        - "~ ` | · √ π τ ÷ × ¶"
+        - "© ® £ € ¥ ^ ° * { }"
+        - "show_numbers_from_symbols   \\ / < > = [ ]  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:
+        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: "*/="
+    ".":
+        outline: "special"
+    space:
+        outline: spaceline
+        text: " "
+    Return:
+        outline: "wide"
+        icon: "key-enter"
+        keysym: "Return"

data/keyboards/number/us_wide.yaml

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

data/keyboards/pin/us_wide.yaml

@@ -0,0 +1,20 @@
+---
+margins: { top: 4, side: 0, bottom: 4 }
+outlines:
+    default: { width: 120, height: 52 }
+
+views:
+    base:
+        - "1 2 3"
+        - "4 5 6"
+        - "7 8 9"
+        - "BackSpace 0 Return"
+
+buttons:
+    BackSpace:
+        icon: "edit-clear-symbolic"
+        action: erase
+    Return:
+        icon: "key-enter"
+        keysym: "Return"
+

data/keyboards/pl.yaml

@@ -20,13 +20,13 @@ views:
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
-        - "show_letters preferences         space        period Return"
+        - "show_symbols   , \" ' : ; ! ?  BackSpace"
+        - "show_letters preferences         space        . Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
         - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        period Return"
+        - "show_letters preferences         space        . Return"
     accents:
         - "q w ę r t y u i ó p"
         - "ą ś d f g h j k ł"
@@ -100,9 +100,8 @@ buttons:
                     - "accents"
         outline: "altline"
         label: "ĄĘ"
-    period:
+    .:
         outline: "altline"
-        text: "."
     space:
         outline: "spaceline"
         text: " "
@@ -110,5 +109,3 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    colon:
-        text: ":"

data/keyboards/pl_wide.yaml

@@ -20,13 +20,13 @@ views:
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
-        - "show_letters preferences         space        period Return"
+        - "show_symbols   , \" ' : ; ! ?  BackSpace"
+        - "show_letters preferences         space        . Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
         - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        period Return"
+        - "show_letters preferences         space        . Return"
     accents:
         - "q w ę r t y u i ó p"
         - "ą ś d f g h j k ł"
@@ -88,9 +88,8 @@ buttons:
                 unlock_view: "upper"
         outline: "altline"
         label: "ĄĘ"
-    period:
+    .:
         outline: "altline"
-        text: "."
     space:
         outline: "spaceline"
         text: " "
@@ -98,5 +97,3 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    colon:
-        text: ":"

data/keyboards/ro.yaml

@@ -20,7 +20,7 @@ views:
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # € % & - _ + ( )"
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
+        - "show_symbols   , \" ' : ; ! ?  BackSpace"
         - "show_letters show_eschars preferences         space        . Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
@@ -83,7 +83,3 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    colon:
-        text: ":"
-    "\"":
-        keysym: "quotedbl"

data/keyboards/ro_wide.yaml

@@ -20,7 +20,7 @@ views:
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # € % & - _ + ( )"
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
+        - "show_symbols   , \" ' : ; ! ?  BackSpace"
         - "show_letters show_eschars preferences         space        . Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
@@ -83,7 +83,3 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    colon:
-        text: ":"
-    "\"":
-        keysym: "quotedbl"

data/keyboards/ru.yaml

@@ -13,7 +13,7 @@ views:
         - "й ц у к е н г ш щ з х"
         - "ф ы в а п р о л д ж э"
         - "Shift_L  я ч с м и т ь б ю  BackSpace"
-        - "show_numbers preferences    ё  space  ъ  period Return"
+        - "show_numbers preferences    ё  space  ъ  . Return"
     upper:
         - "Й Ц У К Е Н Г Ш Щ З Х"
         - "Ф Ы В А П Р О Л Д Ж Э"
@@ -22,13 +22,13 @@ views:
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
-        - "show_letters preferences         space_fill   period Return"
+        - "show_symbols   , \" ' : ; ! ?  BackSpace"
+        - "show_letters preferences         space_fill   . Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
         - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space_fill   period Return"
+        - "show_letters preferences         space_fill   . Return"
 
 buttons:
     Shift_L:
@@ -66,9 +66,8 @@ buttons:
             set_view: "symbols"
         outline: "wide"
         label: "*/="
-    period:
+    .:
         outline: "special"
-        text: "."
     comma:
         outline: "special"
         text: ","
@@ -82,8 +81,6 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    colon:
-        text: ":"
     ё:
         outline: "narrow"
     Ё:

data/keyboards/ru_wide.yaml

@@ -0,0 +1,91 @@
+---
+outlines:
+    default:   { width: 48,    height: 42 }
+    altline:   { width: 48,    height: 42 }
+    wide:      { width: 85.5,  height: 42 }
+    narrow:    { width: 39,    height: 42 }
+    spaceline: { width: 160.5, height: 42 }
+    fill:      { width: 238.5, height: 42 }
+    special:   { width: 63,    height: 42 }
+
+views:
+    base:
+        - "й ц у к е н г ш щ з х"
+        - "ф ы в а п р о л д ж э"
+        - "Shift_L  я ч с м и т ь б ю  BackSpace"
+        - "show_numbers preferences    ё  space  ъ  . Return"
+    upper:
+        - "Й Ц У К Е Н Г Ш Щ З Х"
+        - "Ф Ы В А П Р О Л Д Ж Э"
+        - "Shift_L   Я Ч С М И Т Ь Б Ю  BackSpace"
+        - "show_numbers preferences    Ё  space  Ъ  comma Return"
+    numbers:
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "@ # $ % & - _ + ( )"
+        - "show_symbols   , \" ' : ; ! ?  BackSpace"
+        - "show_letters preferences         space_fill   . Return"
+    symbols:
+        - "~ ` | · √ π τ ÷ × ¶"
+        - "© ® £ € ¥ ^ ° * { }"
+        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
+        - "show_letters preferences         space_fill   . 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: "wide"
+        label: "123"
+    show_letters:
+        action:
+            set_view: "base"
+        outline: "wide"
+        label: "АБВ"
+    show_symbols:
+        action:
+            set_view: "symbols"
+        outline: "wide"
+        label: "*/="
+    .:
+        outline: "special"
+    comma:
+        outline: "special"
+        text: ","
+    space:
+        outline: "spaceline"
+        text: " "
+    space_fill:
+        outline: "fill"
+        text: " "
+    Return:
+        outline: "wide"
+        icon: "key-enter"
+        keysym: "Return"
+    ё:
+        outline: "narrow"
+    Ё:
+        outline: "narrow"
+    ъ:
+        outline: "narrow"
+    Ъ:
+        outline: "narrow"

data/keyboards/se.yaml

@@ -20,13 +20,13 @@ views:
         - "show_numbers preferences         space        .    Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
-        - "at numbersign dollar percent ampersand minus underscore plus parenleft parenright"
-        - "show_symbols   comma quotedbl quoteright colon semicolon exclam question  BackSpace"
+        - "@ # $ % & - _ + ( )"
+        - "show_symbols   , \" ' : ; ! ?  BackSpace"
         - "show_letters preferences         space        .    Return"
     symbols:
-        - "asciitilde quoteleft bar U00B7 squareroot Greek_pi Greek_tau division multiply paragraph"
-        - "copyright U00AE U00A3 EuroSign U00A5 asciicircum degree asterisk braceleft braceright"
-        - "show_numbers_from_symbols   backslash slash less greater equal bracketleft bracketright  BackSpace"
+        - "~ ` | · √ π τ ÷ × ¶"
+        - "© ® £ € ¥ ^ ° * { }"
+        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
         - "show_letters preferences         space        .    Return"
 
 buttons:
@@ -74,91 +74,3 @@ buttons:
         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: "]"

data/keyboards/se_wide.yaml

@@ -20,13 +20,13 @@ views:
         - "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_symbols   , \" ' : ; ! ?  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_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
         - "show_letters preferences         space        .    Return"
 
 buttons:
@@ -74,91 +74,3 @@ buttons:
         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: "]"

data/keyboards/terminal/de.yaml

@@ -1,15 +1,15 @@
 ---
 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 }
+    default:   { width: 35.33,  height: 46 }
+    halfwidth: { width: 17.665, height: 46 }
+    narrow:    { width: 26.335, height: 46 }
+    special:   { width: 44,     height: 46 }
+    altline:   { width: 52.67,  height: 46 }
+    large:     { width: 52.67,  height: 46 }
+    action:    { width: 59,     height: 46 }
+    wide:      { width: 59,     height: 46 }
+    spaceline: { width: 92.29,  height: 46 }
+    small:     { width: 50.471, height: 22 }
 
 views:
     base:
@@ -19,7 +19,7 @@ views:
         - "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"
+        - "TabSmall Ctrl Alt PageUp PageDown 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"
@@ -28,14 +28,14 @@ views:
         - "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"
+        - "show_symbols   , \" ' : ; ! ?  BackSpace"
+        - "show_letters show_eschars preferences         space        . Return"
     symbols:
         - "TabSmall Ctrl Alt ↑ ↓ ← →"
         - "~ ` · √ π τ ÷ × ¶ @"
         - "© ® £ € ¥ ^ ° { }"
-        - "show_numbers_from_symbols   % | < > = [ ]  BackSpace"
-        - "show_letters show_eschars preferences         space        period Return"
+        - "show_numbers   % | < > = [ ]  BackSpace"
+        - "show_letters show_eschars preferences         space        . Return"
     eschars:
         - "TabSmall Ctrl Alt ↑ ↓ ← →"
         - "ä è é ö ü Ä È É Ö Ü"
@@ -43,7 +43,7 @@ views:
         - "show_numbers  « » ç Ç æ œ ß  BackSpace"
         - "show_letters show_eschars preferences         space        „ “ Return"
     actions:
-        - "TabSmall Ctrl Alt PgUp PgDn Home End"
+        - "TabSmall Ctrl Alt PageUp PageDown Home End"
         - "F1  F2  F3  F4  F5  F6"
         - "F7  F8  F9  F10 F11 F12"
         - "Esc Tab Pause Insert Up Del"
@@ -70,11 +70,6 @@ buttons:
             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"
@@ -102,9 +97,8 @@ buttons:
             set_view: "actions"
         outline: "altline"
         label: ">_"
-    period:
+    .:
         outline: "large"
-        text: "."
     space:
         outline: "spaceline"
         text: " "
@@ -112,8 +106,6 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    colon:
-        text: ":"
     F1:
         outline: "action"
         keysym: "F1"
@@ -187,14 +179,14 @@ buttons:
         outline: "small"
         keysym: "End"
         label: "Ende"
-    PgUp:
+    PageUp:
         outline: "small"
         keysym: "Page_Up"
-        label: "Bild↑"
-    PgDn:
+        label: "Bild ↑"
+    PageDown:
         outline: "small"
         keysym: "Page_Down"
-        label: "Bild↓"
+        label: "Bild ↓"
     "↑":
         outline: "small"
         keysym: "Up"

data/keyboards/terminal/de_wide.yaml

@@ -19,7 +19,7 @@ views:
         - "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"
+        - "EscSmall TabSmall Ctrl Alt PageUp PageDown 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"
@@ -28,14 +28,14 @@ views:
         - "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"
+        - "show_symbols   , \" ' : ; ! ?  BackSpace"
+        - "show_letters show_eschars preferences         space        . Return"
     symbols:
         - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
         - "~ ` · √ π τ ÷ × ¶ @"
         - "© ® £ € ¥ ^ ° { }"
-        - "show_numbers_from_symbols   % | < > = [ ]  BackSpace"
-        - "show_letters show_eschars preferences         space        period Return"
+        - "show_numbers   % | < > = [ ]  BackSpace"
+        - "show_letters show_eschars preferences         space        . Return"
     eschars:
         - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
         - "ä è é ö ü Ä È É Ö Ü"
@@ -43,7 +43,7 @@ views:
         - "show_numbers  « » ç Ç æ œ ß  BackSpace"
         - "show_letters show_eschars preferences         space        „ “ Return"
     actions:
-        - "EscSmall TabSmall Ctrl Alt PgUp PgDn Home End"
+        - "EscSmall TabSmall Ctrl Alt PageUp PageDown Home End"
         - "F1  F2  F3  F4  F5  F6"
         - "F7  F8  F9  F10 F11 F12"
         - "Esc Tab Pause Insert Up Del"
@@ -70,11 +70,6 @@ buttons:
             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"
@@ -102,9 +97,8 @@ buttons:
             set_view: "actions"
         outline: "altline"
         label: ">_"
-    period:
+    .:
         outline: "large"
-        text: "."
     space:
         outline: "spaceline"
         text: " "
@@ -112,8 +106,6 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    colon:
-        text: ":"
     F1:
         outline: "action"
         keysym: "F1"
@@ -191,14 +183,14 @@ buttons:
         outline: "small"
         keysym: "End"
         label: "Ende"
-    PgUp:
+    PageUp:
         outline: "small"
         keysym: "Page_Up"
-        label: "Bild↑"
-    PgDn:
+        label: "Bild ↑"
+    PageDown:
         outline: "small"
         keysym: "Page_Down"
-        label: "Bild↓"
+        label: "Bild ↓"
     "↑":
         outline: "small"
         keysym: "Up"

data/keyboards/terminal/es.yaml

@@ -1,47 +1,49 @@
 ---
 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 }
+    default:   { width: 35.33,  height: 46 }
+    halfwidth: { width: 17.665, height: 46 }
+    thin:      { width: 30.995, height: 46 }
+    action:    { width: 59,     height: 46 }
+    altline:   { width: 52.67,  height: 46 }
+    large:     { width: 52.67,  height: 46 }
+    wide:      { width: 59,     height: 46 }
+    spaceline: { width: 92.29,  height: 46 }
+    special:   { width: 44,     height: 46 }
+    small:     { width: 50.471, height: 22 }
 
 views:
     base:
         - "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 show_eschars preferences      space        show_actions Return"
     upper:
-        - "TabSmall Ctrl Alt PgUp PgDn Home End"
+        - "TabSmall Ctrl Alt PageUp PageDown 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"
+        - "SlashSmall A S D F G H J K L PipeSmall"
+        - "Shift_L   Z 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_symbols , \" ' : ; ! ?  BackSpace"
         - "show_letters show_eschars preferences         space        . Return"
     symbols:
         - "TabSmall Ctrl Alt ↑ ↓ ← →"
-        - "~ ` | · √ π τ ÷ × ¶"
-        - "© ® £ $ ¥ ^ ° @ { }"
-        - "show_numbers   \\ % < > = [ ]  BackSpace"
+        - "~ ` · √ π τ ÷ × ¶ @"
+        - "© ® £ € ¥ ^ ° { }"
+        - "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"
+        - "show_numbers ü ç ï ñ Ü Ç Ï Ñ BackSpace"
+        - "show_letters show_eschars preferences        space        show_actions Return"
     actions:
-        - "TabSmall Ctrl Alt PgUp PgDn Home End"
+        - "TabSmall Ctrl Alt PageUp PageDown Home End"
         - "F1  F2  F3  F4  F5  F6"
         - "F7  F8  F9  F10 F11 F12"
         - "Esc Tab Pause Insert Up Del"
@@ -85,9 +87,11 @@ buttons:
         label: "τ=\\"
     show_eschars:
         action:
-            set_view: "eschars"
+            locking:
+                lock_view: "eschars"
+                unlock_view: "base"
         outline: "altline"
-        label: "áÁ"
+        label: "Áá"
     show_actions:
         action:
             set_view: "actions"
@@ -103,8 +107,6 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    colon:
-        text: ":"
     F1:
         outline: "action"
         keysym: "F1"
@@ -154,34 +156,38 @@ buttons:
     Del:
         outline: "action"
         keysym: "Delete"
-    DelUp:
-        outline: "altline"
-        keysym: "Delete"
-        label: "Del"
+        label: "Supr"
     Insert:
         outline: "action"
         keysym: "Insert"
     Menu:
         outline: "action"
         keysym: "Menu"
+        label: "Menú"
     Pause:
         outline: "action"
         keysym: "Pause"
+        label: "Pausa"
     Break:
         outline: "action"
         keysym: "Break"
+        label: "Inter"
     Home:
         outline: "small"
         keysym: "Home"
+        label: "Inicio"
     End:
         outline: "small"
         keysym: "End"
-    PgUp:
+        label: "Fin"
+    PageUp:
         outline: "small"
         keysym: "Page_Up"
-    PgDn:
+        label: "Pág ↑"
+    PageDown:
         outline: "small"
         keysym: "Page_Down"
+        label: "Pág ↓"
     "↑":
         outline: "small"
         keysym: "Up"
@@ -218,3 +224,35 @@ buttons:
         modifier: "Alt"
         outline: "small"
         label: "Alt"
+    ü:
+        outline: "thin"
+    ç:
+        outline: "thin"
+    ï:
+        outline: "thin"
+    ñ:
+        outline: "thin"
+    Ü:
+        outline: "thin"
+    Ç:
+        outline: "thin"
+    Ï:
+        outline: "thin"
+    Ñ:
+        outline: "thin"
+    MinusSmall:
+        outline: "halfwidth"
+        text: "-"
+    SlashSmall:
+        outline: "halfwidth"
+        text: "/"
+    PipeSmall:
+        outline: "halfwidth"
+        text: "|"
+    PeriodSmall:
+        outline: "halfwidth"
+        text: "."
+    "\\":
+        outline: "halfwidth"
+    _:
+        outline: "halfwidth"

data/keyboards/terminal/es_wide.yaml

@@ -1,47 +1,49 @@
 ---
 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 }
+    default:   { width: 54,    height: 37 }
+    halfwidth: { width: 27,    height: 37 }
+    thin:      { width: 47.25, height: 37 }
+    action:    { width: 90,    height: 37 }
+    altline:   { width: 81,    height: 37 }
+    large:     { width: 81,    height: 37 }
+    wide:      { width: 90,    height: 37 }
+    spaceline: { width: 153,   height: 37 }
+    special:   { width: 54,    height: 37 }
+    small:     { width: 67.4,  height: 22 }
 
 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 show_eschars preferences    space    show_actions Return"
     upper:
-        - "EscSmall TabSmall Ctrl Alt PgUp PgDn Home End"
+        - "EscSmall TabSmall Ctrl Alt PageUp PageDown 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"
+        - "SlashSmall A S D F G H J K L PipeSmall"
+        - "Shift_L   Z 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_symbols , \" ' : ; ! ?  BackSpace"
         - "show_letters show_eschars preferences         space        . Return"
     symbols:
         - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
-        - "~ ` | · √ π τ ÷ × ¶"
-        - "© ® £ € ¥ ^ ° @ { }"
-        - "show_numbers   \\ % < > = [ ]  BackSpace"
+        - "~ ` · √ π τ ÷ × ¶ @"
+        - "© ® £ € ¥ ^ ° { }"
+        - "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"
+        - "show_numbers ü ç ï ñ Ü Ç Ï Ñ BackSpace"
+        - "show_letters show_eschars preferences        space        show_actions Return"
     actions:
-        - "EscSmall TabSmall Ctrl Alt PgUp PgDn Home End"
+        - "EscSmall TabSmall Ctrl Alt PageUp PageDown Home End"
         - "F1  F2  F3  F4  F5  F6"
         - "F7  F8  F9  F10 F11 F12"
         - "Esc Tab Pause Insert Up Del"
@@ -85,9 +87,11 @@ buttons:
         label: "τ=\\"
     show_eschars:
         action:
-            set_view: "eschars"
+            locking:
+                lock_view: "eschars"
+                unlock_view: "base"
         outline: "altline"
-        label: "áÁ"
+        label: "Áá"
     show_actions:
         action:
             set_view: "actions"
@@ -103,8 +107,6 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    colon:
-        text: ":"
     F1:
         outline: "action"
         keysym: "F1"
@@ -158,34 +160,38 @@ buttons:
     Del:
         outline: "action"
         keysym: "Delete"
-    DelUp:
-        outline: "altline"
-        keysym: "Delete"
-        label: "Del"
+        label: "Supr"
     Insert:
         outline: "action"
         keysym: "Insert"
     Menu:
         outline: "action"
         keysym: "Menu"
+        label: "Menú"
     Pause:
         outline: "action"
         keysym: "Pause"
+        label: "Pausa"
     Break:
         outline: "action"
         keysym: "Break"
+        label: "Inter"
     Home:
         outline: "small"
         keysym: "Home"
+        label: "Inicio"
     End:
         outline: "small"
         keysym: "End"
-    PgUp:
+        label: "Fin"
+    PageUp:
         outline: "small"
         keysym: "Page_Up"
-    PgDn:
+        label: "Pág ↑"
+    PageDown:
         outline: "small"
         keysym: "Page_Down"
+        label: "Pág ↓"
     "↑":
         outline: "small"
         keysym: "Up"
@@ -222,3 +228,35 @@ buttons:
         modifier: "Alt"
         outline: "small"
         label: "Alt"
+    ü:
+        outline: "thin"
+    ç:
+        outline: "thin"
+    ï:
+        outline: "thin"
+    ñ:
+        outline: "thin"
+    Ü:
+        outline: "thin"
+    Ç:
+        outline: "thin"
+    Ï:
+        outline: "thin"
+    Ñ:
+        outline: "thin"
+    MinusSmall:
+        outline: "halfwidth"
+        text: "-"
+    SlashSmall:
+        outline: "halfwidth"
+        text: "/"
+    PipeSmall:
+        outline: "halfwidth"
+        text: "|"
+    PeriodSmall:
+        outline: "halfwidth"
+        text: "."
+    "\\":
+        outline: "halfwidth"
+    _:
+        outline: "halfwidth"

data/keyboards/terminal/fr+bepo.yaml

@@ -1,50 +1,52 @@
 ---
 outlines:
-    action:    { width: 59,    height: 46 }
-    small:     { width: 50,    height: 22 }
-    default:   { width: 35.33, height: 46 }
-    altline:   { width: 35.33, height: 46 }
-    wide:      { width: 50,    height: 46 }
-    spaceline: { width: 110,   height: 46 }
-    special:   { width: 35.33,    height: 46 }
+    default:   { width: 35.33,  height: 46 }
+    halfwidth: { width: 17.665, height: 46 }
+    action:    { width: 59,     height: 46 }
+    altline:   { width: 42,     height: 46 }
+    wide:      { width: 50,     height: 46 }
+    narrow:    { width: 22.5,   height: 46 }
+    spaceline: { width: 119.47, height: 46 }
+    special:   { width: 35.33,  height: 46 }
+    small:     { width: 50.471, height: 22 }
 
 views:
     base:
-        - "Ctrl Alt Tabsmall ↑ ↓ ← →"
+        - "TabSmall Ctrl Alt ↑ ↓ ← →"
         - "b é p o w v d l j z"
         - "a u i e c t s r n m"
-        - "Shift_L y x k q g h f period BackSpace"
-        - "show_numbers preferences slash  space  show_eschars show_actions Return"
+        - "Shift_L y x k q g h f . BackSpace"
+        - "show_numbers show_eschars preferences   space SlashSmall show_actions Return"
     upper:
-        - "Ctrl Alt Tabsmall PgUp PgDn Home End"
+        - "TabSmall Ctrl Alt PageUp PageDown Home End"
         - "B É P O W V D L J Z"
         - "A U I E C T S R N M"
-        - "Shift_L   Y X K Q G H F -  BackSpace"
-        - "show_numbers preferences  space  colon  show_eschars show_actions Return"
+        - "Shift_L   Y X K Q G H F MinusSmall  BackSpace"
+        - "show_numbers show_eschars preferences   space  ColonSmall  show_actions Return"
     numbers:
-        - "Ctrl Alt Tabsmall ↑ ↓ ← →"
+        - "TabSmall Ctrl Alt ↑ ↓ ← →"
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # € % & - _ + ( )"
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
-        - "show_letters preferences         space        show_eschars show_actions Return"
+        - "show_symbols   , \" ' : ; ! ? .  BackSpace"
+        - "show_letters show_eschars preferences        space    SlashSmall     show_actions Return"
     symbols:
-        - "Ctrl Alt Tabsmall ↑ ↓ ← →"
+        - "TabSmall Ctrl Alt ↑ ↓ ← →"
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ $ ¥ ^ ° * { }"
-        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        show_eschars show_actions Return"
+        - "show_numbers   \\ / < > = [ ] .  BackSpace"
+        - "show_letters show_eschars preferences        space    SlashSmall     show_actions Return"
     eschars:
-        - "Ctrl Alt Tabsmall ↑ ↓ ← →"
+        - "TabSmall Ctrl Alt ↑ ↓ ← →"
         - "à â ç é è ê î ô ù û"
         - "À Â Ç É È Ê Î Ô Ù Û"
-        - "show_numbers_from_symbols  æ œ ä ë ï ö ü  BackSpace"
-        - "show_letters preferences         space        show_eschars show_actions Return"
+        - "show_numbers  æ œ ä ë ï ö ü .  BackSpace"
+        - "show_letters show_eschars preferences        space    SlashSmall     show_actions Return"
     actions:
-        - "Ctrl Alt PgUp PgDn Home End"
+        - "TabSmall Ctrl Alt PageUp PageDown 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:
@@ -87,19 +89,22 @@ buttons:
     Esc:
         outline: "action"
         keysym: "Escape"
+        label: "Echap"
     Tab:
         outline: "action"
         keysym: "Tab"
-    Tabsmall:
+    TabSmall:
         outline: "small"
         keysym: "Tab"
         label: "Tab"
     Del:
         outline: "action"
         keysym: "Delete"
+        label: "Suppr"
     Insert:
         outline: "action"
         keysym: "Insert"
+        label: "Inser"
     Menu:
         outline: "action"
         keysym: "Menu"
@@ -109,18 +114,23 @@ buttons:
     Break:
         outline: "action"
         keysym: "Break"
+        label: "Attn"
     Home:
         outline: "small"
         keysym: "Home"
+        label: "🡔"
     End:
         outline: "small"
         keysym: "End"
-    PgUp:
+        label: "Fin"
+    PageUp:
         outline: "small"
         keysym: "Page_Up"
-    PgDn:
+        label: "Page ↑"
+    PageDown:
         outline: "small"
         keysym: "Page_Down"
+        label: "Page ↓"
     "↑":
         outline: "small"
         keysym: "Up"
@@ -157,16 +167,10 @@ buttons:
         modifier: "Alt"
         outline: "small"
         label: "Alt"
-    period:
-        outline: "special"
-        text: "."
-    slash:
-        outline: "special"
-        text: "/"
     show_actions:
         action:
             set_view: "actions"
-        outline: "special"
+        outline: "altline"
         label: ">_"
     Shift_L:
         action:
@@ -186,14 +190,14 @@ buttons:
     show_numbers:
         action:
             set_view: "numbers"
-        outline: "wide"
-        label: "123"
-    show_numbers_from_symbols:
-        action:
-            set_view: "numbers"
-        outline: "wide"
+        outline: "altline"
         label: "123"
     show_letters:
+        action:
+            set_view: "base"
+        outline: "altline"
+        label: "ABC"
+    show_letters_actions:
         action:
             set_view: "base"
         outline: "wide"
@@ -201,7 +205,7 @@ buttons:
     show_symbols:
         action:
             set_view: "symbols"
-        outline: "wide"
+        outline: "altline"
         label: "*/="
     show_eschars:
         action:
@@ -209,7 +213,7 @@ buttons:
                 lock_view: "eschars"
                 unlock_view: "base"
         outline: "altline"
-        label: "âÂ"
+        label: "Ââ"
     space:
         outline: "spaceline"
         text: " "
@@ -217,7 +221,14 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    colon:
+    ColonSmall:
+        outline: "narrow"
         text: ":"
-    "\"":
-        keysym: "quotedbl"
+    MinusSmall:
+        outline: "narrow"
+        text: "-"
+    SlashSmall:
+        outline: "narrow"
+        text: "/"
+    .:
+        outline: "narrow"

data/keyboards/terminal/fr+bepo_wide.yaml

@@ -1,50 +1,53 @@
 ---
 outlines:
     default:   { width: 54,   height: 37 }
-    action:    { width: 90,   height: 37 }
-    small:     { width: 67.4, height: 22 }
-    altline:   { width: 81,   height: 37 }
-    wide:      { width: 100,  height: 37 }
-    spaceline: { width: 110,  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 ↑ ↓ ← →"
         - "b é p o w v d l j z"
         - "a u i e c t s r n m"
-        - "Shift_L y x k q g h f period BackSpace"
-        - "show_numbers preferences         space    slash show_eschars show_actions Return"
+        - "Shift_L y x k q g h f . BackSpace"
+        - "show_numbers show_eschars preferences        space   SlashSmall   show_actions Return"
     upper:
-        - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
+        - "EscSmall TabSmall Ctrl Alt PageUp PageDown ← →"
         - "B É P O W V D L J Z"
         - "A U I E C T S R N M"
-        - "Shift_L   Y X K Q G H F -  BackSpace"
-        - "show_numbers preferences         space  colon   show_eschars show_actions Return"
+        - "Shift_L   Y X K Q G H F MinusSmall  BackSpace"
+        - "show_numbers show_eschars preferences        space   ColonSmall   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        show_eschars show_actions Return"
+        - "show_symbols   , \" ' : ; ! ?  BackSpace"
+        - "show_letters show_eschars preferences        space         show_actions Return"
     symbols:
         - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"    
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ $ ¥ ^ ° * { }"
-        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        show_eschars show_actions Return"
+        - "show_numbers   \\ / < > = [ ]  BackSpace"
+        - "show_letters show_eschars preferences        space         show_actions Return"
     eschars:
         - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"        
         - "à â ç é è ê î ô ù û"
         - "À Â Ç É È Ê Î Ô Ù Û"
-        - "show_numbers_from_symbols  æ œ ä ë ï ö ü  BackSpace"
-        - "show_letters preferences         space        show_eschars show_actions Return"
+        - "show_numbers  æ œ ä ë ï ö ü  BackSpace"
+        - "show_letters show_eschars preferences        space         show_actions Return"
     actions:
-        - "EscSmall TabSmall Ctrl Alt PgUp PgDn Home End"
+        - "EscSmall TabSmall Ctrl Alt PageUp PageDown 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:
@@ -87,10 +90,11 @@ buttons:
     Esc:
         outline: "action"
         keysym: "Escape"
+        label: "Echap"
     EscSmall:
         outline: "small"
         keysym: "Escape"
-        label: "Esc"
+        label: "Echap"
     Tab:
         outline: "action"
         keysym: "Tab"
@@ -101,9 +105,11 @@ buttons:
     Del:
         outline: "action"
         keysym: "Delete"
+        label: "Suppr"
     Insert:
         outline: "action"
         keysym: "Insert"
+        label: "Inser"
     Menu:
         outline: "action"
         keysym: "Menu"
@@ -113,18 +119,23 @@ buttons:
     Break:
         outline: "action"
         keysym: "Break"
+        label: "Attn"
     Home:
         outline: "small"
         keysym: "Home"
+        label: "🡔"
     End:
         outline: "small"
         keysym: "End"
-    PgUp:
+        label: "Fin"
+    PageUp:
         outline: "small"
         keysym: "Page_Up"
-    PgDn:
+        label: "Page ↑"
+    PageDown:
         outline: "small"
         keysym: "Page_Down"
+        label: "Page ↓"
     "↑":
         outline: "small"
         keysym: "Up"
@@ -161,16 +172,10 @@ buttons:
         modifier: "Alt"
         outline: "small"
         label: "Alt"
-    period:
-        outline: "special"
-        text: "."
-    slash:
-        outline: "special"
-        text: "/"
     show_actions:
         action:
             set_view: "actions"
-        outline: "special"
+        outline: "altline"
         label: ">_"
     Shift_L:
         action:
@@ -188,16 +193,16 @@ buttons:
         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: "altline"
+        label: "ABC"
+    show_letters_actions:
         action:
             set_view: "base"
         outline: "wide"
@@ -213,7 +218,7 @@ buttons:
                 lock_view: "eschars"
                 unlock_view: "base"
         outline: "altline"
-        label: "âÂ"
+        label: "Ââ"
     space:
         outline: "spaceline"
         text: " "
@@ -221,7 +226,14 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    colon:
+    ColonSmall:
+        outline: "halfwidth"
         text: ":"
-    "\"":
-        keysym: "quotedbl"
+    MinusSmall:
+        outline: "halfwidth"
+        text: "-"
+    SlashSmall:
+        outline: "halfwidth"
+        text: "/"
+    .:
+        outline: "halfwidth"

data/keyboards/terminal/fr.yaml

@@ -1,50 +1,51 @@
 ---
 outlines:
-    action:    { width: 59,    height: 46 }
-    small:     { width: 50,    height: 22 }
-    default:   { width: 35.33, height: 46 }
-    altline:   { width: 48,    height: 46 }
-    wide:      { width: 50,    height: 46 }
-    spaceline: { width: 110,   height: 46 }
-    special:   { width: 44,    height: 46 }
+    default:   { width: 35.33,  height: 46 }
+    action:    { width: 59,     height: 46 }
+    small:     { width: 50.471, height: 22 }
+    altline:   { width: 52.67,  height: 46 }
+    large:     { width: 52.67,  height: 46 }
+    wide:      { width: 59,     height: 46 }
+    spaceline: { width: 92.29,  height: 46 }
+    special:   { width: 44,     height: 46 }
 
 views:
     base:
-        - "Ctrl Alt Tabsmall ↑ ↓ ← →"
+        - "TabSmall Ctrl Alt ↑ ↓ ← →"
         - "a z e r t y u i o p"
         - "q s d f g h j k l m"
-        - "Shift_L   w x c v b n period   BackSpace"
-        - "show_numbers preferences         space        show_eschars show_actions Return"
+        - "Shift_L   w x c v b n .   BackSpace"
+        - "show_numbers show_eschars preferences        space         show_actions Return"
     upper:
-        - "Ctrl Alt Tabsmall PgUp PgDn Home End"
+        - "TabSmall Ctrl Alt PageUp PageDown Home End"
         - "A Z E R T Y U I O P"
         - "Q S D F G H J K L M"
         - "Shift_L   W X C V B N ,  BackSpace"
-        - "show_numbers preferences         space        show_eschars show_actions Return"
+        - "show_numbers show_eschars preferences        space         show_actions Return"
     numbers:
-        - "Ctrl Alt Tabsmall ↑ ↓ ← →"
+        - "TabSmall Ctrl Alt ↑ ↓ ← →"
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # € % & - _ + ( )"
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
-        - "show_letters preferences         space        show_eschars show_actions Return"
+        - "show_symbols   , \" ' : ; ! ?  BackSpace"
+        - "show_letters show_eschars preferences        space         show_actions Return"
     symbols:
-        - "Ctrl Alt Tabsmall ↑ ↓ ← →"
+        - "TabSmall Ctrl Alt ↑ ↓ ← →"
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ $ ¥ ^ ° * { }"
-        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        show_eschars show_actions Return"
+        - "show_numbers   \\ / < > = [ ]  BackSpace"
+        - "show_letters show_eschars preferences        space         show_actions Return"
     eschars:
-        - "Ctrl Alt Tabsmall ↑ ↓ ← →"
+        - "TabSmall Ctrl Alt ↑ ↓ ← →"
         - "à â ç é è ê î ô ù û"
         - "À Â Ç É È Ê Î Ô Ù Û"
-        - "show_numbers_from_symbols  æ œ ä ë ï ö ü  BackSpace"
-        - "show_letters preferences         space        show_eschars show_actions Return"
+        - "show_numbers  æ œ ä ë ï ö ü  BackSpace"
+        - "show_letters show_eschars preferences        space         show_actions Return"
     actions:
-        - "Ctrl Alt PgUp PgDn Home End"
+        - "TabSmall Ctrl Alt PageUp PageDown 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:
@@ -87,19 +88,22 @@ buttons:
     Esc:
         outline: "action"
         keysym: "Escape"
+        label: "Echap"
     Tab:
         outline: "action"
         keysym: "Tab"
-    Tabsmall:
+    TabSmall:
         outline: "small"
         keysym: "Tab"
         label: "Tab"
     Del:
         outline: "action"
         keysym: "Delete"
+        label: "Suppr"
     Insert:
         outline: "action"
         keysym: "Insert"
+        label: "Inser"
     Menu:
         outline: "action"
         keysym: "Menu"
@@ -109,18 +113,23 @@ buttons:
     Break:
         outline: "action"
         keysym: "Break"
+        label: "Attn"
     Home:
         outline: "small"
         keysym: "Home"
+        label: "🡔"
     End:
         outline: "small"
         keysym: "End"
-    PgUp:
+        label: "Fin"
+    PageUp:
         outline: "small"
         keysym: "Page_Up"
-    PgDn:
+        label: "Page ↑"
+    PageDown:
         outline: "small"
         keysym: "Page_Down"
+        label: "Page ↓"
     "↑":
         outline: "small"
         keysym: "Up"
@@ -157,13 +166,10 @@ buttons:
         modifier: "Alt"
         outline: "small"
         label: "Alt"
-    period:
-        outline: "special"
-        text: "."
     show_actions:
         action:
             set_view: "actions"
-        outline: "special"
+        outline: "altline"
         label: ">_"
     Shift_L:
         action:
@@ -181,16 +187,16 @@ buttons:
         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: "altline"
+        label: "ABC"
+    show_letters_actions:
         action:
             set_view: "base"
         outline: "wide"
@@ -206,7 +212,7 @@ buttons:
                 lock_view: "eschars"
                 unlock_view: "base"
         outline: "altline"
-        label: "âÂ"
+        label: "Ââ"
     space:
         outline: "spaceline"
         text: " "
@@ -214,7 +220,3 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    colon:
-        text: ":"
-    "\"":
-        keysym: "quotedbl"

data/keyboards/terminal/fr_wide.yaml

@@ -4,8 +4,9 @@ outlines:
     action:    { width: 90,   height: 37 }
     small:     { width: 67.4, height: 22 }
     altline:   { width: 81,   height: 37 }
-    wide:      { width: 100,  height: 37 }
-    spaceline: { width: 110,  height: 37 }
+    large:     { width: 81,   height: 37 }
+    wide:      { width: 90,  height: 37 }
+    spaceline: { width: 153,  height: 37 }
     special:   { width: 54,   height: 37 }
 
 views:
@@ -13,38 +14,38 @@ views:
         - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
         - "a z e r t y u i o p"
         - "q s d f g h j k l m"
-        - "Shift_L   w x c v b n period   BackSpace"
-        - "show_numbers preferences         space        show_eschars show_actions Return"
+        - "Shift_L   w x c v b n .   BackSpace"
+        - "show_numbers show_eschars preferences        space         show_actions Return"
     upper:
-        - "EscSmall TabSmall Ctrl Alt PgUp PgDn Home End"
+        - "EscSmall TabSmall Ctrl Alt PageUp PageDown Home End"
         - "A Z E R T Y U I O P"
         - "Q S D F G H J K L M"
         - "Shift_L   W X C V B N ,  BackSpace"
-        - "show_numbers preferences         space        show_eschars show_actions Return"
+        - "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 preferences         space        show_eschars show_actions Return"
+        - "show_symbols   , \" ' : ; ! ?  BackSpace"
+        - "show_letters show_eschars preferences        space         show_actions Return"
     symbols:
         - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ $ ¥ ^ ° * { }"
-        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        show_eschars show_actions Return"
+        - "show_numbers   \\ / < > = [ ]  BackSpace"
+        - "show_letters show_eschars preferences        space         show_actions Return"
     eschars:
         - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
         - "à â ç é è ê î ô ù û"
         - "À Â Ç É È Ê Î Ô Ù Û"
-        - "show_numbers_from_symbols  æ œ ä ë ï ö ü  BackSpace"
-        - "show_letters preferences         space        show_eschars show_actions Return"
+        - "show_numbers  æ œ ä ë ï ö ü  BackSpace"
+        - "show_letters show_eschars preferences        space         show_actions Return"
     actions:
-        - "EscSmall TabSmall Ctrl Alt PgUp PgDn Home End"
+        - "EscSmall TabSmall Ctrl Alt PageUp PageDown 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:
     F1:
@@ -86,10 +87,11 @@ buttons:
     Esc:
         outline: "action"
         keysym: "Escape"
+        label: "Echap"
     EscSmall:
         outline: "small"
         keysym: "Escape"
-        label: "Esc"
+        label: "Echap"
     Tab:
         outline: "action"
         keysym: "Tab"
@@ -100,9 +102,11 @@ buttons:
     Del:
         outline: "action"
         keysym: "Delete"
+        label: "Suppr"
     Insert:
         outline: "action"
         keysym: "Insert"
+        label: "Inser"
     Menu:
         outline: "action"
         keysym: "Menu"
@@ -112,18 +116,23 @@ buttons:
     Break:
         outline: "action"
         keysym: "Break"
+        label: "Attn"
     Home:
         outline: "small"
         keysym: "Home"
+        label: "🡔"
     End:
         outline: "small"
         keysym: "End"
-    PgUp:
+        label: "Fin"
+    PageUp:
         outline: "small"
         keysym: "Page_Up"
-    PgDn:
+        label: "Page ↑"
+    PageDown:
         outline: "small"
         keysym: "Page_Down"
+        label: "Page ↓"
     "↑":
         outline: "small"
         keysym: "Up"
@@ -160,13 +169,10 @@ buttons:
         modifier: "Alt"
         outline: "small"
         label: "Alt"
-    period:
-        outline: "special"
-        text: "."
     show_actions:
         action:
             set_view: "actions"
-        outline: "special"
+        outline: "altline"
         label: ">_"
     Shift_L:
         action:
@@ -184,16 +190,16 @@ buttons:
         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: "altline"
+        label: "ABC"
+    show_letters_actions:
         action:
             set_view: "base"
         outline: "wide"
@@ -209,7 +215,7 @@ buttons:
                 lock_view: "eschars"
                 unlock_view: "base"
         outline: "altline"
-        label: "âÂ"
+        label: "Ââ"
     space:
         outline: "spaceline"
         text: " "
@@ -217,7 +223,3 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    colon:
-        text: ":"
-    "\"":
-        keysym: "quotedbl"

data/keyboards/terminal/us+dvorak.yaml

@@ -1,12 +1,13 @@
 ---
 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 }
+    default:   { width: 35.33,  height: 46 }
+    action:    { width: 59,     height: 46 }
+    altline:   { width: 52.67,  height: 46 }
+    large:     { width: 52.67,  height: 46 }
+    wide:      { width: 59,     height: 46 }
+    spaceline: { width: 144.96, height: 46 }
+    special:   { width: 44,     height: 46 }
+    small:     { width: 50.471, height: 22 }
 
 views:
     base:
@@ -16,29 +17,29 @@ views:
         - ", q j k x b m w v z"
         - "show_numbers preferences      space        show_actions Return"
     upper:
-        - "TabSmall Ctrl Alt PgUp PgDn Home End"
+        - "TabSmall Ctrl Alt PageUp PageDown 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"
+        - "show_symbols   , \" ' : ; ! ?  BackSpace"
         - "* # $ / & - _ + ( )"
         - "1 2 3 4 5 6 7 8 9 0"
-        - "show_letters preferences         space        period Return"
+        - "show_letters preferences         space        . Return"
     symbols:
         - "TabSmall Ctrl Alt ↑ ↓ ← →"
-        - "show_numbers_from_symbols   \\ % < > = [ ]  BackSpace"
+        - "show_numbers   \\ % < > = [ ]  BackSpace"
         - "© ® £ € ¥ ^ ° @ { }"
         - "~ ` | · √ π τ ÷ × ¶"
-        - "show_letters preferences         space        period Return"
+        - "show_letters preferences         space        . Return"
     actions:
-        - "TabSmall Ctrl Alt PgUp PgDn Home End"
+        - "TabSmall Ctrl Alt PageUp PageDown 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:
@@ -57,16 +58,16 @@ buttons:
         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: "altline"
+        label: "ABC"
+    show_letters_actions:
         action:
             set_view: "base"
         outline: "wide"
@@ -81,9 +82,8 @@ buttons:
             set_view: "actions"
         outline: "altline"
         label: ">_"
-    period:
-        outline: "altline"
-        text: "."
+    .:
+        outline: "large"
     space:
         outline: "spaceline"
         text: " "
@@ -91,8 +91,6 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    colon:
-        text: ":"
     F1:
         outline: "action"
         keysym: "F1"
@@ -160,12 +158,14 @@ buttons:
     End:
         outline: "small"
         keysym: "End"
-    PgUp:
+    PageUp:
         outline: "small"
         keysym: "Page_Up"
-    PgDn:
+        label: "Page ↑"
+    PageDown:
         outline: "small"
         keysym: "Page_Down"
+        label: "Page ↓"
     "↑":
         outline: "small"
         keysym: "Up"

data/keyboards/terminal/us+dvorak_wide.yaml

@@ -3,8 +3,9 @@ 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: 225,  height: 37 }
+    spaceline: { width: 234,  height: 37 }
     special:   { width: 54,   height: 37 }
     small:     { width: 67.4, height: 22 }
 
@@ -16,29 +17,29 @@ views:
         - ", 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"
+        - "EscSmall TabSmall Ctrl Alt PageUp PageDown 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"
+        - "show_symbols   , \" ' : ; ! ?  BackSpace"
         - "* # $ / & - _ + ( )"
         - "1 2 3 4 5 6 7 8 9 0"
-        - "show_letters preferences         space        period Return"
+        - "show_letters preferences         space        . Return"
     symbols:
         - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
-        - "show_numbers_from_symbols   \\ % < > = [ ]  BackSpace"
+        - "show_numbers   \\ % < > = [ ]  BackSpace"
         - "© ® £ € ¥ ^ ° @ { }"
         - "~ ` | · √ π τ ÷ × ¶"
-        - "show_letters preferences         space        period Return"
+        - "show_letters preferences         space        . Return"
     actions:
-        - "EscSmall TabSmall Ctrl Alt PgUp PgDn Home End"
+        - "EscSmall TabSmall Ctrl Alt PageUp PageDown 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:
@@ -57,16 +58,16 @@ buttons:
         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: "altline"
+        label: "ABC"
+    show_letters_actions:
         action:
             set_view: "base"
         outline: "wide"
@@ -81,9 +82,8 @@ buttons:
             set_view: "actions"
         outline: "altline"
         label: ">_"
-    period:
-        outline: "altline"
-        text: "."
+    .:
+        outline: "large"
     space:
         outline: "spaceline"
         text: " "
@@ -91,8 +91,6 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    colon:
-        text: ":"
     F1:
         outline: "action"
         keysym: "F1"
@@ -164,12 +162,14 @@ buttons:
     End:
         outline: "small"
         keysym: "End"
-    PgUp:
+    PageUp:
         outline: "small"
         keysym: "Page_Up"
-    PgDn:
+        label: "Page ↑"
+    PageDown:
         outline: "small"
         keysym: "Page_Down"
+        label: "Page ↓"
     "↑":
         outline: "small"
         keysym: "Up"

data/keyboards/terminal/us.yaml

@@ -2,13 +2,14 @@
 outlines:
     default:   { width: 35.33,  height: 46 }
     halfwidth: { width: 17.665, height: 46 }
+    narrow:    { width: 26.335, height: 46 }
     special:   { width: 44,     height: 46 }
     altline:   { width: 52.67,  height: 46 }
     large:     { width: 52.67,  height: 46 }
     action:    { width: 59,     height: 46 }
     wide:      { width: 59,     height: 46 }
     spaceline: { width: 144.96, height: 46 }
-    small:     { width: 50.57,  height: 22 }
+    small:     { width: 50.471, height: 22 }
 
 views:
     base:
@@ -18,7 +19,7 @@ views:
         - "Shift_L   z x c v b n m  BackSpace"
         - "show_numbers preferences      space        show_actions Return"
     upper:
-        - "TabSmall Ctrl Alt PgUp PgDn Home End"
+        - "TabSmall Ctrl Alt PageUp PageDown Home End"
         - "Q W E R T Y U I O P"
         - "SlashSmall A S D F G H J K L PipeSmall"
         - "Shift_L   Z X C V B N M  BackSpace"
@@ -27,16 +28,16 @@ views:
         - "TabSmall Ctrl Alt ↑ ↓ ← →"
         - "1 2 3 4 5 6 7 8 9 0"
         - "\\ * # $ / & - + ( ) _"
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
-        - "show_letters preferences         space        period Return"
+        - "show_symbols   , \" ' : ; ! ?  BackSpace"
+        - "show_letters preferences         space        . Return"
     symbols:
         - "TabSmall Ctrl Alt ↑ ↓ ← →"
         - "~ ` · √ π τ ÷ × ¶ @"
         - "© ® £ € ¥ ^ ° { }"
-        - "show_numbers_from_symbols   % | < > = [ ]  BackSpace"
-        - "show_letters preferences         space        period Return"
+        - "show_numbers   % | < > = [ ]  BackSpace"
+        - "show_letters preferences         space        . Return"
     actions:
-        - "TabSmall Ctrl Alt PgUp PgDn Home End"
+        - "TabSmall Ctrl Alt PageUp PageDown Home End"
         - "F1  F2  F3  F4  F5  F6"
         - "F7  F8  F9  F10 F11 F12"
         - "Esc Tab Pause Insert Up Del"
@@ -63,11 +64,6 @@ buttons:
             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"
@@ -88,9 +84,8 @@ buttons:
             set_view: "actions"
         outline: "altline"
         label: ">_"
-    period:
+    .:
         outline: "large"
-        text: "."
     space:
         outline: "spaceline"
         text: " "
@@ -98,8 +93,6 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    colon:
-        text: ":"
     F1:
         outline: "action"
         keysym: "F1"
@@ -167,12 +160,14 @@ buttons:
     End:
         outline: "small"
         keysym: "End"
-    PgUp:
+    PageUp:
         outline: "small"
         keysym: "Page_Up"
-    PgDn:
+        label: "Page ↑"
+    PageDown:
         outline: "small"
         keysym: "Page_Down"
+        label: "Page ↓"
     "↑":
         outline: "small"
         keysym: "Up"

data/keyboards/terminal/us_wide.yaml

@@ -2,6 +2,7 @@
 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 }
@@ -18,7 +19,7 @@ views:
         - "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"
+        - "EscSmall TabSmall Ctrl Alt PageUp PageDown Home End"
         - "Q W E R T Y U I O P"
         - "SlashSmall A S D F G H J K L PipeSmall"
         - "Shift_L   Z X C V B N M  BackSpace"
@@ -27,16 +28,16 @@ views:
         - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
         - "1 2 3 4 5 6 7 8 9 0"
         - "\\ * # $ / & - + ( ) _"
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
-        - "show_letters preferences         space        period Return"
+        - "show_symbols   , \" ' : ; ! ?  BackSpace"
+        - "show_letters preferences         space        . Return"
     symbols:
         - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
         - "~ ` · √ π τ ÷ × ¶ @"
         - "© ® £ € ¥ ^ ° { }"
-        - "show_numbers_from_symbols   % | < > = [ ]  BackSpace"
-        - "show_letters preferences         space        period Return"
+        - "show_numbers   % | < > = [ ]  BackSpace"
+        - "show_letters preferences         space        . Return"
     actions:
-        - "EscSmall TabSmall Ctrl Alt PgUp PgDn Home End"
+        - "EscSmall TabSmall Ctrl Alt PageUp PageDown Home End"
         - "F1  F2  F3  F4  F5  F6"
         - "F7  F8  F9  F10 F11 F12"
         - "Esc Tab Pause Insert Up Del"
@@ -63,11 +64,6 @@ buttons:
             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"
@@ -88,9 +84,8 @@ buttons:
             set_view: "actions"
         outline: "altline"
         label: ">_"
-    period:
+    .:
         outline: "large"
-        text: "."
     space:
         outline: "spaceline"
         text: " "
@@ -98,8 +93,6 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    colon:
-        text: ":"
     F1:
         outline: "action"
         keysym: "F1"
@@ -171,12 +164,14 @@ buttons:
     End:
         outline: "small"
         keysym: "End"
-    PgUp:
+    PageUp:
         outline: "small"
         keysym: "Page_Up"
-    PgDn:
+        label: "Page ↑"
+    PageDown:
         outline: "small"
         keysym: "Page_Down"
+        label: "Page ↓"
     "↑":
         outline: "small"
         keysym: "Up"

data/keyboards/th.yaml

@@ -12,23 +12,23 @@ views:
         - "ๆ ไ ำ พ ะ ั ี ร น ย บ ล"
         - "ฟ ห ก ด เ ้ ่ า ส ว ง ฃ"
         - "Shift_L   ผ ป แ อ ิ ื ท ม ใ ฝ   BackSpace"
-        - "show_numbers preferences         space        period Return"
+        - "show_numbers preferences         space        PeriodLarge Return"
     upper:
         - "+ ๑ ๒ ๓ ๔ ู ฿ ๕ ๖ ๗ ๘ ๙"
         - "๐ \" ฎ ฑ ธ ํ ๊ ณ ฯ ญ ฐ ,"
         - "ฤ ฆ ฏ โ ฌ ็ ๋ ษ ศ ซ . ฅ"
         - "Shift_L   ( ) ฉ ฮ ฺ ์ ? ฒ ฬ ฦ  BackSpace"
-        - "show_numbers preferences         space        period Return"
+        - "show_numbers preferences         space        PeriodLarge Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
-        - "show_letters preferences         space        period Return"
+        - "show_symbols   , \" ' : ; ! ?  BackSpace"
+        - "show_letters preferences         space        PeriodLarge Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
         - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        period Return"
+        - "show_letters preferences         space        PeriodLarge Return"
 
 buttons:
     Shift_L:
@@ -66,7 +66,7 @@ buttons:
             set_view: "symbols"
         outline: "altline"
         label: "*/="
-    period:
+    PeriodLarge:
         outline: "special"
         text: "."
     space:
@@ -76,5 +76,3 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    colon:
-        text: ":"

data/keyboards/th_wide.yaml

@@ -13,23 +13,23 @@ views:
         - "ๆ ไ ำ พ ะ ั ี ร น ย บ ล"
         - "ฟ ห ก ด เ ้ ่ า ส ว ง ฃ"
         - "Shift_L   ผ ป แ อ ิ ื ท ม ใ ฝ   BackSpace"
-        - "show_numbers preferences         space        period Return"
+        - "show_numbers preferences         space        PeriodLarge Return"
     upper:
         - "+ ๑ ๒ ๓ ๔ ู ฿ ๕ ๖ ๗ ๘ ๙"
         - "๐ \" ฎ ฑ ธ ํ ๊ ณ ฯ ญ ฐ ,"
         - "ฤ ฆ ฏ โ ฌ ็ ๋ ษ ศ ซ . ฅ"
         - "Shift_L   ( ) ฉ ฮ ฺ ์ ? ฒ ฬ ฦ  BackSpace"
-        - "show_numbers preferences         space        period Return"
+        - "show_numbers preferences         space        PeriodLarge Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
-        - "show_letters preferences         spacesymbol        period Return"
+        - "show_symbols   , \" ' : ; ! ?  BackSpace"
+        - "show_letters preferences         spacesymbol        PeriodLarge Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
         - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         spacesymbol        period Return"
+        - "show_letters preferences         spacesymbol        PeriodLarge Return"
 
 buttons:
     Shift_L:
@@ -67,7 +67,7 @@ buttons:
             set_view: "symbols"
         outline: "altline"
         label: "*/="
-    period:
+    PeriodLarge:
         outline: "special"
         text: "."
     space:
@@ -80,5 +80,3 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    colon:
-        text: ":"

data/keyboards/ua.yaml

@@ -13,22 +13,22 @@ views:
         - "й ц у к е н г ш щ з х"
         - "ф і в а п р о л д ж є"
         - "Shift_L  я ч с м и т ь б ю  BackSpace"
-        - "show_numbers preferences    ґ  space  ї  period Return"
+        - "show_numbers preferences    ґ  space  ї  . Return"
     upper:
         - "Й Ц У К Е Н Г Ш Щ З Х"
         - "Ф І В А П Р О Л Д Ж Є"
         - "Shift_L   Я Ч С М И Т Ь Б Ю  BackSpace"
-        - "show_numbers preferences    Ґ  space  Ї  comma Return"
+        - "show_numbers preferences    Ґ  space  Ї  CommaLarge Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
-        - "show_letters preferences         space_fill   period Return"
+        - "show_symbols   , \" ' : ; ! ?  BackSpace"
+        - "show_letters preferences         space_fill   . Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
         - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space_fill   period Return"
+        - "show_letters preferences         space_fill   . Return"
 
 buttons:
     Shift_L:
@@ -66,10 +66,9 @@ buttons:
             set_view: "symbols"
         outline: "wide"
         label: "*/="
-    period:
+    .:
         outline: "special"
-        text: "."
-    comma:
+    CommaLarge:
         outline: "special"
         text: ","
     space:
@@ -82,8 +81,6 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    colon:
-        text: ":"
     ґ:
         outline: "narrow"
     Ґ:

data/keyboards/ua_wide.yaml

@@ -0,0 +1,91 @@
+---
+outlines:
+    default:   { width: 48,    height: 42 }
+    altline:   { width: 48,    height: 42 }
+    wide:      { width: 85.5,  height: 42 }
+    narrow:    { width: 39,    height: 42 }
+    spaceline: { width: 160.5, height: 42 }
+    fill:      { width: 238.5, height: 42 }
+    special:   { width: 63,    height: 42 }
+
+views:
+    base:
+        - "й ц у к е н г ш щ з х"
+        - "ф і в а п р о л д ж є"
+        - "Shift_L  я ч с м и т ь б ю  BackSpace"
+        - "show_numbers preferences    ґ  space  ї  . Return"
+    upper:
+        - "Й Ц У К Е Н Г Ш Щ З Х"
+        - "Ф І В А П Р О Л Д Ж Є"
+        - "Shift_L   Я Ч С М И Т Ь Б Ю  BackSpace"
+        - "show_numbers preferences    Ґ  space  Ї  CommaLarge Return"
+    numbers:
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "@ # $ % & - _ + ( )"
+        - "show_symbols   , \" ' : ; ! ?  BackSpace"
+        - "show_letters preferences         space_fill   . Return"
+    symbols:
+        - "~ ` | · √ π τ ÷ × ¶"
+        - "© ® £ € ¥ ^ ° * { }"
+        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
+        - "show_letters preferences         space_fill   . 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: "wide"
+        label: "123"
+    show_letters:
+        action:
+            set_view: "base"
+        outline: "wide"
+        label: "АБВ"
+    show_symbols:
+        action:
+            set_view: "symbols"
+        outline: "wide"
+        label: "*/="
+    .:
+        outline: "special"
+    CommaLarge:
+        outline: "special"
+        text: ","
+    space:
+        outline: "spaceline"
+        text: " "
+    space_fill:
+        outline: "fill"
+        text: " "
+    Return:
+        outline: "wide"
+        icon: "key-enter"
+        keysym: "Return"
+    ґ:
+        outline: "narrow"
+    Ґ:
+        outline: "narrow"
+    ї:
+        outline: "narrow"
+    Ї:
+        outline: "narrow"

data/keyboards/url/us.yaml

@@ -11,22 +11,22 @@ views:
         - "q w e r t y u i o p"
         - "a s d f g h j k l"
         - "Shift_L   z x c v b n m  BackSpace"
-        - "show_numbers preferences         space        slash period Return"
+        - "show_numbers preferences         space        SlashLarge . 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        slash period Return"
+        - "show_numbers preferences         space        SlashLarge . Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
-        - "show_letters preferences         space        slash period Return"
+        - "show_symbols   , \" ' : ; ! ?  BackSpace"
+        - "show_letters preferences         space        SlashLarge . Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
         - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        slash period Return"
+        - "show_letters preferences         space        SlashLarge . Return"
 
 buttons:
     Shift_L:
@@ -64,10 +64,9 @@ buttons:
             set_view: "symbols"
         outline: "altline"
         label: "*/="
-    period:
+    .:
         outline: "special"
-        text: "."
-    slash:
+    SlashLarge:
         outline: "special"
         text: "/"
     space:
@@ -77,5 +76,3 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    colon:
-        text: ":"

data/keyboards/url/us_wide.yaml

@@ -0,0 +1,78 @@
+---
+outlines:
+    default:   { width: 52,    height: 42 }
+    altline:   { width: 77.52, height: 42 }
+    wide:      { width: 91.25, height: 42 }
+    spaceline: { width: 157,   height: 42 }
+    special:   { width: 64.76, height: 42 }
+
+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        SlashLarge . 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        SlashLarge . Return"
+    numbers:
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "@ # $ % & - _ + ( )"
+        - "show_symbols   , \" ' : ; ! ?  BackSpace"
+        - "show_letters preferences         space        SlashLarge . Return"
+    symbols:
+        - "~ ` | · √ π τ ÷ × ¶"
+        - "© ® £ € ¥ ^ ° * { }"
+        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
+        - "show_letters preferences         space        SlashLarge . 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: "*/="
+    .:
+        outline: "special"
+    SlashLarge:
+        outline: "special"
+        text: "/"
+    space:
+        outline: "spaceline"
+        text: " "
+    Return:
+        outline: "wide"
+        icon: "key-enter"
+        keysym: "Return"

data/keyboards/us+colemak.yaml

@@ -11,22 +11,22 @@ views:
         - "q w f p g j l u y"
         - "a r s t d h n e i o"
         - "Shift_L   z x c v b k m  BackSpace"
-        - "show_numbers preferences         space        period Return"
+        - "show_numbers preferences         space        . Return"
     upper:
         - "Q W F P G J L U Y"
         - "A R S T D H N E I O"
         - "Shift_L   Z X C V B K M  BackSpace"
-        - "show_numbers preferences         space        period Return"
+        - "show_numbers preferences         space        . Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
-        - "show_letters preferences         space        period Return"
+        - "show_symbols   , \" ' : ; ! ?  BackSpace"
+        - "show_letters preferences         space        . Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
         - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        period Return"
+        - "show_letters preferences         space        . Return"
 
 buttons:
     Shift_L:
@@ -64,9 +64,8 @@ buttons:
             set_view: "symbols"
         outline: "altline"
         label: "*/="
-    period:
+    .:
         outline: "special"
-        text: "."
     space:
         outline: "spaceline"
         text: " "
@@ -74,5 +73,3 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    colon:
-        text: ":"

data/keyboards/us+colemak_wide.yaml

@@ -20,7 +20,7 @@ views:
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
+        - "show_symbols   , \" ' : ; ! ?  BackSpace"
         - "show_letters preferences         space        . Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
@@ -64,9 +64,8 @@ buttons:
             set_view: "symbols"
         outline: "altline"
         label: "*/="
-    ".":
+    .:
         outline: "special"
-        text: "."
     space:
         outline: "spaceline"
         text: " "
@@ -74,5 +73,3 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    colon:
-        text: ":"

data/keyboards/us+dvorak.yaml

@@ -11,22 +11,22 @@ views:
         - "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        period Return"
+        - "show_numbers preferences         space        . Return"
     upper:
         - "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        period Return"
+        - "show_numbers preferences         space        . Return"
     numbers:
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
+        - "show_symbols   , \" ' : ; ! ?  BackSpace"
         - "* # $ / & - _ + ( )"
         - "1 2 3 4 5 6 7 8 9 0"
-        - "show_letters preferences         space        period Return"
+        - "show_letters preferences         space        . Return"
     symbols:
         - "show_numbers_from_symbols   \\ % < > = [ ]  BackSpace"
         - "© ® £ € ¥ ^ ° @ { }"
         - "~ ` | · √ π τ ÷ × ¶"
-        - "show_letters preferences         space        period Return"
+        - "show_letters preferences         space        . Return"
 
 buttons:
     Shift_L:
@@ -64,9 +64,8 @@ buttons:
             set_view: "symbols"
         outline: "altline"
         label: "*/="
-    period:
+    .:
         outline: "special"
-        text: "."
     space:
         outline: "spaceline"
         text: " "
@@ -74,8 +73,6 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    colon:
-        text: ":"
 
 # The US QWERTY layout has fewer letters on the third row, and so has
 # the shift & backspace keys placed there. In contrast, the US DVORAK

data/keyboards/us+dvorak_wide.yaml

@@ -11,22 +11,22 @@ views:
         - "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        period Return"
+        - "show_numbers preferences         space        . Return"
     upper:
         - "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        period Return"
+        - "show_numbers preferences         space        . Return"
     numbers:
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
+        - "show_symbols   , \" ' : ; ! ?  BackSpace"
         - "* # $ / & - _ + ( )"
         - "1 2 3 4 5 6 7 8 9 0"
-        - "show_letters preferences         space        period Return"
+        - "show_letters preferences         space        . Return"
     symbols:
         - "show_numbers_from_symbols   \\ % < > = [ ]  BackSpace"
         - "© ® £ € ¥ ^ ° @ { }"
         - "~ ` | · √ π τ ÷ × ¶"
-        - "show_letters preferences         space        period Return"
+        - "show_letters preferences         space        . Return"
 
 buttons:
     Shift_L:
@@ -64,9 +64,8 @@ buttons:
             set_view: "symbols"
         outline: "altline"
         label: "*/="
-    period:
+    .:
         outline: "special"
-        text: "."
     space:
         outline: "spaceline"
         text: " "
@@ -74,8 +73,6 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    colon:
-        text: ":"
 
 # The US QWERTY layout has fewer letters on the third row, and so has
 # the shift & backspace keys placed there. In contrast, the US DVORAK

data/keyboards/us.yaml

@@ -1,32 +1,32 @@
 ---
 outlines:
-    default: { width: 35.33, height: 52 }
-    altline: { width: 52.67, height: 52 }
-    wide: { width: 62, height: 52 }
-    spaceline: { width: 142, height: 52 }
-    special: { width: 44, height: 52 }
+    default:   { width: 35.33, height: 52 }
+    altline:   { width: 52.67, height: 52 }
+    wide:      { width: 62,    height: 52 }
+    spaceline: { width: 141.3, 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        period Return"
+        - "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        period Return"
+        - "show_numbers preferences         space        . Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
-        - "show_letters preferences         space        period Return"
+        - "show_symbols   , \" ' : ; ! ?  BackSpace"
+        - "show_letters preferences         space        . Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
         - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        period Return"
+        - "show_letters preferences         space        . Return"
 
 buttons:
     Shift_L:
@@ -41,7 +41,7 @@ buttons:
         icon: "edit-clear-symbolic"
         action: erase
     preferences:
-        action: show_prefs
+        action: "show_prefs"
         outline: "special"
         icon: "keyboard-mode-symbolic"
     show_numbers:
@@ -64,9 +64,8 @@ buttons:
             set_view: "symbols"
         outline: "altline"
         label: "*/="
-    period:
+    .:
         outline: "special"
-        text: "."
     space:
         outline: "spaceline"
         text: " "
@@ -74,5 +73,3 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    colon:
-        text: ":"