diff --git a/desktops/gnome.nix b/desktops/gnome.nix
index 7ced88be..4087b07d 100644
--- a/desktops/gnome.nix
+++ b/desktops/gnome.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, master-pkgs, hostname, ... }: {
+{ config, pkgs, hostname, ... }: {
   # Enable sound with pipewire.
   sound.enable = true;
   hardware.pulseaudio.enable = false;
@@ -102,18 +102,20 @@
     gnome.simple-scan
   ]);
 
-  environment.systemPackages = with master-pkgs.pkgs; [
+  environment.systemPackages = with pkgs.gnomeExtensions; [
     # Gnome Extensions
-    gnomeExtensions.tiling-assistant
-    gnomeExtensions.dash-to-dock
-    gnomeExtensions.blur-my-shell
-    gnomeExtensions.vitals
-    gnomeExtensions.user-themes
-    gnomeExtensions.caffeine
-    gnomeExtensions.hibernate-status-button
-    gnomeExtensions.night-theme-switcher
-    gnomeExtensions.gamemode
+    tiling-assistant
+    dash-to-dock
+    blur-my-shell
+    vitals
+    user-themes
+    caffeine
+    hibernate-status-button
+    night-theme-switcher
+    gamemode
+  ];
 
+  environment.systemPackages = with pkgs; [
     # Gnome relevant packages
     gnome3.gnome-tweaks
     papirus-icon-theme
diff --git a/flake.nix b/flake.nix
index 3e428453..71eeff1a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -6,7 +6,6 @@
   inputs = {
     # NixOS packages
     unstable-nixpkgs.url = "nixpkgs/nixos-unstable";
-    master-nixpkgs.url = "nixpkgs/master";
 
     # Manage dotfiles in a home directory
     home-manager.url = "github:nix-community/home-manager/release-23.05";
@@ -29,7 +28,6 @@
   outputs = { 
     self,
     unstable-nixpkgs, 
-    master-nixpkgs,
     home-manager, 
     lanzaboote, 
     nur, 
@@ -47,10 +45,6 @@
       inherit system;
       config = { allowUnfree = true; };
     };
-    master-pkgs = import master-nixpkgs {
-      inherit system;
-      config = { allowUnfree = true; };
-    };
 
     lib = unstable-nixpkgs.lib;
   in {
@@ -61,7 +55,6 @@
         inherit system;
         specialArgs = { 
           inherit hostname;
-          inherit master-pkgs;
         };
         modules = [
           # Configuration Imports
diff --git a/home-manager/bash.nix b/home-manager/bash.nix
index 08bc35fa..6cd908ec 100644
--- a/home-manager/bash.nix
+++ b/home-manager/bash.nix
@@ -34,6 +34,11 @@
     bash = {
       enable = true;
       enableCompletion = true;
+      sessionVariables = {
+        # Set the GTK Theme
+        GTK_THEME = "Gruvbox-Dark-BL";
+        XDG_DATA_HOME = "$HOME/.local/share";
+      };
       bashrcExtra = ''
         sops-edit() {
           nix-shell -p sops --run "sops $1"
@@ -53,10 +58,6 @@
 
         # nVidia prime selector alias:
         prime-select = "nvidia-offload";
-        XDG_DATA_HOME = "$HOME/.local/share";
-
-        # Set the GTK Theme
-        GTK_THEME = "Gruvbox-Dark-BL";
 
         # docker
         d = "docker";