diff --git a/data/keyboards/am+phonetic.yaml b/data/keyboards/am+phonetic.yaml
index 7c25c4a2..86f3ae7c 100644
--- a/data/keyboards/am+phonetic.yaml
+++ b/data/keyboards/am+phonetic.yaml
@@ -15,24 +15,24 @@ views:
         - "ք ո ե ր տ ը ւ ի օ պ խ ծ շ"
         - "ա ս դ ֆ գ հ յ կ լ ․"
         - "Shift_L զ ղ ց վ բ ն մ ՛ BackSpace"
-        - "show_numbers preferences         space        period Return"
+        - "show_numbers preferences         space        . Return"
     upper:
         - "՝ Է Թ Փ Ձ Ջ Ւ և Ռ Չ Ճ — Ժ"
         - "Ք Ո Ե Ր Տ Ը Ւ Ի Օ Պ Խ Ծ Շ"
         - "Ա Ս Դ Ֆ Գ Հ Յ Կ Լ ։"
         - "Shift_L Զ Ղ Ց Վ Բ Ն Մ ՞ BackSpace"
-        - "show_numbers preferences         space        period Return"
+        - "show_numbers preferences         space        . Return"
     numbers:
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
+        - "show_symbols   , \" ' : ; ! ?  BackSpace"
         - "ﬓ  ﬔ  ﬕ  ﬖ  ﬗ   ՟ և"
         - "1 2 3 4 5 6 7 8 9 0"
-        - "show_letters preferences         space        period Return"
+        - "show_letters preferences         space        . Return"
     symbols:
         - "show_numbers_from_symbols   \\ % < > = [ ]  BackSpace"
         - "* # $ / & - _ + ( )"
         - "© ® £ € ¥ ^ ° @ { }"
         - "~ ` | · √ π τ ÷ × ¶"
-        - "show_letters preferences         space        period Return"
+        - "show_letters preferences         space        . Return"
 
 buttons:
     Shift_L:
@@ -70,9 +70,8 @@ buttons:
             set_view: "symbols"
         outline: "altline"
         label: "*/="
-    period:
+    .:
         outline: "special"
-        text: "."
     space:
         outline: "spaceline"
         text: " "
@@ -80,5 +79,3 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    colon:
-        text: ":"
diff --git a/data/keyboards/am.yaml b/data/keyboards/am.yaml
index 50d8bf91..adee5719 100644
--- a/data/keyboards/am.yaml
+++ b/data/keyboards/am.yaml
@@ -15,24 +15,24 @@ views:
         - "ճ փ բ ս մ ո ւ կ ը թ ծ ց »"
         - "ջ վ գ ե ա ն ի տ հ պ ր"
         - "Shift_L ժ դ չ յ զ լ ք խ շ ռ BackSpace"
-        - "show_numbers preferences         space        period Return"
+        - "show_numbers preferences         space        . Return"
     upper:
         - "՜ Ֆ Ձ — $ … ՟ և ՚ ( Օ Է Ղ"
         - "Ճ Փ Բ Ս Մ Ո Ւ Կ Ը Թ Ծ Ց «"
         - "Ջ Վ Գ Ե Ա Ն Ի Տ Հ Պ Պ Ր"
         - "Shift_L Ժ Դ Չ Յ Զ Լ Ք Խ Շ Ռ BackSpace"
-        - "show_numbers preferences         space        period Return"
+        - "show_numbers preferences         space        . Return"
     numbers:
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
+        - "show_symbols   , \" ' : ; ! ?  BackSpace"
         - "ﬓ  ﬔ  ﬕ  ﬖ  ﬗ   ՟ և"
         - "1 2 3 4 5 6 7 8 9 0"
-        - "show_letters preferences         space        period Return"
+        - "show_letters preferences         space        . Return"
     symbols:
         - "show_numbers_from_symbols   \\ % < > = [ ]  BackSpace"
         - "* # $ / & - _ + ( )"
         - "© ® £ € ¥ ^ ° @ { }"
         - "~ ` | · √ π τ ÷ × ¶"
-        - "show_letters preferences         space        period Return"
+        - "show_letters preferences         space        . Return"
 
 buttons:
     Shift_L:
@@ -70,9 +70,8 @@ buttons:
             set_view: "symbols"
         outline: "altline"
         label: "*/="
-    period:
+    .:
         outline: "special"
-        text: "."
     space:
         outline: "spaceline"
         text: " "
@@ -80,5 +79,3 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    colon:
-        text: ":"
diff --git a/data/keyboards/be.yaml b/data/keyboards/be.yaml
index 6598b048..92ccd4ea 100644
--- a/data/keyboards/be.yaml
+++ b/data/keyboards/be.yaml
@@ -20,7 +20,7 @@ views:
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # € % & - _ + ( )"
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
+        - "show_symbols   , \" ' : ; ! ?  BackSpace"
         - "show_letters preferences         space        show_eschars Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
@@ -83,7 +83,3 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    colon:
-        text: ":"
-    "\"":
-        keysym: "quotedbl"
diff --git a/data/keyboards/be_wide.yaml b/data/keyboards/be_wide.yaml
index 69c1029f..46da0856 100644
--- a/data/keyboards/be_wide.yaml
+++ b/data/keyboards/be_wide.yaml
@@ -20,7 +20,7 @@ views:
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # € % & - _ + ( )"
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
+        - "show_symbols   , \" ' : ; ! ?  BackSpace"
         - "show_letters preferences         space        show_eschars Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
@@ -83,7 +83,3 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    colon:
-        text: ":"
-    "\"":
-        keysym: "quotedbl"
diff --git a/data/keyboards/bg+phonetic.yaml b/data/keyboards/bg+phonetic.yaml
index e7d1e3e1..4e64c2df 100644
--- a/data/keyboards/bg+phonetic.yaml
+++ b/data/keyboards/bg+phonetic.yaml
@@ -20,7 +20,7 @@ views:
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # € % & - _ + ( )"
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
+        - "show_symbols   , \" ' : ; ! ?  BackSpace"
         - "show_letters preferences         space        Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
@@ -72,7 +72,3 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    colon:
-        text: ":"
-    "\"":
-        keysym: "quotedbl"
diff --git a/data/keyboards/bg.yaml b/data/keyboards/bg.yaml
index 79582bf3..47fd8046 100644
--- a/data/keyboards/bg.yaml
+++ b/data/keyboards/bg.yaml
@@ -20,7 +20,7 @@ views:
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # € % & - _ + ( )"
-        - "show_symbols , \" ' colon ; ! ? ѝ BackSpace"
+        - "show_symbols , \" ' : ; ! ? ѝ BackSpace"
         - "show_letters preferences         space        Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
@@ -72,7 +72,3 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    colon:
-        text: ":"
-    "\"":
-        keysym: "quotedbl"
diff --git a/data/keyboards/br.yaml b/data/keyboards/br.yaml
index bea779db..03b8798a 100644
--- a/data/keyboards/br.yaml
+++ b/data/keyboards/br.yaml
@@ -16,17 +16,17 @@ views:
         - "Q W E R T Y U I O P"
         - "A S D F G H J K L Ç"
         - "Shift_L   Z X C V B N M  BackSpace"
-        - "show_numbers preferences         space     period Return"
+        - "show_numbers preferences         space     . Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "à À á Á ã Ã â Â é É"
         - "show_symbols   ê Ê í Í ó Ó ô Ô"
-        - "show_letters        õ Õ ú Ú ü Ü period BackSpace"
+        - "show_letters        õ Õ ú Ú ü Ü . BackSpace"
     symbols:
         - "@ # $ % - + ÷ × = ≠"
         - "( ) § & < > / * { }"
-        - "show_numbers_from_symbols     º \" ' colon ; ! ?  BackSpace"
-        - "show_letters preferences         space        period Return"
+        - "show_numbers_from_symbols     º \" ' : ; ! ?  BackSpace"
+        - "show_letters preferences         space        . Return"
 
 buttons:
     Shift_L:
@@ -64,9 +64,8 @@ buttons:
             set_view: "symbols"
         outline: "altline"
         label: "*/="
-    period:
+    .:
         outline: "special"
-        text: "."
     space:
         outline: "spaceline"
         text: " "
@@ -74,5 +73,3 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    colon:
-        text: ":"
diff --git a/data/keyboards/ca.yaml b/data/keyboards/ca.yaml
index 9a832d6b..7caf38c9 100644
--- a/data/keyboards/ca.yaml
+++ b/data/keyboards/ca.yaml
@@ -20,7 +20,7 @@ views:
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
+        - "show_symbols   , \" ' : ; ! ?  BackSpace"
         - "show_letters preferences         space        show_eschars Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
@@ -76,9 +76,6 @@ buttons:
                 unlock_view: "base"
         outline: "altline"
         label: "âÂ"
-    period:
-        outline: "special"
-        text: "."
     space:
         outline: "spaceline"
         text: " "
@@ -86,8 +83,6 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    colon:
-        text: ":"
 
 
 
diff --git a/data/keyboards/ch+de.yaml b/data/keyboards/ch+de.yaml
index 008a6d72..d2bae4b2 100644
--- a/data/keyboards/ch+de.yaml
+++ b/data/keyboards/ch+de.yaml
@@ -69,5 +69,3 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    "\"":
-        keysym: "quotedbl"
diff --git a/data/keyboards/ch+fr.yaml b/data/keyboards/ch+fr.yaml
index 1a79d284..2f1cfab2 100644
--- a/data/keyboards/ch+fr.yaml
+++ b/data/keyboards/ch+fr.yaml
@@ -80,5 +80,3 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    "\"":
-        keysym: "quotedbl"
diff --git a/data/keyboards/ch.yaml b/data/keyboards/ch.yaml
index e1932f99..9ade76b6 100644
--- a/data/keyboards/ch.yaml
+++ b/data/keyboards/ch.yaml
@@ -83,8 +83,6 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    "\"":
-        keysym: "quotedbl"
     °:
         outline: "doublewidth"
     "|":
diff --git a/data/keyboards/ch_wide.yaml b/data/keyboards/ch_wide.yaml
index 8e600285..1a6d239e 100644
--- a/data/keyboards/ch_wide.yaml
+++ b/data/keyboards/ch_wide.yaml
@@ -85,8 +85,6 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    "\"":
-        keysym: "quotedbl"
     °:
         outline: "large"
     ".":
diff --git a/data/keyboards/cz+qwerty.yaml b/data/keyboards/cz+qwerty.yaml
index 89b21cd9..af93637c 100644
--- a/data/keyboards/cz+qwerty.yaml
+++ b/data/keyboards/cz+qwerty.yaml
@@ -20,7 +20,7 @@ views:
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
-        - "show_symbols    , \" ' colon ; ! ?    BackSpace"
+        - "show_symbols    , \" ' : ; ! ?    BackSpace"
         - "show_letters preferences show_accents    space    , . Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
