diff --git a/TODO.md b/TODO.md
index 4964e16..936143d 100644
--- a/TODO.md
+++ b/TODO.md
@@ -2,8 +2,9 @@
 - [X] Notifications management via dms
 - [X] Launcher via dms
 - [X] DMS screenshots
-- [ ] Hyprland theming using mutagen with dms integration
+- [X] Hyprland theming using mutagen with dms integration
 - [ ] DMS config sync to here using script
+- [ ] Remove `decman` because it's a pain and use smaller scope `archmgr` (only copy all files to locations always and package diff)
 - [X] Binds for other DMS features (with subcommand)
 - [X] Finish decman config
 - [X] Remove wlogout and replace with dms setup
diff --git a/config/hypr/hyprland/binds/launch.lua b/config/hypr/hyprland/binds/launch.lua
index 96f290e..06725fd 100644
--- a/config/hypr/hyprland/binds/launch.lua
+++ b/config/hypr/hyprland/binds/launch.lua
@@ -38,7 +38,7 @@ hl.define_submap("launch", function()
     hl.bind("SHIFT + B", launcher("brave"))
 
     -- bsmanager
-    hl.bind("b", launcher("/opt/bs-manager/bs-manager"))
+    hl.bind("b", launcher("/opt/BSManager/bs-manager"))
 
     -- ALVR
     hl.bind("p", launcher("alvr_dashboard"))
diff --git a/config/hypr/hyprland/execs.lua b/config/hypr/hyprland/execs.lua
index b8f704e..a4d7208 100644
--- a/config/hypr/hyprland/execs.lua
+++ b/config/hypr/hyprland/execs.lua
@@ -1,22 +1,27 @@
 return function(is_laptop)
     hl.env("QT_QPA_PLATFORM", "wayland")
     hl.env("QT_QPA_PLATFORM_THEME", "qt6ct")
-	hl.on("hyprland.start", function()
-		-- hl.exec_cmd("~/.config/hypr/xdg-portal-hyprland")
-		-- hl.exec_cmd("dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP XAUTHORITY DISPLAY")
-		-- hl.exec_cmd("systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP")
-		hl.exec_cmd("systemctl --user start hyprpolkitagent")
-		hl.exec_cmd("hypridle")
-		hl.exec_cmd("hyprpaper")
-		hl.exec_cmd("hyprlauncher -d")
-		hl.exec_cmd("nm-applet")
-		hl.exec_cmd("nextcloud --background")
-		hl.exec_cmd("dms run")
-		hl.exec_cmd("wl-paste --watch cliphist store")
-		if is_laptop then
-			hl.exec_cmd("hyprctl setcursor oreo_spark_blue_cursors 36")
-		else
-			hl.exec_cmd("hyprctl setcursor oreo_spark_blue_cursors 24")
-		end
-	end)
+
+    hl.on("hyprland.start", function()
+        -- Portal fixes
+        hl.exec_cmd("~/.config/hypr/xdg-portal-hyprland")
+
+        -- Environment setup
+        hl.exec_cmd(
+            "dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP XAUTHORITY DISPLAY"
+        )
+        hl.exec_cmd("systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP")
+        hl.exec_cmd("systemctl --user start hyprpolkitagent")
+
+        -- Start bar and utilities
+        hl.exec_cmd("hypridle")
+        hl.exec_cmd("nextcloud --background")
+        hl.exec_cmd("dms run")
+        hl.exec_cmd("wl-paste --watch cliphist store")
+        if is_laptop then
+            hl.exec_cmd("hyprctl setcursor oreo_spark_blue_cursors 36")
+        else
+            hl.exec_cmd("hyprctl setcursor oreo_spark_blue_cursors 24")
+        end
+    end)
 end
diff --git a/modules/core/ui/hyprland.py b/modules/core/ui/hyprland.py
index 54dc6a7..fae8602 100644
--- a/modules/core/ui/hyprland.py
+++ b/modules/core/ui/hyprland.py
@@ -38,6 +38,3 @@ class Hyprland(decman.Module):
                 "./config/wlogout", owner=config.user, group=config.user
             )
         }
-
-    def on_change(self, store: decman.Store):
-        return super().on_change(store)