diff --git a/src/themes/Kali/assets-renderer/.gitignore b/src/themes/Kali/assets-renderer/.gitignore
index 0cf469e5..e00452dd 100644
--- a/src/themes/Kali/assets-renderer/.gitignore
+++ b/src/themes/Kali/assets-renderer/.gitignore
@@ -1 +1 @@
-/*\.png
+/*/assets*/
diff --git a/src/themes/Kali/assets-renderer/gtk2/.gitignore b/src/themes/Kali/assets-renderer/gtk2/.gitignore
new file mode 100644
index 00000000..4e99a3fb
--- /dev/null
+++ b/src/themes/Kali/assets-renderer/gtk2/.gitignore
@@ -0,0 +1 @@
+menubar-toolbar
diff --git a/src/themes/Kali/assets-renderer/gtk3/Makefile b/src/themes/Kali/assets-renderer/gtk3/Makefile
index 3b786938..6fe1878b 100644
--- a/src/themes/Kali/assets-renderer/gtk3/Makefile
+++ b/src/themes/Kali/assets-renderer/gtk3/Makefile
@@ -27,10 +27,14 @@ build: $(SRC_FILE)
 		            --export-png=$(ASSETS_DIR)/$$i@2.png $(SRC_FILE) > /dev/null 2>&1 \
 		&& $(OPTIPNG) $(ASSETS_DIR)/$$i@2.png ; \
 	done
-	mkdir -p $(THEMES_DIR)Kali-Light/gtk-3.0/assets/
-	cp assets/* $(THEMES_DIR)Kali-Light/gtk-3.0/assets/
 	mkdir -p $(THEMES_DIR)Kali-Dark/gtk-3.0/assets/
+	mkdir -p $(THEMES_DIR)Kali-Dark/gtk-4.0/
+	mkdir -p $(THEMES_DIR)Kali-Light/gtk-3.0/
+	mkdir -p $(THEMES_DIR)Kali-Light/gtk-4.0/
 	cp assets/* $(THEMES_DIR)Kali-Dark/gtk-3.0/assets/
+	ln -rsvf $(THEMES_DIR)Kali-Dark/gtk-3.0/assets/ $(THEMES_DIR)Kali-Light/gtk-3.0/assets
+	ln -rsvf $(THEMES_DIR)Kali-Dark/gtk-3.0/assets/ $(THEMES_DIR)Kali-Dark/gtk-4.0/assets
+	ln -rsvf $(THEMES_DIR)Kali-Dark/gtk-3.0/assets/ $(THEMES_DIR)Kali-Light/gtk-4.0/assets
 
 clean:
 	-rm -r $(ASSETS_DIR)
diff --git a/src/themes/Kali/assets-renderer/xfwm4/Makefile b/src/themes/Kali/assets-renderer/xfwm4/Makefile
index b82be567..d92d5909 100644
--- a/src/themes/Kali/assets-renderer/xfwm4/Makefile
+++ b/src/themes/Kali/assets-renderer/xfwm4/Makefile
@@ -35,6 +35,12 @@ build: $(ASSETS)
 			&& $(OPTIPNG) $$variant@2/$$i.png ; \
 		done ; \
 	done
+	mkdir -p $(THEMES_DIR)Kali-Light/xfwm4/
+	mkdir -p $(THEMES_DIR)Kali-Dark/xfwm4/
+	mkdir -p $(THEMES_DIR)Kali-Light-HiDPI/xfwm4/
+	mkdir -p $(THEMES_DIR)Kali-Dark-HiDPI/xfwm4/
+	mkdir -p $(THEMES_DIR)Kali-Light-xHiDPI/xfwm4/
+	mkdir -p $(THEMES_DIR)Kali-Dark-xHiDPI/xfwm4/
 	cp assets/* $(THEMES_DIR)Kali-Light/xfwm4/
 	cp assets-dark/* $(THEMES_DIR)Kali-Dark/xfwm4/
 	cp assets@1.5/* $(THEMES_DIR)Kali-Light-HiDPI/xfwm4/