diff --git a/data/keyboards/terminal/fr+bepo.yaml b/data/keyboards/terminal/fr+bepo.yaml
index c3b927de..15700618 100644
--- a/data/keyboards/terminal/fr+bepo.yaml
+++ b/data/keyboards/terminal/fr+bepo.yaml
@@ -15,32 +15,32 @@ views:
         - "TabSmall Ctrl Alt ↑ ↓ ← →"
         - "b é p o w v d l j z"
         - "a u i e c t s r n m"
-        - "Shift_L y x k q g h f period BackSpace"
-        - "show_numbers show_eschars preferences   space slash show_actions Return"
+        - "Shift_L y x k q g h f . BackSpace"
+        - "show_numbers show_eschars preferences   space SlashSmall show_actions Return"
     upper:
         - "TabSmall Ctrl Alt PageUp PageDown Home End"
         - "B É P O W V D L J Z"
         - "A U I E C T S R N M"
-        - "Shift_L   Y X K Q G H F minus  BackSpace"
-        - "show_numbers show_eschars preferences   space  colon  show_actions Return"
+        - "Shift_L   Y X K Q G H F MinusSmall  BackSpace"
+        - "show_numbers show_eschars preferences   space  ColonSmall  show_actions Return"
     numbers:
         - "TabSmall Ctrl Alt ↑ ↓ ← →"
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # € % & - _ + ( )"
-        - "show_symbols   , \" ' : ; ! ? period  BackSpace"
-        - "show_letters show_eschars preferences        space    slash     show_actions Return"
+        - "show_symbols   , \" ' : ; ! ? .  BackSpace"
+        - "show_letters show_eschars preferences        space    SlashSmall     show_actions Return"
     symbols:
         - "TabSmall Ctrl Alt ↑ ↓ ← →"
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ $ ¥ ^ ° * { }"
-        - "show_numbers   \\ / < > = [ ] period  BackSpace"
-        - "show_letters show_eschars preferences        space    slash     show_actions Return"
+        - "show_numbers   \\ / < > = [ ] .  BackSpace"
+        - "show_letters show_eschars preferences        space    SlashSmall     show_actions Return"
     eschars:
         - "TabSmall Ctrl Alt ↑ ↓ ← →"
         - "à â ç é è ê î ô ù û"
         - "À Â Ç É È Ê Î Ô Ù Û"
-        - "show_numbers  æ œ ä ë ï ö ü period  BackSpace"
-        - "show_letters show_eschars preferences        space    slash     show_actions Return"
+        - "show_numbers  æ œ ä ë ï ö ü .  BackSpace"
+        - "show_letters show_eschars preferences        space    SlashSmall     show_actions Return"
     actions:
         - "TabSmall Ctrl Alt PageUp PageDown Home End"
         - "F1  F2  F3  F4  F5  F6"
@@ -89,6 +89,7 @@ buttons:
     Esc:
         outline: "action"
         keysym: "Escape"
+        label: "Echap"
     Tab:
         outline: "action"
         keysym: "Tab"
@@ -99,9 +100,11 @@ buttons:
     Del:
         outline: "action"
         keysym: "Delete"
+        label: "Suppr"
     Insert:
         outline: "action"
         keysym: "Insert"
+        label: "Inser"
     Menu:
         outline: "action"
         keysym: "Menu"
@@ -111,12 +114,15 @@ buttons:
     Break:
         outline: "action"
         keysym: "Break"
+        label: "Attn"
     Home:
         outline: "small"
         keysym: "Home"
+        label: "🡔"
     End:
         outline: "small"
         keysym: "End"
+        label: "Fin"
     PageUp:
         outline: "small"
         keysym: "Page_Up"
@@ -161,12 +167,6 @@ buttons:
         modifier: "Alt"
         outline: "small"
         label: "Alt"
-    period:
-        outline: "narrow"
-        text: "."
-    slash:
-        outline: "narrow"
-        text: "/"
     show_actions:
         action:
             set_view: "actions"
