diff --git a/src/skins/vector/css/_components.scss b/src/skins/vector/css/_components.scss
index 88435236..880c1054 100644
--- a/src/skins/vector/css/_components.scss
+++ b/src/skins/vector/css/_components.scss
@@ -49,7 +49,6 @@
 @import "./matrix-react-sdk/views/voip/_CallView.scss";
 @import "./matrix-react-sdk/views/voip/_IncomingCallbox.scss";
 @import "./matrix-react-sdk/views/voip/_VideoView.scss";
-@import "./themes/_base.scss";
 @import "./vector-web/_fonts.scss";
 @import "./vector-web/structures/_CompatibilityPage.scss";
 @import "./vector-web/structures/_LeftPanel.scss";
diff --git a/src/skins/vector/css/rethemendex.sh b/src/skins/vector/css/rethemendex.sh
index 9381c5cd..a7d9a657 100755
--- a/src/skins/vector/css/rethemendex.sh
+++ b/src/skins/vector/css/rethemendex.sh
@@ -1,8 +1,13 @@
 #!/bin/bash
 
-echo "// autogenerated by rethemendex.sh" > _components.scss
+cd `dirname $0`
 
-for i in `find . -iname _\*.scss | fgrep -v _components.scss | sort`;
-do
-    echo "@import \"$i\";" >> _components.scss
-done
+{
+    echo "// autogenerated by rethemendex.sh"
+
+    find . \! \( -path ./themes -prune \) -iname _\*.scss |
+        fgrep -v _components.scss | LC_ALL=C sort |
+        while read i; do
+            echo "@import \"$i\";"
+        done
+} > _components.scss