@@ -102,5 +102,3 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    colon:
-        text: ":"
diff --git a/data/keyboards/cz+qwerty_wide.yaml b/data/keyboards/cz+qwerty_wide.yaml
index 0076fdf8..e791db34 100644
--- a/data/keyboards/cz+qwerty_wide.yaml
+++ b/data/keyboards/cz+qwerty_wide.yaml
@@ -20,7 +20,7 @@ views:
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
-        - "show_symbols    , \" ' colon ; ! ?    BackSpace"
+        - "show_symbols    , \" ' : ; ! ?    BackSpace"
         - "show_letters preferences show_accents    space    , . Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
@@ -102,5 +102,3 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    colon:
-        text: ":"
diff --git a/data/keyboards/cz.yaml b/data/keyboards/cz.yaml
index e414724e..971beffb 100644
--- a/data/keyboards/cz.yaml
+++ b/data/keyboards/cz.yaml
@@ -20,7 +20,7 @@ views:
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
-        - "show_symbols    , \" ' colon ; ! ?    BackSpace"
+        - "show_symbols    , \" ' : ; ! ?    BackSpace"
         - "show_letters preferences show_accents    space    , . Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
@@ -102,5 +102,3 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    colon:
-        text: ":"
diff --git a/data/keyboards/cz_wide.yaml b/data/keyboards/cz_wide.yaml
index 8b5a27f1..4dc3701a 100644
--- a/data/keyboards/cz_wide.yaml
+++ b/data/keyboards/cz_wide.yaml
@@ -20,7 +20,7 @@ views:
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
-        - "show_symbols    , \" ' colon ; ! ?    BackSpace"
+        - "show_symbols    , \" ' : ; ! ?    BackSpace"
         - "show_letters preferences show_accents    space    , . Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
@@ -102,5 +102,3 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    colon:
-        text: ":"
diff --git a/data/keyboards/de.yaml b/data/keyboards/de.yaml
index 4d114dd1..ed73ff04 100644
--- a/data/keyboards/de.yaml
+++ b/data/keyboards/de.yaml
@@ -73,7 +73,6 @@ buttons:
         label: "Ää"
     space:
         outline: "spaceline"
-        label: " "
         text: " "
     Return:
         outline: "altline"
diff --git a/data/keyboards/dk.yaml b/data/keyboards/dk.yaml
index abb0f0fb..0769206f 100644
--- a/data/keyboards/dk.yaml
+++ b/data/keyboards/dk.yaml
@@ -22,8 +22,8 @@ views:
         - "show_symbols   , \" ' : ; ! ?  BackSpace"
         - "show_letters preferences         space        .    Return"
     symbols:
-        - "~ ` | U00B7 squareroot Greek_pi Greek_tau division multiply paragraph"
-        - "copyright U00AE U00A3 EuroSign U00A5 asciicircum degree * { }"
+        - "~ ` | · √ π τ ÷ × ¶"
+        - "© ® £ € ¥ ^ ° * { }"
         - "show_numbers   \\ / < > = [ ]  BackSpace"
         - "show_letters preferences         space        .    Return"
 
@@ -61,37 +61,9 @@ buttons:
     ".":
         outline: altline
     space:
-        outline: spaceline
+        outline: "spaceline"
         text: " "
     Return:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    U00B7:
-        text: "·"
-    squareroot:
-        text: "√"
-    Greek_pi:
-        text: "π"
-    division:
-        text: "÷"
-    multiply:
-        text: "×"
-    paragraph:
-        text: "¶"
-    Greek_tau:
-        text: "τ"
-    copyright:
-        text: "©"
-    U00AE:
-        text: "®"
-    U00A3:
-        text: "£"
-    EuroSign:
-        text: "€"
-    U00A5:
-        text: "¥"
-    asciicircum:
-        text: "^"
-    degree:
-        text: "°"
diff --git a/data/keyboards/email/us.yaml b/data/keyboards/email/us.yaml
index 748b3da5..0cae6434 100644
--- a/data/keyboards/email/us.yaml
+++ b/data/keyboards/email/us.yaml
@@ -12,22 +12,22 @@ views:
         - "q w e r t y u i o p"
         - "a s d f g h j k l"
         - "Shift_L   z x c v b n m  BackSpace"
-        - "show_numbers preferences         space        at period Return"
+        - "show_numbers preferences         space        @ . Return"
     upper:
         - "Q W E R T Y U I O P"
         - "A S D F G H J K L"
         - "Shift_L   Z X C V B N M  BackSpace"
-        - "show_numbers preferences         space        at period Return"
+        - "show_numbers preferences         space        @ . Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
-        - "show_letters preferences         space        at period Return"
+        - "show_symbols   , \" ' : ; ! ?  BackSpace"
+        - "show_letters preferences         space        @ . Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
         - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        at period Return"
+        - "show_letters preferences         space        @ . Return"
 
 buttons:
     Shift_L:
@@ -41,9 +41,8 @@ buttons:
         outline: "altline"
         icon: "edit-clear-symbolic"
         action: erase
-    at:
+    "@":
         outline: "large"
-        text: "@"
     preferences:
         action: "show_prefs"
         outline: "special"
@@ -68,9 +67,8 @@ buttons:
             set_view: "symbols"
         outline: "altline"
         label: "*/="
-    period:
+    .:
         outline: "large"
-        text: "."
     space:
         outline: "spaceline"
         text: " "
@@ -78,5 +76,3 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    colon:
-        text: ":"
diff --git a/data/keyboards/es+cat.yaml b/data/keyboards/es+cat.yaml
index ca13e028..0efa1645 100644
--- a/data/keyboards/es+cat.yaml
+++ b/data/keyboards/es+cat.yaml
@@ -11,22 +11,22 @@ views:
         - "q w e r t y u i o p"
         - "a s d f g h j k l ç"
         - "Shift_L   z x c v b n m  BackSpace"
-        - "show_numbers show_eschars preferences         space        ? period Return"
+        - "show_numbers show_eschars preferences         space        ? . Return"
     upper:
         - "Q W E R T Y U I O P"
         - "A S D F G H J K L Ç"
         - "Shift_L   Z X C V B N M  BackSpace"
-        - "show_numbers show_eschars preferences         space        ¿ period Return"
+        - "show_numbers show_eschars preferences         space        ¿ . Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # € % & - _ + ( )"
-        - "show_symbols   , \" ' colon ; ! = BackSpace"
-        - "show_letters show_eschars preferences         space        ? period Return"
+        - "show_symbols   , \" ' : ; ! = BackSpace"
+        - "show_letters show_eschars preferences         space        ? . Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ $ ¥ ^ ° * { }"
         - "show_numbers   \\ / < > = [ ]  BackSpace"
-        - "show_letters show_eschars preferences         space        ? period Return"
+        - "show_letters show_eschars preferences         space        ? . Return"
     eschars:
         - "á é í ó ú Á É Í Ó Ú"
         - "à è ì ò ù À È Ì Ò Ù"
@@ -71,10 +71,6 @@ buttons:
                 unlock_view: "base"
         outline: "altline"
         label: "àÀ"
-
-    period:
-        outline: "default"
-        text: "."
     space:
         outline: "spaceline"
         text: " "
@@ -82,6 +78,3 @@ buttons:
         outline: "altline"
         icon: "key-enter"
         keysym: "Return"
-    colon:
-        text: ":"
-
diff --git a/data/keyboards/es.yaml b/data/keyboards/es.yaml
index 471c0f39..41c896e9 100644
--- a/data/keyboards/es.yaml
+++ b/data/keyboards/es.yaml
@@ -11,22 +11,22 @@ views:
         - "q w e r t y u i o p"
         - "a s d f g h j k l ñ"
         - "Shift_L   z x c v b n m  BackSpace"
-        - "show_numbers show_eschars preferences         space        ? period Return"
+        - "show_numbers show_eschars preferences         space        ? . Return"
     upper:
         - "Q W E R T Y U I O P"
         - "A S D F G H J K L Ñ"
         - "Shift_L   Z X C V B N M  BackSpace"
-        - "show_numbers show_eschars preferences         space        ¿ period Return"
+        - "show_numbers show_eschars preferences         space        ¿ . Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # € % & - _ + ( )"
-        - "show_symbols   , \" ' colon ; ! = BackSpace"
-        - "show_letters show_eschars preferences         space        ? period Return"
+        - "show_symbols   , \" ' : ; ! = BackSpace"
+        - "show_letters show_eschars preferences         space        ? . Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ $ ¥ ^ ° * { }"
         - "show_numbers   \\ / < > = [ ]  BackSpace"
-        - "show_letters show_eschars preferences         space        ? period Return"
+        - "show_letters show_eschars preferences         space        ? . Return"
     eschars:
         - "á é í ó ú Á É Í Ó Ú"
         - "à è ì ò ù À È Ì Ò Ù"
@@ -71,10 +71,6 @@ buttons:
                 unlock_view: "base"
         outline: "altline"
         label: "áÁ"
-
-    period:
-        outline: "default"
-        text: "."
     space:
         outline: "spaceline"
         text: " "
@@ -82,6 +78,3 @@ buttons:
         outline: "altline"
         icon: "key-enter"
         keysym: "Return"
-    colon:
-        text: ":"
-
diff --git a/data/keyboards/fi.yaml b/data/keyboards/fi.yaml
index 82674d26..5363a2f7 100644
--- a/data/keyboards/fi.yaml
+++ b/data/keyboards/fi.yaml
@@ -18,13 +18,13 @@ views:
         - "show_numbers preferences         space        .    Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
-        - "at numbersign dollar percent ampersand minus underscore plus parenleft parenright"
-        - "show_symbols   comma quotedbl quoteright colon semicolon exclam question  BackSpace"
+        - "@ # $ % & - _ + ( )"
+        - "show_symbols   , \" ' : ; ! ?  BackSpace"
         - "show_letters preferences         space        .    Return"
     symbols:
-        - "asciitilde quoteleft bar U00B7 squareroot Greek_pi Greek_tau division multiply paragraph"
-        - "copyright U00AE U00A3 EuroSign U00A5 asciicircum degree asterisk braceleft braceright"
-        - "show_numbers   backslash slash less greater equal bracketleft bracketright  BackSpace"
+        - "~ ` | · √ π τ ÷ × ¶"
+        - "© ® £ € ¥ ^ ° * { }"
+        - "show_numbers   \\ / < > = [ ]  BackSpace"
         - "show_letters preferences         space        .    Return"
 
 buttons:
@@ -67,104 +67,3 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    aring:
-        text: "å"
-    Aring:
-        text: "Å"
-    ouml:
-        text: "ö"
-    Ouml:
-        text: "Ö"
-    auml:
-        text: "ä"
-    Auml:
-        text: "Ä"
-    asterisk:
-        text: "*"
-    asciitilde:
-        text: "~"
-    quoteleft:
-        text: "`"
-    bar:
-        text: "|"
-    U00B7:
-        text: "·"
-    squareroot:
-        text: "√"
-    Greek_pi:
-        text: "π"
-    division:
-        text: "÷"
-    multiply:
-        text: "×"
-    paragraph:
-        text: "¶"
-    Greek_tau:
-        text: "τ"
-    copyright:
-        text: "©"
-    numbersign:
-        text: "#"
-    U00AE:
-        text: "®"
-    at:
-        text: "@"
-    dollar:
-        text: "$"
-    U00A3:
-        text: "£"
-    percent:
-        text: "%"
-    EuroSign:
-        text: "€"
-    ampersand:
-        text: "&"
-    U00A5:
-        text: "¥"
-    minus:
-        text: "-"
-    asciicircum:
-        text: "^"
-    underscore:
-        text: "_"
-    degree:
-        text: "°"
-    plus:
-        text: "+"
-    equal:
-        text: "="
-    parenleft:
-        text: "("
-    parenright:
-        text: ")"
-    braceleft:
-        text: "{"
-    braceright:
-        text: "}"
-    comma:
-        text: ","
-    backslash:
-        text: "\\"
-    slash:
-        text: "/"
-    quotedbl:
-        text: "\""
-    quoteright:
-        text: "'"
-    less:
-        text: "<"
-    greater:
-        text: ">"
-    colon:
-        text: ":"
-    semicolon:
-        text: ";"
-    exclam:
-        text: "!"
-    question:
-        text: "?"
-    bracketleft:
-        text: "["
-    bracketright:
-        text: "]"
-
diff --git a/data/keyboards/fr+bepo.yaml b/data/keyboards/fr+bepo.yaml
index ce5e38c3..10a01c43 100644
--- a/data/keyboards/fr+bepo.yaml
+++ b/data/keyboards/fr+bepo.yaml
@@ -11,18 +11,18 @@ views:
     base:
         - "b é p o w v d l j z"
         - "a u i e c t s r n m"
-        - "Shift_L y x k q g h f period BackSpace"
+        - "Shift_L y x k q g h f . BackSpace"
         - "show_numbers preferences         space    show_eschars Return"
     upper:
         - "B É P O W V D L J Z"
         - "A U I E C T S R N M"
         - "Shift_L   Y X K Q G H F -  BackSpace"
-        - "show_numbers preferences         space  colon   show_eschars Return"
+        - "show_numbers preferences         space  :   show_eschars Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # € % & - _ + ( )"
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
-        - "show_letters preferences         space        show_eschars  Return"
+        - "show_symbols   , \" ' : ; ! ?  BackSpace"
+        - "show_letters preferences         space        show_eschars Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ $ ¥ ^ ° * { }"
@@ -35,122 +35,6 @@ views:
         - "show_letters preferences         space        show_eschars  Return"
  
 buttons:
-    F1:
-        outline: "action"
-        keysym: "F1"
-    F2:
-        outline: "action"
-        keysym: "F2"
-    F3:
-        outline: "action"
-        keysym: "F3"
-    F4:
-        outline: "action"
-        keysym: "F4"
-    F5:
-        outline: "action"
-        keysym: "F5"
-    F6:
-        outline: "action"
-        keysym: "F6"
-    F7:
-        outline: "action"
-        keysym: "F7"
-    F8:
-        outline: "action"
-        keysym: "F8"
-    F9:
-        outline: "action"
-        keysym: "F9"
-    F10:
-        outline: "action"
-        keysym: "F10"
-    F11:
-        outline: "action"
-        keysym: "F11"
-    F12:
-        outline: "action"
-        keysym: "F12"
-    Esc:
-        outline: "action"
-        keysym: "Escape"
-    Tab:
-        outline: "action"
-        keysym: "Tab"
-    Del:
-        outline: "action"
-        keysym: "Delete"
-    Insert:
-        outline: "action"
-        keysym: "Insert"
-    Menu:
-        outline: "action"
-        keysym: "Menu"
-    Pause:
-        outline: "action"
-        keysym: "Pause"
-    Break:
-        outline: "action"
-        keysym: "Break"
-    Home:
-        outline: "small"
-        keysym: "Home"
-    End:
-        outline: "small"
-        keysym: "End"
-    PgUp:
-        outline: "small"
-        keysym: "Page_Up"
-    PgDn:
-        outline: "small"
-        keysym: "Page_Down"
-    "↑":
-        outline: "small"
-        keysym: "Up"
-    "↓":
-        outline: "small"
-        keysym: "Down"
-    "←":
-        outline: "small"
-        keysym: "Left"
-    "→":
-        outline: "small"
-        keysym: "Right"
-    Up:
-        label: "↑"
-        outline: "action"
-        keysym: "Up"
-    Left:
-        label: "←"
-        outline: "action"
-        keysym: "Left"
-    Down:
-        label: "↓"
-        outline: "action"
-        keysym: "Down"
-    Right:
-        label: "→"
-        outline: "action"
-        keysym: "Right"
-    Ctrl:
-        modifier: "Control"
-        outline: "small"
-        label: "Ctrl"
-    Alt:
-        modifier: "Alt"
-        outline: "small"
-        label: "Alt"
-    period:
-        outline: "special"
-        text: "."
-    slash:
-        outline: "special"
-        text: "/"
-    show_actions:
-        action:
-            set_view: "actions"
-        outline: "special"
-        label: ">_"
     Shift_L:
         action:
             locking:
@@ -200,7 +84,5 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    colon:
-        text: ":"
-    "\"":
-        keysym: "quotedbl"
+    .:
+        outline: "special"
diff --git a/data/keyboards/fr+bepo_wide.yaml b/data/keyboards/fr+bepo_wide.yaml
index afbd194d..f15754a7 100644
--- a/data/keyboards/fr+bepo_wide.yaml
+++ b/data/keyboards/fr+bepo_wide.yaml
@@ -16,11 +16,11 @@ views:
         - "B É P O W V D L J Z"
         - "A U I E C T S R N M"
         - "Shift_L   Y X K Q G H F -  BackSpace"
-        - "show_numbers preferences         space  colon   show_eschars Return"
+        - "show_numbers preferences         space  :   show_eschars Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # € % & - _ + ( )"
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
+        - "show_symbols   , \" ' : ; ! ?  BackSpace"
         - "show_letters preferences         space        show_eschars Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
@@ -83,7 +83,3 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    colon:
-        text: ":"
-    "\"":
-        keysym: "quotedbl"
diff --git a/data/keyboards/fr.yaml b/data/keyboards/fr.yaml
index 6598b048..92ccd4ea 100644
--- a/data/keyboards/fr.yaml
+++ b/data/keyboards/fr.yaml
@@ -20,7 +20,7 @@ views:
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # € % & - _ + ( )"
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
+        - "show_symbols   , \" ' : ; ! ?  BackSpace"
         - "show_letters preferences         space        show_eschars Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
@@ -83,7 +83,3 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    colon:
-        text: ":"
-    "\"":
-        keysym: "quotedbl"
diff --git a/data/keyboards/fr_wide.yaml b/data/keyboards/fr_wide.yaml
index 69c1029f..46da0856 100644
--- a/data/keyboards/fr_wide.yaml
+++ b/data/keyboards/fr_wide.yaml
@@ -20,7 +20,7 @@ views:
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # € % & - _ + ( )"
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
+        - "show_symbols   , \" ' : ; ! ?  BackSpace"
         - "show_letters preferences         space        show_eschars Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
@@ -83,7 +83,3 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    colon:
-        text: ":"
-    "\"":
-        keysym: "quotedbl"
diff --git a/data/keyboards/ge.yaml b/data/keyboards/ge.yaml
index 04a2bea0..3b399e9a 100644
--- a/data/keyboards/ge.yaml
+++ b/data/keyboards/ge.yaml
@@ -11,22 +11,22 @@ views:
         - "ქ წ ე რ ტ ყ უ ი ო პ"
         - "ა ს დ ფ გ ჰ ჯ კ ლ"
         - "Shift_L ზ ხ ც ვ ბ ნ მ BackSpace"
-        - "show_numbers preferences         space        period Return"
+        - "show_numbers preferences         space        . Return"
     upper:
         - "ქ ჭ ე ღ თ ყ უ ი ო პ"
         - "ა შ დ ფ გ ჰ ჟ კ ლ"
         - "Shift_L ძ ხ ჩ ვ ბ ნ მ BackSpace"
-        - "show_numbers preferences         space        period Return"
+        - "show_numbers preferences         space        . Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "! @ # $ % ^ & * ( )"
-        - "show_symbols   - ' \" colon ; , ?   BackSpace"
-        - "show_letters preferences         space        period Return"
+        - "show_symbols   - ' \" : ; , ?   BackSpace"
+        - "show_letters preferences         space        . Return"
     symbols:
         - "+ ⨯ ÷ = / _ € £ ¥ ₾"
         - "~ ` | · √ π τ ° { }"
         - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        period Return"
+        - "show_letters preferences         space        . Return"
 
 buttons:
     Shift_L:
@@ -64,9 +64,8 @@ buttons:
             set_view: "symbols"
         outline: "altline"
         label: "*/="
-    period:
+    .:
         outline: "special"
-        text: "."
     space:
         outline: "spaceline"
         text: " "
@@ -74,5 +73,3 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    colon:
-        text: ":"
diff --git a/data/keyboards/gr+polytonic.yaml b/data/keyboards/gr+polytonic.yaml
index 36375070..dc4675d1 100644
--- a/data/keyboards/gr+polytonic.yaml
+++ b/data/keyboards/gr+polytonic.yaml
@@ -13,15 +13,15 @@ outlines:
 
 views:
     base:
-        - "semicolon ς ε ρ τ υ θ ι ο π"
+        - "; ς ε ρ τ υ θ ι ο π"
         - "α σ δ φ γ η ξ κ λ show_accents"
         - "Shift_L ζ χ ψ ω β ν μ BackSpace"
-        - "show_numbers preferences space period comma Return"
+        - "show_numbers preferences space . CommaSpecial Return"
     upper:
-        - "colon EuroSign Ε Ρ Τ Υ Θ Ι Ο Π"
+        - ": € Ε Ρ Τ Υ Θ Ι Ο Π"
         - "Α Σ Δ Φ Γ Η Ξ Κ Λ show_accents"
         - "Shift_L Ζ Χ Ψ Ω Β Ν Μ BackSpace"
-        - "show_numbers preferences space exclam period_upper Return"
+        - "show_numbers preferences space ! ·Special Return"
     accents:
         - "show_psiliordasiaandvaria show_psiliordasiaandoxia show_psiliordasia show_bariaorperispomeni show_oxia"
         - "show_PsiliOrDasiaAndVaria show_PsiliOrDasiaAndOxia show_PsiliOrDasia show_BariaOrPerispomeni show_Oxia show_base"
@@ -31,12 +31,12 @@ views:
         - "ά έ ή ί ϊ ΐ ό ύ ϋ ώ"
         - "show_Oxia ᾳ ᾴ ῃ ῄ ῳ ῴ show_base"
         - "Ϗ ϐ ϑ ϗ ϖ ΰ ϕ – — BackSpace"
-        - "show_numbers preferences space eis_l eis_r Return"
+        - "show_numbers preferences space « » Return"
     Oxia:
         - "Ά Έ Ή Ί Ϊ Ό Ύ Ϋ Ώ"
         - "show_oxia ᾼ ῌ ῼ show_base"
         - "Ϗ ϐ ϑ ϗ ϖ ϕ – — BackSpace"
-        - "show_numbers preferences space eis_l eis_r Return"
+        - "show_numbers preferences space « » Return"
     bariaorperispomeni:
         - "ὰ ὲ ὴ ὶ ῒ ὸ ὺ ὼ ῐ ῑ"
         - "show_BariaOrPerispomeni ᾳ ᾲ ῃ ῂ ῳ ῲ ῠ show_base"
