diff --git a/data/keyboards/terminal/de.yaml b/data/keyboards/terminal/de.yaml
index 989123b2..7de8f00b 100644
--- a/data/keyboards/terminal/de.yaml
+++ b/data/keyboards/terminal/de.yaml
@@ -9,7 +9,7 @@ outlines:
     large:            { width: 60.615,  height: 52     }
     narrow:           { width: 30.307,  height: 52     }
     placeholder:      { width: 20.205,  height: 52     }
-    small:            { width: 57.728,  height: 27.725 }
+    small:            { width: 50.512,  height: 27.725 }
     spaceline:        { width: 114.495, height: 52     }
     special:          { width: 40.41,   height: 52     }
     special-2:        { width: 60.615,  height: 52     }
@@ -18,37 +18,37 @@ outlines:
 
 views:
     base:
-        - "Tab-small Ctrl Alt ↑ ↓ ← →"
+        - "Tab-small Ctrl Alt Shift ↑ ↓ ← →"
         - "q w e r t z u i o p"
         - ".-thin a s d f g h j k l --thin"
         - "show_upper y x c v b n m BackSpace"
         - "show_numbers show_eschars preferences space show_actions Return"
     upper:
-        - "Tab-small Ctrl Alt PageUp PageDown Home End"
+        - "Tab-small Ctrl Alt Shift PageUp PageDown Home End"
         - "Q W E R T Z U I O P"
         - "/-thin A S D F G H J K L |-thin"
         - "show_upper Y X C V B N M BackSpace"
         - "show_numbers show_eschars preferences space show_actions Return"
     numbers:
-        - "Tab-small Ctrl Alt ↑ ↓ ← →"
+        - "Tab-small Ctrl Alt Shift ↑ ↓ ← →"
         - "1 2 3 4 5 6 7 8 9 0"
         - "\\ * # $ / & - + ( ) _"
         - "show_symbols , \" ' : ; ! ? BackSpace"
         - "show_letters show_eschars preferences space . Return"
     symbols:
-        - "Tab-small Ctrl Alt ↑ ↓ ← →"
+        - "Tab-small Ctrl Alt Shift ↑ ↓ ← →"
         - "~ ` · √ π τ ÷ × ¶ @"
         - "-- © ® £ € ¥ ^ ° { } --"
         - "show_numbers % | < > = [ ] BackSpace"
         - "show_letters show_eschars preferences space . Return"
     eschars:
-        - "Tab-small Ctrl Alt ↑ ↓ ← →"
+        - "Tab-small Ctrl Alt Shift ↑ ↓ ← →"
         - "ä è é ö ü Ä È É Ö Ü"
         - "à â ê î ô À Â È Î Ô"
         - "show_numbers « » ç Ç æ œ ß BackSpace"
         - "show_letters show_eschars preferences space „ “ Return"
     actions:
-        - "Tab-small Ctrl Alt PageUp PageDown Home End"
+        - "Tab-small Ctrl Alt Shift PageUp PageDown Home End"
         - "F1  F2  F3  F4  F5  F6"
         - "F7  F8  F9  F10 F11 F12"
         - "Esc Tab Pause Insert Up Del"
@@ -228,6 +228,10 @@ buttons:
         modifier: "Alt"
         outline: "small"
         label: "Alt"
+    Shift:
+        modifier: "Shift"
+        outline: "small"
+        label: "Umsch"
     --thin:
         outline: "halfwidth"
         text: "-"
diff --git a/data/keyboards/terminal/de_wide.yaml b/data/keyboards/terminal/de_wide.yaml
index b3235d9d..4214bb71 100644
--- a/data/keyboards/terminal/de_wide.yaml
+++ b/data/keyboards/terminal/de_wide.yaml
@@ -9,7 +9,7 @@ outlines:
     large:            { width: 92.736,  height: 42   }
     narrow:           { width: 46.368,  height: 42   }
     placeholder:      { width: 30.912,  height: 42   }
-    small:            { width: 77.28,   height: 25.2 }
+    small:            { width: 68.693,  height: 25.2 }
     spaceline:        { width: 175.168, height: 42   }
     special:          { width: 61.824,  height: 42   }
     special-2:        { width: 92.736,  height: 42   }
@@ -18,37 +18,37 @@ outlines:
 
 views:
     base:
-        - "Esc-small Tab-small Ctrl Alt ↑ ↓ ← →"
+        - "Esc-small Tab-small Ctrl Alt Shift ↑ ↓ ← →"
         - "q w e r t z u i o p"
         - "PeriodSmall a s d f g h j k l MinusSmall"
         - "show_upper y x c v b n m BackSpace"
         - "show_numbers show_eschars preferences space show_actions Return"
     upper:
-        - "Esc-small Tab-small Ctrl Alt PageUp PageDown Home End"
+        - "Esc-small Tab-small Ctrl Alt Shift PageUp PageDown Home End"
         - "Q W E R T Z U I O P"
         - "SlashSmall A S D F G H J K L PipeSmall"
         - "show_upper Y X C V B N M BackSpace"
         - "show_numbers show_eschars preferences space show_actions Return"
     numbers:
-        - "Esc-small Tab-small Ctrl Alt ↑ ↓ ← →"
+        - "Esc-small Tab-small Ctrl Alt Shift ↑ ↓ ← →"
         - "1 2 3 4 5 6 7 8 9 0"
         - "\\ * # $ / & - + ( ) _"
         - "show_symbols , \" ' : ; ! ? BackSpace"
         - "show_letters show_eschars preferences space . Return"
     symbols:
-        - "Esc-small Tab-small Ctrl Alt ↑ ↓ ← →"
+        - "Esc-small Tab-small Ctrl Alt Shift ↑ ↓ ← →"
         - "~ ` · √ π τ ÷ × ¶ @"
         - "-- © ® £ € ¥ ^ ° { } --"
         - "show_numbers % | < > = [ ] BackSpace"
         - "show_letters show_eschars preferences space . Return"
     eschars:
-        - "Esc-small Tab-small Ctrl Alt ↑ ↓ ← →"
+        - "Esc-small Tab-small Ctrl Alt Shift ↑ ↓ ← →"
         - "ä è é ö ü Ä È É Ö Ü"
         - "à â ê î ô À Â È Î Ô"
         - "show_numbers « » ç Ç æ œ ß BackSpace"
         - "show_letters show_eschars preferences space „ “ Return"
     actions:
-        - "Esc-small Tab-small Ctrl Alt PageUp PageDown Home End"
+        - "Esc-small Tab-small Ctrl Alt Shift PageUp PageDown Home End"
         - "F1  F2  F3  F4  F5  F6"
         - "F7  F8  F9  F10 F11 F12"
         - "Esc Tab Pause Insert Up Del"
@@ -232,6 +232,10 @@ buttons:
         modifier: "Alt"
         outline: "small"
         label: "Alt"
+    Shift:
+        modifier: "Shift"
+        outline: "small"
+        label: "Umschalt"
     MinusSmall:
         outline: "halfwidth"
         text: "-"
diff --git a/data/keyboards/terminal/es.yaml b/data/keyboards/terminal/es.yaml
index 6bb7e4c2..85dfe4d0 100644
--- a/data/keyboards/terminal/es.yaml
+++ b/data/keyboards/terminal/es.yaml
@@ -8,7 +8,7 @@ outlines:
     halfwidth:     { width: 20.205,  height: 52     }
     large:         { width: 60.615,  height: 52     }
     placeholder:   { width: 20.205,  height: 52     }
-    small:         { width: 57.728,  height: 27.725 }
+    small:         { width: 50.512,  height: 27.725 }
     spaceline:     { width: 114.495, height: 52     }
     special:       { width: 40.41,   height: 52     }
     special-2:     { width: 60.615,  height: 52     }
@@ -17,37 +17,37 @@ outlines:
 
 views:
     base:
-        - "Tab-small Ctrl Alt ↑ ↓ ← →"
+        - "Tab-small Ctrl Alt Shift ↑ ↓ ← →"
         - "q w e r t y u i o p"
         - ".-thin a s d f g h j k l --thin"
         - "show_upper z x c v b n m BackSpace"
         - "show_numbers show_eschars preferences space show_actions Return"
     upper:
-        - "Tab-small Ctrl Alt PageUp PageDown Home End"
+        - "Tab-small Ctrl Alt Shift PageUp PageDown Home End"
         - "Q W E R T Y U I O P"
         - "/-thin A S D F G H J K L |-thin"
         - "show_upper Z X C V B N M BackSpace"
         - "show_numbers show_eschars preferences space show_actions Return"
     numbers:
-        - "Tab-small Ctrl Alt ↑ ↓ ← →"
+        - "Tab-small Ctrl Alt Shift ↑ ↓ ← →"
         - "1 2 3 4 5 6 7 8 9 0"
         - "\\ * # $ / & - + ( ) _"
         - "show_symbols , \" ' : ; ! ? BackSpace"
         - "show_letters show_eschars preferences space . Return"
     symbols:
-        - "Tab-small Ctrl Alt ↑ ↓ ← →"
+        - "Tab-small Ctrl Alt Shift ↑ ↓ ← →"
         - "~ ` · √ π τ ÷ × ¶ @"
         - "-- © ® £ € ¥ ^ ° { } --"
         - "show_numbers % | < > = [ ] BackSpace"
         - "show_letters show_eschars preferences space . Return"
     eschars:
-        - "Tab-small Ctrl Alt ↑ ↓ ← →"
+        - "Tab-small Ctrl Alt Shift ↑ ↓ ← →"
         - "á é í ó ú Á É Í Ó Ú"
         - "à è ì ò ù À È Ì Ò Ù"
         - "show_numbers ü ç ï ñ Ü Ç Ï Ñ BackSpace"
         - "show_letters show_eschars preferences space . Return"
     actions:
-        - "Tab-small Ctrl Alt PageUp PageDown Home End"
+        - "Tab-small Ctrl Alt Shift PageUp PageDown Home End"
         - "F1  F2  F3  F4  F5  F6"
         - "F7  F8  F9  F10 F11 F12"
         - "Esc Tab Pause Insert Up Del"
@@ -227,6 +227,10 @@ buttons:
         modifier: "Alt"
         outline: "small"
         label: "Alt"
+    Shift:
+        modifier: "Shift"
+        outline: "small"
+        label: "Mayús"
     ü:
         outline: "thin"
     ç:
diff --git a/data/keyboards/terminal/es_wide.yaml b/data/keyboards/terminal/es_wide.yaml
index ad2d3691..9c728c6f 100644
--- a/data/keyboards/terminal/es_wide.yaml
+++ b/data/keyboards/terminal/es_wide.yaml
@@ -8,7 +8,7 @@ outlines:
     halfwidth:     { width: 30.912,  height: 42   }
     large:         { width: 92.736,  height: 42   }
     placeholder:   { width: 30.912,  height: 42   }
-    small:         { width: 77.28,   height: 25.2 }
+    small:         { width: 68.693,  height: 25.2 }
     spaceline:     { width: 175.168, height: 42   }
     special:       { width: 61.824,  height: 42   }
     special-2:     { width: 92.736,  height: 42   }
@@ -17,37 +17,37 @@ outlines:
 
 views:
     base:
-        - "Esc-small Tab-small Ctrl Alt ↑ ↓ ← →"
+        - "Esc-small Tab-small Ctrl Alt Shift ↑ ↓ ← →"
         - "q w e r t y u i o p"
         - "PeriodSmall a s d f g h j k l MinusSmall"
         - "show_upper z x c v b n m BackSpace"
         - "show_numbers show_eschars preferences space show_actions Return"
     upper:
-        - "Esc-small Tab-small Ctrl Alt PageUp PageDown Home End"
+        - "Esc-small Tab-small Ctrl Alt Shift PageUp PageDown Home End"
         - "Q W E R T Y U I O P"
         - "SlashSmall A S D F G H J K L PipeSmall"
         - "show_upper Z X C V B N M BackSpace"
         - "show_numbers show_eschars preferences space show_actions Return"
     numbers:
-        - "Esc-small Tab-small Ctrl Alt ↑ ↓ ← →"
+        - "Esc-small Tab-small Ctrl Alt Shift ↑ ↓ ← →"
         - "1 2 3 4 5 6 7 8 9 0"
         - "\\ * # $ / & - + ( ) _"
         - "show_symbols , \" ' : ; ! ? BackSpace"
         - "show_letters show_eschars preferences space . Return"
     symbols:
-        - "Esc-small Tab-small Ctrl Alt ↑ ↓ ← →"
+        - "Esc-small Tab-small Ctrl Alt Shift ↑ ↓ ← →"
         - "~ ` · √ π τ ÷ × ¶ @"
         - "-- © ® £ € ¥ ^ ° { } --"
         - "show_numbers % | < > = [ ] BackSpace"
         - "show_letters show_eschars preferences space . Return"
     eschars:
-        - "Esc-small Tab-small Ctrl Alt ↑ ↓ ← →"
+        - "Esc-small Tab-small Ctrl Alt Shift ↑ ↓ ← →"
         - "á é í ó ú Á É Í Ó Ú"
         - "à è ì ò ù À È Ì Ò Ù"
         - "show_numbers ü ç ï ñ Ü Ç Ï Ñ BackSpace"
         - "show_letters show_eschars preferences space . Return"
     actions:
-        - "Esc-small Tab-small Ctrl Alt PageUp PageDown Home End"
+        - "Esc-small Tab-small Ctrl Alt Shift PageUp PageDown Home End"
         - "F1  F2  F3  F4  F5  F6"
         - "F7  F8  F9  F10 F11 F12"
         - "Esc Tab Pause Insert Up Del"
@@ -231,6 +231,10 @@ buttons:
         modifier: "Alt"
         outline: "small"
         label: "Alt"
+    Shift:
+        modifier: "Shift"
+        outline: "small"
+        label: "Mayús"
     ü:
         outline: "thin"
     ç:
diff --git a/data/keyboards/terminal/fr+bepo.yaml b/data/keyboards/terminal/fr+bepo.yaml
index 6cd64cb9..133d995c 100644
--- a/data/keyboards/terminal/fr+bepo.yaml
+++ b/data/keyboards/terminal/fr+bepo.yaml
@@ -6,7 +6,7 @@ outlines:
     change-view:   { width: 60.615,  height: 52     }
     change-view-2: { width: 67.35,   height: 52     }
     large:         { width: 60.615,  height: 52     }
-    small:         { width: 57.728,  height: 27.725 }
+    small:         { width: 50.512,  height: 27.725 }
     spaceline:     { width: 114.495, height: 52     }
     special:       { width: 40.41,   height: 52     }
     special-2:     { width: 60.615,  height: 52     }
