diff --git a/actions/getIdentityData.ts b/actions/getIdentityData.ts
index 6e8bc4f2..eff3f876 100644
--- a/actions/getIdentityData.ts
+++ b/actions/getIdentityData.ts
@@ -12,6 +12,7 @@ export async function uncachedGetIdentityData() {
   let auth_token =
     cookieStore.get("auth_token")?.value ||
     cookieStore.get("external_auth_token")?.value;
+  console.log("AUTH_TOKEN: " + auth_token);
   let auth_res = auth_token
     ? await supabaseServerClient
         .from("email_auth_tokens")
@@ -47,6 +48,8 @@ export async function uncachedGetIdentityData() {
         .eq("confirmed", true)
         .single()
     : null;
+  console.log("GETTING IDENTITY", auth_res);
+  if (auth_res?.error) console.log(auth_res.error);
   if (!auth_res?.data?.identities) return null;
 
   // Transform embedded entitlements into a keyed record, filtering expired
diff --git a/app/(home-pages)/home/Actions/AccountSettings.tsx b/app/(home-pages)/home/Actions/AccountSettings.tsx
index 44e7be54..6d065766 100644
--- a/app/(home-pages)/home/Actions/AccountSettings.tsx
+++ b/app/(home-pages)/home/Actions/AccountSettings.tsx
@@ -16,7 +16,14 @@ export const AccountSettings = (props: { entityID: string }) => {
       align={isMobile ? "center" : "start"}
       className={`w-xs bg-white!`}
       arrowFill="bg-white"
-      trigger={<ActionButton smallOnMobile icon=<PaintSmall /> label="Theme" />}
+      trigger={
+        <ActionButton
+          secondary
+          smallOnMobile
+          icon=<PaintSmall />
+          label="Theme"
+        />
+      }
     >
       <ThemeSetterContent entityID={props.entityID} home />
     </Popover>
diff --git a/app/globals.css b/app/globals.css
index a60bf02d..c3984c74 100644
--- a/app/globals.css
+++ b/app/globals.css
@@ -486,6 +486,12 @@ pre.shiki {
   @apply rounded-md;
 }
 
+.light-container {
+  background: color-mix(in oklab, rgb(var(--primary)), rgb(var(--bg-page)) 95%);
+  @apply border;
+  @apply border-border-light;
+  @apply rounded-md;
+}
 .frosted-container {
   background: rgba(var(--bg-page), 0.75);
   @apply border;
diff --git a/app/lish/[did]/[publication]/dashboard/Actions.tsx b/app/lish/[did]/[publication]/dashboard/Actions.tsx
index 4a601d4f..f8be5ab0 100644
--- a/app/lish/[did]/[publication]/dashboard/Actions.tsx
+++ b/app/lish/[did]/[publication]/dashboard/Actions.tsx
@@ -38,6 +38,7 @@ function PublicationShareButton() {
       asChild
       trigger={
         <ActionButton
+          secondary
           id="pub-share-button"
           icon=<ShareSmall />
           label="Share"
diff --git a/components/ActionBar/ActionButton.tsx b/components/ActionBar/ActionButton.tsx
index 2450f348..0e621016 100644
--- a/components/ActionBar/ActionButton.tsx
+++ b/components/ActionBar/ActionButton.tsx
@@ -15,7 +15,6 @@ export const ActionButton = forwardRef<
     label: React.ReactNode;
     primary?: boolean;
     secondary?: boolean;
-    nav?: boolean;
     className?: string;
     subtext?: string;
     labelOnMobile?: boolean;
@@ -29,7 +28,6 @@ export const ActionButton = forwardRef<
     label,
     primary,
     secondary,
-    nav,
     labelOnMobile,
     smallOnMobile,
     subtext,
@@ -47,40 +45,44 @@ export const ActionButton = forwardRef<
     }
   }, [sidebar, inOpenPopover]);
 
-  let showLabelOnMobile =
-    labelOnMobile !== false && (primary || secondary || nav);
+  let showLabelOnMobile = labelOnMobile !== false && (primary || secondary);
 
   return (
     <button
       {...buttonProps}
       ref={ref}
       className={`
-      actionButton relative font-bold
+      actionButton relative
       rounded-md border
       flex gap-2 items-start justify-start
-      sm:w-full sm:max-w-full p-1
+      sm:w-full sm:max-w-full py-0.5 px-1
       w-max
+      outline-2 outline-transparent outline-offset-1
       ${smallOnMobile && "sm:text-base text-sm py-0! sm:py-1! sm:h-fit h-6 items-center!"}
       ${
         primary
-          ? "bg-accent-1 border-accent-1 text-accent-2 transparent-outline sm:hover:outline-accent-contrast focus:outline-accent-1 outline-offset-1 "
+          ? "bg-accent-1 border-accent-1 text-accent-2  sm:hover:outline-accent-contrast focus:outline-accent-1  font-bold"
           : secondary
-            ? " bg-bg-page border-accent-contrast text-accent-contrast transparent-outline focus:outline-accent-contrast sm:hover:outline-accent-contrast outline-offset-1"
-            : nav
-              ? "border-transparent text-secondary sm:hover:border-border justify-start! max-w-full"
-              : "border-transparent text-accent-contrast sm:hover:border-accent-contrast"
+            ? "border-accent-contrast  sm:hover:outline-accent-contrast focus:outline-accent-1   text-accent-contrast hover:border-accent-contrast  focus:border-accent-contrast font-bold"
+            : "border-transparent text-secondary sm:hover:border-border justify-start! max-w-full"
       }
       ${className}
       `}
     >
-      <div className="shrink-0 flex flex-row gap-0.5">{icon}</div>
+      <div
+        className={`shrink-0 flex flex-row gap-0.5 ${!primary && !secondary && "text-tertiary"}`}
+      >
+        {icon}
+      </div>
       <div
         className={`flex flex-col ${subtext && "leading-snug"}  sm:max-w-full min-w-0 mr-1  ${sidebar.open ? "block" : showLabelOnMobile ? "sm:hidden block" : "hidden"}`}
         style={{ width: "-webkit-fill-available" }}
       >
         <div className="truncate text-left">{label}</div>
         {subtext && (
-          <div className="text-xs text-tertiary font-normal text-left">
+          <div
+            className={`text-xs  ${secondary ? "text-accent-contrast" : "text-tertiary"} font-normal text-left`}
+          >
             {subtext}
           </div>
         )}
diff --git a/components/ActionBar/DesktopNavigation.tsx b/components/ActionBar/DesktopNavigation.tsx
index 4447e091..dc5813c2 100644
--- a/components/ActionBar/DesktopNavigation.tsx
+++ b/components/ActionBar/DesktopNavigation.tsx
@@ -1,9 +1,8 @@
 import { useIdentityData } from "components/IdentityProvider";
 import {
   navPages,
-  HomeButton,
-  ReaderButton,
   NotificationButton,
+  ReaderButton,
   WriterButton,
 } from "./NavigationButtons";
 import { PublicationButtons } from "./Publications";
@@ -12,68 +11,87 @@ import { LoginModal } from "components/LoginButton";
 import { ProfileButton } from "./ProfileButton";
 import { ActionButton } from "./ActionButton";
 import { AccountSmall } from "components/Icons/AccountSmall";
+import { TabsSmall } from "components/Icons/TabsSmall";
 
 export const DesktopNavigation = (props: {
   currentPage: navPages;
   publication?: string;
+  actions?: React.ReactNode;
+  tabs?: { [name: string]: { icon?: React.ReactNode } };
+  currentTab?: string;
+  onTabClick?: (tab: string) => void;
+  onTabHover?: (tab: string) => void;
 }) => {
   let { identity } = useIdentityData();
   let thisPublication = identity?.publications?.find(
     (pub) => pub.uri === props.publication,
   );
 
-  let currentlyWriter =
+  let isWriterPage =
     props.currentPage === "home" ||
     props.currentPage === "looseleafs" ||
     props.currentPage === "pub";
+
   return (
-    <div className="flex flex-col gap-3">
-      <Sidebar alwaysOpen>
-        {identity ? (
-          <>
-            <ProfileButton />
-            {identity.atp_did && (
-              <NotificationButton
-                current={props.currentPage === "notifications"}
-              />
-            )}
-          </>
-        ) : (
-          <LoginModal
-            asChild
-            trigger={
-              <ActionButton
-                secondary
-                icon={<AccountSmall />}
-                label="Log In/Sign Up"
-              />
-            }
+    <Sidebar alwaysOpen>
+      {props.actions}
+
+      {props.tabs && Object.keys(props.tabs).length > 1 && (
+        <>
+          <hr className="border-border-light border-dashed my-1" />
+          {Object.keys(props.tabs).map((t) => (
+            <ActionButton
+              key={t}
+              icon={props.tabs![t].icon ?? <TabsSmall />}
+              label={t}
+              className={
+                t === props.currentTab ? "bg-bg-page! border-border-light!" : ""
+              }
+              onClick={() => props.onTabClick?.(t)}
+              onMouseEnter={() => props.onTabHover?.(t)}
+              onPointerDown={() => props.onTabHover?.(t)}
+            />
+          ))}
+        </>
+      )}
+
+      {props.currentPage === "home" && (
+        <>
+          <hr className="border-border-light my-1" />
+          <PublicationButtons
+            currentPage={props.currentPage}
+            currentPubUri={thisPublication?.uri}
           />
-        )}
-      </Sidebar>
+        </>
+      )}
 
-      <Sidebar alwaysOpen>
+      <div className="flex-1" />
+      <WriterButton />
+      {isWriterPage && (
         <ReaderButton
-          current={props.currentPage === "reader"}
           subs={
             identity?.publication_subscriptions?.length !== 0 &&
             identity?.publication_subscriptions?.length !== undefined
           }
         />
-        <WriterButton
-          currentPage={props.currentPage}
-          currentPubUri={thisPublication?.uri}
-        />
-        {currentlyWriter && (
-          <>
-            <hr className="border-border-light border-dashed" />
-            <PublicationButtons
-              currentPage={props.currentPage}
-              currentPubUri={thisPublication?.uri}
+      )}
+      {identity?.atp_did && (
+        <NotificationButton current={props.currentPage === "notifications"} />
+      )}
+      {identity ? (
+        <ProfileButton />
+      ) : (
+        <LoginModal
+          asChild
+          trigger={
+            <ActionButton
+              secondary
+              icon={<AccountSmall />}
+              label="Log In/Sign Up"
             />
-          </>
-        )}
-      </Sidebar>
-    </div>
+          }
+        />
+      )}
+    </Sidebar>
   );
 };
diff --git a/components/ActionBar/NavigationButtons.tsx b/components/ActionBar/NavigationButtons.tsx
index 71b83f77..cd48be69 100644
--- a/components/ActionBar/NavigationButtons.tsx
+++ b/components/ActionBar/NavigationButtons.tsx
@@ -27,7 +27,6 @@ export const HomeButton = (props: {
   return (
     <SpeedyLink href={"/home"} className="hover:!no-underline">
       <ActionButton
-        nav
         icon={<HomeSmall />}
         label="Home"
         className={`${props.current ? "bg-bg-page! border-border-light!" : ""} w-full! ${props.className}`}
@@ -37,41 +36,30 @@ export const HomeButton = (props: {
 };
 
 export const WriterButton = (props: {
-  currentPage: navPages;
   currentPubUri?: string;
   compactOnMobile?: boolean;
 }) => {
-  let current =
-    props.currentPage === "home" ||
-    props.currentPage === "looseleafs" ||
-    props.currentPage === "pub";
-
   return (
     <SpeedyLink href={"/home"} className="hover:!no-underline">
       <ActionButton
-        nav
         labelOnMobile={!props.compactOnMobile}
         icon={<WriterSmall />}
         label="Write"
-        className={`${current ? "bg-bg-page! border-border-light!" : ""}`}
       />
     </SpeedyLink>
   );
 };
 
 export const ReaderButton = (props: {
-  current?: boolean;
   subs: boolean;
   compactOnMobile?: boolean;
 }) => {
   return (
     <SpeedyLink href={"/reader"} className="hover:no-underline!">
       <ActionButton
-        nav
         labelOnMobile={!props.compactOnMobile}
         icon={<ReaderUnreadSmall />}
         label="Read"
-        className={props.current ? "bg-bg-page! border-border-light!" : ""}
       />
     </SpeedyLink>
   );
@@ -84,7 +72,6 @@ export function NotificationButton(props: { current?: boolean }) {
   return (
     <SpeedyLink href={"/notifications"} className="hover:no-underline!">
       <ActionButton
-        nav
         labelOnMobile={false}
         icon={
           unreads ? (
diff --git a/components/ActionBar/ProfileButton.tsx b/components/ActionBar/ProfileButton.tsx
index 7c064ef0..8386768e 100644
--- a/components/ActionBar/ProfileButton.tsx
+++ b/components/ActionBar/ProfileButton.tsx
@@ -32,7 +32,6 @@ export const ProfileButton = () => {
       className="w-xs py-1!"
       trigger={
         <ActionButton
-          nav
           labelOnMobile={false}
           icon={
             record ? (
diff --git a/components/ActionBar/Publications.tsx b/components/ActionBar/Publications.tsx
index a23243b1..da74cc89 100644
--- a/components/ActionBar/Publications.tsx
+++ b/components/ActionBar/Publications.tsx
@@ -15,7 +15,7 @@ import { SpeedyLink } from "components/SpeedyLink";
 import { PublishSmall } from "components/Icons/PublishSmall";
 import { Popover } from "components/Popover";
 import { ButtonPrimary, ButtonSecondary } from "components/Buttons";
-import { useIsMobile } from "src/hooks/isMobile";
+import { useIsInitialRender, useIsMobile } from "src/hooks/isMobile";
 import { useState } from "react";
 import { LooseLeafSmall } from "components/Icons/LooseleafSmall";
 import { type navPages } from "./NavigationButtons";
@@ -45,24 +45,12 @@ export const PublicationButtons = (props: {
     >
       {hasLooseleafs && (
         <>
-          <SpeedyLink
-            href={`/looseleafs`}
-            className={`flex gap-2 items-start text-secondary font-bold hover:no-underline! hover:text-accent-contrast w-full `}
-          >
+          <SpeedyLink href={`/looseleafs`} className={` hover:no-underline!  `}>
             {/*TODO How should i get if this is the current page or not?
               theres not "pub" to check the uri for. Do i need to add it as an option to NavPages? thats kinda annoying*/}
-            <ActionButton
-              label="Looseleafs"
-              icon={<LooseLeafSmall />}
-              nav
-              className={`w-full! ${
-                props.currentPage === "looseleafs"
-                  ? "bg-bg-page! border-border!"
-                  : ""
-              }
-                ${props.optionClassName}`}
-            />
+            <ActionButton label="Looseleafs" icon={<LooseLeafSmall />} />
           </SpeedyLink>
+          <hr className="border-border-light border-dashed my-1" />
         </>
       )}
 
@@ -100,12 +88,11 @@ export const PublicationOption = (props: {
   return (
     <SpeedyLink
       href={`${getBasePublicationURL(props)}/dashboard`}
-      className={`flex gap-2 items-start text-secondary font-bold hover:no-underline! hover:text-accent-contrast w-full `}
+      className={`hover:no-underline! `}
     >
       <ActionButton
         label={record.name}
         icon={<PubIcon record={record} uri={props.uri} />}
-        nav
         className={`w-full! ${props.current ? "bg-bg-page! border-border!" : ""} ${props.className}`}
       />
     </SpeedyLink>
@@ -113,15 +100,17 @@ export const PublicationOption = (props: {
 };
 
 const PubListEmpty = () => {
-  let isMobile = useIsMobile();
+  let initialRender = useIsInitialRender();
+  let mobile = useIsMobile();
+  let isMobile = !initialRender && mobile;
 
   let [state, setState] = useState<"default" | "info">("default");
   if (isMobile && state == "default")
     return (
       <ActionButton
         label="Publish"
+        secondary
         icon={<PublishSmall />}
-        nav
         subtext="Start a blog on ATProto!"
         onClick={() => {
           setState("info");
@@ -139,9 +128,9 @@ const PubListEmpty = () => {
         asChild
         trigger={
           <ActionButton
+            secondary
             label="Publish"
             icon={<PublishSmall />}
-            nav
             subtext="Start a blog on ATProto!"
           />
         }
diff --git a/components/ActionBar/Sidebar.tsx b/components/ActionBar/Sidebar.tsx
index 6736ae92..19a95f80 100644
--- a/components/ActionBar/Sidebar.tsx
+++ b/components/ActionBar/Sidebar.tsx
@@ -1,6 +1,7 @@
 "use client";
 import { uv } from "colorjs.io/fn";
 import { Media } from "components/Media";
+import { useCardBorderHidden } from "components/Pages/useCardBorderHidden";
 import { createContext, useState } from "react";
 
 export const SidebarContext = createContext({
@@ -16,6 +17,7 @@ export function Sidebar(props: {
   let [sidebarExpanded, setSidebarExpanded] = useState(false);
   let [childForceOpen, setChildForceOpen] = useState(false);
   let open = sidebarExpanded || childForceOpen;
+  let cardBorderHidden = useCardBorderHidden();
   return (
     <Media mobile={false}>
       <SidebarContext
@@ -25,12 +27,13 @@ export function Sidebar(props: {
         }}
       >
         <div
+          style={{ height: "-webkit-fill-available" }}
           className={`
           actionSidebar
           ${!props.alwaysOpen ? "absolute top-0 left-0 z-10 w-max" : "w-[192px] max-w-[192px]"}
-          h-fit p-[6px]
-          flex flex-col gap-1 justify-start border
-          rounded-md  bg-bg-page ${open && !props.alwaysOpen ? "border-border-light" : "frosted-container"}
+          p-[6px] my-6
+          flex flex-col gap-0.5 justify-start border
+          rounded-md ${cardBorderHidden ? "light-container" : "frosted-container"}
           ${props.className}
           `}
           onMouseOver={() => {
diff --git a/components/IdentityProvider.tsx b/components/IdentityProvider.tsx
index 1e81244c..b71e2313 100644
--- a/components/IdentityProvider.tsx
+++ b/components/IdentityProvider.tsx
@@ -54,6 +54,7 @@ export function IdentityContextProvider(props: {
       channel.unsubscribe();
     };
   }, [identity?.atp_did]);
+  console.log("IDENTITY", identity);
   return (
     <IdentityContext.Provider value={{ identity, mutate }}>
       {props.children}
diff --git a/components/Media.tsx b/components/Media.tsx
index 0f4ada77..efed4d36 100644
--- a/components/Media.tsx
+++ b/components/Media.tsx
@@ -31,7 +31,7 @@ export function MediaContents(props: {
   if (initialRender)
     return (
       <div
-        className={`${props.mobile ? "sm:hidden contents" : "hidden sm:contents"} ${props.className}`}
+        className={`mediaContentContainer ${props.mobile ? "sm:hidden contents" : "hidden sm:contents"} ${props.className}`}
       >
         {props.children}
       </div>
diff --git a/components/PageLayouts/DashboardLayout.tsx b/components/PageLayouts/DashboardLayout.tsx
index a3df6c84..b690f1cd 100644
--- a/components/PageLayouts/DashboardLayout.tsx
+++ b/components/PageLayouts/DashboardLayout.tsx
@@ -3,14 +3,9 @@ import { useState, createContext, useContext, useEffect } from "react";
 import { useSearchParams } from "next/navigation";
 import { Header } from "../PageHeader";
 import { Footer } from "components/ActionBar/Footer";
-import { Sidebar } from "components/ActionBar/Sidebar";
-import { DesktopNavigation } from "components/ActionBar/DesktopNavigation";
-
 import { MobileNavigation } from "components/ActionBar/MobileNavigation";
-import {
-  navPages,
-  NotificationButton,
-} from "components/ActionBar/NavigationButtons";
+import { navPages } from "components/ActionBar/NavigationButtons";
+import { DesktopNavigation } from "components/ActionBar/DesktopNavigation";
 import { create } from "zustand";
 import { Popover } from "components/Popover";
 import { Checkbox } from "components/Checkbox";
@@ -23,11 +18,8 @@ import { Input } from "components/Input";
 import { SearchTiny } from "components/Icons/SearchTiny";
 import { InterfaceState, useIdentityData } from "components/IdentityProvider";
 import { updateIdentityInterfaceState } from "actions/updateIdentityInterfaceState";
-import Link from "next/link";
-import { ExternalLinkTiny } from "components/Icons/ExternalLinkTiny";
 import { usePreserveScroll } from "src/hooks/usePreserveScroll";
 import { Tab } from "components/Tab";
-import { PubIcon, PublicationButtons } from "components/ActionBar/Publications";
 
 export type DashboardState = {
   display?: "grid" | "list";
@@ -149,12 +141,10 @@ export function DashboardLayout<
   const searchParams = useSearchParams();
   const tabParam = searchParams.get("tab");
 
-  // Initialize tab from search param if valid, otherwise use default
   const initialTab =
     tabParam && props.tabs[tabParam] ? tabParam : props.defaultTab;
   let [tab, setTab] = useState<keyof T>(initialTab);
 
-  // Custom setter that updates both state and URL
   const setTabWithUrl = (newTab: keyof T) => {
     setTab(newTab);
     const params = new URLSearchParams(searchParams.toString());
@@ -177,15 +167,15 @@ export function DashboardLayout<
       <div
         className={`dashboard pwa-padding relative max-w-(--breakpoint-lg) w-full h-full mx-auto flex sm:flex-row flex-col sm:items-stretch sm:px-6`}
       >
-        <MediaContents mobile={false}>
-          <div className="flex flex-col gap-3 my-6">
-            <DesktopNavigation
-              currentPage={props.currentPage}
-              publication={props.publication}
-            />
-            {props.actions && <Sidebar alwaysOpen>{props.actions}</Sidebar>}
-          </div>
-        </MediaContents>
+        <DesktopNavigation
+          currentPage={props.currentPage}
+          publication={props.publication}
+          actions={props.actions}
+          tabs={props.tabs}
+          currentTab={tab as string}
+          onTabClick={(t) => setTabWithUrl(t as keyof T)}
+          onTabHover={props.onTabHover}
+        />
         <div
           className={`w-full h-full flex flex-col gap-2 relative overflow-y-scroll pt-3 pb-3 px-3 sm:pt-8 sm:pb-6 sm:pl-8 sm:pr-4 `}
           ref={ref}
@@ -195,59 +185,51 @@ export function DashboardLayout<
             <PageTitle pageTitle={props.pageTitle} actions={props.actions} />
           )}
 
-          {Object.keys(props.tabs).length <= 1 && !controls ? null : (
-            <>
-              <Header>
-                {headerState === "default" ? (
-                  <>
-                    {Object.keys(props.tabs).length > 1 && (
-                      <div className="pubDashTabs flex flex-row gap-1">
-                        {Object.keys(props.tabs).map((t) => {
-                          return (
-                            <Tab
-                              key={t}
-                              name={t}
-                              icon={props.tabs[t].icon}
-                              selected={t === tab}
-                              onSelect={() => setTabWithUrl(t)}
-                              onMouseEnter={() => props.onTabHover?.(t)}
-                              onPointerDown={() => props.onTabHover?.(t)}
-                            />
-                          );
-                        })}
-                      </div>
-                    )}
-                    {props.publication && controls && (
-                      <button
-                        className={`sm:hidden block text-tertiary`}
-                        onClick={() => {
-                          setHeaderState("controls");
-                        }}
-                      >
-                        <SortSmall />
-                      </button>
-                    )}
-                    <div
-                      className={`sm:block ${props.publication && "hidden"} grow`}
-                    >
-                      {controls}
+          {!controls && Object.keys(props.tabs).length <= 1 ? null : (
+            <Header>
+              {headerState === "default" ? (
+                <>
+                  {Object.keys(props.tabs).length > 1 && (
+                    <div className="sm:hidden pubDashTabs flex flex-row gap-1">
+                      {Object.keys(props.tabs).map((t) => (
+                        <Tab
+                          key={t}
+                          name={t}
+                          icon={props.tabs[t].icon}
+                          selected={t === tab}
+                          onSelect={() => setTabWithUrl(t)}
+                          onMouseEnter={() => props.onTabHover?.(t)}
+                          onPointerDown={() => props.onTabHover?.(t)}
+                        />
+                      ))}
                     </div>
-                  </>
-                ) : (
-                  <>
-                    {controls}
+                  )}
+                  {props.publication && controls && (
                     <button
-                      className="text-tertiary"
-                      onClick={() => {
-                        setHeaderState("default");
-                      }}
+                      className={`sm:hidden block text-tertiary`}
+                      onClick={() => setHeaderState("controls")}
                     >
-                      <TabsSmall />
+                      <SortSmall />
                     </button>
-                  </>
-                )}
-              </Header>
-            </>
+                  )}
+                  <div
+                    className={`sm:block ${props.publication && "hidden"} grow`}
+                  >
+                    {controls}
+                  </div>
+                </>
+              ) : (
+                <>
+                  {controls}
+                  <button
+                    className="text-tertiary"
+                    onClick={() => setHeaderState("default")}
+                  >
+                    <TabsSmall />
+                  </button>
+                </>
+              )}
+            </Header>
           )}
           {content}
         </div>
diff --git a/components/ThemeManager/ThemeSetter.tsx b/components/ThemeManager/ThemeSetter.tsx
index 6895d4ef..6be12ece 100644
--- a/components/ThemeManager/ThemeSetter.tsx
+++ b/components/ThemeManager/ThemeSetter.tsx
@@ -80,7 +80,7 @@ export const ThemePopover = (props: { entityID: string; home?: boolean }) => {
         asChild
         side={isMobile ? "top" : "right"}
         align={isMobile ? "center" : "start"}
-        trigger={<ActionButton icon={<PaintSmall />} label="Theme" />}
+        trigger={<ActionButton secondary icon={<PaintSmall />} label="Theme" />}
       >
         <ThemeSetterContent {...props} />
       </Popover>
@@ -260,7 +260,8 @@ const SamplePage = (props: {
     ?.data.value;
 
   // Read font values directly since the popover is portalled outside .leafletWrapper
-  let headingFontId = useEntity(props.entityID, "theme/heading-font")?.data.value;
+  let headingFontId = useEntity(props.entityID, "theme/heading-font")?.data
+    .value;
   let bodyFontId = useEntity(props.entityID, "theme/body-font")?.data.value;
   let bodyFontFamily = getFontFamilyValue(getFontConfig(bodyFontId));
   let headingFontFamily = getFontFamilyValue(getFontConfig(headingFontId));
diff --git a/package-lock.json b/package-lock.json
index 21b5c956..a6578822 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2940,18 +2940,6 @@
         "node": ">=6.0.0"
       }
     },
-    "node_modules/@jridgewell/source-map": {
-      "version": "0.3.11",
-      "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.11.tgz",
-      "integrity": "sha512-ZMp1V8ZFcPG5dIWnQLr3NSI1MiCU7UETdS/A0G8V/XWHvJv3ZsFqutJn1Y5RPmAPX6F3BiE397OqveU/9NCuIA==",
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "@jridgewell/gen-mapping": "^0.3.5",
-        "@jridgewell/trace-mapping": "^0.3.25"
-      }
-    },
     "node_modules/@jridgewell/sourcemap-codec": {
       "version": "1.5.5",
       "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz",
@@ -9656,30 +9644,6 @@
         "@types/ms": "*"
       }
     },
-    "node_modules/@types/eslint": {
-      "version": "9.6.1",
-      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-9.6.1.tgz",
-      "integrity": "sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==",
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "@types/estree": "*",
-        "@types/json-schema": "*"
-      }
-    },
-    "node_modules/@types/eslint-scope": {
-      "version": "3.7.7",
-      "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz",
-      "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==",
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "@types/eslint": "*",
-        "@types/estree": "*"
-      }
-    },
     "node_modules/@types/estree": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz",
@@ -10253,198 +10217,6 @@
         }
       }
     },
-    "node_modules/@webassemblyjs/ast": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.14.1.tgz",
-      "integrity": "sha512-nuBEDgQfm1ccRp/8bCQrx1frohyufl4JlbMMZ4P1wpeOfDhF6FQkxZJ1b/e+PLwr6X1Nhw6OLme5usuBWYBvuQ==",
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "@webassemblyjs/helper-numbers": "1.13.2",
-        "@webassemblyjs/helper-wasm-bytecode": "1.13.2"
-      }
-    },
-    "node_modules/@webassemblyjs/floating-point-hex-parser": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.13.2.tgz",
-      "integrity": "sha512-6oXyTOzbKxGH4steLbLNOu71Oj+C8Lg34n6CqRvqfS2O71BxY6ByfMDRhBytzknj9yGUPVJ1qIKhRlAwO1AovA==",
-      "license": "MIT",
-      "optional": true,
-      "peer": true
-    },
-    "node_modules/@webassemblyjs/helper-api-error": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.13.2.tgz",
-      "integrity": "sha512-U56GMYxy4ZQCbDZd6JuvvNV/WFildOjsaWD3Tzzvmw/mas3cXzRJPMjP83JqEsgSbyrmaGjBfDtV7KDXV9UzFQ==",
-      "license": "MIT",
-      "optional": true,
-      "peer": true
-    },
-    "node_modules/@webassemblyjs/helper-buffer": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.14.1.tgz",
-      "integrity": "sha512-jyH7wtcHiKssDtFPRB+iQdxlDf96m0E39yb0k5uJVhFGleZFoNw1c4aeIcVUPPbXUVJ94wwnMOAqUHyzoEPVMA==",
-      "license": "MIT",
-      "optional": true,
-      "peer": true
-    },
-    "node_modules/@webassemblyjs/helper-numbers": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.13.2.tgz",
-      "integrity": "sha512-FE8aCmS5Q6eQYcV3gI35O4J789wlQA+7JrqTTpJqn5emA4U2hvwJmvFRC0HODS+3Ye6WioDklgd6scJ3+PLnEA==",
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "@webassemblyjs/floating-point-hex-parser": "1.13.2",
-        "@webassemblyjs/helper-api-error": "1.13.2",
-        "@xtuc/long": "4.2.2"
-      }
-    },
-    "node_modules/@webassemblyjs/helper-wasm-bytecode": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.13.2.tgz",
-      "integrity": "sha512-3QbLKy93F0EAIXLh0ogEVR6rOubA9AoZ+WRYhNbFyuB70j3dRdwH9g+qXhLAO0kiYGlg3TxDV+I4rQTr/YNXkA==",
-      "license": "MIT",
-      "optional": true,
-      "peer": true
-    },
-    "node_modules/@webassemblyjs/helper-wasm-section": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.14.1.tgz",
-      "integrity": "sha512-ds5mXEqTJ6oxRoqjhWDU83OgzAYjwsCV8Lo/N+oRsNDmx/ZDpqalmrtgOMkHwxsG0iI//3BwWAErYRHtgn0dZw==",
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "@webassemblyjs/ast": "1.14.1",
-        "@webassemblyjs/helper-buffer": "1.14.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
-        "@webassemblyjs/wasm-gen": "1.14.1"
-      }
-    },
-    "node_modules/@webassemblyjs/ieee754": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.13.2.tgz",
-      "integrity": "sha512-4LtOzh58S/5lX4ITKxnAK2USuNEvpdVV9AlgGQb8rJDHaLeHciwG4zlGr0j/SNWlr7x3vO1lDEsuePvtcDNCkw==",
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "@xtuc/ieee754": "^1.2.0"
-      }
-    },
-    "node_modules/@webassemblyjs/leb128": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.13.2.tgz",
-      "integrity": "sha512-Lde1oNoIdzVzdkNEAWZ1dZ5orIbff80YPdHx20mrHwHrVNNTjNr8E3xz9BdpcGqRQbAEa+fkrCb+fRFTl/6sQw==",
-      "license": "Apache-2.0",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "@xtuc/long": "4.2.2"
-      }
-    },
-    "node_modules/@webassemblyjs/utf8": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.13.2.tgz",
-      "integrity": "sha512-3NQWGjKTASY1xV5m7Hr0iPeXD9+RDobLll3T9d2AO+g3my8xy5peVyjSag4I50mR1bBSN/Ct12lo+R9tJk0NZQ==",
-      "license": "MIT",
-      "optional": true,
-      "peer": true
-    },
-    "node_modules/@webassemblyjs/wasm-edit": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.14.1.tgz",
-      "integrity": "sha512-RNJUIQH/J8iA/1NzlE4N7KtyZNHi3w7at7hDjvRNm5rcUXa00z1vRz3glZoULfJ5mpvYhLybmVcwcjGrC1pRrQ==",
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "@webassemblyjs/ast": "1.14.1",
-        "@webassemblyjs/helper-buffer": "1.14.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
-        "@webassemblyjs/helper-wasm-section": "1.14.1",
-        "@webassemblyjs/wasm-gen": "1.14.1",
-        "@webassemblyjs/wasm-opt": "1.14.1",
-        "@webassemblyjs/wasm-parser": "1.14.1",
-        "@webassemblyjs/wast-printer": "1.14.1"
-      }
-    },
-    "node_modules/@webassemblyjs/wasm-gen": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.14.1.tgz",
-      "integrity": "sha512-AmomSIjP8ZbfGQhumkNvgC33AY7qtMCXnN6bL2u2Js4gVCg8fp735aEiMSBbDR7UQIj90n4wKAFUSEd0QN2Ukg==",
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "@webassemblyjs/ast": "1.14.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
-        "@webassemblyjs/ieee754": "1.13.2",
-        "@webassemblyjs/leb128": "1.13.2",
-        "@webassemblyjs/utf8": "1.13.2"
-      }
-    },
-    "node_modules/@webassemblyjs/wasm-opt": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.14.1.tgz",
-      "integrity": "sha512-PTcKLUNvBqnY2U6E5bdOQcSM+oVP/PmrDY9NzowJjislEjwP/C4an2303MCVS2Mg9d3AJpIGdUFIQQWbPds0Sw==",
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "@webassemblyjs/ast": "1.14.1",
-        "@webassemblyjs/helper-buffer": "1.14.1",
-        "@webassemblyjs/wasm-gen": "1.14.1",
-        "@webassemblyjs/wasm-parser": "1.14.1"
-      }
-    },
-    "node_modules/@webassemblyjs/wasm-parser": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.14.1.tgz",
-      "integrity": "sha512-JLBl+KZ0R5qB7mCnud/yyX08jWFw5MsoalJ1pQ4EdFlgj9VdXKGuENGsiCIjegI1W7p91rUlcB/LB5yRJKNTcQ==",
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "@webassemblyjs/ast": "1.14.1",
-        "@webassemblyjs/helper-api-error": "1.13.2",
-        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
-        "@webassemblyjs/ieee754": "1.13.2",
-        "@webassemblyjs/leb128": "1.13.2",
-        "@webassemblyjs/utf8": "1.13.2"
-      }
-    },
-    "node_modules/@webassemblyjs/wast-printer": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.14.1.tgz",
-      "integrity": "sha512-kPSSXE6De1XOR820C90RIo2ogvZG+c3KiHzqUoO/F34Y2shGzesfqv7o57xrxovZJH/MetF5UjroJ/R/3isoiw==",
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "@webassemblyjs/ast": "1.14.1",
-        "@xtuc/long": "4.2.2"
-      }
-    },
-    "node_modules/@xtuc/ieee754": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
-      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
-      "license": "BSD-3-Clause",
-      "optional": true,
-      "peer": true
-    },
-    "node_modules/@xtuc/long": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
-      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
-      "license": "Apache-2.0",
-      "optional": true,
-      "peer": true
-    },
     "node_modules/@yornaath/batshit": {
       "version": "0.14.0",
       "resolved": "https://registry.npmjs.org/@yornaath/batshit/-/batshit-0.14.0.tgz",
@@ -10506,20 +10278,6 @@
         "acorn": "^8"
       }
     },
-    "node_modules/acorn-import-phases": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/acorn-import-phases/-/acorn-import-phases-1.0.4.tgz",
-      "integrity": "sha512-wKmbr/DDiIXzEOiWrTTUcDm24kQ2vGfZQvM2fwg2vXqR5uW6aapr7ObPtj1th32b9u90/Pf4AItvdTh42fBmVQ==",
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "engines": {
-        "node": ">=10.13.0"
-      },
-      "peerDependencies": {
-        "acorn": "^8.14.0"
-      }
-    },
     "node_modules/acorn-jsx": {
       "version": "5.3.2",
       "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
@@ -10560,39 +10318,6 @@
         "url": "https://github.com/sponsors/epoberezkin"
       }
     },
-    "node_modules/ajv-formats": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
-      "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "ajv": "^8.0.0"
-      },
-      "peerDependencies": {
-        "ajv": "^8.0.0"
-      },
-      "peerDependenciesMeta": {
-        "ajv": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/ajv-keywords": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-      "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.3"
-      },
-      "peerDependencies": {
-        "ajv": "^8.8.2"
-      }
-    },
     "node_modules/ansi-regex": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
@@ -11399,17 +11124,6 @@
         "node": ">=18"
       }
     },
