diff --git a/flake.nix b/flake.nix
index 53bf0104..b7b4723d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -137,7 +137,7 @@
               };
             };
           hive-ci = ./nix/modules/hive-ci.nix;
-          hive-forge = ./nix/modules/hive-forge.nix;
+          hive-forge = ./nix/modules/hive-forge;
         };
 
       nixosConfigurations =
diff --git a/nix/modules/default.nix b/nix/modules/default.nix
index c795abe2..72451000 100644
--- a/nix/modules/default.nix
+++ b/nix/modules/default.nix
@@ -14,7 +14,7 @@
     ./hyperhive.nix
     ./hive-c0re
     ./hive-ci.nix
-    ./hive-forge.nix
+    ./hive-forge
     ./hive-gateway
     ./hive-matrix.nix
     ./hive-network.nix
diff --git a/nix/modules/hive-forge.nix b/nix/modules/hive-forge/default.nix
similarity index 97%
rename from nix/modules/hive-forge.nix
rename to nix/modules/hive-forge/default.nix
index f625a8a7..0bdab6f6 100644
--- a/nix/modules/hive-forge.nix
+++ b/nix/modules/hive-forge/default.nix
@@ -313,16 +313,16 @@ in
           staticRootWithTheme = pkgs.runCommand "forgejo-static-with-theme" { } ''
             cp -r --no-preserve=mode,ownership ${cfg.package.data}/. $out/
             mkdir -p $out/public/assets/css
-            cp ${../forge-theme/theme-catppuccin-vibec0re.css} \
+            cp ${./theme-catppuccin-vibec0re.css} \
                $out/public/assets/css/theme-catppuccin-vibec0re.css
             # Replace the default Forgejo logo + favicon with the hyperhive
             # mark. Files in public/assets/img/ are served before built-ins.
             mkdir -p $out/public/assets/img
-            cp ${../../branding/hyperhive.svg} $out/public/assets/img/logo.svg
-            cp ${../../branding/hyperhive.svg} $out/public/assets/img/favicon.svg
-            cp ${../../branding/hyperhive.png} $out/public/assets/img/logo.png
-            cp ${../../branding/hyperhive.png} $out/public/assets/img/favicon.png
-            cp ${../../branding/hyperhive.png} $out/public/assets/img/avatar_default.png
+            cp ${../../../branding/hyperhive.svg} $out/public/assets/img/logo.svg
+            cp ${../../../branding/hyperhive.svg} $out/public/assets/img/favicon.svg
+            cp ${../../../branding/hyperhive.png} $out/public/assets/img/logo.png
+            cp ${../../../branding/hyperhive.png} $out/public/assets/img/favicon.png
+            cp ${../../../branding/hyperhive.png} $out/public/assets/img/avatar_default.png
           '';
         in
         {
diff --git a/nix/forge-theme/theme-catppuccin-vibec0re.css b/nix/modules/hive-forge/theme-catppuccin-vibec0re.css
similarity index 100%
rename from nix/forge-theme/theme-catppuccin-vibec0re.css
rename to nix/modules/hive-forge/theme-catppuccin-vibec0re.css