diff --git a/src/components/navigation/BottomNavigation.tsx b/src/components/navigation/BottomNavigation.tsx
index 90de4515..c29906bf 100644
--- a/src/components/navigation/BottomNavigation.tsx
+++ b/src/components/navigation/BottomNavigation.tsx
@@ -1,4 +1,4 @@
-import { Message, Group } from "@styled-icons/boxicons-solid";
+import { Message, Group, Compass } from "@styled-icons/boxicons-solid";
 import { observer } from "mobx-react-lite";
 import { useHistory, useLocation } from "react-router";
 import styled, { css } from "styled-components";
@@ -56,7 +56,8 @@ export default observer(() => {
 
     const friendsActive = path.startsWith("/friends");
     const settingsActive = path.startsWith("/settings");
-    const homeActive = !(friendsActive || settingsActive);
+    const discoverActive = path.startsWith("/discover");
+    const homeActive = !(friendsActive || settingsActive || discoverActive);
 
     return (
         <Base>
@@ -102,6 +103,15 @@ export default observer(() => {
                         </IconButton>
                     </ConditionalLink>
                 </Button>*/}
+                <Button active={discoverActive}>
+                    <ConditionalLink
+                        active={discoverActive}
+                        to="/discover/servers">
+                        <IconButton>
+                            <Compass size={24} />
+                        </IconButton>
+                    </ConditionalLink>
+                </Button>
                 <Button active={settingsActive}>
                     <ConditionalLink active={settingsActive} to="/settings">
                         <IconButton>
diff --git a/src/components/settings/AppearanceShims.tsx b/src/components/settings/AppearanceShims.tsx
index 41f2d876..550c7c8a 100644
--- a/src/components/settings/AppearanceShims.tsx
+++ b/src/components/settings/AppearanceShims.tsx
@@ -50,10 +50,8 @@ export const ThemeBaseSelectorShim = observer(() => {
  * TODO: stabilise
  */
 export const ThemeShopShim = () => {
-    if (!useApplicationState().experiments.isEnabled("theme_shop")) return null;
-
     return (
-        <Link to="/settings/theme_shop" replace>
+        <Link to="/discover/themes" replace>
             <CategoryButton
                 icon={<Store size={24} />}
                 action="chevron"
diff --git a/src/pages/RevoltApp.tsx b/src/pages/RevoltApp.tsx
index 5282a44f..65ebf012 100644
--- a/src/pages/RevoltApp.tsx
+++ b/src/pages/RevoltApp.tsx
@@ -80,10 +80,12 @@ const Routes = styled.div.attrs({ "data-component": "routes" })<{
 export default function App() {
     const path = useLocation().pathname;
     const fixedBottomNav =
-        path === "/" || path === "/settings" || path.startsWith("/friends");
+        path === "/" ||
+        path === "/settings" ||
+        path.startsWith("/friends") ||
+        path.startsWith("/discover");
     const inChannel = path.includes("/channel");
     const inServer = path.includes("/server");
-    const inDiscover = path.startsWith("/discover");
     const inSpecial =
         (path.startsWith("/friends") && isTouchscreenDevice) ||
         path.startsWith("/invite") ||
@@ -118,11 +120,7 @@ export default function App() {
                     }
                     bottomNav={{
                         component: <BottomNavigation />,
-                        showIf: inDiscover
-                            ? 0
-                            : fixedBottomNav
-                            ? ShowIf.Always
-                            : ShowIf.Left,
+                        showIf: fixedBottomNav ? ShowIf.Always : ShowIf.Left,
                         height: 50,
                     }}
                     docked={isTouchscreenDevice ? Docked.None : Docked.Left}>
diff --git a/src/pages/discover/Discover.tsx b/src/pages/discover/Discover.tsx
index 4c9e6d95..192e21d3 100644
--- a/src/pages/discover/Discover.tsx
+++ b/src/pages/discover/Discover.tsx
@@ -1,18 +1,18 @@
-import { LeftArrowAlt } from "@styled-icons/boxicons-regular";
 import { Compass } from "@styled-icons/boxicons-solid";
-import { useHistory } from "react-router-dom";
+import { reaction } from "mobx";
+import { useHistory, useLocation } from "react-router-dom";
 import styled, { css } from "styled-components";
 
-import { useEffect, useState } from "preact/hooks";
+import { useEffect, useMemo, useRef, useState } from "preact/hooks";
 
 import { isTouchscreenDevice } from "../../lib/isTouchscreenDevice";
 
 import { useApplicationState } from "../../mobx/State";
 
+import { Overrides } from "../../context/Theme";
 import { useIntermediate } from "../../context/intermediate/Intermediate";
 
 import Header from "../../components/ui/Header";
-import IconButton from "../../components/ui/IconButton";
 import Preloader from "../../components/ui/Preloader";
 
 const Container = styled.div`
@@ -28,6 +28,7 @@ const Container = styled.div`
                   width: 100%;
                   height: 100%;
                   position: fixed;
+                  padding-bottom: 50px;
                   background: var(--background);
               `
             : css`
@@ -54,43 +55,94 @@ const Loader = styled.div`
     flex-grow: 1;
 `;
 
+const TRUSTED_HOSTS = [
+    "local.revolt.chat:3000",
+    "local.revolt.chat:3001",
+    "rvlt.gg",
+];
+
 export default function Discover() {
-    const layout = useApplicationState().layout;
+    const state = useApplicationState();
     const { openLink } = useIntermediate();
+
     const history = useHistory();
+    const { pathname, search } = useLocation();
+
+    const srcURL = useMemo(() => {
+        const query = new URLSearchParams(search);
+        query.set("embedded", "true");
+        // const REMOTE = 'https://rvlt.gg';
+        const REMOTE = "http://local.revolt.chat:3001";
+        return `${REMOTE}${pathname}?${query.toString()}`;
+    }, []);
 
     const [loaded, setLoaded] = useState(false);
+    const ref = useRef<HTMLIFrameElement>(null!);
 
-    useEffect(() => layout.setLastSection("discover"), []);
+    function sendTheme(theme?: Overrides) {
+        ref.current?.contentWindow?.postMessage(
+            JSON.stringify({
+                source: "revolt",
+                type: "theme",
+                theme: theme ?? state.settings.theme.computeVariables(),
+            }),
+            "*",
+        );
+    }
+
+    useEffect(
+        () =>
+            reaction(() => state.settings.theme.computeVariables(), sendTheme),
+        [],
+    );
+
+    useEffect(() => state.layout.setLastSection("discover"), []);
 
     useEffect(() => {
         function onMessage(message: MessageEvent) {
-            let data = JSON.parse(message.data);
-            if (data.source === "discover") {
-                switch (data.type) {
-                    case "navigate": {
-                        openLink(data.url);
-                        break;
+            let url = new URL(message.origin);
+            if (!TRUSTED_HOSTS.includes(url.host)) return;
+
+            try {
+                let data = JSON.parse(message.data);
+                if (data.source === "discover") {
+                    switch (data.type) {
+                        case "init": {
+                            sendTheme();
+                            break;
+                        }
+                        case "path": {
+                            history.replace(data.path);
+                            break;
+                        }
+                        case "navigate": {
+                            openLink(data.url);
+                            break;
+                        }
+                        case "applyTheme": {
+                            state.settings.theme.hydrate({
+                                ...data.theme.variables,
+                                css: data.theme.css,
+                            });
+                            break;
+                        }
                     }
                 }
+            } catch (err) {
+                if (import.meta.env.DEV) {
+                    console.error(err);
+                }
             }
         }
 
         window.addEventListener("message", onMessage);
         return () => window.removeEventListener("message", onMessage);
-    });
+    }, [ref]);
 
     return (
         <Container>
             {isTouchscreenDevice && (
                 <Header placement="primary">
-                    <IconButton
-                        onClick={() => history.push(layout.getLastPath())}>
-                        <LeftArrowAlt
-                            size={27}
-                            style={{ marginInlineEnd: "8px" }}
-                        />
-                    </IconButton>
                     <Compass size={27} />
                     Discover
                 </Header>
@@ -101,10 +153,11 @@ export default function Discover() {
                 </Loader>
             )}
             <Frame
+                ref={ref}
                 loaded={loaded}
                 crossOrigin="anonymous"
                 onLoad={() => setLoaded(true)}
-                src="https://rvlt.gg/discover/servers?embedded=true"
+                src={srcURL}
             />
         </Container>
     );
diff --git a/src/pages/settings/Settings.tsx b/src/pages/settings/Settings.tsx
index 977870c4..6bafdea5 100644
--- a/src/pages/settings/Settings.tsx
+++ b/src/pages/settings/Settings.tsx
@@ -56,7 +56,6 @@ import { Notifications } from "./panes/Notifications";
 import { Profile } from "./panes/Profile";
 import { Sessions } from "./panes/Sessions";
 import { Sync } from "./panes/Sync";
-import { ThemeShop } from "./panes/ThemeShop";
 
 const AccountHeader = styled.div`
     display: flex;
@@ -243,11 +242,6 @@ export default observer(() => {
                     <Route path="/settings/bots">
                         <MyBots />
                     </Route>
-                    {experiments.isEnabled("theme_shop") && (
-                        <Route path="/settings/theme_shop">
-                            <ThemeShop />
-                        </Route>
-                    )}
                     <Route path="/settings/feedback">
                         <Feedback />
                     </Route>
diff --git a/src/pages/settings/panes/ThemeShop.tsx b/src/pages/settings/panes/ThemeShop.tsx
index 22627519..a467b616 100644
--- a/src/pages/settings/panes/ThemeShop.tsx
+++ b/src/pages/settings/panes/ThemeShop.tsx
@@ -1,3 +1,9 @@
+/**
+ * ! DEPRECATED FILE
+ * ! DO NOT IMPORT
+ *
+ * Replaced by Revolt Discover
+ */
 import { Check } from "@styled-icons/boxicons-regular";
 import {
     Star,