diff --git a/common/home/bash/programs.nix b/common/home/bash/programs.nix
index 3d3af5ed..e00fcc9d 100644
--- a/common/home/bash/programs.nix
+++ b/common/home/bash/programs.nix
@@ -41,7 +41,7 @@
       themes = {
         dracula-bat = {
           src = pkgs.dracula-theme;
-          file = "bat/Dracula.tmTheme";
+          file = "bat";
         };
       };
       extraPackages = with pkgs.bat-extras; [
diff --git a/common/home/trash-d/default.nix b/common/home/trash-d/default.nix
index ecbba28c..5a867455 100644
--- a/common/home/trash-d/default.nix
+++ b/common/home/trash-d/default.nix
@@ -1,5 +1,5 @@
-{pkgs, ...}: let
-  trash = pkgs.callPackage ./trash-d.nix pkgs;
+{pkgs, ...} @ inputs: let
+  trash = pkgs.callPackage ./trash-d.nix inputs;
 in {
   home.packages = [trash];
 
diff --git a/common/home/trash-d/trash-d.nix b/common/home/trash-d/trash-d.nix
index ac066a95..9062e732 100644
--- a/common/home/trash-d/trash-d.nix
+++ b/common/home/trash-d/trash-d.nix
@@ -1,6 +1,6 @@
 {
+  trash-d-src,
   stdenv,
-  fetchFromGitHub,
   dmd,
   dub,
   ronn,
@@ -8,14 +8,9 @@
 }:
 stdenv.mkDerivation {
   name = "trash";
-  version = "unstable";
+  version = trash-d-src.rev;
 
-  src = fetchFromGitHub {
-    owner = "rushsteve1";
-    repo = "trash-d";
-    rev = "d88bb672612761c8e299e717857bf9c85a903e99";
-    hash = "sha256-oPxeoEqOYf6DCg5rJxINqAIlMbxqzAJcZDUY/EzADzY=";
-  };
+  src = trash-d-src;
 
   buildInputs = [dub dmd ronn];
 
diff --git a/common/overlays/default.nix b/common/overlays/default.nix
index 3b894ca8..abab5eb5 100644
--- a/common/overlays/default.nix
+++ b/common/overlays/default.nix
@@ -2,11 +2,11 @@
   neovim-flake,
   nixpkgs-wayland,
   ...
-}: {
+} @ inputs: {
   nixpkgs.overlays = [
-    (import ./dracula-theme)
-    (import ./plymouth)
-    (import ./spotifywm)
+    (import ./dracula-theme inputs)
+    (import ./plymouth inputs)
+    (import ./spotifywm inputs)
     (import ./squeekboard)
 
     neovim-flake.overlay
diff --git a/common/overlays/dracula-theme/bat.nix b/common/overlays/dracula-theme/bat.nix
deleted file mode 100644
index 5e9a9d9e..00000000
--- a/common/overlays/dracula-theme/bat.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  stdenv,
-  fetchFromGitHub,
-  ...
-}:
-stdenv.mkDerivation {
-  name = "dracula-bat";
-
-  src = fetchFromGitHub {
-    owner = "matt1432";
-    repo = "bat";
-    rev = "270bce892537311ac92494a2a7663e3ecf772092";
-    hash = "sha256-UyZ3WFfrEEBjtdb//5waVItmjKorkOiNGtu9eeB3lOw=";
-  };
-
-  installPhase = ''
-    mkdir -p $out/bat
-    cp -a ./Dracula.tmTheme $out/bat
-  '';
-}
diff --git a/common/overlays/dracula-theme/default.nix b/common/overlays/dracula-theme/default.nix
index 735eb981..422d08a7 100644
--- a/common/overlays/dracula-theme/default.nix
+++ b/common/overlays/dracula-theme/default.nix
@@ -1,17 +1,14 @@
-(final: prev: {
+{
+  bat-theme-src,
+  xresources-theme-src,
+  ...
+} @ inputs: (final: prev: {
   dracula-theme = prev.dracula-theme.overrideAttrs (oldAttrs: let
-    bat-colors = prev.callPackage ./bat.nix prev;
-    git-colors = prev.callPackage ./git.nix prev;
-    plymouth = prev.callPackage ./plymouth.nix prev;
-    Xresources = prev.callPackage ./xresources.nix prev;
+    git-colors = prev.callPackage ./git.nix inputs;
+    plymouth = prev.callPackage ./plymouth.nix inputs;
     wallpaper = prev.fetchurl (import ./wallpaper.nix);
   in {
-    src = prev.fetchFromGitHub {
-      owner = "dracula";
-      repo = "gtk";
-      rev = "80d5a3fedf280e9cc7f2df3b100a1082c3bcd1cc";
-      hash = "sha256-BPL0Msva1/sPQKPeRJHgvU+xXU3m8b2E6aDBLmXbkkA=";
-    };
+    src = inputs.gtk-theme-src;
 
     installPhase = ''
       runHook preInstall
@@ -19,10 +16,10 @@
       mkdir -p $out/share/plymouth/themes $out/wallpapers
       cp -a ${wallpaper} $out/wallpapers/waves.png
 
-      cp -a ${bat-colors}/bat $out/bat
+      cp -a ${bat-theme-src}/Dracula.tmTheme $out/bat
       cp -a ${git-colors}/git-colors $out/git-colors
       cp -a ${plymouth}/share/plymouth/themes/dracula $out/share/plymouth/themes/
-      cp -a ${Xresources}/xres $out/xres
+      cp -a ${xresources-theme-src}/Xresources $out/xres
 
       # -------------------------------------------
       mkdir -p $out/share/themes/Dracula
diff --git a/common/overlays/dracula-theme/git.nix b/common/overlays/dracula-theme/git.nix
index 8b904f4d..f13840d6 100644
--- a/common/overlays/dracula-theme/git.nix
+++ b/common/overlays/dracula-theme/git.nix
@@ -1,17 +1,13 @@
 {
   stdenv,
-  fetchFromGitHub,
+  git-theme-src,
   ...
 }:
 stdenv.mkDerivation {
   name = "dracula-git";
+  version = git-theme-src.rev;
 
-  src = fetchFromGitHub {
-    owner = "dracula";
-    repo = "git";
-    rev = "924d5fc32f7ca15d0dd3a8d2cf1747e81e063c73";
-    hash = "sha256-3tKjKn5IHIByj+xgi2AIL1vZANlb0vlYJsPjH6BHGxM=";
-  };
+  src = git-theme-src;
 
   installPhase = ''
     # Git colors
diff --git a/common/overlays/dracula-theme/plymouth.nix b/common/overlays/dracula-theme/plymouth.nix
index f43d43f1..78d2f28f 100644
--- a/common/overlays/dracula-theme/plymouth.nix
+++ b/common/overlays/dracula-theme/plymouth.nix
@@ -1,17 +1,13 @@
 {
   stdenv,
-  fetchFromGitHub,
+  plymouth-theme-src,
   ...
 }:
 stdenv.mkDerivation {
   name = "dracula-plymouth";
+  version = plymouth-theme-src.rev;
 
-  src = fetchFromGitHub {
-    owner = "dracula";
-    repo = "plymouth";
-    rev = "37aa09b27ecee4a825b43d2c1d20b502e8f19c96";
-    hash = "sha256-7YwkBzkAND9lfH2ewuwna1zUkQStBBx4JHGw3/+svhA=";
-  };
+  src = plymouth-theme-src;
 
   installPhase = let
     dracula-script = ./dracula-plymouth.patch;
diff --git a/common/overlays/dracula-theme/wallpaper.nix b/common/overlays/dracula-theme/wallpaper.nix
index 95cde496..c1ae71e0 100644
--- a/common/overlays/dracula-theme/wallpaper.nix
+++ b/common/overlays/dracula-theme/wallpaper.nix
@@ -1,4 +1,4 @@
 {
-  url = "https://github.com/aynp/dracula-wallpapers/blob/main/Art/4k/Waves%201.png?raw=true";
+  url = "https://raw.githubusercontent.com/aynp/dracula-wallpapers/main/Art/4k/Waves%201.png";
   hash = "sha256-f9FwSOSvqTeDj4bOjYUQ6TM+/carCD9o5dhg/MnP/lk=";
 }
diff --git a/common/overlays/dracula-theme/xresources.nix b/common/overlays/dracula-theme/xresources.nix
deleted file mode 100644
index 866cf5d4..00000000
--- a/common/overlays/dracula-theme/xresources.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  stdenv,
-  fetchFromGitHub,
-  ...
-}:
-stdenv.mkDerivation {
-  name = "dracula-xresources";
-
-  src = fetchFromGitHub {
-    owner = "dracula";
-    repo = "xresources";
-    rev = "539ef24e9b0c5498a82d59bfa2bad9b618d832a3";
-    hash = "sha256-6fltsAluqOqYIh2NX0I/LC3WCWkb9Fn8PH6LNLBQbrY=";
-  };
-
-  installPhase = ''
-    mkdir -p $out/xres
-    cp -a ./Xresources $out/xres/
-  '';
-}
diff --git a/common/overlays/plymouth/default.nix b/common/overlays/plymouth/default.nix
index 1c9edcec..0e4eb855 100644
--- a/common/overlays/plymouth/default.nix
+++ b/common/overlays/plymouth/default.nix
@@ -1,16 +1,6 @@
-final: prev: {
+{plymouth-src, ...}: (final: prev: {
   plymouth = prev.plymouth.overrideAttrs (o: {
-    version = "unstable-2023-12-08";
-
-    src = prev.fetchFromGitLab {
-      domain = "gitlab.freedesktop.org";
-      owner = "plymouth";
-      repo = "plymouth";
-
-      # https://gitlab.freedesktop.org/plymouth/plymouth/-/issues/236
-      # Last commit that works
-      rev = "58cc9f84e456ab0510b13d7bdbc13697467ca7be";
-      hash = "sha256-hgQ8nCphR4hc+WTNtS8GgBrC54uYnvTCp7kjgB/u5lE=";
-    };
+    version = plymouth-src.rev;
+    src = plymouth-src;
   });
-}
+})
diff --git a/common/overlays/spotifywm/default.nix b/common/overlays/spotifywm/default.nix
index 32e874cf..14cb47a3 100644
--- a/common/overlays/spotifywm/default.nix
+++ b/common/overlays/spotifywm/default.nix
@@ -1,3 +1,3 @@
-(final: prev: {
-  spotifywm = final.callPackage ./spotifywm.nix {};
+{...} @ inputs: (final: prev: {
+  spotifywm = final.callPackage ./spotifywm.nix inputs;
 })
diff --git a/common/overlays/spotifywm/spotifywm.nix b/common/overlays/spotifywm/spotifywm.nix
index aa65898a..bfeb832c 100644
--- a/common/overlays/spotifywm/spotifywm.nix
+++ b/common/overlays/spotifywm/spotifywm.nix
@@ -2,26 +2,20 @@
 {
   lib,
   stdenv,
-  fetchFromGitHub,
+  spotifywm-src,
   libX11,
   makeBinaryWrapper,
   spotify,
   symlinkJoin,
+  ...
 }: let
   spotifywm = stdenv.mkDerivation {
     pname = "spotifywm";
-    version = "unstable-2022-10-25";
+    version = spotifywm-src.rev;
 
-    src = fetchFromGitHub {
-      owner = "dasJ";
-      repo = "spotifywm";
-      rev = "8624f539549973c124ed18753881045968881745";
-      hash = "sha256-AsXqcoqUXUFxTG+G+31lm45gjP6qGohEnUSUtKypew0=";
-    };
+    src = spotifywm-src;
 
-    buildInputs = [
-      libX11
-    ];
+    buildInputs = [libX11];
 
     installPhase = ''
       runHook preInstall
@@ -35,9 +29,7 @@ in
   symlinkJoin {
     inherit (spotifywm) name;
 
-    nativeBuildInputs = [
-      makeBinaryWrapper
-    ];
+    nativeBuildInputs = [makeBinaryWrapper];
 
     paths = [
       spotify
diff --git a/common/pkgs/coloryou/default.nix b/common/pkgs/coloryou/default.nix
index d4bd1714..537936f0 100644
--- a/common/pkgs/coloryou/default.nix
+++ b/common/pkgs/coloryou/default.nix
@@ -1,4 +1,4 @@
-{python3Packages}:
+{python3Packages, ...}:
 python3Packages.buildPythonPackage {
   pname = "coloryou";
   version = "0.0.1";
diff --git a/common/pkgs/coloryou/shell.nix b/common/pkgs/coloryou/shell.nix
index 761114d9..5ac2d6d6 100644
--- a/common/pkgs/coloryou/shell.nix
+++ b/common/pkgs/coloryou/shell.nix
@@ -1,6 +1,6 @@
 with import <nixpkgs> {};
 with pkgs.python311Packages;
-  buildPythonPackage rec {
+  buildPythonPackage {
     name = "coloryou";
     src = ./.;
     propagatedBuildInputs = [material-color-utilities utils];
diff --git a/common/pkgs/default.nix b/common/pkgs/default.nix
index d4b18c90..d17acb4b 100644
--- a/common/pkgs/default.nix
+++ b/common/pkgs/default.nix
@@ -2,10 +2,10 @@
   lib,
   pkgs,
   ...
-}:
+} @ inputs:
 with lib; let
   mkPackage = name: v: {
-    ${name} = pkgs.callPackage ./${name} {};
+    ${name} = pkgs.callPackage ./${name} inputs;
   };
 
   rmNotPackage = name: value:
diff --git a/common/pkgs/input-emulator/default.nix b/common/pkgs/input-emulator/default.nix
deleted file mode 100644
index 5d713831..00000000
--- a/common/pkgs/input-emulator/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  stdenv,
-  meson,
-  ninja,
-  pkg-config,
-  cmake,
-  bash-completion,
-  fetchFromGitHub,
-}:
-stdenv.mkDerivation rec {
-  pname = "input-emulator";
-
-  src = fetchFromGitHub {
-    owner = "tio";
-    repo = pname;
-    rev = "6c35040e6fc4f65ce0519ee76d00d60490bcb987";
-    hash = "sha256-Im0RADqRwlZ/RiZFSVp+HwnWoLdcpRp0Ej6RP0GY0+c=";
-  };
-
-  nativeBuildInputs = [
-    meson
-    ninja
-    pkg-config
-    cmake
-    bash-completion
-  ];
-}
diff --git a/common/pkgs/pam-fprint-grosshack/default.nix b/common/pkgs/pam-fprint-grosshack/default.nix
index e8252bdf..362542d3 100644
--- a/common/pkgs/pam-fprint-grosshack/default.nix
+++ b/common/pkgs/pam-fprint-grosshack/default.nix
@@ -10,17 +10,14 @@
   systemd,
   pam,
   libpam-wrapper,
-  fetchFromGitLab,
+  pam-fprint-grosshack-src,
+  ...
 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   name = "pam-fprint-grosshack";
+  version = pam-fprint-grosshack-src.rev;
 
-  src = fetchFromGitLab {
-    owner = "mishakmak";
-    repo = name;
-    rev = "45b42524fb5783e1e555067743d7e0f70d27888a";
-    hash = "sha256-obczZbf/oH4xGaVvp3y3ZyDdYhZnxlCWvL0irgEYIi0=";
-  };
+  src = pam-fprint-grosshack-src;
 
   nativeBuildInputs = [
     meson
diff --git a/common/pkgs/pokemon-colorscripts/default.nix b/common/pkgs/pokemon-colorscripts/default.nix
index ad97967b..464fd543 100644
--- a/common/pkgs/pokemon-colorscripts/default.nix
+++ b/common/pkgs/pokemon-colorscripts/default.nix
@@ -1,22 +1,19 @@
 {
   stdenv,
   python3Packages,
-  fetchFromGitLab,
+  pokemon-colorscripts-src,
+  ...
 }:
 stdenv.mkDerivation {
   name = "pokemon-colorscripts";
+  version = pokemon-colorscripts-src.rev;
+
+  src = pokemon-colorscripts-src;
 
   propagatedBuildInputs = with python3Packages; [
     python
   ];
 
-  src = fetchFromGitLab {
-    owner = "phoneybadger";
-    repo = "pokemon-colorscripts";
-    rev = "0483c85b93362637bdd0632056ff986c07f30868";
-    hash = "sha256-rj0qKYHCu9SyNsj1PZn1g7arjcHuIDGHwubZg/yJt7A=";
-  };
-
   installPhase = ''
     mkdir -p $out/pokemon-colorscripts $out/bin
 
diff --git a/common/pkgs/repl/default.nix b/common/pkgs/repl/default.nix
index 1d3f4725..38c3b90a 100644
--- a/common/pkgs/repl/default.nix
+++ b/common/pkgs/repl/default.nix
@@ -3,6 +3,7 @@
   coreutils,
   gnused,
   writeShellScriptBin,
+  ...
 }: let
   repl = ./repl.nix;
   example = command: desc: ''\n\u001b[33m ${command}\u001b[0m - ${desc}'';
diff --git a/devices/binto/modules/gpu-replay.nix b/devices/binto/modules/gpu-replay.nix
index 8691a172..423def99 100644
--- a/devices/binto/modules/gpu-replay.nix
+++ b/devices/binto/modules/gpu-replay.nix
@@ -2,13 +2,13 @@
   pkgs,
   config,
   lib,
+  gpu-screen-recorder-src,
   ...
 }: let
   gsr = pkgs.gpu-screen-recorder.overrideAttrs (o: {
-    src = pkgs.fetchurl {
-      url = "https://dec05eba.com/snapshot/gpu-screen-recorder.git.r445.84f9a04.tar.gz";
-      hash = "sha256-YKGLv7QFBxTZDW9HKS6tEeP1pX91idtuy0oUr4mbjjU=";
-    };
+    version = gpu-screen-recorder-src.rev;
+
+    src = gpu-screen-recorder-src;
 
     postPatch = "";
 
diff --git a/devices/binto/modules/nix-gaming.nix b/devices/binto/modules/nix-gaming.nix
index e5f4c970..1c9f3efb 100644
--- a/devices/binto/modules/nix-gaming.nix
+++ b/devices/binto/modules/nix-gaming.nix
@@ -3,9 +3,7 @@
   pkgs,
   ...
 }: {
-  imports = [
-    nix-gaming.nixosModules.steamCompat
-  ];
+  imports = [nix-gaming.nixosModules.steamCompat];
 
   programs = {
     steam = {
diff --git a/flake.lock b/flake.lock
index af1de56f..3bd63c96 100644
Binary files a/flake.lock and b/flake.lock differ
diff --git a/flake.nix b/flake.nix
index 1cd25684..1c7b8f67 100644
Binary files a/flake.nix and b/flake.nix differ
diff --git a/home/theme.nix b/home/theme.nix
index 969968da..25e5c42d 100644
--- a/home/theme.nix
+++ b/home/theme.nix
@@ -46,7 +46,7 @@
 
   xresources.extraConfig =
     builtins.readFile
-    "${pkgs.dracula-theme}/xres/Xresources";
+    "${pkgs.dracula-theme}/xres";
 
   xdg.configFile = let
     qtconf = ''
diff --git a/modules/audio.nix b/modules/audio.nix
index 32e347e3..fe7df897 100644
--- a/modules/audio.nix
+++ b/modules/audio.nix
@@ -1,7 +1,5 @@
 {nix-gaming, ...}: {
-  imports = [
-    nix-gaming.nixosModules.pipewireLowLatency
-  ];
+  imports = [nix-gaming.nixosModules.pipewireLowLatency];
 
   hardware.pulseaudio.enable = false;
 
diff --git a/updateSha.sh b/updateSha.sh
index 98e4bd40..dbcad4e6 100755
--- a/updateSha.sh
+++ b/updateSha.sh
@@ -21,29 +21,6 @@ parseFetchurl() {
     sed -i "s,sha256 = .*,sha256 = \"$HASH\";," "$FILE"
 }
 
-
-updateOverlays() {
-    FILE="/home/matt/.nix/common/overlays"
-    parseNurl "https://github.com/dasJ/spotifywm" "$FILE/spotifywm/spotifywm.nix"
-}
-
-updateDracula() {
-    FILE="/home/matt/.nix/common/overlays/dracula-theme"
-    parseNurl "https://github.com/matt1432/bat"       "$FILE/bat.nix"
-    parseNurl "https://github.com/dracula/gtk"        "$FILE/default.nix"
-    parseNurl "https://github.com/dracula/plymouth"   "$FILE/plymouth.nix"
-    parseNurl "https://github.com/dracula/git"        "$FILE/git.nix"
-    parseNurl "https://github.com/dracula/xresources" "$FILE/xresources.nix"
-    parseFetchurl "https://github.com/aynp/dracula-wallpapers/blob/main/Art/4k/Waves%201.png?raw=true" "$FILE/wallpaper.nix"
-}
-
-updateCustomPkgs() {
-    FILE="/home/matt/.nix/common/pkgs"
-    parseNurl "https://github.com/tio/input-emulator" "$FILE/input-emulator/default.nix"
-    parseNurl "https://gitlab.com/mishakmak/pam-fprint-grosshack" "$FILE/pam-fprint-grosshack/default.nix"
-    parseNurl "https://gitlab.com/phoneybadger/pokemon-colorscripts" "$FILE/pokemon-colorscripts/default.nix"
-}
-
 updateFFZ() {
     FILE="/home/matt/.nix/home/firefox/addons/default.nix"
     URL="https://cdn.frankerfacez.com/script/frankerfacez-4.0-an+fx.xpi"
@@ -70,43 +47,15 @@ updateFirefoxAddons() {
     mozilla-addons-to-nix addons.json generated-firefox-addons.nix)
 }
 
-updateGSR() {
-    (
-        cd /tmp || return
-
-        if [[ ! -d "gpu-screen-recorder" ]]; then
-            git clone https://repo.dec05eba.com/gpu-screen-recorder
-            cd gpu-screen-recorder || return
-        else
-            cd gpu-screen-recorder || return
-            git pull
-        fi
-
-        REV=$(printf "r%s.%s\n" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)")
-        URL=https://dec05eba.com/snapshot/gpu-screen-recorder.git."$REV".tar.gz
-        FILE="/home/matt/.nix/devices/binto/modules/gpu-replay.nix"
-
-        parseFetchurl "$URL" "$FILE"
-    )
-}
-
 
 doAll() {
     updateFFZ
-    updateCustomPkgs
-    updateOverlays
-    updateDracula
     updateFirefoxAddons
-    updateGSR
 }
 
 
 [[ "$1" == "-a" || "$1" == "--all" ]] && doAll
-[[ "$1" == "-d" || "$1" == "--dracula" ]] && updateDracula
-[[ "$1" == "-c" || "$1" == "--custom" ]] && updateCustomPkgs
-[[ "$1" == "-o" || "$1" == "--overlays" ]] && updateOverlays
 [[ "$1" == "-f" || "$1" == "--firefox" ]] && updateFirefoxAddons
 [[ "$1" == "-ffz" || "$1" == "--frankerfacez" ]] && updateFFZ
-[[ "$1" == "-gsr" || "$1" == "--gpu-screen-recorder" ]] && updateGSR
 
 alejandra /home/matt/.nix