@@ -88,14 +88,14 @@ views:
         - "show_numbers preferences space Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
-        - "at numbersign dollar percent ampersand minus underscore plus parenleft parenright"
-        - "show_symbols comma quotedbl quoteright colon semicolon exclam question BackSpace"
-        - "show_letters preferences space period comma Return"
+        - "@ # $ % & - _ + ( )"
+        - "show_symbols CommaSpecial \" ' : ; ! ? BackSpace"
+        - "show_letters preferences space . CommaSpecial Return"
     symbols:
-        - "asciitilde quoteleft bar U00B7 squareroot Greek_pi Greek_tau division multiply paragraph"
-        - "copyright U00AE U00A3 EuroSign U00A5 asciicircum degree asterisk braceleft braceright"
-        - "show_numbers backslash slash less greater equal bracketleft bracketright  BackSpace"
-        - "show_letters preferences space period comma Return"
+        - "~ ` | · √ π τ ÷ × ¶"
+        - "© ® £ € ¥ ^ ° * { }"
+        - "show_numbers \\ / < > = [ ]  BackSpace"
+        - "show_letters preferences space . CommaSpecial Return"
 buttons:
     Shift_L:
         action:
@@ -206,121 +206,23 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    period:
+    .:
         outline: "special"
-        text: "."
-    period_upper:
+    ·Special:
         outline: "special"
         text: "·"
-    comma:
+    CommaSpecial:
         outline: "special"
         text: ","
-    colon:
+    ":":
         outline: "special"
-        text: ":"
-    semicolon:
+    ;:
         outline: "special"
-        text: ";"
-    exclam:
+    "!":
         outline: "special"
-        text: "!"
-    eis_l:
+    «:
         outline: "special"
-        text: "«"
-    eis_r:
+    »:
         outline: "special"
-        text: "»"
-    aring:
-        text: "å"
-    Aring:
-        text: "Å"
-    oslash:
-        text: "ø"
-    Oslash:
-        text: "Ø"
-    ae:
-        text: "æ"
-    AE:
-        text: "Æ"
-    asterisk:
-        text: "*"
-    asciitilde:
-        text: "~"
-    quoteleft:
-        text: "`"
-    bar:
-        text: "|"
-    U00B7:
-        text: "·"
-    squareroot:
-        text: "√"
-    Greek_pi:
-        text: "π"
-    division:
-        text: "÷"
-    multiply:
-        text: "×"
-    paragraph:
-        text: "¶"
-    Greek_tau:
-        text: "τ"
-    copyright:
-        text: "©"
-    numbersign:
-        text: "#"
-    U00AE:
-        text: "®"
-    at:
-        text: "@"
-    dollar:
-        text: "$"
-    U00A3:
-        text: "£"
-    percent:
-        text: "%"
-    EuroSign:
+    €:
         outline: "special"
-        text: "€"
-    ampersand:
-        text: "&"
-    U00A5:
-        text: "¥"
-    minus:
-        text: "-"
-    asciicircum:
-        text: "^"
-    underscore:
-        text: "_"
-    degree:
-        text: "°"
-    plus:
-        text: "+"
-    equal:
-        text: "="
-    parenleft:
-        text: "("
-    parenright:
-        text: ")"
-    braceleft:
-        text: "{"
-    braceright:
-        text: "}"
-    backslash:
-        text: "\\"
-    slash:
-        text: "/"
-    quotedbl:
-        text: "\""
-    quoteright:
-        text: "'"
-    less:
-        text: "<"
-    greater:
-        text: ">"
-    question:
-        text: "?"
-    bracketleft:
-        text: "["
-    bracketright:
-        text: "]"
-
diff --git a/data/keyboards/gr.yaml b/data/keyboards/gr.yaml
index 613ef141..c48cc9a9 100644
--- a/data/keyboards/gr.yaml
+++ b/data/keyboards/gr.yaml
@@ -12,30 +12,30 @@ outlines:
 
 views:
     base:
-        - "semicolon ς ε ρ τ υ θ ι ο π"
+        - "; ς ε ρ τ υ θ ι ο π"
         - "α σ δ φ γ η ξ κ λ show_accented"
         - "Shift_L ζ χ ψ ω β ν μ BackSpace"
-        - "show_numbers preferences space period comma Return"
+        - "show_numbers preferences space . CommaSpecial Return"
     upper:
-        - "colon exclam Ε Ρ Τ Υ Θ Ι Ο Π"
+        - ": ! Ε Ρ Τ Υ Θ Ι Ο Π"
         - "Α Σ Δ Φ Γ Η Ξ Κ Λ show_accented"
         - "Shift_L Ζ Χ Ψ Ω Β Ν Μ BackSpace"
-        - "show_numbers preferences space period_upper apostrophe Return"
+        - "show_numbers preferences space ·Special ᾿ Return"
     accented:
         - "ά έ ή ί ϊ ΐ ό ύ ϋ ώ "
         - "Ά Έ Ή Ί Ϊ Ό Ύ Ϋ Ώ show_base"
         - "Ϗ ϐ ϑ ϗ ϖ ΰ ϕ – — BackSpace"
-        - "show_numbers preferences space eis_l eis_r Return"
+        - "show_numbers preferences space « » Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
-        - "at numbersign dollar percent ampersand minus underscore plus parenleft parenright"
-        - "show_symbols comma quotedbl quoteright colon semicolon exclam question BackSpace"
-        - "show_letters preferences space period comma Return"
+        - "@ # $ % & - _ + ( )"
+        - "show_symbols CommaSpecial \" ' : ; ! ? BackSpace"
+        - "show_letters preferences space . CommaSpecial Return"
     symbols:
-        - "asciitilde quoteleft bar U00B7 squareroot Greek_pi Greek_tau division multiply paragraph"
-        - "copyright U00AE U00A3 EuroSign U00A5 asciicircum degree asterisk braceleft braceright"
-        - "show_numbers backslash slash less greater equal bracketleft bracketright  BackSpace"
-        - "show_letters preferences space period comma Return"
+        - "~ ` | · √ π τ ÷ × ¶"
+        - "© ® £ € ¥ ^ ° * { }"
+        - "show_numbers \\ / < > = [ ]  BackSpace"
+        - "show_letters preferences space . CommaSpecial Return"
 buttons:
     Shift_L:
         action:
@@ -86,123 +86,23 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    period:
+    .:
         outline: "special"
-        text: "."
-    period_upper:
+    ·Special:
         outline: "special"
         text: "·"
-    comma:
+    CommaSpecial:
         outline: "special"
         text: ","
-    colon:
+    ":":
         outline: "special"
-        text: ":"
-    semicolon:
+    ;:
         outline: "special"
-        text: ";"
-    apostrophe:
+    ᾿:
         outline: "special"
-        text: "᾿"
-    exclam:
+    "!":
         outline: "special"
-        text: "!"
-    eis_l:
+    «:
         outline: "special"
-        text: "«"
-    eis_r:
+    »:
         outline: "special"
-        text: "»"
-    aring:
-        text: "å"
-    Aring:
-        text: "Å"
-    oslash:
-        text: "ø"
-    Oslash:
-        text: "Ø"
-    ae:
-        text: "æ"
-    AE:
-        text: "Æ"
-    asterisk:
-        text: "*"
-    asciitilde:
-        text: "~"
-    quoteleft:
-        text: "`"
-    bar:
-        text: "|"
-    U00B7:
-        text: "·"
-    squareroot:
-        text: "√"
-    Greek_pi:
-        text: "π"
-    division:
-        text: "÷"
-    multiply:
-        text: "×"
-    paragraph:
-        text: "¶"
-    Greek_tau:
-        text: "τ"
-    copyright:
-        text: "©"
-    numbersign:
-        text: "#"
-    U00AE:
-        text: "®"
-    at:
-        text: "@"
-    dollar:
-        text: "$"
-    U00A3:
-        text: "£"
-    percent:
-        text: "%"
-    EuroSign:
-        text: "€"
-    ampersand:
-        text: "&"
-    U00A5:
-        text: "¥"
-    minus:
-        text: "-"
-    asciicircum:
-        text: "^"
-    underscore:
-        text: "_"
-    degree:
-        text: "°"
-    plus:
-        text: "+"
-    equal:
-        text: "="
-    parenleft:
-        text: "("
-    parenright:
-        text: ")"
-    braceleft:
-        text: "{"
-    braceright:
-        text: "}"
-    backslash:
-        text: "\\"
-    slash:
-        text: "/"
-    quotedbl:
-        text: "\""
-    quoteright:
-        text: "'"
-    less:
-        text: "<"
-    greater:
-        text: ">"
-    question:
-        text: "?"
-    bracketleft:
-        text: "["
-    bracketright:
-        text: "]"
-
diff --git a/data/keyboards/gr_wide.yaml b/data/keyboards/gr_wide.yaml
index cb7aee65..6e02abbe 100644
--- a/data/keyboards/gr_wide.yaml
+++ b/data/keyboards/gr_wide.yaml
@@ -1,4 +1,4 @@
-# Creaed by Sotiris Papadopoulos, sotirios.papadopoulos@inserm.fr
+# Created by Sotiris Papadopoulos, sotirios.papadopoulos@inserm.fr
 ---
 outlines:
     default:   { width: 80,  height: 60 }
@@ -9,30 +9,30 @@ outlines:
 
 views:
     base:
-        - "semicolon ς ε ρ τ υ θ ι ο π"
+        - "; ς ε ρ τ υ θ ι ο π"
         - "α σ δ φ γ η ξ κ λ show_accented"
         - "Shift_L ζ χ ψ ω β ν μ BackSpace"
-        - "show_numbers preferences space period comma Return"
+        - "show_numbers preferences space . CommaSpecial Return"
     upper:
-        - "colon exclam Ε Ρ Τ Υ Θ Ι Ο Π"
+        - ": ! Ε Ρ Τ Υ Θ Ι Ο Π"
         - "Α Σ Δ Φ Γ Η Ξ Κ Λ show_accented"
         - "Shift_L Ζ Χ Ψ Ω Β Ν Μ BackSpace"
-        - "show_numbers preferences space period_upper apostrophe Return"
+        - "show_numbers preferences space ·Special ᾿ Return"
     accented:
         - "ά έ ή ί ϊ ΐ ό ύ ϋ ώ "
         - "Ά Έ Ή Ί Ϊ Ό Ύ Ϋ Ώ show_base"
         - "Ϗ ϐ ϑ ϗ ΰ ϕ ϖ – — BackSpace"
-        - "show_numbers preferences space eis_l eis_r Return"
+        - "show_numbers preferences space « » Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
-        - "at numbersign dollar percent ampersand minus underscore plus parenleft parenright"
-        - "show_symbols comma quotedbl quoteright colon semicolon exclam question BackSpace"
-        - "show_letters preferences space period comma Return"
+        - "@ # $ % & - _ + ( )"
+        - "show_symbols CommaSpecial \" ' : ; ! ? BackSpace"
+        - "show_letters preferences space . CommaSpecial Return"
     symbols:
