diff --git a/populate.sh b/populate.sh
index ce856dd..9ae5cd6 100644
--- a/populate.sh
+++ b/populate.sh
@@ -1,16 +1,14 @@
 #!/bin/sh
 git clone https://gitlab.com/threeoh6000/ewfm-themes.git
 
-mv ewfm-themes/ themes/
-mv themes/linear/* themes/
-mv themes/3box/* themes/
-mv themes/roundbox/* themes/
-mv themes/other/* themes/
+mkdir themes
 
-mv themes/LICENSE themes/STANDARD-LICENSE
-mv themes/README themes/STANDARD-README
+mv ewfm-themes/linear/* themes/
+mv ewfm-themes/3box/* themes/
+mv ewfm-themes/roundbox/* themes/
+mv ewfm-themes/other/* themes/
 
-rm -r themes/3box
-rm -r themes/linear
-rm -r themes/roundbox
-rm -r themes/other
+mv ewfm-themes/LICENSE themes/STANDARD-LICENSE
+mv ewfm-themes/README themes/STANDARD-README
+
+rm -rf ewfm-themes/