@@ -221,11 +221,14 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    colon:
+    ColonSmall:
         outline: "narrow"
         text: ":"
-    "\"":
-        keysym: "quotedbl"
-    minus:
+    MinusSmall:
         outline: "narrow"
         text: "-"
+    SlashSmall:
+        outline: "narrow"
+        text: "/"
+    .:
+        outline: "narrow"
diff --git a/data/keyboards/terminal/fr+bepo_wide.yaml b/data/keyboards/terminal/fr+bepo_wide.yaml
index 1eb2a754..25c4356d 100644
--- a/data/keyboards/terminal/fr+bepo_wide.yaml
+++ b/data/keyboards/terminal/fr+bepo_wide.yaml
@@ -16,14 +16,14 @@ views:
         - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
         - "b é p o w v d l j z"
         - "a u i e c t s r n m"
-        - "Shift_L y x k q g h f period BackSpace"
-        - "show_numbers show_eschars preferences        space   slash   show_actions Return"
+        - "Shift_L y x k q g h f . BackSpace"
+        - "show_numbers show_eschars preferences        space   SlashSmall   show_actions Return"
     upper:
         - "EscSmall TabSmall Ctrl Alt PageUp PageDown ← →"
         - "B É P O W V D L J Z"
         - "A U I E C T S R N M"
-        - "Shift_L   Y X K Q G H F minus  BackSpace"
-        - "show_numbers show_eschars preferences        space   colon   show_actions Return"
+        - "Shift_L   Y X K Q G H F MinusSmall  BackSpace"
+        - "show_numbers show_eschars preferences        space   ColonSmall   show_actions Return"
     numbers:
         - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
         - "1 2 3 4 5 6 7 8 9 0"
@@ -90,10 +90,11 @@ buttons:
     Esc:
         outline: "action"
         keysym: "Escape"
+        label: "Echap"
     EscSmall:
         outline: "small"
         keysym: "Escape"
-        label: "Esc"
+        label: "Echap"
     Tab:
         outline: "action"
         keysym: "Tab"
@@ -104,9 +105,11 @@ buttons:
     Del:
         outline: "action"
         keysym: "Delete"
+        label: "Suppr"
     Insert:
         outline: "action"
         keysym: "Insert"
+        label: "Inser"
     Menu:
         outline: "action"
         keysym: "Menu"
@@ -116,12 +119,15 @@ buttons:
     Break:
         outline: "action"
         keysym: "Break"
+        label: "Attn"
     Home:
         outline: "small"
         keysym: "Home"
+        label: "🡔"
     End:
         outline: "small"
         keysym: "End"
+        label: "Fin"
     PageUp:
         outline: "small"
         keysym: "Page_Up"
@@ -166,12 +172,6 @@ buttons:
         modifier: "Alt"
         outline: "small"
         label: "Alt"
-    period:
-        outline: "halfwidth"
-        text: "."
-    slash:
-        outline: "halfwidth"
-        text: "/"
     show_actions:
         action:
             set_view: "actions"
@@ -226,11 +226,14 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    colon:
+    ColonSmall:
         outline: "halfwidth"
         text: ":"
-    "\"":
-        keysym: "quotedbl"
-    minus:
+    MinusSmall:
         outline: "halfwidth"
         text: "-"
+    SlashSmall:
+        outline: "halfwidth"
+        text: "/"
+    .:
+        outline: "halfwidth"
diff --git a/data/keyboards/terminal/fr.yaml b/data/keyboards/terminal/fr.yaml
index 1f299ed1..9cc0f24a 100644
--- a/data/keyboards/terminal/fr.yaml
+++ b/data/keyboards/terminal/fr.yaml
@@ -14,7 +14,7 @@ views:
         - "TabSmall Ctrl Alt ↑ ↓ ← →"
         - "a z e r t y u i o p"
         - "q s d f g h j k l m"
-        - "Shift_L   w x c v b n period   BackSpace"
+        - "Shift_L   w x c v b n .   BackSpace"
         - "show_numbers show_eschars preferences        space         show_actions Return"
     upper:
         - "TabSmall Ctrl Alt PageUp PageDown Home End"
