diff --git a/data/common.css b/data/common.css
index 54b18011..2f4d46c7 100644
--- a/data/common.css
+++ b/data/common.css
@@ -11,6 +11,10 @@ sq_view.gr_polytonic {
     font-size: 2em;
 }
 
+sq_view.ir_azb {
+    font-size: 1.368em;
+}
+
 sq_button {
     border-radius: 4px;
     margin: 2px;
@@ -36,4 +40,4 @@ sq_button.small {
 sq_view.pin sq_button {
     border-radius: 0px;
     margin: 1px 1px 1px 1px;
-}
\ No newline at end of file
+}
diff --git a/data/keyboards/am+phonetic.yaml b/data/keyboards/am+phonetic.yaml
index fa6e3ee9..76c71c36 100644
--- a/data/keyboards/am+phonetic.yaml
+++ b/data/keyboards/am+phonetic.yaml
@@ -1,39 +1,41 @@
-# Armenian layout created by Norayr Chilingarian
+# Armenian layout based on work by Norayr Chilingarian
 # Yerevan
 # Oct 2021
 ---
 outlines:
-    default:       { width: 35.33, height: 52 }
-    altline:       { width: 52.67, height: 52 }
-    wide:          { width: 32,    height: 32 }
-    change-view:   { width: 52.67, height: 52 }
-    change-view-2: { width: 32,    height: 32 }
-    spaceline:     { width: 142,   height: 52 }
-    special:       { width: 44,    height: 52 }
+    default:       { width: 34.3, height: 52 }
+    altline:       { width: 52,   height: 52 }
+    wide:          { width: 52,   height: 52 }
+    change-view:   { width: 52,   height: 52 }
+    spaceline:     { width: 255,  height: 52 }
+    special:       { width: 44,   height: 52 }
+    large:         { width: 44,   height: 52 }
+    placeholder:   { width: 34.3, height: 52 }
 
 views:
     base:
         - "՝ է թ փ ձ ջ ւ և ռ չ ճ ֊ ժ"
         - "ք ո ե ր տ ը ւ ի օ պ խ ծ շ"
-        - "ա ս դ ֆ գ հ յ կ լ ․"
-        - "Shift_L զ ղ ց վ բ ն մ ՛ BackSpace"
+        - "-- -- ա ս դ ֆ գ հ յ կ լ ․ --"
+        - "Shift_L -- զ ղ ց վ բ ն մ ՛ -- BackSpace"
         - "show_numbers preferences         space        . Return"
     upper:
         - "՝ Է Թ Փ Ձ Ջ Ւ և Ռ Չ Ճ — Ժ"
         - "Ք Ո Ե Ր Տ Ը Ւ Ի Օ Պ Խ Ծ Շ"
-        - "Ա Ս Դ Ֆ Գ Հ Յ Կ Լ ։"
-        - "Shift_L Զ Ղ Ց Վ Բ Ն Մ ՞ BackSpace"
+        - "-- -- Ա Ս Դ Ֆ Գ Հ Յ Կ Լ ։ --"
+        - "Shift_L -- Զ Ղ Ց Վ Բ Ն Մ ՞ -- BackSpace"
         - "show_numbers preferences         space        . Return"
     numbers:
-        - "show_symbols   , \" ' : ; ! ?  BackSpace"
-        - "ﬓ  ﬔ  ﬕ  ﬖ  ﬗ   ՟ և"
-        - "1 2 3 4 5 6 7 8 9 0"
+        - "-- -- -- -- -- -- -- -- --"
+        - "-- ﬓ  ﬔ  ﬕ  ﬖ  ﬗ   ՟ և --"
+        - "-- , \" ' : ; ! ? --"
+        - "show_symbols 1 2 3 4 5 6 7 8 9 0 BackSpace"
         - "show_letters preferences         space        . Return"
     symbols:
-        - "show_numbers_from_symbols   \\ % < > = [ ]  BackSpace"
-        - "* # $ / & - _ + ( )"
-        - "© ® £ € ¥ ^ ° @ { }"
-        - "~ ` | · √ π τ ÷ × ¶"
+        - "* # \\ % < > = [ ]"
+        - "© $ / & - _ + ( )"
+        - "® £ € ¥ ^ ° @ { }"
+        - "show_numbers ~ ` | · √ π τ ÷ × ¶ BackSpace"
         - "show_letters preferences         space        . Return"
 
 buttons:
@@ -53,11 +55,6 @@ buttons:
         outline: "special"
         icon: "keyboard-mode-symbolic"
     show_numbers:
-        action:
-            set_view: "numbers"
-        outline: "change-view-2"
-        label: "123"
-    show_numbers_from_symbols:
         action:
             set_view: "numbers"
         outline: "change-view"
@@ -65,7 +62,7 @@ buttons:
     show_letters:
         action:
             set_view: "base"
-        outline: "change-view-2"
+        outline: "change-view"
         label: "ԱԲԳ"
     show_symbols:
         action:
@@ -73,7 +70,7 @@ buttons:
         outline: "change-view"
         label: "*/="
     .:
-        outline: "special"
+        outline: "large"
     space:
         outline: "spaceline"
         text: " "
@@ -81,3 +78,6 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
+    --:
+        outline: "placeholder"
+        text: ""
\ No newline at end of file
diff --git a/data/keyboards/am+phonetic_wide.yaml b/data/keyboards/am+phonetic_wide.yaml
index 5a47f6a9..589d7388 100644
--- a/data/keyboards/am+phonetic_wide.yaml
+++ b/data/keyboards/am+phonetic_wide.yaml
@@ -1,39 +1,41 @@
-# Armenian layout created by Norayr Chilingarian
+# Armenian layout based on work by Norayr Chilingarian
 # Yerevan
 # Oct 2021
 ---
 outlines:
-    default:       { width: 50,     height: 42 }
-    altline:       { width: 74.54,  height: 42 }
-    wide:          { width: 45.29,  height: 32 }
-    change-view:   { width: 74.54,  height: 42 }
-    change-view-2: { width: 45.29,  height: 32 }
-    spaceline:     { width: 200.96, height: 42 }
+    default:       { width: 51.7,   height: 42 }
+    altline:       { width: 77.5,   height: 42 }
+    wide:          { width: 77.5,   height: 42 }
+    change-view:   { width: 77.5,   height: 42 }
+    spaceline:     { width: 392,    height: 42 }
     special:       { width: 62.27,  height: 42 }
+    large:         { width: 62.27,  height: 42 }
+    placeholder:   { width: 51.7,   height: 42 }
 
 views:
     base:
         - "՝ է թ փ ձ ջ ւ և ռ չ ճ ֊ ժ"
         - "ք ո ե ր տ ը ւ ի օ պ խ ծ շ"
-        - "ա ս դ ֆ գ հ յ կ լ ․"
-        - "Shift_L զ ղ ց վ բ ն մ ՛ BackSpace"
+        - "-- -- ա ս դ ֆ գ հ յ կ լ ․ --"
+        - "Shift_L -- զ ղ ց վ բ ն մ ՛ -- BackSpace"
         - "show_numbers preferences         space        . Return"
     upper:
         - "՝ Է Թ Փ Ձ Ջ Ւ և Ռ Չ Ճ — Ժ"
         - "Ք Ո Ե Ր Տ Ը Ւ Ի Օ Պ Խ Ծ Շ"
-        - "Ա Ս Դ Ֆ Գ Հ Յ Կ Լ ։"
-        - "Shift_L Զ Ղ Ց Վ Բ Ն Մ ՞ BackSpace"
+        - "-- -- Ա Ս Դ Ֆ Գ Հ Յ Կ Լ ։ --"
+        - "Shift_L -- Զ Ղ Ց Վ Բ Ն Մ ՞ -- BackSpace"
         - "show_numbers preferences         space        . Return"
     numbers:
-        - "show_symbols   , \" ' : ; ! ?  BackSpace"
-        - "ﬓ  ﬔ  ﬕ  ﬖ  ﬗ   ՟ և"
-        - "1 2 3 4 5 6 7 8 9 0"
+        - "-- -- -- -- -- -- -- -- --"
+        - "-- ﬓ  ﬔ  ﬕ  ﬖ  ﬗ   ՟ և --"
+        - "-- , \" ' : ; ! ? --"
+        - "show_symbols 1 2 3 4 5 6 7 8 9 0 BackSpace"
         - "show_letters preferences         space        . Return"
     symbols:
-        - "show_numbers_from_symbols   \\ % < > = [ ]  BackSpace"
-        - "* # $ / & - _ + ( )"
-        - "© ® £ € ¥ ^ ° @ { }"
-        - "~ ` | · √ π τ ÷ × ¶"
+        - "* # \\ % < > = [ ]"
+        - "© $ / & - _ + ( )"
+        - "® £ € ¥ ^ ° @ { }"
+        - "show_numbers ~ ` | · √ π τ ÷ × ¶ BackSpace"
         - "show_letters preferences         space        . Return"
 
 buttons:
@@ -53,11 +55,6 @@ buttons:
         outline: "special"
         icon: "keyboard-mode-symbolic"
     show_numbers:
-        action:
-            set_view: "numbers"
-        outline: "change-view-2"
-        label: "123"
-    show_numbers_from_symbols:
         action:
             set_view: "numbers"
         outline: "change-view"
@@ -65,7 +62,7 @@ buttons:
     show_letters:
         action:
             set_view: "base"
-        outline: "change-view-2"
+        outline: "change-view"
         label: "ԱԲԳ"
     show_symbols:
         action:
@@ -73,7 +70,7 @@ buttons:
         outline: "change-view"
         label: "*/="
     .:
-        outline: "special"
+        outline: "large"
     space:
         outline: "spaceline"
         text: " "
@@ -81,3 +78,6 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
+    --:
+        outline: "placeholder"
+        text: ""
\ No newline at end of file
diff --git a/data/keyboards/am.yaml b/data/keyboards/am.yaml
index db46fe92..0e07b688 100644
--- a/data/keyboards/am.yaml
+++ b/data/keyboards/am.yaml
@@ -1,39 +1,41 @@
-# Armenian layout created by Norayr Chilingarian
+# Armenian layout based on work by Norayr Chilingarian
 # Yerevan
 # Oct 2021
 ---
 outlines:
-    default:       { width: 35.33, height: 52 }
-    altline:       { width: 52.67, height: 52 }
-    wide:          { width: 32,    height: 32 }
-    change-view:   { width: 52.67, height: 52 }
-    change-view-2: { width: 32,    height: 32 }
-    spaceline:     { width: 142,   height: 52 }
-    special:       { width: 44,    height: 52 }
+    default:       { width: 34.3, height: 52 }
+    altline:       { width: 52,   height: 52 }
+    wide:          { width: 52,   height: 52 }
+    change-view:   { width: 52,   height: 52 }
+    spaceline:     { width: 255,  height: 52 }
+    special:       { width: 44,   height: 52 }
+    large:         { width: 44,   height: 52 }
+    placeholder:   { width: 34.3, height: 52 }
 
 views:
     base:
         - "՝ ֆ ձ ֊ , ։ ՞ ․ ՛ ) օ է ղ"
         - "ճ փ բ ս մ ո ւ կ ը թ ծ ց »"
-        - "ջ վ գ ե ա ն ի տ հ պ ր"
+        - "-- ջ վ գ ե ա ն ի տ հ պ ր --"
         - "Shift_L ժ դ չ յ զ լ ք խ շ ռ BackSpace"
         - "show_numbers preferences         space        . Return"
     upper:
         - "՜ Ֆ Ձ — $ … ՟ և ՚ ( Օ Է Ղ"
         - "Ճ Փ Բ Ս Մ Ո Ւ Կ Ը Թ Ծ Ց «"
-        - "Ջ Վ Գ Ե Ա Ն Ի Տ Հ Պ Պ Ր"
+        - "-- Ջ Վ Գ Ե Ա Ն Ի Տ Հ Պ Պ Ր"
         - "Shift_L Ժ Դ Չ Յ Զ Լ Ք Խ Շ Ռ BackSpace"
         - "show_numbers preferences         space        . Return"
     numbers:
-        - "show_symbols   , \" ' : ; ! ?  BackSpace"
-        - "ﬓ  ﬔ  ﬕ  ﬖ  ﬗ   ՟ և"
-        - "1 2 3 4 5 6 7 8 9 0"
+        - "-- -- -- -- -- -- -- -- --"
+        - "-- ﬓ  ﬔ  ﬕ  ﬖ  ﬗ   ՟ և --"
+        - "-- , \" ' : ; ! ? --"
+        - "show_symbols 1 2 3 4 5 6 7 8 9 0 BackSpace"
         - "show_letters preferences         space        . Return"
     symbols:
-        - "show_numbers_from_symbols   \\ % < > = [ ]  BackSpace"
-        - "* # $ / & - _ + ( )"
-        - "© ® £ € ¥ ^ ° @ { }"
-        - "~ ` | · √ π τ ÷ × ¶"
+        - "* # \\ % < > = [ ]"
+        - "© $ / & - _ + ( )"
+        - "® £ € ¥ ^ ° @ { }"
+        - "show_numbers ~ ` | · √ π τ ÷ × ¶ BackSpace"
         - "show_letters preferences         space        . Return"
 
 buttons:
@@ -53,11 +55,6 @@ buttons:
         outline: "special"
         icon: "keyboard-mode-symbolic"
     show_numbers:
-        action:
-            set_view: "numbers"
-        outline: "change-view-2"
-        label: "123"
-    show_numbers_from_symbols:
         action:
             set_view: "numbers"
         outline: "change-view"
@@ -65,7 +62,7 @@ buttons:
     show_letters:
         action:
             set_view: "base"
-        outline: "change-view-2"
+        outline: "change-view"
         label: "ԱԲԳ"
     show_symbols:
         action:
@@ -73,7 +70,7 @@ buttons:
         outline: "change-view"
         label: "*/="
     .:
-        outline: "special"
+        outline: "large"
     space:
         outline: "spaceline"
         text: " "
@@ -81,3 +78,6 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
+    --:
+        outline: "placeholder"
+        text: ""
\ No newline at end of file
diff --git a/data/keyboards/am_wide.yaml b/data/keyboards/am_wide.yaml
index 355cb53c..70c77707 100644
--- a/data/keyboards/am_wide.yaml
+++ b/data/keyboards/am_wide.yaml
@@ -1,39 +1,41 @@
-# Armenian layout created by Norayr Chilingarian
+# Armenian layout based on work by Norayr Chilingarian
 # Yerevan
 # Oct 2021
 ---
 outlines:
-    default:       { width: 50,     height: 42 }
-    altline:       { width: 74.54,  height: 42 }
-    wide:          { width: 45.29,  height: 32 }
-    change-view:   { width: 74.54,  height: 42 }
-    change-view-2: { width: 45.29,  height: 32 }
-    spaceline:     { width: 200.96, height: 42 }
-    special:       { width: 62.27,  height: 42 }
+    default:     { width: 51.7,   height: 42 }
+    altline:     { width: 77.5,   height: 42 }
+    wide:        { width: 77.5,   height: 42 }
+    change-view: { width: 77.5,   height: 42 }
+    spaceline:   { width: 392,    height: 42 }
+    special:     { width: 62.27,  height: 42 }
+    large:       { width: 62.27,  height: 42 }
+    placeholder: { width: 51.7,   height: 42 }
 
 views:
     base:
         - "՝ ֆ ձ ֊ , ։ ՞ ․ ՛ ) օ է ղ"
         - "ճ փ բ ս մ ո ւ կ ը թ ծ ց »"
-        - "ջ վ գ ե ա ն ի տ հ պ ր"
+        - "-- ջ վ գ ե ա ն ի տ հ պ ր --"
         - "Shift_L ժ դ չ յ զ լ ք խ շ ռ BackSpace"
         - "show_numbers preferences         space        . Return"
     upper:
         - "՜ Ֆ Ձ — $ … ՟ և ՚ ( Օ Է Ղ"
         - "Ճ Փ Բ Ս Մ Ո Ւ Կ Ը Թ Ծ Ց «"
-        - "Ջ Վ Գ Ե Ա Ն Ի Տ Հ Պ Պ Ր"
+        - "-- Ջ Վ Գ Ե Ա Ն Ի Տ Հ Պ Պ Ր"
         - "Shift_L Ժ Դ Չ Յ Զ Լ Ք Խ Շ Ռ BackSpace"
         - "show_numbers preferences         space        . Return"
     numbers:
-        - "show_symbols   , \" ' : ; ! ?  BackSpace"
-        - "ﬓ  ﬔ  ﬕ  ﬖ  ﬗ   ՟ և"
-        - "1 2 3 4 5 6 7 8 9 0"
+        - "-- -- -- -- -- -- -- -- --"
+        - "-- ﬓ  ﬔ  ﬕ  ﬖ  ﬗ   ՟ և --"
+        - "-- , \" ' : ; ! ? --"
+        - "show_symbols 1 2 3 4 5 6 7 8 9 0 BackSpace"
         - "show_letters preferences         space        . Return"
     symbols:
-        - "show_numbers_from_symbols   \\ % < > = [ ]  BackSpace"
-        - "* # $ / & - _ + ( )"
-        - "© ® £ € ¥ ^ ° @ { }"
-        - "~ ` | · √ π τ ÷ × ¶"
+        - "* # \\ % < > = [ ]"
+        - "© $ / & - _ + ( )"
+        - "® £ € ¥ ^ ° @ { }"
+        - "show_numbers ~ ` | · √ π τ ÷ × ¶ BackSpace"
         - "show_letters preferences         space        . Return"
 
 buttons:
@@ -53,11 +55,6 @@ buttons:
         outline: "special"
         icon: "keyboard-mode-symbolic"
     show_numbers:
-        action:
-            set_view: "numbers"
-        outline: "change-view-2"
-        label: "123"
-    show_numbers_from_symbols:
         action:
             set_view: "numbers"
         outline: "change-view"
@@ -65,7 +62,7 @@ buttons:
     show_letters:
         action:
             set_view: "base"
-        outline: "change-view-2"
+        outline: "change-view"
         label: "ԱԲԳ"
     show_symbols:
         action:
@@ -73,7 +70,7 @@ buttons:
         outline: "change-view"
         label: "*/="
     .:
-        outline: "special"
+        outline: "large"
     space:
         outline: "spaceline"
         text: " "
@@ -81,3 +78,6 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
+    --:
+        outline: "placeholder"
+        text: ""
\ No newline at end of file
diff --git a/data/keyboards/ara.yaml b/data/keyboards/ara.yaml
index 920e09bb..086557d1 100644
--- a/data/keyboards/ara.yaml
+++ b/data/keyboards/ara.yaml
@@ -1,13 +1,14 @@
 # Maintained by: Khaled Eldoheiri <khalid@kdehairy.com>
 ---
 outlines:
-    default:       { width: 32.66,  height: 52 }
+    default:       { width: 32.95,   height: 52 }
     altline:       { width: 48.99,  height: 52 }
     wide:          { width: 62,     height: 52 }
     change-view:   { width: 48.99,  height: 52 }
     change-view-2: { width: 62,     height: 52 }
-    spaceline:     { width: 195.96, height: 52 }
+    spaceline:     { width: 195.65, height: 52 }
     special:       { width: 35.66,  height: 52 }
+    fill:          { width: 65.32,  height: 52 }
 
 views:
     base:
@@ -69,3 +70,15 @@ buttons:
         outline: "altline"
         icon: "key-enter"
         keysym: "Return"
+    5:
+        outline: "fill"
+    "&":
+        outline: "fill"
+    ":":
+        outline: "fill"
+    √:
+        outline: "fill"
+    ¥:
+        outline: "fill"
+    ">":
+        outline: "fill"
\ No newline at end of file
diff --git a/data/keyboards/ara_wide.yaml b/data/keyboards/ara_wide.yaml
index b13a56cf..94bf025f 100644
--- a/data/keyboards/ara_wide.yaml
+++ b/data/keyboards/ara_wide.yaml
@@ -6,8 +6,9 @@ outlines:
     wide:          { width: 108,  height: 42 }
     change-view:   { width: 73.5, height: 42 }
     change-view-2: { width: 108,  height: 42 }
-    spaceline:     { width: 324,  height: 42 }
+    spaceline:     { width: 295,  height: 42 }
     special:       { width: 49,   height: 42 }
+    fill:          { width: 98,   height: 42 }
 
 views:
     base:
@@ -69,3 +70,21 @@ buttons:
         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: ">"
\ No newline at end of file
diff --git a/data/keyboards/be.yaml b/data/keyboards/be.yaml
index f702e7fa..03d1e3c3 100644
--- a/data/keyboards/be.yaml
+++ b/data/keyboards/be.yaml
@@ -1,12 +1,12 @@
 ---
 outlines:
-    default:       { width: 35.33, height: 52 }
-    altline:       { width: 52.67, height: 52 }
-    wide:          { width: 59,    height: 52 }
-    change-view:   { width: 52.67, height: 52 }
-    change-view-2: { width: 59,    height: 52 }
-    spaceline:     { width: 140,   height: 52 }
-    special:       { width: 44,    height: 52 }
+    default:       { width: 35.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:
diff --git a/data/keyboards/bg+phonetic.yaml b/data/keyboards/bg+phonetic.yaml
index 1e01148f..954ca656 100644
--- a/data/keyboards/bg+phonetic.yaml
+++ b/data/keyboards/bg+phonetic.yaml
@@ -1,12 +1,13 @@
 ---
 outlines:
     default:       { width: 32.72, height: 52 }
-    altline:       { width: 47,    height: 52 }
-    wide:          { width: 49.09, height: 52 }
-    change-view:   { width: 47,    height: 52 }
-    change-view-2: { width: 49.09, height: 52 }
+    altline:       { width: 50.12, height: 52 }
+    wide:          { width: 50.12, height: 52 }
+    change-view:   { width: 50.12, height: 52 }
     spaceline:     { width: 185,   height: 52 }
     special:       { width: 44,    height: 52 }
+    placeholder:   { width: 32.72, height: 52 }
+    fill:          { width: 65.44, height: 52 }
 
 views:
     base:
@@ -22,13 +23,13 @@ views:
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # € % & - _ + ( )"
-        - "show_symbols   , \" ' : ; ! ?  BackSpace"
-        - "show_letters preferences         space        Return"
+        - "show_symbols -- , \" ' : ; ! ?  BackSpace"
+        - "show_letters preferences         space    .    Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ $ ¥ ^ ° * { }"
-        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        Return"
+        - "show_numbers_from_symbols -- \\ / < > = [ ]  BackSpace"
+        - "show_letters preferences         space    ,    Return"
 
 
 buttons:
@@ -50,7 +51,7 @@ buttons:
     show_numbers:
         action:
             set_view: "numbers"
-        outline: "change-view-2"
+        outline: "change-view"
         label: "123"
     show_numbers_from_symbols:
         action:
@@ -60,7 +61,7 @@ buttons:
     show_letters:
         action:
             set_view: "base"
-        outline: "change-view-2"
+        outline: "change-view"
         label: "ABC"
     show_symbols:
         action:
@@ -74,3 +75,14 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
+    --:
+        outline: "placeholder"
+        text: ""
+    5:
+        outline: "fill"
+    "&":
+        outline: "fill"
+    √:
+        outline: "fill"
+    ¥:
+        outline: "fill"
\ No newline at end of file
diff --git a/data/keyboards/bg+phonetic_wide.yaml b/data/keyboards/bg+phonetic_wide.yaml
index cb04408b..7c5b4051 100644
--- a/data/keyboards/bg+phonetic_wide.yaml
+++ b/data/keyboards/bg+phonetic_wide.yaml
@@ -1,12 +1,13 @@
 ---
 outlines:
-    default:       { width: 48,     height: 42 }
-    altline:       { width: 68.95,  height: 42 }
-    wide:          { width: 72.01,  height: 42 }
-    change-view:   { width: 68.95,  height: 42 }
-    change-view-2: { width: 72.01,  height: 42 }
-    spaceline:     { width: 271.39, height: 42 }
-    special:       { width: 64.55,  height: 42 }
+    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:
@@ -27,7 +28,7 @@ views:
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ $ ¥ ^ ° * { }"
-        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
+        - "show_numbers   \\ / < > = [ ]  BackSpace"
         - "show_letters preferences         space        Return"
 
 
@@ -48,11 +49,6 @@ buttons:
         outline: "special"
         icon: "keyboard-mode-symbolic"
     show_numbers:
-        action:
-            set_view: "numbers"
-        outline: "change-view-2"
-        label: "123"
-    show_numbers_from_symbols:
         action:
             set_view: "numbers"
         outline: "change-view"
@@ -60,7 +56,7 @@ buttons:
     show_letters:
         action:
             set_view: "base"
-        outline: "change-view-2"
+        outline: "change-view"
         label: "ABC"
     show_symbols:
         action:
@@ -74,3 +70,14 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
+    --:
+        outline: "placeholder"
+        text: ""
+    5:
+        outline: "fill"
+    "&":
+        outline: "fill"
+    √:
+        outline: "fill"
+    ¥:
+        outline: "fill"
\ No newline at end of file
diff --git a/data/keyboards/bg.yaml b/data/keyboards/bg.yaml
index fe280ede..a3b7dbcf 100644
--- a/data/keyboards/bg.yaml
+++ b/data/keyboards/bg.yaml
@@ -1,12 +1,13 @@
 ---
 outlines:
     default:       { width: 32.72, height: 52 }
-    altline:       { width: 47,    height: 52 }
-    wide:          { width: 49.09, height: 52 }
-    change-view:   { width: 47,    height: 52 }
-    change-view-2: { width: 49.09, height: 52 }
+    altline:       { width: 50.12, height: 52 }
+    wide:          { width: 50.12, height: 52 }
+    change-view:   { width: 50.12, height: 52 }
     spaceline:     { width: 185,   height: 52 }
     special:       { width: 44,    height: 52 }
+    placeholder:   { width: 32.72, height: 52 }
+    fill:          { width: 65.44, height: 52 }
 
 views:
     base:
@@ -23,12 +24,12 @@ views:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # € % & - _ + ( )"
         - "show_symbols , \" ' : ; ! ? ѝ BackSpace"
-        - "show_letters preferences         space        Return"
+        - "show_letters preferences         space    .    Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ $ ¥ ^ ° * { }"
-        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        Return"
+        - "show_numbers -- \\ / < > = [ ] BackSpace"
+        - "show_letters preferences         space    ,    Return"
 
 
 buttons:
@@ -48,11 +49,6 @@ buttons:
         outline: "special"
         icon: "keyboard-mode-symbolic"
     show_numbers:
-        action:
-            set_view: "numbers"
-        outline: "change-view-2"
-        label: "123"
-    show_numbers_from_symbols:
         action:
             set_view: "numbers"
         outline: "change-view"
@@ -60,7 +56,7 @@ buttons:
     show_letters:
         action:
             set_view: "base"
-        outline: "change-view-2"
+        outline: "change-view"
         label: "ABC"
     show_symbols:
         action:
@@ -74,3 +70,14 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
+    --:
+        outline: "placeholder"
+        text: ""
+    5:
+        outline: "fill"
+    "&":
+        outline: "fill"
+    √:
+        outline: "fill"
+    ¥:
+        outline: "fill"
\ No newline at end of file
diff --git a/data/keyboards/bg_wide.yaml b/data/keyboards/bg_wide.yaml
index 68f57829..214364bd 100644
--- a/data/keyboards/bg_wide.yaml
+++ b/data/keyboards/bg_wide.yaml
@@ -1,12 +1,13 @@
 ---
 outlines:
-    default:       { width: 48,     height: 42 }
-    altline:       { width: 68.95,  height: 42 }
-    wide:          { width: 72.01,  height: 42 }
-    change-view:   { width: 68.95,  height: 42 }
-    change-view-2: { width: 72.01,  height: 42 }
-    spaceline:     { width: 271.39, height: 42 }
-    special:       { width: 64.55,  height: 42 }
+    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:
@@ -23,12 +24,12 @@ views:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # € % & - _ + ( )"
         - "show_symbols , \" ' : ; ! ? ѝ BackSpace"
-        - "show_letters preferences         space        Return"
+        - "show_letters preferences         space    .    Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ $ ¥ ^ ° * { }"
-        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        Return"
+        - "show_numbers -- \\ / < > = [ ]  BackSpace"
+        - "show_letters preferences         space    ,    Return"
 
 
 buttons:
@@ -48,11 +49,6 @@ buttons:
         outline: "special"
         icon: "keyboard-mode-symbolic"
     show_numbers:
-        action:
-            set_view: "numbers"
-        outline: "change-view-2"
-        label: "123"
-    show_numbers_from_symbols:
         action:
             set_view: "numbers"
         outline: "change-view"
@@ -60,7 +56,7 @@ buttons:
     show_letters:
         action:
             set_view: "base"
-        outline: "change-view-2"
+        outline: "change-view"
         label: "ABC"
     show_symbols:
         action:
@@ -74,3 +70,14 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
+    --:
+        outline: "placeholder"
+        text: ""
+    5:
+        outline: "fill"
+    "&":
+        outline: "fill"
+    √:
+        outline: "fill"
+    ¥:
+        outline: "fill"
\ No newline at end of file
diff --git a/data/keyboards/ca.yaml b/data/keyboards/ca.yaml
index 83aa6b17..66b5d1d6 100644
--- a/data/keyboards/ca.yaml
+++ b/data/keyboards/ca.yaml
@@ -1,12 +1,13 @@
 ---
 outlines:
-    default:       { width: 35.33, height: 52 }
-    altline:       { width: 52.67, height: 52 }
+    default:       { width: 35.5,  height: 52 }
+    altline:       { width: 53.5,  height: 52 }
     wide:          { width: 62,    height: 52 }
-    change-view:   { width: 52.67, height: 52 }
+    change-view:   { width: 53.5,  height: 52 }
     change-view-2: { width: 62,    height: 52 }
-    spaceline:     { width: 142,   height: 52 }
+    spaceline:     { width: 135,   height: 52 }
     special:       { width: 44,    height: 52 }
+    placeholder:   { width: 36,    height: 52 }
 
 views:
     base:
@@ -32,7 +33,7 @@ views:
     eschars:
         - "à â ç é è ê ë î ï ô"
         - "ù û À Â Ç É È Ê Î Ô"
-        - "show_numbers_from_symbols  ' ! ? . ,   BackSpace"
+        - "show_numbers_from_symbols -- ' ! ? . , -- BackSpace"
         - "show_letters preferences         space        show_eschars Return"
 
 buttons:
@@ -85,6 +86,6 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-
-
-
+    --:
+        outline: "placeholder"
+        text: ""
\ No newline at end of file
diff --git a/data/keyboards/ca_wide.yaml b/data/keyboards/ca_wide.yaml
index 52ded1e1..e79791e9 100644
--- a/data/keyboards/ca_wide.yaml
+++ b/data/keyboards/ca_wide.yaml
@@ -1,12 +1,13 @@
 ---
 outlines:
-    default:       { width: 52,    height: 42 }
-    altline:       { width: 77.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: 209,   height: 42 }
-    special:       { width: 64.76, height: 42 }
+    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:
@@ -32,7 +33,7 @@ views:
     eschars:
         - "à â ç é è ê ë î ï ô"
         - "ù û À Â Ç É È Ê Î Ô"
-        - "show_numbers_from_symbols  ' ! ? . ,   BackSpace"
+        - "show_numbers_from_symbols -- ' ! ? . , -- BackSpace"
         - "show_letters preferences         space        show_eschars Return"
 
 buttons:
@@ -85,6 +86,6 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-
-
-
+    --:
+        outline: "placeholder"
+        text: ""
\ No newline at end of file
diff --git a/data/keyboards/ch+fr.yaml b/data/keyboards/ch+fr.yaml
index 0601d5d1..7088886c 100644
--- a/data/keyboards/ch+fr.yaml
+++ b/data/keyboards/ch+fr.yaml
@@ -1,12 +1,12 @@
 # Maintained by: Jordi Bossy <jordi@bossy.space>. No Copyright, enjoy!
 ---
 outlines:
-    default:       { width: 35.33, height: 52 }
-    altline:       { width: 48,    height: 52 }
+    default:       { width: 35.67, height: 52 }
+    altline:       { width: 53.5,  height: 52 }
     wide:          { width: 59,    height: 52 }
-    change-view:   { width: 48,    height: 52 }
+    change-view:   { width: 53.5,  height: 52 }
     change-view-2: { width: 59,    height: 52 }
-    spaceline:     { width: 70,    height: 52 }
+    spaceline:     { width: 57,    height: 52 }
     special:       { width: 28,    height: 52 }
 
 views:
@@ -34,7 +34,7 @@ views:
         - "à â ç é è ê î ô ù û"
         - "À Â Ç É È Ê Î Ô Ù Û"
         - "show_numbers  æ œ ä ë ï ö ü  BackSpace"
-        - "show_letters show_eschars preferences  ñ Ñ   space        ° ß Return"
+        - "show_letters show_eschars preferences ' space        ° ß Return"
 
 buttons:
     Shift_L:
@@ -80,4 +80,4 @@ buttons:
     Return:
         outline: "wide"
         icon: "key-enter"
-        keysym: "Return"
+        keysym: "Return"
\ No newline at end of file
diff --git a/data/keyboards/ch+fr_wide.yaml b/data/keyboards/ch+fr_wide.yaml
index f8c9ba1b..dc7763ac 100644
--- a/data/keyboards/ch+fr_wide.yaml
+++ b/data/keyboards/ch+fr_wide.yaml
@@ -1,13 +1,14 @@
 # Maintained by: Jordi Bossy <jordi@bossy.space>. No Copyright, enjoy!
 ---
 outlines:
-    default:       { width: 52,     height: 42 }
-    altline:       { width: 70.65,  height: 42 }
-    wide:          { width: 86.84,  height: 42 }
-    change-view:   { width: 70.65,  height: 42 }
-    change-view-2: { width: 86.84,  height: 42 }
-    spaceline:     { width: 103.03, height: 42 }
-    special:       { width: 41.21,  height: 42 }
+    default:       { width: 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:
@@ -29,12 +30,12 @@ views:
         - "€ $ £ ¥ % | § µ [ ]"
         - "© ® § ` ^ { } · ¡ ¿"
         - "show_numbers  « » ÷ × “ ” „ BackSpace"
-        - "show_letters show_eschars preferences    -   space        , . Return"
+        - "show_letters show_eschars preferences    --thin   space        , . Return"
     eschars:
         - "à â ç é è ê î ô ù û"
         - "À Â Ç É È Ê Î Ô Ù Û"
         - "show_numbers  æ œ ä ë ï ö ü  BackSpace"
-        - "show_letters show_eschars preferences  ñ Ñ   space        ° ß Return"
+        - "show_letters show_eschars preferences ' space        ° ß Return"
 
 buttons:
     Shift_L:
@@ -81,3 +82,20 @@ buttons:
         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"
\ No newline at end of file
diff --git a/data/keyboards/ch.yaml b/data/keyboards/ch.yaml
index cd4878fe..5557e2fd 100644
--- a/data/keyboards/ch.yaml
+++ b/data/keyboards/ch.yaml
@@ -9,8 +9,8 @@ outlines:
     wide:          { width: 64.9,   height: 58 }
     change-view:   { width: 52.8,   height: 58 }
     change-view-2: { width: 64.9,   height: 58 }
-    spaceline:     { width: 116.67, height: 58 }
-    special:       { width: 30.41,  height: 58 }
+    spaceline:     { width: 111.75, height: 58 }
+    special:       { width: 35.33,  height: 58 }
 
 views:
     base:
diff --git a/data/keyboards/cz+qwerty.yaml b/data/keyboards/cz+qwerty.yaml
index 20626585..0576f9e8 100644
--- a/data/keyboards/cz+qwerty.yaml
+++ b/data/keyboards/cz+qwerty.yaml
@@ -7,38 +7,39 @@ outlines:
     spaceline:     { width: 106,   height: 52 }
     special:       { width: 35.33, height: 52 }
     change-view-2: { width: 35.33, height: 52 }
+    placeholder:   { width: 35.33, height: 52 }
 
 views:
     base:
         - "q w e r t y u i o p"
         - "a s d f g h j k l"
         - "Shift_L    z x c v b n m    BackSpace"
-        - "show_numbers preferences show_accents    space    , . Return"
+        - "show_numbers show_accents preferences     space    , . Return"
     upper:
         - "Q W E R T Y U I O P"
         - "A S D F G H J K L"
         - "Shift_L    Z X C V B N M    BackSpace"
-        - "show_numbers preferences show_upper_accents    space    ! ? Return"
+        - "show_numbers show_upper_accents preferences     space    ! ? Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
         - "show_symbols    , \" ' : ; ! ?    BackSpace"
-        - "show_letters preferences show_accents    space    , . Return"
+        - "show_letters show_accents preferences     space    , . Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
         - "show_numbers    \\ / < > = [ ]    BackSpace"
-        - "show_letters preferences show_accents    space    , . Return"
+        - "show_letters show_accents preferences     space    , . Return"
     accents:
         - "ä ě é ř ť ý ů í ó ö"
-        - "á š ď ë ŕ ú ü ô ľ"
+        - "á š ď ë ŕ ú ü ô ľ --"
         - "accents_Shift_L    ž ß č ç ñ ň ĺ    BackSpace"
-        - "show_letters preferences show_accents    space    , . Return"
+        - "show_letters show_accents preferences     space    , . Return"
     upper_accents:
         - "Ä Ě É Ř Ť Ý Ů Í Ó Ö"
-        - "Á Š Ď Ë Ŕ Ú Ü Ô Ľ"
+        - "Á Š Ď Ë Ŕ Ú Ü Ô Ľ --"
         - "accents_Shift_L    Ž ẞ Č Ç Ñ Ň Ĺ    BackSpace"
-        - "show_letters preferences show_upper_accents    space    , . Return"
+        - "show_letters show_upper_accents preferences     space    , . Return"
 
 buttons:
     Shift_L:
@@ -99,3 +100,6 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
+    --:
+        outline: "placeholder"
+        text: ""
\ No newline at end of file
diff --git a/data/keyboards/cz+qwerty_wide.yaml b/data/keyboards/cz+qwerty_wide.yaml
index c94bd7c0..dd5e3d8c 100644
--- a/data/keyboards/cz+qwerty_wide.yaml
+++ b/data/keyboards/cz+qwerty_wide.yaml
@@ -7,38 +7,39 @@ outlines:
     spaceline:     { width: 162, height: 42 }
     special:       { width: 54,  height: 42 }
     change-view-2: { width: 54,  height: 42 }
+    placeholder:   { width: 54,  height: 42 }
 
 views:
     base:
         - "q w e r t y u i o p"
         - "a s d f g h j k l"
         - "Shift_L    z x c v b n m    BackSpace"
-        - "show_numbers preferences show_accents    space    , . Return"
+        - "show_numbers show_accents preferences     space    , . Return"
     upper:
         - "Q W E R T Y U I O P"
         - "A S D F G H J K L"
         - "Shift_L    Z X C V B N M    BackSpace"
-        - "show_numbers preferences show_upper_accents    space    ! ? Return"
+        - "show_numbers show_upper_accents preferences     space    ! ? Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
         - "show_symbols    , \" ' : ; ! ?    BackSpace"
-        - "show_letters preferences show_accents    space    , . Return"
+        - "show_letters show_accents preferences     space    , . Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
         - "show_numbers    \\ / < > = [ ]    BackSpace"
-        - "show_letters preferences show_accents    space    , . Return"
+        - "show_letters show_accents preferences     space    , . Return"
     accents:
         - "ä ě é ř ť ý ů í ó ö"
-        - "á š ď ë ŕ ú ü ô ľ"
+        - "á š ď ë ŕ ú ü ô ľ --"
         - "accents_Shift_L    ž ß č ç ñ ň ĺ    BackSpace"
-        - "show_letters preferences show_accents    space    , . Return"
+        - "show_letters show_accents preferences     space    , . Return"
     upper_accents:
         - "Ä Ě É Ř Ť Ý Ů Í Ó Ö"
-        - "Á Š Ď Ë Ŕ Ú Ü Ô Ľ"
+        - "Á Š Ď Ë Ŕ Ú Ü Ô Ľ --"
         - "accents_Shift_L    Ž ẞ Č Ç Ñ Ň Ĺ    BackSpace"
-        - "show_letters preferences show_upper_accents    space    , . Return"
+        - "show_letters show_upper_accents preferences     space    , . Return"
 
 buttons:
     Shift_L:
@@ -99,3 +100,6 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
+    --:
+        outline: "placeholder"
+        text: ""
\ No newline at end of file
diff --git a/data/keyboards/cz.yaml b/data/keyboards/cz.yaml
index a7b8f201..fb3da973 100644
--- a/data/keyboards/cz.yaml
+++ b/data/keyboards/cz.yaml
@@ -7,38 +7,39 @@ outlines:
     spaceline:     { width: 106,   height: 52 }
     special:       { width: 35.33, height: 52 }
     change-view-2: { width: 35.33, height: 52 }
+    placeholder:   { width: 35.33, height: 52 }
 
 views:
     base:
         - "q w e r t z u i o p"
         - "a s d f g h j k l"
         - "Shift_L    y x c v b n m    BackSpace"
-        - "show_numbers preferences show_accents    space    , . Return"
+        - "show_numbers show_accents preferences     space    , . Return"
     upper:
         - "Q W E R T Z U I O P"
         - "A S D F G H J K L"
         - "Shift_L    Y X C V B N M    BackSpace"
-        - "show_numbers preferences show_upper_accents    space    ! ? Return"
+        - "show_numbers show_upper_accents preferences     space    ! ? Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
         - "show_symbols    , \" ' : ; ! ?    BackSpace"
-        - "show_letters preferences show_accents    space    , . Return"
+        - "show_letters show_accents preferences     space    , . Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
         - "show_numbers    \\ / < > = [ ]    BackSpace"
-        - "show_letters preferences show_accents    space    , . Return"
+        - "show_letters show_accents preferences     space    , . Return"
     accents:
         - "ä ě é ř ť ž ů í ó ö"
-        - "á š ď ë ŕ ú ü ô ľ"
+        - "á š ď ë ŕ ú ü ô ľ --"
         - "accents_Shift_L    ý ß č ç ñ ň ĺ    BackSpace"
-        - "show_letters preferences show_accents    space    , . Return"
+        - "show_letters show_accents preferences     space    , . Return"
     upper_accents:
         - "Ä Ě É Ř Ť Ž Ů Í Ó Ö"
-        - "Á Š Ď Ë Ŕ Ú Ü Ô Ľ"
+        - "Á Š Ď Ë Ŕ Ú Ü Ô Ľ --"
         - "accents_Shift_L    Ý ẞ Č Ç Ñ Ň Ĺ    BackSpace"
-        - "show_letters preferences show_upper_accents    space    , . Return"
+        - "show_letters show_upper_accents preferences     space    , . Return"
 
 buttons:
     Shift_L:
@@ -99,3 +100,6 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
+    --:
+        outline: "placeholder"
+        text: ""
\ No newline at end of file
diff --git a/data/keyboards/cz_wide.yaml b/data/keyboards/cz_wide.yaml
index c29af92c..f8b8d7a1 100644
--- a/data/keyboards/cz_wide.yaml
+++ b/data/keyboards/cz_wide.yaml
@@ -7,38 +7,39 @@ outlines:
     spaceline:     { width: 162, height: 42 }
     special:       { width: 54,  height: 42 }
     change-view-2: { width: 54,  height: 42 }
+    placeholder:   { width: 54,  height: 42 }
 
 views:
     base:
         - "q w e r t z u i o p"
         - "a s d f g h j k l"
         - "Shift_L    y x c v b n m    BackSpace"
-        - "show_numbers preferences show_accents    space    , . Return"
+        - "show_numbers show_accents preferences     space    , . Return"
     upper:
         - "Q W E R T Z U I O P"
         - "A S D F G H J K L"
         - "Shift_L    Y X C V B N M    BackSpace"
-        - "show_numbers preferences show_upper_accents    space    ! ? Return"
+        - "show_numbers show_upper_accents preferences     space    ! ? Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
         - "show_symbols    , \" ' : ; ! ?    BackSpace"
-        - "show_letters preferences show_accents    space    , . Return"
+        - "show_letters show_accents preferences     space    , . Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
         - "show_numbers    \\ / < > = [ ]    BackSpace"
-        - "show_letters preferences show_accents    space    , . Return"
+        - "show_letters show_accents preferences     space    , . Return"
     accents:
         - "ä ě é ř ť ž ů í ó ö"
-        - "á š ď ë ŕ ú ü ô ľ"
+        - "á š ď ë ŕ ú ü ô ľ --"
         - "accents_Shift_L    ý ß č ç ñ ň ĺ    BackSpace"
-        - "show_letters preferences show_accents    space    , . Return"
+        - "show_letters show_accents preferences     space    , . Return"
     upper_accents:
         - "Ä Ě É Ř Ť Ž Ů Í Ó Ö"
-        - "Á Š Ď Ë Ŕ Ú Ü Ô Ľ"
+        - "Á Š Ď Ë Ŕ Ú Ü Ô Ľ --"
         - "accents_Shift_L    Ý ẞ Č Ç Ñ Ň Ĺ    BackSpace"
-        - "show_letters preferences show_upper_accents    space    , . Return"
+        - "show_letters show_upper_accents preferences     space    , . Return"
 
 buttons:
     Shift_L:
@@ -99,3 +100,6 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
+    --:
+        outline: "placeholder"
+        text: ""
\ No newline at end of file
diff --git a/data/keyboards/de.yaml b/data/keyboards/de.yaml
index 6febbc95..ef26f98a 100644
--- a/data/keyboards/de.yaml
+++ b/data/keyboards/de.yaml
@@ -30,7 +30,7 @@ views:
         - "show_letters show_eschars preferences         space        , . Return"
     eschars:
         - "ä è é ö ü Ä È É Ö Ü"
-        - "à â ê î ô À Â È Î Ô"
+        - "à â ê î ô À Â Ê Î Ô"
         - "show_numbers  « » ç Ç æ œ ß-subtle-highlight  BackSpace"
         - "show_letters show_eschars preferences         space        „ “ Return"
 
diff --git a/data/keyboards/de_wide.yaml b/data/keyboards/de_wide.yaml
index b59717f5..e605193b 100644
--- a/data/keyboards/de_wide.yaml
+++ b/data/keyboards/de_wide.yaml
@@ -1,14 +1,17 @@
 ---
 outlines:
-    default:          { width: 48,   height: 42 }
-    subtle-highlight: { width: 48,   height: 42 }
-    halfwidth:        { width: 24,   height: 42 }
-    thin:             { width: 30,   height: 42 }
-    narrow:           { width: 40.5, height: 42 }
-    altline:          { width: 81,   height: 42 }
-    change-view:      { width: 81,   height: 42 }
-    spaceline:        { width: 156,  height: 42 }
-    special:          { width: 48,   height: 42 }
+    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:
@@ -24,17 +27,17 @@ views:
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # € % & - _ + ( )"
-        - "show_symbols   ; \" ' : = < >  BackSpace"
+        - "show_symbols   ; \" ' : = < > -- BackSpace"
         - "show_letters show_eschars preferences         space        ,-narrow .-narrow Return"
     symbols:
         - "~ ` ´ | · √ µ ÷ × ¶"
         - "© ® £ $ ¥ ^ ° * { }"
-        - "show_numbers   \\ / § π τ [ ]  BackSpace"
+        - "show_numbers   \\ / § π τ [ ] -- BackSpace"
         - "show_letters show_eschars preferences         space        ,-narrow .-narrow Return"
     eschars:
-        - "ä-subtle-highlight è é ö-subtle-highlight ü-subtle-highlight Ä-subtle-highlight È É Ö-subtle-highlight Ü-subtle-highlight"
-        - "à â ê î ô À Â È Î Ô"
-        - "show_numbers  « » ç Ç æ œ ß-subtle-highlight  BackSpace"
+        - "ä-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:
@@ -110,8 +113,8 @@ buttons:
     ö-subtle-highlight:
         outline: "subtle-highlight"
         text: "ö"
-    ü-subtle-highlight:
-        outline: "subtle-highlight"
+    ü-subtle-highlight-2:
+        outline: "subtle-highlight-2"
         text: "ü"
     Ä-subtle-highlight:
         outline: "subtle-highlight"
@@ -125,3 +128,16 @@ buttons:
     ß-subtle-highlight:
         outline: "subtle-highlight"
         text: "ß"
+    --:
+        outline: "placeholder"
+        text: ""
+    5:
+        outline: "fill"
+    "&":
+        outline: "fill"
+    ·:
+        outline: "fill"
+    ¥:
+        outline: "fill"
+    ô:
+        outline: "fill"
\ No newline at end of file
diff --git a/data/keyboards/dk.yaml b/data/keyboards/dk.yaml
index 3f5ffc72..d625a057 100644
--- a/data/keyboards/dk.yaml
+++ b/data/keyboards/dk.yaml
@@ -1,31 +1,35 @@
 ---
 outlines:
-    default:     { width: 32,       height: 52 }
-    altline:     { width: 48.39024, height: 52 }
-    wide:        { width: 62,       height: 52 }
-    change-view: { width: 48.39024, height: 52 }
-    spaceline:   { width: 150.5853, height: 52 }
+    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 }
+    spaceline:   { width: 150,    height: 52 }
+    special:     { width: 48,     height: 52 }
+    placeholder: { width: 32,     height: 52 }
+    fill:        { width: 64,     height: 52 }
 
 views:
     base:
         - "q w e r t y u i o p å"
         - "a s d f g h j k l ø æ"
-        - "Shift_L   z x c v b n m  BackSpace"
+        - "Shift_L   z x c v b n m , BackSpace"
         - "show_numbers preferences         space        .    Return"
     upper:
         - "Q W E R T Y U I O P Å"
         - "A S D F G H J K L Ø Æ"
-        - "Shift_L   Z X C V B N M  BackSpace"
+        - "Shift_L   Z X C V B N M , BackSpace"
         - "show_numbers preferences         space        .    Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
-        - "show_symbols   , \" ' : ; ! ?  BackSpace"
+        - "show_symbols -- , \" ' : ; ! ?  BackSpace"
         - "show_letters preferences         space        .    Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers   \\ / < > = [ ]  BackSpace"
+        - "show_numbers -- \\ / < > = [ ]  BackSpace"
         - "show_letters preferences         space        .    Return"
 
 buttons:
@@ -42,7 +46,7 @@ buttons:
         action: "erase"
     preferences:
         action: "show_prefs"
-        outline: "change-view"
+        outline: "special"
         icon: "keyboard-mode-symbolic"
     show_numbers:
         action:
@@ -60,7 +64,7 @@ buttons:
         outline: "change-view"
         label: "*/="
     .:
-        outline: "altline"
+        outline: "large"
     space:
         outline: "spaceline"
         text: " "
@@ -68,3 +72,14 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
+    --:
+        outline: "placeholder"
+        text: ""
+    5:
+        outline: "fill"
+    "&":
+        outline: "fill"
+    √:
+        outline: "fill"
+    ¥:
+        outline: "fill"
\ No newline at end of file
diff --git a/data/keyboards/dk_wide.yaml b/data/keyboards/dk_wide.yaml
index bfa3053d..695e7deb 100644
--- a/data/keyboards/dk_wide.yaml
+++ b/data/keyboards/dk_wide.yaml
@@ -1,31 +1,34 @@
 ---
 outlines:
-    default:     { width: 48,     height: 42 }
-    altline:     { width: 72.58,  height: 42 }
+    default:     { width: 48.87,  height: 42 }
+    altline:     { width: 73.5,   height: 42 }
     wide:        { width: 92.99,  height: 42 }
-    change-view: { width: 72.58,  height: 42 }
-    spaceline:   { width: 225.87, height: 42 }
+    change-view: { width: 73.5,   height: 42 }
+    spaceline:   { width: 273.5,  height: 42 }
+    special:     { width: 48.87,  height: 42 }
+    placeholder: { width: 48.87,  height: 42 }
+    fill:        { width: 97.74,  height: 42 }
 
 views:
     base:
         - "q w e r t y u i o p å"
         - "a s d f g h j k l ø æ"
-        - "Shift_L   z x c v b n m  BackSpace"
+        - "Shift_L   z x c v b n m , BackSpace"
         - "show_numbers preferences         space        .    Return"
     upper:
         - "Q W E R T Y U I O P Å"
         - "A S D F G H J K L Ø Æ"
-        - "Shift_L   Z X C V B N M  BackSpace"
+        - "Shift_L   Z X C V B N M , BackSpace"
         - "show_numbers preferences         space        .    Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
-        - "show_symbols   , \" ' : ; ! ?  BackSpace"
+        - "show_symbols -- , \" ' : ; ! ?  BackSpace"
         - "show_letters preferences         space        .    Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers   \\ / < > = [ ]  BackSpace"
+        - "show_numbers -- \\ / < > = [ ]  BackSpace"
         - "show_letters preferences         space        .    Return"
 
 buttons:
@@ -42,7 +45,7 @@ buttons:
         action: "erase"
     preferences:
         action: "show_prefs"
-        outline: "change-view"
+        outline: "special"
         icon: "keyboard-mode-symbolic"
     show_numbers:
         action:
@@ -59,8 +62,6 @@ buttons:
             set_view: "symbols"
         outline: "change-view"
         label: "*/="
-    .:
-        outline: "altline"
     space:
         outline: "spaceline"
         text: " "
@@ -68,3 +69,14 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
+    --:
+        outline: "placeholder"
+        text: ""
+    5:
+        outline: "fill"
+    "&":
+        outline: "fill"
+    √:
+        outline: "fill"
+    ¥:
+        outline: "fill"
\ No newline at end of file
diff --git a/data/keyboards/emoji/us_wide.yaml b/data/keyboards/emoji/us_wide.yaml
index 7e7febbf..ddbcd04a 100644
--- a/data/keyboards/emoji/us_wide.yaml
+++ b/data/keyboards/emoji/us_wide.yaml
@@ -1,12 +1,12 @@
 ---
 outlines:
-    default:       { width: 104,  height: 52 }
-    placeholder:   { width: 104,  height: 52 }
-    special:       { width: 104,  height: 52 }
-    change-view:   { width: 104,  height: 52 }
-    change-view-2: { width: 72.8, height: 56 }
-    emoji-group:   { width: 104,  height: 52 }
-    placeholder-2: { width: 520,  height: 52 }
+    default:       { width: 97.07,  height: 52 }
+    placeholder:   { width: 97.07,  height: 52 }
+    special:       { width: 97.07,  height: 52 }
+    change-view:   { width: 97.07,  height: 52 }
+    change-view-2: { width: 67.95,  height: 56 }
+    emoji-group:   { width: 97.07,  height: 52 }
+    placeholder-2: { width: 485.33, height: 52 }
 
 views:
     base:
diff --git a/data/keyboards/epo.yaml b/data/keyboards/epo.yaml
index 040c342e..d6ccf222 100644
--- a/data/keyboards/epo.yaml
+++ b/data/keyboards/epo.yaml
@@ -1,19 +1,21 @@
 ---
 outlines:
-    default:       { width: 35.33, height: 52 }
-    altline:       { width: 52.67, height: 52 }
-    wide:          { width: 62,    height: 52 }
-    change-view:   { width: 52.67, height: 52 }
+    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: 99.67, height: 52 }
-    special:       { width: 35.33, height: 52 }
+    spaceline:     { width: 88.75, height: 52 }
+    special:       { width: 35.67, height: 52 }
+    placeholder:   { width: 35.67, height: 52 }
+    large:         { width: 71.34, height: 52 }
 
 views:
     base:
         - "q w e r t y u i o p"
         - "a s d f g h j k l"
         - "Shift_L   z x c v b n m  BackSpace"
-        - "show_numbers show_eschars preferences         space        , . Return"
+        - "show_numbers show_eschars preferences         space        .-large Return"
     upper:
         - "Q W E R T Y U I O P"
         - "A S D F G H J K L"
@@ -23,16 +25,16 @@ views:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
         - "show_symbols   , \" ' : ; ! ?  BackSpace"
-        - "show_letters preferences         space        . Return"
+        - "show_letters show_eschars preferences         space       .-large Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
         - "show_numbers   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        . Return"
+        - "show_letters show_eschars preferences         space       , . Return"
     eschars:
-        - "ĉ ĝ ĥ ĵ ŝ ŭ ?"
-        - "Ĉ Ĝ Ĥ Ĵ Ŝ Ŭ !"
-        - "show_numbers ' - 🐊 💚 🌐 . BackSpace"
+        - "-- -- ĉ ĝ ĥ ĵ ŝ ŭ ? --"
+        - "-- -- Ĉ Ĝ Ĥ Ĵ Ŝ Ŭ ! --"
+        - "show_numbers ' \" - – , . … BackSpace"
         - "show_letters show_eschars preferences         space        „ “ Return"
 
 buttons:
@@ -77,6 +79,12 @@ buttons:
         outline: "spaceline"
         text: " "
     Return:
-        outline: "altline"
+        outline: "wide"
         icon: "key-enter"
         keysym: "Return"
+    --:
+        outline: "placeholder"
+        text: ""
+    .-large:
+        outline: "large"
+        text: "."
\ No newline at end of file
diff --git a/data/keyboards/epo_wide.yaml b/data/keyboards/epo_wide.yaml
index 81c66331..50c71b88 100644
--- a/data/keyboards/epo_wide.yaml
+++ b/data/keyboards/epo_wide.yaml
@@ -1,38 +1,41 @@
 ---
 outlines:
-    default:       { width: 52,    height: 42 }
-    altline:       { width: 77.52, height: 42 }
+    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: 77.52, height: 42 }
+    change-view:   { width: 80.5,  height: 42 }
     change-view-2: { width: 91.25, height: 42 }
