diff --git a/flake.lock b/flake.lock
index 256a543..20d3059 100644
--- a/flake.lock
+++ b/flake.lock
@@ -90,6 +90,27 @@
         "type": "github"
       }
     },
+    "codex-desktop": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1791562553,
+        "narHash": "sha256-uyLpIxJv9lqy1pgGUd0C/RZvqWyFqbwR0Tq7E+UX0VM=",
+        "owner": "ilysenko",
+        "repo": "codex-desktop-linux",
+        "rev": "443cb5d52ed781cac6cc7083780abb058cf93678",
+        "type": "github"
+      },
+      "original": {
+        "owner": "ilysenko",
+        "repo": "codex-desktop-linux",
+        "type": "github"
+      }
+    },
     "crane": {
       "locked": {
         "lastModified": 1781825982,
@@ -189,14 +210,14 @@
     },
     "flake-utils": {
       "inputs": {
-        "systems": "systems_2"
+        "systems": "systems"
       },
       "locked": {
-        "lastModified": 1694529238,
-        "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
         "type": "github"
       },
       "original": {
@@ -207,7 +228,7 @@
     },
     "flake-utils-plus": {
       "inputs": {
-        "flake-utils": "flake-utils"
+        "flake-utils": "flake-utils_2"
       },
       "locked": {
         "lastModified": 1715533576,
@@ -224,6 +245,24 @@
         "type": "github"
       }
     },
+    "flake-utils_2": {
+      "inputs": {
+        "systems": "systems_3"
+      },
+      "locked": {
+        "lastModified": 1694529238,
+        "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "gitignore": {
       "inputs": {
         "nixpkgs": [
@@ -529,6 +568,7 @@
     "root": {
       "inputs": {
         "aagl": "aagl",
+        "codex-desktop": "codex-desktop",
         "home-manager": "home-manager",
         "lanzaboote": "lanzaboote",
         "millennium": "millennium",
@@ -693,9 +733,24 @@
         "type": "github"
       }
     },
+    "systems_3": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
     "utils": {
       "inputs": {
-        "systems": "systems"
+        "systems": "systems_2"
       },
       "locked": {
         "lastModified": 1731533236,
diff --git a/flake.nix b/flake.nix
index cd40607..ac25191 100644
--- a/flake.nix
+++ b/flake.nix
@@ -56,6 +56,10 @@
       url = "github:SteamClientHomebrew/Millennium?dir=packages/nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    codex-desktop = {
+      url = "github:ilysenko/codex-desktop-linux";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs = inputs:
diff --git a/modules/nixos/desktop-environment/default.nix b/modules/nixos/desktop-environment/default.nix
index da636a9..4b1c4e5 100644
--- a/modules/nixos/desktop-environment/default.nix
+++ b/modules/nixos/desktop-environment/default.nix
@@ -87,6 +87,7 @@ in {
         gnome-software
         gnomeExtensions.pop-shell
         gnome-remote-desktop
+        dconf-editor
         glib-networking # Required gnome-remote-desktop dependency
       ];
       systemd.user.services.gnome-remote-desktop.environment = {
diff --git a/modules/nixos/nixos/default.nix b/modules/nixos/nixos/default.nix
index a7ced6d..25f6b29 100644
--- a/modules/nixos/nixos/default.nix
+++ b/modules/nixos/nixos/default.nix
@@ -43,7 +43,7 @@ in
           age
           wget
           sops
-          # bitwarden-desktop #replaced bitwarden
+          bitwarden-desktop #replaced bitwarden
           bitwarden-cli
           cowsay
           remmina
diff --git a/systems/x86_64-linux/drivebystation-nix/configuration.nix b/systems/x86_64-linux/drivebystation-nix/configuration.nix
index 8564646..66eb387 100644
--- a/systems/x86_64-linux/drivebystation-nix/configuration.nix
+++ b/systems/x86_64-linux/drivebystation-nix/configuration.nix
@@ -46,7 +46,28 @@
     LC_TELEPHONE = "nl_NL.UTF-8";
     LC_TIME = "nl_NL.UTF-8";
   };
+  system.activationScripts."stremio-mpv-flatpak-patch" = {
+      text = ''
+        # 1. Provide the symlink where Stremio's player engine queries
+        mkdir -p /usr/bin
+        ln -sf /run/current-system/sw/bin/mpv /usr/bin/mpv
 
+        # 2. Locate and patch the runtime server.js file inside the active Flatpak installation
+        TARGET_FILE="/var/lib/flatpak/app/com.stremio.Stremio/current/active/files/opt/stremio/server.js"
+        
+        if [ -f "$TARGET_FILE" ]; then
+          # Make sure the file is writable momentarily for the patch
+          chmod +w "$TARGET_FILE"
+          
+          # Inject the flatpak-spawn sequence into the linux player profile
+          sed -i 's|linux:{path:\["\/usr\/bin\/mpv"\]|linux:{path:["/usr/bin/flatpak-spawn"],args:["--host","/usr/bin/mpv"]|g' "$TARGET_FILE"
+          sed -i 's|linux:{path:\["mpv"\]|linux:{path:["/usr/bin/flatpak-spawn"],args:["--host","/usr/bin/mpv"]|g' "$TARGET_FILE"
+          
+          # Restore permissions
+          chmod -w "$TARGET_FILE"
+        fi
+      '';
+    };
   services = {
     # Enable Gnome Session
     displayManager.gdm.enable = true;
@@ -59,6 +80,7 @@
 
     displayManager.cosmic-greeter.enable = false;
     displayManager.defaultSession = "gnome";
+    # Clear the sandbox restriction dynamically
     
     xserver = {
       enable = true; # Enable the deprecated X11 teletype terminal connection system. 
diff --git a/systems/x86_64-linux/drivebystation-nix/default.nix b/systems/x86_64-linux/drivebystation-nix/default.nix
index 5010883..68e3e8a 100644
--- a/systems/x86_64-linux/drivebystation-nix/default.nix
+++ b/systems/x86_64-linux/drivebystation-nix/default.nix
@@ -91,11 +91,18 @@ in
           virt-manager
           nil
           codex
+          inputs.codex-desktop.packages.${pkgs.stdenv.hostPlatform.system}.codex-desktop
           #  thunderbird
         ];
         
       };
 
+      programs.appimage = {
+        enable = true;
+        binfmt = true;
+      };
+
+
       programs.anime-game-launcher.enable = true; # Adds launcher and /etc/hosts rules
       programs.anime-games-launcher.enable = true;
 
@@ -161,6 +168,8 @@ in
         my-namespace.rounded-windows-bms
         my-namespace.cs-demo-manager
         vscode-modernized
+        zed-editor
+        jetbrains-toolbox
 
         (pkgs.writeShellScriptBin "switch-to-desktop" ''
           #!/bin/sh