diff --git a/modules/home/aseprite/default.nix b/modules/home/aseprite/aseprite.nix
similarity index 100%
rename from modules/home/aseprite/default.nix
rename to modules/home/aseprite/aseprite.nix
diff --git a/modules/home/audacious/default.nix b/modules/home/audacious/audacious.nix
similarity index 100%
rename from modules/home/audacious/default.nix
rename to modules/home/audacious/audacious.nix
diff --git a/modules/home/bat/default.nix b/modules/home/bat.nix
similarity index 100%
rename from modules/home/bat/default.nix
rename to modules/home/bat.nix
diff --git a/modules/home/btop/default.nix b/modules/home/btop.nix
similarity index 100%
rename from modules/home/btop/default.nix
rename to modules/home/btop.nix
diff --git a/modules/home/cava/default.nix b/modules/home/cava.nix
similarity index 100%
rename from modules/home/cava/default.nix
rename to modules/home/cava.nix
diff --git a/modules/home/default.nix b/modules/home/default.nix
index a13f524..62aa0a6 100644
--- a/modules/home/default.nix
+++ b/modules/home/default.nix
@@ -1,27 +1,27 @@
 {inputs, username, ...}: {
   imports =
-       [(import ./aseprite)]        # pixel art editor
-    ++ [(import ./audacious)]       # music player
-    ++ [(import ./bat)]
-    ++ [(import ./btop)]
-    ++ [(import ./cava)]
-    ++ [(import ./discord)]         # discord with catppuccin theme
-    ++ [(import ./floorp)]          # firefox based browser
-    ++ [(import ./gaming)]
-    ++ [(import ./git)]
-    ++ [(import ./gtk)]
+       [(import ./aseprite/aseprite.nix)]         # pixel art editor
+    ++ [(import ./audacious/audacious.nix)]       # music player
+    ++ [(import ./bat.nix)]
+    ++ [(import ./btop.nix)]
+    ++ [(import ./cava.nix)]
+    ++ [(import ./discord.nix)]                   # discord with catppuccin theme
+    ++ [(import ./floorp/floorp.nix)]             # firefox based browser
+    ++ [(import ./gaming.nix)]
+    ++ [(import ./git.nix)]
+    ++ [(import ./gtk.nix)]
     ++ [(import ./hyprland)]
-    ++ [(import ./kitty)]
-    ++ [(import ./mako)]            # notification deamon
-    ++ [(import ./micro)]           # nano replacement
-    ++ [(import ./nvim)]
-    ++ [(import ./packages)]
-    ++ [(import ./rider)]           # C# JetBrain editor
-    ++ [(import ./scripts)]         # personal scripts
-    ++ [(import ./starship)]
-    ++ [(import ./swaylock)]
-    ++ [(import ./vscodium)]
+    ++ [(import ./kitty.nix)]
+    ++ [(import ./mako.nix)]                      # notification deamon
+    ++ [(import ./micro.nix)]                     # nano replacement
+    ++ [(import ./nvim.nix)]
+    ++ [(import ./packages.nix)]
+    ++ [(import ./rider.nix)]                     # C# JetBrain editor
+    ++ [(import ./scripts/scripts.nix)]           # personal scripts
+    ++ [(import ./starship.nix)]
+    ++ [(import ./swaylock.nix)]
+    ++ [(import ./vscodium.nix)]
     ++ [(import ./waybar)]
-    ++ [(import ./wofi)]
-    ++ [(import ./zsh)];
+    ++ [(import ./wofi/wofi.nix)]
+    ++ [(import ./zsh.nix)];
 }
diff --git a/modules/home/discord/theme-template.nix b/modules/home/discord.nix
similarity index 79%
rename from modules/home/discord/theme-template.nix
rename to modules/home/discord.nix
index 616993c..066dad8 100644
--- a/modules/home/discord/theme-template.nix
+++ b/modules/home/discord.nix
@@ -1,4 +1,10 @@
+{ pkgs, ... }: 
 {
+  home.packages = with pkgs; [
+    (discord.override { 
+      withVencord = true; 
+    })
+  ];
   xdg.configFile."Vencord/themes/custom.css".text = '' 
     /**
     * @name Catppuccin Mocha
diff --git a/modules/home/discord/default.nix b/modules/home/discord/default.nix
deleted file mode 100644
index f48a6db..0000000
--- a/modules/home/discord/default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ pkgs, ... }: 
-{
-  imports = [ (import ./theme-template.nix) ];
-  home.packages = with pkgs; [
-    (discord.override { 
-      withVencord = true; 
-    })
-  ];
-}
\ No newline at end of file
diff --git a/modules/home/floorp/default.nix b/modules/home/floorp/floorp.nix
similarity index 100%
rename from modules/home/floorp/default.nix
rename to modules/home/floorp/floorp.nix
diff --git a/modules/home/gaming/default.nix b/modules/home/gaming.nix
similarity index 100%
rename from modules/home/gaming/default.nix
rename to modules/home/gaming.nix
diff --git a/modules/home/git/default.nix b/modules/home/git.nix
similarity index 100%
rename from modules/home/git/default.nix
rename to modules/home/git.nix
diff --git a/modules/home/gtk/default.nix b/modules/home/gtk.nix
similarity index 100%
rename from modules/home/gtk/default.nix
rename to modules/home/gtk.nix
diff --git a/modules/home/kitty/default.nix b/modules/home/kitty.nix
similarity index 100%
rename from modules/home/kitty/default.nix
rename to modules/home/kitty.nix
diff --git a/modules/home/mako/default.nix b/modules/home/mako.nix
similarity index 100%
rename from modules/home/mako/default.nix
rename to modules/home/mako.nix
diff --git a/modules/home/micro/default.nix b/modules/home/micro.nix
similarity index 100%
rename from modules/home/micro/default.nix
rename to modules/home/micro.nix
diff --git a/modules/home/nvim/default.nix b/modules/home/nvim.nix
similarity index 100%
rename from modules/home/nvim/default.nix
rename to modules/home/nvim.nix
diff --git a/modules/home/packages/default.nix b/modules/home/packages.nix
similarity index 100%
rename from modules/home/packages/default.nix
rename to modules/home/packages.nix
diff --git a/modules/home/rider/default.nix b/modules/home/rider.nix
similarity index 100%
rename from modules/home/rider/default.nix
rename to modules/home/rider.nix
diff --git a/modules/home/scripts/default.nix b/modules/home/scripts/scripts.nix
similarity index 100%
rename from modules/home/scripts/default.nix
rename to modules/home/scripts/scripts.nix
diff --git a/modules/home/starship/default.nix b/modules/home/starship.nix
similarity index 100%
rename from modules/home/starship/default.nix
rename to modules/home/starship.nix
diff --git a/modules/home/swaylock/default.nix b/modules/home/swaylock.nix
similarity index 100%
rename from modules/home/swaylock/default.nix
rename to modules/home/swaylock.nix
diff --git a/modules/home/vscodium/default.nix b/modules/home/vscodium.nix
similarity index 100%
rename from modules/home/vscodium/default.nix
rename to modules/home/vscodium.nix
diff --git a/modules/home/wofi/default.nix b/modules/home/wofi/wofi.nix
similarity index 100%
rename from modules/home/wofi/default.nix
rename to modules/home/wofi/wofi.nix
diff --git a/modules/home/zsh/default.nix b/modules/home/zsh.nix
similarity index 100%
rename from modules/home/zsh/default.nix
rename to modules/home/zsh.nix