-    spaceline:     { width: 146.7, height: 42 }
+    spaceline:     { width: 164,   height: 42 }
     special:       { width: 52,    height: 42 }
+    placeholder:   { width: 53.75, height: 42 }
+    large:         { width: 80,    height: 42 }
 
 views:
     base:
         - "q w e r t y u i o p"
         - "a s d f g h j k l"
         - "Shift_L   z x c v b n m  BackSpace"
-        - "show_numbers show_eschars preferences         space        , . Return"
+        - "show_numbers show_eschars preferences         space        .-large Return"
     upper:
         - "Q W E R T Y U I O P"
         - "A S D F G H J K L"
         - "Shift_L   Z X C V B N M  BackSpace"
-        - "show_numbers show_eschars preferences         space        ! ? Return"
+        - "show_numbers show_eschars preferences         space        !-thin ?-thin Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
         - "show_symbols   , \" ' : ; ! ?  BackSpace"
-        - "show_letters preferences         space        . Return"
+        - "show_letters show_eschars preferences         space       .-large Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
         - "show_numbers   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        . Return"
+        - "show_letters show_eschars preferences         space       ,-thin .-thin Return"
     eschars:
-        - "ĉ ĝ ĥ ĵ ŝ ŭ ?"
-        - "Ĉ Ĝ Ĥ Ĵ Ŝ Ŭ !"
-        - "show_numbers ' - 🐊 💚 🌐 . BackSpace"
+        - "-- -- ĉ ĝ ĥ ĵ ŝ ŭ ? --"
+        - "-- -- Ĉ Ĝ Ĥ Ĵ Ŝ Ŭ ! --"
+        - "show_numbers ' \" - – , . … BackSpace"
         - "show_letters show_eschars preferences         space        „ “ Return"
 
 buttons:
