diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf
index 1a1a25f..3a091e6 100644
--- a/hypr/hyprland.conf
+++ b/hypr/hyprland.conf
@@ -1,9 +1,48 @@
 exec-once=hyprpaper
 env = WLR_DRM_DEVICES,/dev/dri/card0:/dev/dri/card1
-monitor=,preferred,auto,1
+env = WLR_NO_HARDWARE_CURSORS,1
+monitor=DP-2,preferred,0x550,1
+monitor=DP-1,preferred,1920x0,1,bitdepth,10
+monitor=HDMI-A-1,preferred,5760x550,1
+workspace=DP-1,11
+workspace=DP-2,21
+workspace=HDMI-A-1,1
+
+workspace=1,monitor:HDMI-A-1, default:true
+workspace=2,monitor:HDMI-A-1
+workspace=3,monitor:HDMI-A-1
+workspace=4,monitor:HDMI-A-1
+workspace=5,monitor:HDMI-A-1
+workspace=6,monitor:HDMI-A-1
+workspace=7,monitor:HDMI-A-1
+workspace=8,monitor:HDMI-A-1
+workspace=9,monitor:HDMI-A-1
+
+workspace=11,monitor:DP-1, default:true
+workspace=12,monitor:DP-1
+workspace=13,monitor:DP-1
+workspace=14,monitor:DP-1
+workspace=15,monitor:DP-1
+workspace=16,monitor:DP-1
+workspace=17,monitor:DP-1
+workspace=18,monitor:DP-1
+workspace=19,monitor:DP-1
+
+workspace=21,monitor:DP-2
+workspace=22,monitor:DP-2
+workspace=23,monitor:DP-2
+workspace=24,monitor:DP-2
+workspace=25,monitor:DP-2
+workspace=26,monitor:DP-2
+workspace=27,monitor:DP-2
+workspace=28,monitor:DP-2
+workspace=29,monitor:DP-2
+
 exec-once=waybar