-    "node_modules/chrome-trace-event": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.4.tgz",
-      "integrity": "sha512-rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ==",
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "engines": {
-        "node": ">=6.0"
-      }
-    },
     "node_modules/citty": {
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/citty/-/citty-0.2.2.tgz",
@@ -13045,14 +12759,6 @@
         "node": ">= 0.4"
       }
     },
-    "node_modules/es-module-lexer": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-2.0.0.tgz",
-      "integrity": "sha512-5POEcUuZybH7IdmGsD8wlf0AI55wMecM9rVBTI/qEAy2c1kTOm3DjFYjrBdI2K3BaJjJYfYFeRtM0t9ssnRuxw==",
-      "license": "MIT",
-      "optional": true,
-      "peer": true
-    },
     "node_modules/es-object-atoms": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
@@ -15860,39 +15566,6 @@
         "node": ">= 0.4"
       }
     },
-    "node_modules/jest-worker": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
-      "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "@types/node": "*",
-        "merge-stream": "^2.0.0",
-        "supports-color": "^8.0.0"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      }
-    },
-    "node_modules/jest-worker/node_modules/supports-color": {
-      "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/supports-color?sponsor=1"
-      }
-    },
     "node_modules/jiti": {
       "version": "2.6.0",
       "resolved": "https://registry.npmjs.org/jiti/-/jiti-2.6.0.tgz",
@@ -16390,21 +16063,6 @@
       "integrity": "sha512-pCj3PrQyATaoTYKHrgWRF3SJwsm61udVh+vuls/Rl6SptiDhgE7ziUIudAedRY9QEfynmM7/RmLEfPUyw1HPCw==",
       "license": "MIT"
     },