@@ -80,3 +83,25 @@ buttons:
         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"
\ No newline at end of file
diff --git a/data/keyboards/es+cat.yaml b/data/keyboards/es+cat.yaml
index 8271887e..3daf0675 100644
--- a/data/keyboards/es+cat.yaml
+++ b/data/keyboards/es+cat.yaml
@@ -1,12 +1,12 @@
 ---
 outlines:
-    default:       { width: 35.33, height: 52 }
+    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: 99.67, height: 52 }
-    special:       { width: 35.33,    height: 52 }
+    spaceline:     { width: 90,    height: 52 }
+    special:       { width: 35.67, height: 52 }
 
 views:
     base:
diff --git a/data/keyboards/es+cat_wide.yaml b/data/keyboards/es+cat_wide.yaml
index a0d07923..853bc603 100644
--- a/data/keyboards/es+cat_wide.yaml
+++ b/data/keyboards/es+cat_wide.yaml
@@ -1,12 +1,12 @@
 ---
 outlines:
-    default:       { width: 52,     height: 42 }
-    altline:       { width: 77.51,  height: 42 }
-    wide:          { width: 91.25,  height: 42 }
-    change-view:   { width: 77.51,  height: 42 }
-    change-view-2: { width: 91.25,  height: 42 }
-    spaceline:     { width: 146.69, height: 42 }
-    special:       { width: 52,  height: 42 }
+    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:
diff --git a/data/keyboards/es.yaml b/data/keyboards/es.yaml
index 90381ad8..4d6ca4f7 100644
--- a/data/keyboards/es.yaml
+++ b/data/keyboards/es.yaml
@@ -1,12 +1,11 @@
 ---
 outlines:
-    default:       { width: 35.33, height: 52 }
+    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: 99.67, height: 52 }
-    special:       { width: 35.33,    height: 52 }
+    spaceline:     { width: 90,    height: 52 }
+    special:       { width: 35.67, height: 52 }
 
 views:
     base:
diff --git a/data/keyboards/es_wide.yaml b/data/keyboards/es_wide.yaml
index debf39cc..1963d596 100644
--- a/data/keyboards/es_wide.yaml
+++ b/data/keyboards/es_wide.yaml
@@ -1,12 +1,11 @@
 ---
 outlines:
-    default:       { width: 52,     height: 42 }
-    altline:       { width: 77.51,  height: 42 }
-    wide:          { width: 91.25,  height: 42 }
-    change-view:   { width: 77.51,  height: 42 }
-    change-view-2: { width: 91.25,  height: 42 }
-    spaceline:     { width: 146.69, height: 42 }
-    special:       { width: 52,  height: 42 }
+    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:
diff --git a/data/keyboards/fi.yaml b/data/keyboards/fi.yaml
index d2e1c046..640165a2 100644
--- a/data/keyboards/fi.yaml
+++ b/data/keyboards/fi.yaml
@@ -1,32 +1,35 @@
 ---
 outlines:
-    default:       { width: 32,       height: 52 }
-    altline:       { width: 48.39024, height: 52 }
-    wide:          { width: 62,       height: 52 }
-    change-view:   { width: 48.39024, height: 52 }
-    change-view-2: { width: 62,       height: 52 }
-    spaceline:     { width: 150.5853, height: 52 }
+    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 }
+    spaceline:   { width: 150,    height: 52 }
+    special:     { width: 48,     height: 52 }
+    placeholder: { width: 32,     height: 52 }
+    fill:        { width: 64,     height: 52 }
 
 views:
     base:
         - "q w e r t y u i o p å"
         - "a s d f g h j k l ö ä"
-        - "Shift_L   z x c v b n m  BackSpace"
+        - "Shift_L   z x c v b n m , BackSpace"
         - "show_numbers preferences         space        .    Return"
     upper:
         - "Q W E R T Y U I O P Å"
         - "A S D F G H J K L Ö Ä"
-        - "Shift_L   Z X C V B N M  BackSpace"
+        - "Shift_L   Z X C V B N M , BackSpace"
         - "show_numbers preferences         space        .    Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
-        - "show_symbols   , \" ' : ; ! ?  BackSpace"
+        - "show_symbols -- , \" ' : ; ! ? BackSpace"
         - "show_letters preferences         space        .    Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers   \\ / < > = [ ]  BackSpace"
+        - "show_numbers -- \\ / < > = [ ] BackSpace"
         - "show_letters preferences         space        .    Return"
 
 buttons:
@@ -43,7 +46,7 @@ buttons:
         action: "erase"
     preferences:
         action: "show_prefs"
-        outline: "change-view"
+        outline: "special"
         icon: "keyboard-mode-symbolic"
     show_numbers:
         action:
@@ -61,7 +64,7 @@ buttons:
         outline: "change-view"
         label: "*/="
     .:
-        outline: "altline"
+        outline: "large"
     space:
         outline: "spaceline"
         text: " "
@@ -69,3 +72,14 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
+    --:
+        outline: "placeholder"
+        text: ""
+    5:
+        outline: "fill"
+    "&":
+        outline: "fill"
+    √:
+        outline: "fill"
+    ¥:
+        outline: "fill"
\ No newline at end of file
diff --git a/data/keyboards/fi_wide.yaml b/data/keyboards/fi_wide.yaml
index 73e63a77..4679999f 100644
--- a/data/keyboards/fi_wide.yaml
+++ b/data/keyboards/fi_wide.yaml
@@ -1,32 +1,34 @@
 ---
 outlines:
-    default:       { width: 48,     height: 42 }
-    altline:       { width: 72.59,  height: 42 }
-    wide:          { width: 93,     height: 42 }
-    change-view:   { width: 72.59,  height: 42 }
-    change-view-2: { width: 93,     height: 42 }
-    spaceline:     { width: 225.88, height: 42 }
+    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"
+        - "Shift_L   z x c v b n m , BackSpace"
         - "show_numbers preferences         space        .    Return"
     upper:
         - "Q W E R T Y U I O P Å"
         - "A S D F G H J K L Ö Ä"
-        - "Shift_L   Z X C V B N M  BackSpace"
+        - "Shift_L   Z X C V B N M , BackSpace"
         - "show_numbers preferences         space        .    Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
-        - "show_symbols   , \" ' : ; ! ?  BackSpace"
+        - "show_symbols -- , \" ' : ; ! ? BackSpace"
         - "show_letters preferences         space        .    Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers   \\ / < > = [ ]  BackSpace"
+        - "show_numbers -- \\ / < > = [ ] BackSpace"
         - "show_letters preferences         space        .    Return"
 
 buttons:
@@ -43,7 +45,7 @@ buttons:
         action: "erase"
     preferences:
         action: "show_prefs"
-        outline: "change-view"
+        outline: "special"
         icon: "keyboard-mode-symbolic"
     show_numbers:
         action:
@@ -60,8 +62,6 @@ buttons:
             set_view: "symbols"
         outline: "change-view"
         label: "*/="
-    .:
-        outline: "altline"
     space:
         outline: "spaceline"
         text: " "
@@ -69,3 +69,14 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
+    --:
+        outline: "placeholder"
+        text: ""
+    5:
+        outline: "fill"
+    "&":
+        outline: "fill"
+    √:
+        outline: "fill"
+    ¥:
+        outline: "fill"
\ No newline at end of file
diff --git a/data/keyboards/fr+bepo.yaml b/data/keyboards/fr+bepo.yaml
index f5a6026a..07e8c9cc 100644
--- a/data/keyboards/fr+bepo.yaml
+++ b/data/keyboards/fr+bepo.yaml
@@ -1,40 +1,41 @@
 ---
 outlines:
     default:       { width: 35.33, height: 52 }
-    small:         { width: 50,    height: 30 }
-    altline:       { width: 35.33, height: 52 }
+    altline:       { width: 37.0,  height: 52 }
     wide:          { width: 50,    height: 52 }
-    change-view:   { width: 35.33, height: 52 }
+    change-view:   { width: 37.0,  height: 52 }
     change-view-2: { width: 50,    height: 52 }
-    spaceline:     { width: 150,   height: 52 }
+    spaceline:     { width: 171,   height: 52 }
     special:       { width: 35.33, height: 52 }
+    large:         { width: 35.33, height: 52 }
+    placeholder:   { width: 35.33, height: 52 }
 
 views:
     base:
         - "b é p o w v d l j z"
         - "a u i e c t s r n m"
         - "Shift_L y x k q g h f . BackSpace"
-        - "show_numbers preferences         space    show_eschars Return"
+        - "show_numbers preferences         space   show_eschars Return"
     upper:
         - "B É P O W V D L J Z"
         - "A U I E C T S R N M"
         - "Shift_L   Y X K Q G H F -  BackSpace"
-        - "show_numbers preferences         space  :   show_eschars Return"
+        - "show_numbers preferences         space   show_eschars Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # € % & - _ + ( )"
-        - "show_symbols   , \" ' : ; ! ?  BackSpace"
-        - "show_letters preferences         space        show_eschars Return"
+        - "show_symbols -- , \" ' : ; ! ?  BackSpace"
+        - "show_letters preferences         space   show_eschars Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ $ ¥ ^ ° * { }"
-        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        show_eschars Return"
+        - "show_numbers_from_symbols -- \\ / < > = [ ]  BackSpace"
+        - "show_letters preferences         space   show_eschars Return"
     eschars:
         - "à â ç é è ê î ô ù û"
         - "À Â Ç É È Ê Î Ô Ù Û"
-        - "show_numbers_from_symbols  æ œ ä ë ï ö ü  BackSpace"
-        - "show_letters preferences         space        show_eschars  Return"
+        - "show_numbers_from_symbols  æ œ ä ë ï ö ü : BackSpace"
+        - "show_letters preferences         space   show_eschars  Return"
  
 buttons:
     Shift_L:
@@ -77,7 +78,7 @@ buttons:
             locking:
                 lock_view: "eschars"
                 unlock_view: "base"
-        outline: "change-view"
+        outline: "change-view-2"
         label: "âÂ"
     space:
         outline: "spaceline"
@@ -87,4 +88,7 @@ buttons:
         icon: "key-enter"
         keysym: "Return"
     .:
-        outline: "special"
+        outline: "large"
+    --:
+        outline: "placeholder"
+        text: ""
\ No newline at end of file
diff --git a/data/keyboards/fr+bepo_wide.yaml b/data/keyboards/fr+bepo_wide.yaml
index abc2c69e..8f145fbd 100644
--- a/data/keyboards/fr+bepo_wide.yaml
+++ b/data/keyboards/fr+bepo_wide.yaml
@@ -1,12 +1,13 @@
 ---
 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 }
