diff --git a/.config/hypr/vars.conf b/.config/hypr/vars.conf
index a4ab214..ef0c932 100644
--- a/.config/hypr/vars.conf
+++ b/.config/hypr/vars.conf
@@ -3,7 +3,7 @@ input {
     kb_layout = de
     kb_variant =
     kb_model =
-    kb_options =
+    kb_options = compose:menu
     kb_rules =
 	numlock_by_default = true
 
diff --git a/.config/waybar/config b/.config/waybar/config
index 8fada29..2b23ce8 100644
--- a/.config/waybar/config
+++ b/.config/waybar/config
@@ -19,56 +19,7 @@
 		"clock",
 		"tray"
 	],
-	"hyprland/workspaces": {
-		"on-click": "activate",
-		"all-outputs": true,
-		"sort-by-number": true,
-	},
-	"hyprland/window": {
-		"max-length": 128
-	},
-	"clock": {
-		"interval": 1,
-        "format": " {:%Y-%m-%d %H:%M:%S}",
-        "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>"
-	},
-	"cpu": {
-		"format": " {usage}%"
-	},
-	"memory": {
-		"format": " {percentage}%"
-	},
-	"network": {
-		"format": " {ipaddr}"
-	},
-	"temperature": {
-		"format": " {temperatureC}°C"
-	},
-	"tray": {
-		"spacing": 4
-	},
-    "custom/pacman": {
-        "format": "󰏕 {}",
-        "interval": 3600,
-        "exec": "~/.config/waybar/custom/pacman",
-        "on-click": "alacritty -e 'archlinux-update'",
-		"return-type": "json",
-        "signal": 8
-    },
-	"custom/weather": {
-        "exec": "~/.config/waybar/custom/weather",
-        "on-click": "xdg-open 'https://www.wetter.com/deutschland/oranienburg/DE0007983.html'",
-		"return-type": "json",
-		"format": "{}",
-		"tooltip": true,
-		"interval": 1200
-	},
-	"custom/status": {
-		"format": "󱖫 {}",
-        "exec": "~/.config/waybar/custom/status-serguzim-net",
-        "on-click": "xdg-open 'https://status.serguzim.net'",
-		"return-type": "json",
-		"tooltip": true,
-		"interval": 500
-	}
+	"include": [
+		"~/.config/waybar/default-modules.json",
+	],
 }
diff --git a/.config/waybar/default-modules.json b/.config/waybar/default-modules.json
new file mode 100644
index 0000000..c888a86
--- /dev/null
+++ b/.config/waybar/default-modules.json
@@ -0,0 +1,55 @@
+{
+	"hyprland/workspaces": {
+		"on-click": "activate",
+		"all-outputs": true,
+		"sort-by-number": true,
+	},
+	"hyprland/window": {
+		"max-length": 128
+	},
+	"clock": {
+		"interval": 1,
+        "format": " {:%Y-%m-%d %H:%M:%S}",
+        "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>"
+	},
+	"cpu": {
+		"format": " {usage}%"
+	},
+	"memory": {
+		"format": " {percentage}%"
+	},
+	"network": {
+		"format": " {ipaddr}"
+	},
+	"temperature": {
+		"format": " {temperatureC}°C",
+		"hwmon-path": "/sys/class/hwmon/hwmon5/temp1_input"
+	},
+	"tray": {
+		"spacing": 4
+	},
+    "custom/pacman": {
+        "format": "󰏕 {}",
+        "interval": 3600,
+        "exec": "~/.config/waybar/custom/pacman",
+        "on-click": "alacritty -e 'archlinux-update'",
+		"return-type": "json",
+        "signal": 8
+    },
+	"custom/weather": {
+        "exec": "~/.config/waybar/custom/weather",
+        "on-click": "xdg-open 'https://www.wetter.com/deutschland/oranienburg/DE0007983.html'",
+		"return-type": "json",
+		"format": "{}",
+		"tooltip": true,
+		"interval": 1200
+	},
+	"custom/status": {
+		"format": "󱖫 {}",
+        "exec": "~/.config/waybar/custom/status-serguzim-net",
+        "on-click": "xdg-open 'https://status.serguzim.net'",
+		"return-type": "json",
+		"tooltip": true,
+		"interval": 500
+	}
+}