@@ -14,37 +14,37 @@ outlines:
 
 views:
     base:
-        - "Tab-small Ctrl Alt ↑ ↓ ← →"
+        - "Tab-small Ctrl Alt Shift ↑ ↓ ← →"
         - "b é p o w v d l j z"
         - "a u i e c t s r n m"
         - "show_upper y x k q g h f BackSpace"
         - "show_numbers show_eschars preferences space show_actions Return"
     upper:
-        - "Tab-small Ctrl Alt PageUp PageDown Home End"
+        - "Tab-small Ctrl Alt Shift PageUp PageDown Home End"
         - "B É P O W V D L J Z"
         - "A U I E C T S R N M"
         - "show_upper Y X K Q G H F BackSpace"
         - "show_numbers show_eschars preferences space show_actions Return"
     numbers:
-        - "Tab-small Ctrl Alt ↑ ↓ ← →"
+        - "Tab-small Ctrl Alt Shift ↑ ↓ ← →"
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # € % & - _ + ( )"
         - "show_symbols , \" ' : ; ! ?  BackSpace"
         - "show_letters show_eschars preferences space . Return"
     symbols:
-        - "Tab-small Ctrl Alt ↑ ↓ ← →"
+        - "Tab-small Ctrl Alt Shift ↑ ↓ ← →"
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ $ ¥ ^ ° * { }"
         - "show_numbers \\ / < > = [ ]  BackSpace"
         - "show_letters show_eschars preferences space . Return"
     eschars:
-        - "Tab-small Ctrl Alt ↑ ↓ ← →"
+        - "Tab-small Ctrl Alt Shift ↑ ↓ ← →"
         - "à â ç é è ê î ô ù û"
         - "À Â Ç É È Ê Î Ô Ù Û"
         - "show_numbers æ œ ä ë ï ö ü  BackSpace"
         - "show_letters show_eschars preferences space . Return"
     actions:
-        - "Tab-small Ctrl Alt PageUp PageDown Home End"
+        - "Tab-small Ctrl Alt Shift PageUp PageDown Home End"
         - "F1  F2  F3  F4  F5  F6"
         - "F7  F8  F9  F10 F11 F12"
         - "Esc Tab Pause Insert Up Del"
@@ -168,6 +168,10 @@ buttons:
         modifier: "Alt"
         outline: "small"
         label: "Alt"
+    Shift:
+        modifier: "Shift"
+        outline: "small"
+        label: "Maj"
     show_actions:
         action:
             set_view: "actions"
diff --git a/data/keyboards/terminal/fr+bepo_wide.yaml b/data/keyboards/terminal/fr+bepo_wide.yaml
index cd3fc590..48b07236 100644
--- a/data/keyboards/terminal/fr+bepo_wide.yaml
+++ b/data/keyboards/terminal/fr+bepo_wide.yaml
@@ -6,7 +6,7 @@ outlines:
     change-view:   { width: 92.736,  height: 42   }
     change-view-2: { width: 103.04,  height: 42   }
     large:         { width: 92.736,  height: 42   }
-    small:         { width: 77.28,   height: 25.2 }
+    small:         { width: 68.693,  height: 25.2 }
     spaceline:     { width: 175.168, height: 42   }
     special:       { width: 61.824,  height: 42   }
     special-2:     { width: 92.736,  height: 42   }
@@ -14,37 +14,37 @@ outlines:
 
 views:
     base:
-        - "Esc-small Tab-small Ctrl Alt ↑ ↓ ← →"
+        - "Esc-small Tab-small Ctrl Alt Shift ↑ ↓ ← →"
         - "b é p o w v d l j z"
         - "a u i e c t s r n m"
         - "show_upper y x k q g h f BackSpace"
         - "show_numbers show_eschars preferences space show_actions Return"
     upper:
-        - "Esc-small Tab-small Ctrl Alt PageUp PageDown Home End"
+        - "Esc-small Tab-small Ctrl Alt Shift PageUp PageDown Home End"
         - "B É P O W V D L J Z"
         - "A U I E C T S R N M"
         - "show_upper Y X K Q G H F BackSpace"
         - "show_numbers show_eschars preferences space show_actions Return"
     numbers:
-        - "Esc-small Tab-small Ctrl Alt ↑ ↓ ← →"
+        - "Esc-small Tab-small Ctrl Alt Shift ↑ ↓ ← →"
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # € % & - _ + ( )"
         - "show_symbols   , \" ' : ; ! ?  BackSpace"
         - "show_letters show_eschars preferences space . Return"
     symbols:
-        - "Esc-small Tab-small Ctrl Alt ↑ ↓ ← →"
+        - "Esc-small Tab-small Ctrl Alt Shift ↑ ↓ ← →"
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ $ ¥ ^ ° * { }"
         - "show_numbers   \\ / < > = [ ]  BackSpace"
         - "show_letters show_eschars preferences space . Return"
     eschars:
-        - "Esc-small Tab-small Ctrl Alt ↑ ↓ ← →"
+        - "Esc-small Tab-small Ctrl Alt Shift ↑ ↓ ← →"
         - "à â ç é è ê î ô ù û"
         - "À Â Ç É È Ê Î Ô Ù Û"
         - "show_numbers  æ œ ä ë ï ö ü  BackSpace"
         - "show_letters show_eschars preferences space . Return"
     actions:
-        - "Esc-small Tab-small Ctrl Alt PageUp PageDown Home End"
+        - "Esc-small Tab-small Ctrl Alt Shift PageUp PageDown Home End"
         - "F1  F2  F3  F4  F5  F6"
         - "F7  F8  F9  F10 F11 F12"
         - "Esc Tab Pause Insert Up Del"
@@ -172,6 +172,10 @@ buttons:
         modifier: "Alt"
         outline: "small"
         label: "Alt"
+    Shift:
+        modifier: "Shift"
+        outline: "small"
+        label: "Maj"
     show_actions:
         action:
             set_view: "actions"
diff --git a/data/keyboards/terminal/fr.yaml b/data/keyboards/terminal/fr.yaml
index 467ad87a..14756d95 100644
--- a/data/keyboards/terminal/fr.yaml
+++ b/data/keyboards/terminal/fr.yaml
@@ -6,7 +6,7 @@ outlines:
     change-view:   { width: 60.615,  height: 52     }
     change-view-2: { width: 67.35,   height: 52     }
     large:         { width: 60.615,  height: 52     }
-    small:         { width: 57.728,  height: 27.725 }
+    small:         { width: 50.512,  height: 27.725 }
     spaceline:     { width: 114.495, height: 52     }
     special:       { width: 40.41,   height: 52     }
     special-2:     { width: 60.615,  height: 52     }
@@ -14,37 +14,37 @@ outlines:
 
 views:
     base:
-        - "Tab-small Ctrl Alt ↑ ↓ ← →"
+        - "Tab-small Ctrl Alt Shift ↑ ↓ ← →"
         - "a z e r t y u i o p"
         - "q s d f g h j k l m"
         - "show_upper w x c v b n . BackSpace"
         - "show_numbers show_eschars preferences space show_actions Return"
     upper:
-        - "Tab-small Ctrl Alt PageUp PageDown Home End"
+        - "Tab-small Ctrl Alt Shift PageUp PageDown Home End"
         - "A Z E R T Y U I O P"
         - "Q S D F G H J K L M"
         - "show_upper W X C V B N , BackSpace"
         - "show_numbers show_eschars preferences space show_actions Return"
     numbers:
-        - "Tab-small Ctrl Alt ↑ ↓ ← →"
+        - "Tab-small Ctrl Alt Shift ↑ ↓ ← →"
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # € % & - _ + ( )"
         - "show_symbols , \" ' : ; ! ? BackSpace"
         - "show_letters show_eschars preferences space .-large Return"
     symbols:
-        - "Tab-small Ctrl Alt ↑ ↓ ← →"
+        - "Tab-small Ctrl Alt Shift ↑ ↓ ← →"
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ $ ¥ ^ ° * { }"
         - "show_numbers \\ / < > = [ ] BackSpace"
         - "show_letters show_eschars preferences space .-large Return"
     eschars:
-        - "Tab-small Ctrl Alt ↑ ↓ ← →"
+        - "Tab-small Ctrl Alt Shift ↑ ↓ ← →"
         - "à â ç é è ê î ô ù û"
         - "À Â Ç É È Ê Î Ô Ù Û"
         - "show_numbers æ œ ä ë ï ö ü BackSpace"
         - "show_letters show_eschars preferences space .-large Return"
     actions:
-        - "Tab-small Ctrl Alt PageUp PageDown Home End"
+        - "Tab-small Ctrl Alt Shift PageUp PageDown Home End"
         - "F1  F2  F3  F4  F5  F6"
         - "F7  F8  F9  F10 F11 F12"
         - "Esc Tab Pause Insert Up Del"
@@ -169,6 +169,10 @@ buttons:
         modifier: "Alt"
         outline: "small"
         label: "Alt"
+    Shift:
+        modifier: "Shift"
+        outline: "small"
+        label: "Maj"
     show_actions:
         action:
             set_view: "actions"
diff --git a/data/keyboards/terminal/fr_wide.yaml b/data/keyboards/terminal/fr_wide.yaml
index 1c19d2f4..56a8761e 100644
--- a/data/keyboards/terminal/fr_wide.yaml
+++ b/data/keyboards/terminal/fr_wide.yaml
@@ -6,7 +6,7 @@ outlines:
     change-view:   { width: 92.736,  height: 42   }
     change-view-2: { width: 103.04,  height: 42   }
     large:         { width: 92.736,  height: 42   }
-    small:         { width: 77.28,   height: 25.2 }
+    small:         { width: 68.693,  height: 25.2 }
     spaceline:     { width: 175.168, height: 42   }
     special:       { width: 61.824,  height: 42   }
     special-2:     { width: 92.736,  height: 42   }