+    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: 272, height: 42 }
     special:       { width: 54,  height: 42 }
+    placeholder:   { width: 54,  height: 42 }
 
 views:
     base:
@@ -18,21 +19,21 @@ views:
         - "B É P O W V D L J Z"
         - "A U I E C T S R N M"
         - "Shift_L   Y X K Q G H F -  BackSpace"
-        - "show_numbers preferences         space  :   show_eschars Return"
+        - "show_numbers preferences         space    show_eschars Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # € % & - _ + ( )"
-        - "show_symbols   , \" ' : ; ! ?  BackSpace"
+        - "show_symbols -- , \" ' : ; ! ?  BackSpace"
         - "show_letters preferences         space        show_eschars Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ $ ¥ ^ ° * { }"
-        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
+        - "show_numbers_from_symbols -- \\ / < > = [ ]  BackSpace"
         - "show_letters preferences         space        show_eschars Return"
     eschars:
         - "à â ç é è ê î ô ù û"
         - "À Â Ç É È Ê Î Ô Ù Û"
-        - "show_numbers_from_symbols  æ œ ä ë ï ö ü  BackSpace"
+        - "show_numbers_from_symbols  æ œ ä ë ï ö ü : BackSpace"
         - "show_letters preferences         space        show_eschars Return"
 
 buttons:
@@ -85,3 +86,6 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
+    --:
+        outline: "placeholder"
+        text: ""
\ No newline at end of file
diff --git a/data/keyboards/ge.yaml b/data/keyboards/ge.yaml
index f7ee65df..7e6a6be8 100644
--- a/data/keyboards/ge.yaml
+++ b/data/keyboards/ge.yaml
@@ -1,34 +1,35 @@
 ---
 outlines:
-    default:       { width: 35.33, height: 52 }
-    altline:       { width: 52.67, height: 52 }
+    default:       { width: 35.67, height: 52 }
+    altline:       { width: 53,    height: 52 }
     wide:          { width: 62,    height: 52 }
-    change-view:   { width: 52.67, height: 52 }
+    change-view:   { width: 53,    height: 52 }
     change-view-2: { width: 62,    height: 52 }
     spaceline:     { width: 142,   height: 52 }
     special:       { width: 44,    height: 52 }
+    large:         { width: 44,    height: 52 }
 
 views:
     base:
         - "ქ წ ე რ ტ ყ უ ი ო პ"
         - "ა ს დ ფ გ ჰ ჯ კ ლ"
         - "Shift_L ზ ხ ც ვ ბ ნ მ BackSpace"
-        - "show_numbers preferences         space        . Return"
+        - "show_numbers preferences         space    .     Return"
     upper:
         - "ქ ჭ ე ღ თ ყ უ ი ო პ"
         - "ა შ დ ფ გ ჰ ჟ კ ლ"
         - "Shift_L ძ ხ ჩ ვ ბ ნ მ BackSpace"
-        - "show_numbers preferences         space        . Return"
+        - "show_numbers preferences         space    .     Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "! @ # $ % ^ & * ( )"
         - "show_symbols   - ' \" : ; , ?   BackSpace"
-        - "show_letters preferences         space        . Return"
+        - "show_letters preferences         space    .     Return"
     symbols:
         - "+ ⨯ ÷ = / _ € £ ¥ ₾"
         - "~ ` | · √ π τ ° { }"
         - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        . Return"
+        - "show_letters preferences         space    .     Return"
 
 buttons:
     Shift_L:
@@ -66,11 +67,11 @@ buttons:
             set_view: "symbols"
         outline: "change-view"
         label: "*/="
-    .:
-        outline: "special"
     space:
         outline: "spaceline"
         text: " "
+    .:
+        outline: "large"
     Return:
         outline: "wide"
         icon: "key-enter"
diff --git a/data/keyboards/ge_wide.yaml b/data/keyboards/ge_wide.yaml
index a9340836..a1aa0f73 100644
--- a/data/keyboards/ge_wide.yaml
+++ b/data/keyboards/ge_wide.yaml
@@ -1,34 +1,34 @@
 ---
 outlines:
-    default:       { width: 52,     height: 42 }
-    altline:       { width: 77.52,  height: 42 }
-    wide:          { width: 91.26,  height: 42 }
-    change-view:   { width: 77.52,  height: 42 }
-    change-view-2: { width: 91.26,  height: 42 }
-    spaceline:     { width: 209.01, height: 42 }
-    special:       { width: 64.76,  height: 42 }
+    default:       { width: 53.5,  height: 42 }
+    altline:       { width: 80.25, height: 42 }
+    wide:          { width: 91.26, height: 42 }
+    change-view:   { width: 80.25, height: 42 }
+    change-view-2: { width: 91.26, height: 42 }
+    spaceline:     { width: 245,   height: 42 }
+    special:       { width: 53.5,  height: 42 }
 
 views:
     base:
         - "ქ წ ე რ ტ ყ უ ი ო პ"
         - "ა ს დ ფ გ ჰ ჯ კ ლ"
         - "Shift_L ზ ხ ც ვ ბ ნ მ BackSpace"
-        - "show_numbers preferences         space        . Return"
+        - "show_numbers preferences         space    .     Return"
     upper:
         - "ქ ჭ ე ღ თ ყ უ ი ო პ"
         - "ა შ დ ფ გ ჰ ჟ კ ლ"
         - "Shift_L ძ ხ ჩ ვ ბ ნ მ BackSpace"
-        - "show_numbers preferences         space        . Return"
+        - "show_numbers preferences         space    .     Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "! @ # $ % ^ & * ( )"
         - "show_symbols   - ' \" : ; , ?   BackSpace"
-        - "show_letters preferences         space        . Return"
+        - "show_letters preferences         space    .     Return"
     symbols:
         - "+ ⨯ ÷ = / _ € £ ¥ ₾"
         - "~ ` | · √ π τ ° { }"
         - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        . Return"
+        - "show_letters preferences         space    .     Return"
 
 buttons:
     Shift_L:
@@ -66,8 +66,6 @@ buttons:
             set_view: "symbols"
         outline: "change-view"
         label: "*/="
-    .:
-        outline: "special"
     space:
         outline: "spaceline"
         text: " "
@@ -75,3 +73,6 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
+    --:
+        outline: "placeholder"
+        text: ""
\ No newline at end of file
diff --git a/data/keyboards/gr+polytonic.yaml b/data/keyboards/gr+polytonic.yaml
index 990f13d7..2ddbbbf9 100644
--- a/data/keyboards/gr+polytonic.yaml
+++ b/data/keyboards/gr+polytonic.yaml
@@ -4,40 +4,45 @@
 # 
 ---
 outlines:
-    default:       { width: 40,    height: 60 }
-    altline:       { width: 52.67, height: 60 }
-    wide:          { width: 62,    height: 60 }
-    change-view:   { width: 52.67, height: 60 }
-    change-view-2: { width: 62,    height: 60 }
-    extrawide:     { width: 66,    height: 60 }
-    spaceline:     { width: 140,   height: 60 }
-    special:       { width: 44,    height: 60 }
+    default:          { width: 40,    height: 60 }
+    special:          { width: 52.67, height: 60 }
+    altline:          { width: 57.5, height: 60 }
+    large:            { width: 57.5, height: 60 }
+    wide:             { width: 62,    height: 60 }
+    change-view:      { width: 57.5, height: 60 }
+    change-view-2:    { width: 81,    height: 60 }
+    character-group:  { width: 72,    height: 60 }
+    spaceline:        { width: 143,   height: 60 }
+    spaceline-2:      { width: 223,   height: 60 }
+    subtle-highlight: { width: 40,    height: 60 }
+    placeholder:      { width: 40,    height: 60 }
+    placeholder-2:    { width: 72,   height: 60 }
 
 views:
     base:
         - "; ς ε ρ τ υ θ ι ο π"
         - "α σ δ φ γ η ξ κ λ show_accents"
         - "Shift_L ζ χ ψ ω β ν μ BackSpace"
-        - "show_numbers preferences space . CommaSpecial Return"
+        - "show_numbers preferences space . ,-subtle-highlight Return"
     upper:
         - ": € Ε Ρ Τ Υ Θ Ι Ο Π"
         - "Α Σ Δ Φ Γ Η Ξ Κ Λ show_accents"
         - "Shift_L Ζ Χ Ψ Ω Β Ν Μ BackSpace"
-        - "show_numbers preferences space ! ·Special Return"
+        - "show_numbers preferences space ! ·-subtle-highlight Return"
     accents:
-        - "show_psiliordasiaandvaria show_psiliordasiaandoxia show_psiliordasia show_bariaorperispomeni show_oxia"
+        - "show_psiliordasiaandvaria show_psiliordasiaandoxia show_psiliordasia show_bariaorperispomeni show_oxia ᾿"
         - "show_PsiliOrDasiaAndVaria show_PsiliOrDasiaAndOxia show_PsiliOrDasia show_BariaOrPerispomeni show_Oxia show_base"
-        - "show_PsiliOrDasiaAndPerispomeni show_psiliordasiaandperispomeni ᾿ BackSpace"
-        - "show_numbers preferences space Return"
+        - "--- show_PsiliOrDasiaAndPerispomeni show_psiliordasiaandperispomeni --- --- BackSpace"
+        - "show_numbers preferences space-spaceline-2 Return"
     oxia:
         - "ά έ ή ί ϊ ΐ ό ύ ϋ ώ"
-        - "show_Oxia ᾳ ᾴ ῃ ῄ ῳ ῴ show_base"
+        - "show_Oxia -- ᾳ ᾴ ῃ ῄ ῳ ῴ show_base"
         - "Ϗ ϐ ϑ ϗ ϖ ΰ ϕ – — BackSpace"
         - "show_numbers preferences space « » Return"
     Oxia:
-        - "Ά Έ Ή Ί Ϊ Ό Ύ Ϋ Ώ"
-        - "show_oxia ᾼ ῌ ῼ show_base"
-        - "Ϗ ϐ ϑ ϗ ϖ ϕ – — BackSpace"
+        - "Ά Έ Ή Ί Ϊ Ό Ύ Ϋ Ώ --"
+        - "show_oxia -- -- ᾼ ῌ ῼ -- -- show_base"
+        - "Ϗ ϐ ϑ ϗ ϖ -- ϕ – — BackSpace"
         - "show_numbers preferences space « » Return"
     bariaorperispomeni:
         - "ὰ ὲ ὴ ὶ ῒ ὸ ὺ ὼ ῐ ῑ"
@@ -45,66 +50,68 @@ views:
         - "ᾶ ᾷ ῆ ῖ ῗ ῦ ῧ ῶ ῡ BackSpace"
         - "show_numbers preferences space ῇ ῷ Return"
     BariaOrPerispomeni:
-        - "Ὰ Ὲ Ὴ Ὶ Ὸ Ὺ Ὼ"
-        - "show_bariaorperispomeni ᾼ ῌ ῼ show_base"
-        - "show_numbers preferences space BackSpace Return"
+        - "-- Ὰ Ὲ Ὴ Ὶ Ὸ Ὺ Ὼ -- --"
+        - "show_bariaorperispomeni -- -- ᾼ ῌ ῼ -- -- show_base"
+        - "--- -- -- -- -- -- -- -- BackSpace"
+        - "show_numbers preferences space-spaceline-2 Return"
     psiliordasia:
         - "ἀ ἐ ἠ ἰ ὀ ὐ ὠ ᾀ ᾐ ᾠ"
         - "show_PsiliOrDasia ἁ ἑ ἡ ἱ ὁ ὑ ὡ show_base"
-        - "ᾁ ᾑ ᾡ ῤ ῥ BackSpace"
-        - "show_numbers preferences space Return"
+        - "--- ᾁ ᾑ ᾡ ῤ ῥ -- -- BackSpace"
+        - "show_numbers preferences space-spaceline-2 Return"
     PsiliOrDasia:
-        - "Ἀ Ἐ Ἠ Ἰ Ὀ Ὠ ᾈ ᾘ ᾨ"
+        - "Ἀ Ἐ Ἠ Ἰ Ὀ Ὠ ᾈ ᾘ ᾨ --"
         - "show_psiliordasia Ἁ Ἑ Ἡ Ἱ Ὁ Ὑ Ὡ show_base"
-        - "ᾉ ᾙ ᾩ Ῥ BackSpace"
-        - "show_numbers preferences space Return"
+        - "--- -- ᾉ ᾙ ᾩ Ῥ -- -- BackSpace"
+        - "show_numbers preferences space-spaceline-2 Return"
     psiliordasiaandoxia:
         - "ἄ ἔ ἤ ἴ ὄ ὔ ὤ ᾄ ᾔ ᾤ"
         - "show_PsiliOrDasiaAndOxia ἅ ἕ ἥ ἵ ὅ ὕ ὥ show_base"
-        - "ᾅ ᾕ ᾥ BackSpace"
-        - "show_numbers preferences space Return"
+        - "--- -- ᾅ ᾕ ᾥ -- -- -- BackSpace"
+        - "show_numbers preferences space-spaceline-2 Return"
     PsiliOrDasiaAndOxia:
-        - "Ἄ Ἔ Ἤ Ἴ Ὄ Ὤ ᾌ ᾜ ᾬ"
+        - "Ἄ Ἔ Ἤ Ἴ Ὄ Ὤ ᾌ ᾜ ᾬ --"
         - "show_psiliordasiaandoxia Ἅ Ἕ Ἥ Ἵ Ὅ Ὕ Ὥ show_base"
-        - "ᾍ ᾝ ᾭ BackSpace"
-        - "show_numbers preferences space Return"
+        - "--- -- ᾍ ᾝ ᾭ -- -- -- BackSpace"
+        - "show_numbers preferences space-spaceline-2 Return"
     psiliordasiaandvaria:
         - "ἂ ἒ ἢ ἲ ὂ ὒ ὢ ᾂ ᾒ ᾢ"
         - "show_PsiliOrDasiaAndVaria ἃ ἓ ἣ ἳ ὃ ὓ ὣ show_base"
-        - "ᾃ ᾓ ᾣ BackSpace"
-        - "show_numbers preferences space Return"
+        - "--- -- ᾃ ᾓ ᾣ -- -- -- BackSpace"
+        - "show_numbers preferences space-spaceline-2 Return"
     PsiliOrDasiaAndVaria:
-        - "Ἂ Ἒ Ἢ Ἲ Ὂ Ὢ ᾊ ᾚ ᾪ"
+        - "Ἂ Ἒ Ἢ Ἲ Ὂ Ὢ ᾊ ᾚ ᾪ --"
         - "show_psiliordasiaandvaria Ἃ Ἓ Ἣ Ἳ Ὃ Ὓ Ὣ show_base"
-        - "ᾋ ᾛ ᾫ BackSpace"
-        - "show_numbers preferences space Return"
+        - "--- -- ᾋ ᾛ ᾫ -- -- -- BackSpace"
+        - "show_numbers preferences space-spaceline-2 Return"
     psiliordasiaandperispomeni:
-        - "ἆ ἦ ἶ ὖ ὦ ᾆ ᾖ ᾦ"
-        - "show_PsiliOrDasiaAndPerispomeni ἇ ἧ ἷ ὗ ὧ show_base"
-        - "ᾇ ᾗ ᾧ BackSpace"
-        - "show_numbers preferences space Return"
+        - "-- ἆ ἦ ἶ ὖ ὦ ᾆ ᾖ ᾦ --"
+        - "show_PsiliOrDasiaAndPerispomeni -- ἇ ἧ ἷ ὗ ὧ -- show_base"
+        - "--- -- ᾇ ᾗ ᾧ -- -- -- BackSpace"
+        - "show_numbers preferences space-spaceline-2 Return"
     PsiliOrDasiaAndPerispomeni:
-        - "Ἆ Ἦ Ἶ Ὦ ᾎ ᾞ ᾮ"
-        - "show_psiliordasiaandperispomeni Ἇ Ἧ Ἷ Ὗ Ὧ show_base"
-        - "ᾏ ᾟ ᾯ BackSpace"
-        - "show_numbers preferences space Return"
+        - "-- Ἆ Ἦ Ἶ Ὦ ᾎ ᾞ ᾮ -- --"
+        - "show_psiliordasiaandperispomeni -- Ἇ Ἧ Ἷ Ὗ Ὧ -- show_base"
+        - "--- -- ᾏ ᾟ ᾯ -- -- -- BackSpace"
+        - "show_numbers preferences space-spaceline-2 Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
-        - "show_symbols CommaSpecial \" ' : ; ! ? BackSpace"
-        - "show_letters preferences space . CommaSpecial Return"
+        - "show_symbols ,-subtle-highlight \" ' : ; ! ? BackSpace"
+        - "show_letters preferences space . ,-subtle-highlight Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
         - "show_numbers \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences space . CommaSpecial Return"
+        - "show_letters preferences space . ,-subtle-highlight Return"
+
 buttons:
     Shift_L:
         action:
             locking:
                 lock_view: "upper"
                 unlock_view: "base"
-        outline: "change-view"
+        outline: "change-view-2"
         icon: "key-shift"
     BackSpace:
         outline: "altline"
@@ -112,67 +119,67 @@ buttons:
         action: "erase"
     preferences:
         action: "show_prefs"
-        outline: "altline"
+        outline: "special"
         icon: "keyboard-mode-symbolic"
     show_oxia:
         action:
             set_view: "oxia"
-        outline: "extrawide"
+        outline: "character-group"
         label: "´ ΅"
     show_Oxia:
         action:
             set_view: "Oxia"
-        outline: "extrawide"
+        outline: "character-group"
         label: "´¨↑"
     show_bariaorperispomeni:
         action:
             set_view: "bariaorperispomeni"
-        outline: "extrawide"
+        outline: "character-group"
         label: "` ῀"
     show_BariaOrPerispomeni:
         action:
             set_view: "BariaOrPerispomeni"
-        outline: "extrawide"
+        outline: "character-group"
         label: "`῀↑"
     show_psiliordasia:
         action:
             set_view: "psiliordasia"
-        outline: "extrawide"
+        outline: "character-group"
         label: "᾿ ῾"
     show_PsiliOrDasia:
         action:
             set_view: "PsiliOrDasia"
-        outline: "extrawide"
+        outline: "character-group"
         label: "᾿῾↑"
     show_psiliordasiaandoxia:
         action:
             set_view: "psiliordasiaandoxia"
-        outline: "extrawide"
+        outline: "character-group"
         label: "῎ ῞"
     show_PsiliOrDasiaAndOxia:
         action:
             set_view: "PsiliOrDasiaAndOxia"
-        outline: "extrawide"
+        outline: "character-group"
         label: "῎῞↑"
     show_psiliordasiaandvaria:
         action:
             set_view: "psiliordasiaandvaria"
-        outline: "extrawide"
+        outline: "character-group"
         label: "῍ ῝"
     show_PsiliOrDasiaAndVaria:
         action:
             set_view: "PsiliOrDasiaAndVaria"
-        outline: "extrawide"
+        outline: "character-group"
         label: "῍῝↑"
     show_psiliordasiaandperispomeni:
         action:
             set_view: "psiliordasiaandperispomeni"
-        outline: "extrawide"
+        outline: "character-group"
         label: "῏ ῟"
     show_PsiliOrDasiaAndPerispomeni:
         action:
             set_view: "PsiliOrDasiaAndPerispomeni"
-        outline: "extrawide"
+        outline: "character-group"
         label: "῏῟↑"
     show_numbers:
         action:
@@ -187,7 +194,7 @@ buttons:
     show_symbols:
         action:
             set_view: "symbols"
-        outline: "change-view"
+        outline: "change-view-2"
         label: "*/="
     show_accents:
         action:
@@ -209,22 +216,33 @@ buttons:
         icon: "key-enter"
         keysym: "Return"
     .:
-        outline: "special"
-    ·Special:
-        outline: "special"
+        outline: "subtle-highlight"
+    ·-subtle-highlight:
+        outline: "subtle-highlight"
         text: "·"
-    CommaSpecial:
-        outline: "special"
+    ",-subtle-highlight":
+        outline: "subtle-highlight"
         text: ","
     ":":
-        outline: "special"
+        outline: "subtle-highlight"
     ;:
-        outline: "special"
+        outline: "subtle-highlight"
     "!":
-        outline: "special"
+        outline: "subtle-highlight"
     «:
-        outline: "special"
+        outline: "subtle-highlight"
     »:
-        outline: "special"
+        outline: "subtle-highlight"
     €:
-        outline: "special"
+        outline: "subtle-highlight"
+    space-spaceline-2:
+        outline: "spaceline-2"
+        text: " "
+    --:
+        outline: "placeholder"
+        text: ""
+    ---:
+        outline: "placeholder-2"
+        text: ""
+    ᾿:
+        outline: "large"
\ No newline at end of file
diff --git a/data/keyboards/gr+polytonic_wide.yaml b/data/keyboards/gr+polytonic_wide.yaml
index 57214d9c..3cc8fc8e 100644
--- a/data/keyboards/gr+polytonic_wide.yaml
+++ b/data/keyboards/gr+polytonic_wide.yaml
@@ -4,40 +4,45 @@
 # 
 ---
 outlines:
-    default:       { width: 74,    height: 60 }
-    altline:       { width: 97.44, height: 60 }
-    wide:          { width: 114.7, height: 60 }
-    change-view:   { width: 97.44, height: 60 }
-    change-view-2: { width: 114.7, height: 60 }
-    extrawide:     { width: 122.1, height: 60 }
-    spaceline:     { width: 259,   height: 60 }
-    special:       { width: 81.4,  height: 60 }
+    default:          { width: 74,    height: 60 }
+    special:          { width: 74,    height: 60 }
+    altline:          { width: 97.44, height: 60 }
+    large:            { width: 97.44, height: 60 }
+    wide:             { width: 114.7, height: 60 }
+    change-view:      { width: 97.44, height: 60 }
+    change-view-2:    { width: 114.7, height: 60 }
+    character-group:  { width: 122.1, height: 60 }
+    spaceline:        { width: 279,   height: 60 }
+    spaceline-2:      { width: 427,   height: 60 }
+    subtle-highlight: { width: 74,    height: 60 }
+    placeholder:      { width: 74,    height: 60 }
+    placeholder-2:    { width: 122.1, height: 60 }
 
 views:
     base:
         - "; ς ε ρ τ υ θ ι ο π"
         - "α σ δ φ γ η ξ κ λ show_accents"
         - "Shift_L ζ χ ψ ω β ν μ BackSpace"
-        - "show_numbers preferences space . CommaSpecial Return"
+        - "show_numbers preferences space . ,-subtle-highlight Return"
     upper:
         - ": € Ε Ρ Τ Υ Θ Ι Ο Π"
         - "Α Σ Δ Φ Γ Η Ξ Κ Λ show_accents"
         - "Shift_L Ζ Χ Ψ Ω Β Ν Μ BackSpace"
-        - "show_numbers preferences space ! ·Special Return"
+        - "show_numbers preferences space ! ·-subtle-highlight Return"
     accents:
-        - "show_psiliordasiaandvaria show_psiliordasiaandoxia show_psiliordasia show_bariaorperispomeni show_oxia"
+        - "show_psiliordasiaandvaria show_psiliordasiaandoxia show_psiliordasia show_bariaorperispomeni show_oxia ᾿"
         - "show_PsiliOrDasiaAndVaria show_PsiliOrDasiaAndOxia show_PsiliOrDasia show_BariaOrPerispomeni show_Oxia show_base"