-        - "asciitilde quoteleft bar U00B7 squareroot Greek_pi Greek_tau division multiply paragraph"
-        - "copyright U00AE U00A3 EuroSign U00A5 asciicircum degree asterisk braceleft braceright"
-        - "show_numbers backslash slash less greater equal bracketleft bracketright  BackSpace"
-        - "show_letters preferences space period comma Return"
+        - "~ ` | · √ π τ ÷ × ¶"
+        - "© ® £ € ¥ ^ ° * { }"
+        - "show_numbers \\ / < > = [ ]  BackSpace"
+        - "show_letters preferences space . CommaSpecial Return"
 buttons:
     Shift_L:
         action:
@@ -83,122 +83,23 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    period:
+    .:
         outline: "special"
-        text: "."
-    period_upper:
+    ·Special:
         outline: "special"
         text: "·"
-    comma:
+    CommaSpecial:
         outline: "special"
         text: ","
-    colon:
+    ":":
         outline: "special"
-        text: ":"
-    semicolon:
+    ;:
         outline: "special"
-        text: ";"
-    apostrophe:
+    ᾿:
         outline: "special"
-        text: "᾿"
-    exclam:
+    "!":
         outline: "special"
-        text: "!"
-    eis_l:
+    «:
         outline: "special"
-        text: "«"
-    eis_r:
+    »:
         outline: "special"
-        text: "»"
-    aring:
-        text: "å"
-    Aring:
-        text: "Å"
-    oslash:
-        text: "ø"
-    Oslash:
-        text: "Ø"
-    ae:
-        text: "æ"
-    AE:
-        text: "Æ"
-    asterisk:
-        text: "*"
-    asciitilde:
-        text: "~"
-    quoteleft:
-        text: "`"
-    bar:
-        text: "|"
-    U00B7:
-        text: "·"
-    squareroot:
-        text: "√"
-    Greek_pi:
-        text: "π"
-    division:
-        text: "÷"
-    multiply:
-        text: "×"
-    paragraph:
-        text: "¶"
-    Greek_tau:
-        text: "τ"
-    copyright:
-        text: "©"
-    numbersign:
-        text: "#"
-    U00AE:
-        text: "®"
-    at:
-        text: "@"
-    dollar:
-        text: "$"
-    U00A3:
-        text: "£"
-    percent:
-        text: "%"
-    EuroSign:
-        text: "€"
-    ampersand:
-        text: "&"
-    U00A5:
-        text: "¥"
-    minus:
-        text: "-"
-    asciicircum:
-        text: "^"
-    underscore:
-        text: "_"
-    degree:
-        text: "°"
-    plus:
-        text: "+"
-    equal:
-        text: "="
-    parenleft:
-        text: "("
-    parenright:
-        text: ")"
-    braceleft:
-        text: "{"
-    braceright:
-        text: "}"
-    backslash:
-        text: "\\"
-    slash:
-        text: "/"
-    quotedbl:
-        text: "\""
-    quoteright:
-        text: "'"
-    less:
-        text: "<"
-    greater:
-        text: ">"
-    question:
-        text: "?"
-    bracketleft:
-        text: "["
-    bracketright:
-        text: "]"
diff --git a/data/keyboards/il.yaml b/data/keyboards/il.yaml
index 1d5d21b7..ada245d0 100644
--- a/data/keyboards/il.yaml
+++ b/data/keyboards/il.yaml
@@ -11,24 +11,24 @@ views:
         - "' - ק  ר א ט ו ן ם פ"
         - "ש ד ג כ ע י ח ל ך ף"
         - "ז ס ב ה נ מ צ ת ץ  BackSpace"
-        - "show_numbers comma preferences         space        period Return"
+        - "show_numbers CommaLarge preferences         space        . Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # ₪ % & - _ + ( )"
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
-        - "show_letters preferences         space        period Return"
+        - "show_symbols   , \" ' : ; ! ?  BackSpace"
+        - "show_letters preferences         space        . Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € $ ^ ° * { }"
         - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        period Return"
+        - "show_letters preferences         space        . Return"
 
 buttons:
     BackSpace:
         outline: "default"
         icon: "edit-clear-symbolic"
         action: erase
-    comma:
+    CommaLarge:
         outline: "special"
         text: ","
         
@@ -56,9 +56,8 @@ buttons:
             set_view: "symbols"
         outline: "altline"
         label: "*/="
-    period:
+    .:
         outline: "special"
-        text: "."
     space:
         outline: "spaceline"
         text: " "
@@ -66,6 +65,3 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    colon:
-        text: ":"
-
diff --git a/data/keyboards/ir.yaml b/data/keyboards/ir.yaml
index 507a29b3..e0fb9975 100644
--- a/data/keyboards/ir.yaml
+++ b/data/keyboards/ir.yaml
@@ -11,7 +11,7 @@ views:
         - "ض ص ث ق ف غ ع ه خ ح ج"
         - "ش س ی ب ل ا ت ن م ک گ"
         - "Shift_L  ظ ط ز ر ذ د پ و  BackSpace"
-        - "show_numbers preferences         space     zwnj period Return"
+        - "show_numbers preferences         space     zwnj . Return"
     upper:
         - "  ْ  ٌ  ٍ  ً  ُ  ِ  َ  ّ # @ چ"
         - "_ ئ ي إ أ آ ة » « : ؛"
@@ -21,12 +21,12 @@ views:
         - "۱ ۲ ۳ ۴ ۵ ۶ ۷ ۸ ۹ ۰ |"
         - "… ٬ ٫ ﷼ ٪ ، * ) ( − ـ"
         - "show_symbols + - × ÷ = ^ % / BackSpace"
-        - "show_letters preferences         space        period Return"
+        - "show_letters preferences         space        . Return"
     symbols:
         - "& ` | · • % π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
         - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        period Return"
+        - "show_letters preferences         space        . Return"
 
 buttons:
     Shift_L:
@@ -64,9 +64,8 @@ buttons:
             set_view: "symbols"
         outline: "altline"
         label: "*/="
-    period:
+    .:
         outline: "special"
-        text: "."
     space:
         outline: "spaceline"
         text: " "
@@ -77,5 +76,3 @@ buttons:
     zwnj:
         icon: "zwnj"
         text: "‌"
-    colon:
-        text: ":"
diff --git a/data/keyboards/ir_wide.yaml b/data/keyboards/ir_wide.yaml
index 1929256d..a5f988dc 100644
--- a/data/keyboards/ir_wide.yaml
+++ b/data/keyboards/ir_wide.yaml
@@ -11,22 +11,22 @@ views:
         - "ض ص ث ق ف غ ع ه خ ح ج چ \\"
         - "ش س ی ب ل ا ت ن م ک گ"
         - "Shift_L ظ ط ز ر ذ د پ و ، / BackSpace"
-        - "show_numbers preferences         space     zwnj ؟ ! period Return"
+        - "show_numbers preferences         space     zwnj ؟ ! . Return"
     upper:
         - " ْ  ٌ  ٍ  ً  ُ  ِ  َ  ّ  ] [ @ # _"
         - "ؤ ئ ي إ أ آ ة » « : ؛"
         - "Shift_L ك  ٓ ژ ٰ  ‌  ٔ  ء  >  <  ؟ BackSpace"
-        - "show_numbers preferences         space        ، ؟ ! period Return"
+        - "show_numbers preferences         space        ، ؟ ! . Return"
     numbers:
         - "۱ ۲ ۳ ۴ ۵ ۶ ۷ ۸ ۹ ۰ | ="
         - "… ٬ ٫ ﷼ ٪ ، * ) ( − _"
         - "show_symbols + - × ÷ = ^ % / BackSpace"
-        - "show_letters preferences         space        ، ؟ ! period Return"
+        - "show_letters preferences         space        ، ؟ ! . Return"
     symbols:
         - "& ` | · • % π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
         - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        ، ؟ ! period Return"
+        - "show_letters preferences         space        ، ؟ ! . Return"
 
 buttons:
     Shift_L:
@@ -64,9 +64,8 @@ buttons:
             set_view: "symbols"
         outline: "altline"
         label: "*/="
-    period:
+    .:
         outline: "special"
-        text: "."
     space:
         outline: "spaceline"
         text: " "
@@ -77,5 +76,3 @@ buttons:
     zwnj:
         icon: "zwnj"
         text: "‌"
-    colon:
-        text: ":"
diff --git a/data/keyboards/no.yaml b/data/keyboards/no.yaml
index 4a35e8f5..3a187077 100644
--- a/data/keyboards/no.yaml
+++ b/data/keyboards/no.yaml
@@ -23,8 +23,8 @@ views:
         - "show_symbols   , \" ' : ; ! ?  BackSpace"
         - "show_letters preferences         space        .    Return"
     symbols:
-        - "~ ` | U00B7 squareroot Greek_pi Greek_tau division multiply paragraph"
-        - "copyright U00AE U00A3 EuroSign U00A5 asciicircum degree * { }"
+        - "~ ` | · √ π τ ÷ × ¶"
+        - "© ® £ € ¥ ^ ° * { }"
         - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
         - "show_letters preferences         space        .    Return"
 
@@ -73,32 +73,3 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    U00B7:
-        text: "·"
-    squareroot:
-        text: "√"
-    Greek_pi:
-        text: "π"
-    division:
-        text: "÷"
-    multiply:
-        text: "×"
-    paragraph:
-        text: "¶"
-    Greek_tau:
-        text: "τ"
-    copyright:
-        text: "©"
-    U00AE:
-        text: "®"
-    U00A3:
-        text: "£"
-    EuroSign:
-        text: "€"
-    U00A5:
-        text: "¥"
-    asciicircum:
-        text: "^"
-    degree:
-        text: "°"
-
diff --git a/data/keyboards/pl.yaml b/data/keyboards/pl.yaml
index 37433007..c075f7e6 100644
--- a/data/keyboards/pl.yaml
+++ b/data/keyboards/pl.yaml
@@ -20,13 +20,13 @@ views:
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
-        - "show_letters preferences         space        period Return"
+        - "show_symbols   , \" ' : ; ! ?  BackSpace"
+        - "show_letters preferences         space        . Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
         - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        period Return"
+        - "show_letters preferences         space        . Return"
     accents:
         - "q w ę r t y u i ó p"
         - "ą ś d f g h j k ł"
@@ -100,9 +100,8 @@ buttons:
                     - "accents"
         outline: "altline"
         label: "ĄĘ"
-    period:
+    .:
         outline: "altline"
-        text: "."
     space:
         outline: "spaceline"
         text: " "
@@ -110,5 +109,3 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    colon:
-        text: ":"
diff --git a/data/keyboards/pl_wide.yaml b/data/keyboards/pl_wide.yaml
index 58f1e9a2..24d0a4e0 100644
--- a/data/keyboards/pl_wide.yaml
+++ b/data/keyboards/pl_wide.yaml
@@ -20,13 +20,13 @@ views:
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
-        - "show_letters preferences         space        period Return"
+        - "show_symbols   , \" ' : ; ! ?  BackSpace"
+        - "show_letters preferences         space        . Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
         - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        period Return"
+        - "show_letters preferences         space        . Return"
     accents:
         - "q w ę r t y u i ó p"
         - "ą ś d f g h j k ł"