@@ -26,7 +26,7 @@ views:
         - "TabSmall Ctrl Alt ↑ ↓ ← →"
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # € % & - _ + ( )"
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
+        - "show_symbols   , \" ' : ; ! ?  BackSpace"
         - "show_letters show_eschars preferences        space         show_actions Return"
     symbols:
         - "TabSmall Ctrl Alt ↑ ↓ ← →"
@@ -88,6 +88,7 @@ buttons:
     Esc:
         outline: "action"
         keysym: "Escape"
+        label: "Echap"
     Tab:
         outline: "action"
         keysym: "Tab"
@@ -98,9 +99,11 @@ buttons:
     Del:
         outline: "action"
         keysym: "Delete"
+        label: "Suppr"
     Insert:
         outline: "action"
         keysym: "Insert"
+        label: "Inser"
     Menu:
         outline: "action"
         keysym: "Menu"
@@ -110,12 +113,15 @@ buttons:
     Break:
         outline: "action"
         keysym: "Break"
+        label: "Attn"
     Home:
         outline: "small"
         keysym: "Home"
+        label: "🡔"
     End:
         outline: "small"
         keysym: "End"
+        label: "Fin"
     PageUp:
         outline: "small"
         keysym: "Page_Up"
@@ -160,8 +166,6 @@ buttons:
         modifier: "Alt"
         outline: "small"
         label: "Alt"
-    period:
-        text: "."
     show_actions:
         action:
             set_view: "actions"
@@ -216,7 +220,3 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    colon:
-        text: ":"
-    "\"":
-        keysym: "quotedbl"
diff --git a/data/keyboards/terminal/fr_wide.yaml b/data/keyboards/terminal/fr_wide.yaml
index e2a6f268..bf5e690f 100644
--- a/data/keyboards/terminal/fr_wide.yaml
+++ b/data/keyboards/terminal/fr_wide.yaml
@@ -14,7 +14,7 @@ views:
         - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
         - "a z e r t y u i o p"
         - "q s d f g h j k l m"
-        - "Shift_L   w x c v b n period   BackSpace"
+        - "Shift_L   w x c v b n .   BackSpace"
         - "show_numbers show_eschars preferences        space         show_actions Return"
     upper:
         - "EscSmall TabSmall Ctrl Alt PageUp PageDown Home End"
@@ -26,7 +26,7 @@ views:
         - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # € % & - _ + ( )"
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
+        - "show_symbols   , \" ' : ; ! ?  BackSpace"
         - "show_letters show_eschars preferences        space         show_actions Return"
     symbols:
         - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
@@ -87,10 +87,11 @@ buttons:
     Esc:
         outline: "action"
         keysym: "Escape"
+        label: "Echap"
     EscSmall:
         outline: "small"
         keysym: "Escape"
-        label: "Esc"
+        label: "Echap"
     Tab:
         outline: "action"
         keysym: "Tab"
@@ -101,9 +102,11 @@ buttons:
     Del:
         outline: "action"
         keysym: "Delete"
+        label: "Suppr"
     Insert:
         outline: "action"
         keysym: "Insert"
+        label: "Inser"
     Menu:
         outline: "action"
         keysym: "Menu"
@@ -113,12 +116,15 @@ buttons:
     Break:
         outline: "action"
         keysym: "Break"
+        label: "Attn"
     Home:
         outline: "small"
         keysym: "Home"
+        label: "🡔"
     End:
         outline: "small"
         keysym: "End"
+        label: "Fin"
     PageUp:
         outline: "small"
         keysym: "Page_Up"
@@ -163,9 +169,6 @@ buttons:
         modifier: "Alt"
         outline: "small"
         label: "Alt"
-    period:
-        outline: "default"
-        text: "."
     show_actions:
         action:
             set_view: "actions"
@@ -220,7 +223,3 @@ buttons:
         outline: "wide"
         icon: "key-enter"
         keysym: "Return"
-    colon:
-        text: ":"
-    "\"":
-        keysym: "quotedbl"