diff --git a/.config/river/keys b/.config/river/keys
index 15dc333..496095c 100755
--- a/.config/river/keys
+++ b/.config/river/keys
@@ -59,23 +59,15 @@ define_tag() {
     riverctl map normal $mod+Shift+Control $2 toggle-view-tags $1
 }
 
-define_tag $((1 << 0)) U
-define_tag $((1 << 1)) I
-define_tag $((1 << 2)) O
-define_tag $((1 << 3)) P
-define_tag $((1 << 4)) Y
-define_tag $((1 << 5)) Comma
-define_tag $((1 << 6)) Period
-define_tag $((1 << 7)) Slash
-define_tag $((1 << 11)) 1
-define_tag $((1 << 12)) 2
-define_tag $((1 << 13)) 3
-define_tag $((1 << 14)) 4
-define_tag $((1 << 15)) 5
-define_tag $((1 << 16)) 6
-define_tag $((1 << 17)) 7
-define_tag $((1 << 18)) 8
-define_tag $((1 << 19)) 9
+define_tag $((1 << 0)) 1
+define_tag $((1 << 1)) 2
+define_tag $((1 << 2)) 3
+define_tag $((1 << 3)) 4
+define_tag $((1 << 4)) 5
+define_tag $((1 << 5)) 6
+define_tag $((1 << 6)) 7
+define_tag $((1 << 7)) 8
+define_tag $((1 << 8)) 9
 
 all_tags=$(((1 << 32) - 1))
 riverctl map normal $mod 0 set-focused-tags $all_tags
diff --git a/.config/yambar/real-config.yml b/.config/yambar/real-config.yml
index 5f4bb24..1c39742 100644
--- a/.config/yambar/real-config.yml
+++ b/.config/yambar/real-config.yml
@@ -16,24 +16,15 @@ bar:
               margin: 8
               tag: id
               values:
-                1: {string: {text: "u"}}
-                2: {string: {text: "i"}}
-                3: {string: {text: "o"}}
-                4: {string: {text: "p"}}
-                5: {string: {text: "y"}}
-                6: {string: {text: ","}}
-                7: {string: {text: "."}}
-                8: {string: {text: "/"}}
-                12: {string: {text: "1"}}
-                13: {string: {text: "2"}}
-                14: {string: {text: "3"}}
-                15: {string: {text: "4"}}
-                16: {string: {text: "5"}}
-                17: {string: {text: "6"}}
-                18: {string: {text: "7"}}
-                19: {string: {text: "8"}}
-                20: {string: {text: "9"}}
-                21: {string: {text: "0"}}
+                1: {string: {text: "1"}}
+                2: {string: {text: "2"}}
+                3: {string: {text: "3"}}
+                4: {string: {text: "4"}}
+                5: {string: {text: "5"}}
+                6: {string: {text: "6"}}
+                7: {string: {text: "7"}}
+                8: {string: {text: "8"}}
+                9: {string: {text: "9"}}
         content:
           map:
             tag: state
@@ -42,24 +33,15 @@ bar:
                 map:
                   <<: *river_base
                   values:
-                    1: {string: {text: "u", foreground: *bg}}
-                    2: {string: {text: "i", foreground: *bg}}
-                    3: {string: {text: "o", foreground: *bg}}
-                    4: {string: {text: "p", foreground: *bg}}
-                    5: {string: {text: "y", foreground: *bg}}
-                    6: {string: {text: ",", foreground: *bg}}
-                    7: {string: {text: ".", foreground: *bg}}
-                    8: {string: {text: "/", foreground: *bg}}
-                    12: {string: {text: "1", foreground: *bg}}
-                    13: {string: {text: "2", foreground: *bg}}
-                    14: {string: {text: "3", foreground: *bg}}
-                    15: {string: {text: "4", foreground: *bg}}
-                    16: {string: {text: "5", foreground: *bg}}
-                    17: {string: {text: "6", foreground: *bg}}
-                    18: {string: {text: "7", foreground: *bg}}
-                    19: {string: {text: "8", foreground: *bg}}
-                    20: {string: {text: "9", foreground: *bg}}
-                    21: {string: {text: "0", foreground: *bg}}
+                    1: {string: {text: "1", foreground: *bg}}
+                    2: {string: {text: "2", foreground: *bg}}
+                    3: {string: {text: "3", foreground: *bg}}
+                    4: {string: {text: "4", foreground: *bg}}
+                    5: {string: {text: "5", foreground: *bg}}
+                    6: {string: {text: "6", foreground: *bg}}
+                    7: {string: {text: "7", foreground: *bg}}
+                    8: {string: {text: "8", foreground: *bg}}
+                    9: {string: {text: "9", foreground: *bg}}
                   deco: {background: {color: *accent}}
               unfocused: {map: {<<: *river_base}}
               invisible: