diff --git a/configuration.nix b/configuration.nix
index ae3eb8a..19e9f46 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -5,6 +5,7 @@
     ./common
     #    ./fake_flake.nix
     ./users.nix
+    ./custom
   ];
 
   # Bootloader.
diff --git a/custom/default.nix b/custom/default.nix
new file mode 100644
index 0000000..4c3da16
--- /dev/null
+++ b/custom/default.nix
@@ -0,0 +1,11 @@
+{ lib, ... }: {
+  nixpkgs.overlays = lib.singleton (final: prev: {
+    confwhich = prev.callPackage ./confwhich/package.nix { };
+      deskwhich = prev.callPackage ./deskwhich/package.nix { };
+        linux-bench = prev.callPackage ./linux-bench/package.nix { };
+          ooye = prev.callPackage ./ooye/package.nix { };
+            rfindup = prev.callPackage ./rfindup/package.nix { };
+              searchclip = prev.callPackage ./searchclip/package.nix { };
+                tlpui = prev.callPackage ./tlpui/package.nix { };
+  });
+}
diff --git a/hardening/systemd/default.nix b/hardening/systemd/default.nix
index 0df3226..a8dd538 100644
--- a/hardening/systemd/default.nix
+++ b/hardening/systemd/default.nix
@@ -17,7 +17,7 @@ in
     ./wpa_supplicant.nix
     ./auditd.nix
     ./acpid.nix
-    ./cups.nix
+    # ./cups.nix
     # ./bluetooth.nix
     # ./tty.nix
     ./ask-password.nix
diff --git a/overlays/confwhich.nix b/overlays/confwhich.nix
deleted file mode 100644
index 04a8af6..0000000
--- a/overlays/confwhich.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{ prev, ... }:
-{
-  confwhich = prev.callPackage ../custom/confwhich/package.nix { };
-}
diff --git a/overlays/default.nix b/overlays/default.nix
index 96325d8..ed64e7e 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -30,17 +30,10 @@
       [
         ./lua_update.nix
         ./matrix-appservice-discord.nix
-        ./deskwhich.nix
-        ./tlpui.nix
         # ./ccache-wrapper.nix
-        ./searchclip.nix
-        ./confwhich.nix
-        ./rfindup.nix
-        ./ooye.nix
         ./factorio.nix
         ./ranger.nix
         ./vesktop.nix
-        ./linux-bench.nix
         # ./grpcio-tools.nix
       ];
 }
diff --git a/overlays/deskwhich.nix b/overlays/deskwhich.nix
deleted file mode 100644
index b0cd31e..0000000
--- a/overlays/deskwhich.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{ prev, ... }:
-{
-  deskwhich = prev.callPackage ../custom/deskwhich/package.nix { };
-}
diff --git a/overlays/linux-bench.nix b/overlays/linux-bench.nix
deleted file mode 100644
index f032726..0000000
--- a/overlays/linux-bench.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{ prev, ... }:
-{
-  linux-bench = prev.callPackage ../custom/linux-bench/package.nix { };
-}
diff --git a/overlays/ooye.nix b/overlays/ooye.nix
deleted file mode 100644
index ea3b36a..0000000
--- a/overlays/ooye.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{ prev, ... }:
-{
-  ooye = prev.callPackage ../custom/ooye/package.nix { };
-}
diff --git a/overlays/rfindup.nix b/overlays/rfindup.nix
deleted file mode 100644
index d8bf2ad..0000000
--- a/overlays/rfindup.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{ prev, ... }:
-{
-  rfindup = prev.callPackage ../custom/rfindup/package.nix { };
-}
diff --git a/overlays/searchclip.nix b/overlays/searchclip.nix
deleted file mode 100644
index 50bbfbd..0000000
--- a/overlays/searchclip.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{ prev, ... }:
-{
-  searchclip = prev.callPackage ../custom/searchclip/package.nix { };
-}
diff --git a/overlays/tlpui.nix b/overlays/tlpui.nix
deleted file mode 100644
index 62f4855..0000000
--- a/overlays/tlpui.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{ prev, ... }:
-{
-  tlpui = prev.callPackage ../custom/tlpui/package.nix { };
-}