@@ -88,9 +88,8 @@ buttons:
                 unlock_view: "upper"
         outline: "altline"
         label: "ĄĘ"
-    period:
+    .:
         outline: "altline"
-        text: "."
     space:
         outline: "spaceline"
         text: " "
@@ -98,5 +97,3 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    colon:
-        text: ":"
diff --git a/data/keyboards/ro.yaml b/data/keyboards/ro.yaml
index cb884f94..2ddf2588 100644
--- a/data/keyboards/ro.yaml
+++ b/data/keyboards/ro.yaml
@@ -20,7 +20,7 @@ views:
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # € % & - _ + ( )"
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
+        - "show_symbols   , \" ' : ; ! ?  BackSpace"
         - "show_letters show_eschars preferences         space        . Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
@@ -83,7 +83,3 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    colon:
-        text: ":"
-    "\"":
-        keysym: "quotedbl"
diff --git a/data/keyboards/ro_wide.yaml b/data/keyboards/ro_wide.yaml
index 6c15063d..d7269040 100644
--- a/data/keyboards/ro_wide.yaml
+++ b/data/keyboards/ro_wide.yaml
@@ -20,7 +20,7 @@ views:
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # € % & - _ + ( )"
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
+        - "show_symbols   , \" ' : ; ! ?  BackSpace"
         - "show_letters show_eschars preferences         space        . Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
@@ -83,7 +83,3 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    colon:
-        text: ":"
-    "\"":
-        keysym: "quotedbl"
diff --git a/data/keyboards/ru.yaml b/data/keyboards/ru.yaml
index 7430f8a5..2fd16e1e 100644
--- a/data/keyboards/ru.yaml
+++ b/data/keyboards/ru.yaml
@@ -13,7 +13,7 @@ views:
         - "й ц у к е н г ш щ з х"
         - "ф ы в а п р о л д ж э"
         - "Shift_L  я ч с м и т ь б ю  BackSpace"
-        - "show_numbers preferences    ё  space  ъ  period Return"
+        - "show_numbers preferences    ё  space  ъ  . Return"
     upper:
         - "Й Ц У К Е Н Г Ш Щ З Х"
         - "Ф Ы В А П Р О Л Д Ж Э"
@@ -22,13 +22,13 @@ views:
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
-        - "show_letters preferences         space_fill   period Return"
+        - "show_symbols   , \" ' : ; ! ?  BackSpace"
+        - "show_letters preferences         space_fill   . Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
         - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space_fill   period Return"
+        - "show_letters preferences         space_fill   . Return"
 
 buttons:
     Shift_L:
@@ -66,9 +66,8 @@ buttons:
             set_view: "symbols"
         outline: "wide"
         label: "*/="
-    period:
+    .:
         outline: "special"
-        text: "."
     comma:
         outline: "special"
         text: ","
@@ -82,8 +81,6 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    colon:
-        text: ":"
     ё:
         outline: "narrow"
     Ё:
diff --git a/data/keyboards/se.yaml b/data/keyboards/se.yaml
index d9b2d722..0804f944 100644
--- a/data/keyboards/se.yaml
+++ b/data/keyboards/se.yaml
@@ -20,13 +20,13 @@ views:
         - "show_numbers preferences         space        .    Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
-        - "at numbersign dollar percent ampersand minus underscore plus parenleft parenright"
-        - "show_symbols   comma quotedbl quoteright colon semicolon exclam question  BackSpace"
+        - "@ # $ % & - _ + ( )"
+        - "show_symbols   , \" ' : ; ! ?  BackSpace"
         - "show_letters preferences         space        .    Return"
     symbols:
-        - "asciitilde quoteleft bar U00B7 squareroot Greek_pi Greek_tau division multiply paragraph"
-        - "copyright U00AE U00A3 EuroSign U00A5 asciicircum degree asterisk braceleft braceright"
-        - "show_numbers_from_symbols   backslash slash less greater equal bracketleft bracketright  BackSpace"
+        - "~ ` | · √ π τ ÷ × ¶"
+        - "© ® £ € ¥ ^ ° * { }"
+        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
         - "show_letters preferences         space        .    Return"
 
 buttons:
@@ -74,91 +74,3 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    asterisk:
-        text: "*"
-    asciitilde:
-        text: "~"
-    quoteleft:
-        text: "`"
-    bar:
-        text: "|"
-    U00B7:
-        text: "·"
-    squareroot:
-        text: "√"
-    Greek_pi:
-        text: "π"
-    division:
-        text: "÷"
-    multiply:
-        text: "×"
-    paragraph:
-        text: "¶"
-    Greek_tau:
-        text: "τ"
-    copyright:
-        text: "©"
-    numbersign:
-        text: "#"
-    U00AE:
-        text: "®"
-    at:
-        text: "@"
-    dollar:
-        text: "$"
-    U00A3:
-        text: "£"
-    percent:
-        text: "%"
-    EuroSign:
-        text: "€"
-    ampersand:
-        text: "&"
-    U00A5:
-        text: "¥"
-    minus:
-        text: "-"
-    asciicircum:
-        text: "^"
-    underscore:
-        text: "_"
-    degree:
-        text: "°"
-    plus:
-        text: "+"
-    equal:
-        text: "="
-    parenleft:
-        text: "("
-    parenright:
-        text: ")"
-    braceleft:
-        text: "{"
-    braceright:
-        text: "}"
-    comma:
-        text: ","
-    backslash:
-        text: "\\"
-    slash:
-        text: "/"
-    quotedbl:
-        text: "\""
-    quoteright:
-        text: "'"
-    less:
-        text: "<"
-    greater:
-        text: ">"
-    colon:
-        text: ":"
-    semicolon:
-        text: ";"
-    exclam:
-        text: "!"
-    question:
-        text: "?"
-    bracketleft:
-        text: "["
-    bracketright:
-        text: "]"
diff --git a/data/keyboards/se_wide.yaml b/data/keyboards/se_wide.yaml
index 8df661ce..5cc5ecb0 100644
--- a/data/keyboards/se_wide.yaml
+++ b/data/keyboards/se_wide.yaml
@@ -20,13 +20,13 @@ views:
         - "show_numbers preferences         space        .    Return"
     numbers:
         - "§ 1 2 3 4 5 6 7 8 9 0"
-        - "at numbersign EuroSign dollar percent ampersand minus underscore plus parenleft parenright"
-        - "show_symbols   comma quotedbl quoteright colon semicolon exclam question  BackSpace"
+        - "@ # € $ % & - _ + ( )"
+        - "show_symbols   , \" ' : ; ! ?  BackSpace"
         - "show_letters preferences         space        .    Return"
     symbols:
-        - "µ asciitilde quoteleft bar U00B7 squareroot Greek_pi Greek_tau division multiply paragraph"
-        - "½ ¤ copyright U00AE U00A3 U00A5 asciicircum degree asterisk braceleft braceright"
-        - "show_numbers_from_symbols   backslash slash less greater equal bracketleft bracketright  BackSpace"
+        - "µ ~ ` | · √ π τ ÷ × ¶"
+        - "½ ¤ © ® £ ¥ ^ ° * { }"
+        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
         - "show_letters preferences         space        .    Return"
 
 buttons:
@@ -74,91 +74,3 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    asterisk:
-        text: "*"
-    asciitilde:
-        text: "~"
-    quoteleft:
-        text: "`"
-    bar:
-        text: "|"
-    U00B7:
-        text: "·"
-    squareroot:
-        text: "√"
-    Greek_pi:
-        text: "π"
-    division:
-        text: "÷"
-    multiply:
-        text: "×"
-    paragraph:
-        text: "¶"
-    Greek_tau:
-        text: "τ"
-    copyright:
-        text: "©"
-    numbersign:
-        text: "#"
-    U00AE:
-        text: "®"
-    at:
-        text: "@"
-    dollar:
-        text: "$"
-    U00A3:
-        text: "£"
-    percent:
-        text: "%"
-    EuroSign:
-        text: "€"
-    ampersand:
-        text: "&"
-    U00A5:
-        text: "¥"
-    minus:
-        text: "-"
-    asciicircum:
-        text: "^"
-    underscore:
-        text: "_"
-    degree:
-        text: "°"
-    plus:
-        text: "+"
-    equal:
-        text: "="
-    parenleft:
-        text: "("
-    parenright:
-        text: ")"
-    braceleft:
-        text: "{"
-    braceright:
-        text: "}"
-    comma:
-        text: ","
-    backslash:
-        text: "\\"
-    slash:
-        text: "/"
-    quotedbl:
-        text: "\""
-    quoteright:
-        text: "'"
-    less:
-        text: "<"
-    greater:
-        text: ">"
-    colon:
-        text: ":"
-    semicolon:
-        text: ";"
-    exclam:
-        text: "!"
-    question:
-        text: "?"
-    bracketleft:
-        text: "["
-    bracketright:
-        text: "]"
diff --git a/data/keyboards/terminal/de.yaml b/data/keyboards/terminal/de.yaml
index 224da6bc..f5bba37e 100644
--- a/data/keyboards/terminal/de.yaml
+++ b/data/keyboards/terminal/de.yaml
@@ -28,14 +28,14 @@ views:
         - "TabSmall Ctrl Alt ↑ ↓ ← →"
         - "1 2 3 4 5 6 7 8 9 0"
         - "\\ * # $ / & - + ( ) _"
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
-        - "show_letters show_eschars preferences         space        period Return"
+        - "show_symbols   , \" ' : ; ! ?  BackSpace"
+        - "show_letters show_eschars preferences         space        . Return"
     symbols:
         - "TabSmall Ctrl Alt ↑ ↓ ← →"
         - "~ ` · √ π τ ÷ × ¶ @"
         - "© ® £ € ¥ ^ ° { }"
         - "show_numbers   % | < > = [ ]  BackSpace"
-        - "show_letters show_eschars preferences         space        period Return"
+        - "show_letters show_eschars preferences         space        . Return"
     eschars:
         - "TabSmall Ctrl Alt ↑ ↓ ← →"
         - "ä è é ö ü Ä È É Ö Ü"
@@ -97,9 +97,8 @@ buttons:
             set_view: "actions"
         outline: "altline"
         label: ">_"
-    period:
+    .:
         outline: "large"
-        text: "."
     space:
         outline: "spaceline"
         text: " "
@@ -107,8 +106,6 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    colon:
-        text: ":"
     F1:
         outline: "action"
         keysym: "F1"
diff --git a/data/keyboards/terminal/de_wide.yaml b/data/keyboards/terminal/de_wide.yaml
index 989e6d63..a27d882a 100644
--- a/data/keyboards/terminal/de_wide.yaml
+++ b/data/keyboards/terminal/de_wide.yaml
@@ -28,14 +28,14 @@ views:
         - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
         - "1 2 3 4 5 6 7 8 9 0"
         - "\\ * # $ / & - + ( ) _"
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
-        - "show_letters show_eschars preferences         space        period Return"
+        - "show_symbols   , \" ' : ; ! ?  BackSpace"
+        - "show_letters show_eschars preferences         space        . Return"
     symbols:
         - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
         - "~ ` · √ π τ ÷ × ¶ @"
         - "© ® £ € ¥ ^ ° { }"
         - "show_numbers   % | < > = [ ]  BackSpace"