-        - "show_PsiliOrDasiaAndPerispomeni show_psiliordasiaandperispomeni ᾿ BackSpace"
-        - "show_numbers preferences space Return"
+        - "--- show_PsiliOrDasiaAndPerispomeni show_psiliordasiaandperispomeni --- --- BackSpace"
+        - "show_numbers preferences space-spaceline-2 Return"
     oxia:
         - "ά έ ή ί ϊ ΐ ό ύ ϋ ώ"
-        - "show_Oxia ᾳ ᾴ ῃ ῄ ῳ ῴ show_base"
+        - "show_Oxia -- ᾳ ᾴ ῃ ῄ ῳ ῴ show_base"
         - "Ϗ ϐ ϑ ϗ ϖ ΰ ϕ – — BackSpace"
         - "show_numbers preferences space « » Return"
     Oxia:
-        - "Ά Έ Ή Ί Ϊ Ό Ύ Ϋ Ώ"
-        - "show_oxia ᾼ ῌ ῼ show_base"
-        - "Ϗ ϐ ϑ ϗ ϖ ϕ – — BackSpace"
+        - "Ά Έ Ή Ί Ϊ Ό Ύ Ϋ Ώ --"
+        - "show_oxia -- -- ᾼ ῌ ῼ -- -- show_base"
+        - "Ϗ ϐ ϑ ϗ ϖ -- ϕ – — BackSpace"
         - "show_numbers preferences space « » Return"
     bariaorperispomeni:
         - "ὰ ὲ ὴ ὶ ῒ ὸ ὺ ὼ ῐ ῑ"
@@ -45,66 +50,68 @@ views:
         - "ᾶ ᾷ ῆ ῖ ῗ ῦ ῧ ῶ ῡ BackSpace"
         - "show_numbers preferences space ῇ ῷ Return"
     BariaOrPerispomeni:
-        - "Ὰ Ὲ Ὴ Ὶ Ὸ Ὺ Ὼ"
-        - "show_bariaorperispomeni ᾼ ῌ ῼ show_base"
-        - "show_numbers preferences space BackSpace Return"
+        - "-- Ὰ Ὲ Ὴ Ὶ Ὸ Ὺ Ὼ -- --"
+        - "show_bariaorperispomeni -- -- ᾼ ῌ ῼ -- -- show_base"
+        - "--- -- -- -- -- -- -- -- BackSpace"
+        - "show_numbers preferences space-spaceline-2 Return"
     psiliordasia:
         - "ἀ ἐ ἠ ἰ ὀ ὐ ὠ ᾀ ᾐ ᾠ"
         - "show_PsiliOrDasia ἁ ἑ ἡ ἱ ὁ ὑ ὡ show_base"
-        - "ᾁ ᾑ ᾡ ῤ ῥ BackSpace"
-        - "show_numbers preferences space Return"
+        - "--- ᾁ ᾑ ᾡ ῤ ῥ -- -- BackSpace"
+        - "show_numbers preferences space-spaceline-2 Return"
     PsiliOrDasia:
-        - "Ἀ Ἐ Ἠ Ἰ Ὀ Ὠ ᾈ ᾘ ᾨ"
+        - "Ἀ Ἐ Ἠ Ἰ Ὀ Ὠ ᾈ ᾘ ᾨ --"
         - "show_psiliordasia Ἁ Ἑ Ἡ Ἱ Ὁ Ὑ Ὡ show_base"
-        - "ᾉ ᾙ ᾩ Ῥ BackSpace"
-        - "show_numbers preferences space Return"
+        - "--- -- ᾉ ᾙ ᾩ Ῥ -- -- BackSpace"
+        - "show_numbers preferences space-spaceline-2 Return"
     psiliordasiaandoxia:
         - "ἄ ἔ ἤ ἴ ὄ ὔ ὤ ᾄ ᾔ ᾤ"
         - "show_PsiliOrDasiaAndOxia ἅ ἕ ἥ ἵ ὅ ὕ ὥ show_base"
-        - "ᾅ ᾕ ᾥ BackSpace"
-        - "show_numbers preferences space Return"
+        - "--- -- ᾅ ᾕ ᾥ -- -- -- BackSpace"
+        - "show_numbers preferences space-spaceline-2 Return"
     PsiliOrDasiaAndOxia:
-        - "Ἄ Ἔ Ἤ Ἴ Ὄ Ὤ ᾌ ᾜ ᾬ"
+        - "Ἄ Ἔ Ἤ Ἴ Ὄ Ὤ ᾌ ᾜ ᾬ --"
         - "show_psiliordasiaandoxia Ἅ Ἕ Ἥ Ἵ Ὅ Ὕ Ὥ show_base"
-        - "ᾍ ᾝ ᾭ BackSpace"
-        - "show_numbers preferences space Return"
+        - "--- -- ᾍ ᾝ ᾭ -- -- -- BackSpace"
+        - "show_numbers preferences space-spaceline-2 Return"
     psiliordasiaandvaria:
         - "ἂ ἒ ἢ ἲ ὂ ὒ ὢ ᾂ ᾒ ᾢ"
         - "show_PsiliOrDasiaAndVaria ἃ ἓ ἣ ἳ ὃ ὓ ὣ show_base"
-        - "ᾃ ᾓ ᾣ BackSpace"
-        - "show_numbers preferences space Return"
+        - "--- -- ᾃ ᾓ ᾣ -- -- -- BackSpace"
+        - "show_numbers preferences space-spaceline-2 Return"
     PsiliOrDasiaAndVaria:
-        - "Ἂ Ἒ Ἢ Ἲ Ὂ Ὢ ᾊ ᾚ ᾪ"
+        - "Ἂ Ἒ Ἢ Ἲ Ὂ Ὢ ᾊ ᾚ ᾪ --"
         - "show_psiliordasiaandvaria Ἃ Ἓ Ἣ Ἳ Ὃ Ὓ Ὣ show_base"
-        - "ᾋ ᾛ ᾫ BackSpace"
-        - "show_numbers preferences space Return"
+        - "--- -- ᾋ ᾛ ᾫ -- -- -- BackSpace"
+        - "show_numbers preferences space-spaceline-2 Return"
     psiliordasiaandperispomeni:
-        - "ἆ ἦ ἶ ὖ ὦ ᾆ ᾖ ᾦ"
-        - "show_PsiliOrDasiaAndPerispomeni ἇ ἧ ἷ ὗ ὧ show_base"
-        - "ᾇ ᾗ ᾧ BackSpace"
-        - "show_numbers preferences space Return"
+        - "-- ἆ ἦ ἶ ὖ ὦ ᾆ ᾖ ᾦ --"
+        - "show_PsiliOrDasiaAndPerispomeni -- ἇ ἧ ἷ ὗ ὧ -- show_base"
+        - "--- -- ᾇ ᾗ ᾧ -- -- -- BackSpace"
+        - "show_numbers preferences space-spaceline-2 Return"
     PsiliOrDasiaAndPerispomeni:
-        - "Ἆ Ἦ Ἶ Ὦ ᾎ ᾞ ᾮ"
-        - "show_psiliordasiaandperispomeni Ἇ Ἧ Ἷ Ὗ Ὧ show_base"
-        - "ᾏ ᾟ ᾯ BackSpace"
-        - "show_numbers preferences space Return"
+        - "-- Ἆ Ἦ Ἶ Ὦ ᾎ ᾞ ᾮ -- --"
+        - "show_psiliordasiaandperispomeni -- Ἇ Ἧ Ἷ Ὗ Ὧ -- show_base"
+        - "--- -- ᾏ ᾟ ᾯ -- -- -- BackSpace"
+        - "show_numbers preferences space-spaceline-2 Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
-        - "show_symbols CommaSpecial \" ' : ; ! ? BackSpace"
-        - "show_letters preferences space . CommaSpecial Return"
+        - "show_symbols ,-subtle-highlight \" ' : ; ! ? BackSpace"
+        - "show_letters preferences space . ,-subtle-highlight Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
         - "show_numbers \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences space . CommaSpecial Return"
+        - "show_letters preferences space . ,-subtle-highlight Return"
+
 buttons:
     Shift_L:
         action:
             locking:
                 lock_view: "upper"
                 unlock_view: "base"
-        outline: "change-view"
+        outline: "change-view-2"
         icon: "key-shift"
     BackSpace:
         outline: "altline"
@@ -112,67 +119,67 @@ buttons:
         action: "erase"
     preferences:
         action: "show_prefs"
-        outline: "altline"
+        outline: "special"
         icon: "keyboard-mode-symbolic"
     show_oxia:
         action:
             set_view: "oxia"
-        outline: "extrawide"
+        outline: "character-group"
         label: "´ ΅"
     show_Oxia:
         action:
             set_view: "Oxia"
-        outline: "extrawide"
+        outline: "character-group"
         label: "´¨↑"
     show_bariaorperispomeni:
         action:
             set_view: "bariaorperispomeni"
-        outline: "extrawide"
+        outline: "character-group"
         label: "` ῀"
     show_BariaOrPerispomeni:
         action:
             set_view: "BariaOrPerispomeni"
-        outline: "extrawide"
+        outline: "character-group"
         label: "`῀↑"
     show_psiliordasia:
         action:
             set_view: "psiliordasia"
-        outline: "extrawide"
+        outline: "character-group"
         label: "᾿ ῾"
     show_PsiliOrDasia:
         action:
             set_view: "PsiliOrDasia"
-        outline: "extrawide"
+        outline: "character-group"
         label: "᾿῾↑"
     show_psiliordasiaandoxia:
         action:
             set_view: "psiliordasiaandoxia"
-        outline: "extrawide"
+        outline: "character-group"
         label: "῎ ῞"
     show_PsiliOrDasiaAndOxia:
         action:
             set_view: "PsiliOrDasiaAndOxia"
-        outline: "extrawide"
+        outline: "character-group"
         label: "῎῞↑"
     show_psiliordasiaandvaria:
         action:
             set_view: "psiliordasiaandvaria"
-        outline: "extrawide"
+        outline: "character-group"
         label: "῍ ῝"
     show_PsiliOrDasiaAndVaria:
         action:
             set_view: "PsiliOrDasiaAndVaria"
-        outline: "extrawide"
+        outline: "character-group"
         label: "῍῝↑"
     show_psiliordasiaandperispomeni:
         action:
             set_view: "psiliordasiaandperispomeni"
-        outline: "extrawide"
+        outline: "character-group"
         label: "῏ ῟"
     show_PsiliOrDasiaAndPerispomeni:
         action:
             set_view: "PsiliOrDasiaAndPerispomeni"
-        outline: "extrawide"
+        outline: "character-group"
         label: "῏῟↑"
     show_numbers:
         action:
@@ -187,7 +194,7 @@ buttons:
     show_symbols:
         action:
             set_view: "symbols"
-        outline: "change-view"
+        outline: "change-view-2"
         label: "*/="
     show_accents:
         action:
@@ -209,22 +216,33 @@ buttons:
         icon: "key-enter"
         keysym: "Return"
     .:
-        outline: "special"
-    ·Special:
-        outline: "special"
+        outline: "subtle-highlight"
+    ·-subtle-highlight:
+        outline: "subtle-highlight"
         text: "·"
-    CommaSpecial:
-        outline: "special"
+    ",-subtle-highlight":
+        outline: "subtle-highlight"
         text: ","
     ":":
-        outline: "special"
+        outline: "subtle-highlight"
     ;:
-        outline: "special"
+        outline: "subtle-highlight"
     "!":
-        outline: "special"
+        outline: "subtle-highlight"
     «:
-        outline: "special"
+        outline: "subtle-highlight"
     »:
-        outline: "special"
+        outline: "subtle-highlight"
     €:
-        outline: "special"
+        outline: "subtle-highlight"
+    space-spaceline-2:
+        outline: "spaceline-2"
+        text: " "
+    --:
+        outline: "placeholder"
+        text: ""
+    ---:
+        outline: "placeholder-2"
+        text: ""
+    ᾿:
+        outline: "large"
\ No newline at end of file
diff --git a/data/keyboards/gr.yaml b/data/keyboards/gr.yaml
index b08f1f7a..45ed8ec5 100644
--- a/data/keyboards/gr.yaml
+++ b/data/keyboards/gr.yaml
@@ -4,47 +4,47 @@
 # Edited by Sotiris Papadopoulos, sotirios.papadopoulos@inserm.fr
 ---
 outlines:
-    default:       { width: 40,    height: 60 }
-    altline:       { width: 52.67, height: 60 }
-    wide:          { width: 62,    height: 60 }
-    change-view:   { width: 52.67, height: 60 }
-    change-view-2: { width: 62,    height: 60 }
-    spaceline:     { width: 140,   height: 60 }
-    special:       { width: 44,    height: 60 }
+    default:          { width: 40,    height: 60 }
+    altline:          { width: 52.67, height: 60 }
+    wide:             { width: 62,    height: 60 }
+    change-view:      { width: 52.67, height: 60 }
+    change-view-2:    { width: 62,    height: 60 }
+    spaceline:        { width: 138,   height: 60 }
+    subtle-highlight: { width: 40,    height: 60 }
 
 views:
     base:
         - "; ς ε ρ τ υ θ ι ο π"
         - "α σ δ φ γ η ξ κ λ show_accented"
         - "Shift_L ζ χ ψ ω β ν μ BackSpace"
-        - "show_numbers preferences space . CommaSpecial Return"
+        - "show_numbers preferences space . ,-subtle-highlight Return"
     upper:
         - ": ! Ε Ρ Τ Υ Θ Ι Ο Π"
         - "Α Σ Δ Φ Γ Η Ξ Κ Λ show_accented"
         - "Shift_L Ζ Χ Ψ Ω Β Ν Μ BackSpace"
-        - "show_numbers preferences space ·Special ᾿ Return"
+        - "show_numbers preferences space ·-subtle-highlight ᾿ Return"
     accented:
         - "ά έ ή ί ϊ ΐ ό ύ ϋ ώ "
-        - "Ά Έ Ή Ί Ϊ Ό Ύ Ϋ Ώ show_base"
+        - "Ά Έ Ή Ί Ϊ Ό Ύ Ϋ Ώ show_accented"
         - "Ϗ ϐ ϑ ϗ ϖ ΰ ϕ – — BackSpace"
         - "show_numbers preferences space « » Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
-        - "show_symbols CommaSpecial \" ' : ; ! ? BackSpace"
-        - "show_letters preferences space . CommaSpecial Return"
+        - "show_symbols ,-subtle-highlight \" ' : ; ! ? BackSpace"
+        - "show_letters preferences space . ,-subtle-highlight Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
         - "show_numbers \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences space . CommaSpecial Return"
+        - "show_letters preferences space . ,-subtle-highlight Return"
 buttons:
     Shift_L:
         action:
             locking:
                 lock_view: "upper"
                 unlock_view: "base"
-        outline: "change-view"
+        outline: "change-view-2"
         icon: "key-shift"
     BackSpace:
         outline: "altline"
@@ -67,7 +67,7 @@ buttons:
     show_symbols:
         action:
             set_view: "symbols"
-        outline: "change-view"
+        outline: "change-view-2"
         label: "*/="
     show_accented:
         action:
@@ -76,11 +76,6 @@ buttons:
                 unlock_view: "base"
         outline: "change-view"
         label: "άΐ"
-    show_base:
-        action:
-            set_view: "base"
-        outline: "change-view"
-        label: "αι"
     space:
         outline: "spaceline"
         text: " "
@@ -89,22 +84,22 @@ buttons:
         icon: "key-enter"
         keysym: "Return"
     .:
-        outline: "special"
-    ·Special:
-        outline: "special"
+        outline: "subtle-highlight"
+    ·-subtle-highlight:
+        outline: "subtle-highlight"
         text: "·"
-    CommaSpecial:
-        outline: "special"
+    ",-subtle-highlight":
+        outline: "subtle-highlight"
         text: ","
     ":":
-        outline: "special"
+        outline: "subtle-highlight"
     ;:
-        outline: "special"
+        outline: "subtle-highlight"
     ᾿:
-        outline: "special"
+        outline: "subtle-highlight"
     "!":
-        outline: "special"
+        outline: "subtle-highlight"
     «:
-        outline: "special"
+        outline: "subtle-highlight"
     »:
-        outline: "special"
+        outline: "subtle-highlight"
diff --git a/data/keyboards/gr_wide.yaml b/data/keyboards/gr_wide.yaml
index ef785e4a..57230398 100644
--- a/data/keyboards/gr_wide.yaml
+++ b/data/keyboards/gr_wide.yaml
@@ -1,40 +1,40 @@
 # Created by Sotiris Papadopoulos, sotirios.papadopoulos@inserm.fr
 ---
 outlines:
-    default:       { width: 80,  height: 60 }
-    altline:       { width: 110, height: 60 }
-    wide:          { width: 120, height: 60 }
-    change-view:   { width: 110, height: 60 }
-    change-view-2: { width: 120, height: 60 }
-    spaceline:     { width: 250, height: 60 }
-    special:       { width: 75,  height: 60 }
+    default:          { width: 73,  height: 60 }
+    special:          { width: 73,  height: 60 }
+    altline:          { width: 110, height: 60 }
+    wide:             { width: 110, height: 60 }
+    change-view:      { width: 110, height: 60 }
+    spaceline:        { width: 291, height: 60 }
+    subtle-highlight: { width: 73,  height: 60 }
 
 views:
     base:
         - "; ς ε ρ τ υ θ ι ο π"
         - "α σ δ φ γ η ξ κ λ show_accented"
         - "Shift_L ζ χ ψ ω β ν μ BackSpace"
-        - "show_numbers preferences space . CommaSpecial Return"
+        - "show_numbers preferences space . ,-subtle-highlight Return"
     upper:
         - ": ! Ε Ρ Τ Υ Θ Ι Ο Π"
         - "Α Σ Δ Φ Γ Η Ξ Κ Λ show_accented"
         - "Shift_L Ζ Χ Ψ Ω Β Ν Μ BackSpace"
-        - "show_numbers preferences space ·Special ᾿ Return"
+        - "show_numbers preferences space ·-subtle-highlight ᾿ Return"
     accented:
         - "ά έ ή ί ϊ ΐ ό ύ ϋ ώ "
-        - "Ά Έ Ή Ί Ϊ Ό Ύ Ϋ Ώ show_base"
-        - "Ϗ ϐ ϑ ϗ ΰ ϕ ϖ – — BackSpace"
+        - "Ά Έ Ή Ί Ϊ Ό Ύ Ϋ Ώ show_accented"
+        - "Ϗ ϐ ϑ ϗ ϖ ΰ ϕ – — BackSpace"
         - "show_numbers preferences space « » Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
-        - "show_symbols CommaSpecial \" ' : ; ! ? BackSpace"
-        - "show_letters preferences space . CommaSpecial Return"
+        - "show_symbols ,-subtle-highlight \" ' : ; ! ? BackSpace"
+        - "show_letters preferences space . ,-subtle-highlight Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
         - "show_numbers \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences space . CommaSpecial Return"
+        - "show_letters preferences space . ,-subtle-highlight Return"
 buttons:
     Shift_L:
         action:
@@ -54,12 +54,12 @@ buttons:
     show_numbers:
         action:
             set_view: "numbers"
-        outline: "change-view-2"
+        outline: "change-view"
         label: "123"
     show_letters:
         action:
             set_view: "base"
-        outline: "change-view-2"
+        outline: "change-view"
         label: "ΑΒΓ"
     show_symbols:
         action:
@@ -73,11 +73,6 @@ buttons:
                 unlock_view: "base"
         outline: "change-view"
         label: "άΐ"
-    show_base:
-        action:
-            set_view: "base"
-        outline: "change-view"
-        label: "αι"
     space:
         outline: "spaceline"
         text: " "
@@ -86,22 +81,22 @@ buttons:
         icon: "key-enter"
         keysym: "Return"
     .:
-        outline: "special"
-    ·Special:
-        outline: "special"
+        outline: "subtle-highlight"
+    ·-subtle-highlight:
+        outline: "subtle-highlight"
         text: "·"
-    CommaSpecial:
-        outline: "special"
+    ",-subtle-highlight":
+        outline: "subtle-highlight"
         text: ","
     ":":
-        outline: "special"
+        outline: "subtle-highlight"
     ;:
-        outline: "special"
+        outline: "subtle-highlight"
     ᾿:
-        outline: "special"
+        outline: "subtle-highlight"
     "!":
-        outline: "special"
+        outline: "subtle-highlight"
     «:
-        outline: "special"
+        outline: "subtle-highlight"
     »:
-        outline: "special"
+        outline: "subtle-highlight"
diff --git a/data/keyboards/hu.yaml b/data/keyboards/hu.yaml
index b74df173..cfb637a8 100644
--- a/data/keyboards/hu.yaml
+++ b/data/keyboards/hu.yaml
@@ -1,12 +1,14 @@
-# Maintained by: soyer <soyer@irl.hu>
+# Based on work by: soyer <soyer@irl.hu>
 ---
 outlines:
-    default:       { width: 35.33, height: 52 }
-    altline:       { width: 52.67, height: 52 }
-    change-view:   { width: 52.67, height: 52 }
+    default:       { width: 35.67, height: 52 }
+    altline:       { width: 53,    height: 52 }
+    change-view:   { width: 53,    height: 52 }
     change-view-2: { width: 62,    height: 52 }
-    spaceline:     { width: 99.67, height: 52 }
-    special:       { width: 35.33, height: 52 }
+    spaceline:     { width: 53.5,  height: 52 }
+    special:       { width: 35.67, height: 52 }
+    placeholder:   { width: 35.67, height: 52 }
+    placeholder-2: { width: 17.83, height: 52 }
 
 views:
     base:
@@ -30,10 +32,10 @@ views:
         - "show_numbers   \\ / § π τ [ ]  BackSpace"
         - "show_letters show_eschars preferences         space        , . - Return"
     eschars:
-        - "ö ü ó Ö Ü Ó"
-        - "í ő ú Í Ő Ú"
-        - "show_numbers é á ű É Á Ű BackSpace"
-        - "show_letters show_eschars preferences         space        „ “ Return"
+        - "-- -- ö ü ó Ö Ü Ó -- --"
+        - "-- -- í ő ú Í Ő Ú -- --"
+        - "show_numbers --- é á ű É Á Ű --- BackSpace"
+        - "show_letters show_eschars preferences         space       , „ “ Return"
 
 buttons:
     Shift_L:
@@ -80,3 +82,9 @@ buttons:
         outline: "altline"
         icon: "key-enter"
         keysym: "Return"
+    --:
+        outline: "placeholder"
+        text: ""
+    ---:
+        outline: "placeholder-2"
+        text: ""
\ No newline at end of file
diff --git a/data/keyboards/hu_wide.yaml b/data/keyboards/hu_wide.yaml
index b89e11d6..06714704 100644
--- a/data/keyboards/hu_wide.yaml
+++ b/data/keyboards/hu_wide.yaml
@@ -1,12 +1,13 @@
-# Maintained by: soyer <soyer@irl.hu>
+# Based on work by: soyer <soyer@irl.hu>
 ---
 outlines:
