diff --git a/UI/BigComponents/ThemeButton.svelte b/UI/BigComponents/ThemeButton.svelte
index c03d1e55cd..ace9b6d009 100644
--- a/UI/BigComponents/ThemeButton.svelte
+++ b/UI/BigComponents/ThemeButton.svelte
@@ -1,80 +1,83 @@
 <script lang="ts">
-    import {Translation} from "../i18n/Translation"
-    import * as personal from "../../assets/themes/personal/personal.json"
-    import {ImmutableStore, Store, UIEventSource} from "../../Logic/UIEventSource"
-    import UserDetails, {OsmConnection} from "../../Logic/Osm/OsmConnection"
-    import Constants from "../../Models/Constants"
-    import type {LayoutInformation} from "../../Models/ThemeConfig/LayoutConfig"
-    import Tr from "../Base/Tr.svelte"
-    import SubtleLink from "../Base/SubtleLink.svelte";
+  import { Translation } from "../i18n/Translation"
+  import * as personal from "../../assets/themes/personal/personal.json"
+  import { ImmutableStore, Store, UIEventSource } from "../../Logic/UIEventSource"
+  import UserDetails, { OsmConnection } from "../../Logic/Osm/OsmConnection"
+  import Constants from "../../Models/Constants"
+  import type { LayoutInformation } from "../../Models/ThemeConfig/LayoutConfig"
+  import Tr from "../Base/Tr.svelte"
+  import SubtleLink from "../Base/SubtleLink.svelte"
 
-    export let theme: LayoutInformation
-    export let isCustom: boolean = false
-    export let userDetails: UIEventSource<UserDetails>
-    export let state: { layoutToUse: {id: string}, osmConnection: OsmConnection }
+  export let theme: LayoutInformation
+  export let isCustom: boolean = false
+  export let userDetails: UIEventSource<UserDetails>
+  export let state: { layoutToUse: { id: string }; osmConnection: OsmConnection }
 
-    $: title = new Translation(
-        theme.title,
-        !isCustom && !theme.mustHaveLanguage ? "themes:" + theme.id + ".title" : undefined
-    )
-    $: description = new Translation(theme.shortDescription)
+  $: title = new Translation(
+    theme.title,
+    !isCustom && !theme.mustHaveLanguage ? "themes:" + theme.id + ".title" : undefined
+  )
+  $: description = new Translation(theme.shortDescription)
 