-        - "show_letters show_eschars preferences         space        period Return"
+        - "show_letters show_eschars preferences         space        . Return"
     eschars:
         - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
         - "ä è é ö ü Ä È É Ö Ü"
@@ -97,9 +97,8 @@ buttons:
             set_view: "actions"
         outline: "altline"
         label: ">_"
-    period:
+    .:
         outline: "large"
-        text: "."
     space:
         outline: "spaceline"
         text: " "
@@ -107,8 +106,6 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    colon:
-        text: ":"
     F1:
         outline: "action"
         keysym: "F1"
diff --git a/data/keyboards/terminal/us+dvorak.yaml b/data/keyboards/terminal/us+dvorak.yaml
index e529dd53..7e79f817 100644
--- a/data/keyboards/terminal/us+dvorak.yaml
+++ b/data/keyboards/terminal/us+dvorak.yaml
@@ -24,16 +24,16 @@ views:
         - "show_numbers preferences      space        show_actions Return"
     numbers:
         - "TabSmall Ctrl Alt ↑ ↓ ← →"
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
+        - "show_symbols   , \" ' : ; ! ?  BackSpace"
         - "* # $ / & - _ + ( )"
         - "1 2 3 4 5 6 7 8 9 0"
-        - "show_letters preferences         space        period Return"
+        - "show_letters preferences         space        . Return"
     symbols:
         - "TabSmall Ctrl Alt ↑ ↓ ← →"
         - "show_numbers   \\ % < > = [ ]  BackSpace"
         - "© ® £ € ¥ ^ ° @ { }"
         - "~ ` | · √ π τ ÷ × ¶"
-        - "show_letters preferences         space        period Return"
+        - "show_letters preferences         space        . Return"
     actions:
         - "TabSmall Ctrl Alt PageUp PageDown Home End"
         - "F1  F2  F3  F4  F5  F6"
@@ -82,9 +82,8 @@ buttons:
             set_view: "actions"
         outline: "altline"
         label: ">_"
-    period:
+    .:
         outline: "large"
-        text: "."
     space:
         outline: "spaceline"
         text: " "
@@ -92,8 +91,6 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    colon:
-        text: ":"
     F1:
         outline: "action"
         keysym: "F1"
diff --git a/data/keyboards/terminal/us+dvorak_wide.yaml b/data/keyboards/terminal/us+dvorak_wide.yaml
index 6a40c045..56687619 100644
--- a/data/keyboards/terminal/us+dvorak_wide.yaml
+++ b/data/keyboards/terminal/us+dvorak_wide.yaml
@@ -24,16 +24,16 @@ views:
         - "show_numbers preferences      space        show_actions Return"
     numbers:
         - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
+        - "show_symbols   , \" ' : ; ! ?  BackSpace"
         - "* # $ / & - _ + ( )"
         - "1 2 3 4 5 6 7 8 9 0"
-        - "show_letters preferences         space        period Return"
+        - "show_letters preferences         space        . Return"
     symbols:
         - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
         - "show_numbers   \\ % < > = [ ]  BackSpace"
         - "© ® £ € ¥ ^ ° @ { }"
         - "~ ` | · √ π τ ÷ × ¶"
-        - "show_letters preferences         space        period Return"
+        - "show_letters preferences         space        . Return"
     actions:
         - "EscSmall TabSmall Ctrl Alt PageUp PageDown Home End"
         - "F1  F2  F3  F4  F5  F6"
@@ -82,9 +82,8 @@ buttons:
             set_view: "actions"
         outline: "altline"
         label: ">_"
-    period:
+    .:
         outline: "large"
-        text: "."
     space:
         outline: "spaceline"
         text: " "
@@ -92,8 +91,6 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    colon:
-        text: ":"
     F1:
         outline: "action"
         keysym: "F1"
diff --git a/data/keyboards/terminal/us.yaml b/data/keyboards/terminal/us.yaml
index 75654a69..eb0fb424 100644
--- a/data/keyboards/terminal/us.yaml
+++ b/data/keyboards/terminal/us.yaml
@@ -28,14 +28,14 @@ views:
         - "TabSmall Ctrl Alt ↑ ↓ ← →"
         - "1 2 3 4 5 6 7 8 9 0"
         - "\\ * # $ / & - + ( ) _"
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
-        - "show_letters preferences         space        period Return"
+        - "show_symbols   , \" ' : ; ! ?  BackSpace"
+        - "show_letters preferences         space        . Return"
     symbols:
         - "TabSmall Ctrl Alt ↑ ↓ ← →"
         - "~ ` · √ π τ ÷ × ¶ @"
         - "© ® £ € ¥ ^ ° { }"
         - "show_numbers   % | < > = [ ]  BackSpace"
-        - "show_letters preferences         space        period Return"
+        - "show_letters preferences         space        . Return"
     actions:
         - "TabSmall Ctrl Alt PageUp PageDown Home End"
         - "F1  F2  F3  F4  F5  F6"
@@ -84,9 +84,8 @@ buttons:
             set_view: "actions"
         outline: "altline"
         label: ">_"
-    period:
+    .:
         outline: "large"
-        text: "."
     space:
         outline: "spaceline"
         text: " "
@@ -94,8 +93,6 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    colon:
-        text: ":"
     F1:
         outline: "action"
         keysym: "F1"
diff --git a/data/keyboards/terminal/us_wide.yaml b/data/keyboards/terminal/us_wide.yaml
index 913ac146..42c908ad 100644
--- a/data/keyboards/terminal/us_wide.yaml
+++ b/data/keyboards/terminal/us_wide.yaml
@@ -28,14 +28,14 @@ views:
         - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
         - "1 2 3 4 5 6 7 8 9 0"
         - "\\ * # $ / & - + ( ) _"
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
-        - "show_letters preferences         space        period Return"
+        - "show_symbols   , \" ' : ; ! ?  BackSpace"
+        - "show_letters preferences         space        . Return"
     symbols:
         - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
         - "~ ` · √ π τ ÷ × ¶ @"
         - "© ® £ € ¥ ^ ° { }"
         - "show_numbers   % | < > = [ ]  BackSpace"
-        - "show_letters preferences         space        period Return"
+        - "show_letters preferences         space        . Return"
     actions:
         - "EscSmall TabSmall Ctrl Alt PageUp PageDown Home End"
         - "F1  F2  F3  F4  F5  F6"
@@ -84,9 +84,8 @@ buttons:
             set_view: "actions"
         outline: "altline"
         label: ">_"
-    period:
+    .:
         outline: "large"
-        text: "."
     space:
         outline: "spaceline"
         text: " "
@@ -94,8 +93,6 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    colon:
-        text: ":"
     F1:
         outline: "action"
         keysym: "F1"
diff --git a/data/keyboards/th.yaml b/data/keyboards/th.yaml
index 43a7bb6d..a6054719 100644
--- a/data/keyboards/th.yaml
+++ b/data/keyboards/th.yaml
@@ -12,23 +12,23 @@ views:
         - "ๆ ไ ำ พ ะ ั ี ร น ย บ ล"
         - "ฟ ห ก ด เ ้ ่ า ส ว ง ฃ"
         - "Shift_L   ผ ป แ อ ิ ื ท ม ใ ฝ   BackSpace"
-        - "show_numbers preferences         space        period Return"
+        - "show_numbers preferences         space        PeriodLarge Return"
     upper:
         - "+ ๑ ๒ ๓ ๔ ู ฿ ๕ ๖ ๗ ๘ ๙"
         - "๐ \" ฎ ฑ ธ ํ ๊ ณ ฯ ญ ฐ ,"
         - "ฤ ฆ ฏ โ ฌ ็ ๋ ษ ศ ซ . ฅ"
         - "Shift_L   ( ) ฉ ฮ ฺ ์ ? ฒ ฬ ฦ  BackSpace"
-        - "show_numbers preferences         space        period Return"
+        - "show_numbers preferences         space        PeriodLarge Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
-        - "show_letters preferences         space        period Return"
+        - "show_symbols   , \" ' : ; ! ?  BackSpace"
+        - "show_letters preferences         space        PeriodLarge Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
         - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        period Return"
+        - "show_letters preferences         space        PeriodLarge Return"
 
 buttons:
     Shift_L:
@@ -66,7 +66,7 @@ buttons:
             set_view: "symbols"
         outline: "altline"
         label: "*/="
-    period:
+    PeriodLarge:
         outline: "special"
         text: "."
     space:
@@ -76,5 +76,3 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    colon:
-        text: ":"
diff --git a/data/keyboards/th_wide.yaml b/data/keyboards/th_wide.yaml
index 63bd10bd..937c7f04 100644
--- a/data/keyboards/th_wide.yaml
+++ b/data/keyboards/th_wide.yaml
@@ -13,23 +13,23 @@ views:
         - "ๆ ไ ำ พ ะ ั ี ร น ย บ ล"
         - "ฟ ห ก ด เ ้ ่ า ส ว ง ฃ"
         - "Shift_L   ผ ป แ อ ิ ื ท ม ใ ฝ   BackSpace"
-        - "show_numbers preferences         space        period Return"
+        - "show_numbers preferences         space        PeriodLarge Return"
     upper:
         - "+ ๑ ๒ ๓ ๔ ู ฿ ๕ ๖ ๗ ๘ ๙"
         - "๐ \" ฎ ฑ ธ ํ ๊ ณ ฯ ญ ฐ ,"
         - "ฤ ฆ ฏ โ ฌ ็ ๋ ษ ศ ซ . ฅ"
         - "Shift_L   ( ) ฉ ฮ ฺ ์ ? ฒ ฬ ฦ  BackSpace"
-        - "show_numbers preferences         space        period Return"
+        - "show_numbers preferences         space        PeriodLarge Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
-        - "show_letters preferences         spacesymbol        period Return"
+        - "show_symbols   , \" ' : ; ! ?  BackSpace"
+        - "show_letters preferences         spacesymbol        PeriodLarge Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
         - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         spacesymbol        period Return"
+        - "show_letters preferences         spacesymbol        PeriodLarge Return"
 
 buttons:
     Shift_L:
@@ -67,7 +67,7 @@ buttons:
             set_view: "symbols"
         outline: "altline"
         label: "*/="
-    period:
+    PeriodLarge:
         outline: "special"
         text: "."
     space:
@@ -80,5 +80,3 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    colon:
-        text: ":"
diff --git a/data/keyboards/ua.yaml b/data/keyboards/ua.yaml
index 1ab15480..f400c8a9 100644
--- a/data/keyboards/ua.yaml
+++ b/data/keyboards/ua.yaml
@@ -13,22 +13,22 @@ views:
         - "й ц у к е н г ш щ з х"
         - "ф і в а п р о л д ж є"
         - "Shift_L  я ч с м и т ь б ю  BackSpace"
-        - "show_numbers preferences    ґ  space  ї  period Return"
+        - "show_numbers preferences    ґ  space  ї  . Return"
     upper:
         - "Й Ц У К Е Н Г Ш Щ З Х"
         - "Ф І В А П Р О Л Д Ж Є"
         - "Shift_L   Я Ч С М И Т Ь Б Ю  BackSpace"
