diff --git a/modules/colors.nix b/colors.nix
similarity index 100%
rename from modules/colors.nix
rename to colors.nix
diff --git a/modules/containers/default.nix b/modules/containers/default.nix
index 9089723..c13a4bf 100644
--- a/modules/containers/default.nix
+++ b/modules/containers/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, lib, config, ... }: lib.mkIf(config.withContainers) {
+{ lib, config, pkgs, ... }: lib.mkIf config.withContainers {
   virtualisation.podman = {
     enable = true;
     dockerCompat = true;
diff --git a/modules/default.nix b/modules/default.nix
index 28aefbe..c1256c6 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -1,6 +1,5 @@
 { inputs, pkgs, lib, ... }: {
   imports = [
-    ./colors.nix
     ./containers
     ./games
     ./gnome
diff --git a/modules/games/default.nix b/modules/games/default.nix
index 44061c6..d06e7b6 100644
--- a/modules/games/default.nix
+++ b/modules/games/default.nix
@@ -1,4 +1,4 @@
-{ lib, config, pkgs, ... }: lib.mkIf (config.withGames) {
+{ lib, config, pkgs, ... }: lib.mkIf config.withGames {
   programs.steam.enable = true;
   programs.gamescope.enable = true;
   programs.gamemode.enable = true;
diff --git a/modules/gnome/default.nix b/modules/gnome/default.nix
index 59e86fb..ad84ee8 100644
--- a/modules/gnome/default.nix
+++ b/modules/gnome/default.nix
@@ -1,4 +1,4 @@
-{ lib, config, ... }: lib.mkIf (config.withGnome) {
+{ lib, config, ... }: lib.mkIf config.withGnome {
   services.xserver = {
     enable = true;
     desktopManager.gnome.enable = true;
diff --git a/modules/niri/default.nix b/modules/niri/default.nix
index 6021437..560a185 100644
--- a/modules/niri/default.nix
+++ b/modules/niri/default.nix
@@ -1,4 +1,4 @@
-{ lib, config, pkgs, ... }: lib.mkIf (config.withNiri) {
+{ lib, config, pkgs, ... }: lib.mkIf config.withNiri {
   programs.niri.enable = true;
 
   home-manager.users.twoneis = {
diff --git a/modules/user/default.nix b/modules/user/default.nix
index d634c87..441e447 100644
--- a/modules/user/default.nix
+++ b/modules/user/default.nix
@@ -1,31 +1,34 @@
-{ lib, config, ... }: lib.mkIf (config.user) {
+{ lib, config, ... }: {
   imports = [
     ./programs.nix
     ./themes.nix
   ];
 
-  # Audio
-  security.rtkit.enable = true;
+  config = lib.mkIf config.user{
 
-  services.pipewire = {
-    enable = true;
-    alsa.enable = true;
-    alsa.support32Bit = true;
-    pulse.enable = true;
-    jack.enable = true;
-  };
+    # Audio
+    security.rtkit.enable = true;
 
-  # Bluetooth
-  hardware.bluetooth = {
-    enable = true;
-    powerOnBoot = true;
-    settings = {
-      General = {
-        Enable = "Source,Sink,Media,Socket";
-        Experimental = true;
+    services.pipewire = {
+      enable = true;
+      alsa.enable = true;
+      alsa.support32Bit = true;
+      pulse.enable = true;
+      jack.enable = true;
+    };
+
+    # Bluetooth
+    hardware.bluetooth = {
+      enable = true;
+      powerOnBoot = true;
+      settings = {
+        General = {
+          Enable = "Source,Sink,Media,Socket";
+          Experimental = true;
+        };
       };
     };
-  };
 
-  services.blueman.enable = true;
+    services.blueman.enable = true;
+  };
 }
diff --git a/modules/user/firefox.nix b/modules/user/firefox.nix
index f5ce675..92a7f19 100644
--- a/modules/user/firefox.nix
+++ b/modules/user/firefox.nix
@@ -1,5 +1,5 @@
-{ pkgs, ... }: {
-  home-manager.users.twnoneis = {
+{ lib, config, pkgs, ... }: lib.mkIf config.user {
+  home-manager.users.twoneis = {
     programs.firefox = {
       enable = true;
       profiles = {
diff --git a/modules/user/programs.nix b/modules/user/programs.nix
index 07cda30..6967503 100644
--- a/modules/user/programs.nix
+++ b/modules/user/programs.nix
@@ -1,70 +1,72 @@
-{ config, pkgs, ... }: {
+{ lib, config, pkgs, ... }: {
   imports = [
     ./firefox.nix
   ];
 
-  networking.firewall.allowedTCPPorts = [
-    57621 # spotifyd
-  ];
-
-  services = {
-    # Needed for some features in nautilus such as auto-mounting and trash
-    gvfs.enable = true;
-  };
-
-  home-manager.users.twoneis = {
-    home.packages = with pkgs; [
-      signal-desktop
-      vesktop
-      fractal
-      loupe
-      snapshot
-      gnome.nautilus
-      libreoffice-qt6-fresh
+  config = lib.mkIf config.user {
+    networking.firewall.allowedTCPPorts = [
+      57621 # spotifyd
     ];
 
-    home.file = {
-      ".config/vesktop/settings.json" = {
-        source = ./vesktop.conf.json;
-      };
-      ".config/vesktop/settings/settings.json" = {
-        source = ./vencord.conf.json;
-      };
+    services = {
+      # Needed for some features in nautilus such as auto-mounting and trash
+      gvfs.enable = true;
     };
 
-    programs.pandoc = {
-      enable = true;
-    };
+    home-manager.users.twoneis = {
+      home.packages = with pkgs; [
+        signal-desktop
+        vesktop
+        fractal
+        loupe
+        snapshot
+        gnome.nautilus
+        libreoffice-qt6-fresh
+      ];
 
-    programs.mpv = {
-      enable = true;
-    };
-
-    services.spotifyd = {
-      enable = true;
-      settings = {
-        global = {
-          device_name = config.networking.hostName;
-          bitrate = 320;
-          volume_normalisation = true;
-          autoplay = false;
-          zeroconf_port = 57621;
+      home.file = {
+        ".config/vesktop/settings.json" = {
+          source = ./vesktop.conf.json;
+        };
+        ".config/vesktop/settings/settings.json" = {
+          source = ./vencord.conf.json;
         };
       };
-    };
 
-    programs.thunderbird = {
-      enable = true;
-      profiles = {
-        "default" = {
-          isDefault = true;
+      programs.pandoc = {
+        enable = true;
+      };
+
+      programs.mpv = {
+        enable = true;
+      };
+
+      services.spotifyd = {
+        enable = true;
+        settings = {
+          global = {
+            device_name = config.networking.hostName;
+            bitrate = 320;
+            volume_normalisation = true;
+            autoplay = false;
+            zeroconf_port = 57621;
+          };
         };
       };
-    };
 
-    programs.alacritty = {
-      enable = true;
-      settings = import ./alacritty.conf.nix;
+      programs.thunderbird = {
+        enable = true;
+        profiles = {
+          "default" = {
+            isDefault = true;
+          };
+        };
+      };
+
+      programs.alacritty = {
+        enable = true;
+        settings = import ./alacritty.conf.nix;
+      };
     };
   };
 }
diff --git a/modules/utils/default.nix b/modules/utils/default.nix
index 570de48..88ae821 100644
--- a/modules/utils/default.nix
+++ b/modules/utils/default.nix
@@ -17,7 +17,7 @@
 
     home.file = {
       ".gdbinit" = {
-        source = ./gdbinit;
+        source = ./gdbinit.conf;
       };
     };
 
diff --git a/modules/vm/default.nix b/modules/vm/default.nix
index a80421d..5adc1b2 100644
--- a/modules/vm/default.nix
+++ b/modules/vm/default.nix
@@ -1,4 +1,4 @@
-{ lib, config, ... }: lib.mkIf (config.withVM) {
+{ lib, config, ... }: lib.mkIf config.withVM {
   virtualisation.libvirtd.enable = true;
   programs.virt-manager.enable = true;
   users.users.twoneis.extraGroups = [ "libvirtd" ];
diff --git a/outputs.nix b/outputs.nix
index 0ae382e..52cc13b 100644
--- a/outputs.nix
+++ b/outputs.nix
@@ -12,6 +12,7 @@
         ./devices/ellaca
         ./modules
         ./options.nix
+        ./colors.nix
         niri.nixosModules.niri
         home-manager.nixosModules.home-manager
       ];
@@ -30,6 +31,7 @@
         ./devices/pleniscenta
         ./modules
         ./options.nix
+        ./colors.nix
         niri.nixosModules.niri
         home-manager.nixosModules.home-manager
       ];
@@ -47,6 +49,7 @@
         ./devices/inkvine
         ./modules
         ./options.nix
+        ./colors.nix
         niri.nixosModules.niri
         home-manager.nixosModules.home-manager
       ];