From f1e1915a08220ebb09ed70653be836c5cd6d7127 Mon Sep 17 00:00:00 2001
From: Dylan <dyl@tfwno.gf>
Date: Sun, 24 Jan 2016 10:38:46 +1100
Subject: [PATCH] Really fix whitespace issue

---
 fetch | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/fetch b/fetch
index b0c4b0d4..ffaaf931 100755
--- a/fetch
+++ b/fetch
@@ -885,12 +885,6 @@ getgtk () {
         gtk2theme=$(grep "^[^#]*$name" /etc/gtk-2.0/gtkrc)
     fi
 
-    # Format the string
-    gtk2theme=${gtk2theme/${name}*=/}
-    gtk2theme=${gtk2theme//\"/}
-    gtk2theme="$gtk2theme"
-    [ "$gtk2theme" ] && gtktheme="$gtk2theme [GTK2] "
-
     # Check for gtk3 theme
     if [ -f "$HOME/.config/gtk-3.0/settings.ini" ]; then
         gtk3theme=$(grep "^[^#]*$name" $HOME/.config/gtk-3.0/settings.ini)
@@ -898,10 +892,18 @@ getgtk () {
         gtk3theme=$(grep "^[^#]*$name" /etc/gtk-3.0/settings.ini)
     fi
 
+    # Format the strings
+    gtk2theme=${gtk2theme/${name}*=/}
+    gtk2theme=${gtk2theme//\"/}
+    gtk2theme=${gtk2theme//[[:space:]]/ }
+
+    [ "$gtk2theme" ] && \
+        gtktheme="$gtk2theme [GTK2] "
+
     # Format the string
     gtk3theme=${gtk3theme/${name}*=/}
     gtk3theme=${gtk3theme//\"/}
-    gtk3theme="$gtk3theme"
+    gtk3theme=${gtk3theme//[[:space:]]/ }
     gtktheme="${gtk2theme}${gtk3theme} [GTK3]"
 
     # Check to see if gtk2 and gtk3 theme are identical