diff --git a/cookbook/templatetags/theming_tags.py b/cookbook/templatetags/theming_tags.py
index f35096fd..fb7e1405 100644
--- a/cookbook/templatetags/theming_tags.py
+++ b/cookbook/templatetags/theming_tags.py
@@ -63,14 +63,15 @@ def get_theming_values(space, user):
         for logo in list(tv.keys()):
             if logo.startswith('logo_color_') and getattr(space, logo, None):
                 tv[logo] = getattr(space, logo).file.url
-            if space.custom_space_theme:
-                tv['custom_theme'] = space.custom_space_theme.file.url
-            if space.space_theme in themes:
-                tv['theme'] = static(themes[space.space_theme])
-            if space.nav_logo:
-                tv['nav_logo'] = space.nav_logo.file.url
-            if space.nav_bg_color:
-                tv['nav_bg_color'] = space.nav_bg_color
-            if space.nav_text_color and space.nav_text_color in nav_text_type_mapping:
-                tv['nav_text_class'] = nav_text_type_mapping[space.nav_text_color]
+
+        if space.custom_space_theme:
+            tv['custom_theme'] = space.custom_space_theme.file.url
+        if space.space_theme in themes:
+            tv['theme'] = static(themes[space.space_theme])
+        if space.nav_logo:
+            tv['nav_logo'] = space.nav_logo.file.url
+        if space.nav_bg_color:
+            tv['nav_bg_color'] = space.nav_bg_color
+        if space.nav_text_color and space.nav_text_color in nav_text_type_mapping:
+            tv['nav_text_class'] = nav_text_type_mapping[space.nav_text_color]
     return tv
diff --git a/recipes/settings.py b/recipes/settings.py
index a22cd394..644bf8a4 100644
--- a/recipes/settings.py
+++ b/recipes/settings.py
@@ -57,7 +57,7 @@ COMMENT_PREF_DEFAULT = bool(int(os.getenv('COMMENT_PREF_DEFAULT', True)))
 FRACTION_PREF_DEFAULT = bool(int(os.getenv('FRACTION_PREF_DEFAULT', False)))
 KJ_PREF_DEFAULT = bool(int(os.getenv('KJ_PREF_DEFAULT', False)))
 STICKY_NAV_PREF_DEFAULT = bool(int(os.getenv('STICKY_NAV_PREF_DEFAULT', True)))
-UNAUTHENTICATED_THEME_FROM_SPACE = 2 #int(os.getenv('UNAUTHENTICATED_THEME_FROM_SPACE', 0))
+UNAUTHENTICATED_THEME_FROM_SPACE = int(os.getenv('UNAUTHENTICATED_THEME_FROM_SPACE', 0))
 
 # minimum interval that users can set for automatic sync of shopping lists
 SHOPPING_MIN_AUTOSYNC_INTERVAL = int(