src/components/common/user/UserHover.tsx

+import { User } from "revolt.js/dist/maps/Users";
+import styled from "styled-components";
+
+import { Children } from "../../../types/Preact";
+import Tooltip from "../Tooltip";
+import { Username } from "./UserShort";
+import UserStatus from "./UserStatus";
+
+interface Props {
+    user?: User;
+    children: Children;
+}
+
+const Base = styled.div`
+    display: flex;
+    flex-direction: column;
+
+    .username {
+        font-size: 13px;
+        font-weight: 600;
+    }
+
+    .status {
+        font-size: 11px;
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+    }
+
+    .tip {
+        display: flex;
+        align-items: center;
+        gap: 4px;
+        margin-top: 2px;
+        color: var(--secondary-foreground);
+    }
+`;
+
+export default function UserHover({ user, children }: Props) {
+    return (
+        <Tooltip
+            placement="right-end"
+            content={
+                <Base>
+                    <Username className="username" user={user} />
+                    <span className="status">
+                        <UserStatus user={user} />
+                    </span>
+                    {/*<div className="tip"><InfoCircle size={13}/>Right-click on the avatar to access the quick menu</div>*/}
+                </Base>
+            }>
+            {children}
+        </Tooltip>
+    );
+}

src/components/common/user/UserIcon.tsx

-import { User } from "revolt.js";
-import { useContext } from "preact/hooks";
 import { MicrophoneOff } from "@styled-icons/boxicons-regular";
+import { observer } from "mobx-react-lite";
+import { Presence } from "revolt-api/types/Users";
+import { User } from "revolt.js/dist/maps/Users";
 import styled, { css } from "styled-components";
-import { Users } from "revolt.js/dist/api/objects";
+
+import { useContext } from "preact/hooks";
+
 import { ThemeContext } from "../../../context/Theme";
-import IconBase, { IconBaseProps } from "../IconBase";
 import { AppContext } from "../../../context/revoltjs/RevoltClient";
 