-        - "show_numbers preferences    Ґ  space  Ї  comma Return"
+        - "show_numbers preferences    Ґ  space  Ї  CommaLarge Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
-        - "show_letters preferences         space_fill   period Return"
+        - "show_symbols   , \" ' : ; ! ?  BackSpace"
+        - "show_letters preferences         space_fill   . Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
         - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space_fill   period Return"
+        - "show_letters preferences         space_fill   . Return"
 
 buttons:
     Shift_L:
@@ -66,10 +66,9 @@ buttons:
             set_view: "symbols"
         outline: "wide"
         label: "*/="
-    period:
+    .:
         outline: "special"
-        text: "."
-    comma:
+    CommaLarge:
         outline: "special"
         text: ","
     space:
@@ -82,8 +81,6 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    colon:
-        text: ":"
     ґ:
         outline: "narrow"
     Ґ:
diff --git a/data/keyboards/url/us.yaml b/data/keyboards/url/us.yaml
index 29653c70..277a9ac6 100644
--- a/data/keyboards/url/us.yaml
+++ b/data/keyboards/url/us.yaml
@@ -11,22 +11,22 @@ views:
         - "q w e r t y u i o p"
         - "a s d f g h j k l"
         - "Shift_L   z x c v b n m  BackSpace"
-        - "show_numbers preferences         space        slash period Return"
+        - "show_numbers preferences         space        SlashLarge . Return"
     upper:
         - "Q W E R T Y U I O P"
         - "A S D F G H J K L"
         - "Shift_L   Z X C V B N M  BackSpace"
-        - "show_numbers preferences         space        slash period Return"
+        - "show_numbers preferences         space        SlashLarge . Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
-        - "show_letters preferences         space        slash period Return"
+        - "show_symbols   , \" ' : ; ! ?  BackSpace"
+        - "show_letters preferences         space        SlashLarge . Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
         - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        slash period Return"
+        - "show_letters preferences         space        SlashLarge . Return"
 
 buttons:
     Shift_L:
@@ -64,10 +64,9 @@ buttons:
             set_view: "symbols"
         outline: "altline"
         label: "*/="
-    period:
+    .:
         outline: "special"
-        text: "."
-    slash:
+    SlashLarge:
         outline: "special"
         text: "/"
     space:
@@ -77,5 +76,3 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    colon:
-        text: ":"
diff --git a/data/keyboards/us+colemak.yaml b/data/keyboards/us+colemak.yaml
index a8235712..2363c903 100644
--- a/data/keyboards/us+colemak.yaml
+++ b/data/keyboards/us+colemak.yaml
@@ -11,22 +11,22 @@ views:
         - "q w f p g j l u y"
         - "a r s t d h n e i o"
         - "Shift_L   z x c v b k m  BackSpace"
-        - "show_numbers preferences         space        period Return"
+        - "show_numbers preferences         space        . Return"
     upper:
         - "Q W F P G J L U Y"
         - "A R S T D H N E I O"
         - "Shift_L   Z X C V B K M  BackSpace"
-        - "show_numbers preferences         space        period Return"
+        - "show_numbers preferences         space        . Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
-        - "show_letters preferences         space        period Return"
+        - "show_symbols   , \" ' : ; ! ?  BackSpace"
+        - "show_letters preferences         space        . Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
         - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        period Return"
+        - "show_letters preferences         space        . Return"
 
 buttons:
     Shift_L:
@@ -64,9 +64,8 @@ buttons:
             set_view: "symbols"
         outline: "altline"
         label: "*/="
-    period:
+    .:
         outline: "special"
-        text: "."
     space:
         outline: "spaceline"
         text: " "
@@ -74,5 +73,3 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    colon:
-        text: ":"
diff --git a/data/keyboards/us+colemak_wide.yaml b/data/keyboards/us+colemak_wide.yaml
index 7b07e500..916a9eee 100644
--- a/data/keyboards/us+colemak_wide.yaml
+++ b/data/keyboards/us+colemak_wide.yaml
@@ -20,7 +20,7 @@ views:
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
+        - "show_symbols   , \" ' : ; ! ?  BackSpace"
         - "show_letters preferences         space        . Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
@@ -64,9 +64,8 @@ buttons:
             set_view: "symbols"
         outline: "altline"
         label: "*/="
-    ".":
+    .:
         outline: "special"
-        text: "."
     space:
         outline: "spaceline"
         text: " "
@@ -74,5 +73,3 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    colon:
-        text: ":"
diff --git a/data/keyboards/us+dvorak.yaml b/data/keyboards/us+dvorak.yaml
index 80f93417..d307a745 100644
--- a/data/keyboards/us+dvorak.yaml
+++ b/data/keyboards/us+dvorak.yaml
@@ -11,22 +11,22 @@ views:
         - "Shift_L   p y f g c r l  BackSpace"
         - "a o e u i d h t n s"
         - ", q j k x b m w v z"
-        - "show_numbers preferences         space        period Return"
+        - "show_numbers preferences         space        . Return"
     upper:
         - "Shift_L   P Y F G C R L  BackSpace"
         - "A O E U I D H T N S"
         - ", Q J K X B M W V Z"
-        - "show_numbers preferences         space        period Return"
+        - "show_numbers preferences         space        . Return"
     numbers:
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
+        - "show_symbols   , \" ' : ; ! ?  BackSpace"
         - "* # $ / & - _ + ( )"
         - "1 2 3 4 5 6 7 8 9 0"
-        - "show_letters preferences         space        period Return"
+        - "show_letters preferences         space        . Return"
     symbols:
         - "show_numbers_from_symbols   \\ % < > = [ ]  BackSpace"
         - "© ® £ € ¥ ^ ° @ { }"
         - "~ ` | · √ π τ ÷ × ¶"
-        - "show_letters preferences         space        period Return"
+        - "show_letters preferences         space        . Return"
 
 buttons:
     Shift_L:
@@ -64,9 +64,8 @@ buttons:
             set_view: "symbols"
         outline: "altline"
         label: "*/="
-    period:
+    .:
         outline: "special"
-        text: "."
     space:
         outline: "spaceline"
         text: " "
@@ -74,8 +73,6 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    colon:
-        text: ":"
 
 # The US QWERTY layout has fewer letters on the third row, and so has
 # the shift & backspace keys placed there. In contrast, the US DVORAK
diff --git a/data/keyboards/us+dvorak_wide.yaml b/data/keyboards/us+dvorak_wide.yaml
index a61df6cd..89533d9f 100644
--- a/data/keyboards/us+dvorak_wide.yaml
+++ b/data/keyboards/us+dvorak_wide.yaml
@@ -11,22 +11,22 @@ views:
         - "Shift_L   p y f g c r l  BackSpace"
         - "a o e u i d h t n s"
         - ", q j k x b m w v z"
-        - "show_numbers preferences         space        period Return"
+        - "show_numbers preferences         space        . Return"
     upper:
         - "Shift_L   P Y F G C R L  BackSpace"
         - "A O E U I D H T N S"
         - ", Q J K X B M W V Z"
-        - "show_numbers preferences         space        period Return"
+        - "show_numbers preferences         space        . Return"
     numbers:
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
+        - "show_symbols   , \" ' : ; ! ?  BackSpace"
         - "* # $ / & - _ + ( )"
         - "1 2 3 4 5 6 7 8 9 0"
-        - "show_letters preferences         space        period Return"
+        - "show_letters preferences         space        . Return"
     symbols:
         - "show_numbers_from_symbols   \\ % < > = [ ]  BackSpace"
         - "© ® £ € ¥ ^ ° @ { }"
         - "~ ` | · √ π τ ÷ × ¶"
-        - "show_letters preferences         space        period Return"
+        - "show_letters preferences         space        . Return"
 
 buttons:
     Shift_L:
@@ -64,9 +64,8 @@ buttons:
             set_view: "symbols"
         outline: "altline"
         label: "*/="
-    period:
+    .:
         outline: "special"
-        text: "."
     space:
         outline: "spaceline"
         text: " "
@@ -74,8 +73,6 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    colon:
-        text: ":"
 
 # The US QWERTY layout has fewer letters on the third row, and so has
 # the shift & backspace keys placed there. In contrast, the US DVORAK
diff --git a/data/keyboards/us.yaml b/data/keyboards/us.yaml
index 7a7f4dd6..03f195af 100644
--- a/data/keyboards/us.yaml
+++ b/data/keyboards/us.yaml
@@ -1,32 +1,32 @@
 ---
 outlines:
-    default: { width: 35.33, height: 52 }
-    altline: { width: 52.67, height: 52 }
-    wide: { width: 62, height: 52 }
-    spaceline: { width: 142, height: 52 }
-    special: { width: 44, height: 52 }
+    default:   { width: 35.33, height: 52 }
+    altline:   { width: 52.67, height: 52 }
+    wide:      { width: 62,    height: 52 }
+    spaceline: { width: 141.3, height: 52 }
+    special:   { width: 44,    height: 52 }
 
 views:
     base:
         - "q w e r t y u i o p"
         - "a s d f g h j k l"
         - "Shift_L   z x c v b n m  BackSpace"
-        - "show_numbers preferences         space        period Return"
+        - "show_numbers preferences         space        . Return"
     upper:
         - "Q W E R T Y U I O P"
         - "A S D F G H J K L"
         - "Shift_L   Z X C V B N M  BackSpace"
-        - "show_numbers preferences         space        period Return"
+        - "show_numbers preferences         space        . Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
-        - "show_letters preferences         space        period Return"
+        - "show_symbols   , \" ' : ; ! ?  BackSpace"
+        - "show_letters preferences         space        . Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ € ¥ ^ ° * { }"
         - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters preferences         space        period Return"
+        - "show_letters preferences         space        . Return"
 
 buttons:
     Shift_L:
@@ -41,7 +41,7 @@ buttons:
         icon: "edit-clear-symbolic"
         action: erase
     preferences:
-        action: show_prefs
+        action: "show_prefs"
         outline: "special"
         icon: "keyboard-mode-symbolic"
     show_numbers:
@@ -64,9 +64,8 @@ buttons:
             set_view: "symbols"
         outline: "altline"
         label: "*/="
-    period:
+    .:
         outline: "special"
-        text: "."
     space:
         outline: "spaceline"
         text: " "
@@ -74,5 +73,3 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    colon:
-        text: ":"
diff --git a/data/keyboards/us_wide.yaml b/data/keyboards/us_wide.yaml
index f30f7fad..d6abf769 100644
--- a/data/keyboards/us_wide.yaml
+++ b/data/keyboards/us_wide.yaml
@@ -20,7 +20,7 @@ views:
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # $ % & - _ + ( )"
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
+        - "show_symbols   , \" ' : ; ! ?  BackSpace"
         - "show_letters preferences         space        . Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
@@ -64,9 +64,8 @@ buttons:
             set_view: "symbols"
         outline: "altline"
         label: "*/="
-    ".":
+    .:
         outline: "special"
-        text: "."
     space:
         outline: "spaceline"
         text: " "
@@ -74,5 +73,3 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    colon:
-        text: ":"