diff --git a/scripts/themer b/scripts/themer
index 62d5dbc..16c92a3 100755
--- a/scripts/themer
+++ b/scripts/themer
@@ -37,7 +37,14 @@ echo
 echo "*** Installing Adwaita theme for Firefox... ***"
 echo
 
-curl -s -o- https://raw.githubusercontent.com/rafaelmardojai/firefox-gnome-theme/master/scripts/install-by-curl.sh | bash
+# Download and install gnome-firefox-theme
+rm -rf /tmp/firefox-gnome-theme/
+git clone https://github.com/rafaelmardojai/firefox-gnome-theme.git /tmp/firefox-gnome-theme/
+(
+    cd /tmp/firefox-gnome-theme/
+    git checkout v$(firefox --version | sed -nr 's/[^0-9]*([0-9]*).*/\1/p') # Making sure to use the appropriate version
+    bash ./scripts/auto-install.sh
+)
 
 # Set user flags for theme
 function set_ff_flag ()