+import IconBase, { IconBaseProps } from "../IconBase";
+import fallback from "../assets/user.png";
+
 type VoiceStatus = "muted";
 interface Props extends IconBaseProps<User> {
     mask?: string;
@@ -17,17 +22,13 @@ interface Props extends IconBaseProps<User> {
 export function useStatusColour(user?: User) {
     const theme = useContext(ThemeContext);
 
-    return (
-        user?.online &&
-            user?.status?.presence !== Users.Presence.Invisible
-                ? user?.status?.presence === Users.Presence.Idle
-                    ? theme["status-away"]
-                    : user?.status?.presence ===
-                        Users.Presence.Busy
-                    ? theme["status-busy"]
-                    : theme["status-online"]
-                : theme["status-invisible"]
-    );
+    return user?.online && user?.status?.presence !== Presence.Invisible
+        ? user?.status?.presence === Presence.Idle
+            ? theme["status-away"]
+            : user?.status?.presence === Presence.Busy
+            ? theme["status-busy"]
+            : theme["status-online"]
+        : theme["status-invisible"];
 }
 
 const VoiceIndicator = styled.div<{ status: VoiceStatus }>`
@@ -43,51 +44,75 @@ const VoiceIndicator = styled.div<{ status: VoiceStatus }>`
         stroke: white;
     }
 
-    ${ props => props.status === 'muted' && css`
-        background: var(--error);
-    ` }
+    ${(props) =>
+        props.status === "muted" &&
+        css`
+            background: var(--error);
+        `}
 `;
 
-import fallback from '../assets/user.png';
+export default observer(
+    (
+        props: Props &
+            Omit<
+                JSX.SVGAttributes<SVGSVGElement>,
+                keyof Props | "children" | "as"
+            >,
+    ) => {
+        const client = useContext(AppContext);
 
-export default function UserIcon(props: Props & Omit<JSX.SVGAttributes<SVGSVGElement>, keyof Props>) {
-    const client = useContext(AppContext);
+        const {
+            target,
+            attachment,
+            size,
+            status,
+            animate,
+            mask,
+            hover,
+            ...svgProps
+        } = props;
+        const iconURL =
+            client.generateFileURL(
+                target?.avatar ?? attachment,
+                { max_side: 256 },
+                animate,
+            ) ?? (target ? target.defaultAvatarURL : fallback);
 
-    const { target, attachment, size, voice, status, animate, mask, children, as, ...svgProps } = props;
-    const iconURL = client.generateFileURL(target?.avatar ?? attachment, { max_side: 256 }, animate)
-        ?? (target ? client.users.getDefaultAvatarURL(target._id) : fallback);
-
-    return (
-        <IconBase {...svgProps}
-            width={size}
-            height={size}
-            aria-hidden="true"
-            viewBox="0 0 32 32">
-            <foreignObject x="0" y="0" width="32" height="32" mask={mask ?? (status ? "url(#user)" : undefined)}>
-                {
-                    <img src={iconURL}
-                        draggable={false} />
-                }
-            </foreignObject>
-            {props.status && (
-                <circle
-                    cx="27"
-                    cy="27"
-                    r="5"
-                    fill={useStatusColour(target)}
-                />
-            )}
-            {props.voice && (
+        return (
+            <IconBase
+                {...svgProps}
+                width={size}
+                height={size}
+                hover={hover}
+                aria-hidden="true"
+                viewBox="0 0 32 32">
                 <foreignObject
-                    x="22"
-                    y="22"
-                    width="10"
-                    height="10">
-                    <VoiceIndicator status={props.voice}>
-                        {props.voice === "muted" && <MicrophoneOff size={6} />}
-                    </VoiceIndicator>
+                    x="0"
+                    y="0"
+                    width="32"
+                    height="32"
+                    class="icon"
+                    mask={mask ?? (status ? "url(#user)" : undefined)}>
+                    {<img src={iconURL} draggable={false} loading="lazy" />}
                 </foreignObject>
-            )}
-        </IconBase>
-    );
-}
+                {props.status && (
+                    <circle
+                        cx="27"
+                        cy="27"
+                        r="5"
+                        fill={useStatusColour(target)}
+                    />
+                )}
+                {props.voice && (
+                    <foreignObject x="22" y="22" width="10" height="10">
+                        <VoiceIndicator status={props.voice}>
+                            {props.voice === "muted" && (
+                                <MicrophoneOff size={6} />
+                            )}
+                        </VoiceIndicator>
+                    </foreignObject>
+                )}
+            </IconBase>
+        );
+    },
+);

src/components/common/user/UserShort.tsx

-import { User } from "revolt.js";
-import UserIcon from "./UserIcon";
+import { observer } from "mobx-react-lite";
+import { useParams } from "react-router-dom";
+import { User } from "revolt.js/dist/maps/Users";
+
 import { Text } from "preact-i18n";
 
-export function Username({ user, ...otherProps }: { user?: User } & JSX.HTMLAttributes<HTMLElement>) {
-    return <span {...otherProps}>{ user?.username ?? <Text id="app.main.channel.unknown_user" /> }</span>;
-}
+import { useClient } from "../../../context/revoltjs/RevoltClient";
+
+import UserIcon from "./UserIcon";
+
+export const Username = observer(
+    ({
+        user,
+        ...otherProps
+    }: { user?: User } & JSX.HTMLAttributes<HTMLElement>) => {
+        let username = user?.username;
+        let color;
 
-export default function UserShort({ user, size }: { user?: User, size?: number }) {
-    return <>
-        <UserIcon size={size ?? 24} target={user} />
-        <Username user={user} />
-    </>;
-}
\ No newline at end of file
+        if (user) {
+            const { server } = useParams<{ server?: string }>();
+            if (server) {
+                const client = useClient();
+                const member = client.members.getKey({
+                    server,
+                    user: user._id,
+                });
+
+                if (member) {
+                    if (member.nickname) {
+                        username = member.nickname;
+                    }
+
+                    if (member.roles && member.roles.length > 0) {
+                        const srv = client.servers.get(member._id.server);
+                        if (srv?.roles) {
+                            for (const role of member.roles) {
+                                const c = srv.roles[role].colour;
+                                if (c) {
+                                    color = c;
+                                    continue;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        return (
+            <span {...otherProps} style={{ color }}>
+                {username ?? <Text id="app.main.channel.unknown_user" />}
+            </span>
+        );
+    },
+);
+
+export default function UserShort({
+    user,
+    size,
+}: {
+    user?: User;
+    size?: number;
+}) {
+    return (
+        <>
+            <UserIcon size={size ?? 24} target={user} />
+            <Username user={user} />
+        </>
+    );
+}

src/components/common/user/UserStatus.tsx

-import { User } from "revolt.js";
+import { observer } from "mobx-react-lite";
+import { Presence } from "revolt-api/types/Users";
+import { User } from "revolt.js/dist/maps/Users";
+
 import { Text } from "preact-i18n";
-import { Users } from "revolt.js/dist/api/objects";
+
+import Tooltip from "../Tooltip";
 
 interface Props {
-    user: User;
+    user?: User;
+    tooltip?: boolean;
 }
 
-export default function UserStatus({ user }: Props) {
-    if (user.online) {
+export default observer(({ user, tooltip }: Props) => {
+    if (user?.online) {
         if (user.status?.text) {
-            return <>{user.status?.text}</>;
+            if (tooltip) {
+                return (
+                    <Tooltip arrow={undefined} content={user.status.text}>
+                        {user.status.text}
+                    </Tooltip>
+                );
+            }
+
+            return <>{user.status.text}</>;
         }
 
-        if (user.status?.presence === Users.Presence.Busy) {
+        if (user.status?.presence === Presence.Busy) {
             return <Text id="app.status.busy" />;
         }
 
-        if (user.status?.presence === Users.Presence.Idle) {
+        if (user.status?.presence === Presence.Idle) {
             return <Text id="app.status.idle" />;
         }
 
-        if (user.status?.presence === Users.Presence.Invisible) {
+        if (user.status?.presence === Presence.Invisible) {
             return <Text id="app.status.offline" />;
         }
 
@@ -28,4 +41,4 @@ export default function UserStatus({ user }: Props) {
     }
 
     return <Text id="app.status.offline" />;
-}
+});

src/components/markdown/Markdown.module.scss

-@import "@fontsource/fira-mono/400.css";
-
 .markdown {
     :global(.emoji) {
         height: 1.25em;
@@ -14,7 +12,7 @@
         margin-bottom: 0;
         margin-top: 1px;
         margin-right: 2px;
-        vertical-align: -.3em;
+        vertical-align: -0.3em;
     }
 
     p,
@@ -28,9 +26,9 @@
         &[data-type="mention"] {
             padding: 0 6px;
             font-weight: 600;
-            border-radius: 12px;
             display: inline-block;
             background: var(--secondary-background);
+            border-radius: calc(var(--border-radius) * 2);
 
             &:hover {
                 text-decoration: none;
@@ -63,8 +61,8 @@
     blockquote {
         margin: 2px 0;
         padding: 2px 0;
-        border-radius: 4px;
         background: var(--hover);
+        border-radius: var(--border-radius);
         border-inline-start: 4px solid var(--tertiary-background);
 
         > * {
@@ -74,9 +72,8 @@
 
     pre {
         padding: 1em;
-        border-radius: 4px;
         overflow-x: scroll;
-        border-radius: 3px;
+        border-radius: var(--border-radius);
         background: var(--block) !important;
     }
 
@@ -87,9 +84,9 @@
     code {
         color: white;
         font-size: 90%;
-        border-radius: 4px;
         background: var(--block);
-        font-family: "Fira Mono", monospace;
+        border-radius: var(--border-radius);
+        font-family: var(--monospace-font), monospace;
     }
 
     input[type="checkbox"] {
@@ -115,12 +112,13 @@
         padding: 0 2px;
         cursor: pointer;
         user-select: none;
-        border-radius: 4px;
         color: transparent;
         background: #151515;
+        border-radius: var(--border-radius);
 
         > * {
             opacity: 0;
+            pointer-events: none;
         }
 
         &:global(.shown) {
@@ -131,22 +129,19 @@
 
             > * {
                 opacity: 1;
+                pointer-events: unset;
             }
         }
     }
 
     :global(.code) {
-        font-family: "Fira Mono", monospace;
+        font-family: var(--monospace-font), monospace;
 
         :global(.lang) {
-            // height: 8px;
-            // position: relative;
+            width: fit-content;
+            padding-bottom: 8px;
 
             div {
-                // margin-left: -5px;
-                // margin-top: -16px;
-                // position: absolute;
-
                 color: #111;
                 cursor: pointer;
                 padding: 2px 6px;
@@ -165,10 +160,6 @@
                     box-shadow: 0 1px #787676;
                 }
             }
-
-            // ! FIXME: had to change this temporarily due to overflow
-            width: fit-content;
-            padding-bottom: 8px;
         }
     }
 
@@ -185,18 +176,18 @@
     input[type="checkbox"] + label:before {
         width: 12px;
         height: 12px;
-        content: 'a';
+        content: "a";
         font-size: 10px;
         margin-right: 6px;
         line-height: 12px;
-        position: relative;
-        border-radius: 4px;
         background: white;
+        position: relative;
         display: inline-block;
+        border-radius: var(--border-radius);
     }
 
     input[type="checkbox"][checked="true"] + label:before {
-        content: '✓';
+        content: "✓";
         align-items: center;
         display: inline-flex;
         justify-content: center;

src/components/markdown/Markdown.tsx

 import { Suspense, lazy } from "preact/compat";
 
-const Renderer = lazy(() => import('./Renderer'));
+const Renderer = lazy(() => import("./Renderer"));
 
 export interface MarkdownProps {
     content?: string;
@@ -9,9 +9,9 @@ export interface MarkdownProps {
 
 export default function Markdown(props: MarkdownProps) {
     return (
-        // @ts-expect-error
+        // @ts-expect-error Typings mis-match.
         <Suspense fallback={props.content}>
             <Renderer {...props} />
         </Suspense>
-    )
+    );
 }

src/components/markdown/Renderer.tsx

+/* eslint-disable react-hooks/rules-of-hooks */
+import MarkdownKatex from "@traptitech/markdown-it-katex";
+import MarkdownSpoilers from "@traptitech/markdown-it-spoiler";
+import "katex/dist/katex.min.css";
 import MarkdownIt from "markdown-it";
+// @ts-expect-error No typings.
+import MarkdownEmoji from "markdown-it-emoji/dist/markdown-it-emoji-bare";
+// @ts-expect-error No typings.
+import MarkdownSub from "markdown-it-sub";
+// @ts-expect-error No typings.
+import MarkdownSup from "markdown-it-sup";
+import Prism from "prismjs";
+import "prismjs/themes/prism-tomorrow.css";
 import { RE_MENTIONS } from "revolt.js";
-import { useContext } from "preact/hooks";
-import { MarkdownProps } from "./Markdown";
+
 import styles from "./Markdown.module.scss";
-import { generateEmoji } from "../common/Emoji";
+import { useCallback, useContext } from "preact/hooks";
+
 import { internalEmit } from "../../lib/eventEmitter";
-import { emojiDictionary } from "../../assets/emojis";
+
 import { AppContext } from "../../context/revoltjs/RevoltClient";
 
-import Prism from "prismjs";
-import "katex/dist/katex.min.css";
-import "prismjs/themes/prism-tomorrow.css";
+import { generateEmoji } from "../common/Emoji";
 
-import MarkdownKatex from "@traptitech/markdown-it-katex";
-import MarkdownSpoilers from "@traptitech/markdown-it-spoiler";
+import { emojiDictionary } from "../../assets/emojis";
+import { MarkdownProps } from "./Markdown";
 
-// @ts-ignore
-import MarkdownEmoji from "markdown-it-emoji/dist/markdown-it-emoji-bare";
-// @ts-ignore
-import MarkdownSup from "markdown-it-sup";
-// @ts-ignore
-import MarkdownSub from "markdown-it-sub";
+// TODO: global.d.ts file for defining globals
+declare global {
+    interface Window {
+        copycode: (element: HTMLDivElement) => void;
+    }
+}
 
 // Handler for code block copy.
 if (typeof window !== "undefined") {
-    (window as any).copycode = function(element: HTMLDivElement) {
+    window.copycode = function (element: HTMLDivElement) {
         try {
-            let code = element.parentElement?.parentElement?.children[1];
+            const code = element.parentElement?.parentElement?.children[1];
             if (code) {
-                navigator.clipboard.writeText((code as any).innerText.trim());
+                navigator.clipboard.writeText(code.textContent?.trim() ?? "");
             }
         } catch (e) {}
     };
@@ -38,97 +48,46 @@ export const md: MarkdownIt = MarkdownIt({
     breaks: true,
     linkify: true,
     highlight: (str, lang) => {
-        let v = Prism.languages[lang];
+        const v = Prism.languages[lang];
         if (v) {
-            let out = Prism.highlight(str, v, lang);
+            const out = Prism.highlight(str, v, lang);
             return `<pre class="code"><div class="lang"><div onclick="copycode(this)">${lang}</div></div><code class="language-${lang}">${out}</code></pre>`;
         }
-        
-        return `<pre class="code"><code>${md.utils.escapeHtml(str)}</code></pre>`;
-    }
-})
-.disable("image")
-.use(MarkdownEmoji, { defs: emojiDictionary })
-.use(MarkdownSpoilers)
-.use(MarkdownSup)
-.use(MarkdownSub)
-.use(MarkdownKatex, {
-    throwOnError: false,
-    maxExpand: 0
-});
-
-// ? Force links to open _blank.
-// From: https://github.com/markdown-it/markdown-it/blob/master/docs/architecture.md#renderer
-const defaultRender =
-    md.renderer.rules.link_open ||
-    function(tokens, idx, options, _env, self) {
-        return self.renderToken(tokens, idx, options);
-    };
 
-// Handler for internal links, pushes events to React using magic.
-if (typeof window !== "undefined") {
-    (window as any).internalHandleURL = function(element: HTMLAnchorElement) {
-        const url = new URL(element.href, location as any);
-        const pathname = url.pathname;
-
-        if (pathname.startsWith("/@")) {
-            internalEmit("Intermediate", "openProfile", pathname.substr(2));
-        } else {
-            internalEmit("Intermediate", "navigate", pathname);
-        }
-    };
-}
-
-md.renderer.rules.link_open = function(tokens, idx, options, env, self) {
-    let internal;
-    const hIndex = tokens[idx].attrIndex("href");
-    if (hIndex >= 0) {
-        try {
-            // For internal links, we should use our own handler to use react-router history.
-            // @ts-ignore
-            const href = tokens[idx].attrs[hIndex][1];
-            const url = new URL(href, location as any);
-
-            if (url.hostname === location.hostname) {
-                internal = true;
-                // I'm sorry.
-                tokens[idx].attrPush([
-                    "onclick",
-                    "internalHandleURL(this); return false"
-                ]);
-
-                if (url.pathname.startsWith("/@")) {
-                    tokens[idx].attrPush(["data-type", "mention"]);
-                }
-            }
-        } catch (err) {
-            // Ignore the error, treat as normal link.
-        }
-    }
-
-    if (!internal) {
-        // Add target=_blank for external links.
-        const aIndex = tokens[idx].attrIndex("target");
-
-        if (aIndex < 0) {
-            tokens[idx].attrPush(["target", "_blank"]);
-        } else {
-            try {
-                // @ts-ignore
-                tokens[idx].attrs[aIndex][1] = "_blank";
-            } catch (_) {}
-        }
+        return `<pre class="code"><code>${md.utils.escapeHtml(
+            str,
+        )}</code></pre>`;
+    },
+})
+    .disable("image")
+    .use(MarkdownEmoji, { defs: emojiDictionary })
+    .use(MarkdownSpoilers)
+    .use(MarkdownSup)
+    .use(MarkdownSub)
+    .use(MarkdownKatex, {
+        throwOnError: false,
+        maxExpand: 0,
+        maxSize: 10,
+        strict: false,
+        errorColor: "var(--error)",
+    });
+
+// TODO: global.d.ts file for defining globals
+declare global {
+    interface Window {
+        internalHandleURL: (element: HTMLAnchorElement) => void;
     }
+}
 
-    return defaultRender(tokens, idx, options, env, self);
-};
-
-md.renderer.rules.emoji = function(token, idx) {
+md.renderer.rules.emoji = function (token, idx) {
     return generateEmoji(token[idx].content);
 };
 
 const RE_TWEMOJI = /:(\w+):/g;
 
+// ! FIXME: Move to library
+const RE_CHANNELS = /<#([A-z0-9]{26})>/g;
+
 export default function Renderer({ content, disallowBigEmoji }: MarkdownProps) {
     const client = useContext(AppContext);
     if (typeof content === "undefined") return null;
@@ -136,10 +95,9 @@ export default function Renderer({ content, disallowBigEmoji }: MarkdownProps) {
 
     // We replace the message with the mention at the time of render.
     // We don't care if the mention changes.
-    let newContent = content.replace(
-        RE_MENTIONS,
-        (sub: string, ...args: any[]) => {
-            const id = args[0],
+    const newContent = content
+        .replace(RE_MENTIONS, (sub: string, ...args: unknown[]) => {
+            const id = args[0] as string,
                 user = client.users.get(id);
 
             if (user) {
@@ -147,26 +105,102 @@ export default function Renderer({ content, disallowBigEmoji }: MarkdownProps) {
             }
 
             return sub;
-        }
-    );
+        })
+        .replace(RE_CHANNELS, (sub: string, ...args: unknown[]) => {
+            const id = args[0] as string,
+                channel = client.channels.get(id);
+
+            if (channel?.channel_type === "TextChannel") {
+                return `[#${channel.name}](/server/${channel.server_id}/channel/${id})`;
+            }
+
+            return sub;
+        });
 