-    default:       { width: 48,  height: 42 }
-    altline:       { width: 81,  height: 42 }
-    change-view:   { width: 81,  height: 42 }
-    change-view-2: { width: 108, height: 42 }
-    spaceline:     { width: 216, height: 42 }
-    special:       { width: 48,  height: 42 }
+    default:       { width: 44.75, height: 42 }
+    altline:       { width: 81,    height: 42 }
+    change-view:   { width: 81,    height: 42 }
+    change-view-2: { width: 108,   height: 42 }
+    spaceline:     { width: 100,   height: 42 }
+    special:       { width: 44.75, height: 42 }
+    placeholder:   { width: 44.75, height: 42 }
 
 views:
     base:
@@ -20,20 +21,20 @@ views:
         - "Shift_L Í Y X C V B N M  BackSpace"
         - "show_numbers show_eschars preferences         space        ? : ! Return"
     numbers:
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "@ # € % & - _ + ( )"
-        - "show_symbols   ; \" ' : = < >  BackSpace"
+        - "-- 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_numbers   \\ / § π τ [ ] -- BackSpace"
         - "show_letters show_eschars preferences         space        , . - Return"
     eschars:
-        - "ö ü ó Ö Ü Ó"
-        - "í ő ú Í Ő Ú"
-        - "show_numbers é á ű É Á Ű BackSpace"
-        - "show_letters show_eschars preferences         space        „ “ Return"
+        - "-- -- -- ö ü ó Ö Ü Ó -- -- --"
+        - "-- -- -- í ő ú Í Ő Ú -- -- --"
+        - "show_numbers -- é á ű É Á Ű -- BackSpace"
+        - "show_letters show_eschars preferences         space       , „ “ Return"
 
 buttons:
     Shift_L:
@@ -80,3 +81,6 @@ buttons:
         outline: "altline"
         icon: "key-enter"
         keysym: "Return"
+    --:
+        outline: "placeholder"
+        text: ""
\ No newline at end of file
diff --git a/data/keyboards/il.yaml b/data/keyboards/il.yaml
index 34a0b6df..49526763 100644
--- a/data/keyboards/il.yaml
+++ b/data/keyboards/il.yaml
@@ -1,49 +1,39 @@
 ---
 outlines:
-    default:       { width: 40,  height: 60 }
-    altline:       { width: 40,  height: 60 }
-    wide:          { width: 62,  height: 60 }
-    change-view:   { width: 56,  height: 60 }
-    change-view-2: { width: 62,  height: 60 }
-    spaceline:     { width: 142, height: 60 }
-    special:       { width: 44,  height: 60 }
+    default:          { width: 41,  height: 60 }
+    altline:          { width: 41,  height: 60 }
+    wide:             { width: 82,  height: 60 }
+    change-view:      { width: 82,  height: 60 }
+    spaceline:        { width: 122, height: 60 }
+    special:          { width: 41,  height: 60 }
 
 views:
     base:
         - "' - ק  ר א ט ו ן ם פ"
         - "ש ד ג כ ע י ח ל ך ף"
         - "ז ס ב ה נ מ צ ת ץ  BackSpace"
-        - "show_numbers CommaLarge preferences         space        . Return"
+        - "show_numbers preferences    ,     space        . Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # ₪ % & - _ + ( )"
         - "show_symbols   , \" ' : ; ! ?  BackSpace"
-        - "show_letters preferences         space        . Return"
+        - "show_letters preferences    ,     space        . Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € $ ^ ° * { }"
-        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        . Return"
+        - "show_numbers   \\ / < > = [ ]  BackSpace"
+        - "show_letters preferences    ,     space        . Return"
 
 buttons:
     BackSpace:
         outline: "altline"
         icon: "edit-clear-symbolic"
         action: "erase"
-    CommaLarge:
-        outline: "special"
-        text: ","
-        
     preferences:
         action: "show_prefs"
         outline: "special"
         icon: "keyboard-mode-symbolic"
     show_numbers:
-        action:
-            set_view: "numbers"
-        outline: "change-view-2"
-        label: "123"
-    show_numbers_from_symbols:
         action:
             set_view: "numbers"
         outline: "change-view"
@@ -51,15 +41,13 @@ buttons:
     show_letters:
         action:
             set_view: "base"
-        outline: "change-view-2"
+        outline: "change-view"
         label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"
         outline: "change-view"
         label: "*/="
-    .:
-        outline: "special"
     space:
         outline: "spaceline"
         text: " "
@@ -67,3 +55,6 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
+    --:
+        outline: "placeholder"
+        text: ""
\ No newline at end of file
diff --git a/data/keyboards/il_wide.yaml b/data/keyboards/il_wide.yaml
index b2676a48..7357c405 100644
--- a/data/keyboards/il_wide.yaml
+++ b/data/keyboards/il_wide.yaml
@@ -1,49 +1,39 @@
 ---
 outlines:
-    default:       { width: 52,    height: 42 }
-    altline:       { width: 52,    height: 42 }
-    wide:          { width: 80.6,  height: 42 }
-    change-view:   { width: 72.8,  height: 42 }
-    change-view-2: { width: 80.6,  height: 42 }
-    spaceline:     { width: 184.6, height: 42 }
-    special:       { width: 57.2,  height: 42 }
+    default:          { width: 53.75, height: 42 }
+    altline:          { width: 53.75, height: 42 }
+    wide:             { width: 107,   height: 42 }
+    change-view:      { width: 107,   height: 42 }
+    spaceline:        { width: 162,   height: 42 }
+    special:          { width: 53.5,  height: 42 }
 
 views:
     base:
         - "' - ק  ר א ט ו ן ם פ"
         - "ש ד ג כ ע י ח ל ך ף"
         - "ז ס ב ה נ מ צ ת ץ  BackSpace"
-        - "show_numbers CommaLarge preferences         space        . Return"
+        - "show_numbers preferences    ,     space        . Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # ₪ % & - _ + ( )"
         - "show_symbols   , \" ' : ; ! ?  BackSpace"
-        - "show_letters preferences         space        . Return"
+        - "show_letters preferences    ,     space        . Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € $ ^ ° * { }"
-        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        . Return"
+        - "show_numbers   \\ / < > = [ ]  BackSpace"
+        - "show_letters preferences    ,     space        . Return"
 
 buttons:
     BackSpace:
         outline: "altline"
         icon: "edit-clear-symbolic"
         action: "erase"
-    CommaLarge:
-        outline: "special"
-        text: ","
-        
     preferences:
         action: "show_prefs"
         outline: "special"
         icon: "keyboard-mode-symbolic"
     show_numbers:
-        action:
-            set_view: "numbers"
-        outline: "change-view-2"
-        label: "123"
-    show_numbers_from_symbols:
         action:
             set_view: "numbers"
         outline: "change-view"
@@ -51,15 +41,13 @@ buttons:
     show_letters:
         action:
             set_view: "base"
-        outline: "change-view-2"
+        outline: "change-view"
         label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"
         outline: "change-view"
         label: "*/="
-    .:
-        outline: "special"
     space:
         outline: "spaceline"
         text: " "
diff --git a/data/keyboards/ir.yaml b/data/keyboards/ir.yaml
index ee63232d..85a6e12b 100644
--- a/data/keyboards/ir.yaml
+++ b/data/keyboards/ir.yaml
@@ -1,12 +1,14 @@
 ---
 outlines:
-    default:       { width: 35.33, 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: 142,   height: 52 }
-    special:       { width: 44,    height: 52 }
+    default:       { width: 32.75,  height: 52 }
+    altline:       { width: 48.99,  height: 52 }
+    wide:          { width: 62,     height: 52 }
+    change-view:   { width: 48.99,  height: 52 }
+    change-view-2: { width: 62,     height: 52 }
+    spaceline:     { width: 135,    height: 52 }
+    special:       { width: 35.66,  height: 52 }
+    fill:          { width: 64.9,   height: 52 }
+    placeholder:   { width: 32.75,  height: 52 }
 
 views:
     base:
@@ -18,17 +20,17 @@ views:
         - "  ْ  ٌ  ٍ  ً  ُ  ِ  َ  ّ # @ چ"
         - "_ ئ ي إ أ آ ة » « : ؛"
         - "Shift_L ك  ٓ ژ  ٔ ء > < ؟ BackSpace"
-        - "show_numbers preferences         space        ! ، Return"
+        - "show_numbers preferences         space       ، ! Return"
     numbers:
         - "۱ ۲ ۳ ۴ ۵ ۶ ۷ ۸ ۹ ۰ |"
-        - "… ٬ ٫ ﷼ ٪ ، * ) ( − ـ"
-        - "show_symbols + - × ÷ = ^ % / BackSpace"
-        - "show_letters preferences         space        . Return"
+        - "… ٬ ٫ ﷼ ٪ ^ * ) ( − ـ"
+        - "show_symbols + - × ÷ = / % -- BackSpace"
+        - "show_letters preferences         space       ، . Return"
     symbols:
-        - "& ` | · • % π τ ÷ × ¶"
-        - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        . Return"
+        - "& ` | · • % π τ ¶ [ ]"
+        - "© ® £ € ¥ ^ * ° { } --"
+        - "show_numbers_from_symbols + - × ÷  = \\ < > BackSpace"
+        - "show_letters preferences         space       ، . Return"
 
 buttons:
     Shift_L:
@@ -66,8 +68,6 @@ buttons:
             set_view: "symbols"
         outline: "change-view"
         label: "*/="
-    .:
-        outline: "special"
     space:
         outline: "spaceline"
         text: " "
@@ -78,3 +78,6 @@ buttons:
     zwnj:
         icon: "zwnj"
         text: "‌"
+    --:
+        outline: "placeholder"
+        text: ""
\ No newline at end of file
diff --git a/data/keyboards/ir_wide.yaml b/data/keyboards/ir_wide.yaml
index 208d7e38..687862e5 100644
--- a/data/keyboards/ir_wide.yaml
+++ b/data/keyboards/ir_wide.yaml
@@ -1,34 +1,36 @@
 ---
 outlines:
-    default:       { width: 54,  height: 42 }
-    altline:       { width: 81,  height: 42 }
-    wide:          { width: 108, height: 42 }
-    change-view:   { width: 81,  height: 42 }
-    change-view-2: { width: 108, height: 42 }
-    spaceline:     { width: 216, height: 42 }
-    special:       { width: 54,  height: 42 }
+    default:       { width: 44.75, height: 42 }
+    altline:       { width: 67.25, height: 42 }
+    wide:          { width: 80,    height: 42 }
+    change-view:   { width: 67.25, height: 42 }
+    change-view-2: { width: 80,    height: 42 }
+    spaceline:     { width: 198,   height: 42 }
+    special:       { width: 44.75, height: 42 }
+    placeholder:   { width: 44.75, height: 42 }
+    fill:          { width: 89.5,  height: 42 }
 
 views:
     base:
-        - "ض ص ث ق ف غ ع ه خ ح ج چ \\"
-        - "ش س ی ب ل ا ت ن م ک گ"
-        - "Shift_L ظ ط ز ر ذ د پ و ، / BackSpace"
-        - "show_numbers preferences         space     zwnj ؟ ! . Return"
+        - "ض ص ث ق ف غ ع ه خ ح ج چ"
+        - "ش س ی ب ل ا ت ن م ک گ /"
+        - "Shift_L ظ ط ز ر ذ د پ و ، BackSpace"
+        - "show_numbers preferences         space     zwnj ؟ . Return"
     upper:
-        - " ْ  ٌ  ٍ  ً  ُ  ِ  َ  ّ  ] [ @ # _"
-        - "ؤ ئ ي إ أ آ ة » « : ؛"
-        - "Shift_L ك  ٓ ژ ٰ  ‌  ٔ  ء  >  <  ؟ BackSpace"
-        - "show_numbers preferences         space        ، ؟ ! . Return"
+        - " ْ  ٌ  ٍ  ً  ُ  ِ  َ  ّ  ] [ @ #"
+        - "ؤ ئ ي إ أ آ ة » « : ؛ \\"
+        - "Shift_L ك  ٓ ژ ٰ  ‌  ٔ  ء  >  <  BackSpace"
+        - "show_numbers preferences         space        ، ؟ ! Return"
     numbers:
-        - "۱ ۲ ۳ ۴ ۵ ۶ ۷ ۸ ۹ ۰ | ="
-        - "… ٬ ٫ ﷼ ٪ ، * ) ( − _"
-        - "show_symbols + - × ÷ = ^ % / BackSpace"
-        - "show_letters preferences         space        ، ؟ ! . Return"
+        - "-- ۱ ۲ ۳ ۴ ۵ ۶ ۷ ۸ ۹ ۰ |"
+        - "… ٬ ٫ ﷼ ٪ ^ * ° ) ( − _"
+        - "show_symbols + - × ÷ = / % > <  BackSpace"
+        - "show_letters preferences         space        ، ؟ . Return"
     symbols:
-        - "& ` | · • % π τ ÷ × ¶"
-        - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        ، ؟ ! . Return"
+        - "-- & ` | · • % π τ ¶ [ ]"
+        - "© ® £ € ¥ ^ * ° { } -- --"
+        - "show_numbers_from_symbols + - × ÷ = \\ % < > BackSpace"
+        - "show_letters preferences         space        ، ! . Return"
 
 buttons:
     Shift_L:
@@ -66,8 +68,6 @@ buttons:
             set_view: "symbols"
         outline: "change-view"
         label: "*/="
-    .:
-        outline: "special"
     space:
         outline: "spaceline"
         text: " "
@@ -78,3 +78,6 @@ buttons:
     zwnj:
         icon: "zwnj"
         text: "‌"
+    --:
+        outline: "placeholder"
+        text: ""
\ No newline at end of file
diff --git a/data/keyboards/it+fur.yaml b/data/keyboards/it+fur.yaml
index 6e8f0945..29e0f3d5 100644
--- a/data/keyboards/it+fur.yaml
+++ b/data/keyboards/it+fur.yaml
@@ -1,14 +1,15 @@
-# Friulian layout created by Fabio Tomat
+# Based on the Friulian layout created by Fabio Tomat
 # 14 october 2020
 ---
 outlines:
-    default:       { width: 35.33, height: 52 }
-    altline:       { width: 52.67, height: 52 }
+    default:       { width: 35.67, height: 52 }
+    altline:       { width: 52.75, height: 52 }
     wide:          { width: 62,    height: 52 }
-    change-view:   { width: 52.67, height: 52 }
+    change-view:   { width: 52.75, height: 52 }
     change-view-2: { width: 62,    height: 52 }
-    spaceline:     { width: 99.67, height: 52 }
+    spaceline:     { width: 82.75, height: 52 }
     special:       { width: 44,    height: 52 }
+    placeholder:   { width: 35.67, height: 52 }
 
 views:
     base:
@@ -82,4 +83,6 @@ buttons:
         outline: "altline"
         icon: "key-enter"
         keysym: "Return"
-
+    --:
+        outline: "placeholder"
+        text: ""
\ No newline at end of file
diff --git a/data/keyboards/it+fur_wide.yaml b/data/keyboards/it+fur_wide.yaml
index ff2b7698..5c031d0f 100644
--- a/data/keyboards/it+fur_wide.yaml
+++ b/data/keyboards/it+fur_wide.yaml
@@ -1,14 +1,15 @@
-# Friulian layout created by Fabio Tomat
+# Based on the Friulian layout created by Fabio Tomat
 # 14 october 2020
 ---
 outlines:
-    default:       { width: 52,    height: 42 }
-    altline:       { width: 77.52, height: 42 }
+    default:       { width: 53.5,  height: 42 }
+    altline:       { width: 80.25, height: 42 }
     wide:          { width: 91.26, height: 42 }
-    change-view:   { width: 77.52, height: 42 }
+    change-view:   { width: 80.25, height: 42 }
     change-view-2: { width: 91.26, height: 42 }
-    spaceline:     { width: 146.7, height: 42 }
-    special:       { width: 64.76, height: 42 }
+    spaceline:     { width: 134,   height: 42 }
+    special:       { width: 53.5,  height: 42 }
+    placeholder:   { width: 53.5,  height: 42 }
 
 views:
     base:
@@ -82,4 +83,6 @@ buttons:
         outline: "altline"
         icon: "key-enter"
         keysym: "Return"
-
+    --:
+        outline: "placeholder"
+        text: ""
\ No newline at end of file
diff --git a/data/keyboards/it.yaml b/data/keyboards/it.yaml
index a7ff3e5d..107b0ab0 100644
--- a/data/keyboards/it.yaml
+++ b/data/keyboards/it.yaml
@@ -2,13 +2,14 @@
 # 03 october 2019
 ---
 outlines:
-    default:       { width: 35.33, height: 52 }
-    altline:       { width: 52.67, height: 52 }
+    default:       { width: 35.67, height: 52 }
+    altline:       { width: 52.75, height: 52 }
     wide:          { width: 62,    height: 52 }
-    change-view:   { width: 52.67, height: 52 }
+    change-view:   { width: 52.75, height: 52 }
     change-view-2: { width: 62,    height: 52 }
-    spaceline:     { width: 99.67, height: 52 }
-    special:       { width: 35.33,    height: 52 }
+    spaceline:     { width: 82.75, height: 52 }
+    special:       { width: 44,    height: 52 }
+    placeholder:   { width: 35.67, height: 52 }
 
 views:
     base:
@@ -82,4 +83,6 @@ buttons:
         outline: "altline"
         icon: "key-enter"
         keysym: "Return"
-
+    --:
+        outline: "placeholder"
+        text: ""
\ No newline at end of file
diff --git a/data/keyboards/it_wide.yaml b/data/keyboards/it_wide.yaml
index 060131f7..6caabf40 100644
--- a/data/keyboards/it_wide.yaml
+++ b/data/keyboards/it_wide.yaml
@@ -2,13 +2,14 @@
 # 03 october 2019
 ---
 outlines:
-    default:       { width: 52,    height: 42 }
-    altline:       { width: 77.52, height: 42 }
+    default:       { width: 53.5,  height: 42 }
+    altline:       { width: 80.25, height: 42 }
     wide:          { width: 91.26, height: 42 }
-    change-view:   { width: 77.52, height: 42 }
+    change-view:   { width: 80.25, height: 42 }
     change-view-2: { width: 91.26, height: 42 }
-    spaceline:     { width: 146.7, height: 42 }
-    special:       { width: 52, height: 42 }
+    spaceline:     { width: 134,   height: 42 }
+    special:       { width: 53.5,  height: 42 }
+    placeholder:   { width: 53.5,  height: 42 }
 
 views:
     base:
@@ -82,4 +83,6 @@ buttons:
         outline: "altline"
         icon: "key-enter"
         keysym: "Return"
-
+    --:
+        outline: "placeholder"
+        text: ""
\ No newline at end of file
diff --git a/data/keyboards/no.yaml b/data/keyboards/no.yaml
index ee13efa9..0f3743fd 100644
--- a/data/keyboards/no.yaml
+++ b/data/keyboards/no.yaml
@@ -1,33 +1,35 @@
 ---
 outlines:
-    default:       { width: 32,       height: 52 }
-    altline:       { width: 48.39024, height: 52 }
-    wide:          { width: 64,       height: 52 }
-    change-view:   { width: 48.39024, height: 52 }
-    change-view-2: { width: 64,       height: 52 }
-    spaceline:     { width: 142,      height: 52 }
-    special:       { width: 44,       height: 52 }
+    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 }
+    spaceline:   { width: 150,    height: 52 }
+    special:     { width: 48,     height: 52 }
+    placeholder: { width: 32,     height: 52 }
+    fill:        { width: 64,     height: 52 }
 
 views:
     base:
         - "q w e r t y u i o p å"
         - "a s d f g h j k l ø æ"
-        - "Shift_L   z x c v b n m  BackSpace"
+        - "Shift_L   z x c v b n m , BackSpace"
         - "show_numbers preferences         space        .    Return"
     upper:
         - "Q W E R T Y U I O P Å"
         - "A S D F G H J K L Ø Æ"
-        - "Shift_L   Z X C V B N M  BackSpace"
+        - "Shift_L   Z X C V B N M , BackSpace"
         - "show_numbers preferences         space        .    Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
-        - "show_symbols   , \" ' : ; ! ?  BackSpace"
+        - "show_symbols -- , \" ' : ; ! ? BackSpace"
         - "show_letters preferences         space        .    Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
+        - "show_numbers -- \\ / < > = [ ] BackSpace"
         - "show_letters preferences         space        .    Return"
 
 buttons:
@@ -47,11 +49,6 @@ buttons:
         outline: "special"
         icon: "keyboard-mode-symbolic"
     show_numbers:
-        action:
-            set_view: "numbers"
-        outline: "change-view-2"
-        label: "123"
-    show_numbers_from_symbols:
         action:
             set_view: "numbers"
         outline: "change-view"
@@ -59,7 +56,7 @@ buttons:
     show_letters:
         action:
             set_view: "base"
-        outline: "change-view-2"
+        outline: "change-view"
         label: "ABC"
     show_symbols:
         action:
@@ -67,7 +64,7 @@ buttons:
         outline: "change-view"
         label: "*/="
     .:
-        outline: "special"
+        outline: "large"
     space:
         outline: "spaceline"
         text: " "
@@ -75,3 +72,14 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
+    --:
+        outline: "placeholder"
+        text: ""
+    5:
+        outline: "fill"
+    "&":
+        outline: "fill"
+    √:
+        outline: "fill"
+    ¥:
+        outline: "fill"
\ No newline at end of file
diff --git a/data/keyboards/no_wide.yaml b/data/keyboards/no_wide.yaml
index 53aca9a1..f0ec85ca 100644
--- a/data/keyboards/no_wide.yaml
+++ b/data/keyboards/no_wide.yaml
@@ -1,33 +1,34 @@
 ---
 outlines:
-    default:       { width: 48,       height: 42 }
-    altline:       { width: 72.59,    height: 42 }
-    wide:          { width: 96,       height: 42 }
-    change-view:   { width: 72.59,    height: 42 }
-    change-view-2: { width: 96,       height: 42 }
-    spaceline:     { width: 213,      height: 42 }
-    special:       { width: 66,       height: 42 }
+    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"
+        - "Shift_L   z x c v b n m , BackSpace"
         - "show_numbers preferences         space        .    Return"
     upper:
         - "Q W E R T Y U I O P Å"
         - "A S D F G H J K L Ø Æ"
-        - "Shift_L   Z X C V B N M  BackSpace"
+        - "Shift_L   Z X C V B N M , BackSpace"
         - "show_numbers preferences         space        .    Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
-        - "show_symbols   , \" ' : ; ! ?  BackSpace"
+        - "show_symbols -- , \" ' : ; ! ? BackSpace"
         - "show_letters preferences         space        .    Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
+        - "show_numbers -- \\ / < > = [ ] BackSpace"
         - "show_letters preferences         space        .    Return"
 
 buttons:
@@ -47,11 +48,6 @@ buttons:
         outline: "special"
         icon: "keyboard-mode-symbolic"
     show_numbers:
-        action:
-            set_view: "numbers"
-        outline: "change-view-2"
-        label: "123"
-    show_numbers_from_symbols:
         action:
             set_view: "numbers"
         outline: "change-view"
@@ -59,15 +55,13 @@ buttons:
     show_letters:
         action:
             set_view: "base"
-        outline: "change-view-2"
+        outline: "change-view"
         label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"
         outline: "change-view"
         label: "*/="
-    .:
-        outline: "special"
     space:
         outline: "spaceline"
         text: " "
