diff --git a/home/default.nix b/home/default.nix
index 30f98ee..dc23998 100755
--- a/home/default.nix
+++ b/home/default.nix
@@ -161,7 +161,6 @@
         audacity
         strawberry
         musescore
-        mpv
         gimp
         calibre
         spotify-player
diff --git a/home/browsers/firefox/chrome/theme/colors.css b/home/graphical/firefox/chrome/theme/colors.css
similarity index 100%
rename from home/browsers/firefox/chrome/theme/colors.css
rename to home/graphical/firefox/chrome/theme/colors.css
diff --git a/home/browsers/firefox/chrome/theme/hide.css b/home/graphical/firefox/chrome/theme/hide.css
similarity index 100%
rename from home/browsers/firefox/chrome/theme/hide.css
rename to home/graphical/firefox/chrome/theme/hide.css
diff --git a/home/browsers/firefox/chrome/userChrome.css b/home/graphical/firefox/chrome/userChrome.css
similarity index 100%
rename from home/browsers/firefox/chrome/userChrome.css
rename to home/graphical/firefox/chrome/userChrome.css
diff --git a/home/browsers/firefox/default.nix b/home/graphical/firefox/default.nix
similarity index 100%
rename from home/browsers/firefox/default.nix
rename to home/graphical/firefox/default.nix
diff --git a/home/graphical/mpv/default.nix b/home/graphical/mpv/default.nix
new file mode 100644
index 0000000..572a600
--- /dev/null
+++ b/home/graphical/mpv/default.nix
@@ -0,0 +1,33 @@
+{ config, pkgs, ... }:
+
+let
+  catppuccin-mpv = pkgs.fetchFromGitHub {
+    owner = "catppuccin";
+    repo = "mpv";
+    rev = "08e90daf511eee2c10c98f0031b51bb9de240d60";
+    sha256 = "sha256-oUheJNWk2R6gNEmkK8H6PWX0iofx2KMGDoFWtnr420A=";
+  };
+
+  mergedConfig = pkgs.runCommand "mergedConfig" { } ''
+    mkdir -p $out
+    ${pkgs.gnused}/bin/sed 's/#1e1e2e/#000000/g' \
+      ${catppuccin-mpv}/themes/${config.catppuccin.flavor}/${config.catppuccin.accent}.conf \
+      > $out/mpv.conf
+  '';
+in
+{
+  home.packages = with pkgs; [
+    (mpv.override {
+      scripts = with mpvScripts; [
+        uosc
+        sponsorblock
+        mpris
+      ];
+    })
+  ];
+  home.file.".config/mpv" = {
+    source = mergedConfig;
+    recursive = true;
+    force = true;
+  };
+}
diff --git a/home/hosts/alien/default.nix b/home/hosts/alien/default.nix
index 39b3b9c..a13858c 100644
--- a/home/hosts/alien/default.nix
+++ b/home/hosts/alien/default.nix
@@ -16,6 +16,12 @@
     _2ship2harkinian
   ];
 
+  programs.noctalia-shell.settings.brightness = {
+    brightnessStep = 5;
+    enforceMinimum = false;
+    enableDdcSupport = true;
+  };
+
   programs.plasma = {
     panels = [
       # Alternative global menu to fit the modified taskbar
diff --git a/home/hosts/peach/default.nix b/home/hosts/peach/default.nix
index eb45c61..0c92f54 100644
--- a/home/hosts/peach/default.nix
+++ b/home/hosts/peach/default.nix
@@ -21,6 +21,12 @@
     render-drm-device = "/dev/dri/card2";
   };
 
+  programs.noctalia-shell.settings.brightness = {
+    brightnessStep = 5;
+    enforceMinimum = false;
+    enableDdcSupport = false;
+  };
+
   programs.plasma = {
     input.touchpads = [
       {
diff --git a/home/tiling/niri/niri.nix b/home/tiling/niri/niri.nix
index cdadd24..d07b570 100644
--- a/home/tiling/niri/niri.nix
+++ b/home/tiling/niri/niri.nix
@@ -10,7 +10,7 @@
     hotkey-overlay.skip-at-startup = true;
     prefer-no-csd = true;
     gestures.hot-corners.enable = false;
-    spawn-at-startup = [ ];
+    spawn-at-startup = [ ]; # systemd is based sorry
     overview = {
       backdrop-color = pkgs.catppuccin.${config.catppuccin.flavor}.crust;
       workspace-shadow.enable = false;
@@ -75,14 +75,14 @@
       ];
       border = {
         enable = true;
-        width = 1;
+        width = 2;
         active.color = pkgs.catppuccin.${config.catppuccin.flavor}.${config.catppuccin.accent};
         inactive.color = pkgs.catppuccin.${config.catppuccin.flavor}.surface0;
         urgent.color = pkgs.catppuccin.${config.catppuccin.flavor}.maroon;
       };
       focus-ring = {
         enable = false;
-        width = 1;
+        width = 2;
         active.color = pkgs.catppuccin.${config.catppuccin.flavor}.${config.catppuccin.accent};
         inactive.color = pkgs.catppuccin.${config.catppuccin.flavor}.surface0;
         urgent.color = pkgs.catppuccin.${config.catppuccin.flavor}.maroon;
diff --git a/home/tiling/niri/noctalia.nix b/home/tiling/niri/noctalia.nix
index 07b6038..cdfcd56 100644
--- a/home/tiling/niri/noctalia.nix
+++ b/home/tiling/niri/noctalia.nix
@@ -446,11 +446,6 @@ in
         preferredPlayer = "";
         externalMixer = "pwvucontrol || pavucontrol";
       };
-      brightness = {
-        brightnessStep = 5;
-        enforceMinimum = true;
-        enableDdcSupport = true;
-      };
       colorSchemes = {
         useWallpaperColors = false;
         predefinedScheme = "Cat-Custom";
diff --git a/system/all.nix b/system/all.nix
index 64c1c14..2950aef 100755
--- a/system/all.nix
+++ b/system/all.nix
@@ -54,7 +54,8 @@
   home-manager.users.sckova = {
     imports = [
       ../home
-      ../home/browsers/firefox
+      ../home/graphical/firefox
+      ../home/graphical/mpv
       ../home/tiling/niri
       ../home/tiling/quickshell
       ../home/tiling/wallpaper