-    "node_modules/loader-runner": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.1.tgz",
-      "integrity": "sha512-IWqP2SCPhyVFTBtRcgMHdzlf9ul25NwaFx4wCEH/KjAXuuHY4yNjvPXsBokp8jCB936PyWRaPKUNh8NvylLp2Q==",
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "engines": {
-        "node": ">=6.11.5"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
     "node_modules/locate-path": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
@@ -16901,14 +16559,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/merge-stream": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
-      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
-      "license": "MIT",
-      "optional": true,
-      "peer": true
-    },
     "node_modules/merge2": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
@@ -17839,14 +17489,6 @@
         "node": ">= 0.6"
       }
     },
-    "node_modules/neo-async": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
-      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
-      "license": "MIT",
-      "optional": true,
-      "peer": true
-    },
     "node_modules/next": {
       "version": "16.2.3",
       "resolved": "https://registry.npmjs.org/next/-/next-16.2.3.tgz",
@@ -21443,27 +21085,6 @@
       "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.27.0.tgz",
       "integrity": "sha512-eNv+WrVbKu1f3vbYJT/xtiF5syA5HPIMtf9IgY/nKg0sWqzAUEvqY/xm7OcZc/qafLx/iO9FgOmeSAp4v5ti/Q=="
     },
-    "node_modules/schema-utils": {
-      "version": "4.3.3",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.3.tgz",
-      "integrity": "sha512-eflK8wEtyOE6+hsaRVPxvUKYCpRgzLqDTb8krvAsRIwOGlHoSgYLgBXoubGgLd2fT41/OUYdb48v4k4WWHQurA==",
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "@types/json-schema": "^7.0.9",
-        "ajv": "^8.9.0",
-        "ajv-formats": "^2.1.1",
-        "ajv-keywords": "^5.1.0"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
     "node_modules/selderee": {
       "version": "0.11.0",
       "resolved": "https://registry.npmjs.org/selderee/-/selderee-0.11.0.tgz",
@@ -22372,69 +21993,6 @@
       "integrity": "sha512-lDMFv4nKQrSjlkHKAlHVqKrBG4DyFfa9F74cmBZ3Iy3ed8yvWnlWSIdi4IKfSqwmazAohBNwiN64qGx4y5Q3IQ==",
       "license": "ISC"
     },
-    "node_modules/terser": {
-      "version": "5.46.1",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.46.1.tgz",
-      "integrity": "sha512-vzCjQO/rgUuK9sf8VJZvjqiqiHFaZLnOiimmUuOKODxWL8mm/xua7viT7aqX7dgPY60otQjUotzFMmCB4VdmqQ==",
-      "license": "BSD-2-Clause",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "@jridgewell/source-map": "^0.3.3",
-        "acorn": "^8.15.0",
-        "commander": "^2.20.0",
-        "source-map-support": "~0.5.20"
-      },
-      "bin": {
-        "terser": "bin/terser"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/terser-webpack-plugin": {
-      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.4.0.tgz",
-      "integrity": "sha512-Bn5vxm48flOIfkdl5CaD2+1CiUVbonWQ3KQPyP7/EuIl9Gbzq/gQFOzaMFUEgVjB1396tcK0SG8XcNJ/2kDH8g==",
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "@jridgewell/trace-mapping": "^0.3.25",
-        "jest-worker": "^27.4.5",
-        "schema-utils": "^4.3.0",
-        "terser": "^5.31.1"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^5.1.0"
-      },
-      "peerDependenciesMeta": {
-        "@swc/core": {
-          "optional": true
-        },
-        "esbuild": {
-          "optional": true
-        },
-        "uglify-js": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/terser/node_modules/commander": {
-      "version": "2.20.3",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-      "license": "MIT",
-      "optional": true,
-      "peer": true
-    },
     "node_modules/thread-stream": {
       "version": "2.7.0",
       "resolved": "https://registry.npmjs.org/thread-stream/-/thread-stream-2.7.0.tgz",
@@ -23190,21 +22748,6 @@
       "resolved": "https://registry.npmjs.org/w3c-keyname/-/w3c-keyname-2.2.8.tgz",
       "integrity": "sha512-dpojBhNsCNN7T82Tm7k26A6G9ML3NkhDsnw9n/eoxSRlVBB4CEtIQ/KTCLI2Fwf3ataSXRhYFkQi3SlnFwPvPQ=="
     },
-    "node_modules/watchpack": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.5.1.tgz",
-      "integrity": "sha512-Zn5uXdcFNIA1+1Ei5McRd+iRzfhENPCe7LeABkJtNulSxjma+l7ltNx55BWZkRlwRnpOgHqxnjyaDgJnNXnqzg==",
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "glob-to-regexp": "^0.4.1",
-        "graceful-fs": "^4.1.2"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
     "node_modules/web-namespaces": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/web-namespaces/-/web-namespaces-2.0.1.tgz",
@@ -23231,55 +22774,6 @@
         "node": ">=12"
       }
     },