-    // TODO: Improve this function
-    function createUrl(
-        layout: { id: string; definition?: string },
-        isCustom: boolean,
-        state?: { layoutToUse?: { id } }
-    ): Store<string> {
-        if (layout === undefined) {
-            return undefined
-        }
-        if (layout.id === undefined) {
-            console.error("ID is undefined for layout", layout)
-            return undefined
-        }
-
-        if (layout.id === state?.layoutToUse?.id) {
-            return undefined
-        }
-
-
-        let path = window.location.pathname
-        // Path starts with a '/' and contains everything, e.g. '/dir/dir/page.html'
-        path = path.substr(0, path.lastIndexOf("/"))
-        // Path will now contain '/dir/dir', or empty string in case of nothing
-        if (path === "") {
-            path = "."
-        }
-
-        let linkPrefix = `${path}/${layout.id.toLowerCase()}.html?`
-        if (location.hostname === "localhost" || location.hostname === "127.0.0.1" || location.port === "1234") {
-            // Redirect to 'theme.html?layout=* instead of 'layout.html'. This is probably a debug run, where the routing does not work
-            linkPrefix = `${path}/theme.html?layout=${layout.id}&`
-        }
-
-        if (isCustom) {
-            linkPrefix = `${path}/theme.html?userlayout=${layout.id}&`
-        }
-
-        let hash = ""
-        if (layout.definition !== undefined) {
-            hash = "#" + btoa(JSON.stringify(layout.definition))
-        }
-
-        return new ImmutableStore<string>(`${linkPrefix}${hash}`)
+  // TODO: Improve this function
+  function createUrl(
+    layout: { id: string; definition?: string },
+    isCustom: boolean,
+    state?: { layoutToUse?: { id } }
+  ): Store<string> {
+    if (layout === undefined) {
+      return undefined
+    }
+    if (layout.id === undefined) {
+      console.error("ID is undefined for layout", layout)
+      return undefined
     }
 
-    let href = createUrl(theme, isCustom, state)
+    if (layout.id === state?.layoutToUse?.id) {
+      return undefined
+    }
+
+    let path = window.location.pathname
+    // Path starts with a '/' and contains everything, e.g. '/dir/dir/page.html'
+    path = path.substr(0, path.lastIndexOf("/"))
+    // Path will now contain '/dir/dir', or empty string in case of nothing
+    if (path === "") {
+      path = "."
+    }
+
+    let linkPrefix = `${path}/${layout.id.toLowerCase()}.html?`
+    if (
+      location.hostname === "localhost" ||
+      location.hostname === "127.0.0.1" ||
+      location.port === "1234"
+    ) {
+      // Redirect to 'theme.html?layout=* instead of 'layout.html'. This is probably a debug run, where the routing does not work
+      linkPrefix = `${path}/theme.html?layout=${layout.id}&`
+    }
+
+    if (isCustom) {
+      linkPrefix = `${path}/theme.html?userlayout=${layout.id}&`
+    }
+
+    let hash = ""
+    if (layout.definition !== undefined) {
+      hash = "#" + btoa(JSON.stringify(layout.definition))
+    }
+
+    return new ImmutableStore<string>(`${linkPrefix}${hash}`)
+  }
+
+  let href = createUrl(theme, isCustom, state)
 </script>
 
 {#if theme.id !== personal.id || $userDetails.csCount > Constants.userJourney.personalLayoutUnlock}
-    <SubtleLink href={$href} options={{extraClasses: "w-full"}}>
-        <img slot="image" src={theme.icon} class="block h-11 w-11 bg-red mx-4" alt=""/>
-        <span class="flex flex-col text-ellipsis overflow-hidden">
-          <Tr t={title}/>
-          <span class="subtle max-h-12 truncate text-ellipsis">
-            <Tr t={description}/>
-          </span>
+  <SubtleLink href={$href} options={{ extraClasses: "w-full" }}>
+    <img slot="image" src={theme.icon} class="block h-11 w-11 mx-4" alt="" />
+    <span class="flex flex-col text-ellipsis overflow-hidden">
+      <Tr t={title} />
+      <span class="subtle max-h-12 truncate text-ellipsis">
+        <Tr t={description} />
       </span>
-    </SubtleLink>
+    </span>
+  </SubtleLink>
 {/if}
diff --git a/UI/Input/Checkboxes.ts b/UI/Input/Checkboxes.ts
index d974c033aa..b183095c50 100644
--- a/UI/Input/Checkboxes.ts
+++ b/UI/Input/Checkboxes.ts
@@ -66,7 +66,7 @@ export default class CheckBoxes extends InputElement<number[]> {
             label.htmlFor = input.id
             label.appendChild(input)
             label.appendChild(inputI.ConstructElement())
-            label.classList.add("block", "w-full", "p-2", "cursor-pointer", "bg-red")
+            label.classList.add("block", "w-full", "p-2", "cursor-pointer")
 
             formTag.appendChild(label)
 
diff --git a/UI/Input/RadioButton.ts b/UI/Input/RadioButton.ts
index 15e1a425a6..1386895cb3 100644
--- a/UI/Input/RadioButton.ts
+++ b/UI/Input/RadioButton.ts
@@ -118,7 +118,7 @@ export class RadioButton<T> extends InputElement<T> {
             const label = document.createElement("label")
             label.appendChild(labelHtml)
             label.htmlFor = input.id
-            label.classList.add("flex", "w-full", "cursor-pointer", "bg-red")
+            label.classList.add("flex", "w-full", "cursor-pointer")
 
             if (!this._dontStyle) {
                 labelHtml.classList.add("p-2")