-    const useLargeEmojis = disallowBigEmoji ? false : content.replace(RE_TWEMOJI, '').trim().length === 0;
+    const useLargeEmojis = disallowBigEmoji
+        ? false
+        : content.replace(RE_TWEMOJI, "").trim().length === 0;
+
+    const toggle = useCallback((ev: MouseEvent) => {
+        if (ev.currentTarget) {
+            const element = ev.currentTarget as HTMLDivElement;
+            if (element.classList.contains("spoiler")) {
+                element.classList.add("shown");
+            }
+        }
+    }, []);
+
+    const handleLink = useCallback((ev: MouseEvent) => {
+        if (ev.currentTarget) {
+            const element = ev.currentTarget as HTMLAnchorElement;
+            const url = new URL(element.href, location.href);
+            const pathname = url.pathname;
+
+            if (pathname.startsWith("/@")) {
+                const id = pathname.substr(2);
+                if (/[0123456789ABCDEFGHJKMNPQRSTVWXYZ]{26}/.test(id)) {
+                    ev.preventDefault();
+                    internalEmit("Intermediate", "openProfile", id);
+                }
+            } else {
+                ev.preventDefault();
+                internalEmit("Intermediate", "navigate", pathname);
+            }
+        }
+    }, []);
 
     return (
         <span
+            ref={(el) => {
+                if (el) {
+                    el.querySelectorAll<HTMLDivElement>(".spoiler").forEach(
+                        (element) => {
+                            element.removeEventListener("click", toggle);
+                            element.addEventListener("click", toggle);
+                        },
+                    );
+
+                    el.querySelectorAll<HTMLAnchorElement>("a").forEach(
+                        (element) => {
+                            element.removeEventListener("click", handleLink);
+                            element.removeAttribute("data-type");
+                            element.removeAttribute("target");
+
+                            let internal;
+                            const href = element.href;
+                            if (href) {
+                                try {
+                                    const url = new URL(href, location.href);
+
+                                    if (url.hostname === location.hostname) {
+                                        internal = true;
+                                        element.addEventListener(
+                                            "click",
+                                            handleLink,
+                                        );
+
+                                        if (url.pathname.startsWith("/@")) {
+                                            element.setAttribute(
+                                                "data-type",
+                                                "mention",
+                                            );
+                                        }
+                                    }
+                                } catch (err) {}
+                            }
+
+                            if (!internal) {
+                                element.setAttribute("target", "_blank");
+                            }
+                        },
+                    );
+                }
+            }}
             className={styles.markdown}
             dangerouslySetInnerHTML={{
-                __html: md.render(newContent)
+                __html: md.render(newContent),
             }}
             data-large-emojis={useLargeEmojis}
-            onClick={ev => {
-                if (ev.target) {
-                    let element: Element = ev.target as any;
-                    if (element.classList.contains("spoiler")) {
-                        element.classList.add("shown");
-                    }
-                }
-            }}
         />
     );
 }

src/components/native/Titlebar.tsx

+import { Wrench } from "@styled-icons/boxicons-solid";
+import styled from "styled-components";
+
+import UpdateIndicator from "../common/UpdateIndicator";
+
+const TitlebarBase = styled.div`
+    height: var(--titlebar-height);
+    display: flex;
+    user-select: none;
+    align-items: center;
+
+    .drag {
+        flex-grow: 1;
+        -webkit-app-region: drag;
+        margin-top: 10px;
+        height: 100%;
+    }
+
+    .quick {
+        color: var(--secondary-foreground);
+
+        > div,
+        > div > div {
+            width: var(--titlebar-height) !important;
+        }
+
+        &.disabled {
+            color: var(--error);
+        }
+
+        &.unavailable {
+            background: var(--error);
+        }
+    }
+
+    .title {
+        -webkit-app-region: drag;
+        /*height: var(--titlebar-height);*/
+        font-size: 16px;
+        font-weight: 600;
+        margin-inline-start: 10px;
+        margin-top: 10px;
+        gap: 6px;
+        display: flex;
+        align-items: center;
+        justify-content: flex-start;
+        z-index: 90000;
+        color: var(--titlebar-logo-color);
+
+        svg {
+            margin-bottom: 10px;
+        }
+
+        svg:first-child {
+            height: calc(var(--titlebar-height) / 3);
+        }
+    }
+
+    .actions {
+        z-index: 100;
+        display: flex;
+        align-items: center;
+        margin-inline-start: 6px;
+
+        div {
+            width: calc(
+                var(--titlebar-height) + var(--titlebar-action-padding)
+            );
+            height: var(--titlebar-height);
+
+            display: grid;
+            place-items: center;
+            transition: 0.2s ease color;
+            transition: 0.2s ease background-color;
+
+            &:hover {
+                background: var(--primary-background);
+            }
+
+            &.error:hover {
+                background: var(--error);
+            }
+        }
+    }
+`;
+
+export function Titlebar() {
+    return (
+        <TitlebarBase>
+            <div class="title">
+                <svg
+                    xmlns="http://www.w3.org/2000/svg"
+                    viewBox="0 0 193.733 37.438">
+                    <path
+                        d="M23.393,1.382c0,2.787-1.52,4.46-4.764,4.46H13.258V-2.977H18.63C21.873-2.977,23.393-1.254,23.393,1.382Zm-24-11.555,5.2,7.213V25.4h8.666V11.973h2.078l7.4,13.43h9.781l-8.21-14.089A10.355,10.355,0,0,0,32.212,1.027c0-6.183-4.358-11.2-13.075-11.2Zm60.035,0H37.634V25.4H59.426V18.46H46.3v-7.8H57.906V3.966H46.3V-2.969H59.426Zm20.981,26.86-8.818-26.86H62.365L74.984,25.4H85.83L98.449-10.173H89.276Zm56.659-9.173c0-10.693-8.058-18.194-18.194-18.194-10.085,0-18.3,7.5-18.3,18.194a17.9,17.9,0,0,0,18.3,18.244A17.815,17.815,0,0,0,137.066,7.514Zm-27.62,0c0-6.335,3.649-10.338,9.426-10.338,5.676,0,9.376,4,9.376,10.338,0,6.233-3.7,10.338-9.376,10.338C113.095,17.852,109.446,13.747,109.446,7.514ZM141.88-10.173V25.4H161.9v-6.95H150.545V-10.173Zm22.248,7.2h9.426V25.4h8.666V-2.975h9.426v-7.2H164.128Z"
+                        transform="translate(1.586 11.18)"
+                        fill="var(--titlebar-logo-color)"
+                        stroke="var(--titlebar-logo-color)"
+                        stroke-width="1"
+                    />
+                </svg>
+                {window.native.getConfig().build === "dev" && (
+                    <Wrench size="12.5" />
+                )}
+            </div>
+            {/*<div class="actions quick">
+                <Tooltip
+                    content="Mute"
+                    placement="bottom">
+                    <div onClick={window.native.min}>
+                        <Microphone size={15}/>
+                    </div>
+                </Tooltip>
+                <Tooltip
+                    content="Deafen"
+                    placement="bottom">
+                    <div onClick={window.native.min}>
+                        <VolumeFull size={15}/>
+                    </div>
+                </Tooltip>
+            </div>*/}
+            <div class="drag" />
+            <UpdateIndicator style="titlebar" />
+            <div class="actions">
+                <div onClick={window.native.min}>
+                    <svg
+                        aria-hidden="false"
+                        width="12"
+                        height="12"
+                        viewBox="0 0 12 12">
+                        <rect
+                            fill="currentColor"
+                            width="10"
+                            height="1"
+                            x="1"
+                            y="6"
+                        />
+                    </svg>
+                </div>
+                <div onClick={window.native.max}>
+                    <svg
+                        aria-hidden="false"
+                        width="12"
+                        height="12"
+                        viewBox="0 0 12 12">
+                        <rect
+                            width="9"
+                            height="9"
+                            x="1.5"
+                            y="1.5"
+                            fill="none"
+                            stroke="currentColor"
+                        />
+                    </svg>
+                </div>
+                <div onClick={window.native.close} class="error">
+                    <svg
+                        aria-hidden="false"
+                        width="12"
+                        height="12"
+                        viewBox="0 0 12 12">
+                        <polygon
+                            fill="currentColor"
+                            stroke-width="1"
+                            fill-rule="evenodd"
+                            points="11 1.576 6.583 6 11 10.424 10.424 11 6 6.583 1.576 11 1 10.424 5.417 6 1 1.576 1.576 1 6 5.417 10.424 1"
+                            style="stroke:currentColor;stroke-width:0.4"
+                        />
+                    </svg>
+                </div>
+            </div>
+        </TitlebarBase>
+    );
+}

src/components/navigation/BottomNavigation.tsx

-import IconButton from "../ui/IconButton";
-import UserIcon from "../common/user/UserIcon";
-import styled, { css } from "styled-components";
-import { useSelf } from "../../context/revoltjs/hooks";
+import { Message, Group } from "@styled-icons/boxicons-solid";
+import { observer } from "mobx-react-lite";
 import { useHistory, useLocation } from "react-router";
+import styled, { css } from "styled-components";
+
 import ConditionalLink from "../../lib/ConditionalLink";
-import { Message, Group } from "@styled-icons/boxicons-solid";
-import { LastOpened } from "../../redux/reducers/last_opened";
+
 import { connectState } from "../../redux/connector";
+import { LastOpened } from "../../redux/reducers/last_opened";
+
+import { useClient } from "../../context/revoltjs/RevoltClient";
+
+import UserIcon from "../common/user/UserIcon";
+import IconButton from "../ui/IconButton";
 
-const NavigationBase = styled.div`
+const Base = styled.div`
+    background: var(--secondary-background);
+`;
+
+const Navbar = styled.div`
     z-index: 100;
-    height: 50px;
+    max-width: 500px;
+    margin: 0 auto;
     display: flex;
-    background: var(--secondary-background);
+    height: var(--bottom-navigation-height);
 `;
 
 const Button = styled.a<{ active: boolean }>`
     flex: 1;
 