@@ -14,37 +14,37 @@ outlines:
 
 views:
     base:
-        - "Esc-small Tab-small Ctrl Alt ↑ ↓ ← →"
+        - "Esc-small Tab-small Ctrl Alt Shift ↑ ↓ ← →"
         - "a z e r t y u i o p"
         - "q s d f g h j k l m"
         - "show_upper w x c v b n . BackSpace"
         - "show_numbers show_eschars preferences space show_actions Return"
     upper:
-        - "Esc-small Tab-small Ctrl Alt PageUp PageDown Home End"
+        - "Esc-small Tab-small Ctrl Alt Shift PageUp PageDown Home End"
         - "A Z E R T Y U I O P"
         - "Q S D F G H J K L M"
         - "show_upper W X C V B N , BackSpace"
         - "show_numbers show_eschars preferences space show_actions Return"
     numbers:
-        - "Esc-small Tab-small Ctrl Alt ↑ ↓ ← →"
+        - "Esc-small Tab-small Ctrl Alt Shift ↑ ↓ ← →"
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # € % & - _ + ( )"
         - "show_symbols , \" ' : ; ! ? BackSpace"
         - "show_letters show_eschars preferences space .-large Return"
     symbols:
-        - "Esc-small Tab-small Ctrl Alt ↑ ↓ ← →"
+        - "Esc-small Tab-small Ctrl Alt Shift ↑ ↓ ← →"
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ $ ¥ ^ ° * { }"
         - "show_numbers \\ / < > = [ ] BackSpace"
         - "show_letters show_eschars preferences space .-large Return"
     eschars:
-        - "Esc-small Tab-small Ctrl Alt ↑ ↓ ← →"
+        - "Esc-small Tab-small Ctrl Alt Shift ↑ ↓ ← →"
         - "à â ç é è ê î ô ù û"
         - "À Â Ç É È Ê Î Ô Ù Û"
         - "show_numbers æ œ ä ë ï ö ü BackSpace"
         - "show_letters show_eschars preferences space .-large Return"
     actions:
-        - "Esc-small Tab-small Ctrl Alt PageUp PageDown Home End"
+        - "Esc-small Tab-small Ctrl Alt Shift PageUp PageDown Home End"
         - "F1  F2  F3  F4  F5  F6"
         - "F7  F8  F9  F10 F11 F12"
         - "Esc Tab Pause Insert Up Del"
@@ -172,6 +172,10 @@ buttons:
         modifier: "Alt"
         outline: "small"
         label: "Alt"
+    Shift:
+        modifier: "Shift"
+        outline: "small"
+        label: "Maj"
     show_actions:
         action:
             set_view: "actions"
diff --git a/data/keyboards/terminal/us+dvorak.yaml b/data/keyboards/terminal/us+dvorak.yaml
index 8ca94dda..f64d23a1 100644
--- a/data/keyboards/terminal/us+dvorak.yaml
+++ b/data/keyboards/terminal/us+dvorak.yaml
@@ -6,7 +6,7 @@ outlines:
     change-view:   { width: 60.615,  height: 52     }
     change-view-2: { width: 67.35,   height: 52     }
     large:         { width: 60.615,  height: 52     }
-    small:         { width: 57.728,  height: 27.725 }
+    small:         { width: 50.512,  height: 27.725 }
     spaceline:     { width: 148.17,  height: 52     }
     special:       { width: 60.615,  height: 52     }
     special-2:     { width: 60.615,  height: 52     }
@@ -14,31 +14,31 @@ outlines:
 
 views:
     base:
-        - "Tab-small Ctrl Alt ↑ ↓ ← →"
+        - "Tab-small Ctrl Alt Shift ↑ ↓ ← →"
         - "show_upper p y f g c r l BackSpace"
         - "a o e u i d h t n s"
         - ", q j k x b m w v z"
         - "show_numbers preferences space show_actions Return"
     upper:
-        - "Tab-small Ctrl Alt PageUp PageDown Home End"
+        - "Tab-small Ctrl Alt Shift PageUp PageDown Home End"
         - "show_upper P Y F G C R L BackSpace"
         - "A O E U I D H T N S"
         - ", Q J K X B M W V Z"
         - "show_numbers preferences space show_actions Return"
     numbers:
-        - "Tab-small Ctrl Alt ↑ ↓ ← →"
+        - "Tab-small Ctrl Alt Shift ↑ ↓ ← →"
         - "show_symbols , \" ' : ; ! ? BackSpace"
         - "* # $ / & - _ + ( )"
         - "1 2 3 4 5 6 7 8 9 0"
         - "show_letters preferences space . Return"
     symbols:
-        - "Tab-small Ctrl Alt ↑ ↓ ← →"
+        - "Tab-small Ctrl Alt Shift ↑ ↓ ← →"
         - "show_numbers_from_symbols \\ % < > = [ ] BackSpace"
         - "© ® £ € ¥ ^ ° @ { }"
         - "~ ` | · √ π τ ÷ × ¶"
         - "show_letters preferences space . Return"
     actions:
-        - "Tab-small Ctrl Alt PageUp PageDown Home End"
+        - "Tab-small Ctrl Alt Shift PageUp PageDown Home End"
         - "F1  F2  F3  F4  F5  F6"
         - "F7  F8  F9  F10 F11 F12"
         - "Esc Tab Pause Insert Up Del"
@@ -210,3 +210,7 @@ buttons:
         modifier: "Alt"
         outline: "small"
         label: "Alt"
+    Shift:
+        modifier: "Shift"
+        outline: "small"
+        label: "Shift"
\ No newline at end of file
diff --git a/data/keyboards/terminal/us+dvorak_wide.yaml b/data/keyboards/terminal/us+dvorak_wide.yaml
index 922e1eb4..4fb222dd 100644
--- a/data/keyboards/terminal/us+dvorak_wide.yaml
+++ b/data/keyboards/terminal/us+dvorak_wide.yaml
@@ -6,7 +6,7 @@ outlines:
     change-view:   { width: 92.736,  height: 42   }
     change-view-2: { width: 103.04,  height: 42   }
     large:         { width: 92.736,  height: 42   }
-    small:         { width: 77.28,   height: 25.2 }
+    small:         { width: 68.693,  height: 25.2 }
     spaceline:     { width: 267.904, height: 42   }
     special:       { width: 61.824,  height: 42   }
     special-2:     { width: 92.736,  height: 42   }
@@ -14,31 +14,31 @@ outlines:
 
 views:
     base:
-        - "Esc-small Tab-small Ctrl Alt ↑ ↓ ← →"
+        - "Esc-small Tab-small Ctrl Alt Shift ↑ ↓ ← →"
         - "show_upper p y f g c r l BackSpace"
         - "a o e u i d h t n s"
         - ", q j k x b m w v z"
         - "show_numbers preferences space show_actions Return"
     upper:
-        - "Esc-small Tab-small Ctrl Alt PageUp PageDown Home End"
+        - "Esc-small Tab-small Ctrl Alt Shift PageUp PageDown Home End"
         - "show_upper P Y F G C R L BackSpace"
         - "A O E U I D H T N S"
         - ", Q J K X B M W V Z"
         - "show_numbers preferences space show_actions Return"
     numbers:
-        - "Esc-small Tab-small Ctrl Alt ↑ ↓ ← →"
+        - "Esc-small Tab-small Ctrl Alt Shift ↑ ↓ ← →"
         - "show_symbols , \" ' : ; ! ? BackSpace"
         - "* # $ / & - _ + ( )"
         - "1 2 3 4 5 6 7 8 9 0"
         - "show_letters preferences space . Return"
     symbols:
-        - "Esc-small Tab-small Ctrl Alt ↑ ↓ ← →"
+        - "Esc-small Tab-small Ctrl Alt Shift ↑ ↓ ← →"
         - "show_numbers \\ % < > = [ ] BackSpace"
         - "© ® £ € ¥ ^ ° @ { }"
         - "~ ` | · √ π τ ÷ × ¶"
         - "show_letters preferences space . Return"
     actions:
-        - "Esc-small Tab-small Ctrl Alt PageUp PageDown Home End"
+        - "Esc-small Tab-small Ctrl Alt Shift PageUp PageDown Home End"
         - "F1  F2  F3  F4  F5  F6"
         - "F7  F8  F9  F10 F11 F12"
         - "Esc Tab Pause Insert Up Del"
@@ -209,3 +209,7 @@ buttons:
         modifier: "Alt"
         outline: "small"
         label: "Alt"
+    Shift:
+        modifier: "Shift"
+        outline: "small"
+        label: "Shift"
\ No newline at end of file
diff --git a/data/keyboards/terminal/us.yaml b/data/keyboards/terminal/us.yaml
index fad10795..6b1d91f0 100644
--- a/data/keyboards/terminal/us.yaml
+++ b/data/keyboards/terminal/us.yaml
@@ -9,7 +9,7 @@ outlines:
     large:         { width: 60.615,  height: 52     }
     narrow:        { width: 30.307,  height: 52     }
     placeholder:   { width: 20.205,  height: 52     }
-    small:         { width: 57.728,  height: 27.725 }
+    small:         { width: 50.512,  height: 27.725 }
     spaceline:     { width: 148.17,  height: 52     }
     special:       { width: 60.615,  height: 52     }
     special-2:     { width: 60.615,  height: 52     }
@@ -17,31 +17,31 @@ outlines:
 
 views:
     base:
-        - "Tab-small Ctrl Alt ↑ ↓ ← →"
+        - "Tab-small Ctrl Alt Shift ↑ ↓ ← →"
         - "q w e r t y u i o p"
         - ".-thin a s d f g h j k l --thin"
         - "show_upper z x c v b n m BackSpace"
         - "show_numbers preferences space show_actions Return"
     upper:
