Most x11 references removed, some x* files renamed to w*, for wayland; project compiling and running.

Removing tabs first
2019-01-31 22:02:44 -02:00 · 2019-01-31 20:50:55 -02:00
466 changed files with 36526 additions and 43515 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,23 +0,0 @@
-_build/
-debian/*.debhelper
-debian/.debhelper/
-debian/cargo/registry/
-debian/cargo/.*cache*
-debian/debhelper-build-stamp
-debian/files
-debian/*.substvars
-debian/squeekboard/
-debian/squeekboard-devel/
-debian/tmp/
-meson_Cargo.toml.in
-po/squeekboard.pot
-po/*.mo
-TAGS
-tags
-target/
-vendor/
-vgdump
-*.swp
-*~
-\#*#
-.\#*
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -1,141 +0,0 @@
-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
-  - test
-  - deploy
-
-before_script:
-  - apt-get -y update
-  - apt-get -y install ca-certificates
-
-build_docs:
-  stage: build
-  artifacts:
-    paths:
-      - _build
-  script:
-    - apt-get -y install --no-install-recommends python3-pip python3-sphinx python3-recommonmark
-    - ./doc/build.sh _build
-  except:
-    variables:
-      - $PKG_ONLY == "1"
-
-build_meson:
-  stage: build
-  artifacts:
-    paths:
-      - _build
-    expire_in: 3h
-  script:
-    - apt-get -y build-dep .
-    - meson . _build/ -Ddepdatadir=/usr/share -Dfind_orphans=true --werror
-    - ninja -C _build install
-  except:
-    variables:
-      - $PKG_ONLY == "1"
-
-build_deb:
-  allow_failure: true
-  tags:
-    - aarch64
-  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_reference:
-  stage: build
-  needs:
-    - job: build_meson
-      artifacts: true
-  artifacts:
-    paths:
-      - _build/doc
-  script:
-    - apt-get -y build-dep .
-    - apt-get -y install cargo
-    - cd _build
-    - ../cargo.sh doc --no-deps --document-private-items --features 'zbus_v1_5,clap_v4'
-  except:
-    variables:
-      - $PKG_ONLY == "1"
-
-test:
-  stage: test
-  needs:
-    - job: build_meson
-      artifacts: true
-  script:
-    - apt-get -y build-dep .
-    - apt-get -y install clang-tidy
-    - ninja -C _build test
-    - tools/style-check_build _build
-  except:
-    variables:
-      - $PKG_ONLY == "1"
-
-test_style:
-  stage: test
-  needs: []
-  script:
-    - apt-get -y build-dep .
-    - tools/style-check_source
-  except:
-    variables:
-      - $PKG_ONLY == "1"
-
-check_release:
-  stage: test
-  needs: []
-  only:
-    refs:
-      - main
-  script:
-    - apt-get -y install git python3
-    - (head -n 1 ./debian/changelog && git tag) | ./debian/check_release.py
-  except:
-    variables:
-      - $PKG_ONLY == "1"
-
-pages:
-  stage: deploy
-  needs:
-    - build_docs
-    - build_reference
-  script:
-    - mv _build/ public/
-  artifacts:
-    paths:
-      - public
-  only:
-    refs:
-      - main
--- a/37
+++ b/37
@ -1,5 +1,36 @@
-squeekboard is written by Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm> on behlf of Purism, SPC.
-eekboard was written by Daiki Ueno <ueno@unixuser.org>
+eekboard is written by Daiki Ueno <ueno@unixuser.org>.  The following
+files contain code derived from other free software packages:

-For more details, see the debian/copyright file.
+eek/eek-keyboard-drawing.h
+eek/eek-keyboard-drawing.c

+  These files contain code derived from the libgnomekbd library.
+  Copyright (C) 2006 Sergey V. Udaltsov <svu@gnome.org>
+
+eek/eek-theme.h
+eek/eek-theme.c
+eek/eek-theme-context.h
+eek/eek-theme-context.c
+eek/eek-theme-node.h
+eek/eek-theme-node.c
+
+  These files contain code derived from gnome-shell.
+
+  Copyright 2008-2010 Red Hat, Inc.
+  Copyright 2009 Steve Frécinaux
+  Copyright 2009, 2010 Florian Müllner
+  Copyright 2010 Adel Gadllah
+  Copyright 2010 Giovanni Campagna
+  Copyright 2003-2004 Dodji Seketeli
+
+data/icons/8x8/Makefile.am
+data/icons/16x16/Makefile.am
+data/icons/22x22/Makefile.am
+data/icons/24x24/Makefile.am
+data/icons/32x32/Makefile.am
+data/icons/48x48/Makefile.am
+data/icons/scalable/Makefile.am
+
+  These files contain code derived from im-chooser.
+
+  Copyright (C) 2006-2008 Red Hat, Inc. All rights reserved.
--- a/8
+++ b/8
@ -1,7 +1,7 @@
                    GNU GENERAL PUBLIC LICENSE
                       Version 3, 29 June 2007

- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.

@ -645,7 +645,7 @@ the "copyright" line and a pointer to where the full notice is found.
    GNU General Public License for more details.

    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.

 Also add information on how to contact you by electronic and paper mail.

@ -664,11 +664,11 @@ might be different; for a GUI interface, you would use an "about box".
  You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU GPL, see
-<https://www.gnu.org/licenses/>.
+<http://www.gnu.org/licenses/>.

  The GNU General Public License does not permit incorporating your program
 into proprietary programs.  If your program is a subroutine library, you
 may consider it more useful to permit linking proprietary applications with
 the library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.  But first, please read
-<https://www.gnu.org/licenses/why-not-lgpl.html>.
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
--- a/Cargo.lock
+++ b/Cargo.lock
--- a/Cargo.toml
+++ b/Cargo.toml
@ -1,66 +0,0 @@
-[package]
-name = "rs"
-version = "0.1.0"
-edition = "2021"
-
-[lib]
-name = "rs"
-path = "src/lib.rs"
-crate-type = ["staticlib", "rlib"]
-
-# Cargo can't do autodiscovery if Cargo.toml is not in the root.
-[[bin]]
-name = "test_layout"
-path = "src/bin/test_layout.rs"
-
-[[example]]
-name = "test_layout"
-path = "examples/test_layout.rs"
-
-[[example]]
-name = "find_orphan_layouts"
-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.7", 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"]
--- a/src/imservice.h
+++ b/src/imservice.h
--- a/Makefile.am
+++ b/Makefile.am
@ -0,0 +1,39 @@
+# Copyright (C) 2010-2011 Daiki Ueno <ueno@unixuser.org>
+# Copyright (C) 2010-2011 Red Hat, Inc.
+
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public License
+# as published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+
+# This library is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301 USA
+
+ACLOCAL_AMFLAGS = -I m4
+SUBDIRS = eek eekboard src tests bindings docs po data examples
+DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-introspection
+
+GITIGNOREFILES =				\
+	INSTALL					\
+	aclocal.m4				\
+	compile					\
+	config.guess				\
+	config.h.in				\
+	config.sub				\
+	depcomp					\
+	gtk-doc.make				\
+	install-sh				\
+	ltmain.sh				\
+	m4					\
+	missing					\
+	mkinstalldirs				\
+	$(NULL)
+
+-include $(top_srcdir)/git.mk
--- a/154
+++ b/154
@ -1,154 +0,0 @@
-squeekboard 1.42.1
------------------
-Released October 2024
-* Fixes:
-    * With some apps, in particular apps made with Electron, text-input did not work with some buttons, depending on which layout was used. Text-input should now work normally with those apps.
-    * In some situations, modifiers were cleared after pressing another button (for example: when pressing `C`, for `Ctrl + C`), resulting in text-input without the modifiers. The modifiers will remain active in those situations from now on.
-* Contributors:
-    * MoonlightWave-12
-    * Sebastian Krzyszkowiak
-
-squeekboard 1.42.0
------------------
-Released September 2024
-* New layouts:
-    * Belarusian (by)
-    * French (fr+bepo) terminal-layout
-    * Japanese (jp)
-    * Serbian (rs), (rs+latin), (rs+latinunicode)
-* Changed layouts:
-    * Thai (th):
-        * There is less empty space now.
-        * Most buttons are wider now.
-        * The arrangement of buttons for the `symbols` and `numbers` views, is more consistent with other layouts now.
-* Fixes:
-    * "Keyboard Settings" in the language-selection-popover will now open the correct panel in GNOME Settings.
-    * On some relatively small screens in horizontal orientation, the compact shape was used instead of the wide shape,
-      even though the wide shape can fit into the same height. The wide shape will be used on those screens now.
-* Changes:
-    * The height of the panel will adapt to screens differently.
-      In particular, the panel will be 1/3 of the screen's height on most monitors in horizontal orientation,
-      and as tall as it can be, while maintaining the aspect-ratio of the wide shape (16:5) without empty space next to it,
-      for most monitors in vertical orientation.
-    * GSettings for adjusting the height of the panel for the keyboard have been added.
-    * The documentation has been improved. In particular, it should now be much easier to learn how to test changes to Squeekboard and layouts.
-    * After building a Debian-package for Squeekboard and installing it, `update-alternatives` is now supported.
-    * The layout-files now have the English name of the language for which the respective layout is, in a comment at the top of the file.
-    * For a few languages which do not have a layout yet, a more appropriate fallback-layout will be chosen.
-* Contributors:
-    * Guido Günther
-    * MoonlightWave-12
-* UI translations:
-    * Sabri Ünal (tr)
-
-squeekboard 1.41.0
------------------
-Released August 2024
-* New layouts:
-    * Malayalam
-    * German (Bone)
-    * German (Neo 2)
-* New icons:
-    * zwsp (zero-width-space)
-    * zwj (zero-width-joiner)
-
-squeekboard 1.39.0
------------------
-Released May 2024
-* New button-styles:
-    * `change-view`: Highlighted like `special`, but with a border at the bottom.
-    * `character-group`: Like `change-view`, but with less highlighting.
-    * `placeholder`: Less contrast to the background and does not visually change when pressed.
-    * `subtle-highlight`: For highlighting commonly used characters in accent-views, for example.
-* New layouts:
-    * Portuguese
-    * Slovenian
-    * Turkish (F-layout)
-    * Turkish (Q-layout)
-* Remade layout:
-    * Portuguese (Brazil): A view for accents has been added.
-* Changes:
-    * The new button-styles are used in the available layouts, where appropriate.
-    * The top rows of the terminal-layouts are a little taller.
-    * Squeekboard will choose the wide shape of layouts, for more displays in horizontal orientation.
-    * Highlighted buttons now show visual feedback too, when pressed.
-    * Many layouts have been adjusted, so that those change their form less when switching views.
-    * Various small issues have been fixed, to make layouts more consistent.
-* Development:
-    * Scaling-tests for many display-types have been added.
-
-squeekboard 1.38.0
------------------
-Released March 2024
-* Changes:
-    * 25 wide shapes have been added, so that every available layout now has a wide shape
-    * "PgUp" and "PgDn" on the terminal-layouts have been relabeled to "Page ↑" and "Page ↓"
-    * The Spanish and French terminal-layouts now have translated key-names
-    * The Spanish terminal-layout has been updated with the additional keys that are already available on the US-terminal-layout.
-    * The wide and base shapes of the German layout had a different key-arrangement and the wide shape did not have a button to access additional characters; this has been fixed.
-* Development:
-    * Squeekboard's versioning now follows Phosh's versioning (for example: Squeekboard 1.38 was released in time for Phosh 0.38)
-    * The build-system has been simplified
-    * A single Cargo.toml file is used, instead of assembling it from multiple parts
-    * Newer dependencies are now used for building Squeekboard by default
-    * Squeekboard's main development-platform is now Debian Testing
-    * The layout-files have been cleaned up, so that those are easier to understand and edit
-
-squeekboard 1.24.0
------------------
-Released March 2024
-* Changes:
-    * The emoji-layout has been replaced with a new one, which offers many more emojis to choose from.
-
-squeekboard 1.23.0
------------------
-Released March 2024
-* New or updated translations:
-    * Belarusian
-    * Haitian Creole
-* New layouts:
-    * French Canadian (QWERTY + accented letters)
-    * German terminal-layout
-    * Spanish terminal-layout
-* Changes:
-    * Fixed Persian and Swiss layouts
-    * Fixed various small style-issues in many layouts
-    * Improved the US-terminal-layout
-
-squeekboard 1.22.0 "Superposition"
------------------
-Released April 2023
-* New or updated translations:
-    * Basque
-* Changes:
-    * fixed panel sizing when scaling
-    * fixed panel sizing when rotating
-    * fixed Dvorak terminal layout
-
-squeekboard 1.21.0 "Expected value"
------------------
-Released February 2023
-* New or updated translations:
-    * Hindi
-    * Czech
-    * German
-* New layouts:
-    * wide Swedish
-    * Hungarian
-* Changes:
-    * use a custom font for gr+polytonic, where the default is unreadable
-    * require newer Rust
-    * fixed panel sizing when rotating
-    * internal improvements.
-
-squeekboard 1.20.0 "PID controller"
------------------
-Released September 2023
-* New translations:
-    * Greek
-    * Croatian
-* New layouts:
-    * US Dvorak terminal
-* Improvements:
-    * forcing the panel to hide now takes effect immediately
-    * Squeekboard icon will present itself when other applications need to show it
--- a/35
+++ b/35
@ -0,0 +1,35 @@
+eekboard - an easy to use virtual keyboard toolkit -*- outline -*-
+
+eekboard is a virtual keyboard software package, including a set of
+tools to implement desktop virtual keyboards.
+
+* Building
+
+** Dependencies
+
+REQUIRED: GLib2, GTK, PangoCairo, libxklavier, libcroco
+OPTIONAL: libXtst, at-spi2-core, IBus, Clutter, Clutter-Gtk, Python, Vala, gobject-introspection, libcanberra
+
+** Build from git repo
+
+  $ git clone git://github.com/ueno/eekboard.git
+  $ cd eekboard
+  $ ./autogen.sh --prefix=/usr --enable-gtk-doc
+  $ make
+  $ sudo make install
+
+** Build from tarball
+
+  $ ./configure --prefix=/usr
+  $ make
+  $ sudo make install
+
+* Running
+
+  $ eekboard
+  $ eekboard -f # show/hide automatically based on focus-in/focus-out events
+
+Even though eekboard -f watches a11y events by default, it currently
+works better with IBus.  To use IBus, do:
+
+  $ gsettings set org.fedorahosted.eekboard focus-listener 'ibus'
--- a/README.md
+++ b/README.md
@ -1,122 +0,0 @@
-*squeekboard* - a Wayland on-screen keyboard
-========================================
-
-*Squeekboard* is the on-screen-keyboard input-method for Phosh. It is primarily designed for smartphones, tablet-PCs, and other devices with touchscreens.
-
-It squeaks because some Rust got inside.
-
-Features
--------
-
-### Present
-
- GTK3
- Custom keyboard layouts defined in yaml
- Input purpose dependent keyboard layouts
- DBus interface to show and hide
- Use Wayland input method protocol to submit text
- Use Wayland virtual keyboard protocol
-
-### TODO
-
- [Port to GTK4 / GTK4-Layer-Shell](https://gitlab.gnome.org/World/Phosh/squeekboard/-/issues/64)
- [Text prediction/correction](https://gitlab.gnome.org/World/Phosh/squeekboard/-/issues/54)
- Use preedit
- Submit actions like "next field" using a future Wayland protocol
- Pick up DBus interface files from /usr/share
-
-Creating layouts
-------------------
-
-If you want to work on layouts, check out the [guide](doc/tutorial.md).
-
-Nightly builds
--------------
-
-For testing the latest commits of the `main`-branch, one can install the nightly builds of Squeekboard.
-For more information about the nightly builds, read the ["Phosh Nightly Package Builds"-blog-post](https://phosh.mobi/posts/phosh-nightly/).
-
-Building
--------
-
-### Dependencies
-
-See `.gitlab-ci.yml` or run `apt-get build-dep .`
-
-### Build from git repo
-
-```sh
-$ git clone https://gitlab.gnome.org/World/Phosh/squeekboard.git
-$ cd squeekboard
-$ mkdir _build
-$ meson setup _build/
-$ cd _build
-$ ninja
-```
-
-To run tests use `ninja test`. To install squeekboard run `ninja install`.
-
-Running
-------
-
-```sh
-$ cd ../build/
-$ src/squeekboard
-```
-
-If no compatible Wayland compositor is running yet, you can use Phoc (after installing it):
-
-```sh
-$ phoc --exec 'src/squeekboard'
-```
-
-Squeekboard's panel will appear whenever a compatible application requests an input method. Click a text field in any GTK application, like `python3 ./tools/entry.py`.
-
-Squeekboard honors the gnome "screen-keyboard-enabled" setting. Either enable this through gnome-settings under accessibility or run:
-
-```sh
-$ gsettings set org.gnome.desktop.a11y.applications screen-keyboard-enabled true
-```
-
-Alternatively, force panel visibility manually with:
-
-```sh
-$ busctl call --user sm.puri.OSK0 /sm/puri/OSK0 sm.puri.OSK0 SetVisible b true
-```
-
-or by using the environment-variable `SQUEEKBOARD_DEBUG=force_show`.
-
-### What the compositor has to support
-
-A compatible compositor has to support the protocols:
-
- layer-shell
- virtual-keyboard-v1
-
-It's strongly recommended to support:
-
- input-method-v2
-
-Settings
--------
-
-You can change the height of the panel for the keyboard with:
-
-```sh
-$ gsettings set sm.puri.Squeekboard scale-in-horizontal-screen-orientation 1.0
-$ gsettings set sm.puri.Squeekboard scale-in-vertical-screen-orientation 1.0
-```
-
-Note: If the keyboard is open when the settings for the panel-height are changed, the height of the keyboard will not change until it is opened again, or the layout is changed.
-While using Phosh, you can long-click/long-tap the home-bar at the bottom, to open and close the keyboard.
-
-To reset the settings to the default, you can use:
-
-```sh
-$ gsettings reset-recursively sm.puri.Squeekboard
-```
-
-Developing
----------
-
-See [`doc/hacking.md`](doc/hacking.md) for this copy, or the [official documentation](https://world.pages.gitlab.gnome.org/Phosh/squeekboard) for the current release.
--- a/1
+++ b/1
@ -0,0 +1 @@
+See https://github.com/ueno/eekboard/wiki/TODO
--- a/autogen.sh
+++ b/autogen.sh
@ -0,0 +1,25 @@
+#!/bin/sh
+# Run this to generate all the initial makefiles, etc.
+
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+PKG_NAME="eekboard"
+
+(test -f $srcdir/configure.ac \
+  && test -f $srcdir/README ) || {
+    echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
+    echo " top-level $PKG_NAME directory"
+    exit 1
+}
+
+which gnome-autogen.sh || {
+    echo "You need to install gnome-common from the GNOME CVS"
+    exit 1
+}
+
+ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I m4"
+REQUIRED_AUTOMAKE_VERSION=1.10
+REQUIRED_AUTOCONF_VERSION=2.60
+
+. gnome-autogen.sh
--- a/bindings/Makefile.am
+++ b/bindings/Makefile.am
@ -0,0 +1,21 @@
+# Copyright (C) 2010-2011 Daiki Ueno <ueno@unixuser.org>
+# Copyright (C) 2010-2011 Red Hat, Inc.
+
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public License
+# as published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+
+# This library is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301 USA
+
+SUBDIRS = vala
+
+-include $(top_srcdir)/git.mk
--- a/bindings/vala/Eek-0.90.metadata
+++ b/bindings/vala/Eek-0.90.metadata
@ -0,0 +1 @@
+Eek cheader_filename="eek/eek.h"
--- a/bindings/vala/EekGtk-0.90.metadata
+++ b/bindings/vala/EekGtk-0.90.metadata
@ -0,0 +1 @@
+EekGtk cheader_filename="eek/eek-gtk.h"
--- a/bindings/vala/EekXkl-0.90.metadata
+++ b/bindings/vala/EekXkl-0.90.metadata
@ -0,0 +1 @@
+EekXkl cheader_filename="eek/eek-xkl.h"
--- a/bindings/vala/Makefile.am
+++ b/bindings/vala/Makefile.am
@ -0,0 +1,92 @@
+# Copyright (C) 2010-2011 Daiki Ueno <ueno@unixuser.org>
+# Copyright (C) 2010-2011 Red Hat, Inc.
+
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public License
+# as published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+
+# This library is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301 USA
+
+NULL =
+
+if ENABLE_VALA
+vapidir = $(datadir)/vala/vapi
+dist_vapi_DATA =				\
+	eek-$(EEK_API_VERSION).vapi		\
+	eek-$(EEK_API_VERSION).deps		\
+	eek-gtk-$(EEK_API_VERSION).vapi		\
+	eek-gtk-$(EEK_API_VERSION).deps		\
+	$(NULL)
+
+EXTRA_DIST =					\
+	Eek-$(EEK_API_VERSION).metadata		\
+	EekGtk-$(EEK_API_VERSION).metadata	\
+	$(NULL)
+
+GITIGNOREFILES = \
+	eek-$(EEK_API_VERSION).vapi		\
+	eek-gtk-$(EEK_API_VERSION).vapi		\
+	$(NULL)
+
+maintainer-clean-local:
+	rm -f *.vapi
+
+eek_vapi_deps =						\
+	$(srcdir)/Eek-$(EEK_API_VERSION).metadata	\
+	|						\
+	$(top_builddir)/eek/Eek-$(EEK_API_VERSION).gir	\
+	$(NULL)
+
+eek-$(EEK_API_VERSION).vapi: $(eek_vapi_deps)
+	$(VAPIGEN_V)$(VAPIGEN) \
+		--library eek-$(EEK_API_VERSION) \
+		--pkg gio-2.0 \
+		--metadatadir=$(srcdir) \
+		$(top_builddir)/eek/Eek-$(EEK_API_VERSION).gir
+
+eek_gtk_vapi_deps =					\
+	$(srcdir)/EekGtk-$(EEK_API_VERSION).metadata	\
+	|						\
+	$(top_builddir)/eek/EekGtk-$(EEK_API_VERSION).gir	\
+	$(NULL)
+
+eek-gtk-$(EEK_API_VERSION).vapi: $(eek_gtk_vapi_deps)
+	$(VAPIGEN_V)$(VAPIGEN) --vapidir=$(builddir) \
+		--library eek-gtk-$(EEK_API_VERSION) \
+		--pkg eek-$(EEK_API_VERSION) \
+		--pkg gio-2.0 \
+		--pkg gtk+-3.0 \
+		--metadatadir=$(srcdir)	\
+		$(top_builddir)/eek/EekGtk-$(EEK_API_VERSION).gir
+
+# eek_xkl_vapi_deps =						\
+# 	$(srcdir)/EekXkl-$(EEK_API_VERSION).metadata		\
+# 	|							\
+# 	$(top_builddir)/eek/EekXkl-$(EEK_API_VERSION).gir	\
+# 	$(NULL)
+# 
+# eek-xkl-$(EEK_API_VERSION).vapi: $(eek_xkl_vapi_deps)
+# 	$(VAPIGEN_V)$(VAPIGEN) \
+# 		--vapidir=$(builddir) \
+# 		--library eek-xkl-$(EEK_API_VERSION) \
+# 		--pkg eek-$(EEK_API_VERSION) \
+# 		--pkg gio-2.0 \
+# 		--metadatadir=$(srcdir) \
+# 		$(top_builddir)/eek/EekXkl-$(EEK_API_VERSION).gir
+
+# set up the verbosity rules to avoid some build noise
+VAPIGEN_V = $(VAPIGEN_V_$(V))
+VAPIGEN_V_ = $(VAPIGEN_V_$(AM_DEFAULT_VERBOSITY))
+VAPIGEN_V_0 = @echo "  VAPIG " $@;
+endif
+
+-include $(top_srcdir)/git.mk
--- a/bindings/vala/eek-0.90.deps
+++ b/bindings/vala/eek-0.90.deps
@ -0,0 +1 @@
+gio-2.0
--- a/bindings/vala/eek-gtk-0.90.deps
+++ b/bindings/vala/eek-gtk-0.90.deps
@ -0,0 +1 @@
+eek-0.90
--- a/bindings/vala/eek-xkl-0.90.deps
+++ b/bindings/vala/eek-xkl-0.90.deps
@ -0,0 +1,2 @@
+eek-0.90
+x11
--- a/cargo.sh
+++ b/cargo.sh
@ -1,25 +0,0 @@
-#!/bin/sh
-
-# This script manages Cargo operations
-# while keeping the artifact directory within the build tree
-# instead of the source tree
-
-set -e
-
-SCRIPT_PATH="$(realpath "$0")"
-SOURCE_DIR="$(dirname "$SCRIPT_PATH")"
-
-CARGO_TARGET_DIR="$(pwd)"
-export CARGO_TARGET_DIR
-
-GSETTINGS_SCHEMA_DIR="${CARGO_TARGET_DIR}/data:${GSETTINGS_SCHEMA_DIR}"
-export GSETTINGS_SCHEMA_DIR
-
-cd "$SOURCE_DIR"
-
-# the 'run" command takes arguments at the end,
-# so --manifest-path must not be last
-CMD="$1"
-shift
-cargo "$CMD" --manifest-path "$CARGO_TARGET_DIR"/Cargo.toml "$@"
-
--- a/cargo_build.py
+++ b/cargo_build.py
@ -1,49 +0,0 @@
-#!/usr/bin/env python3
-
-"""This script manages Cargo builds
-while keeping the artifact directory within the build tree
-instead of the source tree.
-"""
-
-from pathlib import Path
-import shlex
-import subprocess
-import sys
-
-source_dir = Path(__file__).absolute().parent
-
-args = sys.argv[1:]
-binary_dir = "debug"
-
-if '--release' in args:
-    binary_dir = "release"
-
-# The file produced by Cargo will have a special name
-try:
-    i = args.index('--rename')
-except ValueError:
-    filename = None
-else:
-    args.pop(i)
-    filename = args.pop(i)
-
-# The target destination of the produced file is a positional argument
-out_path = [arg for arg in args if not arg.startswith('--')]
-if out_path:
-    out_path = out_path[0]
-    i = args.index(out_path)
-    args.pop(i)    
-
-subprocess.run(['sh', "{}/cargo.sh".format(source_dir.as_posix()), 'build']
-    + args,
-    check=True)
-
-if out_path:
-    out_path = Path(out_path).absolute()
-    out_basename = out_path.name
-    filename = filename or out_basename
-    subprocess.run(['cp', '-a',
-        './{}/{}'.format(binary_dir, filename),
-        out_path],
-        check=True)
-
--- a/configure.ac
+++ b/configure.ac
@ -0,0 +1,244 @@
+# Copyright (C) 2010-2011 Daiki Ueno <ueno@unixuser.org>
+# Copyright (C) 2010-2011 Red Hat, Inc.
+
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public License
+# as published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+
+# This library is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301 USA
+
+AC_PREREQ(2.63)
+dnl AC_CONFIG_SRCDIR([configure.ac])
+AC_CONFIG_MACRO_DIR([m4])
+
+AC_INIT([eekboard], [1.0.8], [ueno@unixuser.org])
+
+dnl Init automake
+AM_INIT_AUTOMAKE
+AM_MAINTAINER_MODE([enable])
+AC_GNU_SOURCE
+
+dnl Support silent build
+m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
+
+dnl Check for programs
+AC_PROG_CC
+AM_PROG_CC_C_O
+AC_PROG_CC_STDC
+AC_PROG_INSTALL
+AC_PROG_CXX
+
+# define PACKAGE_VERSION_* variables
+AM_DISABLE_STATIC
+AC_ISC_POSIX
+AC_HEADER_STDC
+LT_INIT
+IT_PROG_INTLTOOL([0.35.0])
+
+GTK_API_VERSION=3.0
+GTK_REQUIRED=2.91.0
+EEK_API_VERSION=0.90
+EEK_API_MAJOR_VERSION=0
+EEK_API_MINOR_VERSION=90
+EEK_API_PC_VERSION=0.90
+EEK_LIBRARY_SUFFIX="-$EEK_API_VERSION"
+
+AC_SUBST([GTK_API_VERSION])
+AC_SUBST([EEK_API_VERSION])
+AC_SUBST([EEK_API_MAJOR_VERSION])
+AC_SUBST([EEK_API_MINOR_VERSION])
+AC_SUBST([EEK_API_PC_VERSION])
+AC_SUBST([EEK_LIBRARY_SUFFIX])
+AC_SUBST([EEK_LIBRARY_SUFFIX_U],[AS_TR_SH([$EEK_LIBRARY_SUFFIX])])
+
+AM_PATH_GLIB_2_0
+PKG_CHECK_MODULES([GLIB2], [glib-2.0 >= 2.26.0], ,
+  [AC_MSG_ERROR([GLib2 not found])])
+PKG_CHECK_MODULES([GIO2], [gio-2.0], ,
+  [AC_MSG_ERROR([Gio2 not found])])
+GLIB_GSETTINGS
+
+PKG_CHECK_MODULES([PANGOCAIRO], [pangocairo], ,
+  [AC_MSG_ERROR([PangoCairo not found])])
+PKG_CHECK_MODULES([GTK], [
+  gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
+  gdk-$GTK_API_VERSION >= $GTK_REQUIRED], ,
+  [AC_MSG_ERROR([GTK not found])])
+PKG_CHECK_MODULES([LIBXKLAVIER], [libxklavier x11], ,
+  [AC_MSG_ERROR([Libxklavier not found])])
+PKG_CHECK_MODULES([LIBCROCO], [libcroco-0.6], ,
+  [AC_MSG_ERROR([libcroco not found])])
+
+dnl use XTest to generate key events
+AC_MSG_CHECKING([whether you enable XTest])
+AC_ARG_ENABLE(xtest,
+              AS_HELP_STRING([--enable-xtest=no/yes],
+                             [Enable XTest default=yes]),
+              enable_xtest=$enableval,
+              enable_xtest=yes)
+
+if test x$enable_xtest = xyes; then
+  PKG_CHECK_MODULES([XTEST], [xtst], , enable_xtest=no)
+  if test x$enable_xtest = xyes; then
+    AC_DEFINE([HAVE_XTEST], [1], [Define if XTest is found])
+  fi
+fi
+AM_CONDITIONAL(ENABLE_XTEST, [test x$enable_xtest = xyes])
+AC_MSG_RESULT($enable_xtest)
+
+dnl use X to mark the fullscreen window as dock
+AC_MSG_CHECKING([whether you enable X dock])
+AC_ARG_ENABLE(x-dock,
+              AS_HELP_STRING([--enable-x-dock=no/yes],
+                             [Enable X dock default=yes]),
+              enable_x_dock=$enableval,
+              enable_x_dock=yes)
+
+if test x$enable_x_dock = xyes; then
+  PKG_CHECK_MODULES([XDOCK], [x11], , enable_x_dock=no)
+  if test x$enable_x_dock = xyes; then
+    AC_DEFINE([HAVE_XDOCK], [1], [Define if X dock is found])
+  fi
+fi
+AM_CONDITIONAL(ENABLE_XDOCK, [test x$enable_x_dock = xyes])
+AC_MSG_RESULT($enable_x_dock)
+
+focus_listeners="ibus"
+keystroke_listeners=""
+
+dnl use AT-SPI 2 to capture focus/keystroke events
+AC_MSG_CHECKING([whether you enable AT-SPI 2 event handling])
+AC_ARG_ENABLE(atspi,
+              AS_HELP_STRING([--enable-atspi=no/yes],
+                             [Enable AT-SPI 2 event handling default=yes]),
+              enable_atspi=$enableval,
+              enable_atspi=yes)
+
+if test x$enable_atspi = xyes; then
+  PKG_CHECK_MODULES([ATSPI2], [atspi-2], , enable_atspi=no)
+  if test x$enable_atspi = xyes; then
+    AC_DEFINE([HAVE_ATSPI], [1], [Define if AT-SPI 2 is found])
+    focus_listeners="atspi $focus_listeners"
+    keystroke_listeners="atspi $keystroke_listeners"
+  fi
+fi
+AC_MSG_RESULT($enable_atspi)
+AM_CONDITIONAL(ENABLE_ATSPI, [test x$enable_atspi = xyes])
+
+if test -n "$focus_listeners"; then
+  AC_DEFINE(ENABLE_FOCUS_LISTENER, [1], [Define if eekboard can follow focus changes])
+fi
+
+GOBJECT_INTROSPECTION_CHECK([0.9.0])
+
+dnl Vala langauge binding
+AC_MSG_CHECKING([whether you enable Vala language support])
+AC_ARG_ENABLE(vala,
+              AS_HELP_STRING([--enable-vala=no/yes],
+                             [Enable Vala language binding default=yes]),
+              enable_vala=$enableval,
+              enable_vala=yes)
+if test x$enable_vala = xyes; then
+  if test "x$INTROSPECTION_SCANNER" = x; then
+    enable_vala=no
+    AC_MSG_WARN([GObject-Introspection must be enabled for Vala bindings])
+  fi
+
+  AM_PROG_VALAC([0.10.0])
+  have_vala=yes
+
+  AC_PATH_PROG(VALAC, valac, valac)
+  AC_SUBST(VALAC)
+  AC_SUBST(VALAFLAGS)
+
+  AC_PATH_PROG([VAPIGEN], [vapigen], [false])
+
+  if test "x$VAPIGEN" = "xfalse"; then
+    enable_vala=no
+    AC_MSG_WARN([vapigen not found. Was vala compiled with --enable-vapigen?])
+  fi
+
+  AC_SUBST(VAPIGEN)
+fi
+AC_MSG_RESULT($enable_vala)
+AM_CONDITIONAL(ENABLE_VALA, [test x$enable_vala = xyes])
+
+dnl libcanberra
+AC_MSG_CHECKING([whether you enable libcanberra])
+AC_ARG_ENABLE(libcanberra,
+              AS_HELP_STRING([--enable-libcanberra=no/yes],
+                             [Enable libcanberra user interface default=no]),
+              enable_libcanberra=$enableval,
+              enable_libcanberra=yes)
+
+if test x$enable_libcanberra = xyes; then
+  PKG_CHECK_MODULES([LIBCANBERRA], [libcanberra-gtk3], , enable_libcanberra=no)
+  if test x$enable_libcanberra = xyes; then
+    AC_DEFINE([HAVE_LIBCANBERRA], [1], [Define if libcanberra is found])
+  fi
+fi
+AM_CONDITIONAL(ENABLE_LIBCANBERRA, [test x$enable_libcanberra = xyes])
+AC_MSG_RESULT($enable_libcanberra)
+
+GTK_DOC_CHECK([1.14],[--flavour no-tmpl])
+
+dnl define GETTEXT_* variables
+GETTEXT_PACKAGE=$PACKAGE
+AC_SUBST(GETTEXT_PACKAGE)
+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Define to the read-only architecture-independent data directory.])
+AM_GLIB_GNU_GETTEXT
+AM_GLIB_DEFINE_LOCALEDIR(EEKBOARD_LOCALEDIR)
+
+AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_FILES([Makefile
+eek/Makefile
+eekboard/Makefile
+src/Makefile
+tests/Makefile
+bindings/Makefile
+bindings/vala/Makefile
+docs/Makefile
+docs/reference/Makefile
+docs/reference/eek/Makefile
+docs/reference/eekboard/Makefile
+po/Makefile.in
+data/Makefile
+data/icons/Makefile
+data/icons/16x16/Makefile
+data/icons/22x22/Makefile
+data/icons/24x24/Makefile
+data/icons/32x32/Makefile
+data/icons/48x48/Makefile
+data/icons/scalable/Makefile
+data/themes/Makefile
+data/keyboards/Makefile
+examples/Makefile
+examples/simple-client/Makefile
+eek/eek-${EEK_API_VERSION}.pc
+eek/eek-gtk-${EEK_API_VERSION}.pc
+eekboard/eekboard-${EEK_API_VERSION}.pc])
+AC_OUTPUT
+AC_MSG_RESULT([
+Build options:
+  Version                   $VERSION
+  Install prefix            $prefix
+  Build shared libs         $enable_shared
+  Build static libs         $enable_static
+  CFLAGS                    $CFLAGS
+  Build Vala binding        $enable_vala
+  Sound support             $enable_libcanberra
+  Build document            $enable_gtk_doc
+  Focus listeners           $focus_listeners
+  Keystroke listeners       $keystroke_listeners
+])
+
+
--- a/data/Makefile.am
+++ b/data/Makefile.am
@ -0,0 +1,35 @@
+SUBDIRS = icons themes keyboards
+
+@GSETTINGS_RULES@
+@INTLTOOL_XML_NOMERGE_RULE@
+gsettings_schemas_in_files = org.fedorahosted.eekboard.gschema.xml.in
+gsettings_SCHEMAS = $(gsettings_schemas_in_files:.gschema.xml.in=.gschema.xml)
+
+servicedir       = $(datadir)/dbus-1/services
+service_in_files = eekboard-server.service.in
+service_DATA     = $(service_in_files:.service.in=.service)
+
+$(service_DATA): $(service_in_files) Makefile
+	$(AM_V_GEN) sed -e "s|\@bindir\@|$(bindir)|" $< > $@
+
+desktopdir = $(datadir)/applications
+desktop_in_files = eekboard.desktop.in
+desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+
+if ENABLE_ATSPI
+autostartdir	 = $(sysconfdir)/xdg/autostart
+autostart_in_files = eekboard-autostart.desktop.in
+autostart_DATA   = $(autostart_in_files:.desktop.in=.desktop)
+endif
+
+@INTLTOOL_DESKTOP_RULE@
+
+CLEANFILES = $(service_DATA) $(desktop_DATA) $(gsettings_SCHEMAS)
+EXTRA_DIST = $(service_in_files) $(desktop_in_files) $(gsettings_schemas_in_files)
+
+if ENABLE_ATSPI
+CLEANFILES += $(autostart_DATA)
+EXTRA_DIST += $(autostart_in_files)
+endif
+
+-include $(top_srcdir)/git.mk
--- a/data/common.css
+++ b/data/common.css
@ -1,55 +0,0 @@
-/* Theme independent styles */
-
-sq_view {
-    font-family: cantarell, sans-serif;
-    font-size: 1.5em;
-}
-
-/* Becomes readable with a special font */
-sq_view.gr_polytonic {
-    font-family: GFSDidotClassic, cantarell, sans-serif;
-    font-size: 2em;
-}
-
-sq_view.in_mal {
-    font-size: 1em;
-}
-
-sq_view.wide.in_mal {
-    font-size: 1.25em;
-}
-
-sq_view.ir_azb {
-    font-size: 1.368em;
-}
-
-sq_view.wide.jp {
-    font-size: 1.15em;
-}
-
-sq_button {
-    border-radius: 4px;
-    margin: 2px;
-}
-
-sq_view.wide sq_button {
-    margin: 3px;
-}
-
-sq_button.latched,
-sq_button.locked {
-    font-weight: bold;
-}
-
-sq_button.action {
-    font-size: 0.75em;
-}
-
-sq_button.small {
-    font-size: 0.5em;
-}
-
-sq_view.pin sq_button {
-    border-radius: 0px;
-    margin: 1px 1px 1px 1px;
-}
--- a/data/dbus/sm.puri.OSK0.xml
+++ b/data/dbus/sm.puri.OSK0.xml
@ -1,31 +0,0 @@
-<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
-"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
-<node xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd">
-
-  <!--
-      sm.puri.OSK0:
-
-      This interface is exported by on screen keyboards (OSK) to
-      indicate and set state like visibility.
-  -->
-
-  <interface name="sm.puri.OSK0">
-    <!--
-        SetVisible:
-        @visible: %TRUE if the OSK should be shown to the user, %FALSE otherwise
-
-        Toggle keyboard visibility.
-    -->
-    <method name="SetVisible">
-      <arg type="b" direction="in" name="visible"/>
-    </method>
-    <!--
-        Visible:
-
-        Indicates whether the on screen keyboard is currently
-        unfolded. %TRUE if the OSK is currently visible to the user,
-        %FALSE otherwise.
-    -->
-    <property name="Visible" type="b" access="read"/>
-  </interface>
-</node>
--- a/data/eekboard-autostart.desktop.in
+++ b/data/eekboard-autostart.desktop.in
@ -0,0 +1,6 @@
+[Desktop Entry]
+Name=Eekboard
+Exec=eekboard -f
+Type=Application
+#AutostartCondition=GSettings org.gnome.desktop.a11y.applications screen-keyboard-enabled
+X-GNOME-AutoRestart=true
--- a/data/eekboard-server.service.in
+++ b/data/eekboard-server.service.in
@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=org.fedorahosted.Eekboard
+Exec=@bindir@/eekboard-server
--- a/data/eekboard.desktop.in
+++ b/data/eekboard.desktop.in
@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Eekboard
+GenericName=Eekboard Virtual Keyboard
+Comment=Virtual Keyboard
+Exec=eekboard
+Icon=eekboard
+Terminal=false
+Type=Application
+Categories=GTK;Utility;
--- a/data/icons/16x16/Makefile.am
+++ b/data/icons/16x16/Makefile.am
@ -0,0 +1,17 @@
+size = 16x16
+
+icondir = $(datadir)/icons/hicolor/$(size)/apps
+dist_icon_DATA = eekboard.png
+
+gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
+
+install-data-hook:
+	@-if test -z "$(DESTDIR)"; then			\
+		echo "Updating Gtk icon cache.";	\
+		$(gtk_update_icon_cache);		\
+	else						\
+		echo "*** Icon cache not updated.  After install, run this:"; \
+		echo "***   $(gtk_update_icon_cache)";	\
+	fi
+
+-include $(top_srcdir)/git.mk
--- a/data/icons/16x16/eekboard.png
+++ b/data/icons/16x16/eekboard.png
--- a/data/icons/22x22/Makefile.am
+++ b/data/icons/22x22/Makefile.am
@ -0,0 +1,17 @@
+size = 22x22
+
+icondir = $(datadir)/icons/hicolor/$(size)/apps
+dist_icon_DATA = eekboard.png
+
+gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
+
+install-data-hook:
+	@-if test -z "$(DESTDIR)"; then			\
+		echo "Updating Gtk icon cache.";	\
+		$(gtk_update_icon_cache);		\
+	else						\
+		echo "*** Icon cache not updated.  After install, run this:"; \
+		echo "***   $(gtk_update_icon_cache)";	\
+	fi
+
+-include $(top_srcdir)/git.mk
--- a/data/icons/22x22/eekboard.png
+++ b/data/icons/22x22/eekboard.png
--- a/data/icons/24x24/Makefile.am
+++ b/data/icons/24x24/Makefile.am
@ -0,0 +1,17 @@
+size = 24x24
+
+icondir = $(datadir)/icons/hicolor/$(size)/apps
+dist_icon_DATA = eekboard.png
+
+gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
+
+install-data-hook:
+	@-if test -z "$(DESTDIR)"; then			\
+		echo "Updating Gtk icon cache.";	\
+		$(gtk_update_icon_cache);		\
+	else						\
+		echo "*** Icon cache not updated.  After install, run this:"; \
+		echo "***   $(gtk_update_icon_cache)";	\
+	fi
+
+-include $(top_srcdir)/git.mk
--- a/data/icons/24x24/eekboard.png
+++ b/data/icons/24x24/eekboard.png
--- a/data/icons/32x32/Makefile.am
+++ b/data/icons/32x32/Makefile.am
@ -0,0 +1,17 @@
+size = 32x32
+
+icondir = $(datadir)/icons/hicolor/$(size)/apps
+dist_icon_DATA = eekboard.png
+
+gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
+
+install-data-hook:
+	@-if test -z "$(DESTDIR)"; then			\
+		echo "Updating Gtk icon cache.";	\
+		$(gtk_update_icon_cache);		\
+	else						\
+		echo "*** Icon cache not updated.  After install, run this:"; \
+		echo "***   $(gtk_update_icon_cache)";	\
+	fi
+
+-include $(top_srcdir)/git.mk
--- a/data/icons/32x32/eekboard.png
+++ b/data/icons/32x32/eekboard.png
--- a/data/icons/48x48/Makefile.am
+++ b/data/icons/48x48/Makefile.am
@ -0,0 +1,17 @@
+size = 48x48
+
+icondir = $(datadir)/icons/hicolor/$(size)/apps
+dist_icon_DATA = eekboard.png
+
+gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
+
+install-data-hook:
+	@-if test -z "$(DESTDIR)"; then			\
+		echo "Updating Gtk icon cache.";	\
+		$(gtk_update_icon_cache);		\
+	else						\
+		echo "*** Icon cache not updated.  After install, run this:"; \
+		echo "***   $(gtk_update_icon_cache)";	\
+	fi
+
+-include $(top_srcdir)/git.mk
--- a/data/icons/48x48/eekboard.png
+++ b/data/icons/48x48/eekboard.png
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@ -0,0 +1,3 @@
+SUBDIRS = 16x16 22x22 24x24 32x32 48x48 scalable
+
+-include $(top_srcdir)/git.mk
--- a/data/icons/key-enter.svg
+++ b/data/icons/key-enter.svg
@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"
-     version="1.1" viewBox="0 0 24 24">
-   
-    <path d="M 24,1 L 24,10 C 24,15 20,17 17,17 L 7,17 L 10,20 L 10,23
-             L 7,23 L 0,15 L 7,7 L 10,7 L 10,10 L 7,13 L 17,13
-             C 19,13 20,12 20,10 L 20,1 Z"
-          stroke="none" fill="black" />
-</svg>
--- a/data/icons/key-shift.svg
+++ b/data/icons/key-shift.svg
@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"
-     version="1.1" viewBox="0 0 24 24">
-   
-    <path d="M 12,2 L 22,14 L 16,14 L 16,22 L 8,22 L 8,14 L 2,14 Z"
-          stroke="none" fill="black" />
-</svg>
--- a/data/icons/keyboard-mode-symbolic.svg
+++ b/data/icons/keyboard-mode-symbolic.svg
@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg4043"
-   version="1.1"
-   viewBox="0 0 4.2333331 4.2333093"
-   height="4.2333093mm"
-   width="4.2333331mm">
-  <defs
-     id="defs4037" />
-  <metadata
-     id="metadata4040">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-86.329776,-68.097636)"
-     id="layer1">
-    <g
-       style="stroke-width:1.00004983;fill:#2e3436;fill-opacity:1"
-       transform="matrix(0.99990029,0,0,1,-7.1823833,-1.8799927)"
-       id="g842">
-      <g
-         style="stroke-width:1.00004983;fill:#2e3436;fill-opacity:1"
-         id="g836">
-        <path
-           id="path5166"
-           d="m 95.636719,69.978516 c -1.165869,0 -2.115235,0.949365 -2.115235,2.115234 0,1.165869 0.949366,2.117188 2.115235,2.117188 1.165869,0 2.117187,-0.951319 2.117187,-2.117188 0,-1.165869 -0.951318,-2.115234 -2.117187,-2.115234 z m 0,0.529296 c 0.879886,0 1.58789,0.706052 1.58789,1.585938 0,0.879886 -0.708004,1.587891 -1.58789,1.587891 -0.879886,0 -1.585938,-0.708005 -1.585938,-1.587891 0,-0.879886 0.706052,-1.585937 1.585938,-1.585938 z"
-           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#2e3436;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.52919304;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
-      </g>
-      <path
-         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#2e3436;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.26459652;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-         d="m 95.636719,70.109375 c -0.144398,0 -0.27248,0.07793 -0.373047,0.189453 -0.100567,0.111521 -0.18209,0.261405 -0.25,0.439453 -0.135821,0.356096 -0.214844,0.830395 -0.214844,1.355469 0,0.525074 0.07902,1.001326 0.214844,1.357422 0.06791,0.178048 0.149433,0.327932 0.25,0.439453 0.100567,0.111521 0.228649,0.1875 0.373047,0.1875 0.144397,0 0.27248,-0.07598 0.373047,-0.1875 0.100566,-0.111521 0.182089,-0.261405 0.25,-0.439453 0.135821,-0.356096 0.216797,-0.832348 0.216796,-1.357422 0,-0.525074 -0.08097,-0.999373 -0.216796,-1.355469 -0.06791,-0.178048 -0.149434,-0.327932 -0.25,-0.439453 -0.100567,-0.111521 -0.22865,-0.189453 -0.373047,-0.189453 z m 0,0.265625 c 0.05067,0 0.109272,0.02564 0.177734,0.101562 0.06846,0.07592 0.139293,0.198356 0.199219,0.355469 0.119851,0.314227 0.197266,0.763915 0.197266,1.261719 0,0.497804 -0.07742,0.949446 -0.197266,1.263672 -0.05993,0.157113 -0.130756,0.279549 -0.199219,0.355469 -0.06846,0.07592 -0.12706,0.101562 -0.177734,0.101562 -0.05067,0 -0.107319,-0.02564 -0.175781,-0.101562 -0.06846,-0.07592 -0.139294,-0.198356 -0.199219,-0.355469 C 95.141867,73.043196 95.0625,72.591554 95.0625,72.09375 c 0,-0.497804 0.07937,-0.947492 0.199219,-1.261719 0.05993,-0.157113 0.130756,-0.279549 0.199219,-0.355469 C 95.5294,70.400643 95.586045,70.375 95.636719,70.375 Z"
-         id="circle5168" />
-      <path
-         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#2e3436;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.26459652;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-         d="m 93.697266,71.962891 v 0.263671 h 3.96875 v -0.263671 z"
-         id="path5170" />
-    </g>
-  </g>
-</svg>
--- a/data/icons/scalable/Makefile.am
+++ b/data/icons/scalable/Makefile.am
@ -0,0 +1,15 @@
+icondir = $(datadir)/icons/hicolor/scalable/apps
+dist_icon_DATA = eekboard.svg
+
+gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
+
+install-data-hook:
+	@-if test -z "$(DESTDIR)"; then			\
+		echo "Updating Gtk icon cache.";	\
+		$(gtk_update_icon_cache);		\
+	else						\
+		echo "*** Icon cache not updated.  After install, run this:"; \
+		echo "***   $(gtk_update_icon_cache)";	\
+	fi
+
+-include $(top_srcdir)/git.mk
--- a/data/icons/scalable/eekboard.svg
+++ b/data/icons/scalable/eekboard.svg
--- a/data/icons/zwj.svg
+++ b/data/icons/zwj.svg
@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="200" height="200" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <g fill="none" stroke="#000">
-  <path d="m135.66 182.97a51.681 32.879 0 0 1-71.332 9.8e-4" stroke-width="12.123"/>
-  <path d="m135.66 17.029a51.681 32.879 0 0 0-71.332-0.0011" stroke-width="12.123"/>
-  <path d="m100 7.7071v184.59" stroke-width="10"/>
- </g>
-</svg>
--- a/data/icons/zwnj.svg
+++ b/data/icons/zwnj.svg
@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1">
-  <path d="M 3,0.5 V 1 c 2.5,0 4.5,1 4.5,2 v 12.5 h 1 V 3 c 0,-1 2,-2 4.5,-2 V 0.5 Z" />
-</svg>
--- a/data/icons/zwsp.svg
+++ b/data/icons/zwsp.svg
@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="200" height="200" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <g fill="none" stroke="#000">
-  <circle cx="100" cy="20.429" r="14.118" stroke-width="9.05"/>
-  <circle cx="100" cy="179.57" r="14.118" stroke-width="9.05"/>
-  <path d="m100 34.739v130.52" stroke-width="8.5856"/>
- </g>
-</svg>
--- a/data/keyboards/Makefile.am
+++ b/data/keyboards/Makefile.am
@ -0,0 +1,40 @@
+keyboardsdir = $(pkgdatadir)/keyboards
+
+nobase_dist_keyboards_DATA =			\
+	keyboards.xml				\
+	geometry/compact.xml			\
+	symbols/ar.xml				\
+	symbols/be.xml				\
+	symbols/fa.xml				\
+	symbols/he.xml				\
+	symbols/ja-kana.xml			\
+	symbols/kk.xml				\
+	symbols/ks.xml				\
+	symbols/my.xml				\
+	symbols/ru.xml				\
+	symbols/th.xml				\
+	symbols/ua.xml				\
+	symbols/ug.xml				\
+	symbols/us.xml				\
+	symbols/zh-bopomofo.xml			\
+	$(inscript_symbols)			\
+	$(NULL)
+
+inscript_symbols =				\
+	symbols/as-inscript.xml			\
+	symbols/bn-inscript.xml			\
+	symbols/gu-inscript.xml			\
+	symbols/hi-inscript.xml			\
+	symbols/kn-inscript.xml			\
+	symbols/ks-inscript.xml			\
+	symbols/mai-inscript.xml		\
+	symbols/ml-inscript.xml			\
+	symbols/mr-inscript.xml			\
+	symbols/or-inscript.xml			\
+	symbols/pa-inscript.xml			\
+	symbols/sd-inscript.xml			\
+	symbols/ta-inscript.xml			\
+	symbols/te-inscript.xml			\
+	$(NULL)
+
+-include $(top_srcdir)/git.mk
--- a/data/keyboards/am+phonetic.yaml
+++ b/data/keyboards/am+phonetic.yaml
@ -1,90 +0,0 @@
-# Language: Armenian (phonetic)
-# Armenian layout based on work by Norayr Chilingarian
-# Yerevan
-# Oct 2021
---
-outlines:
-    default:       { width: 34.3,   height: 52 }
-    altline:       { width: 52,     height: 52 }
-    wide:          { width: 104,    height: 52 }
-    change-view:   { width: 52,     height: 52 }
-    change-view-2: { width: 104,    height: 52 }
-    spaceline:     { width: 150.99, height: 52 }
-    special:       { width: 44,     height: 52 }
-    large:         { width: 44,     height: 52 }
-    placeholder:   { width: 34.3,   height: 52 }
-
-views:
-    base:
-        - "՝ է թ փ ձ ջ ւ և ռ չ ճ ֊ ժ"
-        - "ք ո ե ր տ ը ւ ի օ պ խ ծ շ"
-        - "-- -- ա ս դ ֆ գ հ յ կ լ ․ --"
-        - "Shift_L -- զ ղ ց վ բ ն մ ՛ -- BackSpace"
-        - "show_numbers preferences         space        . Return"
-    upper:
-        - "՝ Է Թ Փ Ձ Ջ Ւ և Ռ Չ Ճ — Ժ"
-        - "Ք Ո Ե Ր Տ Ը Ւ Ի Օ Պ Խ Ծ Շ"
-        - "-- -- Ա Ս Դ Ֆ Գ Հ Յ Կ Լ ։ --"
-        - "Shift_L -- Զ Ղ Ց Վ Բ Ն Մ ՞ -- BackSpace"
-        - "show_numbers preferences         space        . Return"
-    numbers:
-        - "-- -- -- -- -- -- -- -- --"
-        - "-- ﬓ  ﬔ  ﬕ  ﬖ  ﬗ   ՟ և --"
-        - "-- , \" ' : ; ! ? --"
-        - "show_symbols 1 2 3 4 5 6 7 8 9 0 BackSpace"
-        - "show_letters preferences         space        . Return"
-    symbols:
-        - "* # \\ % < > = [ ]"
-        - "© $ / & - _ + ( )"
-        - "® £ € ¥ ^ ° @ { }"
-        - "show_numbers_from_symbols ~ ` | · √ π τ ÷ × ¶ BackSpace"
-        - "show_letters preferences         space        . Return"
-
-buttons:
-    Shift_L:
-        action:
-            locking:
-                lock_view: "upper"
-                unlock_view: "base"
-        outline: "change-view"
-        icon: "key-shift"
-    BackSpace:
-        outline: "altline"
-        icon: "edit-clear-symbolic"
-        action: "erase"
-    preferences:
-        action: "show_prefs"
-        outline: "special"
-        icon: "keyboard-mode-symbolic"
-    show_numbers:
-        action:
-            set_view: "numbers"
-        outline: "change-view-2"
-        label: "123"
-    show_numbers_from_symbols:
-        action:
-            set_view: "numbers"
-        outline: "change-view"
-        label: "123"
-    show_letters:
-        action:
-            set_view: "base"
-        outline: "change-view-2"
-        label: "ԱԲԳ"
-    show_symbols:
-        action:
-            set_view: "symbols"
-        outline: "change-view"
-        label: "*/="
-    .:
-        outline: "large"
-    space:
-        outline: "spaceline"
-        text: " "
-    Return:
-        outline: "wide"
-        icon: "key-enter"
-        keysym: "Return"
-    --:
-        outline: "placeholder"
-        text: ""
--- a/data/keyboards/am+phonetic_wide.yaml
+++ b/data/keyboards/am+phonetic_wide.yaml
@ -1,90 +0,0 @@
-# Language: Armenian (phonetic)
-# Armenian layout based on work by Norayr Chilingarian
-# Yerevan
-# Oct 2021
---
-outlines:
-    default:       { width: 51.7,   height: 42 }
-    altline:       { width: 77.5,   height: 42 }
-    wide:          { width: 103.35, height: 42 }
-    change-view:   { width: 77.5,   height: 42 }
-    change-view-2: { width: 103.35, height: 42 }
-    spaceline:     { width: 340.3,  height: 42 }
-    special:       { width: 62.27,  height: 42 }
-    large:         { width: 62.27,  height: 42 }
-    placeholder:   { width: 51.7,   height: 42 }
-
-views:
-    base:
-        - "՝ է թ փ ձ ջ ւ և ռ չ ճ ֊ ժ"
-        - "ք ո ե ր տ ը ւ ի օ պ խ ծ շ"
-        - "-- -- ա ս դ ֆ գ հ յ կ լ ․ --"
-        - "Shift_L -- զ ղ ց վ բ ն մ ՛ -- BackSpace"
-        - "show_numbers preferences         space        . Return"
-    upper:
-        - "՝ Է Թ Փ Ձ Ջ Ւ և Ռ Չ Ճ — Ժ"
-        - "Ք Ո Ե Ր Տ Ը Ւ Ի Օ Պ Խ Ծ Շ"
-        - "-- -- Ա Ս Դ Ֆ Գ Հ Յ Կ Լ ։ --"
-        - "Shift_L -- Զ Ղ Ց Վ Բ Ն Մ ՞ -- BackSpace"
-        - "show_numbers preferences         space        . Return"
-    numbers:
-        - "-- -- -- -- -- -- -- -- --"
-        - "-- ﬓ  ﬔ  ﬕ  ﬖ  ﬗ   ՟ և --"
-        - "-- , \" ' : ; ! ? --"
-        - "show_symbols 1 2 3 4 5 6 7 8 9 0 BackSpace"
-        - "show_letters preferences         space        . Return"
-    symbols:
-        - "* # \\ % < > = [ ]"
-        - "© $ / & - _ + ( )"
-        - "® £ € ¥ ^ ° @ { }"
-        - "show_numbers_from_symbols ~ ` | · √ π τ ÷ × ¶ BackSpace"
-        - "show_letters preferences         space        . Return"
-
-buttons:
-    Shift_L:
-        action:
-            locking:
-                lock_view: "upper"
-                unlock_view: "base"
-        outline: "change-view"
-        icon: "key-shift"
-    BackSpace:
-        outline: "altline"
-        icon: "edit-clear-symbolic"
-        action: "erase"
-    preferences:
-        action: "show_prefs"
-        outline: "special"
-        icon: "keyboard-mode-symbolic"
-    show_numbers:
-        action:
-            set_view: "numbers"
-        outline: "change-view-2"
-        label: "123"
-    show_numbers_from_symbols:
-        action:
-            set_view: "numbers"
-        outline: "change-view"
-        label: "123"
-    show_letters:
-        action:
-            set_view: "base"
-        outline: "change-view-2"
-        label: "ԱԲԳ"
-    show_symbols:
-        action:
-            set_view: "symbols"
-        outline: "change-view"
-        label: "*/="
-    .:
-        outline: "large"
-    space:
-        outline: "spaceline"
-        text: " "
-    Return:
-        outline: "wide"
-        icon: "key-enter"
-        keysym: "Return"
-    --:
-        outline: "placeholder"
-        text: ""
--- a/data/keyboards/am.yaml
+++ b/data/keyboards/am.yaml
@ -1,90 +0,0 @@
-# Language: Armenian
-# Armenian layout based on work by Norayr Chilingarian
-# Yerevan
-# Oct 2021
---
-outlines:
-    default:       { width: 34.3,   height: 52 }
-    altline:       { width: 52,     height: 52 }
-    wide:          { width: 104,    height: 52 }
-    change-view:   { width: 52,     height: 52 }
-    change-view-2: { width: 104,    height: 52 }
-    spaceline:     { width: 150.99, height: 52 }
-    special:       { width: 44,     height: 52 }
-    large:         { width: 44,     height: 52 }
-    placeholder:   { width: 34.3,   height: 52 }
-
-views:
-    base:
-        - "՝ ֆ ձ ֊ , ։ ՞ ․ ՛ ) օ է ղ"
-        - "ճ փ բ ս մ ո ւ կ ը թ ծ ց »"
-        - "-- ջ վ գ ե ա ն ի տ հ պ ր --"
-        - "Shift_L ժ դ չ յ զ լ ք խ շ ռ BackSpace"
-        - "show_numbers preferences         space        . Return"
-    upper:
-        - "՜ Ֆ Ձ — $ … ՟ և ՚ ( Օ Է Ղ"
-        - "Ճ Փ Բ Ս Մ Ո Ւ Կ Ը Թ Ծ Ց «"
-        - "-- Ջ Վ Գ Ե Ա Ն Ի Տ Հ Պ Պ Ր"
-        - "Shift_L Ժ Դ Չ Յ Զ Լ Ք Խ Շ Ռ BackSpace"
-        - "show_numbers preferences         space        . Return"
-    numbers:
-        - "-- -- -- -- -- -- -- -- --"
-        - "-- ﬓ  ﬔ  ﬕ  ﬖ  ﬗ   ՟ և --"
-        - "-- , \" ' : ; ! ? --"
-        - "show_symbols 1 2 3 4 5 6 7 8 9 0 BackSpace"
-        - "show_letters preferences         space        . Return"
-    symbols:
-        - "* # \\ % < > = [ ]"
-        - "© $ / & - _ + ( )"
-        - "® £ € ¥ ^ ° @ { }"
-        - "show_numbers_from_symbols ~ ` | · √ π τ ÷ × ¶ BackSpace"
-        - "show_letters preferences         space        . Return"
-
-buttons:
-    Shift_L:
-        action:
-            locking:
-                lock_view: "upper"
-                unlock_view: "base"
-        outline: "change-view"
-        icon: "key-shift"
-    BackSpace:
-        outline: "altline"
-        icon: "edit-clear-symbolic"
-        action: "erase"
-    preferences:
-        action: "show_prefs"
-        outline: "special"
-        icon: "keyboard-mode-symbolic"
-    show_numbers:
-        action:
-            set_view: "numbers"
-        outline: "change-view-2"
-        label: "123"
-    show_numbers_from_symbols:
-        action:
-            set_view: "numbers"
-        outline: "change-view"
-        label: "123"
-    show_letters:
-        action:
-            set_view: "base"
-        outline: "change-view-2"
-        label: "ԱԲԳ"
-    show_symbols:
-        action:
-            set_view: "symbols"
-        outline: "change-view"
-        label: "*/="
-    .:
-        outline: "large"
-    space:
-        outline: "spaceline"
-        text: " "
-    Return:
-        outline: "wide"
-        icon: "key-enter"
-        keysym: "Return"
-    --:
-        outline: "placeholder"
-        text: ""
--- a/data/keyboards/am_wide.yaml
+++ b/data/keyboards/am_wide.yaml
@ -1,90 +0,0 @@
-# Language: Armenian
-# Armenian layout based on work by Norayr Chilingarian
-# Yerevan
-# Oct 2021
---
-outlines:
-    default:       { width: 51.7,   height: 42 }
-    altline:       { width: 77.5,   height: 42 }
-    wide:          { width: 103.35, height: 42 }
-    change-view:   { width: 77.5,   height: 42 }
-    change-view-2: { width: 103.35, height: 42 }
-    spaceline:     { width: 340.3,  height: 42 }
-    special:       { width: 62.27,  height: 42 }
-    large:         { width: 62.27,  height: 42 }
-    placeholder:   { width: 51.7,   height: 42 }
-
-views:
-    base:
-        - "՝ ֆ ձ ֊ , ։ ՞ ․ ՛ ) օ է ղ"
-        - "ճ փ բ ս մ ո ւ կ ը թ ծ ց »"
-        - "-- ջ վ գ ե ա ն ի տ հ պ ր --"
-        - "Shift_L ժ դ չ յ զ լ ք խ շ ռ BackSpace"
-        - "show_numbers preferences         space        . Return"
-    upper:
-        - "՜ Ֆ Ձ — $ … ՟ և ՚ ( Օ Է Ղ"
-        - "Ճ Փ Բ Ս Մ Ո Ւ Կ Ը Թ Ծ Ց «"
-        - "-- Ջ Վ Գ Ե Ա Ն Ի Տ Հ Պ Պ Ր"
-        - "Shift_L Ժ Դ Չ Յ Զ Լ Ք Խ Շ Ռ BackSpace"
-        - "show_numbers preferences         space        . Return"
-    numbers:
-        - "-- -- -- -- -- -- -- -- --"
-        - "-- ﬓ  ﬔ  ﬕ  ﬖ  ﬗ   ՟ և --"
-        - "-- , \" ' : ; ! ? --"
-        - "show_symbols 1 2 3 4 5 6 7 8 9 0 BackSpace"
-        - "show_letters preferences         space        . Return"
-    symbols:
-        - "* # \\ % < > = [ ]"
-        - "© $ / & - _ + ( )"
-        - "® £ € ¥ ^ ° @ { }"
-        - "show_numbers_from_symbols ~ ` | · √ π τ ÷ × ¶ BackSpace"
-        - "show_letters preferences         space        . Return"
-
-buttons:
-    Shift_L:
-        action:
-            locking:
-                lock_view: "upper"
-                unlock_view: "base"
-        outline: "change-view"
-        icon: "key-shift"
-    BackSpace:
-        outline: "altline"
-        icon: "edit-clear-symbolic"
-        action: "erase"
-    preferences:
-        action: "show_prefs"
-        outline: "special"
-        icon: "keyboard-mode-symbolic"
-    show_numbers:
-        action:
-            set_view: "numbers"
-        outline: "change-view-2"
-        label: "123"
-    show_numbers_from_symbols:
-        action:
-            set_view: "numbers"
-        outline: "change-view"
-        label: "123"
-    show_letters:
-        action:
-            set_view: "base"
-        outline: "change-view-2"
-        label: "ԱԲԳ"
-    show_symbols:
-        action:
-            set_view: "symbols"
-        outline: "change-view"
-        label: "*/="
-    .:
-        outline: "large"
-    space:
-        outline: "spaceline"
-        text: " "
-    Return:
-        outline: "wide"
-        icon: "key-enter"
-        keysym: "Return"
-    --:
-        outline: "placeholder"
-        text: ""
--- a/data/keyboards/ara.yaml
+++ b/data/keyboards/ara.yaml
@ -1,90 +0,0 @@
-# Language: Arabic
-# Maintained by: Khaled Eldoheiri <khalid@kdehairy.com>
---
-outlines:
-    default:       { width: 32.95,  height: 52 }
-    altline:       { width: 48.99,  height: 52 }
-    wide:          { width: 62,     height: 52 }
-    change-view:   { width: 48.99,  height: 52 }
-    change-view-2: { width: 62,     height: 52 }
-    spaceline:     { width: 169.63, height: 52 }
-    special:       { width: 35.66,  height: 52 }
-    fill:          { width: 65.32,  height: 52 }
-
-views:
-    base:
-        - "ذ ض ص ث ق ف غ ع خ ح ج"
-        - "ش س ي ب ل ا ت ن م ك ط"
-        - "Shift_L ء ؤ ر ة و ز ظ د BackSpace"
-        - "show_numbers preferences         space        . Return"
-    extra:
-        - "ذ ض ص ث ق لإ إ ع خ ح ج"
-        - "ش س ى ب لأ أ ت ن م ك ط"
-        - "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: "extra"
-                unlock_view: "base"
-        outline: "change-view"
-        icon: "key-shift"
-    BackSpace:
-        outline: "altline"
-        icon: "edit-clear-symbolic"
-        action: "erase"
-    preferences:
-        action: "show_prefs"
-        outline: "special"
-        icon: "keyboard-mode-symbolic"
-    show_numbers:
-        action:
-            set_view: "numbers"
-        outline: "change-view-2"
-        label: "123"
-    show_numbers_from_symbols:
-        action:
-            set_view: "numbers"
-        outline: "change-view"
-        label: "123"
-    show_letters:
-        action:
-            set_view: "base"
-        outline: "change-view-2"
-        label: "ض"
-    show_symbols:
-        action:
-            set_view: "symbols"
-        outline: "change-view"
-        label: "*/="
-    space:
-        outline: "spaceline"
-        text: " "
-    Return:
-        outline: "wide"
-        icon: "key-enter"
-        keysym: "Return"
-    5:
-        outline: "fill"
-    "&":
-        outline: "fill"
-    ":":
-        outline: "fill"
-    √:
-        outline: "fill"
-    ¥:
-        outline: "fill"
-    ">":
-        outline: "fill"
--- a/data/keyboards/ara_wide.yaml
+++ b/data/keyboards/ara_wide.yaml
@ -1,91 +0,0 @@
-# Language: Arabic
-# Maintained by: Khaled Eldoheiri <khalid@kdehairy.com>
---
-outlines:
-    default:       { width: 49,   height: 42 }
-    altline:       { width: 73.5, height: 42 }
-    wide:          { width: 108,  height: 42 }
-    change-view:   { width: 73.5, height: 42 }
-    change-view-2: { width: 108,  height: 42 }
-    spaceline:     { width: 295,  height: 42 }
-    special:       { width: 49,   height: 42 }
-    fill:          { width: 98,   height: 42 }
-
-views:
-    base:
-        - "ذ ض ص ث ق ف غ ع خ ح ج"
-        - "ش س ي ب ل ا ت ن م ك ط"
-        - "Shift_L ء ؤ ر ة و ز ظ د BackSpace"
-        - "show_numbers preferences         space        . Return"
-    extra:
-        - "ذ ض ص ث ق لإ إ ع خ ح ج"
-        - "ش س ى ب لأ أ ت ن م ك ط"
-        - "Shift_L ئ لآ لا ه آ ز ظ د BackSpace"
-        - "show_numbers preferences         space        . Return"
-    numbers:
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "@ # € % & - _ + ( )"
-        - "show_symbols   ، \" ' : ؛ ! ؟  BackSpace"
-        - "show_letters preferences         space        . Return"
-    symbols:
-        - "~ ` | · √ π τ ÷ × ¶"
-        - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        . Return"
-
-buttons:
-    Shift_L:
-        action:
-            locking:
-                lock_view: "extra"
-                unlock_view: "base"
-        outline: "change-view"
-        icon: "key-shift"
-    BackSpace:
-        outline: "altline"
-        icon: "edit-clear-symbolic"
-        action: "erase"
-    preferences:
-        action: "show_prefs"
-        outline: "special"
-        icon: "keyboard-mode-symbolic"
-    show_numbers:
-        action:
-            set_view: "numbers"
-        outline: "change-view"
-        label: "123"
-    show_letters:
-        action:
-            set_view: "base"
-        outline: "change-view"
-        label: "ض"
-    show_symbols:
-        action:
-            set_view: "symbols"
-        outline: "change-view"
-        label: "*/="
-    space:
-        outline: "spaceline"
-        text: " "
-    Return:
-        outline: "altline"
-        icon: "key-enter"
-        keysym: "Return"
-    5:
-        outline: "fill"
-        text: "5"
-    "&":
-        outline: "fill"
-        text: "&"
-    ":":
-        outline: "fill"
-        text: ":"
-    √:
-        outline: "fill"
-        text: "√"
-    ¥:
-        outline: "fill"
-        text: "¥"
-    ">":
-        outline: "fill"
-        text: ">"
--- a/data/keyboards/be.yaml
+++ b/data/keyboards/be.yaml
@ -1,88 +0,0 @@
-# Language: Belgian
---
-outlines:
-    default:       { width: 35.33,  height: 52 }
-    altline:       { width: 53,     height: 52 }
-    wide:          { width: 59,     height: 52 }
-    change-view:   { width: 53,     height: 52 }
-    change-view-2: { width: 59,     height: 52 }
-    spaceline:     { width: 139.75,  height: 52 }
-    special:       { width: 44,     height: 52 }
-
-views:
-    base:
-        - "a z e r t y u i o p"
-        - "q s d f g h j k l m"
-        - "Shift_L   w x c v b n .   BackSpace"
-        - "show_numbers preferences         space        show_eschars Return"
-    upper:
-        - "A Z E R T Y U I O P"
-        - "Q S D F G H J K L M"
-        - "Shift_L   W X C V B N ,  BackSpace"
-        - "show_numbers preferences         space        show_eschars Return"
-    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: "change-view"
-        icon: "key-shift"
-    BackSpace:
-        outline: "altline"
-        icon: "edit-clear-symbolic"
-        action: "erase"
-    preferences:
-        action: "show_prefs"
-        outline: "special"
-        icon: "keyboard-mode-symbolic"
-    show_numbers:
-        action:
-            set_view: "numbers"
-        outline: "change-view-2"
-        label: "123"
-    show_numbers_from_symbols:
-        action:
-            set_view: "numbers"
-        outline: "change-view"
-        label: "123"
-    show_letters:
-        action:
-            set_view: "base"
-        outline: "change-view-2"
-        label: "ABC"
-    show_symbols:
-        action:
-            set_view: "symbols"
-        outline: "change-view"
-        label: "*/="
-    show_eschars:
-        action:
-            locking:
-                lock_view: "eschars"
-                unlock_view: "base"
-        outline: "change-view"
-        label: "âÂ"
-    space:
-        outline: "spaceline"
-        text: " "
-    Return:
-        outline: "wide"
-        icon: "key-enter"
-        keysym: "Return"
--- a/data/keyboards/be_wide.yaml
+++ b/data/keyboards/be_wide.yaml
@ -1,88 +0,0 @@
-# Language: Belgian
---
-outlines:
-    default:       { width: 54,  height: 42 }
-    altline:       { width: 81,  height: 42 }
-    wide:          { width: 100, height: 42 }
-    change-view:   { width: 81,  height: 42 }
-    change-view-2: { width: 100, height: 42 }
-    spaceline:     { width: 205, height: 42 }
-    special:       { width: 54,  height: 42 }
-
-views:
-    base:
-        - "a z e r t y u i o p"
-        - "q s d f g h j k l m"
-        - "Shift_L   w x c v b n .   BackSpace"
-        - "show_numbers preferences         space        show_eschars Return"
-    upper:
-        - "A Z E R T Y U I O P"
-        - "Q S D F G H J K L M"
-        - "Shift_L   W X C V B N ,  BackSpace"
-        - "show_numbers preferences         space        show_eschars Return"
-    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: "change-view"
-        icon: "key-shift"
-    BackSpace:
-        outline: "altline"
-        icon: "edit-clear-symbolic"
-        action: "erase"
-    preferences:
-        action: "show_prefs"
-        outline: "special"
-        icon: "keyboard-mode-symbolic"
-    show_numbers:
-        action:
-            set_view: "numbers"
-        outline: "change-view-2"
-        label: "123"
-    show_numbers_from_symbols:
-        action:
-            set_view: "numbers"
-        outline: "change-view"
-        label: "123"
-    show_letters:
-        action:
-            set_view: "base"
-        outline: "change-view-2"
-        label: "ABC"
-    show_symbols:
-        action:
-            set_view: "symbols"
-        outline: "change-view"
-        label: "*/="
-    show_eschars:
-        action:
-            locking:
-                lock_view: "eschars"
-                unlock_view: "base"
-        outline: "change-view"
-        label: "âÂ"
-    space:
-        outline: "spaceline"
-        text: " "
-    Return:
-        outline: "wide"
-        icon: "key-enter"
-        keysym: "Return"
--- a/data/keyboards/bg+phonetic.yaml
+++ b/data/keyboards/bg+phonetic.yaml
@ -1,90 +0,0 @@
-# Language: Bulgarian (phonetic)
---
-outlines:
-    default:       { width: 32.72,  height: 52 }
-    altline:       { width: 50.12,  height: 52 }
-    wide:          { width: 58.99,  height: 52 }
-    change-view:   { width: 50.12,  height: 52 }
-    change-view-2: { width: 58.99,  height: 52 }
-    spaceline:     { width: 167.26, height: 52 }
-    special:       { width: 44,     height: 52 }
-    placeholder:   { width: 32.72,  height: 52 }
-    fill:          { width: 65.44,  height: 52 }
-
-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: "change-view"
-        icon: "key-shift"
-    BackSpace:
-        outline: "altline"
-        icon: "edit-clear-symbolic"
-        action: "erase"
-    preferences:
-        action: "show_prefs"
-        outline: "special"
-        icon: "keyboard-mode-symbolic"
-    show_numbers:
-        action:
-            set_view: "numbers"
-        outline: "change-view-2"
-        label: "123"
-    show_numbers_from_symbols:
-        action:
-            set_view: "numbers"
-        outline: "change-view"
-        label: "123"
-    show_letters:
-        action:
-            set_view: "base"
-        outline: "change-view-2"
-        label: "ABC"
-    show_symbols:
-        action:
-            set_view: "symbols"
-        outline: "change-view"
-        label: "*/="
-    space:
-        outline: "spaceline"
-        text: " "
-    Return:
-        outline: "wide"
-        icon: "key-enter"
-        keysym: "Return"
-    --:
-        outline: "placeholder"
-        text: ""
-    5:
-        outline: "fill"
-    "&":
-        outline: "fill"
-    √:
-        outline: "fill"
-    ¥:
-        outline: "fill"
--- a/data/keyboards/bg+phonetic_wide.yaml
+++ b/data/keyboards/bg+phonetic_wide.yaml
@ -1,84 +0,0 @@
-# Language: Bulgarian (phonetic)
---
-outlines:
-    default:       { width: 48.75, height: 42 }
-    altline:       { width: 73.5,  height: 42 }
-    wide:          { width: 73.5,  height: 42 }
-    change-view:   { width: 73.5,  height: 42 }
-    spaceline:     { width: 292.5, height: 42 }
-    special:       { width: 48.75, height: 42 }
-    placeholder:   { width: 48.75, height: 42 }
-    fill:          { width: 97.5,  height: 42 }
-
-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   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        Return"
-
-
-buttons:
-    Shift_L:
-        action:
-            locking:
-                lock_view: "upper"
-                unlock_view: "base"
-        outline: "change-view"
-        icon: "key-shift"
-    BackSpace:
-        outline: "altline"
-        icon: "edit-clear-symbolic"
-        action: "erase"
-    preferences:
-        action: "show_prefs"
-        outline: "special"
-        icon: "keyboard-mode-symbolic"
-    show_numbers:
-        action:
-            set_view: "numbers"
-        outline: "change-view"
-        label: "123"
-    show_letters:
-        action:
-            set_view: "base"
-        outline: "change-view"
-        label: "ABC"
-    show_symbols:
-        action:
-            set_view: "symbols"
-        outline: "change-view"
-        label: "*/="
-    space:
-        outline: "spaceline"
-        text: " "
-    Return:
-        outline: "wide"
-        icon: "key-enter"
-        keysym: "Return"
-    --:
-        outline: "placeholder"
-        text: ""
-    5:
-        outline: "fill"
-    "&":
-        outline: "fill"
-    √:
-        outline: "fill"
-    ¥:
-        outline: "fill"
--- a/data/keyboards/bg.yaml
+++ b/data/keyboards/bg.yaml
@ -1,90 +0,0 @@
-# Language: Bulgarian
---
-outlines:
-    default:       { width: 32.72,  height: 52 }
-    altline:       { width: 50.12,  height: 52 }
-    wide:          { width: 58.99,  height: 52 }
-    change-view:   { width: 50.12,  height: 52 }
-    change-view-2: { width: 58.99,  height: 52 }
-    spaceline:     { width: 167.26, height: 52 }
-    special:       { width: 44,     height: 52 }
-    placeholder:   { width: 32.72,  height: 52 }
-    fill:          { width: 65.44,  height: 52 }
-
-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: "change-view"
-        icon: "key-shift"
-    BackSpace:
-        outline: "altline"
-        icon: "edit-clear-symbolic"
-        action: "erase"
-    preferences:
-        action: "show_prefs"
-        outline: "special"
-        icon: "keyboard-mode-symbolic"
-    show_numbers:
-        action:
-            set_view: "numbers"
-        outline: "change-view-2"
-        label: "123"
-    show_numbers_from_symbols:
-        action:
-            set_view: "numbers"
-        outline: "change-view"
-        label: "123"
-    show_letters:
-        action:
-            set_view: "base"
-        outline: "change-view-2"
-        label: "ABC"
-    show_symbols:
-        action:
-            set_view: "symbols"
-        outline: "change-view"
-        label: "*/="
-    space:
-        outline: "spaceline"
-        text: " "
-    Return:
-        outline: "wide"
-        icon: "key-enter"
-        keysym: "Return"
-    --:
-        outline: "placeholder"
-        text: ""
-    5:
-        outline: "fill"
-    "&":
-        outline: "fill"
-    √:
-        outline: "fill"
-    ¥:
-        outline: "fill"
--- a/data/keyboards/bg_wide.yaml
+++ b/data/keyboards/bg_wide.yaml
@ -1,84 +0,0 @@
-# Language: Bulgarian
---
-outlines:
-    default:       { width: 48.75, height: 42 }
-    altline:       { width: 73.5,  height: 42 }
-    wide:          { width: 73.5,  height: 42 }
-    change-view:   { width: 73.5,  height: 42 }
-    spaceline:     { width: 292.5, height: 42 }
-    special:       { width: 48.75, height: 42 }
-    placeholder:   { width: 48.75, height: 42 }
-    fill:          { width: 97.5,  height: 42 }
-
-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 -- \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space    ,    Return"
-
-
-buttons:
-    Shift_L:
-        action:
-            locking:
-                lock_view: "upper"
-                unlock_view: "base"
-        outline: "change-view"
-        icon: "key-shift"
-    BackSpace:
-        outline: "altline"
-        icon: "edit-clear-symbolic"
-        action: "erase"
-    preferences:
-        action: "show_prefs"
-        outline: "special"
-        icon: "keyboard-mode-symbolic"
-    show_numbers:
-        action:
-            set_view: "numbers"
-        outline: "change-view"
-        label: "123"
-    show_letters:
-        action:
-            set_view: "base"
-        outline: "change-view"
-        label: "ABC"
-    show_symbols:
-        action:
-            set_view: "symbols"
-        outline: "change-view"
-        label: "*/="
-    space:
-        outline: "spaceline"
-        text: " "
-    Return:
-        outline: "wide"
-        icon: "key-enter"
-        keysym: "Return"
-    --:
-        outline: "placeholder"
-        text: ""
-    5:
-        outline: "fill"
-    "&":
-        outline: "fill"
-    √:
-        outline: "fill"
-    ¥:
-        outline: "fill"
--- a/data/keyboards/br.yaml
+++ b/data/keyboards/br.yaml
@ -1,89 +0,0 @@
-# Language: Portuguese (Brazil)
---
-outlines:
-    default:       { width: 35.67, height: 52 }
-    altline:       { width: 53,    height: 52 }
-    wide:          { width: 53,    height: 52 }
-    change-view:   { width: 53,    height: 52 }
-    spaceline:     { width: 90,    height: 52 }
-    special:       { width: 35.67, height: 52 }
-    large:         { width: 71.34, height: 52 }
-
-views:
-    base:
-        - "q w e r t y u i o p"
-        - "a s d f g h j k l ç"
-        - "Shift_L   z x c v b n m  BackSpace"
-        - "show_numbers show_eschars preferences         space     .-large Return"
-    upper:
-        - "Q W E R T Y U I O P"
-        - "A S D F G H J K L Ç"
-        - "Shift_L   Z X C V B N M  BackSpace"
-        - "show_numbers show_eschars preferences         space     ,-large Return"
-    numbers:
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "@ # $ % & - _ + ( )"
-        - "show_symbols   , \" ' : ; ! ?  BackSpace"
-        - "show_letters show_eschars preferences space º . Return"
-    symbols:
-        - "~ ` | · √ π τ ÷ × ¶"
-        - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers   \\ / < > = [ ]  BackSpace"
-        - "show_letters show_eschars preferences         space       ≠ § Return"
-    eschars:
-        - "À Á Ã Â É Ê Í Ó Ô Õ"
-        - "à á ã â é ê í ó ô õ "
-        - "show_numbers Ú Ü ú ü ! ? . BackSpace"
-        - "show_letters show_eschars preferences         space    « »    Return"
-
-buttons:
-    Shift_L:
-        action:
-            locking:
-                lock_view: "upper"
-                unlock_view: "base"
-        outline: "change-view"
-        icon: "key-shift"
-    BackSpace:
-        outline: "altline"
-        icon: "edit-clear-symbolic"
-        action: "erase"
-    preferences:
-        action: "show_prefs"
-        outline: "special"
-        icon: "keyboard-mode-symbolic"
-    show_numbers:
-        action:
-            set_view: "numbers"
-        outline: "change-view"
-        label: "123"
-    show_letters:
-        action:
-            set_view: "base"
-        outline: "change-view"
-        label: "ABC"
-    show_symbols:
-        action:
-            set_view: "symbols"
-        outline: "change-view"
-        label: "*/="
-    show_eschars:
-        action:
-            locking:
-                lock_view: "eschars"
-                unlock_view: "base"
-        outline: "change-view"
-        label: "Ãã"
-    .-large:
-        outline: "large"
-        text: "."
-    ",-large":
-        outline: "large"
-        text: ","
-    space:
-        outline: "spaceline"
-        text: " "
-    Return:
-        outline: "wide"
-        icon: "key-enter"
-        keysym: "Return"
--- a/data/keyboards/br_wide.yaml
+++ b/data/keyboards/br_wide.yaml
@ -1,103 +0,0 @@
-# Language: Portuguese (Brazil)
---
-outlines:
-    default:     { width: 53.75, height: 42 }
-    thin:        { width: 40.5,  height: 42 }
-    altline:     { width: 81,    height: 42 }
-    wide:        { width: 92,    height: 42 }
-    change-view: { width: 81,    height: 42 }
-    spaceline:   { width: 149.5, height: 42 }
-    special:     { width: 53.75, height: 42 }
-    large:       { width: 81,    height: 42 }
-
-views:
-    base:
-        - "q w e r t y u i o p"
-        - "a s d f g h j k l ç"
-        - "Shift_L   z x c v b n m  BackSpace"
-        - "show_numbers show_eschars preferences         space     .-large Return"
-    upper:
-        - "Q W E R T Y U I O P"
-        - "A S D F G H J K L Ç"
-        - "Shift_L   Z X C V B N M  BackSpace"
-        - "show_numbers show_eschars preferences         space     ,-large Return"
-    numbers:
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "@ # $ % & - _ + ( )"
-        - "show_symbols   , \" ' : ; ! ?  BackSpace"
-        - "show_letters show_eschars preferences space º .-thin Return"
-    symbols:
-        - "~ ` | · √ π τ ÷ × ¶"
-        - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers   \\ / < > = [ ]  BackSpace"
-        - "show_letters show_eschars preferences         space       ≠ § Return"
-    eschars:
-        - "À Á Ã Â É Ê Í Ó Ô Õ"
-        - "à á ã â é ê í ó ô õ "
-        - "show_numbers Ú Ü ú ü ! ? . BackSpace"
-        - "show_letters show_eschars preferences         space    « »    Return"
-
-buttons:
-    Shift_L:
-        action:
-            locking:
-                lock_view: "upper"
-                unlock_view: "base"
-        outline: "change-view"
-        icon: "key-shift"
-    BackSpace:
-        outline: "altline"
-        icon: "edit-clear-symbolic"
-        action: "erase"
-    preferences:
-        action: "show_prefs"
-        outline: "special"
-        icon: "keyboard-mode-symbolic"
-    show_numbers:
-        action:
-            set_view: "numbers"
-        outline: "change-view"
-        label: "123"
-    show_letters:
-        action:
-            set_view: "base"
-        outline: "change-view"
-        label: "ABC"
-    show_symbols:
-        action:
-            set_view: "symbols"
-        outline: "change-view"
-        label: "*/="
-    show_eschars:
-        action:
-            locking:
-                lock_view: "eschars"
-                unlock_view: "base"
-        outline: "change-view"
-        label: "Ãã"
-    .-large:
-        outline: "large"
-        text: "."
-    ",-large":
-        outline: "large"
-        text: ","
-    space:
-        outline: "spaceline"
-        text: " "
-    Return:
-        outline: "wide"
-        icon: "key-enter"
-        keysym: "Return"
-    «:
-        outline: "thin"
-    »:
-        outline: "thin"
-    º:
-        outline: "thin"
-    .-thin:
-        outline: "thin"
-        text: "."
-    ≠:
-        outline: "thin"
-    §:
-        outline: "thin"
--- a/data/keyboards/by.yaml
+++ b/data/keyboards/by.yaml
@ -1,91 +0,0 @@
-# Language: Belarusian
---
-outlines:
-    default:       { width: 32.45,  height: 52 }
-    altline:       { width: 32,     height: 52 }
-    wide:          { width: 64.55,  height: 52 }
-    change-view:   { width: 32,     height: 52 }
-    change-view-2: { width: 64.55,  height: 52 }
-    spaceline:     { width: 91.96,  height: 52 }
-    fill:          { width: 156.86, height: 52 }
-    fill-2:        { width: 64.9,   height: 52 }
-    special:       { width: 35.67,  height: 52 }
-    large:         { width: 35.67,  height: 52 }
-
-views:
-    base:
-        - "й ц у к е н г ш ў з х"
-        - "ф ы в а п р о л д ж э"
-        - "Shift_L  я ч с м і т ь б ю  BackSpace"
-        - "show_numbers preferences    ё  space  ,  . Return"
-    upper:
-        - "Й Ц У К Е Н Г Ш Ў З Х"
-        - "Ф Ы В А П Р О Л Д Ж Э"
-        - "Shift_L   Я Ч С М І Т Ь Б Ю  BackSpace"
-        - "show_numbers preferences    Ё  space   , . Return"
-    numbers:
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "@ # $ % & - _ + ( )"
-        - "show_symbols , \" ' : ; ! ? BackSpace-wide"
-        - "show_letters preferences         space-fill   . Return"
-    symbols:
-        - "~ ` | · √ π τ ÷ × ¶"
-        - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers \\ / < > = [ ] BackSpace-wide"
-        - "show_letters preferences         space-fill   . Return"
-
-buttons:
-    Shift_L:
-        action:
-            locking:
-                lock_view: "upper"
-                unlock_view: "base"
-        outline: "change-view"
-        icon: "key-shift"
-    BackSpace:
-        outline: "altline"
-        icon: "edit-clear-symbolic"
-        action: "erase"
-    BackSpace-wide:
-        outline: "wide"
-        icon: "edit-clear-symbolic"
-        action: "erase"
-    preferences:
-        action: "show_prefs"
-        outline: "special"
-        icon: "keyboard-mode-symbolic"
-    show_numbers:
-        action:
-            set_view: "numbers"
-        outline: "change-view-2"
-        label: "123"
-    show_letters:
-        action:
-            set_view: "base"
-        outline: "change-view-2"
-        label: "АБВ"
-    show_symbols:
-        action:
-            set_view: "symbols"
-        outline: "change-view-2"
-        label: "*/="
-    .:
-        outline: "large"
-    space:
-        outline: "spaceline"
-        text: " "
-    space-fill:
-        outline: "fill"
-        text: " "
-    Return:
-        outline: "wide"
-        icon: "key-enter"
-        keysym: "Return"
-    5:
-        outline: "fill-2"
-    "&":
-        outline: "fill-2"
-    √:
-        outline: "fill-2"
-    ¥:
-        outline: "fill-2"
--- a/data/keyboards/by_wide.yaml
+++ b/data/keyboards/by_wide.yaml
@ -1,88 +0,0 @@
-# Language: Belarusian
---
-outlines:
-    default:       { width: 48.75, height: 42 }
-    altline:       { width: 48.75, height: 42 }
-    wide:          { width: 97.5,  height: 42 }
-    change-view:   { width: 48.75, height: 42 }
-    change-view-2: { width: 97.5,  height: 42 }
-    spaceline:     { width: 146.5, height: 42 }
-    fill:          { width: 244,   height: 42 }
-    fill-2:        { width: 97.5,  height: 42 }
-    special:       { width: 48.75, height: 42 }
-
-views:
-    base:
-        - "й ц у к е н г ш ў з х"
-        - "ф ы в а п р о л д ж э"
-        - "Shift_L  я ч с м і т ь б ю  BackSpace"
-        - "show_numbers preferences    ё  space  ,  . Return"
-    upper:
-        - "Й Ц У К Е Н Г Ш Ў З Х"
-        - "Ф Ы В А П Р О Л Д Ж Э"
-        - "Shift_L   Я Ч С М І Т Ь Б Ю  BackSpace"
-        - "show_numbers preferences    Ё  space  ,  . Return"
-    numbers:
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "@ # $ % & - _ + ( )"
-        - "show_symbols , \" ' : ; ! ? BackSpace-wide"
-        - "show_letters preferences         space-fill   . Return"
-    symbols:
-        - "~ ` | · √ π τ ÷ × ¶"
-        - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers \\ / < > = [ ] BackSpace-wide"
-        - "show_letters preferences         space-fill   . Return"
-
-buttons:
-    Shift_L:
-        action:
-            locking:
-                lock_view: "upper"
-                unlock_view: "base"
-        outline: "change-view"
-        icon: "key-shift"
-    BackSpace:
-        outline: "altline"
-        icon: "edit-clear-symbolic"
-        action: "erase"
-    BackSpace-wide:
-        outline: "wide"
-        icon: "edit-clear-symbolic"
-        action: "erase"
-    preferences:
-        action: "show_prefs"
-        outline: "special"
-        icon: "keyboard-mode-symbolic"
-    show_numbers:
-        action:
-            set_view: "numbers"
-        outline: "change-view-2"
-        label: "123"
-    show_letters:
-        action:
-            set_view: "base"
-        outline: "change-view-2"
-        label: "АБВ"
-    show_symbols:
-        action:
-            set_view: "symbols"
-        outline: "change-view-2"
-        label: "*/="
-    space:
-        outline: "spaceline"
-        text: " "
-    space-fill:
-        outline: "fill"
-        text: " "
-    Return:
-        outline: "wide"
-        icon: "key-enter"
-        keysym: "Return"
-    5:
-        outline: "fill-2"
-    "&":
-        outline: "fill-2"
-    √:
-        outline: "fill-2"
-    ¥:
-        outline: "fill-2"
--- a/data/keyboards/ca.yaml
+++ b/data/keyboards/ca.yaml
@ -1,92 +0,0 @@
-# Language: French (Canada)
---
-outlines:
-    default:       { width: 35.5,  height: 52 }
-    altline:       { width: 53.5,  height: 52 }
-    wide:          { width: 62,    height: 52 }
-    change-view:   { width: 53.5,  height: 52 }
-    change-view-2: { width: 62,    height: 52 }
-    spaceline:     { width: 135,   height: 52 }
-    special:       { width: 44,    height: 52 }
-    placeholder:   { width: 36,    height: 52 }
-
-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: "change-view"
-        icon: "key-shift"
-    BackSpace:
-        outline: "altline"
-        icon: "edit-clear-symbolic"
-        action: "erase"
-    preferences:
-        action: "show_prefs"
-        outline: "special"
-        icon: "keyboard-mode-symbolic"
-    show_numbers:
-        action:
-            set_view: "numbers"
-        outline: "change-view-2"
-        label: "123"
-    show_numbers_from_symbols:
-        action:
-            set_view: "numbers"
-        outline: "change-view"
-        label: "123"
-    show_letters:
-        action:
-            set_view: "base"
-        outline: "change-view-2"
-        label: "ABC"
-    show_symbols:
-        action:
-            set_view: "symbols"
-        outline: "change-view"
-        label: "*/="
-    show_eschars:
-        action:
-            locking:
-                lock_view: "eschars"
-                unlock_view: "base"
-        outline: "change-view"
-        label: "âÂ"
-    space:
-        outline: "spaceline"
-        text: " "
-    Return:
-        outline: "wide"
-        icon: "key-enter"
-        keysym: "Return"
-    --:
-        outline: "placeholder"
-        text: ""
--- a/data/keyboards/ca_wide.yaml
+++ b/data/keyboards/ca_wide.yaml
@ -1,92 +0,0 @@
-# Language: French (Canada)
---
-outlines:
-    default:       { width: 53.7,  height: 42 }
-    altline:       { width: 80.5,  height: 42 }
-    wide:          { width: 92,    height: 42 }
-    change-view:   { width: 80.5,  height: 42 }
-    change-view-2: { width: 92,    height: 42 }
-    spaceline:     { width: 219.5,   height: 42 }
-    special:       { width: 53.7, height: 42 }
-    placeholder:   { width: 53.7,  height: 42 }
-
-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: "change-view"
-        icon: "key-shift"
-    BackSpace:
-        outline: "altline"
-        icon: "edit-clear-symbolic"
-        action: "erase"
-    preferences:
-        action: "show_prefs"
-        outline: "special"
-        icon: "keyboard-mode-symbolic"
-    show_numbers:
-        action:
-            set_view: "numbers"
-        outline: "change-view-2"
-        label: "123"
-    show_numbers_from_symbols:
-        action:
-            set_view: "numbers"
-        outline: "change-view"
-        label: "123"
-    show_letters:
-        action:
-            set_view: "base"
-        outline: "change-view-2"
-        label: "ABC"
-    show_symbols:
-        action:
-            set_view: "symbols"
-        outline: "change-view"
-        label: "*/="
-    show_eschars:
-        action:
-            locking:
-                lock_view: "eschars"
-                unlock_view: "base"
-        outline: "change-view"
-        label: "âÂ"
-    space:
-        outline: "spaceline"
-        text: " "
-    Return:
-        outline: "wide"
-        icon: "key-enter"
-        keysym: "Return"
-    --:
-        outline: "placeholder"
-        text: ""
--- a/data/keyboards/ch+de.yaml
+++ b/data/keyboards/ch+de.yaml
@ -1,73 +0,0 @@
-# Language: German (Switzerland) (ch+de)
-# Maintained by Patrick Jörg <patrickjoerg@gmx.ch>. No Copyright, enjoy!
-
---
-outlines:
-    default:       { width: 35.33, height: 52 }
-    altline:       { width: 48,    height: 52 }
-    wide:          { width: 59,    height: 52 }
-    change-view:   { width: 48,    height: 52 }
-    change-view-2: { width: 59,    height: 52 }
-    spaceline:     { width: 70,    height: 52 }
-    special:       { width: 28,    height: 52 }
-
-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: "change-view"
-        icon: "key-shift"
-    BackSpace:
-        outline: "altline"
-        icon: "edit-clear-symbolic"
-        action: "erase"
-    preferences:
-        action: "show_prefs"
-        outline: "special"
-        icon: "keyboard-mode-symbolic"
-    show_numbers:
-        action:
-            set_view: "numbers"
-        outline: "change-view"
-        label: "123"
-    show_letters:
-        action:
-            set_view: "base"
-        outline: "change-view"
-        label: "ABC"
-    show_symbols:
-        action:
-            set_view: "symbols"
-        outline: "change-view"
-        label: "*/="
-    space:
-        outline: "spaceline"
-        text: " "
-    Return:
-        outline: "wide"
-        icon: "key-enter"
-        keysym: "Return"
--- a/data/keyboards/ch+de_wide.yaml
+++ b/data/keyboards/ch+de_wide.yaml
@ -1,73 +0,0 @@
-# Language: German (Switzerland) (ch+de)
-# 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 }
-    change-view:   { width: 70.65,  height: 42 }
-    change-view-2: { width: 86.84,  height: 42 }
-    spaceline:     { width: 103.03, height: 42 }
-    special:       { width: 41.21,  height: 42 }
-
-views:
-    base:
-        - "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: "change-view"
-        icon: "key-shift"
-    BackSpace:
-        outline: "altline"
-        icon: "edit-clear-symbolic"
-        action: "erase"
-    preferences:
-        action: "show_prefs"
-        outline: "special"
-        icon: "keyboard-mode-symbolic"
-    show_numbers:
-        action:
-            set_view: "numbers"
-        outline: "change-view"
-        label: "123"
-    show_letters:
-        action:
-            set_view: "base"
-        outline: "change-view"
-        label: "ABC"
-    show_symbols:
-        action:
-            set_view: "symbols"
-        outline: "change-view"
-        label: "*/="
-    space:
-        outline: "spaceline"
-        text: " "
-    Return:
-        outline: "wide"
-        icon: "key-enter"
-        keysym: "Return"
--- a/data/keyboards/ch+fr.yaml
+++ b/data/keyboards/ch+fr.yaml
@ -1,84 +0,0 @@
-# Language: French (Switzerland)
-# Maintained by: Jordi Bossy <jordi@bossy.space>. No Copyright, enjoy!
---
-outlines:
-    default:       { width: 35.67, height: 52 }
-    altline:       { width: 53.5,  height: 52 }
-    wide:          { width: 59,    height: 52 }
-    change-view:   { width: 53.5,  height: 52 }
-    change-view-2: { width: 59,    height: 52 }
-    spaceline:     { width: 57,    height: 52 }
-    special:       { width: 28,    height: 52 }
-
-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: "change-view"
-        icon: "key-shift"
-    BackSpace:
-        outline: "altline"
-        icon: "edit-clear-symbolic"
-        action: "erase"
-    preferences:
-        action: "show_prefs"
-        outline: "special"
-        icon: "keyboard-mode-symbolic"
-    show_numbers:
-        action:
-            set_view: "numbers"
-        outline: "change-view"
-        label: "123"
-    show_letters:
-        action:
-            set_view: "base"
-        outline: "change-view"
-        label: "ABC"
-    show_symbols:
-        action:
-            set_view: "symbols"
-        outline: "change-view"
-        label: "*/="
-    show_eschars:
-        action:
-            locking:
-                lock_view: "eschars"
-                unlock_view: "base"
-        outline: "change-view"
-        label: "Ââ"
-    space:
-        outline: "spaceline"
-        text: " "
-    Return:
-        outline: "wide"
-        icon: "key-enter"
-        keysym: "Return"
--- a/data/keyboards/ch+fr_wide.yaml
+++ b/data/keyboards/ch+fr_wide.yaml
@ -1,102 +0,0 @@
-# Language: French (Switzerland)
-# Maintained by: Jordi Bossy <jordi@bossy.space>. No Copyright, enjoy!
---
-outlines:
-    default:       { width: 53.5,  height: 42 }
-    thin:          { width: 40,    height: 42 }
-    altline:       { width: 80,    height: 42 }
-    wide:          { width: 86.84, height: 42 }
-    change-view:   { width: 80,    height: 42 }
-    change-view-2: { width: 86.84, height: 42 }
-    spaceline:     { width: 126,   height: 42 }
-    special:       { width: 41.21, height: 42 }
-
-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    --thin   space        , . Return"
-    eschars:
-        - "à â ç é è ê î ô ù û"
-        - "À Â Ç É È Ê Î Ô Ù Û"
-        - "show_numbers  æ œ ä ë ï ö ü  BackSpace"
-        - "show_letters show_eschars preferences ' space        ° ß Return"
-
-buttons:
-    Shift_L:
-        action:
-            locking:
-                lock_view: "upper"
-                unlock_view: "base"
-        outline: "change-view"
-        icon: "key-shift"
-    BackSpace:
-        outline: "altline"
-        icon: "edit-clear-symbolic"
-        action: "erase"
-    preferences:
-        action: "show_prefs"
-        outline: "special"
-        icon: "keyboard-mode-symbolic"
-    show_numbers:
-        action:
-            set_view: "numbers"
-        outline: "change-view"
-        label: "123"
-    show_letters:
-        action:
-            set_view: "base"
-        outline: "change-view"
-        label: "ABC"
-    show_symbols:
-        action:
-            set_view: "symbols"
-        outline: "change-view"
-        label: "*/="
-    show_eschars:
-        action:
-            locking:
-                lock_view: "eschars"
-                unlock_view: "base"
-        outline: "change-view"
-        label: "Ââ"
-    space:
-        outline: "spaceline"
-        text: " "
-    Return:
-        outline: "wide"
-        icon: "key-enter"
-        keysym: "Return"
-    "'":
-        outline: "thin"
-    "\"":
-        outline: "thin"
-    _:
-        outline: "thin"
-    --thin:
-        outline: "thin"
-        text: "-"
-    .:
-        outline: "thin"
-    ",":
-        outline: "thin"
-    ß:
-        outline: "thin"
-    °:
-        outline: "thin"
--- a/data/keyboards/ch.yaml
+++ b/data/keyboards/ch.yaml
@ -1,95 +0,0 @@
-# Language: German (Switzerland)
-# Maintained by: Jordy Bossy <jordi@bossy.space>
-# and Patrick Jörg <patrickjoerg@gmx.ch>. No Copyright, enjoy!
-
---
-outlines:
-    default:       { width: 35.33,  height: 58 }
-    doublewidth:   { width: 70.66,  height: 58 }
-    altline:       { width: 52.8,   height: 58 }
-    wide:          { width: 64.9,   height: 58 }
-    change-view:   { width: 52.8,   height: 58 }
-    change-view-2: { width: 64.9,   height: 58 }
-    spaceline:     { width: 111.75, height: 58 }
-    special:       { width: 35.33,  height: 58 }
-
-views:
-    base:
-        - "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: "change-view"
-        icon: "key-shift"
-    BackSpace:
-        outline: "altline"
-        icon: "edit-clear-symbolic"
-        action: "erase"
-    preferences:
-        action: "show_prefs"
-        outline: "special"
-        icon: "keyboard-mode-symbolic"
-    show_numbers:
-        action:
-            set_view: "numbers"
-        outline: "change-view"
-        label: "123"
-    show_letters:
-        action:
-            set_view: "base"
-        outline: "change-view"
-        label: "ABC"
-    show_symbols:
-        action:
-            set_view: "symbols"
-        outline: "change-view"
-        label: "*/="
-    show_eschars:
-        action:
-            locking:
-                lock_view: "eschars"
-                unlock_view: "base"
-        outline: "change-view"
-        label: "Ââ"
-    Space:
-        outline: "spaceline"
-        text: " "
-    Return:
-        outline: "wide"
-        icon: "key-enter"
-        keysym: "Return"
-    °:
-        outline: "doublewidth"
-    "|":
-        outline: "doublewidth"
-    "}":
-        outline: "doublewidth"
-    ×:
-        outline: "doublewidth"
--- a/data/keyboards/ch_wide.yaml
+++ b/data/keyboards/ch_wide.yaml
@ -1,101 +0,0 @@
-# Language: German (Switzerland)
-# Maintained by: Jordy Bossy <jordy@bossy.space>
-# and Patrick Jörg <patrickjoerg@gmx.ch>. No Copyright, enjoy!
-
---
-outlines:
-    default:       { width: 48,  height: 42 }
-    doublewidth:   { width: 96,  height: 42 }
-    narrow:        { width: 33,  height: 42 }
-    large:         { width: 66,  height: 42 }
-    altline:       { width: 72,  height: 42 }
-    wide:          { width: 108, height: 42 }
-    change-view:   { width: 72,  height: 42 }
-    change-view-2: { width: 108, height: 42 }
-    spaceline:     { width: 162, height: 42 }
-    special:       { width: 48,  height: 42 }
-
-views:
-    base:
-        - "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: "change-view"
-        icon: "key-shift"
-    BackSpace:
-        outline: "altline"
-        icon: "edit-clear-symbolic"
-        action: "erase"
-    preferences:
-        action: "show_prefs"
-        outline: "special"
-        icon: "keyboard-mode-symbolic"
-    show_numbers:
-        action:
-            set_view: "numbers"
-        outline: "change-view"
-        label: "123"
-    show_letters:
-        action:
-            set_view: "base"
-        outline: "change-view"
-        label: "ABC"
-    show_symbols:
-        action:
-            set_view: "symbols"
-        outline: "change-view"
-        label: "*/="
-    show_eschars:
-        action:
-            locking:
-                lock_view: "eschars"
-                unlock_view: "base"
-        outline: "change-view"
-        label: "Ââ"
-    Space:
-        outline: "spaceline"
-        text: " "
-    Return:
-        outline: "wide"
-        icon: "key-enter"
-        keysym: "Return"
-    °:
-        outline: "large"
-    .:
-        outline: "narrow"
-    ",":
-        outline: "narrow"
-    "|":
-        outline: "doublewidth"
-    "}":
-        outline: "doublewidth"
-    ×:
-        outline: "doublewidth"
--- a/data/keyboards/cz+qwerty.yaml
+++ b/data/keyboards/cz+qwerty.yaml
@ -1,102 +0,0 @@
-# Language: Czech (QWERTY)
---
-outlines:
-    default:       { width: 35.33, height: 52 }
-    altline:       { width: 52.67, height: 52 }
-    wide:          { width: 52.67, height: 52 }
-    change-view:   { width: 52.67, height: 52 }
-    spaceline:     { width: 106,   height: 52 }
-    special:       { width: 35.33, height: 52 }
-    change-view-2: { width: 35.33, height: 52 }
-
-views:
-    base:
-        - "q w e r t y u i o p"
-        - "a s d f g h j k l"
-        - "Shift_L    z x c v b n m    BackSpace"
-        - "show_numbers show_accents preferences     space    , . Return"
-    upper:
-        - "Q W E R T Y U I O P"
-        - "A S D F G H J K L"
-        - "Shift_L    Z X C V B N M    BackSpace"
-        - "show_numbers show_upper_accents preferences     space    ! ? Return"
-    numbers:
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "@ # $ % & - _ + ( )"
-        - "show_symbols    , \" ' : ; ! ?    BackSpace"
-        - "show_letters show_accents preferences     space    , . Return"
-    symbols:
-        - "~ ` | · √ π τ ÷ × ¶"
-        - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers    \\ / < > = [ ]    BackSpace"
-        - "show_letters show_accents preferences     space    , . Return"
-    accents:
-        - "ä ě é ř ť ý ů í ó ö"
-        - "á š ď ë ŕ ú ü ô ľ"
-        - "accents_Shift_L    ž ß č ç ñ ň ĺ    BackSpace"
-        - "show_letters show_accents preferences     space    , . Return"
-    upper_accents:
-        - "Ä Ě É Ř Ť Ý Ů Í Ó Ö"
-        - "Á Š Ď Ë Ŕ Ú Ü Ô Ľ"
-        - "accents_Shift_L    Ž ẞ Č Ç Ñ Ň Ĺ    BackSpace"
-        - "show_letters show_upper_accents preferences     space    , . Return"
-
-buttons:
-    Shift_L:
-        action:
-            locking:
-                lock_view: "upper"
-                unlock_view: "base"
-        outline: "change-view"
-        icon: "key-shift"
-    accents_Shift_L:
-        action:
-            locking:
-                lock_view: "upper_accents"
-                unlock_view: "base"
-        outline: "change-view"
-        icon: "key-shift"
-    BackSpace:
-        outline: "altline"
-        icon: "edit-clear-symbolic"
-        action: "erase"
-    preferences:
-        action: "show_prefs"
-        outline: "special"
-        icon: "keyboard-mode-symbolic"
-    show_numbers:
-        action:
-            set_view: "numbers"
-        outline: "change-view"
-        label: "123"
-    show_letters:
-        action:
-            set_view: "base"
-        outline: "change-view"
-        label: "ABC"
-    show_symbols:
-        action:
-            set_view: "symbols"
-        outline: "change-view"
-        label: "*/="
-    show_accents:
-        action:
-            locking:
-                lock_view: "accents"
-                unlock_view: "base"
-        outline: "change-view-2"
-        label: "á"
-    show_upper_accents:
-        action:
-            locking:
-                lock_view: "upper_accents"
-                unlock_view: "base"
-        outline: "change-view-2"
-        label: "Á"
-    space:
-        outline: "spaceline"
-        text: " "
-    Return:
-        outline: "wide"
-        icon: "key-enter"
-        keysym: "Return"
--- a/data/keyboards/cz+qwerty_wide.yaml
+++ b/data/keyboards/cz+qwerty_wide.yaml
@ -1,102 +0,0 @@
-# Language: Czech (QWERTY)
---
-outlines:
-    default:       { width: 54,  height: 42 }
-    altline:       { width: 81,  height: 42 }
-    wide:          { width: 81,  height: 42 }
-    change-view:   { width: 81,  height: 42 }
-    spaceline:     { width: 162, height: 42 }
-    special:       { width: 54,  height: 42 }
-    change-view-2: { width: 54,  height: 42 }
-
-views:
-    base:
-        - "q w e r t y u i o p"
-        - "a s d f g h j k l"
-        - "Shift_L    z x c v b n m    BackSpace"
-        - "show_numbers show_accents preferences     space    , . Return"
-    upper:
-        - "Q W E R T Y U I O P"
-        - "A S D F G H J K L"
-        - "Shift_L    Z X C V B N M    BackSpace"
-        - "show_numbers show_upper_accents preferences     space    ! ? Return"
-    numbers:
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "@ # $ % & - _ + ( )"
-        - "show_symbols    , \" ' : ; ! ?    BackSpace"
-        - "show_letters show_accents preferences     space    , . Return"
-    symbols:
-        - "~ ` | · √ π τ ÷ × ¶"
-        - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers    \\ / < > = [ ]    BackSpace"
-        - "show_letters show_accents preferences     space    , . Return"
-    accents:
-        - "ä ě é ř ť ý ů í ó ö"
-        - "á š ď ë ŕ ú ü ô ľ"
-        - "accents_Shift_L    ž ß č ç ñ ň ĺ    BackSpace"
-        - "show_letters show_accents preferences     space    , . Return"
-    upper_accents:
-        - "Ä Ě É Ř Ť Ý Ů Í Ó Ö"
-        - "Á Š Ď Ë Ŕ Ú Ü Ô Ľ"
-        - "accents_Shift_L    Ž ẞ Č Ç Ñ Ň Ĺ    BackSpace"
-        - "show_letters show_upper_accents preferences     space    , . Return"
-
-buttons:
-    Shift_L:
-        action:
-            locking:
-                lock_view: "upper"
-                unlock_view: "base"
-        outline: "change-view"
-        icon: "key-shift"
-    accents_Shift_L:
-        action:
-            locking:
-                lock_view: "upper_accents"
-                unlock_view: "base"
-        outline: "change-view"
-        icon: "key-shift"
-    BackSpace:
-        outline: "altline"
-        icon: "edit-clear-symbolic"
-        action: "erase"
-    preferences:
-        action: "show_prefs"
-        outline: "special"
-        icon: "keyboard-mode-symbolic"
-    show_numbers:
-        action:
-            set_view: "numbers"
-        outline: "change-view"
-        label: "123"
-    show_letters:
-        action:
-            set_view: "base"
-        outline: "change-view"
-        label: "ABC"
-    show_symbols:
-        action:
-            set_view: "symbols"
-        outline: "change-view"
-        label: "*/="
-    show_accents:
-        action:
-            locking:
-                lock_view: "accents"
-                unlock_view: "base"
-        outline: "change-view-2"
-        label: "á"
-    show_upper_accents:
-        action:
-            locking:
-                lock_view: "upper_accents"
-                unlock_view: "base"
-        outline: "change-view-2"
-        label: "Á"
-    space:
-        outline: "spaceline"
-        text: " "
-    Return:
-        outline: "wide"
-        icon: "key-enter"
-        keysym: "Return"
--- a/data/keyboards/cz.yaml
+++ b/data/keyboards/cz.yaml
@ -1,102 +0,0 @@
-# Language: Czech
---
-outlines:
-    default:       { width: 35.33, height: 52 }
-    altline:       { width: 52.67, height: 52 }
-    wide:          { width: 52.67, height: 52 }
-    change-view:   { width: 52.67, height: 52 }
-    spaceline:     { width: 106,   height: 52 }
-    special:       { width: 35.33, height: 52 }
-    change-view-2: { width: 35.33, height: 52 }
-
-views:
-    base:
-        - "q w e r t z u i o p"
-        - "a s d f g h j k l"
-        - "Shift_L    y x c v b n m    BackSpace"
-        - "show_numbers show_accents preferences     space    , . Return"
-    upper:
-        - "Q W E R T Z U I O P"
-        - "A S D F G H J K L"
-        - "Shift_L    Y X C V B N M    BackSpace"
-        - "show_numbers show_upper_accents preferences     space    ! ? Return"
-    numbers:
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "@ # $ % & - _ + ( )"
-        - "show_symbols    , \" ' : ; ! ?    BackSpace"
-        - "show_letters show_accents preferences     space    , . Return"
-    symbols:
-        - "~ ` | · √ π τ ÷ × ¶"
-        - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers    \\ / < > = [ ]    BackSpace"
-        - "show_letters show_accents preferences     space    , . Return"
-    accents:
-        - "ä ě é ř ť ž ů í ó ö"
-        - "á š ď ë ŕ ú ü ô ľ"
-        - "accents_Shift_L    ý ß č ç ñ ň ĺ    BackSpace"
-        - "show_letters show_accents preferences     space    , . Return"
-    upper_accents:
-        - "Ä Ě É Ř Ť Ž Ů Í Ó Ö"
-        - "Á Š Ď Ë Ŕ Ú Ü Ô Ľ"
-        - "accents_Shift_L    Ý ẞ Č Ç Ñ Ň Ĺ    BackSpace"
-        - "show_letters show_upper_accents preferences     space    , . Return"
-
-buttons:
-    Shift_L:
-        action:
-            locking:
-                lock_view: "upper"
-                unlock_view: "base"
-        outline: "change-view"
-        icon: "key-shift"
-    accents_Shift_L:
-        action:
-            locking:
-                lock_view: "upper_accents"
-                unlock_view: "base"
-        outline: "change-view"
-        icon: "key-shift"
-    BackSpace:
-        outline: "altline"
-        icon: "edit-clear-symbolic"
-        action: "erase"
-    preferences:
-        action: "show_prefs"
-        outline: "special"
-        icon: "keyboard-mode-symbolic"
-    show_numbers:
-        action:
-            set_view: "numbers"
-        outline: "change-view"
-        label: "123"
-    show_letters:
-        action:
-            set_view: "base"
-        outline: "change-view"
-        label: "ABC"
-    show_symbols:
-        action:
-            set_view: "symbols"
-        outline: "change-view"
-        label: "*/="
-    show_accents:
-        action:
-            locking:
-                lock_view: "accents"
-                unlock_view: "base"
-        outline: "change-view-2"
-        label: "á"
-    show_upper_accents:
-        action:
-            locking:
-                lock_view: "upper_accents"
-                unlock_view: "base"
-        outline: "change-view-2"
-        label: "Á"
-    space:
-        outline: "spaceline"
-        text: " "
-    Return:
-        outline: "wide"
-        icon: "key-enter"
-        keysym: "Return"
--- a/data/keyboards/cz_wide.yaml
+++ b/data/keyboards/cz_wide.yaml
@ -1,102 +0,0 @@
-# Language: Czech
---
-outlines:
-    default:       { width: 54,  height: 42 }
-    altline:       { width: 81,  height: 42 }
-    wide:          { width: 81,  height: 42 }
-    change-view:   { width: 81,  height: 42 }
-    spaceline:     { width: 162, height: 42 }
-    special:       { width: 54,  height: 42 }
-    change-view-2: { width: 54,  height: 42 }
-
-views:
-    base:
-        - "q w e r t z u i o p"
-        - "a s d f g h j k l"
-        - "Shift_L    y x c v b n m    BackSpace"
-        - "show_numbers show_accents preferences     space    , . Return"
-    upper:
-        - "Q W E R T Z U I O P"
-        - "A S D F G H J K L"
-        - "Shift_L    Y X C V B N M    BackSpace"
-        - "show_numbers show_upper_accents preferences     space    ! ? Return"
-    numbers:
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "@ # $ % & - _ + ( )"
-        - "show_symbols    , \" ' : ; ! ?    BackSpace"
-        - "show_letters show_accents preferences     space    , . Return"
-    symbols:
-        - "~ ` | · √ π τ ÷ × ¶"
-        - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers    \\ / < > = [ ]    BackSpace"
-        - "show_letters show_accents preferences     space    , . Return"
-    accents:
-        - "ä ě é ř ť ž ů í ó ö"
-        - "á š ď ë ŕ ú ü ô ľ"
-        - "accents_Shift_L    ý ß č ç ñ ň ĺ    BackSpace"
-        - "show_letters show_accents preferences     space    , . Return"
-    upper_accents:
-        - "Ä Ě É Ř Ť Ž Ů Í Ó Ö"
-        - "Á Š Ď Ë Ŕ Ú Ü Ô Ľ"
-        - "accents_Shift_L    Ý ẞ Č Ç Ñ Ň Ĺ    BackSpace"
-        - "show_letters show_upper_accents preferences     space    , . Return"
-
-buttons:
-    Shift_L:
-        action:
-            locking:
-                lock_view: "upper"
-                unlock_view: "base"
-        outline: "change-view"
-        icon: "key-shift"
-    accents_Shift_L:
-        action:
-            locking:
-                lock_view: "upper_accents"
-                unlock_view: "base"
-        outline: "change-view"
-        icon: "key-shift"
-    BackSpace:
-        outline: "altline"
-        icon: "edit-clear-symbolic"
-        action: "erase"
-    preferences:
-        action: "show_prefs"
-        outline: "special"
-        icon: "keyboard-mode-symbolic"
-    show_numbers:
-        action:
-            set_view: "numbers"
-        outline: "change-view"
-        label: "123"
-    show_letters:
-        action:
-            set_view: "base"
-        outline: "change-view"
-        label: "ABC"
-    show_symbols:
-        action:
-            set_view: "symbols"
-        outline: "change-view"
-        label: "*/="
-    show_accents:
-        action:
-            locking:
-                lock_view: "accents"
-                unlock_view: "base"
-        outline: "change-view-2"
-        label: "á"
-    show_upper_accents:
-        action:
-            locking:
-                lock_view: "upper_accents"
-                unlock_view: "base"
-        outline: "change-view-2"
-        label: "Á"
-    space:
-        outline: "spaceline"
-        text: " "
-    Return:
-        outline: "wide"
-        icon: "key-enter"
-        keysym: "Return"
--- a/data/keyboards/de+bone.yaml
+++ b/data/keyboards/de+bone.yaml
@ -1,122 +0,0 @@
-# Language: German (Bone)
---
-outlines:
-    default:            { width: 32.12,  height: 52 }
-    subtle-highlight:   { width: 32.12,  height: 52 }
-    special:            { width: 32.12,  height: 52 }
-    altline:            { width: 48.17,  height: 52 }
-    change-view:        { width: 48.17,  height: 52 }
-    fill:               { width: 64.24,  height: 52 }
-    subtle-highlight-2: { width: 64.24,  height: 52 }
-    spaceline:          { width: 112.45, height: 52 }
-
-
-views:
-    base:
-        - "j d u a x p h l m w ß"
-        - "c t i e o b n r s g q"
-        - "Shift_L   f v ü ä ö y z k BackSpace"
-        - "show_numbers show_eschars preferences         space        , . Return"
-    upper:
-        - "J D U A X P H L M W ẞ"
-        - "C T I E O B N R S G Q"
-        - "Shift_L   F V Ü Ä Ö Y Z K BackSpace"
-        - "show_numbers show_eschars preferences         space        ! ? Return"
-    numbers:
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "@ # € % & - _ + ( )"
-        - "show_symbols   ; \" ' : = < >  BackSpace"
-        - "show_letters show_eschars preferences         space        , . Return"
-    symbols:
-        - "~ ` ´ | · √ µ ÷ × ¶"
-        - "© ® £ $ ¥ ^ ° * { }"
-        - "show_numbers   \\ / § π τ [ ]  BackSpace"
-        - "show_letters show_eschars preferences         space        , . Return"
-    eschars:
-        - "ä-subtle-highlight è é ö-subtle-highlight ü-subtle-highlight-2 Ä-subtle-highlight È É Ö-subtle-highlight Ü-subtle-highlight"
-        - "à â ê î ô À Â Ê Î Ô"
-        - "show_numbers  « » ç Ç æ œ ß-subtle-highlight BackSpace"
-        - "show_letters show_eschars preferences         space        „ “ Return"
-
-buttons:
-    Shift_L:
-        action:
-            locking:
-                lock_view: "upper"
-                unlock_view: "base"
-        outline: "change-view"
-        icon: "key-shift"
-    BackSpace:
-        outline: "altline"
-        icon: "edit-clear-symbolic"
-        action: "erase"
-    preferences:
-        action: "show_prefs"
-        outline: "special"
-        icon: "keyboard-mode-symbolic"
-    show_numbers:
-        action:
-            set_view: "numbers"
-        outline: "change-view"
-        label: "123"
-    show_letters:
-        action:
-            set_view: "base"
-        outline: "change-view"
-        label: "ABC"
-    show_symbols:
-        action:
-            set_view: "symbols"
-        outline: "change-view"
-        label: "*/="
-    show_eschars:
-        action:
-            locking:
-                lock_view: "eschars"
-                unlock_view: "base"
-        outline: "change-view"
-        label: "Ää"
-    space:
-        outline: "spaceline"
-        text: " "
-    Return:
-        outline: "altline"
-        icon: "key-enter"
-        keysym: "Return"
-    ä-subtle-highlight:
-        outline: "subtle-highlight"
-        text: "ä"
-    ö-subtle-highlight:
-        outline: "subtle-highlight"
-        text: "ö"
-    ü-subtle-highlight-2:
-        outline: "subtle-highlight-2"
-        text: "ü"
-    Ä-subtle-highlight:
-        outline: "subtle-highlight"
-        text: "Ä"
-    Ö-subtle-highlight:
-        outline: "subtle-highlight"
-        text: "Ö"
-    Ü-subtle-highlight:
-        outline: "subtle-highlight"
-        text: "Ü"
-    ß-subtle-highlight:
-        outline: "subtle-highlight"
-        text: "ß"
-    5:
-        outline: "fill"
-    "&":
-        outline: "fill"
-    ·:
-        outline: "fill"
-    ¥:
-        outline: "fill"
-    ô:
-        outline: "fill"
-    Ç:
-        outline: "fill"
-    ":":
-        outline: "fill"
-    π:
-        outline: "fill"
--- a/data/keyboards/de+bone_wide.yaml
+++ b/data/keyboards/de+bone_wide.yaml
@ -1,122 +0,0 @@
-# Language: German (Bone)
---
-outlines:
-    default:            { width: 48.87,  height: 42 }
-    subtle-highlight:   { width: 48.87,  height: 42 }
-    special:            { width: 48.87,  height: 42 }
-    altline:            { width: 73.31,  height: 42 }
-    change-view:        { width: 73.31,  height: 42 }
-    fill:               { width: 97.74,  height: 42 }
-    subtle-highlight-2: { width: 97.74,  height: 42 }
-    spaceline:          { width: 171.03, height: 42 }
-
-
-views:
-    base:
-        - "j d u a x p h l m w ß"
-        - "c t i e o b n r s g q"
-        - "Shift_L   f v ü ä ö y z k BackSpace"
-        - "show_numbers show_eschars preferences         space        , . Return"
-    upper:
-        - "J D U A X P H L M W ẞ"
-        - "C T I E O B N R S G Q"
-        - "Shift_L   F V Ü Ä Ö Y Z K BackSpace"
-        - "show_numbers show_eschars preferences         space        ! ? Return"
-    numbers:
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "@ # € % & - _ + ( )"
-        - "show_symbols   ; \" ' : = < >  BackSpace"
-        - "show_letters show_eschars preferences         space        , . Return"
-    symbols:
-        - "~ ` ´ | · √ µ ÷ × ¶"
-        - "© ® £ $ ¥ ^ ° * { }"
-        - "show_numbers   \\ / § π τ [ ]  BackSpace"
-        - "show_letters show_eschars preferences         space        , . Return"
-    eschars:
-        - "ä-subtle-highlight è é ö-subtle-highlight ü-subtle-highlight-2 Ä-subtle-highlight È É Ö-subtle-highlight Ü-subtle-highlight"
-        - "à â ê î ô À Â Ê Î Ô"
-        - "show_numbers  « » ç Ç æ œ ß-subtle-highlight BackSpace"
-        - "show_letters show_eschars preferences         space        „ “ Return"
-
-buttons:
-    Shift_L:
-        action:
-            locking:
-                lock_view: "upper"
-                unlock_view: "base"
-        outline: "change-view"
-        icon: "key-shift"
-    BackSpace:
-        outline: "altline"
-        icon: "edit-clear-symbolic"
-        action: "erase"
-    preferences:
-        action: "show_prefs"
-        outline: "special"
-        icon: "keyboard-mode-symbolic"
-    show_numbers:
-        action:
-            set_view: "numbers"
-        outline: "change-view"
-        label: "123"
-    show_letters:
-        action:
-            set_view: "base"
-        outline: "change-view"
-        label: "ABC"
-    show_symbols:
-        action:
-            set_view: "symbols"
-        outline: "change-view"
-        label: "*/="
-    show_eschars:
-        action:
-            locking:
-                lock_view: "eschars"
-                unlock_view: "base"
-        outline: "change-view"
-        label: "Ää"
-    space:
-        outline: "spaceline"
-        text: " "
-    Return:
-        outline: "altline"
-        icon: "key-enter"
-        keysym: "Return"
-    ä-subtle-highlight:
-        outline: "subtle-highlight"
-        text: "ä"
-    ö-subtle-highlight:
-        outline: "subtle-highlight"
-        text: "ö"
-    ü-subtle-highlight-2:
-        outline: "subtle-highlight-2"
-        text: "ü"
-    Ä-subtle-highlight:
-        outline: "subtle-highlight"
-        text: "Ä"
-    Ö-subtle-highlight:
-        outline: "subtle-highlight"
-        text: "Ö"
-    Ü-subtle-highlight:
-        outline: "subtle-highlight"
-        text: "Ü"
-    ß-subtle-highlight:
-        outline: "subtle-highlight"
-        text: "ß"
-    5:
-        outline: "fill"
-    "&":
-        outline: "fill"
-    ·:
-        outline: "fill"
-    ¥:
-        outline: "fill"
-    ô:
-        outline: "fill"
-    Ç:
-        outline: "fill"
-    ":":
-        outline: "fill"
-    π:
-        outline: "fill"
--- a/data/keyboards/de+neo.yaml
+++ b/data/keyboards/de+neo.yaml
@ -1,122 +0,0 @@
-# Language: German (Neo 2)
---
-outlines:
-    default:            { width: 32.12,  height: 52 }
-    subtle-highlight:   { width: 32.12,  height: 52 }
-    special:            { width: 32.12,  height: 52 }
-    altline:            { width: 48.17,  height: 52 }
-    change-view:        { width: 48.17,  height: 52 }
-    fill:               { width: 64.24,  height: 52 }
-    subtle-highlight-2: { width: 64.24,  height: 52 }
-    spaceline:          { width: 112.45, height: 52 }
-
-
-views:
-    base:
-        - "x v l c w k h g f q ß"
-        - "u i a e o s n r t d y"
-        - "Shift_L   ü ö ä p z b m j BackSpace"
-        - "show_numbers show_eschars preferences         space        , . Return"
-    upper:
-        - "X V L C W K H G F Q ẞ"
-        - "U I A E O S N R T D Y"
-        - "Shift_L   Ü Ö Ä P Z B M J BackSpace"
-        - "show_numbers show_eschars preferences         space        ! ? Return"
-    numbers:
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "@ # € % & - _ + ( )"
-        - "show_symbols   ; \" ' : = < >  BackSpace"
-        - "show_letters show_eschars preferences         space        , . Return"
-    symbols:
-        - "~ ` ´ | · √ µ ÷ × ¶"
-        - "© ® £ $ ¥ ^ ° * { }"
-        - "show_numbers   \\ / § π τ [ ]  BackSpace"
-        - "show_letters show_eschars preferences         space        , . Return"
-    eschars:
-        - "ä-subtle-highlight è é ö-subtle-highlight ü-subtle-highlight-2 Ä-subtle-highlight È É Ö-subtle-highlight Ü-subtle-highlight"
-        - "à â ê î ô À Â Ê Î Ô"
-        - "show_numbers  « » ç Ç æ œ ß-subtle-highlight BackSpace"
-        - "show_letters show_eschars preferences         space        „ “ Return"
-
-buttons:
-    Shift_L:
-        action:
-            locking:
-                lock_view: "upper"
-                unlock_view: "base"
-        outline: "change-view"
-        icon: "key-shift"
-    BackSpace:
-        outline: "altline"
-        icon: "edit-clear-symbolic"
-        action: "erase"
-    preferences:
-        action: "show_prefs"
-        outline: "special"
-        icon: "keyboard-mode-symbolic"
-    show_numbers:
-        action:
-            set_view: "numbers"
-        outline: "change-view"
-        label: "123"
-    show_letters:
-        action:
-            set_view: "base"
-        outline: "change-view"
-        label: "ABC"
-    show_symbols:
-        action:
-            set_view: "symbols"
-        outline: "change-view"
-        label: "*/="
-    show_eschars:
-        action:
-            locking:
-                lock_view: "eschars"
-                unlock_view: "base"
-        outline: "change-view"
-        label: "Ää"
-    space:
-        outline: "spaceline"
-        text: " "
-    Return:
-        outline: "altline"
-        icon: "key-enter"
-        keysym: "Return"
-    ä-subtle-highlight:
-        outline: "subtle-highlight"
-        text: "ä"
-    ö-subtle-highlight:
-        outline: "subtle-highlight"
-        text: "ö"
-    ü-subtle-highlight-2:
-        outline: "subtle-highlight-2"
-        text: "ü"
-    Ä-subtle-highlight:
-        outline: "subtle-highlight"
-        text: "Ä"
-    Ö-subtle-highlight:
-        outline: "subtle-highlight"
-        text: "Ö"
-    Ü-subtle-highlight:
-        outline: "subtle-highlight"
-        text: "Ü"
-    ß-subtle-highlight:
-        outline: "subtle-highlight"
-        text: "ß"
-    5:
-        outline: "fill"
-    "&":
-        outline: "fill"
-    ·:
-        outline: "fill"
-    ¥:
-        outline: "fill"
-    ô:
-        outline: "fill"
-    Ç:
-        outline: "fill"
-    ":":
-        outline: "fill"
-    π:
-        outline: "fill"
--- a/data/keyboards/de+neo_wide.yaml
+++ b/data/keyboards/de+neo_wide.yaml
@ -1,122 +0,0 @@
-# Language: German (Neo 2)
---
-outlines:
-    default:            { width: 48.87,  height: 42 }
-    subtle-highlight:   { width: 48.87,  height: 42 }
-    special:            { width: 48.87,  height: 42 }
-    altline:            { width: 73.31,  height: 42 }
-    change-view:        { width: 73.31,  height: 42 }
-    fill:               { width: 97.74,  height: 42 }
-    subtle-highlight-2: { width: 97.74,  height: 42 }
-    spaceline:          { width: 171.03, height: 42 }
-
-
-views:
-    base:
-        - "x v l c w k h g f q ß"
-        - "u i a e o s n r t d y"
-        - "Shift_L   ü ö ä p z b m j BackSpace"
-        - "show_numbers show_eschars preferences         space        , . Return"
-    upper:
-        - "X V L C W K H G F Q ẞ"
-        - "U I A E O S N R T D Y"
-        - "Shift_L   Ü Ö Ä P Z B M J BackSpace"
-        - "show_numbers show_eschars preferences         space        ! ? Return"
-    numbers:
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "@ # € % & - _ + ( )"
-        - "show_symbols   ; \" ' : = < >  BackSpace"
-        - "show_letters show_eschars preferences         space        , . Return"
-    symbols:
-        - "~ ` ´ | · √ µ ÷ × ¶"
-        - "© ® £ $ ¥ ^ ° * { }"
-        - "show_numbers   \\ / § π τ [ ]  BackSpace"
-        - "show_letters show_eschars preferences         space        , . Return"
-    eschars:
-        - "ä-subtle-highlight è é ö-subtle-highlight ü-subtle-highlight-2 Ä-subtle-highlight È É Ö-subtle-highlight Ü-subtle-highlight"
-        - "à â ê î ô À Â Ê Î Ô"
-        - "show_numbers  « » ç Ç æ œ ß-subtle-highlight BackSpace"
-        - "show_letters show_eschars preferences         space        „ “ Return"
-
-buttons:
-    Shift_L:
-        action:
-            locking:
-                lock_view: "upper"
-                unlock_view: "base"
-        outline: "change-view"
-        icon: "key-shift"
-    BackSpace:
-        outline: "altline"
-        icon: "edit-clear-symbolic"
-        action: "erase"
-    preferences:
-        action: "show_prefs"
-        outline: "special"
-        icon: "keyboard-mode-symbolic"
-    show_numbers:
-        action:
-            set_view: "numbers"
-        outline: "change-view"
-        label: "123"
-    show_letters:
-        action:
-            set_view: "base"
-        outline: "change-view"
-        label: "ABC"
-    show_symbols:
-        action:
-            set_view: "symbols"
-        outline: "change-view"
-        label: "*/="
-    show_eschars:
-        action:
-            locking:
-                lock_view: "eschars"
-                unlock_view: "base"
-        outline: "change-view"
-        label: "Ää"
-    space:
-        outline: "spaceline"
-        text: " "
-    Return:
-        outline: "altline"
-        icon: "key-enter"
-        keysym: "Return"
-    ä-subtle-highlight:
-        outline: "subtle-highlight"
-        text: "ä"
-    ö-subtle-highlight:
-        outline: "subtle-highlight"
-        text: "ö"
-    ü-subtle-highlight-2:
-        outline: "subtle-highlight-2"
-        text: "ü"
-    Ä-subtle-highlight:
-        outline: "subtle-highlight"
-        text: "Ä"
-    Ö-subtle-highlight:
-        outline: "subtle-highlight"
-        text: "Ö"
-    Ü-subtle-highlight:
-        outline: "subtle-highlight"
-        text: "Ü"
-    ß-subtle-highlight:
-        outline: "subtle-highlight"
-        text: "ß"
-    5:
-        outline: "fill"
-    "&":
-        outline: "fill"
-    ·:
-        outline: "fill"
-    ¥:
-        outline: "fill"
-    ô:
-        outline: "fill"
-    Ç:
-        outline: "fill"
-    ":":
-        outline: "fill"
-    π:
-        outline: "fill"
--- a/data/keyboards/de.yaml
+++ b/data/keyboards/de.yaml
@ -1,97 +0,0 @@
-# Language: German
---
-outlines:
-    default:          { width: 35.33, height: 52 }
-    subtle-highlight: { width: 35.33, height: 52 }
-    altline:          { width: 52.67, height: 52 }
-    change-view:      { width: 52.67, height: 52 }
-    spaceline:        { width: 89.3,  height: 52 }
-    special:          { width: 35.33, height: 52 }
-
-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  « » ç Ç æ œ ß-subtle-highlight  BackSpace"
-        - "show_letters show_eschars preferences         space        „ “ Return"
-
-buttons:
-    Shift_L:
-        action:
-            locking:
-                lock_view: "upper"
-                unlock_view: "base"
-        outline: "change-view"
-        icon: "key-shift"
-    BackSpace:
-        outline: "altline"
-        icon: "edit-clear-symbolic"
-        action: "erase"
-    preferences:
-        action: "show_prefs"
-        outline: "special"
-        icon: "keyboard-mode-symbolic"
-    show_numbers:
-        action:
-            set_view: "numbers"
-        outline: "change-view"
-        label: "123"
-    show_letters:
-        action:
-            set_view: "base"
-        outline: "change-view"
-        label: "ABC"
-    show_symbols:
-        action:
-            set_view: "symbols"
-        outline: "change-view"
-        label: "*/="
-    show_eschars:
-        action:
-            locking:
-                lock_view: "eschars"
-                unlock_view: "base"
-        outline: "change-view"
-        label: "Ää"
-    space:
-        outline: "spaceline"
-        text: " "
-    Return:
-        outline: "altline"
-        icon: "key-enter"
-        keysym: "Return"
-    ä:
-        outline: "subtle-highlight"
-    ö:
-        outline: "subtle-highlight"
-    ü:
-        outline: "subtle-highlight"
-    Ä:
-        outline: "subtle-highlight"
-    Ö:
-        outline: "subtle-highlight"
-    Ü:
-        outline: "subtle-highlight"
-    ß-subtle-highlight:
-        outline: "subtle-highlight"
-        text: "ß"
--- a/data/keyboards/de_wide.yaml
+++ b/data/keyboards/de_wide.yaml
@ -1,144 +0,0 @@
-# Language: German
---
-outlines:
-    default:            { width: 48.87,  height: 42 }
-    subtle-highlight:   { width: 48.87,  height: 42 }
-    halfwidth:          { width: 24,     height: 42 }
-    thin:               { width: 30,     height: 42 }
-    narrow:             { width: 40.5,   height: 42 }
-    altline:            { width: 82.74,  height: 42 }
-    change-view:        { width: 82.74,  height: 42 }
-    fill:               { width: 97.74,  height: 42 }
-    subtle-highlight-2: { width: 97.74,  height: 42 }
-    spaceline:          { width: 159.13, height: 42 }
-    special:            { width: 48.87,  height: 42 }
-    placeholder:        { width: 30,     height: 42 }
-
-views:
-    base:
-        - "q w e r t z u i o p ü"
-        - "a s d f g h j k l ö ä"
-        - "Shift_L   y x c v b n m ß-thin BackSpace"
-        - "show_numbers show_eschars preferences         space        ,-narrow .-narrow Return"
-    upper:
-        - "Q W E R T Z U I O P Ü"
-        - "A S D F G H J K L Ö Ä"
-        - "Shift_L   Y X C V B N M --thin BackSpace"
-        - "show_numbers show_eschars preferences         space        !-narrow ?-narrow Return"
-    numbers:
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "@ # € % & - _ + ( )"
-        - "show_symbols   ; \" ' : = < > -- BackSpace"
-        - "show_letters show_eschars preferences         space        ,-narrow .-narrow Return"
-    symbols:
-        - "~ ` ´ | · √ µ ÷ × ¶"
-        - "© ® £ $ ¥ ^ ° * { }"
-        - "show_numbers   \\ / § π τ [ ] -- BackSpace"
-        - "show_letters show_eschars preferences         space        ,-narrow .-narrow Return"
-    eschars:
-        - "ä-subtle-highlight è é ö-subtle-highlight ü-subtle-highlight-2 Ä-subtle-highlight È É Ö-subtle-highlight Ü-subtle-highlight"
-        - "à â ê î ô À Â Ê Î Ô"
-        - "show_numbers  « » ç Ç æ œ ß-subtle-highlight -- BackSpace"
-        - "show_letters show_eschars preferences         space        „ “ Return"
-
-buttons:
-    Shift_L:
-        action:
-            locking:
-                lock_view: "upper"
-                unlock_view: "base"
-        outline: "change-view"
-        icon: "key-shift"
-    BackSpace:
-        outline: "altline"
-        icon: "edit-clear-symbolic"
-        action: "erase"
-    preferences:
-        action: "show_prefs"
-        outline: "special"
-        icon: "keyboard-mode-symbolic"
-    show_numbers:
-        action:
-            set_view: "numbers"
-        outline: "change-view"
-        label: "123"
-    show_letters:
-        action:
-            set_view: "base"
-        outline: "change-view"
-        label: "ABC"
-    show_symbols:
-        action:
-            set_view: "symbols"
-        outline: "change-view"
-        label: "*/="
-    show_eschars:
-        action:
-            locking:
-                lock_view: "eschars"
-                unlock_view: "base"
-        outline: "change-view"
-        label: "Ää"
-    space:
-        outline: "spaceline"
-        text: " "
-    Return:
-        outline: "altline"
-        icon: "key-enter"
-        keysym: "Return"
-    „:
-        outline: "narrow"
-    “:
-        outline: "narrow"
-    ",-narrow":
-        outline: "narrow"
-        text: ","
-    .-narrow:
-        outline: "narrow"
-        text: "."
-    "!-narrow":
-        outline: "narrow"
-        text: "!"
-    ?-narrow:
-        outline: "narrow"
-        text: "?"
-    --thin:
-        outline: "thin"
-        text: "-"
-    ß-thin:
-        outline: "thin"
-        text: "ß"
-    ä-subtle-highlight:
-        outline: "subtle-highlight"
-        text: "ä"
-    ö-subtle-highlight:
-        outline: "subtle-highlight"
-        text: "ö"
-    ü-subtle-highlight-2:
-        outline: "subtle-highlight-2"
-        text: "ü"
-    Ä-subtle-highlight:
-        outline: "subtle-highlight"
-        text: "Ä"
-    Ö-subtle-highlight:
-        outline: "subtle-highlight"
-        text: "Ö"
-    Ü-subtle-highlight:
-        outline: "subtle-highlight"
-        text: "Ü"
-    ß-subtle-highlight:
-        outline: "subtle-highlight"
-        text: "ß"
-    --:
-        outline: "placeholder"
-        text: ""
-    5:
-        outline: "fill"
-    "&":
-        outline: "fill"
-    ·:
-        outline: "fill"
-    ¥:
-        outline: "fill"
-    ô:
-        outline: "fill"
--- a/data/keyboards/dk.yaml
+++ b/data/keyboards/dk.yaml
@ -1,92 +0,0 @@
-# Language: Danish
---
-outlines:
-    default:       { width: 32.4,   height: 52 }
-    altline:       { width: 48.39,  height: 52 }
-    large:         { width: 48.39,  height: 52 }
-    wide:          { width: 62,     height: 52 }
-    change-view:   { width: 48.39,  height: 52 }
-    change-view-2: { width: 62,     height: 52 }
-    spaceline:     { width: 136.39, height: 52 }
-    special:       { width: 48,     height: 52 }
-    placeholder:   { width: 32,     height: 52 }
-    fill:          { width: 64,     height: 52 }
-
-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: "change-view"
-        icon: "key-shift"
-    BackSpace:
-        outline: "altline"
-        icon: "edit-clear-symbolic"
-        action: "erase"
-    preferences:
-        action: "show_prefs"
-        outline: "special"
-        icon: "keyboard-mode-symbolic"
-    show_numbers:
-        action:
-            set_view: "numbers"
-        outline: "change-view-2"
-        label: "123"
-    show_numbers_from_symbols:
-        action:
-            set_view: "numbers"
-        outline: "change-view"
-        label: "123"
-    show_letters:
-        action:
-            set_view: "base"
-        outline: "change-view-2"
-        label: "ABC"
-    show_symbols:
-        action:
-            set_view: "symbols"
-        outline: "change-view"
-        label: "*/="
-    .:
-        outline: "large"
-    space:
-        outline: "spaceline"
-        text: " "
-    Return:
-        outline: "wide"
-        icon: "key-enter"
-        keysym: "Return"
-    --:
-        outline: "placeholder"
-        text: ""
-    5:
-        outline: "fill"
-    "&":
-        outline: "fill"
-    √:
-        outline: "fill"
-    ¥:
-        outline: "fill"
--- a/data/keyboards/dk_wide.yaml
+++ b/data/keyboards/dk_wide.yaml
@ -1,83 +0,0 @@
-# Language: Danish
---
-outlines:
-    default:     { width: 48.87,  height: 42 }
-    altline:     { width: 73.5,   height: 42 }
-    wide:        { width: 92.99,  height: 42 }
-    change-view: { width: 73.5,   height: 42 }
-    spaceline:   { width: 273.5,  height: 42 }
-    special:     { width: 48.87,  height: 42 }
-    placeholder: { width: 48.87,  height: 42 }
-    fill:        { width: 97.74,  height: 42 }
-
-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: "change-view"
-        icon: "key-shift"
-    BackSpace:
-        outline: "altline"
-        icon: "edit-clear-symbolic"
-        action: "erase"
-    preferences:
-        action: "show_prefs"
-        outline: "special"
-        icon: "keyboard-mode-symbolic"
-    show_numbers:
-        action:
-            set_view: "numbers"
-        outline: "change-view"
-        label: "123"
-    show_letters:
-        action:
-            set_view: "base"
-        outline: "change-view"
-        label: "ABC"
-    show_symbols:
-        action:
-            set_view: "symbols"
-        outline: "change-view"
-        label: "*/="
-    space:
-        outline: "spaceline"
-        text: " "
-    Return:
-        outline: "wide"
-        icon: "key-enter"
-        keysym: "Return"
-    --:
-        outline: "placeholder"
-        text: ""
-    5:
-        outline: "fill"
-    "&":
-        outline: "fill"
-    √:
-        outline: "fill"
-    ¥:
-        outline: "fill"
--- a/data/keyboards/email/us.yaml
+++ b/data/keyboards/email/us.yaml
@ -1,79 +0,0 @@
---
-outlines:
-    default:       { width: 35.33,  height: 52 }
-    wide:          { width: 62,     height: 52 }
-    change-view:   { width: 52.67,  height: 52 }
-    change-view-2: { width: 62,     height: 52 }
-    spaceline:     { width: 106.67, height: 52 }
-    special:       { width: 44,     height: 52 }
-    large:         { width: 44,     height: 52 }
-
-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: "change-view"
-        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: "change-view-2"
-        label: "123"
-    show_numbers_from_symbols:
-        action:
-            set_view: "numbers"
-        outline: "change-view"
-        label: "123"
-    show_letters:
-        action:
-            set_view: "base"
-        outline: "change-view-2"
-        label: "ABC"
-    show_symbols:
-        action:
-            set_view: "symbols"
-        outline: "change-view"
-        label: "*/="
-    .:
-        outline: "large"
-    space:
-        outline: "spaceline"
-        text: " "
-    Return:
-        outline: "wide"
-        icon: "key-enter"
-        keysym: "Return"
--- a/data/keyboards/email/us_wide.yaml
+++ b/data/keyboards/email/us_wide.yaml
@ -1,79 +0,0 @@
---
-outlines:
-    default:       { width: 52,    height: 42 }
-    wide:          { width: 91.25, height: 42 }
-    change-view:   { width: 77.52, height: 42 }
-    change-view-2: { width: 91.25, height: 42 }
-    spaceline:     { width: 157,   height: 42 }
-    special:       { width: 64.76, height: 42 }
-    large:         { width: 54.76, height: 42 }
-
-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: "change-view"
-        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: "change-view-2"
-        label: "123"
-    show_numbers_from_symbols:
-        action:
-            set_view: "numbers"
-        outline: "change-view"
-        label: "123"
-    show_letters:
-        action:
-            set_view: "base"
-        outline: "change-view-2"
-        label: "ABC"
-    show_symbols:
-        action:
-            set_view: "symbols"
-        outline: "change-view"
-        label: "*/="
-    .:
-        outline: "large"
-    space:
-        outline: "spaceline"
-        text: " "
-    Return:
-        outline: "wide"
-        icon: "key-enter"
-        keysym: "Return"
--- a/data/keyboards/emoji/us.yaml
+++ b/data/keyboards/emoji/us.yaml
--- a/data/keyboards/emoji/us_wide.yaml
+++ b/data/keyboards/emoji/us_wide.yaml
--- a/data/keyboards/epo.yaml
+++ b/data/keyboards/epo.yaml
@ -1,91 +0,0 @@
-# Language: Esperanto
---
-outlines:
-    default:       { width: 35.67, height: 52 }
-    altline:       { width: 54,    height: 52 }
-    wide:          { width: 54,    height: 52 }
-    change-view:   { width: 54,    height: 52 }
-    change-view-2: { width: 62,    height: 52 }
-    spaceline:     { width: 88.75, height: 52 }
-    special:       { width: 35.67, height: 52 }
-    placeholder:   { width: 35.67, height: 52 }
-    large:         { width: 71.34, height: 52 }
-
-views:
-    base:
-        - "q w e r t y u i o p"
-        - "a s d f g h j k l"
-        - "Shift_L   z x c v b n m  BackSpace"
-        - "show_numbers show_eschars preferences         space        .-large Return"
-    upper:
-        - "Q W E R T Y U I O P"
-        - "A S D F G H J K L"
-        - "Shift_L   Z X C V B N M  BackSpace"
-        - "show_numbers show_eschars preferences         space        ! ? Return"
-    numbers:
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "@ # $ % & - _ + ( )"
-        - "show_symbols   , \" ' : ; ! ?  BackSpace"
-        - "show_letters show_eschars preferences         space       .-large Return"
-    symbols:
-        - "~ ` | · √ π τ ÷ × ¶"
-        - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers   \\ / < > = [ ]  BackSpace"
-        - "show_letters show_eschars preferences         space       , . Return"
-    eschars:
-        - "-- -- ĉ ĝ ĥ ĵ ŝ ŭ ? --"
-        - "-- -- Ĉ Ĝ Ĥ Ĵ Ŝ Ŭ ! --"
-        - "show_numbers ' \" - – , . … BackSpace"
-        - "show_letters show_eschars preferences         space        „ “ Return"
-
-buttons:
-    Shift_L:
-        action:
-            locking:
-                lock_view: "upper"
-                unlock_view: "base"
-        outline: "change-view"
-        icon: "key-shift"
-    BackSpace:
-        outline: "altline"
-        icon: "edit-clear-symbolic"
-        action: "erase"
-    preferences:
-        action: "show_prefs"
-        outline: "special"
-        icon: "keyboard-mode-symbolic"
-    show_numbers:
-        action:
-            set_view: "numbers"
-        outline: "change-view"
-        label: "123"
-    show_letters:
-        action:
-            set_view: "base"
-        outline: "change-view"
-        label: "ABC"
-    show_symbols:
-        action:
-            set_view: "symbols"
-        outline: "change-view"
-        label: "*/="
-    show_eschars:
-        action:
-            locking:
-                lock_view: "eschars"
-                unlock_view: "base"
-        outline: "change-view"
-        label: "Ŝŭ"
-    space:
-        outline: "spaceline"
-        text: " "
-    Return:
-        outline: "wide"
-        icon: "key-enter"
-        keysym: "Return"
-    --:
-        outline: "placeholder"
-        text: ""
-    .-large:
-        outline: "large"
-        text: "."
--- a/data/keyboards/epo_wide.yaml
+++ b/data/keyboards/epo_wide.yaml
@ -1,108 +0,0 @@
-# Language: Esperanto
---
-outlines:
-    default:       { width: 53.75, height: 42 }
-    thin:          { width: 40,    height: 42 }
-    altline:       { width: 80.5,  height: 42 }
-    wide:          { width: 91.25, height: 42 }
-    change-view:   { width: 80.5,  height: 42 }
-    change-view-2: { width: 91.25, height: 42 }
-    spaceline:     { width: 164,   height: 42 }
-    special:       { width: 52,    height: 42 }
-    placeholder:   { width: 53.75, height: 42 }
-    large:         { width: 80,    height: 42 }
-
-views:
-    base:
-        - "q w e r t y u i o p"
-        - "a s d f g h j k l"
-        - "Shift_L   z x c v b n m  BackSpace"
-        - "show_numbers show_eschars preferences         space        .-large Return"
-    upper:
-        - "Q W E R T Y U I O P"
-        - "A S D F G H J K L"
-        - "Shift_L   Z X C V B N M  BackSpace"
-        - "show_numbers show_eschars preferences         space        !-thin ?-thin Return"
-    numbers:
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "@ # $ % & - _ + ( )"
-        - "show_symbols   , \" ' : ; ! ?  BackSpace"
-        - "show_letters show_eschars preferences         space       .-large Return"
-    symbols:
-        - "~ ` | · √ π τ ÷ × ¶"
-        - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers   \\ / < > = [ ]  BackSpace"
-        - "show_letters show_eschars preferences         space       ,-thin .-thin Return"
-    eschars:
-        - "-- -- ĉ ĝ ĥ ĵ ŝ ŭ ? --"
-        - "-- -- Ĉ Ĝ Ĥ Ĵ Ŝ Ŭ ! --"
-        - "show_numbers ' \" - – , . … BackSpace"
-        - "show_letters show_eschars preferences         space        „ “ Return"
-
-buttons:
-    Shift_L:
-        action:
-            locking:
-                lock_view: "upper"
-                unlock_view: "base"
-        outline: "change-view"
-        icon: "key-shift"
-    BackSpace:
-        outline: "altline"
-        icon: "edit-clear-symbolic"
-        action: "erase"
-    preferences:
-        action: "show_prefs"
-        outline: "special"
-        icon: "keyboard-mode-symbolic"
-    show_numbers:
-        action:
-            set_view: "numbers"
-        outline: "change-view"
-        label: "123"
-    show_letters:
-        action:
-            set_view: "base"
-        outline: "change-view"
-        label: "ABC"
-    show_symbols:
-        action:
-            set_view: "symbols"
-        outline: "change-view"
-        label: "*/="
-    show_eschars:
-        action:
-            locking:
-                lock_view: "eschars"
-                unlock_view: "base"
-        outline: "change-view"
-        label: "Ŝŭ"
-    space:
-        outline: "spaceline"
-        text: " "
-    Return:
-        outline: "altline"
-        icon: "key-enter"
-        keysym: "Return"
-    --:
-        outline: "placeholder"
-        text: ""
-    .-large:
-        outline: "large"
-        text: "."
-    "!-thin":
-        outline: "thin"
-        text: "!"
-    ?-thin:
-        outline: "thin"
-        text: "?"
-    ",-thin":
-        outline: "thin"
-        text: ","
-    .-thin:
-        outline: "thin"
-        text: "."
-    „:
-        outline: "thin"
-    “:
-        outline: "thin"
--- a/data/keyboards/es+cat.yaml
+++ b/data/keyboards/es+cat.yaml
@ -1,83 +0,0 @@
-# Language: Catalan (Spain, with middle-dot L)
---
-outlines:
-    default:       { width: 35.67, height: 52 }
-    altline:       { width: 52.67, height: 52 }
-    wide:          { width: 62,    height: 52 }
-    change-view:   { width: 52.67, height: 52 }
-    change-view-2: { width: 62,    height: 52 }
-    spaceline:     { width: 90,    height: 52 }
-    special:       { width: 35.67, height: 52 }
-
-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: "change-view"
-        icon: "key-shift"
-    BackSpace:
-        outline: "altline"
-        icon: "edit-clear-symbolic"
-        action: "erase"
-    preferences:
-        action: "show_prefs"
-        outline: "special"
-        icon: "keyboard-mode-symbolic"
-    show_numbers:
-        action:
-            set_view: "numbers"
-        outline: "change-view"
-        label: "123"
-    show_letters:
-        action:
-            set_view: "base"
-        outline: "change-view"
-        label: "ABC"
-    show_symbols:
-        action:
-            set_view: "symbols"
-        outline: "change-view"
-        label: "*/="
-    show_eschars:
-        action:
-            locking:
-                lock_view: "eschars"
-                unlock_view: "base"
-        outline: "change-view"
-        label: "Àà"
-    space:
-        outline: "spaceline"
-        text: " "
-    Return:
-        outline: "altline"
-        icon: "key-enter"
-        keysym: "Return"
--- a/data/keyboards/es+cat_wide.yaml
+++ b/data/keyboards/es+cat_wide.yaml
@ -1,83 +0,0 @@
-# Language: Catalan (Spain, with middle-dot L)
---
-outlines:
-    default:       { width: 53.75, height: 42 }
-    altline:       { width: 80,    height: 42 }
-    wide:          { width: 92,    height: 42 }
-    change-view:   { width: 80,    height: 42 }
-    change-view-2: { width: 92,    height: 42 }
-    spaceline:     { width: 135,   height: 42 }
-    special:       { width: 53.75, height: 42 }
-
-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: "change-view"
-        icon: "key-shift"
-    BackSpace:
-        outline: "altline"
-        icon: "edit-clear-symbolic"
-        action: "erase"
-    preferences:
-        action: "show_prefs"
-        outline: "special"
-        icon: "keyboard-mode-symbolic"
-    show_numbers:
-        action:
-            set_view: "numbers"
-        outline: "change-view"
-        label: "123"
-    show_letters:
-        action:
-            set_view: "base"
-        outline: "change-view"
-        label: "ABC"
-    show_symbols:
-        action:
-            set_view: "symbols"
-        outline: "change-view"
-        label: "*/="
-    show_eschars:
-        action:
-            locking:
-                lock_view: "eschars"
-                unlock_view: "base"
-        outline: "change-view"
-        label: "Àà"
-    space:
-        outline: "spaceline"
-        text: " "
-    Return:
-        outline: "altline"
-        icon: "key-enter"
-        keysym: "Return"
--- a/data/keyboards/es.yaml
+++ b/data/keyboards/es.yaml
@ -1,82 +0,0 @@
-# Language: Spanish
---
-outlines:
-    default:       { width: 35.67, height: 52 }
-    altline:       { width: 52.67, height: 52 }
-    wide:          { width: 62,    height: 52 }
-    change-view:   { width: 52.67, height: 52 }
-    spaceline:     { width: 90,    height: 52 }
-    special:       { width: 35.67, height: 52 }
-
-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: "change-view"
-        icon: "key-shift"
-    BackSpace:
-        outline: "altline"
-        icon: "edit-clear-symbolic"
-        action: "erase"
-    preferences:
-        action: "show_prefs"
-        outline: "special"
-        icon: "keyboard-mode-symbolic"
-    show_numbers:
-        action:
-            set_view: "numbers"
-        outline: "change-view"
-        label: "123"
-    show_letters:
-        action:
-            set_view: "base"
-        outline: "change-view"
-        label: "ABC"
-    show_symbols:
-        action:
-            set_view: "symbols"
-        outline: "change-view"
-        label: "*/="
-    show_eschars:
-        action:
-            locking:
-                lock_view: "eschars"
-                unlock_view: "base"
-        outline: "change-view"
-        label: "Áá"
-    space:
-        outline: "spaceline"
-        text: " "
-    Return:
-        outline: "altline"
-        icon: "key-enter"
-        keysym: "Return"
--- a/data/keyboards/es_wide.yaml
+++ b/data/keyboards/es_wide.yaml
@ -1,82 +0,0 @@
-# Language: Spanish
---
-outlines:
-    default:       { width: 53.75, height: 42 }
-    altline:       { width: 80,    height: 42 }
-    wide:          { width: 92,    height: 42 }
-    change-view:   { width: 80,    height: 42 }
-    spaceline:     { width: 135,   height: 42 }
-    special:       { width: 53.75, height: 42 }
-
-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: "change-view"
-        icon: "key-shift"
-    BackSpace:
-        outline: "altline"
-        icon: "edit-clear-symbolic"
-        action: "erase"
-    preferences:
-        action: "show_prefs"
-        outline: "special"
-        icon: "keyboard-mode-symbolic"
-    show_numbers:
-        action:
-            set_view: "numbers"
-        outline: "change-view"
-        label: "123"
-    show_letters:
-        action:
-            set_view: "base"
-        outline: "change-view"
-        label: "ABC"
-    show_symbols:
-        action:
-            set_view: "symbols"
-        outline: "change-view"
-        label: "*/="
-    show_eschars:
-        action:
-            locking:
-                lock_view: "eschars"
-                unlock_view: "base"
-        outline: "change-view"
-        label: "Áá"
-    space:
-        outline: "spaceline"
-        text: " "
-    Return:
-        outline: "altline"
-        icon: "key-enter"
-        keysym: "Return"
--- a/data/keyboards/fi.yaml
+++ b/data/keyboards/fi.yaml
@ -1,92 +0,0 @@
-# Language: Finnish
---
-outlines:
-    default:       { width: 32.4,   height: 52 }
-    altline:       { width: 48.39,  height: 52 }
-    large:         { width: 48.39,  height: 52 }
-    wide:          { width: 62,     height: 52 }
-    change-view:   { width: 48.39,  height: 52 }
-    change-view-2: { width: 62,     height: 52 }
-    spaceline:     { width: 136.39, height: 52 }
-    special:       { width: 48,     height: 52 }
-    placeholder:   { width: 32,     height: 52 }
-    fill:          { width: 64,     height: 52 }
-
-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: "change-view"
-        icon: "key-shift"
-    BackSpace:
-        outline: "altline"
-        icon: "edit-clear-symbolic"
-        action: "erase"
-    preferences:
-        action: "show_prefs"
-        outline: "special"
-        icon: "keyboard-mode-symbolic"
-    show_numbers:
-        action:
-            set_view: "numbers"
-        outline: "change-view-2"
-        label: "123"
-    show_numbers_from_symbols:
-        action:
-            set_view: "numbers"
-        outline: "change-view"
-        label: "123"
-    show_letters:
-        action:
-            set_view: "base"
-        outline: "change-view-2"
-        label: "ABC"
-    show_symbols:
-        action:
-            set_view: "symbols"
-        outline: "change-view"
-        label: "*/="
-    .:
-        outline: "large"
-    space:
-        outline: "spaceline"
-        text: " "
-    Return:
-        outline: "wide"
-        icon: "key-enter"
-        keysym: "Return"
-    --:
-        outline: "placeholder"
-        text: ""
-    5:
-        outline: "fill"
-    "&":
-        outline: "fill"
-    √:
-        outline: "fill"
-    ¥:
-        outline: "fill"
--- a/data/keyboards/fi_wide.yaml
+++ b/data/keyboards/fi_wide.yaml
@ -1,83 +0,0 @@
-# Language: Finnish
---
-outlines:
-    default:     { width: 48.87,  height: 42 }
-    altline:     { width: 73.5,   height: 42 }
-    wide:        { width: 92.99,  height: 42 }
-    change-view: { width: 73.5,   height: 42 }
-    spaceline:   { width: 273.5,  height: 42 }
-    special:     { width: 48.87,  height: 42 }
-    placeholder: { width: 48.87,  height: 42 }
-    fill:        { width: 97.74,  height: 42 }
-
-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: "change-view"
-        icon: "key-shift"
-    BackSpace:
-        outline: "altline"
-        icon: "edit-clear-symbolic"
-        action: "erase"
-    preferences:
-        action: "show_prefs"
-        outline: "special"
-        icon: "keyboard-mode-symbolic"
-    show_numbers:
-        action:
-            set_view: "numbers"
-        outline: "change-view"
-        label: "123"
-    show_letters:
-        action:
-            set_view: "base"
-        outline: "change-view"
-        label: "ABC"
-    show_symbols:
-        action:
-            set_view: "symbols"
-        outline: "change-view"
-        label: "*/="
-    space:
-        outline: "spaceline"
-        text: " "
-    Return:
-        outline: "wide"
-        icon: "key-enter"
-        keysym: "Return"
-    --:
-        outline: "placeholder"
-        text: ""
-    5:
-        outline: "fill"
-    "&":
-        outline: "fill"
-    √:
-        outline: "fill"
-    ¥:
-        outline: "fill"
--- a/data/keyboards/fr+bepo.yaml
+++ b/data/keyboards/fr+bepo.yaml
@ -1,95 +0,0 @@
-# Language: French (BEPO)
---
-outlines:
-    default:       { width: 35.33, height: 52 }
-    altline:       { width: 37.0,  height: 52 }
-    wide:          { width: 50,    height: 52 }
-    change-view:   { width: 37.0,  height: 52 }
-    change-view-2: { width: 50,    height: 52 }
-    spaceline:     { width: 171,   height: 52 }
-    special:       { width: 35.33, height: 52 }
-    large:         { width: 35.33, height: 52 }
-    placeholder:   { width: 35.33, height: 52 }
-
-views:
-    base:
-        - "b é p o w v d l j z"
-        - "a u i e c t s r n m"
-        - "Shift_L y x k q g h f . BackSpace"
-        - "show_numbers preferences         space   show_eschars Return"
-    upper:
-        - "B É P O W V D L J Z"
-        - "A U I E C T S R N M"
-        - "Shift_L   Y X K Q G H F -  BackSpace"
-        - "show_numbers preferences         space   show_eschars Return"
-    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: "change-view"
-        icon: "key-shift"
-    BackSpace:
-        outline: "altline"
-        icon: "edit-clear-symbolic"
-        action: "erase"
-    preferences:
-        action: "show_prefs"
-        outline: "special"
-        icon: "keyboard-mode-symbolic"
-    show_numbers:
-        action:
-            set_view: "numbers"
-        outline: "change-view-2"
-        label: "123"
-    show_numbers_from_symbols:
-        action:
-            set_view: "numbers"
-        outline: "change-view"
-        label: "123"
-    show_letters:
-        action:
-            set_view: "base"
-        outline: "change-view-2"
-        label: "ABC"
-    show_symbols:
-        action:
-            set_view: "symbols"
-        outline: "change-view"
-        label: "*/="
-    show_eschars:
-        action:
-            locking:
-                lock_view: "eschars"
-                unlock_view: "base"
-        outline: "change-view-2"
-        label: "âÂ"
-    space:
-        outline: "spaceline"
-        text: " "
-    Return:
-        outline: "wide"
-        icon: "key-enter"
-        keysym: "Return"
-    .:
-        outline: "large"
-    --:
-        outline: "placeholder"
-        text: ""
--- a/data/keyboards/fr+bepo_wide.yaml
+++ b/data/keyboards/fr+bepo_wide.yaml
@ -1,92 +0,0 @@
-# Language: French (BEPO)
---
-outlines:
-    default:       { width: 54,  height: 42 }
-    altline:       { width: 54,  height: 42 }
-    wide:          { width: 80,  height: 42 }
-    change-view:   { width: 54,  height: 42 }
-    change-view-2: { width: 80,  height: 42 }
-    spaceline:     { width: 246, height: 42 }
-    special:       { width: 54,  height: 42 }
-    placeholder:   { width: 54,  height: 42 }
-
-views:
-    base:
-        - "b é p o w v d l j z"
-        - "a u i e c t s r n m"
-        - "Shift_L y x k q g h f . BackSpace"
-        - "show_numbers preferences         space    show_eschars Return"
-    upper:
-        - "B É P O W V D L J Z"
-        - "A U I E C T S R N M"
-        - "Shift_L   Y X K Q G H F -  BackSpace"
-        - "show_numbers preferences         space    show_eschars Return"
-    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: "change-view"
-        icon: "key-shift"
-    BackSpace:
-        outline: "altline"
-        icon: "edit-clear-symbolic"
-        action: "erase"
-    preferences:
-        action: "show_prefs"
-        outline: "special"
-        icon: "keyboard-mode-symbolic"
-    show_numbers:
-        action:
-            set_view: "numbers"
-        outline: "change-view-2"
-        label: "123"
-    show_numbers_from_symbols:
-        action:
-            set_view: "numbers"
-        outline: "change-view"
-        label: "123"
-    show_letters:
-        action:
-            set_view: "base"
-        outline: "change-view-2"
-        label: "ABC"
-    show_symbols:
-        action:
-            set_view: "symbols"
-        outline: "change-view"
-        label: "*/="
-    show_eschars:
-        action:
-            locking:
-                lock_view: "eschars"
-                unlock_view: "base"
-        outline: "change-view-2"
-        label: "âÂ"
-    space:
-        outline: "spaceline"
-        text: " "
-    Return:
-        outline: "wide"
-        icon: "key-enter"
-        keysym: "Return"
-    --:
-        outline: "placeholder"
-        text: ""
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Luci	5230171d47	Most x11 references removed, some x* files renamed to w*, for wayland; project compiling and running.	2019-01-31 22:02:44 -02:00
Luci	436740b64a	Removing tabs first	2019-01-31 20:50:55 -02:00
				`@ -0,0 +1 @@`
				`See https://github.com/ueno/eekboard/wiki/TODO`