diff --git a/home/features/desktop/hyprland.nix b/home/features/desktop/hyprland.nix
index 4e28eff..ba009e0 100644
--- a/home/features/desktop/hyprland.nix
+++ b/home/features/desktop/hyprland.nix
@@ -97,35 +97,27 @@
         }
       ];
       windowrule = [
-        "float, file_progress"
-        "float, confirm"
-        "float, dialog"
-        "float, download"
-        "float, notification"
-        "float, error"
-        "float, splash"
-        "float, confirmreset"
+        "float, class:file_progress"
+        "float, class:confirm"
+        "float, class:dialog"
+        "float, class:download"
+        "float, class:notification"
+        "float, class:error"
+        "float, class:splash"
+        "float, class:confirmreset"
         "float, title:Open File"
         "float, title:branchdialog"
-        "float, Lxappearance"
-        "float, Wofi"
-        "float, dunst"
-        "animation none,Wofi"
-        "float,viewnior"
-        "float,feh"
-        "float, pavucontrol-qt"
-        "float, pavucontrol"
-        "float, file-roller"
-        "fullscreen, wlogout"
+        "float, class:pavucontrol-qt"
+        "float, class:pavucontrol"
+        "fullscreen, class:wlogout"
         "float, title:wlogout"
         "fullscreen, title:wlogout"
-        "idleinhibit focus, mpv"
-        "idleinhibit fullscreen, firefox"
+        "float, class:mpv"
+        "idleinhibit focus, class:mpv"
+        "opacity 1.0 override, class:mpv"
         "float, title:^(Media viewer)$"
         "float, title:^(Volume Control)$"
         "float, title:^(Picture-in-Picture)$"
-        "size 800 600, title:^(Volume Control)$"
-        "move 75 44%, title:^(Volume Control)$"
       ];
 
       "$mainMod" = "SUPER";
diff --git a/home/features/desktop/media.nix b/home/features/desktop/media.nix
index 113f07f..45e03ce 100644
--- a/home/features/desktop/media.nix
+++ b/home/features/desktop/media.nix
@@ -27,7 +27,6 @@ in {
       krita
       libation
       makemkv
-      mpv
       pamixer
       pavucontrol
       qpwgraph
@@ -41,16 +40,29 @@ in {
       unimatrix
     ];
 
-    programs.obs-studio = {
-      enable = true;
-      plugins = with pkgs.obs-studio-plugins; [
-        obs-composite-blur
-        obs-vaapi
-        obs-vertical-canvas
-        obs-vkcapture
-        obs-webkitgtk
-        wlrobs
-      ];
+    programs = {
+      obs-studio = {
+        enable = true;
+        plugins = with pkgs.obs-studio-plugins; [
+          obs-composite-blur
+          obs-vaapi
+          obs-vertical-canvas
+          obs-vkcapture
+          obs-webkitgtk
+          wlrobs
+        ];
+      };
+      mpv = {
+        enable = true;
+        bindings = {
+          WHEEL_UP = "seek 10";
+          WHEEL_DOWN = "seek -10";
+        };
+        config = {
+          profile = "gpu-hq";
+          ytdl-format = "bestvideo+bestaudio";
+        };
+      };
     };
   };
 }
diff --git a/home/m3tam3re/m3-ares.nix b/home/m3tam3re/m3-ares.nix
index aed6128..87f5124 100644
--- a/home/m3tam3re/m3-ares.nix
+++ b/home/m3tam3re/m3-ares.nix
@@ -31,18 +31,18 @@ in {
           associations.added = {
             "application/zip" = ["org.gnome.FileRoller.desktop"];
             "application/csv" = ["calc.desktop"];
-            "application/pdf" = ["io.github.zen_browser.zen.desktop"];
-            "x-scheme-handler/http" = ["io.github.zen_browser.zen.desktop"];
-            "x-scheme-handler/https" = ["io.github.zen_browser.zen.desktop"];
+            "application/pdf" = ["vivaldi-stable.desktop"];
+            "x-scheme-handler/http" = ["vivaldi-stable.desktop"];
+            "x-scheme-handler/https" = ["vivaldi-stable.desktop"];
           };
           defaultApplications = {
             "application/zip" = ["org.gnome.FileRoller.desktop"];
             "application/csv" = ["calc.desktop"];
-            "application/pdf" = ["io.github.zen_browser.zen.desktop"];
+            "application/pdf" = ["vivaldi-stable.desktop"];
             "application/md" = ["dev.zed.Zed.desktop"];
             "application/text" = ["dev.zed.Zed.desktop"];
-            "x-scheme-handler/http" = ["io.github.zen_browser.zen.desktop"];
-            "x-scheme-handler/https" = ["io.github.zen_browser.zen.desktop"];
+            "x-scheme-handler/http" = ["vivaldi-stable.desktop"];
+            "x-scheme-handler/https" = ["vivaldi-stable.desktop"];
           };
         };
       };