-    "node_modules/webpack": {
-      "version": "5.106.2",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.106.2.tgz",
-      "integrity": "sha512-wGN3qcrBQIFmQ/c0AiOAQBvrZ5lmY8vbbMv4Mxfgzqd/B6+9pXtLo73WuS1dSGXM5QYY3hZnIbvx+K1xxe6FyA==",
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "@types/eslint-scope": "^3.7.7",
-        "@types/estree": "^1.0.8",
-        "@types/json-schema": "^7.0.15",
-        "@webassemblyjs/ast": "^1.14.1",
-        "@webassemblyjs/wasm-edit": "^1.14.1",
-        "@webassemblyjs/wasm-parser": "^1.14.1",
-        "acorn": "^8.16.0",
-        "acorn-import-phases": "^1.0.3",
-        "browserslist": "^4.28.1",
-        "chrome-trace-event": "^1.0.2",
-        "enhanced-resolve": "^5.20.0",
-        "es-module-lexer": "^2.0.0",
-        "eslint-scope": "5.1.1",
-        "events": "^3.2.0",
-        "glob-to-regexp": "^0.4.1",
-        "graceful-fs": "^4.2.11",
-        "loader-runner": "^4.3.1",
-        "mime-db": "^1.54.0",
-        "neo-async": "^2.6.2",
-        "schema-utils": "^4.3.3",
-        "tapable": "^2.3.0",
-        "terser-webpack-plugin": "^5.3.17",
-        "watchpack": "^2.5.1",
-        "webpack-sources": "^3.3.4"
-      },
-      "bin": {
-        "webpack": "bin/webpack.js"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependenciesMeta": {
-        "webpack-cli": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/webpack-bundle-analyzer": {
       "version": "4.10.1",
       "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.10.1.tgz",
@@ -23337,54 +22831,6 @@
         }
       }
     },
-    "node_modules/webpack-sources": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.3.4.tgz",
-      "integrity": "sha512-7tP1PdV4vF+lYPnkMR0jMY5/la2ub5Fc/8VQrrU+lXkiM6C4TjVfGw7iKfyhnTQOsD+6Q/iKw0eFciziRgD58Q==",
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/webpack/node_modules/eslint-scope": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
-      "license": "BSD-2-Clause",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^4.1.1"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/webpack/node_modules/estraverse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
-      "license": "BSD-2-Clause",
-      "optional": true,
-      "peer": true,
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/webpack/node_modules/mime-db": {
-      "version": "1.54.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.54.0.tgz",
-      "integrity": "sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ==",
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
     "node_modules/whatwg-url": {
       "version": "14.1.0",
       "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-14.1.0.tgz",