-    > a, > div, > a > div {
+    > a,
+    > div,
+    > a > div {
         width: 100%;
         height: 100%;
     }
 
-    ${ props => props.active && css`
-        background: var(--hover);
-    ` }
+    > div,
+    > a > div {
+        padding: 0 20px;
+    }
+
+    ${(props) =>
+        props.active &&
+        css`
+            background: var(--hover);
+        `}
 `;
 
 interface Props {
-    lastOpened: LastOpened
+    lastOpened: LastOpened;
 }
 
-export function BottomNavigation({ lastOpened }: Props) {
-    const user = useSelf();
+export const BottomNavigation = observer(({ lastOpened }: Props) => {
+    const client = useClient();
+    const user = client.users.get(client.user!._id);
+
     const history = useHistory();
     const path = useLocation().pathname;
 
-    const channel_id = lastOpened['home'];
+    const channel_id = lastOpened["home"];
 
     const friendsActive = path.startsWith("/friends");
     const settingsActive = path.startsWith("/settings");
     const homeActive = !(friendsActive || settingsActive);
 
-    // console.info(channel_id);
-
     return (
-        <NavigationBase>
-            <Button active={homeActive}>
-                <IconButton
-                    onClick={() => {
-                        if (!homeActive) {
+        <Base>
+            <Navbar>
+                <Button active={homeActive}>
+                    <IconButton
+                        onClick={() => {
                             if (settingsActive) {
                                 if (history.length > 0) {
                                     history.goBack();
-                                } else {
-                                    history.push('/');
                                 }
                             }
-                        }
-                    }}>
-                    <Message size={24} />
-                </IconButton>
-            </Button>
-            <Button active={friendsActive}>
-                <ConditionalLink active={friendsActive} to="/friends">
-                    <IconButton>
-                        <Group size={25} />
-                    </IconButton>
-                </ConditionalLink>
-            </Button>
-            <Button active={settingsActive}>
-                <ConditionalLink active={settingsActive} to="/settings">
-                    <IconButton>
-                        <UserIcon target={user} size={26} status={true} />
+
+                            if (channel_id) {
+                                history.push(`/channel/${channel_id}`);
+                            } else {
+                                history.push("/");
+                            }
+                        }}>
+                        <Message size={24} />
                     </IconButton>
-                </ConditionalLink>
-            </Button>
-        </NavigationBase>
+                </Button>
+                <Button active={friendsActive}>
+                    <ConditionalLink active={friendsActive} to="/friends">
+                        <IconButton>
+                            <Group size={25} />
+                        </IconButton>
+                    </ConditionalLink>
+                </Button>
+                {/*<Button active={searchActive}>
+                    <ConditionalLink active={searchActive} to="/search">
+                        <IconButton>
+                            <Search size={25} />
+                        </IconButton>
+                    </ConditionalLink>
+                </Button>
+                <Button active={inboxActive}>
+                    <ConditionalLink active={inboxActive} to="/inbox">
+                        <IconButton>
+                            <Inbox size={25} />
+                        </IconButton>
+                    </ConditionalLink>
+                </Button>*/}
+                <Button active={settingsActive}>
+                    <ConditionalLink active={settingsActive} to="/settings">
+                        <IconButton>
+                            <UserIcon target={user} size={26} status={true} />
+                        </IconButton>
+                    </ConditionalLink>
+                </Button>
+            </Navbar>
+        </Base>
     );
-}
+});
 
-export default connectState(BottomNavigation, state => {
+export default connectState(BottomNavigation, (state) => {
     return {
-        lastOpened: state.lastOpened
-    }
+        lastOpened: state.lastOpened,
+    };
 });

src/components/navigation/LeftSidebar.tsx

 import { Route, Switch } from "react-router";
-import SidebarBase from "./SidebarBase";
 
+import SidebarBase from "./SidebarBase";
+import HomeSidebar from "./left/HomeSidebar";
 import ServerListSidebar from "./left/ServerListSidebar";
 import ServerSidebar from "./left/ServerSidebar";
-import HomeSidebar from "./left/HomeSidebar";
 
 export default function LeftSidebar() {
     return (
@@ -29,4 +29,4 @@ export default function LeftSidebar() {
             </Switch>
         </SidebarBase>
     );
-};
+}

src/components/navigation/RightSidebar.tsx

 import { Route, Switch } from "react-router";
-import SidebarBase from "./SidebarBase";
 
+import SidebarBase from "./SidebarBase";
 import MemberSidebar from "./right/MemberSidebar";
 
 export default function RightSidebar() {
@@ -16,4 +16,4 @@ export default function RightSidebar() {
             </Switch>
         </SidebarBase>
     );
-};
+}

src/components/navigation/SidebarBase.tsx

 import styled, { css } from "styled-components";
+
 import { isTouchscreenDevice } from "../../lib/isTouchscreenDevice";
 
 export default styled.div`
@@ -16,10 +17,14 @@ export const GenericSidebarBase = styled.div<{ padding?: boolean }>`
     flex-shrink: 0;
     flex-direction: column;
     background: var(--secondary-background);
+    border-end-start-radius: 8px;
 
-    ${ props => props.padding && isTouchscreenDevice && css`
-        padding-bottom: 50px;
-    ` }
+    ${(props) =>
+        props.padding &&
+        isTouchscreenDevice &&
+        css`
+            padding-bottom: 50px;
+        `}
 `;
 
 export const GenericSidebarList = styled.div`

src/components/navigation/items/ButtonItem.tsx

-import classNames from 'classnames';
+import { X, Crown } from "@styled-icons/boxicons-regular";
+import { observer } from "mobx-react-lite";
+import { Presence } from "revolt-api/types/Users";
+import { Channel } from "revolt.js/dist/maps/Channels";
+import { User } from "revolt.js/dist/maps/Users";
+
 import styles from "./Item.module.scss";
-import Tooltip from '../../common/Tooltip';
-import IconButton from '../../ui/IconButton';
+import classNames from "classnames";
+import { attachContextMenu } from "preact-context-menu";
 import { Localizer, Text } from "preact-i18n";
-import { X, Crown } from "@styled-icons/boxicons-regular";
-import { Children } from "../../../types/Preact";
-import UserIcon from '../../common/user/UserIcon';
-import ChannelIcon from '../../common/ChannelIcon';
-import UserStatus from '../../common/user/UserStatus';
-import { attachContextMenu } from 'preact-context-menu';
-import { Channels, Users } from "revolt.js/dist/api/objects";
+
 import { isTouchscreenDevice } from "../../../lib/isTouchscreenDevice";
-import { useIntermediate } from '../../../context/intermediate/Intermediate';
-import { stopPropagation } from '../../../lib/stopPropagation';
+import { stopPropagation } from "../../../lib/stopPropagation";
 
-type CommonProps = Omit<JSX.HTMLAttributes<HTMLDivElement>, 'children' | 'as'> & {
-    active?: boolean
-    alert?: 'unread' | 'mention'
-    alertCount?: number
-}
+import { useIntermediate } from "../../../context/intermediate/Intermediate";
+
+import ChannelIcon from "../../common/ChannelIcon";
+import Tooltip from "../../common/Tooltip";
+import UserIcon from "../../common/user/UserIcon";
+import { Username } from "../../common/user/UserShort";
+import UserStatus from "../../common/user/UserStatus";
+import IconButton from "../../ui/IconButton";
+
+import { Children } from "../../../types/Preact";
+
+type CommonProps = Omit<
+    JSX.HTMLAttributes<HTMLDivElement>,
+    "children" | "as"
+> & {
+    active?: boolean;
+    alert?: "unread" | "mention";
+    alertCount?: number;
+};
 
 type UserProps = CommonProps & {
-    user: Users.User,
-    context?: Channels.Channel,
-    channel?: Channels.DirectMessageChannel
-}
+    user: User;
+    context?: Channel;
+    channel?: Channel;
+};
 
-export function UserButton(props: UserProps) {
-    const { active, alert, alertCount, user, context, channel, ...divProps } = props;
+export const UserButton = observer((props: UserProps) => {
+    const { active, alert, alertCount, user, context, channel, ...divProps } =
+        props;
     const { openScreen } = useIntermediate();
 
     return (
-        <div {...divProps}
+        <div
+            {...divProps}
             className={classNames(styles.item, styles.user)}
             data-active={active}
-            data-alert={typeof alert === 'string'}
-            data-online={typeof channel !== 'undefined' || (user.online && user.status?.presence !== Users.Presence.Invisible)}
-            onContextMenu={attachContextMenu('Menu', {
+            data-alert={typeof alert === "string"}
+            data-online={
+                typeof channel !== "undefined" ||
+                (user.online && user.status?.presence !== Presence.Invisible)
+            }
+            onContextMenu={attachContextMenu("Menu", {
                 user: user._id,
                 channel: channel?._id,
                 unread: alert,
-                contextualChannel: context?._id
+                contextualChannel: context?._id,
             })}>
-            <UserIcon className={styles.avatar} target={user} size={32} status />
+            <UserIcon
+                className={styles.avatar}
+                target={user}
+                size={32}
+                status
+            />
             <div className={styles.name}>
-                <div>{user.username}</div>
+                <div>
+                    <Username user={user} />
+                </div>
                 {
                     <div className={styles.subText}>
-                        { channel?.last_message && alert ? (
-                            channel.last_message.short
+                        {channel?.last_message && alert ? (
+                            (channel.last_message as { short: string }).short
                         ) : (
                             <UserStatus user={user} />
-                        ) }
+                        )}
                     </div>
                 }
             </div>
             <div className={styles.button}>
-                { context?.channel_type === "Group" &&
-                    context.owner === user._id && (
+                {context?.channel_type === "Group" &&
+                    context.owner_id === user._id && (
                         <Localizer>
                             <Tooltip
-                                content={
-                                    <Text id="app.main.groups.owner" />
-                                }
-                            >
+                                content={<Text id="app.main.groups.owner" />}>
                                 <Crown size={20} />
                             </Tooltip>
                         </Localizer>
+                    )}
+                {alert && (
+                    <div className={styles.alert} data-style={alert}>
+                        {alertCount}
+                    </div>
                 )}
-                {alert && <div className={styles.alert} data-style={alert}>{ alertCount }</div>}
-                { !isTouchscreenDevice && channel &&
-                    <IconButton className={styles.icon}
-                        onClick={e => stopPropagation(e) && openScreen({ id: 'special_prompt', type: 'close_dm', target: channel })}>
+                {!isTouchscreenDevice && channel && (
+                    <IconButton
+                        className={styles.icon}
+                        onClick={(e) =>
+                            stopPropagation(e) &&
+                            openScreen({
+                                id: "special_prompt",
+                                type: "close_dm",
+                                target: channel,
+                            })
+                        }>
                         <X size={24} />
                     </IconButton>
-                }
+                )}
             </div>
         </div>
-    )
-}
+    );
+});
 
 type ChannelProps = CommonProps & {
-    channel: Channels.Channel & { unread?: string },
-    user?: Users.User
-    compact?: boolean
-}
+    channel: Channel & { unread?: string };
+    user?: User;
+    compact?: boolean;
+};
 
-export function ChannelButton(props: ChannelProps) {
-    const { active, alert, alertCount, channel, user, compact, ...divProps } = props;
+export const ChannelButton = observer((props: ChannelProps) => {
+    const { active, alert, alertCount, channel, user, compact, ...divProps } =
+        props;
 
-    if (channel.channel_type === 'SavedMessages') throw "Invalid channel type.";
-    if (channel.channel_type === 'DirectMessage') {
-        if (typeof user === 'undefined') throw "No user provided.";
-        return <UserButton {...{ active, alert, channel, user }} />
+    if (channel.channel_type === "SavedMessages") throw "Invalid channel type.";
+    if (channel.channel_type === "DirectMessage") {
+        if (typeof user === "undefined") throw "No user provided.";
+        return <UserButton {...{ active, alert, channel, user }} />;
     }
 
     const { openScreen } = useIntermediate();
 
     return (
-        <div {...divProps}
+        <div
+            {...divProps}
             data-active={active}
-            data-alert={typeof alert === 'string'}
-            aria-label={{}} /*FIXME: ADD ARIA LABEL*/
+            data-alert={typeof alert === "string"}
+            aria-label={channel.name}
             className={classNames(styles.item, { [styles.compact]: compact })}
-            onContextMenu={attachContextMenu('Menu', { channel: channel._id, unread: typeof channel.unread !== 'undefined' })}>
-            <ChannelIcon className={styles.avatar} target={channel} size={compact ? 24 : 32} />
+            onContextMenu={attachContextMenu("Menu", {
+                channel: channel._id,
+                unread: typeof channel.unread !== "undefined",
+            })}>
+            <ChannelIcon
+                className={styles.avatar}
+                target={channel}
+                size={compact ? 24 : 32}
+            />
             <div className={styles.name}>
                 <div>{channel.name}</div>
-                { channel.channel_type === 'Group' &&
+                {channel.channel_type === "Group" && (
                     <div className={styles.subText}>
-                        {(channel.last_message && alert) ? (
-                            channel.last_message.short
+                        {channel.last_message && alert ? (
+                            (channel.last_message as { short: string }).short
                         ) : (
                             <Text
                                 id="quantities.members"
-                                plural={channel.recipients.length}
-                                fields={{ count: channel.recipients.length }}
+                                plural={channel.recipients!.length}
+                                fields={{ count: channel.recipients!.length }}
                             />
                         )}
                     </div>
-                }
+                )}
             </div>
             <div className={styles.button}>
-                {alert && <div className={styles.alert} data-style={alert}>{ alertCount }</div>}
+                {alert && (
+                    <div className={styles.alert} data-style={alert}>
+                        {alertCount}
+                    </div>
+                )}
                 {!isTouchscreenDevice && channel.channel_type === "Group" && (
                     <IconButton
                         className={styles.icon}
-                        onClick={() => openScreen({ id: 'special_prompt', type: 'leave_group', target: channel })}>
+                        onClick={() =>
+                            openScreen({
+                                id: "special_prompt",
+                                type: "leave_group",
+                                target: channel,
+                            })
+                        }>
                         <X size={24} />
                     </IconButton>
                 )}
             </div>
         </div>
-    )
-}
+    );
+});
 
 type ButtonProps = CommonProps & {
-    onClick?: () => void
-    children?: Children
-    className?: string
-    compact?: boolean
-}
+    onClick?: () => void;
+    children?: Children;
+    className?: string;
+    compact?: boolean;
+};
 
 export default function ButtonItem(props: ButtonProps) {
-    const { active, alert, alertCount, onClick, className, children, compact, ...divProps } = props;
+    const {
+        active,
+        alert,
+        alertCount,
+        onClick,
+        className,
+        children,
+        compact,
+        ...divProps
+    } = props;
 
     return (
-        <div {...divProps}
-            className={classNames(styles.item, { [styles.compact]: compact, [styles.normal]: !compact }, className)}
+        <div
+            {...divProps}
+            className={classNames(
+                styles.item,
+                { [styles.compact]: compact, [styles.normal]: !compact },
+                className,
+            )}
             onClick={onClick}
             data-active={active}
-            data-alert={typeof alert === 'string'}>
-            <div className={styles.content}>{ children }</div>
-                {alert && <div className={styles.alert} data-style={alert}>{ alertCount }</div>}
+            data-alert={typeof alert === "string"}>
+            <div className={styles.content}>{children}</div>
+            {alert && (
+                <div className={styles.alert} data-style={alert}>
+                    {alertCount}
+                </div>
+            )}
         </div>
-    )
+    );
 }

src/components/navigation/items/ConnectionStatus.tsx

 import { Text } from "preact-i18n";
-import Banner from "../../ui/Banner";
 import { useContext } from "preact/hooks";
-import { ClientStatus, StatusContext } from "../../../context/revoltjs/RevoltClient";
+
+import {
+    ClientStatus,
+    StatusContext,
+} from "../../../context/revoltjs/RevoltClient";
+
+import Banner from "../../ui/Banner";
 
 export default function ConnectionStatus() {
     const status = useContext(StatusContext);

src/components/navigation/items/Item.module.scss

@@ -3,8 +3,8 @@
     display: flex;
     padding: 0 8px;
     user-select: none;
-    border-radius: 6px;
     margin-bottom: 2px;
+    border-radius: var(--border-radius);
 
     gap: 8px;
     align-items: center;
@@ -20,12 +20,8 @@
         height: 42px;
     }
 
-    &.compact {
+    &.compact { /* TOFIX: Introduce two separate compact items, one for settings, other for channels. */
         height: 32px;
-
-        &[data-mobile="true"] { // TOFIX: make sure this works on mobile 
-            height: 50px;
-        }
     }
 
     &.user {
@@ -50,7 +46,7 @@
         transition: color .1s ease-in-out;
 
         &.content {
-            gap: 8px;
+            gap: 10px;
             flex-grow: 1;
             min-width: 0;
             display: flex;
@@ -148,3 +144,22 @@
         background: var(--error);
     }
 }
+
+@media (pointer: coarse) {
+    .item {
+        height: 40px;
+
+        &.compact {
+            height: var(--bottom-navigation-height);
+
+            > div {
+                gap: 20px;
+
+                > svg {
+                    height: 24px;
+                    width: 24px;
+                }
+            }
+        }
+    }
+  }
\ No newline at end of file

src/components/navigation/left/HomeSidebar.tsx

-import { Localizer, Text } from "preact-i18n";
+import {
+    Home,
+    UserDetail,
+    Wrench,
+    Notepad,
+} from "@styled-icons/boxicons-solid";
+import { observer } from "mobx-react-lite";
+import { Link, Redirect, useLocation, useParams } from "react-router-dom";
+import { RelationshipStatus } from "revolt-api/types/Users";
+
+import { Text } from "preact-i18n";
 import { useContext, useEffect } from "preact/hooks";
-import { Home, UserDetail, Wrench, Notepad } from "@styled-icons/boxicons-solid";
 
-import Category from '../../ui/Category';
+import ConditionalLink from "../../../lib/ConditionalLink";
 import PaintCounter from "../../../lib/PaintCounter";
-import UserHeader from "../../common/user/UserHeader";
-import { Channels } from "revolt.js/dist/api/objects";
+import { isTouchscreenDevice } from "../../../lib/isTouchscreenDevice";
+
+import { dispatch } from "../../../redux";
 import { connectState } from "../../../redux/connector";
-import ConnectionStatus from '../items/ConnectionStatus';
-import { WithDispatcher } from "../../../redux/reducers";
 import { Unreads } from "../../../redux/reducers/unreads";
-import ConditionalLink from "../../../lib/ConditionalLink";
-import { mapChannelWithUnread, useUnreads } from "./common";
-import { Users as UsersNS } from 'revolt.js/dist/api/objects';
-import ButtonItem, { ChannelButton } from '../items/ButtonItem';
-import { AppContext } from "../../../context/revoltjs/RevoltClient";
-import { isTouchscreenDevice } from "../../../lib/isTouchscreenDevice";
-import { GenericSidebarBase, GenericSidebarList } from "../SidebarBase";
-import { Link, Redirect, useLocation, useParams } from "react-router-dom";
+
 import { useIntermediate } from "../../../context/intermediate/Intermediate";
-import { useDMs, useForceUpdate, useUsers } from "../../../context/revoltjs/hooks";
+import { AppContext } from "../../../context/revoltjs/RevoltClient";
 
+import Category from "../../ui/Category";
 import placeholderSVG from "../items/placeholder.svg";
+import { mapChannelWithUnread, useUnreads } from "./common";
 
-type Props = WithDispatcher & {
+import { GenericSidebarBase, GenericSidebarList } from "../SidebarBase";
+import ButtonItem, { ChannelButton } from "../items/ButtonItem";
+import ConnectionStatus from "../items/ConnectionStatus";
+
+type Props = {
     unreads: Unreads;
-}
+};
 
-function HomeSidebar(props: Props) {
+const HomeSidebar = observer((props: Props) => {
     const { pathname } = useLocation();
     const client = useContext(AppContext);
     const { channel } = useParams<{ channel: string }>();
     const { openScreen } = useIntermediate();
 
-    const ctx = useForceUpdate();
-    const channels = useDMs(ctx);
+    const channels = [...client.channels.values()]
+        .filter(
+            (x) =>
+                x.channel_type === "DirectMessage" ||
+                x.channel_type === "Group",
+        )
+        .map((x) => mapChannelWithUnread(x, props.unreads));
 
-    const obj = channels.find(x => x?._id === channel);
+    const obj = client.channels.get(channel);
     if (channel && !obj) return <Redirect to="/" />;
     if (obj) useUnreads({ ...props, channel: obj });
 
     useEffect(() => {
         if (!channel) return;
 
-        props.dispatcher({
-            type: 'LAST_OPENED_SET',
-            parent: 'home',
-            child: channel
+        dispatch({
+            type: "LAST_OPENED_SET",
+            parent: "home",
+            child: channel,
         });
-    }, [ channel ]);
-
-    const channelsArr = channels
-        .filter(x => x.channel_type !== 'SavedMessages')
-        .map(x => mapChannelWithUnread(x, props.unreads));
-
-    const users = useUsers(
-        (channelsArr as (Channels.DirectMessageChannel | Channels.GroupChannel)[])
-            .reduce((prev: any, cur) => [ ...prev, ...cur.recipients ], [])
-    , ctx);
+    }, [channel]);
 
-    channelsArr.sort((b, a) => a.timestamp.localeCompare(b.timestamp));
+    channels.sort((b, a) => a.timestamp.localeCompare(b.timestamp));
 
     return (
         <GenericSidebarBase padding>
-            <UserHeader user={client.user!} />
             <ConnectionStatus />
             <GenericSidebarList>
+                <ConditionalLink active={pathname === "/"} to="/">
+                    <ButtonItem active={pathname === "/"}>
+                        <Home size={20} />
+                        <span>
+                            <Text id="app.navigation.tabs.home" />
+                        </span>
+                    </ButtonItem>
+                </ConditionalLink>
                 {!isTouchscreenDevice && (
                     <>
-                        <ConditionalLink active={pathname === "/"} to="/">
-                            <ButtonItem active={pathname === "/"}>
-                                <Home size={20} />
-                                <span><Text id="app.navigation.tabs.home" /></span>
-                            </ButtonItem>
-                        </ConditionalLink>
-                        <ConditionalLink active={pathname === "/friends"} to="/friends">
+                        <ConditionalLink
+                            active={pathname === "/friends"}
+                            to="/friends">
                             <ButtonItem
                                 active={pathname === "/friends"}
                                 alert={
-                                    typeof users.find(
-                                        user =>
+                                    typeof [...client.users.values()].find(
+                                        (user) =>
                                             user?.relationship ===
-                                            UsersNS.Relationship.Incoming
-                                    ) !== "undefined" ? 'unread' : undefined
-                                }
-                            >
+                                            RelationshipStatus.Incoming,
+                                    ) !== "undefined"
+                                        ? "unread"
+                                        : undefined
+                                }>
                                 <UserDetail size={20} />
-                                <span><Text id="app.navigation.tabs.friends" /></span>
+                                <span>
+                                    <Text id="app.navigation.tabs.friends" />
+                                </span>
                             </ButtonItem>
                         </ConditionalLink>
                     </>
                 )}
-                <ConditionalLink active={obj?.channel_type === "SavedMessages"} to="/open/saved">
+                <ConditionalLink
+                    active={obj?.channel_type === "SavedMessages"}
+                    to="/open/saved">
                     <ButtonItem active={obj?.channel_type === "SavedMessages"}>
                         <Notepad size={20} />
-                        <span><Text id="app.navigation.tabs.saved" /></span>
+                        <span>
+                            <Text id="app.navigation.tabs.saved" />
+                        </span>
                     </ButtonItem>
                 </ConditionalLink>
                 {import.meta.env.DEV && (
                     <Link to="/dev">
                         <ButtonItem active={pathname === "/dev"}>
                             <Wrench size={20} />
-                            <span><Text id="app.navigation.tabs.dev" /></span>
+                            <span>
+                                <Text id="app.navigation.tabs.dev" />
+                            </span>
                         </ButtonItem>
                     </Link>
                 )}
-                <Localizer>
-                    <Category
-                        text={
-                            (
-                                <Text id="app.main.categories.conversations" />
-                            ) as any
-                        }
-                        action={() => openScreen({ id: "special_input", type: "create_group" })}
-                    />
-                </Localizer>
-                {channelsArr.length === 0 && <img src={placeholderSVG} />}
-                {channelsArr.map(x => {
+                <Category
+                    text={<Text id="app.main.categories.conversations" />}
+                    action={() =>
+                        openScreen({
+                            id: "special_input",
+                            type: "create_group",
+                        })
+                    }
+                />
+                {channels.length === 0 && (
+                    <img src={placeholderSVG} loading="eager" />
+                )}
+                {channels.map((x) => {
                     let user;
-                    if (x.channel_type === 'DirectMessage') {
-                        if (!x.active) return null;
-
-                        let recipient = client.channels.getRecipient(x._id);
-                        user = users.find(x => x?._id === recipient);
+                    if (x.channel.channel_type === "DirectMessage") {
+                        if (!x.channel.active) return null;
+                        user = x.channel.recipient;
 
                         if (!user) {
-                            console.warn(`Skipped DM ${x._id} because user was missing.`);
+                            console.warn(
+                                `Skipped DM ${x.channel._id} because user was missing.`,
+                            );
                             return null;
                         }
                     }
-                    
+
                     return (
-                        <ConditionalLink active={x._id === channel} to={`/channel/${x._id}`}>
+                        <ConditionalLink
+                            key={x.channel._id}
+                            active={x.channel._id === channel}
+                            to={`/channel/${x.channel._id}`}>
                             <ChannelButton
                                 user={user}
-                                channel={x}
+                                channel={x.channel}
                                 alert={x.unread}
                                 alertCount={x.alertCount}
-                                active={x._id === channel}
+                                active={x.channel._id === channel}
                             />
                         </ConditionalLink>
                     );
@@ -146,15 +165,14 @@ function HomeSidebar(props: Props) {
             </GenericSidebarList>
         </GenericSidebarBase>
     );
-};
+});
 
 export default connectState(
     HomeSidebar,
-    state => {
+    (state) => {
         return {
-            unreads: state.unreads
+            unreads: state.unreads,
         };
     },
     true,
-    true
 );

src/components/navigation/left/ServerListSidebar.tsx

-import Tooltip from "../../common/Tooltip";
-import IconButton from "../../ui/IconButton";
-import LineDivider from "../../ui/LineDivider";
-import { mapChannelWithUnread } from "./common";
+import { Plus } from "@styled-icons/boxicons-regular";
+import { observer } from "mobx-react-lite";
+import { useHistory, useLocation, useParams } from "react-router-dom";
+import { RelationshipStatus } from "revolt-api/types/Users";
 import styled, { css } from "styled-components";
-import ServerIcon from "../../common/ServerIcon";
-import { Children } from "../../../types/Preact";
-import UserIcon from "../../common/user/UserIcon";
+
+import { attachContextMenu } from "preact-context-menu";
+
+import ConditionalLink from "../../../lib/ConditionalLink";
 import PaintCounter from "../../../lib/PaintCounter";
-import { Plus } from "@styled-icons/boxicons-regular";
+import { isTouchscreenDevice } from "../../../lib/isTouchscreenDevice";
+
 import { connectState } from "../../../redux/connector";
-import { useLocation, useParams } from "react-router-dom";
-import { Unreads } from "../../../redux/reducers/unreads";
-import ConditionalLink from "../../../lib/ConditionalLink";
-import { Channel, Servers } from "revolt.js/dist/api/objects";
 import { LastOpened } from "../../../redux/reducers/last_opened";
-import { isTouchscreenDevice } from "../../../lib/isTouchscreenDevice";
-import { attachContextMenu, openContextMenu } from 'preact-context-menu';
+import { Unreads } from "../../../redux/reducers/unreads";
+
 import { useIntermediate } from "../../../context/intermediate/Intermediate";
-import { useChannels, useForceUpdate, useSelf, useServers } from "../../../context/revoltjs/hooks";
+import { useClient } from "../../../context/revoltjs/RevoltClient";
+
+import ServerIcon from "../../common/ServerIcon";
+import Tooltip from "../../common/Tooltip";
+import UserHover from "../../common/user/UserHover";
+import UserIcon from "../../common/user/UserIcon";
+import IconButton from "../../ui/IconButton";
+import LineDivider from "../../ui/LineDivider";
+import { mapChannelWithUnread } from "./common";
 
-function Icon({ children, unread, size }: { children: Children, unread?: 'mention' | 'unread', size: number }) {
+import { Children } from "../../../types/Preact";
+
+function Icon({
+    children,
+    unread,
+    size,
+}: {
+    children: Children;
+    unread?: "mention" | "unread";
+    size: number;
+}) {
     return (
-        <svg
-            width={size}
-            height={size}
-            aria-hidden="true"
-            viewBox="0 0 32 32"
-        >
+        <svg width={size} height={size} aria-hidden="true" viewBox="0 0 32 32">
             <use href="#serverIndicator" />
-            <foreignObject x="0" y="0" width="32" height="32" mask={ unread ? "url(#server)" : undefined }>
-                { children }
+            <foreignObject
+                x="0"
+                y="0"
+                width="32"
+                height="32"
+                mask={unread ? "url(#server)" : undefined}>
+                {children}
             </foreignObject>
-            {unread === 'unread' && (
-                <circle
-                    cx="27"
-                    cy="5"
-                    r="5"
-                    fill={"white"}
-                />
+            {unread === "unread" && (
+                <circle cx="27" cy="5" r="5" fill={"white"} />
             )}
-            {unread === 'mention' && (
-                <circle
-                    cx="27"
-                    cy="5"
-                    r="5"
-                    fill={"red"}
-                />
+            {unread === "mention" && (
+                <circle cx="27" cy="5" r="5" fill={"var(--error)"} />
             )}
         </svg>
-    )
+    );
 }
 
 const ServersBase = styled.div`
     width: 56px;
     height: 100%;
+    padding-left: 2px;
     display: flex;
     flex-direction: column;
 
-    ${ isTouchscreenDevice && css`
+    ${isTouchscreenDevice &&
+    css`
         padding-bottom: 50px;
-    ` }
+    `}
 `;
 
 const ServerList = styled.div`
     flex-grow: 1;
     display: flex;
     overflow-y: scroll;
-    padding-bottom: 48px;
+    padding-bottom: 20px;
+    /*width: 58px;*/
     flex-direction: column;
-    // border-right: 2px solid var(--accent);
 
     scrollbar-width: none;
 
@@ -79,172 +87,250 @@ const ServerList = styled.div`
     &::-webkit-scrollbar {
         width: 0px;
     }
+
+    /*${isTouchscreenDevice &&
+    css`
+        width: 58px;
+    `}*/
 `;
 
-const ServerEntry = styled.div<{ active: boolean, home?: boolean }>`
+const ServerEntry = styled.div<{ active: boolean; home?: boolean }>`
     height: 58px;
     display: flex;
     align-items: center;
-    justify-content: flex-end;
 
-    > * {
-        // outline: 1px solid red;
+    :focus {
+        outline: 3px solid blue;
     }
 
     > div {
-        width: 46px;
-        height: 46px;
+        height: 42px;
+        padding-inline-start: 6px;
+
         display: grid;
         place-items: center;
-        
+
         border-start-start-radius: 50%;
         border-end-start-radius: 50%;
 
-        ${ props => props.active && css`
-            background: var(--sidebar-active);
-        ` }
-    }
-
-    span {
-        width: 6px;
-        height: 46px;
-
-        ${ props => props.active && css`
-            background-color: var(--sidebar-active);
-
-            &::before, &::after {
-                // outline: 1px solid blue;
-            }
-
-            &::before, &::after {
-                content: "";
-                display: block;
-                position: relative;
+        &:active {
+            transform: translateY(1px);
+        }
 
-                width: 31px;
-                height: 72px;
-                margin-top: -72px;
-                margin-left: -25px;
-                z-index: -1;
+        ${(props) =>
+            props.active &&
+            css`
+                &:active {
+                    transform: none;
+                }
+            `}
+    }
 
-                background-color: var(--background);
-                border-bottom-right-radius: 32px;
+    > span {
+        width: 0;
+        display: relative;
 
-                box-shadow: 0 32px 0 0 var(--sidebar-active);
-            }
+        ${(props) =>
+            !props.active &&
+            css`
+                display: none;
+            `}
 
-            &::after {
-                transform: scaleY(-1) translateY(-118px);
-            }
-        ` }
+        svg {
+            margin-top: 5px;
+            pointer-events: none;
+            // outline: 1px solid red;
+        }
     }
 
-    ${ props => (!props.active || props.home) && css`
-        cursor: pointer;
-    ` }
+    ${(props) =>
+        (!props.active || props.home) &&
+        css`
+            cursor: pointer;
+        `}
 `;
 
+function Swoosh() {
+    return (
+        <span>
+            <svg
+                width="54"
+                height="106"
+                viewBox="0 0 54 106"
+                xmlns="http://www.w3.org/2000/svg">
+                <path
+                    d="M54 53C54 67.9117 41.9117 80 27 80C12.0883 80 0 67.9117 0 53C0 38.0883 12.0883 26 27 26C41.9117 26 54 38.0883 54 53Z"
+                    fill="var(--sidebar-active)"
+                />
+                <path
+                    d="M27 80C4.5 80 54 53 54 53L54.0001 106C54.0001 106 49.5 80 27 80Z"
+                    fill="var(--sidebar-active)"
+                />
+                <path
+                    d="M27 26C4.5 26 54 53 54 53L53.9999 0C53.9999 0 49.5 26 27 26Z"
+                    fill="var(--sidebar-active)"
+                />
+            </svg>
+        </span>
+    );
+}
+
 interface Props {
     unreads: Unreads;
     lastOpened: LastOpened;
 }
 
-export function ServerListSidebar({ unreads, lastOpened }: Props) {
-    const ctx = useForceUpdate();
-    const self = useSelf(ctx);
-    const activeServers = useServers(undefined, ctx) as Servers.Server[];
-    const channels = (useChannels(undefined, ctx) as Channel[])
-        .map(x => mapChannelWithUnread(x, unreads));
-    
-    const unreadChannels = channels.filter(x => x.unread)
-        .map(x => x._id);
-
-    const servers = activeServers.map(server => {
+export const ServerListSidebar = observer(({ unreads, lastOpened }: Props) => {
+    const client = useClient();
+
+    const { server: server_id } = useParams<{ server?: string }>();
+    const server = server_id ? client.servers.get(server_id) : undefined;
+    const activeServers = [...client.servers.values()];
+    const channels = [...client.channels.values()].map((x) =>
+        mapChannelWithUnread(x, unreads),
+    );
+
+    const unreadChannels = channels
+        .filter((x) => x.unread)
+        .map((x) => x.channel?._id);
+
+    const servers = activeServers.map((server) => {
         let alertCount = 0;
-        for (let id of server.channels) {
-            let channel = channels.find(x => x._id === id);
+        for (const id of server.channel_ids) {
+            const channel = channels.find((x) => x.channel?._id === id);
             if (channel?.alertCount) {
                 alertCount += channel.alertCount;
             }
         }
 
         return {
-            ...server,
-            unread: (typeof server.channels.find(x => unreadChannels.includes(x)) !== 'undefined' ?
-                ( alertCount > 0 ? 'mention' : 'unread' ) : undefined) as 'mention' | 'unread' | undefined,
-            alertCount
-        }
+            server,
+            unread: (typeof server.channel_ids.find((x) =>
+                unreadChannels.includes(x),
+            ) !== "undefined"
+                ? alertCount > 0
+                    ? "mention"
+                    : "unread"
+                : undefined) as "mention" | "unread" | undefined,
+            alertCount,
+        };
     });
 
+    const history = useHistory();
     const path = useLocation().pathname;
-    const { server: server_id } = useParams<{ server?: string }>();
-    const server = servers.find(x => x!._id == server_id);
-
     const { openScreen } = useIntermediate();
 
-    let homeUnread: 'mention' | 'unread' | undefined;
+    let homeUnread: "mention" | "unread" | undefined;
     let alertCount = 0;
-    for (let x of channels) {
-        if (((x.channel_type === 'DirectMessage' && x.active) || x.channel_type === 'Group') && x.unread) {
-            homeUnread = 'unread';
+    for (const x of channels) {
+        if (
+            (x.channel?.channel_type === "DirectMessage"
+                ? x.channel?.active
+                : x.channel?.channel_type === "Group") &&
+            x.unread
+        ) {
+            homeUnread = "unread";
             alertCount += x.alertCount ?? 0;
         }
     }
 
-    if (alertCount > 0) homeUnread = 'mention';
-    const homeActive = typeof server === 'undefined' && !path.startsWith('/invite');
+    if (
+        [...client.users.values()].find(
+            (x) => x.relationship === RelationshipStatus.Incoming,
+        )
+    ) {
+        alertCount++;
+    }
+
+    if (alertCount > 0) homeUnread = "mention";
+    const homeActive =
+        typeof server === "undefined" && !path.startsWith("/invite");
 
     return (
         <ServersBase>
             <ServerList>
-                <ConditionalLink active={homeActive} to={lastOpened.home ? `/channel/${lastOpened.home}` : '/'}>
+                <ConditionalLink
+                    active={homeActive}
+                    to={lastOpened.home ? `/channel/${lastOpened.home}` : "/"}>
                     <ServerEntry home active={homeActive}>
-                        <div onContextMenu={attachContextMenu('Status')}
-                            onClick={() => homeActive && openContextMenu("Status")}>
-                            <Icon size={42} unread={homeUnread}>
-                                <UserIcon target={self} size={32} status />
-                            </Icon>
+                        <Swoosh />
+                        <div
+                            onContextMenu={attachContextMenu("Status")}
+                            onClick={() =>
+                                homeActive && history.push("/settings")
+                            }>
+                            <UserHover user={client.user}>
+                                <Icon size={42} unread={homeUnread}>
+                                    <UserIcon
+                                        target={client.user}
+                                        size={32}
+                                        status
+                                        hover
+                                    />
+                                </Icon>
+                            </UserHover>
                         </div>
-                        <span />
                     </ServerEntry>
                 </ConditionalLink>
                 <LineDivider />
-                {
-                    servers.map(entry => {
-                        const active = entry!._id === server?._id;
-                        const id = lastOpened[entry!._id];
-                        
-                        return (
-                            <ConditionalLink active={active} to={`/server/${entry!._id}` + (id ? `/channel/${id}` : '')}>
-                                <ServerEntry
-                                    active={active}
-                                    onContextMenu={attachContextMenu('Menu', { server: entry!._id })}>
-                                    <Tooltip content={entry.name} placement="right">
-                                        <Icon size={42} unread={entry.unread}>
-                                            <ServerIcon size={32} target={entry} />
-                                        </Icon>
-                                    </Tooltip>
-                                    <span />
-                                </ServerEntry>
-                            </ConditionalLink>
-                        )
-                    })
-                }
-                <IconButton onClick={() => openScreen({ id: 'special_input', type: 'create_server' })}>
+                {servers.map((entry) => {
+                    const active = entry.server._id === server?._id;
+                    const id = lastOpened[entry.server._id];
+
+                    return (
+                        <ConditionalLink
+                            key={entry.server._id}
+                            active={active}
+                            to={`/server/${entry.server._id}${
+                                id ? `/channel/${id}` : ""
+                            }`}>
+                            <ServerEntry
+                                active={active}
+                                onContextMenu={attachContextMenu("Menu", {
+                                    server: entry.server._id,
+                                })}>
+                                <Swoosh />
+                                <Tooltip
+                                    content={entry.server.name}
+                                    placement="right">
+                                    <Icon size={42} unread={entry.unread}>
+                                        <ServerIcon
+                                            size={32}
+                                            target={entry.server}
+                                        />
+                                    </Icon>
+                                </Tooltip>
+                            </ServerEntry>
+                        </ConditionalLink>
+                    );
+                })}
+                <IconButton
+                    onClick={() =>
+                        openScreen({
+                            id: "special_input",
+                            type: "create_server",
+                        })
+                    }>
                     <Plus size={36} />
                 </IconButton>
+                {/*<IconButton
+                    onClick={() =>
+                        openScreen({
+                            id: "special_input",
+                            type: "create_server",
+                        })
+                    }>
+                    <Compass size={36} />
+                </IconButton>*/}
                 <PaintCounter small />
             </ServerList>
         </ServersBase>
-    )
-}
+    );
+});
 
-export default connectState(
-    ServerListSidebar,
-    state => {
-        return {
-            unreads: state.unreads,
-            lastOpened: state.lastOpened
-        };
-    }
-);
+export default connectState(ServerListSidebar, (state) => {
+    return {
+        unreads: state.unreads,
+        lastOpened: state.lastOpened,
+    };
+});

src/components/navigation/left/ServerSidebar.tsx

+import { observer } from "mobx-react-lite";
 import { Redirect, useParams } from "react-router";
-import { ChannelButton } from "../items/ButtonItem";
-import { Channels } from "revolt.js/dist/api/objects";
-import { Unreads } from "../../../redux/reducers/unreads";
-import { WithDispatcher } from "../../../redux/reducers";
-import { useChannels, useForceUpdate, useServer } from "../../../context/revoltjs/hooks";
-import { mapChannelWithUnread, useUnreads } from "./common";
-import ConnectionStatus from '../items/ConnectionStatus';
-import { connectState } from "../../../redux/connector";
+import styled, { css } from "styled-components";
+
+import { attachContextMenu } from "preact-context-menu";
+import { useEffect } from "preact/hooks";
+
+import ConditionalLink from "../../../lib/ConditionalLink";
 import PaintCounter from "../../../lib/PaintCounter";
-import styled from "styled-components";
-import { attachContextMenu } from 'preact-context-menu';
+import { isTouchscreenDevice } from "../../../lib/isTouchscreenDevice";
+
+import { dispatch } from "../../../redux";
+import { connectState } from "../../../redux/connector";
+import { Unreads } from "../../../redux/reducers/unreads";
+
+import { useClient } from "../../../context/revoltjs/RevoltClient";
+
+import CollapsibleSection from "../../common/CollapsibleSection";
 import ServerHeader from "../../common/ServerHeader";
-import { useEffect } from "preact/hooks";
 import Category from "../../ui/Category";
-import ConditionalLink from "../../../lib/ConditionalLink";
+import { mapChannelWithUnread, useUnreads } from "./common";
+
+import { ChannelButton } from "../items/ButtonItem";
+import ConnectionStatus from "../items/ConnectionStatus";
 
 interface Props {
     unreads: Unreads;
@@ -26,8 +34,13 @@ const ServerBase = styled.div`
     flex-shrink: 0;
     flex-direction: column;
     background: var(--secondary-background);
-
     border-start-start-radius: 8px;
+    overflow: hidden;
+
+    ${isTouchscreenDevice &&
+    css`
+        padding-bottom: 50px;
+    `}
 `;
 
 const ServerList = styled.div`
@@ -40,46 +53,47 @@ const ServerList = styled.div`
     }
 `;
 
-function ServerSidebar(props: Props & WithDispatcher) {
-    const { server: server_id, channel: channel_id } = useParams<{ server?: string, channel?: string }>();
-    const ctx = useForceUpdate();
+const ServerSidebar = observer((props: Props) => {
+    const client = useClient();
+    const { server: server_id, channel: channel_id } =
+        useParams<{ server: string; channel?: string }>();
 
-    const server = useServer(server_id, ctx);
+    const server = client.servers.get(server_id);
     if (!server) return <Redirect to="/" />;
 
-    const channels = (useChannels(server.channels, ctx)
-        .filter(entry => typeof entry !== 'undefined') as Readonly<Channels.TextChannel | Channels.VoiceChannel>[])
-        .map(x => mapChannelWithUnread(x, props.unreads));
-    
-    const channel = channels.find(x => x?._id === channel_id);
+    const channel = channel_id ? client.channels.get(channel_id) : undefined;
     if (channel_id && !channel) return <Redirect to={`/server/${server_id}`} />;
-    if (channel) useUnreads({ ...props, channel }, ctx);
+    if (channel) useUnreads({ ...props, channel });
 
     useEffect(() => {
         if (!channel_id) return;
 
-        props.dispatcher({
-            type: 'LAST_OPENED_SET',
+        dispatch({
+            type: "LAST_OPENED_SET",
             parent: server_id!,
-            child: channel_id!
+            child: channel_id!,
         });
-    }, [ channel_id ]);
+    }, [channel_id, server_id]);
+
+    const uncategorised = new Set(server.channel_ids);
+    const elements = [];
 
-    let uncategorised = new Set(server.channels);
-    let elements = [];
     function addChannel(id: string) {
-        const entry = channels.find(x => x._id === id);
+        const entry = client.channels.get(id);
         if (!entry) return;
 
         const active = channel?._id === entry._id;
 
         return (
-            <ConditionalLink active={active} to={`/server/${server!._id}/channel/${entry._id}`}>
+            <ConditionalLink
+                key={entry._id}
+                active={active}
+                to={`/server/${server!._id}/channel/${entry._id}`}>
                 <ChannelButton
-                    key={entry._id}
                     channel={entry}
                     active={active}
-                    alert={entry.unread}
+                    // ! FIXME: pull it out directly
+                    alert={mapChannelWithUnread(entry, props.unreads).unread}
                     compact
                 />
             </ConditionalLink>
@@ -87,38 +101,45 @@ function ServerSidebar(props: Props & WithDispatcher) {
     }
 
     if (server.categories) {
-        for (let category of server.categories) {
-            elements.push(<Category text={category.title} />);
-
-            for (let id of category.channels) {
+        for (const category of server.categories) {
+            const channels = [];
+            for (const id of category.channels) {
                 uncategorised.delete(id);
-                elements.push(addChannel(id));
+                channels.push(addChannel(id));
             }
+
+            elements.push(
+                <CollapsibleSection
+                    id={`category_${category.id}`}
+                    defaultValue
+                    summary={<Category text={category.title} />}>
+                    {channels}
+                </CollapsibleSection>,
+            );
         }
     }
 
-    for (let id of uncategorised) {
+    for (const id of Array.from(uncategorised).reverse()) {
         elements.unshift(addChannel(id));
     }
 
     return (
         <ServerBase>
-            <ServerHeader server={server} ctx={ctx} />
+            <ServerHeader server={server} />
             <ConnectionStatus />
-            <ServerList onContextMenu={attachContextMenu('Menu', { server_list: server._id })}>
-                { elements }
+            <ServerList
+                onContextMenu={attachContextMenu("Menu", {
+                    server_list: server._id,
+                })}>
+                {elements}
             </ServerList>
             <PaintCounter small />
         </ServerBase>
-    )
-};
-
-export default connectState(
-    ServerSidebar,
-    state => {
-        return {
-            unreads: state.unreads
-        };
-    },
-    true
-);
+    );
+});
+
+export default connectState(ServerSidebar, (state) => {
+    return {
+        unreads: state.unreads,
+    };
+});

src/components/navigation/left/common.ts

-import { Channel } from "revolt.js";
+import { reaction } from "mobx";
+import { Channel } from "revolt.js/dist/maps/Channels";
+
 import { useLayoutEffect } from "preact/hooks";
-import { WithDispatcher } from "../../../redux/reducers";
+
+import { dispatch } from "../../../redux";
 import { Unreads } from "../../../redux/reducers/unreads";
-import { HookContext, useForceUpdate } from "../../../context/revoltjs/hooks";
 
-type UnreadProps = WithDispatcher & {
+type UnreadProps = {
     channel: Channel;
     unreads: Unreads;
-}
-
-export function useUnreads({ channel, unreads, dispatcher }: UnreadProps, context?: HookContext) {
-    const ctx = useForceUpdate(context);
+};
 
+export function useUnreads({ channel, unreads }: UnreadProps) {
     useLayoutEffect(() => {
-        function checkUnread(target?: Channel) {
+        function checkUnread(target: Channel) {
             if (!target) return;
             if (target._id !== channel._id) return;
-            if (target.channel_type === "SavedMessages" ||
-                target.channel_type === "VoiceChannel") return;
+            if (
+                target.channel_type === "SavedMessages" ||
+                target.channel_type === "VoiceChannel"
+            )
+                return;
 
             const unread = unreads[channel._id]?.last_id;
             if (target.last_message) {
-                const message = typeof target.last_message === 'string' ? target.last_message : target.last_message._id;
+                const message =
+                    typeof target.last_message === "string"
+                        ? target.last_message
+                        : target.last_message._id;
                 if (!unread || (unread && message.localeCompare(unread) > 0)) {
-                    dispatcher({
+                    dispatch({
                         type: "UNREADS_MARK_READ",
                         channel: channel._id,
-                        message
+                        message,
                     });
-                    
-                    ctx.client.req('PUT', `/channels/${channel._id}/ack/${message}` as '/channels/id/ack/id');
+
+                    channel.ack(message);
                 }
             }
         }
 
         checkUnread(channel);
-
-        ctx.client.channels.addListener("mutation", checkUnread);
-        return () => ctx.client.channels.removeListener("mutation", checkUnread);
+        return reaction(
+            () => channel.last_message,
+            () => checkUnread(channel),
+        );
     }, [channel, unreads]);
 }
 
 export function mapChannelWithUnread(channel: Channel, unreads: Unreads) {
     let last_message_id;
-    if (channel.channel_type === 'DirectMessage' || channel.channel_type === 'Group') {
-        last_message_id = channel.last_message?._id;
-    } else if (channel.channel_type === 'TextChannel') {
-        last_message_id = channel.last_message;
+    if (
+        channel.channel_type === "DirectMessage" ||
+        channel.channel_type === "Group"
+    ) {
+        last_message_id = (channel.last_message as { _id: string })?._id;
+    } else if (channel.channel_type === "TextChannel") {
+        last_message_id = channel.last_message as string;
     } else {
-        return { ...channel, unread: undefined, alertCount: undefined, timestamp: channel._id };
+        return {
+            channel,
+            unread: undefined,
+            alertCount: undefined,
+            timestamp: channel._id,
+        };
     }
 
-    let unread: 'mention' | 'unread' | undefined;
+    let unread: "mention" | "unread" | undefined;
     let alertCount: undefined | number;
     if (last_message_id && unreads) {
         const u = unreads[channel._id];
         if (u) {
             if (u.mentions && u.mentions.length > 0) {
                 alertCount = u.mentions.length;
-                unread = 'mention';
-            } else if (u.last_id && last_message_id.localeCompare(u.last_id) > 0) {
-                unread = 'unread';
+                unread = "mention";
+            } else if (
+                u.last_id &&
+                (last_message_id as string).localeCompare(u.last_id) > 0
+            ) {
+                unread = "unread";
             }
         } else {
-            unread = 'unread';
+            unread = "unread";
         }
     }
 
     return {
-        ...channel,
+        channel,
         timestamp: last_message_id ?? channel._id,
         unread,
-        alertCount
+        alertCount,
     };
 }

src/components/navigation/right/ChannelDebugInfo.tsx

+/* eslint-disable react-hooks/rules-of-hooks */
 import { useRenderState } from "../../../lib/renderer/Singleton";
 
 interface Props {
@@ -6,7 +7,7 @@ interface Props {
 
 export function ChannelDebugInfo({ id }: Props) {
     if (process.env.NODE_ENV !== "development") return null;
-    let view = useRenderState(id);
+    const view = useRenderState(id);
     if (!view) return null;
 
     return (
@@ -16,21 +17,24 @@ export function ChannelDebugInfo({ id }: Props) {
                     display: "block",
                     fontSize: "12px",
                     textTransform: "uppercase",
-                    fontWeight: "600"
-                }}
-            >
+                    fontWeight: "600",
+                }}>
                 Channel Info
             </span>
             <p style={{ fontSize: "10px", userSelect: "text" }}>
-                State: <b>{ view.type }</b> <br />
-                { view.type === 'RENDER' && view.messages.length > 0 &&
+                State: <b>{view.type}</b> <br />
+                {view.type === "RENDER" && view.messages.length > 0 && (
                     <>
                         Start: <b>{view.messages[0]._id}</b> <br />
-                        End: <b>{view.messages[view.messages.length - 1]._id}</b> <br />
+                        End:{" "}
+                        <b>
+                            {view.messages[view.messages.length - 1]._id}
+                        </b>{" "}
+                        <br />
                         At Top: <b>{view.atTop ? "Yes" : "No"}</b> <br />
                         At Bottom: <b>{view.atBottom ? "Yes" : "No"}</b>
                     </>
-                }
+                )}
             </p>
         </span>
     );