-exec-once=sudo wg-quick up wg0
-exec-once=sleep 0.7 && swaylock
+
+binds {
+    scroll_event_delay=1
+}
 
 input {
     kb_layout = us
@@ -79,7 +118,7 @@ bind = $mainMod, SPACE, togglesplit, # dwindle
 bind = CONTROL_L ALT_L, L, exec, swaylock
 bind = $mainMod, C, exec, CM_LAUNCHER=rofi-script rofi -modi "clipmenu:/usr/bin/clipmenu" -show clipmenu
 bind = $mainMod, Y, exec, /home/user/.config/rofi/rofi-ykman.sh
-bind = Control Mod2 Mod4, Q, exec, systemctl suspend
+bind = Super_L Control_L, Q, exec, systemctl suspend
 bind = $mainMod, Escape, exec, rofi -show power-menu -modi power-menu:/home/user/.config/awesome/scripts/rofi-power-menu
 
 bind = ,XF86PowerOff, exec, rofi -show power-menu -modi power-menu:/home/user/.config/awesome/scripts/rofi-power-menu
@@ -87,6 +126,8 @@ bind = ,XF86MonBrightnessUp, exec, xbacklight -inc 10
 bind = ,XF86MonBrightnessDown, exec, xbacklight -dec 10
 bind = ,XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 10%+ --limit 1.0
 bind = ,XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 10%-
+bind = ,mouse_right, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 1%+ --limit 1.0
+bind = ,mouse_left, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 1%-
 bind = ,XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle
 bind = ,XF86AudioNext, exec, playerctl next
 bind = ,XF86AudioPrev, exec, playerctl previous
@@ -108,35 +149,32 @@ bind = $mainMod CONTROL_L, H, resizeactive, -20 0
 bind = $mainMod CONTROL_L, K, resizeactive, 0 -20
 bind = $mainMod CONTROL_L, J, resizeactive, 0 20
 
-# Switch workspaces with mainMod + [0-9]
-bind = $mainMod, 1, workspace, 1
-bind = $mainMod, 2, workspace, 2
-bind = $mainMod, 3, workspace, 3
-bind = $mainMod, 4, workspace, 4
-bind = $mainMod, 5, workspace, 5
-bind = $mainMod, 6, workspace, 6
-bind = $mainMod, 7, workspace, 7
-bind = $mainMod, 8, workspace, 8
-bind = $mainMod, 9, workspace, 9
-bind = $mainMod, 0, workspace, 10
+bind = $mainMod, 1, exec, hyprsome workspace 1
+bind = $mainMod, 2, exec, hyprsome workspace 2
+bind = $mainMod, 3, exec, hyprsome workspace 3
+bind = $mainMod, 4, exec, hyprsome workspace 4
+bind = $mainMod, 5, exec, hyprsome workspace 5
+bind = $mainMod, 6, exec, hyprsome workspace 6
+bind = $mainMod, 7, exec, hyprsome workspace 7
+bind = $mainMod, 8, exec, hyprsome workspace 8
+bind = $mainMod, 9, exec, hyprsome workspace 9
+
+bind = $mainMod SHIFT, 1, exec, hyprsome move 1
+bind = $mainMod SHIFT, 2, exec, hyprsome move 2
+bind = $mainMod SHIFT, 3, exec, hyprsome move 3
+bind = $mainMod SHIFT, 4, exec, hyprsome move 4
+bind = $mainMod SHIFT, 5, exec, hyprsome move 5
+bind = $mainMod SHIFT, 6, exec, hyprsome move 6
+bind = $mainMod SHIFT, 7, exec, hyprsome move 7
+bind = $mainMod SHIFT, 8, exec, hyprsome move 8
+bind = $mainMod SHIFT, 9, exec, hyprsome move 9
 
-# Move active window to a workspace with mainMod + SHIFT + [0-9]
-bind = $mainMod SHIFT, 1, movetoworkspace, 1
-bind = $mainMod SHIFT, 2, movetoworkspace, 2
-bind = $mainMod SHIFT, 3, movetoworkspace, 3
-bind = $mainMod SHIFT, 4, movetoworkspace, 4
-bind = $mainMod SHIFT, 5, movetoworkspace, 5
-bind = $mainMod SHIFT, 6, movetoworkspace, 6
-bind = $mainMod SHIFT, 7, movetoworkspace, 7
-bind = $mainMod SHIFT, 8, movetoworkspace, 8
-bind = $mainMod SHIFT, 9, movetoworkspace, 9
-bind = $mainMod SHIFT, 0, movetoworkspace, 10
 bind = $mainMod SHIFT, T, movetoworkspace, empty
 
 
 # Scroll through existing workspaces with mainMod + scroll
-bind = $mainMod, TAB, workspace, e+1
-bind = $mainMod SHIFT, TAB, workspace, e-1
+bind = $mainMod, TAB, workspace, m+1
+bind = $mainMod SHIFT, TAB, workspace, m-1
 bind = $mainMod, T, workspace, empty
 
 # Move/resize windows with mainMod + LMB/RMB and dragging
diff --git a/hypr/hyprpaper.conf b/hypr/hyprpaper.conf
index 42dfc88..6dd5230 100644
--- a/hypr/hyprpaper.conf
+++ b/hypr/hyprpaper.conf
@@ -1,3 +1,5 @@
 ipc = off
 preload = ~/.config/awesome/images/wallpaper.png
-wallpaper = eDP-1,~/.config/awesome/images/wallpaper.png
+wallpaper = DP-1,~/.config/awesome/images/wallpaper.png
+wallpaper = DP-2,~/.config/awesome/images/wallpaper.png
+wallpaper = HDMI-A-1,~/.config/awesome/images/wallpaper.png
diff --git a/waybar/config b/waybar/config
index 6d1b606..9a94139 100644
--- a/waybar/config
+++ b/waybar/config
@@ -1,13 +1,13 @@
 {
     "layer": "top", // Waybar at top layer
-    "height": 28, // Waybar height (to be removed for auto height)
+    "height": 30, // Waybar height (to be removed for auto height)
     "spacing": 4, // Gaps between modules (4px)
+    "output": "DP-1",
     "modules-left": ["hyprland/window"],
     "modules-center": ["hyprland/workspaces"],
     "modules-right": ["tray", "wireplumber", "cpu", "memory", "custom/updates", "temperature", "battery", "clock"],
     "wireplumber": {
         "format": "{icon}   {volume}%",
-        "on-click": "helvum",
         "format-muted": "",
         "on-click": "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle",
         "format-icons": ["", "", ""]
@@ -15,7 +15,8 @@
     "hyprland/workspaces": {
         "disable-scroll": true,
         "all-outputs": false,
-        "warp-on-scroll": false
+        "warp-on-scroll": false,
+        "format": "{name}"
     },
     "hyprland/window": {
         "max-length": 50,
@@ -67,28 +68,4 @@
         // "format-full": "",
         "format-icons": [" ", " ", " ", " ", " "]
     },
-    "battery#bat2": {
-        "bat": "BAT2"
-    },
-    "network": {
-        // "interface": "wlp2*", // (Optional) To force the use of this interface
-        "format-wifi": "{essid} ({signalStrength}%) ",
-        "format-ethernet": "{ipaddr}/{cidr} ",
-        "tooltip-format": "{ifname} via {gwaddr} ",
-        "format-linked": "{ifname} (No IP) ",
-        "format-disconnected": "Disconnected ⚠",
-        "format-alt": "{ifname}: {ipaddr}/{cidr}"
-    },
-    "custom/media": {
-        "format": "{icon} {}",
-        "return-type": "json",
-        "max-length": 40,
-        "format-icons": {
-            "spotify": "",
-            "default": "🎜"
-        },
-        "escape": true,
-        "exec": "$HOME/.config/waybar/mediaplayer.py 2> /dev/null" // Script in resources folder
-        // "exec": "$HOME/.config/waybar/mediaplayer.py --player spotify 2> /dev/null" // Filter player based on name
-    }
 }
diff --git a/waybar/style.css b/waybar/style.css
index 83e6dcd..d3774e1 100644
--- a/waybar/style.css
+++ b/waybar/style.css
@@ -1,7 +1,7 @@
 * {
     /* `otf-font-awesome` is required to be installed for icons */
     font-family: Ubuntu;
-    font-size: 14px;
+    font-size: 17px;
     font-weight:500;
 }
 
@@ -73,7 +73,6 @@ button:hover {
 
 #window {
     font-weight:400;
-    font-size:14px;
     margin-left:0;
 }
 window#waybar.empty #window {