diff --git a/home/dot_config/sway/config.d/bindings b/home/dot_config/sway/config.d/bindings
index 246c6e8..bb2fb53 100644
--- a/home/dot_config/sway/config.d/bindings
+++ b/home/dot_config/sway/config.d/bindings
@@ -169,3 +169,10 @@ bindsym $mod+r mode "resize"
 bindsym $mod+Alt+l exec swaylock
 
 bindsym $mod+p exec cliphist list | wofi -S dmenu | cliphist decode | wl-copy
+
+mode "keyboard_layout" {
+    bindsym c mode "default", exec swaymsg input type:keyboard xkb_variant colemak  && notify-send "Layout Change" "colemak"
+    bindsym q mode "default", exec swaymsg input type:keyboard xkb_variant '""'  && notify-send "Layout Change" "qwerty"
+}
+
+bindsym $mod+t mode keyboard_layout
diff --git a/home/dot_config/sway/config.d/inputs b/home/dot_config/sway/config.d/inputs
index b9e8d95..7fd4325 100644
--- a/home/dot_config/sway/config.d/inputs
+++ b/home/dot_config/sway/config.d/inputs
@@ -29,7 +29,13 @@ input type:touchpad {
 }
 
 input type:keyboard {
-    xkb_layout gb(colemak),gb,us(colemak),us
+    xkb_layout gb
+    xkb_variant colemak
+    xkb_options ctrl:nocaps
+}
+input 1241:36:HOLDCHIP_USB_Keyboard {
+    xkb_layout us
+    xkb_variant colemak
     xkb_options ctrl:nocaps
 }
 
diff --git a/home/dot_config/waybar/config.jsonc b/home/dot_config/waybar/config.jsonc
index d7b6778..e2519ea 100644
--- a/home/dot_config/waybar/config.jsonc
+++ b/home/dot_config/waybar/config.jsonc
@@ -29,9 +29,7 @@
         "network#wifi",
         "cpu",
         "memory",
-        "temperature",
         "backlight",
-        "sway/language",
         "battery",
         "battery#bat2",
         "tray",
@@ -91,18 +89,6 @@
     "memory": {
         "format": "{}% "
     },
-    "temperature": {
-        "thermal-zone": 4,
-        "hwmon-path": "/sys/class/hwmon/hwmon4/temp1_input",
-        "critical-threshold": 100,
-        // "format-critical": "{temperatureC}°C {icon}",
-        "format": "{temperatureC}°C {icon}",
-        "format-icons": [
-            "",
-            "",
-            ""
-        ]
-    },
     "backlight": {
         // "device": "acpi_video1",
         "format": "{percent}% {icon}",
@@ -239,9 +225,5 @@
         "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"
     }
 }
diff --git a/home/dot_config/waybar/style.css b/home/dot_config/waybar/style.css
index 8789934..d34f33b 100644
--- a/home/dot_config/waybar/style.css
+++ b/home/dot_config/waybar/style.css
@@ -257,9 +257,6 @@ label:focus {
 
 #language {
     border-bottom: 3px solid @cyan;
-    padding: 0 5px;
-    margin: 0 5px;
-    min-width: 16px;
 }