diff --git a/desktop/gnome.nix b/desktop/gnome.nix
index 9a70be9..6f10ad0 100755
--- a/desktop/gnome.nix
+++ b/desktop/gnome.nix
@@ -103,13 +103,6 @@ home-manager.users.jsutter = {
     gnomeExtensions.cpufreq
   ];
   home.sessionVariables.GTK_THEME = "palenight";
-  home.file."firefox-gnome-theme" = {
-    target = ".mozilla/firefox/default/chrome/firefox-gnome-theme";
-    source = fetchTarball {
-      url = "https://github.com/rafaelmardojai/firefox-gnome-theme/archive/master.tar.gz";
-      sha256 = "1k7w7drq5xvxccxijjl6spf4w02ghil9jya35crysa3hi0mvyn29";
-      };
-    };
   };
   # GNUPG Stuff 
   services.pcscd.enable = true;
diff --git a/flake.nix b/flake.nix
index 537dce7..43b4b03 100755
--- a/flake.nix
+++ b/flake.nix
@@ -13,6 +13,7 @@
       inputs.home-manager.follows = "home-manager";
     };
     nixos-hardware.url = "github:NixOS/nixos-hardware/master";
+    firefox-gnome-theme.url = "github:rafaelmardojai/firefox-gnome-theme";
   };
 
   outputs = { self, nixpkgs, home-manager, plasma-manager, nixos-hardware }: {
diff --git a/users/jsutter.nix b/users/jsutter.nix
index 960e16a..52ed326 100755
--- a/users/jsutter.nix
+++ b/users/jsutter.nix
@@ -1,11 +1,5 @@
 { config, pkgs, home-manager, ... }:
 
-let
-  home-manager = builtins.fetchTarball {
-    url = "https://github.com/nix-community/home-manager/archive/master.tar.gz";
-  };
-in
-
 {
   # Nix User Repository https://github.com/nix-community/NUR
   nixpkgs.config.packageOverrides = pkgs: {
@@ -14,9 +8,7 @@ in
     };
   };    
 
-  imports = [
-    (import "${home-manager}/nixos")
-  ];
+  imports = [ inputs.home-manager.nixosModules.home-manager ];
 
   users.users.jsutter = {
     shell = pkgs.zsh;
@@ -125,8 +117,9 @@ in
           no = "nixops";
           ns = "nix-shell --pure";
           cat = "bat";
-          nra = "sudo nixos-rebuild switch --flake .#aurora --impure";
-	        nif = "sudo nixos-rebuild switch --flake .#framework --impure";
+          nra = "sudo nixos-rebuild switch --flake .#aurora";
+	        nrf = "sudo nixos-rebuild switch --flake .#framework";
+          nrl = "sudo nixos-rebuild switch --flake .#labrizor"
         };
         oh-my-zsh = {
           enable = true;
@@ -192,12 +185,7 @@ in
               privacy-badger
               disconnect
               plasma-integration
-            ];
-        userChrome = ''
-          @import "firefox-gnome-theme/userChrome.css";
-          @import "firefox-gnome-theme/theme/colors/dark.css"; 
-          ''; 
-          };
+            ]
         };
       };
     };