-        - "Tab-small Ctrl Alt PageUp PageDown Home End"
+        - "Tab-small Ctrl Alt Shift PageUp PageDown Home End"
         - "Q W E R T Y U I O P"
         - "/-thin A S D F G H J K L |-thin"
         - "show_upper Z X C V B N M BackSpace"
         - "show_numbers preferences space show_actions Return"
     numbers:
-        - "Tab-small Ctrl Alt ↑ ↓ ← →"
+        - "Tab-small Ctrl Alt Shift ↑ ↓ ← →"
         - "1 2 3 4 5 6 7 8 9 0"
         - "\\ * # $ / & - + ( ) _"
         - "show_symbols , \" ' : ; ! ? BackSpace"
         - "show_letters preferences space . Return"
     symbols:
-        - "Tab-small Ctrl Alt ↑ ↓ ← →"
+        - "Tab-small Ctrl Alt Shift ↑ ↓ ← →"
         - "~ ` · √ π τ ÷ × ¶ @"
         - "-- © ® £ € ¥ ^ ° { } --"
         - "show_numbers_from_symbols % | < > = [ ] BackSpace"
         - "show_letters preferences space . Return"
     actions:
-        - "Tab-small Ctrl Alt PageUp PageDown Home End"
+        - "Tab-small Ctrl Alt Shift PageUp PageDown Home End"
         - "F1  F2  F3  F4  F5  F6"
         - "F7  F8  F9  F10 F11 F12"
         - "Esc Tab Pause Insert Up Del"
@@ -213,6 +213,10 @@ buttons:
         modifier: "Alt"
         outline: "small"
         label: "Alt"
+    Shift:
+        modifier: "Shift"
+        outline: "small"
+        label: "Shift"
     --thin:
         outline: "halfwidth"
         text: "-"
diff --git a/data/keyboards/terminal/us_wide.yaml b/data/keyboards/terminal/us_wide.yaml
index e0f4d653..90dc252f 100644
--- a/data/keyboards/terminal/us_wide.yaml
+++ b/data/keyboards/terminal/us_wide.yaml
@@ -8,7 +8,7 @@ outlines:
     halfwidth:     { width: 30.912,  height: 42   }
     large:         { width: 92.736,  height: 42   }
     placeholder:   { width: 30.912,  height: 42   }
-    small:         { width: 77.28,   height: 25.2 }
+    small:         { width: 68.693,  height: 25.2 }
     spaceline:     { width: 267.904, height: 42   }
     special:       { width: 61.824,  height: 42   }
     special-2:     { width: 92.736,  height: 42   }
@@ -16,31 +16,31 @@ outlines:
 
 views:
     base:
-        - "Esc-small Tab-small Ctrl Alt ↑ ↓ ← →"
+        - "Esc-small Tab-small Ctrl Alt Shift ↑ ↓ ← →"
         - "q w e r t y u i o p"
         - ".-thin a s d f g h j k l --thin"
         - "show_upper z x c v b n m BackSpace"
         - "show_numbers preferences space show_actions Return"
     upper:
-        - "Esc-small Tab-small Ctrl Alt PageUp PageDown Home End"
+        - "Esc-small Tab-small Ctrl Alt Shift PageUp PageDown Home End"
         - "Q W E R T Y U I O P"
         - "/-thin A S D F G H J K L |-thin"
         - "show_upper Z X C V B N M BackSpace"
         - "show_numbers preferences space show_actions Return"
     numbers:
-        - "Esc-small Tab-small Ctrl Alt ↑ ↓ ← →"
+        - "Esc-small Tab-small Ctrl Alt Shift ↑ ↓ ← →"
         - "1 2 3 4 5 6 7 8 9 0"
         - "\\ * # $ / & - + ( ) _"
         - "show_symbols , \" ' : ; ! ? BackSpace"
         - "show_letters preferences space . Return"
     symbols:
-        - "Esc-small Tab-small Ctrl Alt ↑ ↓ ← →"
+        - "Esc-small Tab-small Ctrl Alt Shift ↑ ↓ ← →"
         - "~ ` · √ π τ ÷ × ¶ @"
         - "-- © ® £ € ¥ ^ ° { } --"
         - "show_numbers % | < > = [ ] BackSpace"
         - "show_letters preferences space . Return"
     actions:
-        - "Esc-small Tab-small Ctrl Alt PageUp PageDown Home End"
+        - "Esc-small Tab-small Ctrl Alt Shift PageUp PageDown Home End"
         - "F1  F2  F3  F4  F5  F6"
         - "F7  F8  F9  F10 F11 F12"
         - "Esc Tab Pause Insert Up Del"
@@ -211,6 +211,10 @@ buttons:
         modifier: "Alt"
         outline: "small"
         label: "Alt"
+    Shift:
+        modifier: "Shift"
+        outline: "small"
+        label: "Shift"
     --thin:
         outline: "halfwidth"
         text: "-"