diff --git a/setup.sh b/setup.sh
index 71179b44..073b8635 100755
--- a/setup.sh
+++ b/setup.sh
@@ -697,6 +697,10 @@ fi
 # Set a special theme if none was set before
 if [ "$theme" = "" ]; then
 	theme=`cat "$wadir/defaulttheme" 2>/dev/null`
+	# If no default theme found fall back to Framed Theme
+	if [ ! -d "$wadir/$theme" ]; then
+		theme="gray-theme"
+	fi
 fi
 oldthemeline=`grep "^theme=" $config_dir/config`
 oldtheme=`echo $oldthemeline | sed -e 's/theme=//g'`