@@ -75,3 +69,14 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
+    --:
+        outline: "placeholder"
+        text: ""
+    5:
+        outline: "fill"
+    "&":
+        outline: "fill"
+    √:
+        outline: "fill"
+    ¥:
+        outline: "fill"
\ No newline at end of file
diff --git a/data/keyboards/pl.yaml b/data/keyboards/pl.yaml
index 62435d47..f3a673e5 100644
--- a/data/keyboards/pl.yaml
+++ b/data/keyboards/pl.yaml
@@ -1,12 +1,14 @@
 ---
 outlines:
-    default:       { width: 35.33, height: 52 }
+    default:       { width: 35.67, height: 52 }
     altline:       { width: 52.67, height: 52 }
+    large:         { width: 52.67, height: 52 }
     wide:          { width: 59,    height: 52 }
     change-view:   { width: 52.67, height: 52 }
     change-view-2: { width: 59,    height: 52 }
-    spaceline:     { width: 140,   height: 52 }
+    spaceline:     { width: 141,   height: 52 }
     special:       { width: 44,    height: 52 }
+    placeholder:   { width: 35.67, height: 52 }
 
 views:
     base:
@@ -23,20 +25,20 @@ views:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
         - "show_symbols   , \" ' : ; ! ?  BackSpace"
-        - "show_letters preferences         space        . Return"
+        - "show_letters preferences         space        .-large Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
         - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        . Return"
+        - "show_letters preferences         space        .-large Return"
     accents:
         - "q w ę r t y u i ó p"
-        - "ą ś d f g h j k ł"
+        - "ą ś d f g h j k ł ."
         - "accents_show_upper   ż ź ć v b ń m  BackSpace"
         - "show_numbers preferences         space        show_accents Return"
     upper_accents:
         - "Q W Ę R T Y U I Ó P"
-        - "Ą Ś D F G H J K Ł"
+        - "Ą Ś D F G H J K Ł ,"
         - "accents_show_upper   Ż Ź Ć V B Ń M  BackSpace"
         - "show_numbers preferences         space        show_upper_accents Return"
 
@@ -101,8 +103,9 @@ buttons:
                     - "accents"
         outline: "change-view"
         label: "ĄĘ"
-    .:
-        outline: "altline"
+    .-large:
+        outline: "large"
+        text: "."
     space:
         outline: "spaceline"
         text: " "
@@ -110,3 +113,6 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
+    --:
+        outline: "placeholder"
+        text: ""
\ No newline at end of file
diff --git a/data/keyboards/pl_wide.yaml b/data/keyboards/pl_wide.yaml
index 0465e417..b80f29a4 100644
--- a/data/keyboards/pl_wide.yaml
+++ b/data/keyboards/pl_wide.yaml
@@ -2,11 +2,13 @@
 outlines:
     default:       { width: 54,  height: 42 }
     altline:       { width: 81,  height: 42 }
+    large:         { width: 81,  height: 42 }
     wide:          { width: 100, height: 42 }
     change-view:   { width: 81,  height: 42 }
     change-view-2: { width: 100, height: 42 }
     spaceline:     { width: 206, height: 42 }
     special:       { width: 54,  height: 42 }
+    placeholder:   { width: 54,  height: 42 }
 
 views:
     base:
@@ -23,20 +25,20 @@ views:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
         - "show_symbols   , \" ' : ; ! ?  BackSpace"
-        - "show_letters preferences         space        . Return"
+        - "show_letters preferences         space        .-large Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
         - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        . Return"
+        - "show_letters preferences         space        .-large Return"
     accents:
         - "q w ę r t y u i ó p"
-        - "ą ś d f g h j k ł"
+        - "ą ś d f g h j k ł ."
         - "accents_show_upper   ż ź ć v b ń m  BackSpace"
         - "show_numbers preferences         space        show_accents Return"
     upper_accents:
         - "Q W Ę R T Y U I Ó P"
-        - "Ą Ś D F G H J K Ł"
+        - "Ą Ś D F G H J K Ł ,"
         - "accents_show_upper   Ż Ź Ć V B Ń M  BackSpace"
         - "show_numbers preferences         space        show_upper_accents Return"
 
@@ -101,8 +103,9 @@ buttons:
                     - "accents"
         outline: "change-view"
         label: "ĄĘ"
-    .:
-        outline: "altline"
+    .-large:
+        outline: "large"
+        text: "."
     space:
         outline: "spaceline"
         text: " "
@@ -110,3 +113,6 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
+    --:
+        outline: "placeholder"
+        text: ""
\ No newline at end of file
diff --git a/data/keyboards/ro.yaml b/data/keyboards/ro.yaml
index 6cf07cb5..0b702f06 100644
--- a/data/keyboards/ro.yaml
+++ b/data/keyboards/ro.yaml
@@ -1,12 +1,12 @@
 ---
 outlines:
-    default:       { width: 35.33, 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: 99.67, height: 52 }
-    special:       { width: 44,    height: 52 }
+    default:       { width: 35.67,  height: 52 }
+    altline:       { width: 53.5,   height: 52 }
+    wide:          { width: 62,     height: 52 }
+    change-view:   { width: 53.5,   height: 52 }
+    spaceline:     { width: 107.67, height: 52 }
+    special:       { width: 35.67,  height: 52 }
+    large:         { width: 44,     height: 52 }
 
 views:
     base:
@@ -18,7 +18,7 @@ views:
         - "Q W E R T Y U I O P"
         - "A S D F G H J K L"
         - "Shift_L   Z X C V B N M  BackSpace"
-        - "show_numbers show_eschars preferences         space        , Return"
+        - "show_numbers show_eschars preferences         space        . Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # € % & - _ + ( )"
@@ -28,11 +28,11 @@ views:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ $ ¥ ^ ° * { }"
         - "show_numbers   \\ / < > = [ ]  BackSpace"
-        - "show_letters show_eschars preferences         space        , Return"
+        - "show_letters show_eschars preferences         space        . Return"
     eschars:
-        - "ă â î ș ț á é í ó ü"
         - "Ă Â Î Ș Ț Á É Í Ó Ü"
-        - "show_numbers_from_symbols „ ” « » ― { } BackSpace"
+        - "ă â î ș ț á é í ó ü"
+        - "show_numbers „ ” « » ― { } BackSpace"
         - "show_letters show_eschars preferences         space        . Return"
 
 buttons:
@@ -59,7 +59,7 @@ buttons:
     show_letters:
         action:
             set_view: "base"
-        outline: "change-view-2"
+        outline: "change-view"
         label: "ABC"
     show_symbols:
         action:
@@ -80,3 +80,5 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
+    .:
+        outline: "large"
diff --git a/data/keyboards/ro_wide.yaml b/data/keyboards/ro_wide.yaml
index ea400b17..c88d8afd 100644
--- a/data/keyboards/ro_wide.yaml
+++ b/data/keyboards/ro_wide.yaml
@@ -1,12 +1,11 @@
 ---
 outlines:
-    default:       { width: 54,  height: 42 }
-    altline:       { width: 81,  height: 42 }
-    wide:          { width: 108, height: 42 }
-    change-view:   { width: 81,  height: 42 }
-    change-view-2: { width: 108, height: 42 }
-    spaceline:     { width: 153, height: 42 }
-    special:       { width: 54,  height: 42 }
+    default:       { width: 54,     height: 42 }
+    altline:       { width: 81,     height: 42 }
+    wide:          { width: 81,     height: 42 }
+    change-view:   { width: 81,     height: 42 }
+    spaceline:     { width: 189.25, height: 42 }
+    special:       { width: 54,     height: 42 }
 
 views:
     base:
@@ -32,7 +31,7 @@ views:
     eschars:
         - "ă â î ș ț á é í ó ü"
         - "Ă Â Î Ș Ț Á É Í Ó Ü"
-        - "show_numbers_from_symbols „ ” « » ― { } BackSpace"
+        - "show_numbers „ ” « » ― { } BackSpace"
         - "show_letters show_eschars preferences         space        . Return"
 
 buttons:
@@ -59,7 +58,7 @@ buttons:
     show_letters:
         action:
             set_view: "base"
-        outline: "change-view-2"
+        outline: "change-view"
         label: "ABC"
     show_symbols:
         action:
diff --git a/data/keyboards/ru.yaml b/data/keyboards/ru.yaml
index 8f52f0ed..0a404d64 100644
--- a/data/keyboards/ru.yaml
+++ b/data/keyboards/ru.yaml
@@ -1,14 +1,17 @@
 ---
 outlines:
-    default:       { width: 32,  height: 52 }
-    altline:       { width: 32,  height: 52 }
-    wide:          { width: 57,  height: 52 }
-    change-view:   { width: 32,  height: 52 }
-    change-view-2: { width: 57,  height: 52 }
-    narrow:        { width: 26,  height: 52 }
-    spaceline:     { width: 107, height: 52 }
-    fill:          { width: 159, height: 52 }
-    special:       { width: 42,  height: 52 }
+    default:       { width: 32.45, height: 52 }
+    altline:       { width: 32,    height: 52 }
+    wide:          { width: 57,    height: 52 }
+    change-view:   { width: 32,    height: 52 }
+    change-view-2: { width: 57,    height: 52 }
+    narrow:        { width: 26,    height: 52 }
+    spaceline:     { width: 107,   height: 52 }
+    fill:          { width: 159,   height: 52 }
+    fill-2:        { width: 64.9,  height: 52 }
+    special:       { width: 42,    height: 52 }
+    large:         { width: 42,    height: 52 }
+    placeholder:   { width: 40,    height: 52 }
 
 views:
     base:
@@ -20,17 +23,17 @@ views:
         - "Й Ц У К Е Н Г Ш Щ З Х"
         - "Ф Ы В А П Р О Л Д Ж Э"
         - "Shift_L   Я Ч С М И Т Ь Б Ю  BackSpace"
-        - "show_numbers preferences    Ё  space  Ъ  comma Return"
+        - "show_numbers preferences    Ё  space  Ъ  ,-large Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
-        - "show_symbols   , \" ' : ; ! ?  BackSpace"
-        - "show_letters preferences         space_fill   . Return"
+        - "show_symbols , \" ' : ; ! ? -- BackSpace"
+        - "show_letters preferences         space-fill   . Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space_fill   . Return"
+        - "show_numbers \\ / < > = [ ] -- BackSpace"
+        - "show_letters preferences         space-fill   . Return"
 
 buttons:
     Shift_L:
@@ -64,14 +67,14 @@ buttons:
         outline: "change-view-2"
         label: "*/="
     .:
-        outline: "special"
-    comma:
-        outline: "special"
+        outline: "large"
+    ",-large":
+        outline: "large"
         text: ","
     space:
         outline: "spaceline"
         text: " "
-    space_fill:
+    space-fill:
         outline: "fill"
         text: " "
     Return:
@@ -86,3 +89,14 @@ buttons:
         outline: "narrow"
     Ъ:
         outline: "narrow"
+    --:
+        outline: "placeholder"
+        text: ""
+    5:
+        outline: "fill-2"
+    "&":
+        outline: "fill-2"
+    √:
+        outline: "fill-2"
+    ¥:
+        outline: "fill-2"
\ No newline at end of file
diff --git a/data/keyboards/ru_wide.yaml b/data/keyboards/ru_wide.yaml
index 0bad6ca8..2e66aaea 100644
--- a/data/keyboards/ru_wide.yaml
+++ b/data/keyboards/ru_wide.yaml
@@ -1,14 +1,16 @@
 ---
 outlines:
-    default:       { width: 48,    height: 42 }
-    altline:       { width: 48,    height: 42 }
+    default:       { width: 48.75, height: 42 }
+    altline:       { width: 48.75, height: 42 }
     wide:          { width: 85.5,  height: 42 }
-    change-view:   { width: 48,    height: 42 }
+    change-view:   { width: 48.75, height: 42 }
     change-view-2: { width: 85.5,  height: 42 }
     narrow:        { width: 39,    height: 42 }
-    spaceline:     { width: 160.5, height: 42 }
-    fill:          { width: 238.5, height: 42 }
-    special:       { width: 63,    height: 42 }
+    spaceline:     { width: 190,   height: 42 }
+    fill:          { width: 268,   height: 42 }
+    fill-2:        { width: 97.5,  height: 42 }
+    special:       { width: 48.75, height: 42 }
+    placeholder:   { width: 60.75, height: 42 }
 
 views:
     base:
@@ -20,17 +22,17 @@ views:
         - "Й Ц У К Е Н Г Ш Щ З Х"
         - "Ф Ы В А П Р О Л Д Ж Э"
         - "Shift_L   Я Ч С М И Т Ь Б Ю  BackSpace"
-        - "show_numbers preferences    Ё  space  Ъ  comma Return"
+        - "show_numbers preferences    Ё  space  Ъ  , Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
-        - "show_symbols   , \" ' : ; ! ?  BackSpace"
-        - "show_letters preferences         space_fill   . Return"
+        - "show_symbols , \" ' : ; ! ? -- BackSpace"
+        - "show_letters preferences         space-fill   . Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space_fill   . Return"
+        - "show_numbers \\ / < > = [ ] -- BackSpace"
+        - "show_letters preferences         space-fill   . Return"
 
 buttons:
     Shift_L:
@@ -63,15 +65,10 @@ buttons:
             set_view: "symbols"
         outline: "change-view-2"
         label: "*/="
-    .:
-        outline: "special"
-    comma:
-        outline: "special"
-        text: ","
     space:
         outline: "spaceline"
         text: " "
-    space_fill:
+    space-fill:
         outline: "fill"
         text: " "
     Return:
@@ -86,3 +83,14 @@ buttons:
         outline: "narrow"
     Ъ:
         outline: "narrow"
+    --:
+        outline: "placeholder"
+        text: ""
+    5:
+        outline: "fill-2"
+    "&":
+        outline: "fill-2"
+    √:
+        outline: "fill-2"
+    ¥:
+        outline: "fill-2"
\ No newline at end of file
diff --git a/data/keyboards/se.yaml b/data/keyboards/se.yaml
index 39995098..5ae12c85 100644
--- a/data/keyboards/se.yaml
+++ b/data/keyboards/se.yaml
@@ -1,34 +1,36 @@
 ---
 outlines:
-    default:       { width: 32,       height: 52 }
-    altline:       { width: 48.39024, height: 52 }
-    wide:          { width: 64,       height: 52 }
-    change-view:   { width: 48.39024, height: 52 }
-    change-view-2: { width: 64,       height: 52 }
-    spaceline:     { width: 142,      height: 52 }
-    special:       { width: 44,       height: 52 }
+    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 }
+    spaceline:   { width: 150,    height: 52 }
+    special:     { width: 48,     height: 52 }
+    placeholder: { width: 32,     height: 52 }
+    fill:        { width: 64,     height: 52 }
  
 
 views:
     base:
         - "q w e r t y u i o p å"
         - "a s d f g h j k l ö ä"
-        - "Shift_L   z x c v b n m  BackSpace"
+        - "Shift_L   z x c v b n m , BackSpace"
         - "show_numbers preferences         space        .    Return"
     upper:
         - "Q W E R T Y U I O P Å"
         - "A S D F G H J K L Ö Ä"
-        - "Shift_L   Z X C V B N M  BackSpace"
+        - "Shift_L   Z X C V B N M , BackSpace"
         - "show_numbers preferences         space        .    Return"
     numbers:
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "@ # $ % & - _ + ( )"
-        - "show_symbols   , \" ' : ; ! ?  BackSpace"
+        - "§ 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_numbers -- \\ / < > = [ ] BackSpace"
         - "show_letters preferences         space        .    Return"
 
 buttons:
@@ -48,17 +50,12 @@ buttons:
         outline: "special"
         icon: "keyboard-mode-symbolic"
     show_numbers:
-        action:
-            set_view: "numbers"
-        outline: "change-view-2"
-        label: "123"
-    show_numbers_from_symbols:
         action:
             set_view: "numbers"
         outline: "change-view"
         label: "123"
     show_letters:
-        outline: "change-view-2"
+        outline: "change-view"
         action:
             set_view: "base"
         label: "ABC"
@@ -68,7 +65,7 @@ buttons:
         outline: "change-view"
         label: "*/="
     .:
-        outline: "special"
+        outline: "large"
     space:
         outline: "spaceline"
         text: " "
@@ -76,3 +73,6 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
+    --:
+        outline: "placeholder"
+        text: ""
\ No newline at end of file
diff --git a/data/keyboards/se_wide.yaml b/data/keyboards/se_wide.yaml
index 6d5d9ac1..accd3870 100644
--- a/data/keyboards/se_wide.yaml
+++ b/data/keyboards/se_wide.yaml
@@ -1,34 +1,35 @@
 ---
 outlines:
-    default:       { width: 50,  height: 42 }
-    altline:       { width: 81,  height: 42 }
-    wide:          { width: 108, height: 42 }
-    change-view:   { width: 81,  height: 42 }
-    change-view-2: { width: 108, height: 42 }
-    spaceline:     { width: 216, height: 42 }
-    special:       { width: 60,  height: 42 }
+    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"
+        - "Shift_L   z x c v b n m , BackSpace"
         - "show_numbers preferences         space        .    Return"
     upper:
         - "Q W E R T Y U I O P Å"
         - "A S D F G H J K L Ö Ä"
-        - "Shift_L   Z X C V B N M  BackSpace"
+        - "Shift_L   Z X C V B N M , BackSpace"
         - "show_numbers preferences         space        .    Return"
     numbers:
         - "§ 1 2 3 4 5 6 7 8 9 0"
         - "@ # € $ % & - _ + ( )"
-        - "show_symbols   , \" ' : ; ! ?  BackSpace"
+        - "show_symbols -- , \" ' : ; ! ? BackSpace"
         - "show_letters preferences         space        .    Return"
     symbols:
         - "µ ~ ` | · √ π τ ÷ × ¶"
         - "½ ¤ © ® £ ¥ ^ ° * { }"
-        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
+        - "show_numbers -- \\ / < > = [ ] BackSpace"
         - "show_letters preferences         space        .    Return"
 
 buttons:
@@ -48,17 +49,12 @@ buttons:
         outline: "special"
         icon: "keyboard-mode-symbolic"
     show_numbers:
-        action:
-            set_view: "numbers"
-        outline: "change-view-2"
-        label: "123"
-    show_numbers_from_symbols:
         action:
             set_view: "numbers"
         outline: "change-view"
         label: "123"
     show_letters:
-        outline: "change-view-2"
+        outline: "change-view"
         action:
             set_view: "base"
         label: "ABC"
@@ -67,8 +63,6 @@ buttons:
             set_view: "symbols"
         outline: "change-view"
         label: "*/="
-    .:
-        outline: "special"
     space:
         outline: "spaceline"
         text: " "
@@ -76,3 +70,6 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
+    --:
+        outline: "placeholder"
+        text: ""
\ No newline at end of file
diff --git a/data/keyboards/terminal/de.yaml b/data/keyboards/terminal/de.yaml
index b45de054..e1153eb8 100644
--- a/data/keyboards/terminal/de.yaml
+++ b/data/keyboards/terminal/de.yaml
@@ -13,6 +13,7 @@ outlines:
     change-view-2:    { width: 59,     height: 46 }
     spaceline:        { width: 92.29,  height: 46 }
     small:            { width: 50.471, height: 22 }
+    placeholder:      { width: 17.665, height: 46 }
 
 views:
     base:
@@ -36,7 +37,7 @@ views:
     symbols:
         - "TabSmall Ctrl Alt ↑ ↓ ← →"
         - "~ ` · √ π τ ÷ × ¶ @"
-        - "© ® £ € ¥ ^ ° { }"
+        - "-- © ® £ € ¥ ^ ° { } --"
         - "show_numbers   % | < > = [ ]  BackSpace"
         - "show_letters show_eschars preferences         space        . Return"
     eschars:
@@ -262,3 +263,6 @@ buttons:
         outline: "subtle-highlight"
     ß:
         outline: "subtle-highlight"
+    --:
+        outline: "placeholder"
+        text: ""
\ No newline at end of file
diff --git a/data/keyboards/terminal/de_wide.yaml b/data/keyboards/terminal/de_wide.yaml
index c3b34c3d..11070aa9 100644
--- a/data/keyboards/terminal/de_wide.yaml
+++ b/data/keyboards/terminal/de_wide.yaml
@@ -3,6 +3,7 @@ outlines:
     default:          { width: 54,   height: 37 }
     subtle-highlight: { width: 54,   height: 37 }
     halfwidth:        { width: 27,   height: 37 }
+    placeholder:      { width: 27,   height: 37 }
     narrow:           { width: 40.5, height: 37 }
     special:          { width: 54,   height: 37 }
     altline:          { width: 81,   height: 37 }
@@ -36,7 +37,7 @@ views:
     symbols:
         - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
         - "~ ` · √ π τ ÷ × ¶ @"
-        - "© ® £ € ¥ ^ ° { }"
+        - "-- © ® £ € ¥ ^ ° { } --"
         - "show_numbers   % | < > = [ ]  BackSpace"
         - "show_letters show_eschars preferences         space        . Return"
     eschars:
@@ -266,3 +267,6 @@ buttons:
         outline: "subtle-highlight"
     ß:
         outline: "subtle-highlight"
+    --:
+        outline: "placeholder"
+        text: ""
\ No newline at end of file
diff --git a/data/keyboards/terminal/es.yaml b/data/keyboards/terminal/es.yaml
index 3bb1145c..23dc4b46 100644
--- a/data/keyboards/terminal/es.yaml
+++ b/data/keyboards/terminal/es.yaml
@@ -2,6 +2,7 @@
 outlines:
     default:       { width: 35.33,  height: 46 }
     halfwidth:     { width: 17.665, height: 46 }
+    placeholder:   { width: 17.665, height: 46 }
     thin:          { width: 30.995, height: 46 }
     action:        { width: 59,     height: 46 }
     altline:       { width: 52.67,  height: 46 }
@@ -35,7 +36,7 @@ views:
     symbols:
         - "TabSmall Ctrl Alt ↑ ↓ ← →"
         - "~ ` · √ π τ ÷ × ¶ @"
-        - "© ® £ € ¥ ^ ° { }"
+        - "-- © ® £ € ¥ ^ ° { } --"
         - "show_numbers  % | < > = [ ]  BackSpace"
         - "show_letters show_eschars preferences         space        . Return"
     eschars:
@@ -258,3 +259,6 @@ buttons:
         outline: "halfwidth"
     _:
         outline: "halfwidth"
+    --:
+        outline: "placeholder"
+        text: ""
\ No newline at end of file
diff --git a/data/keyboards/terminal/es_wide.yaml b/data/keyboards/terminal/es_wide.yaml
index 96d21b9b..12804644 100644
--- a/data/keyboards/terminal/es_wide.yaml
+++ b/data/keyboards/terminal/es_wide.yaml
@@ -2,6 +2,7 @@
 outlines:
     default:       { width: 54,    height: 37 }
     halfwidth:     { width: 27,    height: 37 }
+    placeholder:   { width: 27,    height: 37 }
     thin:          { width: 47.25, height: 37 }
     action:        { width: 90,    height: 37 }
     altline:       { width: 81,    height: 37 }
@@ -35,7 +36,7 @@ views:
     symbols:
         - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
         - "~ ` · √ π τ ÷ × ¶ @"
