diff --git a/flake.lock b/flake.lock
index 926c7e8f..5a89aee7 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1759,27 +1759,6 @@
         "type": "github"
       }
     },
-    "home-manager_3": {
-      "inputs": {
-        "nixpkgs": [
-          "zen-browser",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1771102945,
-        "narHash": "sha256-e5NfW8NhC3qChR8bHVni/asrig/ZFzd1wzpq+cEE/tg=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "ff5e5d882c51f9a032479595cbab40fd04f56399",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
     "hyprcursor": {
       "inputs": {
         "hyprlang": [
@@ -4599,7 +4578,9 @@
     },
     "zen-browser": {
       "inputs": {
-        "home-manager": "home-manager_3",
+        "home-manager": [
+          "home-manager"
+        ],
         "nixpkgs": [
           "nixpkgs"
         ]
diff --git a/flake.nix b/flake.nix
index 7bf28347..c8badd5a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -155,9 +155,9 @@
     };
     zen-browser = {
       url = "github:0xc000022070/zen-browser-flake";
-      # IMPORTANT: we're using "libgbm" and is only available in unstable so ensure
-      # to have it up-to-date or simply don't specify the nixpkgs input
+      # IMPORTANT: To ensure compatibility with the latest Firefox version, use nixpkgs-unstable.
       inputs.nixpkgs.follows = "nixpkgs";
+      inputs.home-manager.follows = "home-manager";
     };
 
     anyrun = {
diff --git a/home/apps/default.nix b/home/apps/default.nix
index 8643c51b..c8ef7c87 100644
--- a/home/apps/default.nix
+++ b/home/apps/default.nix
@@ -3,9 +3,9 @@
   device,
   ...
 }:
- lib.optionalAttrs device.hasGui {
+lib.optionalAttrs device.hasGui {
   imports = [
-    ./audacity.nix
+    # ./audacity.nix
     # ./bottles.nix
     # ./cursor.nix
     # ./gimp.nix
@@ -13,13 +13,18 @@
     # ./ida.nix
     # ./jellyflix.nix
     # ./kicad.nix
+    # ./lmstudio.nix
     # ./neovide.nix
     # ./openscad.nix
+    # ./orcaslicer.nix
     # ./pcsx2.nix
+    # ./prismlauncher.nix
     # ./rpcs3.nix
+    # ./shadps4.nix
     # ./thunderbird.nix
     # ./tsukimi.nix
     # ./vial.nix
+    # ./vlc.nix
     # ./vscode.nix
 
     ./affine.nix
@@ -30,17 +35,12 @@
     ./ghostty.nix
     ./hyprpicker.nix
     ./kitty.nix
-    ./lmstudio.nix
+    ./matrix.nix
     ./mpv.nix
     ./nextcloud.nix
-    ./matrix.nix
     ./obs-studio.nix
-    ./orcaslicer.nix
-    ./prismlauncher.nix
-    ./shadps4.nix
     ./slack.nix
     ./vicinae.nix
-    ./vlc.nix
     ./wezterm.nix
     ./zathura.nix
     ./zed.nix
diff --git a/home/apps/zen.nix b/home/apps/zen.nix
index 5cce649f..e31c12f0 100644
--- a/home/apps/zen.nix
+++ b/home/apps/zen.nix
@@ -2,6 +2,7 @@
   pkgs,
   inputs,
   device,
+  config,
   ...
 }: {
   imports = [
@@ -10,6 +11,25 @@
   programs.zen-browser = {
     enable = device.isLinux;
     profiles.default = {
+      containersForce = true;
+      containers = {
+        Personal = {
+          color = "purple";
+          icon = "fingerprint";
+          id = 1;
+        };
+        Work = {
+          color = "blue";
+          icon = "briefcase";
+          id = 2;
+        };
+        Shopping = {
+          color = "yellow";
+          icon = "dollar";
+          id = 3;
+        };
+      };
+      spacesForce = true;
       extensions.packages = with pkgs.nur.repos.rycee.firefox-addons; [
         privacy-badger
         violentmonkey
@@ -42,5 +62,6 @@
         Fingerprinting = true;
       };
     };
+    suppressXdgMigrationWarning = true;
   };
 }
diff --git a/home/programs/yazi.nix b/home/programs/yazi.nix
index 5fc5c849..77207f45 100644
--- a/home/programs/yazi.nix
+++ b/home/programs/yazi.nix
@@ -17,5 +17,6 @@
         cache_dir = config.home.homeDirectory + "/.cache/yazi/previews";
       };
     };
+    shellWrapperName = "yy";
   };
 }
diff --git a/nixos/ryu/apps/default.nix b/nixos/ryu/apps/default.nix
index d9e32624..16b69a8a 100644
--- a/nixos/ryu/apps/default.nix
+++ b/nixos/ryu/apps/default.nix
@@ -8,5 +8,10 @@
     ./easyeffects.nix
     ./vr.nix
     ./helvum.nix
+    # ./wine.nix
+    # ./virt.nix
+    ./gparted.nix
+    ./nvtop.nix
+    # ./qpwgraph.nix
   ];
 }
diff --git a/nixos/ryu/apps/gparted.nix b/nixos/ryu/apps/gparted.nix
new file mode 100644
index 00000000..4d87a3b9
--- /dev/null
+++ b/nixos/ryu/apps/gparted.nix
@@ -0,0 +1,3 @@
+{pkgs, ...}: {
+  environment.systemPackages = with pkgs; [gparted];
+}
diff --git a/nixos/ryu/apps/nvtop.nix b/nixos/ryu/apps/nvtop.nix
new file mode 100644
index 00000000..cb7c514b
--- /dev/null
+++ b/nixos/ryu/apps/nvtop.nix
@@ -0,0 +1,3 @@
+{pkgs, ...}: {
+  environment.systemPackages = with pkgs; [nvtopPackages.nvidia];
+}
diff --git a/nixos/ryu/apps/qpwgraph.nix b/nixos/ryu/apps/qpwgraph.nix
new file mode 100644
index 00000000..f3222051
--- /dev/null
+++ b/nixos/ryu/apps/qpwgraph.nix
@@ -0,0 +1,3 @@
+{pkgs, ...}: {
+  environment.systemPackages = with pkgs; [qpwgraph];
+}
diff --git a/nixos/ryu/apps/virt.nix b/nixos/ryu/apps/virt.nix
new file mode 100644
index 00000000..62af836c
--- /dev/null
+++ b/nixos/ryu/apps/virt.nix
@@ -0,0 +1,6 @@
+{pkgs, ...}: {
+  environment.systemPackages = with pkgs; [
+    virt-manager
+    quickemu
+  ];
+}
diff --git a/nixos/ryu/apps/wine.nix b/nixos/ryu/apps/wine.nix
new file mode 100644
index 00000000..b7c90e99
--- /dev/null
+++ b/nixos/ryu/apps/wine.nix
@@ -0,0 +1,7 @@
+{pkgs, ...}: {
+  environment.systemPackages = with pkgs; [
+    wine-wayland
+    winetricks
+    wineWowPackages.waylandFull
+  ];
+}
diff --git a/nixos/ryu/configuration.nix b/nixos/ryu/configuration.nix
index fd713f5d..cdaeab4f 100644
--- a/nixos/ryu/configuration.nix
+++ b/nixos/ryu/configuration.nix
@@ -293,42 +293,6 @@
   fonts.fontconfig.enable = true;
   fonts.fontDir.enable = true;
   environment = {
-    # List packages installed in system profile. To search, run:
-    # $ nix search wget
-    systemPackages = with pkgs; [
-      v4l-utils
-      polychromatic
-      openrazer-daemon
-      cudatoolkit
-      # Wine
-      wine-wayland
-      winetricks
-      wineWowPackages.waylandFull
-
-      virt-manager
-      gparted
-      nvtopPackages.nvidia
-      quickemu
-      # (nixvim.makeNixvim (import ../../neovim))
-      qpwgraph
-      hyprland
-      xorg.xhost
-      foot
-      git
-      fish
-      nushell
-      # (pkgs.wrapFirefox
-      #   (pkgs.firefox-unwrapped.override {pipewireSupport = true;})
-      #   {})
-      gnumake
-      python3
-      nerd-fonts.fira-code
-      nerd-fonts.hasklug
-      nerd-fonts.symbols-only
-      monaspace
-      ddcutil
-      libnotify
-    ];
     sessionVariables = {
       WLR_NO_HARDWARE_CURSORS = "1";
       NIXOS_OZONE_WL = "1";
diff --git a/nixos/ryu/games/default.nix b/nixos/ryu/games/default.nix
index bc6b6f18..0e457cc4 100644
--- a/nixos/ryu/games/default.nix
+++ b/nixos/ryu/games/default.nix
@@ -1,5 +1,5 @@
 {...}: {
   imports = [
-    ./hytale.nix
+    # ./hytale.nix
   ];
 }
diff --git a/nixos/ryu/programs/cuda.nix b/nixos/ryu/programs/cuda.nix
new file mode 100644
index 00000000..b0084ce9
--- /dev/null
+++ b/nixos/ryu/programs/cuda.nix
@@ -0,0 +1,3 @@
+{pkgs, ...}: {
+  environment.systemPackages = with pkgs; [cudatoolkit];
+}
diff --git a/nixos/ryu/programs/ddcutil.nix b/nixos/ryu/programs/ddcutil.nix
new file mode 100644
index 00000000..d226d5d2
--- /dev/null
+++ b/nixos/ryu/programs/ddcutil.nix
@@ -0,0 +1,3 @@
+{pkgs, ...}: {
+  environment.systemPackages = with pkgs; [ddcutil];
+}
diff --git a/nixos/ryu/programs/default.nix b/nixos/ryu/programs/default.nix
index dc26f7eb..54b831b0 100644
--- a/nixos/ryu/programs/default.nix
+++ b/nixos/ryu/programs/default.nix
@@ -4,7 +4,7 @@
     ./steam.nix
     ./1password.nix
     ./localsend.nix
-    ./appimage.nix
+    # ./appimage.nix
     ./obs-studio.nix
     ./gnome-disks.nix
     ./nix-ld.nix
@@ -12,5 +12,15 @@
     ./droidcam.nix
     ./wireshark.nix
     ./flatpak.nix
+    ./v4l-utils.nix
+    ./razer.nix
+    ./cuda.nix
+    ./fonts.nix
+    ./dev.nix
+    ./shells.nix
+    ./hyprland.nix
+    ./foot.nix
+    ./ddcutil.nix
+    ./libnotify.nix
   ];
 }
diff --git a/nixos/ryu/programs/dev.nix b/nixos/ryu/programs/dev.nix
new file mode 100644
index 00000000..8ff8702b
--- /dev/null
+++ b/nixos/ryu/programs/dev.nix
@@ -0,0 +1,7 @@
+{pkgs, ...}: {
+  environment.systemPackages = with pkgs; [
+    git
+    gnumake
+    python3
+  ];
+}
diff --git a/nixos/ryu/programs/fonts.nix b/nixos/ryu/programs/fonts.nix
new file mode 100644
index 00000000..3a54d1e1
--- /dev/null
+++ b/nixos/ryu/programs/fonts.nix
@@ -0,0 +1,8 @@
+{pkgs, ...}: {
+  environment.systemPackages = with pkgs; [
+    nerd-fonts.fira-code
+    nerd-fonts.hasklug
+    nerd-fonts.symbols-only
+    monaspace
+  ];
+}
diff --git a/nixos/ryu/programs/foot.nix b/nixos/ryu/programs/foot.nix
new file mode 100644
index 00000000..5cd7646b
--- /dev/null
+++ b/nixos/ryu/programs/foot.nix
@@ -0,0 +1,3 @@
+{pkgs, ...}: {
+  environment.systemPackages = with pkgs; [foot];
+}
diff --git a/nixos/ryu/programs/hyprland.nix b/nixos/ryu/programs/hyprland.nix
new file mode 100644
index 00000000..f4dee3e3
--- /dev/null
+++ b/nixos/ryu/programs/hyprland.nix
@@ -0,0 +1,6 @@
+{pkgs, ...}: {
+  environment.systemPackages = with pkgs; [
+    hyprland
+    xorg.xhost
+  ];
+}
diff --git a/nixos/ryu/programs/libnotify.nix b/nixos/ryu/programs/libnotify.nix
new file mode 100644
index 00000000..253f9421
--- /dev/null
+++ b/nixos/ryu/programs/libnotify.nix
@@ -0,0 +1,3 @@
+{pkgs, ...}: {
+  environment.systemPackages = with pkgs; [libnotify];
+}
diff --git a/nixos/ryu/programs/razer.nix b/nixos/ryu/programs/razer.nix
new file mode 100644
index 00000000..ff8e136c
--- /dev/null
+++ b/nixos/ryu/programs/razer.nix
@@ -0,0 +1,6 @@
+{pkgs, ...}: {
+  environment.systemPackages = with pkgs; [
+    polychromatic
+    openrazer-daemon
+  ];
+}
diff --git a/nixos/ryu/programs/shells.nix b/nixos/ryu/programs/shells.nix
new file mode 100644
index 00000000..c74f3dc9
--- /dev/null
+++ b/nixos/ryu/programs/shells.nix
@@ -0,0 +1,6 @@
+{pkgs, ...}: {
+  environment.systemPackages = with pkgs; [
+    fish
+    nushell
+  ];
+}
diff --git a/nixos/ryu/programs/v4l-utils.nix b/nixos/ryu/programs/v4l-utils.nix
new file mode 100644
index 00000000..c745cb5f
--- /dev/null
+++ b/nixos/ryu/programs/v4l-utils.nix
@@ -0,0 +1,3 @@
+{pkgs, ...}: {
+  environment.systemPackages = with pkgs; [v4l-utils];
+}