@@ -84,13 +84,15 @@ in {
             "5, monitor:HDMI-A-1,border:false,rounding:false"
             "6, monitor:HDMI-A-1"
           ];
-          windowrulev2 = [
+          windowrule = [
             "workspace 1,class:dev.zed.Zed"
+            "workspace 1,class:Msty"
             "workspace 2,class:(com.obsproject.Studio)"
-            "workspace 4,opacity 1.0, class:(chromium-browser)"
-            "workspace 4,opacity 1.0, class:(zen)"
+            "workspace 4,opacity 1.0, class:(brave-browser)"
+            "workspace 4,opacity 1.0, class:(vivaldi-stable)"
             "fullscreen,class:^steam_app_\\d+$"
             "workspace 5,class:^steam_app_\\d+$"
+            "idleinhibit focus, class:^steam_app_\\d+$"
           ];
         };
       };
diff --git a/home/m3tam3re/m3-kratos.nix b/home/m3tam3re/m3-kratos.nix
index 75bec4f..6d0218b 100644
--- a/home/m3tam3re/m3-kratos.nix
+++ b/home/m3tam3re/m3-kratos.nix
@@ -31,18 +31,18 @@ in {
           associations.added = {
             "application/zip" = ["org.gnome.FileRoller.desktop"];
             "application/csv" = ["calc.desktop"];
-            "application/pdf" = ["io.github.zen_browser.zen.desktop"];
-            "x-scheme-handler/http" = ["io.github.zen_browser.zen.desktop"];
-            "x-scheme-handler/https" = ["io.github.zen_browser.zen.desktop"];
+            "application/pdf" = ["vivaldi-stable.desktop"];
+            "x-scheme-handler/http" = ["vivaldi-stable.desktop"];
+            "x-scheme-handler/https" = ["vivaldi-stable.desktop"];
           };
           defaultApplications = {
             "application/zip" = ["org.gnome.FileRoller.desktop"];
             "application/csv" = ["calc.desktop"];
-            "application/pdf" = ["io.github.zen_browser.zen.desktop"];
+            "application/pdf" = ["vivaldi-stable.desktop"];
             "application/md" = ["dev.zed.Zed.desktop"];
             "application/text" = ["dev.zed.Zed.desktop"];
-            "x-scheme-handler/http" = ["io.github.zen_browser.zen.desktop"];
-            "x-scheme-handler/https" = ["io.github.zen_browser.zen.desktop"];
+            "x-scheme-handler/http" = ["vivaldi-stable.desktop"];
+            "x-scheme-handler/https" = ["vivaldi-stable.desktop"];
           };
         };
       };
@@ -86,11 +86,13 @@ in {
             "7, monitor:DP-2"
           ];
 
-          windowrulev2 = [
+          windowrule = [
             "workspace 1,class:dev.zed.Zed"
+            "workspace 1,class:Msty"
             "workspace 2,class:(com.obsproject.Studio)"
-            "workspace 4,opacity 1.0, class:(chromium-browser)"
-            "workspace 4,opacity 1.0, class:(zen)"
+            "workspace 4,opacity 1.0, class:(brave-browser)"
+            "workspace 4,opacity 1.0, class:(vivaldi-stable)"
+            "idleinhibit focus, class:^steam_app_\\d+$"
           ];
         };
       };