diff --git a/flake.lock b/flake.lock
index 8e1531b..5e01fd3 100644
--- a/flake.lock
+++ b/flake.lock
@@ -18,6 +18,24 @@
         "type": "github"
       }
     },
+    "flake-parts": {
+      "inputs": {
+        "nixpkgs-lib": "nixpkgs-lib"
+      },
+      "locked": {
+        "lastModified": 1785627969,
+        "narHash": "sha256-4dtXQk/NMePegK/nWp5NSeuZKLATItOq61lpEvmXqGw=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "427bf4bd9435fdf21321c8cc628c24efc14c0f7a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
     "fromYaml": {
       "flake": false,
       "locked": {
@@ -52,6 +70,27 @@
         "type": "github"
       }
     },
+    "nixcord": {
+      "inputs": {
+        "flake-parts": "flake-parts",
+        "nixpkgs": "nixpkgs_2",
+        "nixpkgs-nixcord": "nixpkgs-nixcord",
+        "treefmt-nix": "treefmt-nix"
+      },
+      "locked": {
+        "lastModified": 1788082709,
+        "narHash": "sha256-NRJUB6pVNqLpX2apWi6fCz5j47ZePRI25f+9H0WYs6Y=",
+        "owner": "4evy",
+        "repo": "nixcord",
+        "rev": "208ae34f932f1ddda36553190169af1ba920481a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "4evy",
+        "repo": "nixcord",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1787209939,
@@ -68,7 +107,54 @@
         "type": "github"
       }
     },
+    "nixpkgs-lib": {
+      "locked": {
+        "lastModified": 1785031560,
+        "narHash": "sha256-OmshNvn2vupOFpYinLUu+1Dnpu4n7Q5N3ggGVNHpkUI=",
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "rev": "0e79af5e3d4dcfcd676ab5ba3f95d2e3352e078c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "type": "github"
+      }
+    },
+    "nixpkgs-nixcord": {
+      "locked": {
+        "lastModified": 1786711500,
+        "narHash": "sha256-QvnceIGTBeDvDd9oCn+GvdsnkquliuwbVgpiRH68qaQ=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "02e08985a27c65ffd33d434eeb2e660a2e4dc84d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-26.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1786711500,
+        "narHash": "sha256-QvnceIGTBeDvDd9oCn+GvdsnkquliuwbVgpiRH68qaQ=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "02e08985a27c65ffd33d434eeb2e660a2e4dc84d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-26.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_3": {
       "locked": {
         "lastModified": 1788039129,
         "narHash": "sha256-pa4Q0qErvCvzCaaUph7Sm37RhR4xvPrYI8Lgz6k85+A=",
@@ -88,11 +174,46 @@
       "inputs": {
         "base16": "base16",
         "home-manager": "home-manager",
-        "nixpkgs": "nixpkgs_2",
+        "nixcord": "nixcord",
+        "nixpkgs": "nixpkgs_3",
+        "tt-discord": "tt-discord",
         "tt-schemes": "tt-schemes",
         "tt-terminal": "tt-terminal"
       }
     },
+    "treefmt-nix": {
+      "inputs": {
+        "nixpkgs": [
+          "nixcord",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1785945821,
+        "narHash": "sha256-NLSyTCW4K4ofhNBllt3omPasm6QpralXH1DBZOc91Dw=",
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "rev": "ae7910970dddc408fe6ab1c8e4b277bb21d72dc0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "type": "github"
+      }
+    },
+    "tt-discord": {
+      "flake": false,
+      "locked": {
+        "narHash": "sha256-a94aaomwiDeaoFKy3YXGVu6iMuIHtxXoFtGAse8tFz8=",
+        "type": "file",
+        "url": "https://git.lucy.rip/lucy/tinted-discord.git"
+      },
+      "original": {
+        "type": "file",
+        "url": "https://git.lucy.rip/lucy/tinted-discord.git"
+      }
+    },
     "tt-schemes": {
       "flake": false,
       "locked": {
diff --git a/flake.nix b/flake.nix
index 5618452..6e232a5 100644
--- a/flake.nix
+++ b/flake.nix
@@ -47,9 +47,13 @@
           home-manager.nixosModules.home-manager
           {
             home-manager.extraSpecialArgs = { inherit inputs; };
+            home-manager.useGlobalPkgs = true;
+            home-manager.useUserPackages = true;
+            home-manager.users.lucy = ./modules/hosts/nerv/home.nix;
             imports = [
-              ./modules/hosts/nerv/home.nix
+              ./modules/themeing
               ./modules/programs
+        
             ];
           }
         ];
diff --git a/modules/hosts/nerv/#home.nix# b/modules/hosts/nerv/#home.nix#
deleted file mode 100644
index 7983caf..0000000
--- a/modules/hosts/nerv/#home.nix#
+++ /dev/null
@@ -1,86 +0,0 @@
-{
-  pkgs,
-  config,
-  ...
-}:
-let
-  c = config.scheme.withHashtag;
-in
-{
-  home-manager.users.lucy = {
-    home.packages = with pkgs; [
-      nixd
-      nixfmt
-      clang
-      kdePackages.qtdeclarative
-    ];
-    home-manager.useGlobalPkgs = true;
-    home-manager.useUserPackages = true;
-    home.stateVersion = "26.05";
-    home.pointerCursor = {
-      enable = true;
-      name = "macOS";
-      package = pkgs.apple-cursor;
-      size = 24;
-    };
-    gtk = {
-      enable = true;
-      colorScheme = "dark";
-      theme = {
-        name = "adw-gtk3-dark";
-        package = pkgs.adw-gtk3;
-      };
-      iconTheme = {
-        name = "Papirus-Dark";
-        package = pkgs.papirus-icon-theme;
-      };
-      font = {
-        name = config.theming.font;
-        package = config.theming.fontPackage;
-        size = 12;
-      };
-      cursorTheme.name = "macOS";
-      cursorTheme.size = 24;
-      gtk3.extraCss = ''
-        @define-color theme_bg_color ${c.base00};
-        @define-color theme_fg_color ${c.base05};
-        @define-color theme_base_color ${c.base00};
-        @define-color theme_text_color ${c.base05};
-        @define-color theme_selected_bg_color ${c.base0D};
-        @define-color theme_selected_fg_color ${c.base00};
-        @define-color insensitive_bg_color ${c.base01};
-        @define-color insensitive_fg_color ${c.base03};
-        @define-color borders ${c.base02};
-        @define-color warning_color ${c.base0A};
-        @define-color error_color ${c.base08};
-        @define-color success_color ${c.base0B};
-      '';
-      gtk4.extraCss = ''
-        @define-color window_bg_color ${c.base00};
-        @define-color window_fg_color ${c.base05};
-        @define-color view_bg_color ${c.base00};
-        @define-color view_fg_color ${c.base05};
-        @define-color headerbar_bg_color ${c.base01};
-        @define-color headerbar_fg_color ${c.base05};
-        @define-color headerbar_border_color ${c.base02};
-        @define-color sidebar_bg_color ${c.base01};
-        @define-color sidebar_fg_color ${c.base05};
-        @define-color card_bg_color ${c.base01};
-        @define-color card_fg_color ${c.base05};
-        @define-color popover_bg_color ${c.base01};
-        @define-color popover_fg_color ${c.base05};
-        @define-color dialog_bg_color ${c.base01};
-        @define-color dialog_fg_color ${c.base05};
-        @define-color accent_bg_color ${c.base0D};
-        @define-color accent_fg_color ${c.base00};
-        @define-color accent_color ${c.base0D};
-        @define-color destructive_bg_color ${c.base08};
-        @define-color destructive_color ${c.base08};
-        @define-color warning_color ${c.base0A};
-        @define-color error_color ${c.base08};
-        @define-color success_color ${c.base0B};
-      '';
-    };
-    dconf.settings."org/gnome/desktop/interface".color-scheme = "prefer-dark";
-  };
-}
diff --git a/modules/hosts/nerv/.#home.nix b/modules/hosts/nerv/.#home.nix
deleted file mode 120000
index 10a6f84..0000000
--- a/modules/hosts/nerv/.#home.nix
+++ /dev/null
@@ -1 +0,0 @@
-lucy@nerv.2718:1788209064
\ No newline at end of file
diff --git a/modules/hosts/nerv/home.nix b/modules/hosts/nerv/home.nix
index 8dd2351..77cc7f0 100644
--- a/modules/hosts/nerv/home.nix
+++ b/modules/hosts/nerv/home.nix
@@ -7,78 +7,77 @@ let
   c = config.scheme.withHashtag;
 in
 {
-  home-manager.users.lucy = {
-    home.packages = with pkgs; [
-      nixd
-      nixfmt
-      clang
-      kdePackages.qtdeclarative
-    ];
-    home.stateVersion = "26.05";
-    home.pointerCursor = {
-      enable = true;
-      name = "macOS";
-      package = pkgs.apple-cursor;
-      size = 24;
-    };
-    gtk = {
-      enable = true;
-      colorScheme = "dark";
-      theme = {
-        name = "adw-gtk3-dark";
-        package = pkgs.adw-gtk3;
-      };
-      iconTheme = {
-        name = "Papirus-Dark";
-        package = pkgs.papirus-icon-theme;
-      };
-      font = {
-        name = config.theming.font;
-        package = config.theming.fontPackage;
-        size = 12;
-      };
-      cursorTheme.name = "macOS";
-      cursorTheme.size = 24;
-      gtk3.extraCss = ''
-        @define-color theme_bg_color ${c.base00};
-        @define-color theme_fg_color ${c.base05};
-        @define-color theme_base_color ${c.base00};
-        @define-color theme_text_color ${c.base05};
-        @define-color theme_selected_bg_color ${c.base0D};
-        @define-color theme_selected_fg_color ${c.base00};
-        @define-color insensitive_bg_color ${c.base01};
-        @define-color insensitive_fg_color ${c.base03};
-        @define-color borders ${c.base02};
-        @define-color warning_color ${c.base0A};
-        @define-color error_color ${c.base08};
-        @define-color success_color ${c.base0B};
-      '';
-      gtk4.extraCss = ''
-        @define-color window_bg_color ${c.base00};
-        @define-color window_fg_color ${c.base05};
-        @define-color view_bg_color ${c.base00};
-        @define-color view_fg_color ${c.base05};
-        @define-color headerbar_bg_color ${c.base01};
-        @define-color headerbar_fg_color ${c.base05};
-        @define-color headerbar_border_color ${c.base02};
-        @define-color sidebar_bg_color ${c.base01};
-        @define-color sidebar_fg_color ${c.base05};
-        @define-color card_bg_color ${c.base01};
-        @define-color card_fg_color ${c.base05};
-        @define-color popover_bg_color ${c.base01};
-        @define-color popover_fg_color ${c.base05};
-        @define-color dialog_bg_color ${c.base01};
-        @define-color dialog_fg_color ${c.base05};
-        @define-color accent_bg_color ${c.base0D};
-        @define-color accent_fg_color ${c.base00};
-        @define-color accent_color ${c.base0D};
-        @define-color destructive_bg_color ${c.base08};
-        @define-color destructive_color ${c.base08};
-        @define-color warning_color ${c.base0A};
-        @define-color error_color ${c.base08};
-        @define-color success_color ${c.base0B};
-      '';
-    };
-    dconf.settings."org/gnome/desktop/interface".color-scheme = "prefer-dark";
+  home.packages = with pkgs; [
+    nixd
+    nixfmt
+    clang
+    kdePackages.qtdeclarative
+  ];
+
+  home.stateVersion = "26.05";
+  home.pointerCursor = {
+    enable = true;
+    name = "macOS";
+    package = pkgs.apple-cursor;
+    size = 24;
   };
+  gtk = {
+    enable = true;
+    colorScheme = "dark";
+    theme = {
+      name = "adw-gtk3-dark";
+      package = pkgs.adw-gtk3;
+    };
+    iconTheme = {
+      name = "Papirus-Dark";
+      package = pkgs.papirus-icon-theme;
+    };
+    font = {
+      name = config.theming.font;
+      package = config.theming.fontPackage;
+      size = 12;
+    };
+    cursorTheme.name = "macOS";
+    cursorTheme.size = 24;
+    gtk3.extraCss = ''
+      @define-color theme_bg_color ${c.base00};
+      @define-color theme_fg_color ${c.base05};
+      @define-color theme_base_color ${c.base00};
+      @define-color theme_text_color ${c.base05};
+      @define-color theme_selected_bg_color ${c.base0D};
+      @define-color theme_selected_fg_color ${c.base00};
+      @define-color insensitive_bg_color ${c.base01};
+      @define-color insensitive_fg_color ${c.base03};
+      @define-color borders ${c.base02};
+      @define-color warning_color ${c.base0A};
+      @define-color error_color ${c.base08};
+      @define-color success_color ${c.base0B};
+    '';
+    gtk4.extraCss = ''
+      @define-color window_bg_color ${c.base00};
+      @define-color window_fg_color ${c.base05};
+      @define-color view_bg_color ${c.base00};
+      @define-color view_fg_color ${c.base05};
+      @define-color headerbar_bg_color ${c.base01};
+      @define-color headerbar_fg_color ${c.base05};
+      @define-color headerbar_border_color ${c.base02};
+      @define-color sidebar_bg_color ${c.base01};
+      @define-color sidebar_fg_color ${c.base05};
+      @define-color card_bg_color ${c.base01};
+      @define-color card_fg_color ${c.base05};
+      @define-color popover_bg_color ${c.base01};
+      @define-color popover_fg_color ${c.base05};
+      @define-color dialog_bg_color ${c.base01};
+      @define-color dialog_fg_color ${c.base05};
+      @define-color accent_bg_color ${c.base0D};
+      @define-color accent_fg_color ${c.base00};
+      @define-color accent_color ${c.base0D};
+      @define-color destructive_bg_color ${c.base08};
+      @define-color destructive_color ${c.base08};
+      @define-color warning_color ${c.base0A};
+      @define-color error_color ${c.base08};
+      @define-color success_color ${c.base0B};
+    '';
+  };
+  dconf.settings."org/gnome/desktop/interface".color-scheme = "prefer-dark";
 }
diff --git a/modules/programs/emacs.nix b/modules/programs/emacs.nix
index e79dfe4..93adc89 100644
--- a/modules/programs/emacs.nix
+++ b/modules/programs/emacs.nix
@@ -3,7 +3,7 @@
   ...
 }:
 {
-  home-manager.users.lucy.programs.emacs = {
+  programs.emacs = {
     enable = true;
     extraPackages =
       epkgs: with epkgs.melpaPackages; [
diff --git a/modules/programs/foot.nix b/modules/programs/foot.nix
index e063b36..9071f9f 100644
--- a/modules/programs/foot.nix
+++ b/modules/programs/foot.nix
@@ -8,7 +8,7 @@ let
   c = config.scheme;
 in
 {
-  home-manager.users.lucy.programs.foot = {
+  programs.foot = {
     enable = true;
     settings = {
       main = {
diff --git a/modules/programs/fuzzel.nix b/modules/programs/fuzzel.nix
index f490212..2c192d0 100644
--- a/modules/programs/fuzzel.nix
+++ b/modules/programs/fuzzel.nix
@@ -3,22 +3,22 @@ let
   c = config.scheme.withHashtag;
 in
 {
-  home-manager.users.lucy = {
-    programs.fuzzel = {
-      enable = true;
-      settings = {
-        main = {
-          font = "${config.theming.font}:size=12";
-        };
-        border.width = 2;
-        colors = {
-          background = "${c.base00}ff";
-          text = "${c.base05}ff";
-          match = "${c.base0D}ff";
-          selection = "${c.base0D}ff";
-          border = "${c.base0D}ff";
-        };
+
+  programs.fuzzel = {
+    enable = true;
+    settings = {
+      main = {
+        font = "${config.theming.font}:size=12";
+      };
+      border.width = 2;
+      colors = {
+        background = "${c.base00}ff";
+        text = "${c.base05}ff";
+        match = "${c.base0D}ff";
+        selection = "${c.base0D}ff";
+        border = "${c.base0D}ff";
       };
     };
   };
+
 }
diff --git a/modules/programs/niri.nix b/modules/programs/niri.nix
index eb117e1..1cc4a54 100644
--- a/modules/programs/niri.nix
+++ b/modules/programs/niri.nix
@@ -1,6 +1,6 @@
 { pkgs, config, ... }:
 {
-  home-manager.users.lucy.wayland.windowManager.niri = {
+  wayland.windowManager.niri = {
     enable = true;
     extraConfig = ''
             prefer-no-csd
diff --git a/modules/programs/nixcord.nix b/modules/programs/nixcord.nix
index 72994fc..4a998d0 100644
--- a/modules/programs/nixcord.nix
+++ b/modules/programs/nixcord.nix
@@ -1,8 +1,8 @@
-{ inputs, ... }: {
+{ inputs, config, lib, ... }: {
   imports = [ inputs.nixcord.homeModules.nixcord ];
   programs.nixcord = {
     enable = true;
     discord.vencord.enable = true;
+    quickCss = (config.scheme inputs.tt-discord);
   };
-
 }
diff --git a/modules/programs/quickshell.nix b/modules/programs/quickshell.nix
index b601367..7a172da 100644
--- a/modules/programs/quickshell.nix
+++ b/modules/programs/quickshell.nix
@@ -4,33 +4,31 @@ let
 in
 {
 
-  home-manager.users.lucy = {
-    programs.quickshell.enable = true;
-    programs.quickshell.systemd.enable = true;
-    xdg.configFile."quickshell/Colors.js" = {
-      enable = true;
-      text = ''
-        const colors = {
-              base00: "${c.base00}",
-              base01: "${c.base01}",
-              base02: "${c.base02}",
-              base03: "${c.base03}",
-              base04: "${c.base04}",
-              base05: "${c.base05}",
-              base06: "${c.base06}",
-              base07: "${c.base07}",
-              base08: "${c.base08}",
-              base09: "${c.base09}",
-              base0A: "${c.base0A}",
-              base0B: "${c.base0B}",
-              base0C: "${c.base0C}",
-              base0D: "${c.base0D}",
-              base0E: "${c.base0E}",
-              base0F: "${c.base0F}",
-         }
-      '';
-      force = true;
-    };
-
+  programs.quickshell.enable = true;
+  programs.quickshell.systemd.enable = true;
+  xdg.configFile."quickshell/Colors.js" = {
+    enable = true;
+    text = ''
+      const colors = {
+            base00: "${c.base00}",
+            base01: "${c.base01}",
+            base02: "${c.base02}",
+            base03: "${c.base03}",
+            base04: "${c.base04}",
+            base05: "${c.base05}",
+            base06: "${c.base06}",
+            base07: "${c.base07}",
+            base08: "${c.base08}",
+            base09: "${c.base09}",
+            base0A: "${c.base0A}",
+            base0B: "${c.base0B}",
+            base0C: "${c.base0C}",
+            base0D: "${c.base0D}",
+            base0E: "${c.base0E}",
+            base0F: "${c.base0F}",
+       }
+    '';
+    force = true;
   };
+
 }
diff --git a/theme.nix b/modules/themeing/default.nix
similarity index 100%
rename from theme.nix
rename to modules/themeing/default.nix