diff --git a/src/routes/_components/settings/instance/ThemeSettings.html b/src/routes/_components/settings/instance/ThemeSettings.html
index 015f38bb..310b8cb9 100644
--- a/src/routes/_components/settings/instance/ThemeSettings.html
+++ b/src/routes/_components/settings/instance/ThemeSettings.html
@@ -2,11 +2,9 @@
   <div class="theme-groups">
     {#each themeGroups as themeGroup}
     <div class="theme-group">
-      {#if themeGroup.dark}
-        <h2>Dark Background</h2>
-      {:else}
-        <h2>Light Background</h2>
-      {/if}
+      <h3>
+        {themeGroup.dark ? 'Dark background' : 'Light background' }
+      </h3>
       {#each themeGroup.themes as theme}
       <div class="theme-picker">
         <input type="radio" id="choice-theme-{theme.name}"
@@ -65,10 +63,18 @@
     border: 2px solid #dadada;
   }
 
+  h3 {
+    font-size: 1.4em;
+  }
+
   @media (max-width: 479px) {
     .theme-groups {
       grid-template-columns: 1fr;
     }
+
+    h3 {
+      margin-top: 0.5em;
+    }
   }
 </style>
 <script>
diff --git a/src/routes/_pages/settings/general.html b/src/routes/_pages/settings/general.html
index 71c7ebf2..23a3f1e3 100644
--- a/src/routes/_pages/settings/general.html
+++ b/src/routes/_pages/settings/general.html
@@ -63,8 +63,10 @@
     </div>
   </form>
 
-  <h2>{themeTitle}</h2>
-  <ThemeSettings instanceName={$currentInstance} />
+  {#if $isUserLoggedIn }
+    <h2>{themeTitle}</h2>
+    <ThemeSettings instanceName={$currentInstance} />
+  {/if}
 </SettingsLayout>
 <style>
   .ui-settings {