diff --git a/home-modules/hyprland.nix b/home-modules/hyprland.nix
index 2198d7b..e3ef84e 100644
--- a/home-modules/hyprland.nix
+++ b/home-modules/hyprland.nix
@@ -4,15 +4,27 @@ let
   transparency = builtins.toString rice.transparency;
   terminal = "ghostty";
   terminal-exec = "ghostty --command=";
-  monitors = {
+  monitors = let
+    docked = false;
+  in {
     xps = {
-      main = {
+      main = if docked then {
+        name = "DP-5";
+        resolution = "1920x1080";
+        position = "1920x0";
+        scale = "1.0";
+      } else {
         name = "eDP-1";
         resolution = "1920x1200";
         position = "0x1080";
         scale = "1.0";
       };
-      second = {
+      second = if docked then {
+        name = "DP-6";
+        resolution = "1920x1080";
+        position = "0x0";
+        scale = "1.0";
+      } else {
         name = "DP-3";
         resolution = "1920x1080";
         position = "0x0";
@@ -281,48 +293,46 @@ in {
         "rounding 0, floating:0, onworkspace:w[tv1]"
         "bordersize 0, floating:0, onworkspace:f[1]"
         "rounding 0, floating:0, onworkspace:f[1]"
-      ];
 
-      windowrule = [
         # "opacity ${transparency}, firefox"
-        "opacity ${transparency}, code-oss"
-        "opacity ${transparency}, VSCodium"
-        "opacity ${transparency}, Code"
+        "opacity ${transparency}, class:^(code-oss)$"
+        "opacity ${transparency}, class:^(VSCodium)$"
+        "opacity ${transparency}, class:^(Code)$"
         # "opacity ${transparency}, sent"
-        "opacity ${transparency}, neovide"
-        "opacity ${transparency}, obsidian"
+        "opacity ${transparency}, class:^(neovide)$"
+        "opacity ${transparency}, class:^(obsidian)$"
         # "opacity ${transparency}, zathura"
         # "bordercolor rgba(${rice.lib.nohash rice.color.foreground}ff) rgba(${rice.lib.nohash rice.color.background}${rice.lib.float-to-drune rice.transparency}), Alacritty"
         # "bordercolor rgba(${rice.lib.nohash rice.color.foreground}ff) rgba(${rice.lib.nohash rice.color.background}${rice.lib.float-to-drune rice.transparency}), ${terminal}"
-        "opacity ${transparency}, discord"
-        "opacity ${transparency}, vesktop"
-        "opacity ${transparency}, Element"
-        "opacity ${transparency}, lutris"
-        "opacity ${transparency}, element"
+        "opacity ${transparency}, class:^(discord)$"
+        "opacity ${transparency}, class:^(vesktop)$"
+        "opacity ${transparency}, class:^(Element)$"
+        "opacity ${transparency}, class:^(lutris)$"
+        "opacity ${transparency}, class:^(element)$"
         # "opacity ${transparency}, ^([sS]potify)$"
         # "opacity ${transparency}, virt-manager"
         # "opacity ${transparency}, thunar"
         "opacity ${transparency}, title:^(wlogout)$"
         "opaque, title:^(GNU Image Manipulation Program)$"
         "float, title:^(Picture-in-Picture)$"
-        "float, title:^(Ibus-ui.*)$"
-        "float, ^(ibus-ui.*)$"
-        "float, ^(ibus-ui-gtk3)$"
+        # "float, class:^(Ibus-ui.*)$"
+        # "float, ^(ibus-ui.*)$"
+        # "float, ^(ibus-ui-gtk3)$"
         "float, title:^(Ibus-ui-gtk3)$"
         "pin, title:^(Picture-in-Picture)$"
-        "float, org.kde.polkit-kde-authentication-agent-1"
+        "float, class:^(org.kde.polkit-kde-authentication-agent-1)$"
         "float, title:^(wlogout)$"
-        "float, imv"
+        "float, class:^(imv)$"
         "float, title:^(Page Info — .*)$"
         "float, title:^(Compact folders)$"
-        "tile, sent"
-        "fullscreen, wlogout"
-        "fullscreen, sent"
-        "workspace 14, lutris"
+        "tile, class:^(sent)$"
+        "fullscreen, class:^(wlogout)$"
+        "fullscreen, class:^(sent)$"
+        "workspace 14, class:^(lutris)$"
         "workspace 100, title:^(Apex Legends)$"
-        "workspace 100, ^(cyberpunk2077.exe)$"
+        # "workspace 100, ^(cyberpunk2077.exe)$"
         "workspace 100, title:^(No Man.s Sky)$"
-        "workspace 100, gamescope"
+        "workspace 100, class:^(gamescope)$"
       ];