diff --git a/modules/home/base16-gtk.nix b/modules/home/base16-gtk.nix
index 8a638031..2b0b1bfd 100644
--- a/modules/home/base16-gtk.nix
+++ b/modules/home/base16-gtk.nix
@@ -117,10 +117,10 @@ in {
 		'';
 		configForSchemes = mapAttrs configForScheme config.base16.schemes;
 		configFilesForSchemes = mapAttrs (k: v: pkgs.writeText "oomox-config-${k}" v) configForSchemes;
-		iconPackageForScheme = name: schemeConfigFile: let
-			schemeConfig = cfg.${name} or cfg.default;
+		iconPackageForScheme = schemeName: schemeConfigFile: let
+			schemeConfig = cfg.${schemeName} or cfg.default;
 		in with pkgs; mkDerivation rec {
-			inherit name;
+			name = "icons-${cfg.${schemeName}.icon_style or cfg.default.icon_style}-${schemeName}";
           src = fetchFromGitHub {
             owner = "themix-project";
             repo = "oomox";
@@ -136,19 +136,15 @@ in {
 				mkdir -p ./.icons
 				patchShebangs plugins/${iconPathSelector schemeConfig.icon_style}
 				plugins/${iconPathSelector schemeConfig.icon_style} ${schemeConfigFile} \
-					-o $name-${schemeConfig.icon_style}
+					-o ${schemeConfig.icon_style}-$name
 				mkdir -p $out/share/icons/${schemeConfig.icon_style}-$name
-				mv ./.icons/* $out/share/icons/${schemeConfig.icon_style}-$name
-				mkdir -p $out/share/themes/${schemeConfig.theme_style}-$name
-				patchShebangs plugins/theme_${schemeConfig.theme_style}
-				plugins/${themePathSelector schemeConfig.theme_style} \
-					--hidpi False --target $out/share/themes --output $name-${schemeConfig.theme_style} ${schemeConfigFile}
+				mv ./.icons/* $out/share/icons
 			'';
 		};
-		themePackageForScheme = name: schemeConfigFile: let
-			schemeConfig = cfg.${name} or cfg.default;
+		themePackageForScheme = schemeName: schemeConfigFile: let
+			schemeConfig = cfg.${schemeName} or cfg.default;
 		in with pkgs; mkDerivation rec {
-			inherit name;
+				name = "theme-${cfg.${schemeName}.theme_style or cfg.default.theme_style}-${schemeName}";
           src = fetchFromGitHub {
             owner = "themix-project";
             repo = "oomox";
@@ -164,7 +160,7 @@ in {
 				mkdir -p $out/share/themes/${schemeConfig.theme_style}-$name
 				patchShebangs plugins/theme_${schemeConfig.theme_style}
 				plugins/${themePathSelector schemeConfig.theme_style} \
-					--hidpi False --target $out/share/themes --output $name-${schemeConfig.theme_style} ${schemeConfigFile}
+					--hidpi False -t $out/share/themes -m all --output ${schemeConfig.theme_style}-$name ${schemeConfigFile}
 			'';
 		};
 		themePackagesForSchemes = mapAttrs (k: v: themePackageForScheme k v) configFilesForSchemes;
diff --git a/tf b/tf
index e0480fd5..f16be2a9 160000
--- a/tf
+++ b/tf
@@ -1 +1 @@
-Subproject commit e0480fd57f0d85814aec8a16c9a1d637283da4e3
+Subproject commit f16be2a91179d35803e30d3f4a8233156a8faa3f