-        - "© ® £ € ¥ ^ ° { }"
+        - "-- © ® £ € ¥ ^ ° { } --"
         - "show_numbers  % | < > = [ ]  BackSpace"
         - "show_letters show_eschars preferences         space        . Return"
     eschars:
@@ -101,7 +102,6 @@ buttons:
         label: ">_"
     .:
         outline: "large"
-        text: "."
     space:
         outline: "spaceline"
         text: " "
@@ -262,3 +262,6 @@ buttons:
         outline: "halfwidth"
     _:
         outline: "halfwidth"
+    --:
+        outline: "placeholder"
+        text: ""
\ No newline at end of file
diff --git a/data/keyboards/terminal/us.yaml b/data/keyboards/terminal/us.yaml
index fe486e2b..81370388 100644
--- a/data/keyboards/terminal/us.yaml
+++ b/data/keyboards/terminal/us.yaml
@@ -2,6 +2,7 @@
 outlines:
     default:       { width: 35.33,  height: 46 }
     halfwidth:     { width: 17.665, height: 46 }
+    placeholder:   { width: 17.665, height: 46 }
     narrow:        { width: 26.335, height: 46 }
     special:       { width: 44,     height: 46 }
     altline:       { width: 52.67,  height: 46 }
@@ -35,7 +36,7 @@ views:
     symbols:
         - "TabSmall Ctrl Alt ↑ ↓ ← →"
         - "~ ` · √ π τ ÷ × ¶ @"
-        - "© ® £ € ¥ ^ ° { }"
+        - "-- © ® £ € ¥ ^ ° { } --"
         - "show_numbers  % | < > = [ ]  BackSpace"
         - "show_letters preferences         space        . Return"
     actions:
@@ -222,3 +223,6 @@ buttons:
         outline: "halfwidth"
     _:
         outline: "halfwidth"
+    --:
+        outline: "placeholder"
+        text: ""
\ No newline at end of file
diff --git a/data/keyboards/terminal/us_wide.yaml b/data/keyboards/terminal/us_wide.yaml
index 3d76a96e..4f7d74ed 100644
--- a/data/keyboards/terminal/us_wide.yaml
+++ b/data/keyboards/terminal/us_wide.yaml
@@ -2,6 +2,7 @@
 outlines:
     default:       { width: 54,   height: 37 }
     halfwidth:     { width: 27,   height: 37 }
+    placeholder:   { width: 27,   height: 37 }
     narrow:        { width: 40.5, height: 37 }
     special:       { width: 54,   height: 37 }
     altline:       { width: 81,   height: 37 }
@@ -35,7 +36,7 @@ views:
     symbols:
         - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
         - "~ ` · √ π τ ÷ × ¶ @"
-        - "© ® £ € ¥ ^ ° { }"
+        - "-- © ® £ € ¥ ^ ° { } --"
         - "show_numbers  % | < > = [ ]  BackSpace"
         - "show_letters preferences         space        . Return"
     actions:
@@ -226,3 +227,6 @@ buttons:
         outline: "halfwidth"
     _:
         outline: "halfwidth"
+    --:
+        outline: "placeholder"
+        text: ""
\ No newline at end of file
diff --git a/data/keyboards/th.yaml b/data/keyboards/th.yaml
index 7144af31..e806c326 100644
--- a/data/keyboards/th.yaml
+++ b/data/keyboards/th.yaml
@@ -1,12 +1,14 @@
 ---
 outlines:
-    default:       { width: 35.33, 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: 142,   height: 52 }
-    special:       { width: 44,    height: 52 }
+    default:       { width: 34,     height: 52 }
+    large:         { width: 44,     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: 233.34, height: 52 }
+    special:       { width: 44,     height: 52 }
+    placeholder:   { width: 34,     height: 52 }
 
 views:
     base:
@@ -14,23 +16,25 @@ views:
         - "ๆ ไ ำ พ ะ ั ี ร น ย บ ล"
         - "ฟ ห ก ด เ ้ ่ า ส ว ง ฃ"
         - "Shift_L   ผ ป แ อ ิ ื ท ม ใ ฝ   BackSpace"
-        - "show_numbers preferences         space        PeriodLarge Return"
+        - "show_numbers preferences         space        .-large Return"
     upper:
         - "+ ๑ ๒ ๓ ๔ ู ฿ ๕ ๖ ๗ ๘ ๙"
         - "๐ \" ฎ ฑ ธ ํ ๊ ณ ฯ ญ ฐ ,"
         - "ฤ ฆ ฏ โ ฌ ็ ๋ ษ ศ ซ . ฅ"
         - "Shift_L   ( ) ฉ ฮ ฺ ์ ? ฒ ฬ ฦ  BackSpace"
-        - "show_numbers preferences         space        PeriodLarge Return"
+        - "show_numbers preferences         space        .-large Return"
     numbers:
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "@ # $ % & - _ + ( )"
-        - "show_symbols   , \" ' : ; ! ?  BackSpace"
-        - "show_letters preferences         space        PeriodLarge Return"
+        - "-- -- -- -- -- -- -- -- -- -- -- --"
+        - "-- -- , \" ' : ; ! ? -- -- --"
+        - "-- 1 2 3 4 5 6 7 8 9 0 --"
+        - "show_symbols @ # $ % & - _ + ( ) BackSpace"
+        - "show_letters preferences         space        .-large Return"
     symbols:
-        - "~ ` | · √ π τ ÷ × ¶"
-        - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        PeriodLarge Return"
+        - "-- -- -- -- -- -- -- -- -- -- -- --"
+        - "-- -- \\ / < > = [ ] -- -- --"
+        - "-- © ® £ € ¥ ^ ° * { } --"
+        - "show_numbers_from_symbols ~ ` | · √ π τ ÷ × ¶ BackSpace"
+        - "show_letters preferences         space        .-large Return"
 
 buttons:
     Shift_L:
@@ -68,9 +72,6 @@ buttons:
             set_view: "symbols"
         outline: "change-view"
         label: "*/="
-    PeriodLarge:
-        outline: "special"
-        text: "."
     space:
         outline: "spaceline"
         text: " "
@@ -78,3 +79,9 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
+    .-large:
+        outline: "large"
+        text: "."
+    --:
+        outline: "placeholder"
+        text: ""
\ No newline at end of file
diff --git a/data/keyboards/th_wide.yaml b/data/keyboards/th_wide.yaml
index 1450009a..f1384ca7 100644
--- a/data/keyboards/th_wide.yaml
+++ b/data/keyboards/th_wide.yaml
@@ -1,13 +1,13 @@
 ---
 outlines:
-    default:         { width: 75,  height: 56 }
-    altline:         { width: 75,  height: 56 }
-    wide:            { width: 135, height: 56 }
-    change-view:     { width: 75,  height: 56 }
-    change-view-2:   { width: 135, height: 56 }
-    spaceline:       { width: 450, height: 56 }
-    spacelinesymbol: { width: 300, height: 56 }
-    special:         { width: 90,  height: 56 }
+    default:       { width: 75,  height: 56 }
+    altline:       { width: 75,  height: 56 }
+    wide:          { width: 135, height: 56 }
+    change-view:   { width: 75,  height: 56 }
+    change-view-2: { width: 135, height: 56 }
+    spaceline:     { width: 480, height: 56 }
+    special:       { width: 75,  height: 56 }
+    placeholder:   { width: 75,  height: 56 }
 
 views:
     base:
@@ -15,23 +15,25 @@ views:
         - "ๆ ไ ำ พ ะ ั ี ร น ย บ ล"
         - "ฟ ห ก ด เ ้ ่ า ส ว ง ฃ"
         - "Shift_L   ผ ป แ อ ิ ื ท ม ใ ฝ   BackSpace"
-        - "show_numbers preferences         space        PeriodLarge Return"
+        - "show_numbers preferences         space        . Return"
     upper:
         - "+ ๑ ๒ ๓ ๔ ู ฿ ๕ ๖ ๗ ๘ ๙"
         - "๐ \" ฎ ฑ ธ ํ ๊ ณ ฯ ญ ฐ ,"
         - "ฤ ฆ ฏ โ ฌ ็ ๋ ษ ศ ซ . ฅ"
         - "Shift_L   ( ) ฉ ฮ ฺ ์ ? ฒ ฬ ฦ  BackSpace"
-        - "show_numbers preferences         space        PeriodLarge Return"
+        - "show_numbers preferences         space        . Return"
     numbers:
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "@ # $ % & - _ + ( )"
-        - "show_symbols   , \" ' : ; ! ?  BackSpace"
-        - "show_letters preferences         spacesymbol        PeriodLarge Return"
+        - "-- -- -- -- -- -- -- -- -- -- -- --"
+        - "-- -- , \" ' : ; ! ? -- -- --"
+        - "-- 1 2 3 4 5 6 7 8 9 0 --"
+        - "show_symbols @ # $ % & - _ + ( ) BackSpace"
+        - "show_letters preferences         space        . Return"
     symbols:
-        - "~ ` | · √ π τ ÷ × ¶"
-        - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         spacesymbol        PeriodLarge Return"
+        - "-- -- -- -- -- -- -- -- -- -- -- --"
+        - "-- -- \\ / < > = [ ] -- -- --"
+        - "-- © ® £ € ¥ ^ ° * { } --"
+        - "show_numbers_from_symbols ~ ` | · √ π τ ÷ × ¶ BackSpace"
+        - "show_letters preferences         space        . Return"
 
 buttons:
     Shift_L:
@@ -69,16 +71,13 @@ buttons:
             set_view: "symbols"
         outline: "change-view"
         label: "*/="
-    PeriodLarge:
-        outline: "special"
-        text: "."
     space:
         outline: "spaceline"
         text: " "
-    spacesymbol:
-        outline: "spacelinesymbol"
-        text: " "
     Return:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
+    --:
+        outline: "placeholder"
+        text: ""
\ No newline at end of file
diff --git a/data/keyboards/ua.yaml b/data/keyboards/ua.yaml
index 859f8167..efc8afd3 100644
--- a/data/keyboards/ua.yaml
+++ b/data/keyboards/ua.yaml
@@ -1,14 +1,17 @@
 ---
 outlines:
-    default:       { width: 32,  height: 52 }
-    altline:       { width: 32,  height: 52 }
-    wide:          { width: 57,  height: 52 }
-    change-view:   { width: 32,  height: 52 }
-    change-view-2: { width: 57,  height: 52 }
-    narrow:        { width: 26,  height: 52 }
-    spaceline:     { width: 107, height: 52 }
-    fill:          { width: 159, height: 52 }
-    special:       { width: 42,  height: 52 }
+    default:       { width: 32.45, height: 52 }
+    altline:       { width: 32,    height: 52 }
+    wide:          { width: 57,    height: 52 }
+    change-view:   { width: 32,    height: 52 }
+    change-view-2: { width: 57,    height: 52 }
+    narrow:        { width: 26,    height: 52 }
+    spaceline:     { width: 107,   height: 52 }
+    fill:          { width: 159,   height: 52 }
+    fill-2:        { width: 64.9,  height: 52 }
+    special:       { width: 42,    height: 52 }
+    large:         { width: 42,    height: 52 }
+    placeholder:   { width: 40,    height: 52 }
 
 views:
     base:
@@ -20,16 +23,16 @@ views:
         - "Й Ц У К Е Н Г Ш Щ З Х"
         - "Ф І В А П Р О Л Д Ж Є"
         - "Shift_L   Я Ч С М И Т Ь Б Ю  BackSpace"
-        - "show_numbers preferences    Ґ  space  Ї  CommaLarge Return"
+        - "show_numbers preferences    Ґ  space  Ї  ,-large Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
-        - "show_symbols   , \" ' : ; ! ?  BackSpace"
+        - "show_symbols , \" ' : ; ! ? -- BackSpace"
         - "show_letters preferences         space_fill   . Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers   \\ / < > = [ ]  BackSpace"
+        - "show_numbers \\ / < > = [ ] -- BackSpace"
         - "show_letters preferences         space_fill   . Return"
 
 buttons:
@@ -64,9 +67,9 @@ buttons:
         outline: "change-view-2"
         label: "*/="
     .:
-        outline: "special"
-    CommaLarge:
-        outline: "special"
+        outline: "large"
+    ",-large":
+        outline: "large"
         text: ","
     space:
         outline: "spaceline"
@@ -86,3 +89,14 @@ buttons:
         outline: "narrow"
     Ї:
         outline: "narrow"
+    --:
+        outline: "placeholder"
+        text: ""
+    5:
+        outline: "fill-2"
+    "&":
+        outline: "fill-2"
+    √:
+        outline: "fill-2"
+    ¥:
+        outline: "fill-2"
\ No newline at end of file
diff --git a/data/keyboards/ua_wide.yaml b/data/keyboards/ua_wide.yaml
index caaca3db..0b8da301 100644
--- a/data/keyboards/ua_wide.yaml
+++ b/data/keyboards/ua_wide.yaml
@@ -1,14 +1,16 @@
 ---
 outlines:
-    default:       { width: 48,    height: 42 }
-    altline:       { width: 48,    height: 42 }
+    default:       { width: 48.75, height: 42 }
+    altline:       { width: 48.75, height: 42 }
     wide:          { width: 85.5,  height: 42 }
-    change-view:   { width: 48,    height: 42 }
+    change-view:   { width: 48.75, height: 42 }
     change-view-2: { width: 85.5,  height: 42 }
     narrow:        { width: 39,    height: 42 }
-    spaceline:     { width: 160.5, height: 42 }
-    fill:          { width: 238.5, height: 42 }
-    special:       { width: 63,    height: 42 }
+    spaceline:     { width: 190,   height: 42 }
+    fill:          { width: 268,   height: 42 }
+    fill-2:        { width: 97.5,  height: 42 }
+    special:       { width: 48.75, height: 42 }
+    placeholder:   { width: 60.75, height: 42 }
 
 views:
     base:
@@ -20,16 +22,16 @@ views:
         - "Й Ц У К Е Н Г Ш Щ З Х"
         - "Ф І В А П Р О Л Д Ж Є"
         - "Shift_L   Я Ч С М И Т Ь Б Ю  BackSpace"
-        - "show_numbers preferences    Ґ  space  Ї  CommaLarge Return"
+        - "show_numbers preferences    Ґ  space  Ї  , Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
-        - "show_symbols   , \" ' : ; ! ?  BackSpace"
+        - "show_symbols , \" ' : ; ! ? -- BackSpace"
         - "show_letters preferences         space_fill   . Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
-        - "show_numbers   \\ / < > = [ ]  BackSpace"
+        - "show_numbers \\ / < > = [ ] -- BackSpace"
         - "show_letters preferences         space_fill   . Return"
 
 buttons:
@@ -63,11 +65,6 @@ buttons:
             set_view: "symbols"
         outline: "change-view-2"
         label: "*/="
-    .:
-        outline: "special"
-    CommaLarge:
-        outline: "special"
-        text: ","
     space:
         outline: "spaceline"
         text: " "
@@ -86,3 +83,14 @@ buttons:
         outline: "narrow"
     Ї:
         outline: "narrow"
+    --:
+        outline: "placeholder"
+        text: ""
+    5:
+        outline: "fill-2"
+    "&":
+        outline: "fill-2"
+    √:
+        outline: "fill-2"
+    ¥:
+        outline: "fill-2"
\ No newline at end of file
diff --git a/data/keyboards/url/us.yaml b/data/keyboards/url/us.yaml
index 5292b2dd..7dd86532 100644
--- a/data/keyboards/url/us.yaml
+++ b/data/keyboards/url/us.yaml
@@ -6,6 +6,7 @@ outlines:
     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:
@@ -66,9 +67,9 @@ buttons:
         outline: "change-view"
         label: "*/="
     .:
-        outline: "special"
+        outline: "large"
     SlashLarge:
-        outline: "special"
+        outline: "large"
         text: "/"
     space:
         outline: "spaceline"
diff --git a/data/keyboards/url/us_wide.yaml b/data/keyboards/url/us_wide.yaml
index 508c56e0..a760acd4 100644
--- a/data/keyboards/url/us_wide.yaml
+++ b/data/keyboards/url/us_wide.yaml
@@ -6,6 +6,7 @@ outlines:
     change-view-2: { width: 91.25, height: 42 }
     spaceline:     { width: 157,   height: 42 }
     special:       { width: 64.76, height: 42 }
+    large:         { width: 64.76, height: 42 }
 
 views:
     base:
@@ -66,9 +67,9 @@ buttons:
         outline: "change-view"
         label: "*/="
     .:
-        outline: "special"
+        outline: "large"
     SlashLarge:
-        outline: "special"
+        outline: "large"
         text: "/"
     space:
         outline: "spaceline"
diff --git a/data/keyboards/us+colemak.yaml b/data/keyboards/us+colemak.yaml
index 4b74ef49..f1c4afc7 100644
--- a/data/keyboards/us+colemak.yaml
+++ b/data/keyboards/us+colemak.yaml
@@ -7,15 +7,17 @@ outlines:
     change-view-2: { width: 62,    height: 52 }
     spaceline:     { width: 142,   height: 52 }
     special:       { width: 44,    height: 52 }
+    large:         { width: 44,    height: 52 }
+    placeholder:   { width: 35.33, height: 52 }
 
 views:
     base:
-        - "q w f p g j l u y"
+        - "q w f p g j l u y --"
         - "a r s t d h n e i o"
         - "Shift_L   z x c v b k m  BackSpace"
         - "show_numbers preferences         space        . Return"
     upper:
-        - "Q W F P G J L U Y"
+        - "Q W F P G J L U Y --"
         - "A R S T D H N E I O"
         - "Shift_L   Z X C V B K M  BackSpace"
         - "show_numbers preferences         space        . Return"
@@ -67,7 +69,7 @@ buttons:
         outline: "change-view"
         label: "*/="
     .:
-        outline: "special"
+        outline: "large"
     space:
         outline: "spaceline"
         text: " "
@@ -75,3 +77,6 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
+    --:
+        outline: "placeholder"
+        text: ""
\ No newline at end of file
diff --git a/data/keyboards/us+colemak_wide.yaml b/data/keyboards/us+colemak_wide.yaml
index 67298811..391e9021 100644
--- a/data/keyboards/us+colemak_wide.yaml
+++ b/data/keyboards/us+colemak_wide.yaml
@@ -7,15 +7,17 @@ outlines:
     change-view-2: { width: 108, height: 42 }
     spaceline:     { width: 216, height: 42 }
     special:       { width: 54,  height: 42 }
+    large:         { width: 54,  height: 42 }
+    placeholder:   { width: 54,  height: 42 }
 
 views:
     base:
-        - "q w f p g j l u y"
+        - "q w f p g j l u y --"
         - "a r s t d h n e i o"
         - "Shift_L   z x c v b k m  BackSpace"
         - "show_numbers preferences         space        . Return"
     upper:
-        - "Q W F P G J L U Y"
+        - "Q W F P G J L U Y --"
         - "A R S T D H N E I O"
         - "Shift_L   Z X C V B K M  BackSpace"
         - "show_numbers preferences         space        . Return"
@@ -67,7 +69,7 @@ buttons:
         outline: "change-view"
         label: "*/="
     .:
-        outline: "special"
+        outline: "large"
     space:
         outline: "spaceline"
         text: " "
@@ -75,3 +77,6 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
+    --:
+        outline: "placeholder"
+        text: ""
\ No newline at end of file
diff --git a/data/keyboards/us+dvorak.yaml b/data/keyboards/us+dvorak.yaml
index 81e535a6..8a1f4ad2 100644
--- a/data/keyboards/us+dvorak.yaml
+++ b/data/keyboards/us+dvorak.yaml
@@ -7,6 +7,7 @@ outlines:
     change-view-2: { width: 62,    height: 52 }
     spaceline:     { width: 142,   height: 52 }
     special:       { width: 44,    height: 52 }
+    large:         { width: 44,    height: 52 }
 
 views:
     base:
@@ -67,7 +68,7 @@ buttons:
         outline: "change-view"
         label: "*/="
     .:
-        outline: "special"
+        outline: "large"
     space:
         outline: "spaceline"
         text: " "
diff --git a/data/keyboards/us+dvorak_wide.yaml b/data/keyboards/us+dvorak_wide.yaml
index 31350643..7d713844 100644
--- a/data/keyboards/us+dvorak_wide.yaml
+++ b/data/keyboards/us+dvorak_wide.yaml
@@ -7,6 +7,7 @@ outlines:
     change-view-2: { width: 108, height: 42 }
     spaceline:     { width: 216, height: 42 }
     special:       { width: 54,  height: 42 }
+    large:         { width: 54,  height: 42 }
 
 views:
     base:
@@ -67,7 +68,7 @@ buttons:
         outline: "change-view"
         label: "*/="
     .:
-        outline: "special"
+        outline: "large"
     space:
         outline: "spaceline"
         text: " "
diff --git a/data/keyboards/us.yaml b/data/keyboards/us.yaml
index 38db4ef1..59c45fcb 100644
--- a/data/keyboards/us.yaml
+++ b/data/keyboards/us.yaml
@@ -7,6 +7,7 @@ outlines:
     wide:          { width: 62,    height: 52 }
     spaceline:     { width: 141.3, height: 52 }
     special:       { width: 44,    height: 52 }
+    large:         { width: 44,    height: 52 }
 
 views:
     base:
@@ -67,7 +68,7 @@ buttons:
         outline: "change-view"
         label: "*/="
     .:
-        outline: "special"
+        outline: "large"
     space:
         outline: "spaceline"
         text: " "
diff --git a/data/keyboards/us_wide.yaml b/data/keyboards/us_wide.yaml
index 3fd77036..46b3c136 100644
--- a/data/keyboards/us_wide.yaml
+++ b/data/keyboards/us_wide.yaml
@@ -7,6 +7,7 @@ outlines:
     wide:          { width: 108, height: 42 }
     spaceline:     { width: 216, height: 42 }
     special:       { width: 54,  height: 42 }
+    large:         { width: 54,  height: 42 }
 
 views:
     base:
@@ -67,7 +68,7 @@ buttons:
         outline: "change-view"
         label: "*/="
     .:
-        outline: "special"
+        outline: "large"
     space:
         outline: "spaceline"
         text: " "
diff --git a/data/style-Adwaita:dark.css b/data/style-Adwaita:dark.css
index 7cd7a6f1..147d7e76 100644
--- a/data/style-Adwaita:dark.css
+++ b/data/style-Adwaita:dark.css
@@ -13,11 +13,13 @@ sq_button:active {
     background: #747077;
 }
 
-sq_button.subtle-highlight {
+sq_button.subtle-highlight,
+sq_button.subtle-highlight-2 {
     background: #3f3e41;
 }
 
-sq_button.subtle-highlight:active {
+sq_button.subtle-highlight:active,
+sq_button.subtle-highlight-2:active {
     background: #676669;
 }
 
diff --git a/data/style.css b/data/style.css
index 3939ed33..2f4e0c37 100644
--- a/data/style.css
+++ b/data/style.css
@@ -14,11 +14,13 @@ sq_button:active {
     background: alpha(@theme_fg_color, 0.11);
 }
 
-sq_button.subtle-highlight {
+sq_button.subtle-highlight,
+sq_button.subtle-highlight-2 {
     background: alpha(@theme_fg_color, 0.105);
 }
 
-sq_button.subtle-highlight:active {
+sq_button.subtle-highlight:active,
+sq_button.subtle-highlight-2:active {
     background: alpha(@theme_fg_color, 0.16);
 }