diff --git a/home/dot_config/sway/config.d/inputs b/home/dot_config/sway/config.d/inputs
index a52ff48..b9e8d95 100644
--- a/home/dot_config/sway/config.d/inputs
+++ b/home/dot_config/sway/config.d/inputs
@@ -29,7 +29,7 @@ input type:touchpad {
 }
 
 input type:keyboard {
-    xkb_layout gb(colemak)
+    xkb_layout gb(colemak),gb,us(colemak),us
     xkb_options ctrl:nocaps
 }
 
@@ -37,8 +37,3 @@ input 65261:4871:TMK/Cub_Ergodox {
   xkb_layout gb
   xkb_options compose:prsc
 }
-
-input 1241:36:HOLDCHIP_USB_Keyboard {
-  xkb_layout us(colemak)
-  xkb_options ctrl:nocaps
-}
diff --git a/home/dot_config/waybar/config.jsonc b/home/dot_config/waybar/config.jsonc
index 4408bd1..d7b6778 100644
--- a/home/dot_config/waybar/config.jsonc
+++ b/home/dot_config/waybar/config.jsonc
@@ -239,5 +239,9 @@
         "on-click": "cliphist list | wofi -S dmenu | cliphist decode | wl-copy",
         "on-click-middle": "cliphist list | wofi -S dmenu | cliphist delete",
         "on-click-right": "cliphist wipe"
+    },
+    "sway/language": {
+        "format": "{short} {variant}",
+        "on-click": "swaymsg input type:keyboard xkb_switch_layout next"
     }
 }