diff --git a/flake.nix b/flake.nix
index ce11c4f..d911cde 100644
--- a/flake.nix
+++ b/flake.nix
@@ -7,11 +7,13 @@
 
       with0x      = theme // (builtins.mapAttrs (_: value: "0x" + value) onlyColors);
       withHashtag = theme // (builtins.mapAttrs (_: value: "#" + value)  onlyColors);
-    in theme // {
-      inherit with0x withHashtag;
 
-      tmTheme       = (import ./templates/tmTheme.nix) theme;
-      adwaitaGtkcss = (import ./templates/adwaitaGtkCss.nix) theme;
+      themeFull = theme // {
+        inherit with0x withHashtag;
+      };
+    in themeFull // {
+      tmTheme       = (import ./templates/tmTheme.nix) themeFull;
+      adwaitaGtkcss = (import ./templates/adwaitaGtkCss.nix) themeFull;
     };
-  } // builtins.mapAttrs (_: self.custom) (import ./themes.nix);
+  } // builtins.mapAttrs (name: self.custom) (import ./themes.nix);
 }