diff --git a/UI/Base/LoginToggle.svelte b/UI/Base/LoginToggle.svelte
index e3c2a4ad0..6f848e9cf 100644
--- a/UI/Base/LoginToggle.svelte
+++ b/UI/Base/LoginToggle.svelte
@@ -5,14 +5,16 @@
   import { Translation } from "../i18n/Translation";
   import Translations from "../i18n/Translations";
   import Tr from "./Tr.svelte";
+  import {OsmConnection} from "../../Logic/Osm/OsmConnection";
+  import {ImmutableStore, UIEventSource} from "../../Logic/UIEventSource";
 
-  export let state: SpecialVisualizationState;
+  export let state: {osmConnection: OsmConnection, featureSwitches?: { featureSwitchUserbadge?: UIEventSource<boolean>}};
   /**
    * If set, 'loading' will act as if we are already logged in.
    */
   export let ignoreLoading: boolean = false
   let loadingStatus = state.osmConnection.loadingStatus;
-  let badge = state.featureSwitches.featureSwitchUserbadge;
+  let badge = state.featureSwitches?.featureSwitchUserbadge ?? new ImmutableStore(true);
   const t = Translations.t.general;
   const offlineModes: Partial<Record<OsmServiceState, Translation>> = {
     offline: t.loginFailedOfflineMode,
diff --git a/UI/BigComponents/CustomGeneratorButton.svelte b/UI/BigComponents/CustomGeneratorButton.svelte
deleted file mode 100644
index a1d3fb86d..000000000
--- a/UI/BigComponents/CustomGeneratorButton.svelte
+++ /dev/null
@@ -1,32 +0,0 @@
-<script lang="ts">
-    import UserDetails from "../../Logic/Osm/OsmConnection"
-    import {UIEventSource} from "../../Logic/UIEventSource"
-    import Constants from "../../Models/Constants"
-    import Svg from "../../Svg"
-    import ToSvelte from "../Base/ToSvelte.svelte"
-    import Translations from "../i18n/Translations"
-    import SubtleLink from "../Base/SubtleLink.svelte";
-    import Tr from "../Base/Tr.svelte";
-
-    export let userDetails: UIEventSource<UserDetails>
-    const t = Translations.t.general.morescreen
-
-</script>
-
-<div>
-    {#if $userDetails.csCount < Constants.userJourney.themeGeneratorReadOnlyUnlock}
-        <SubtleLink
-                url="https://github.com/pietervdvn/MapComplete/issues"
-                newTab={true}
-        >
-            <Tr t={t.requestATheme}/>
-        </SubtleLink>
-    {:else}
-        <SubtleLink href="https://pietervdvn.github.io/mc/legacy/070/customGenerator.html">
-          <span slot="image">
-            <ToSvelte construct={Svg.pencil_svg().SetClass("h-11 w-11 mx-4 bg-red")}/>
-          </span>
-            <Tr t={t.createYourOwnTheme}/>
-        </SubtleLink>
-    {/if}
-</div>
diff --git a/UI/BigComponents/HiddenThemeList.svelte b/UI/BigComponents/HiddenThemeList.svelte
index abf54f391..83e638a95 100644
--- a/UI/BigComponents/HiddenThemeList.svelte
+++ b/UI/BigComponents/HiddenThemeList.svelte
@@ -1,48 +1,54 @@
 <script lang="ts">
-  import { OsmConnection } from "../../Logic/Osm/OsmConnection"
-  import { UIEventSource } from "../../Logic/UIEventSource"
-  import type Loc from "../../Models/Loc"
-  import * as themeOverview from "../../assets/generated/theme_overview.json"
-  import { Utils } from "../../Utils"
-  import ThemesList from "./ThemesList.svelte"
-  import Translations from "../i18n/Translations"
-  import { LayoutInformation } from "../../Models/ThemeConfig/LayoutConfig"
+    import {OsmConnection} from "../../Logic/Osm/OsmConnection"
+    import {UIEventSource} from "../../Logic/UIEventSource"
+    import type Loc from "../../Models/Loc"
+    import * as themeOverview from "../../assets/generated/theme_overview.json"
+    import {Utils} from "../../Utils"
+    import ThemesList from "./ThemesList.svelte"
+    import Translations from "../i18n/Translations"
+    import {LayoutInformation} from "../../Models/ThemeConfig/LayoutConfig"
+    import LoginToggle from "../Base/LoginToggle.svelte";
 
-  export let search: UIEventSource<string>
-  export let state: { osmConnection: OsmConnection; locationControl?: UIEventSource<Loc> }
-  export let onMainScreen: boolean = true
+    export let search: UIEventSource<string>
+    export let state: { osmConnection: OsmConnection; locationControl?: UIEventSource<Loc> }
+    export let onMainScreen: boolean = true
 
-  const prefix = "mapcomplete-hidden-theme-"
-  const hiddenThemes: LayoutInformation[] = (themeOverview["default"] ?? themeOverview)?.filter(
-    (layout) => layout.hideFromOverview
-  ) ?? []
-  const userPreferences = state.osmConnection.preferencesHandler.preferences
-  const t = Translations.t.general.morescreen
+    const prefix = "mapcomplete-hidden-theme-"
+    const hiddenThemes: LayoutInformation[] = (themeOverview["default"] ?? themeOverview)?.filter(
+        (layout) => layout.hideFromOverview
+    ) ?? []
+    const userPreferences = state.osmConnection.preferencesHandler.preferences
+    const t = Translations.t.general.morescreen
 
-  $: knownThemesId = Utils.NoNull(
-    Object.keys($userPreferences)
-      .filter((key) => key.startsWith(prefix))
-      .map((key) => key.substring(prefix.length, key.length - "-enabled".length))
-  )
-  $: knownThemes = hiddenThemes.filter((theme) => knownThemesId.includes(theme.id))
+    let knownThemesId: string[]
+    $: knownThemesId = Utils.NoNull(
+        Object.keys($userPreferences)
+            .filter((key) => key.startsWith(prefix))
+            .map((key) => key.substring(prefix.length, key.length - "-enabled".length))
+    )
+    $: console.log("Known theme ids:", knownThemesId)
+    $: knownThemes = hiddenThemes.filter((theme) => knownThemesId.includes(theme.id))
 </script>
 
-<ThemesList
-  {search}
-  {state}
-  {onMainScreen}
-  themes={knownThemes}
-  isCustom={false}
-  hideThemes={false}
->
-  <svelte:fragment slot="title">
-    <h3>{t.previouslyHiddenTitle.toString()}</h3>
-    <p>
-      {t.hiddenExplanation.Subs({
-        hidden_discovered: knownThemes.length.toString(),
-        total_hidden: hiddenThemes.length.toString(),
-      })}
-    </p>
-  </svelte:fragment>
-</ThemesList>
+<LoginToggle {state}>
 
+    <ThemesList
+            hideThemes={false}
+            isCustom={false}
+            {onMainScreen}
+            {search}
+            {state}
+            themes={knownThemes}
+    >
+        <svelte:fragment slot="title">
+            <h3>{t.previouslyHiddenTitle.toString()}</h3>
+            <p>
+                {t.hiddenExplanation.Subs({
+                    hidden_discovered: knownThemes.length.toString(),
+                    total_hidden: hiddenThemes.length.toString(),
+                })}
+            </p>
+        </svelte:fragment>
+    </ThemesList>
+
+</LoginToggle>
diff --git a/UI/BigComponents/ProfessionalServicesButton.svelte b/UI/BigComponents/ProfessionalServicesButton.svelte
deleted file mode 100644
index e88f97057..000000000
--- a/UI/BigComponents/ProfessionalServicesButton.svelte
+++ /dev/null
@@ -1,25 +0,0 @@
-<script lang="ts">
-  import Title from "../Base/Title"
-  import ToSvelte from "../Base/ToSvelte.svelte"
-  import Translations from "../i18n/Translations"
-  import SubtleLink from "../Base/SubtleLink.svelte";
-  import Tr from "../Base/Tr.svelte";
-
-  const t = Translations.t.professional.indexPage
-</script>
-
-<div>
-  <ToSvelte construct={new Title(t.hook, 4)} />
-  <span>
-    {t.hookMore.toString()}
-  </span>
-  <div class="w-full">
-    
-  <SubtleLink href="./professional.html">
-    <div class="w-full">
-      <Tr slot="message" t={t.button} />
-    </div>
-  </SubtleLink>
-  </div>
-</div>
-
diff --git a/UI/BigComponents/ThemesList.svelte b/UI/BigComponents/ThemesList.svelte
index 8bdb71189..0f63d6238 100644
--- a/UI/BigComponents/ThemesList.svelte
+++ b/UI/BigComponents/ThemesList.svelte
@@ -4,8 +4,6 @@
   import {OsmConnection} from "../../Logic/Osm/OsmConnection"
   import {UIEventSource} from "../../Logic/UIEventSource"
   import type Loc from "../../Models/Loc"
-  import CustomGeneratorButton from "./CustomGeneratorButton.svelte"
-  import ProfessionalServicesButton from "./ProfessionalServicesButton.svelte"
   import ThemeButton from "./ThemeButton.svelte"
   import {LayoutInformation} from "../../Models/ThemeConfig/LayoutConfig"
   import MoreScreen from "./MoreScreen"
@@ -25,11 +23,6 @@
   <slot name="title" />
   {#if onMainScreen}
     <div class="md:grid md:grid-flow-row md:grid-cols-2 lg:grid-cols-3 gap-4">
-      {#if ($search === undefined || $search === "") && !isCustom && hideThemes}
-        <CustomGeneratorButton userDetails={state.osmConnection.userDetails} />
-        <ProfessionalServicesButton />
-      {/if}
-
       {#each filteredThemes as theme (theme.id)}
         {#if theme !== undefined && !(hideThemes && theme?.hideFromOverview)}
           <ThemeButton {theme} {isCustom} userDetails={state.osmConnection.userDetails} {state} />
@@ -38,10 +31,6 @@
     </div>
   {:else}
     <div>
-      {#if ($search === undefined || $search === "") && !isCustom && hideThemes}
-        <CustomGeneratorButton userDetails={state.osmConnection.userDetails} />
-        <ProfessionalServicesButton />
-      {/if}
 
       {#each filteredThemes as theme (theme.id)}
         {#if theme !== undefined && !(hideThemes && theme?.hideFromOverview)}