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 { dispatch } from "../../../redux";
 import { Unreads } from "../../../redux/reducers/unreads";
 
-import { HookContext, useForceUpdate } from "../../../context/revoltjs/hooks";
-
 type UnreadProps = {
     channel: Channel;
     unreads: Unreads;
 };
 
-export function useUnreads(
-    { channel, unreads }: 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 (
@@ -41,19 +35,16 @@ export function useUnreads(
                         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]);
 }
 
@@ -63,12 +54,12 @@ export function mapChannelWithUnread(channel: Channel, unreads: Unreads) {
         channel.channel_type === "DirectMessage" ||
         channel.channel_type === "Group"
     ) {
-        last_message_id = channel.last_message?._id;
+        last_message_id = (channel.last_message as { _id: string })?._id;
     } else if (channel.channel_type === "TextChannel") {
-        last_message_id = channel.last_message;
+        last_message_id = channel.last_message as string;
     } else {
         return {
-            ...channel,
+            channel,
             unread: undefined,
             alertCount: undefined,
             timestamp: channel._id,
@@ -85,7 +76,7 @@ export function mapChannelWithUnread(channel: Channel, unreads: Unreads) {
                 unread = "mention";
             } else if (
                 u.last_id &&
-                last_message_id.localeCompare(u.last_id) > 0
+                (last_message_id as string).localeCompare(u.last_id) > 0
             ) {
                 unread = "unread";
             }
@@ -95,7 +86,7 @@ export function mapChannelWithUnread(channel: Channel, unreads: Unreads) {
     }
 
     return {
-        ...channel,
+        channel,
         timestamp: last_message_id ?? channel._id,
         unread,
         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 (

src/components/navigation/right/MemberSidebar.tsx

-import { useParams } from "react-router";
-import { User } from "revolt.js";
-import { Channels, Servers, Users } from "revolt.js/dist/api/objects";
-import { ClientboundNotification } from "revolt.js/dist/websocket/notifications";
+/* eslint-disable react-hooks/rules-of-hooks */
+import { observer } from "mobx-react-lite";
+import { Link, useParams } from "react-router-dom";
+import { Presence } from "revolt-api/types/Users";
+import { Channel } from "revolt.js/dist/maps/Channels";
+import { Message } from "revolt.js/dist/maps/Messages";
 
 import { Text } from "preact-i18n";
 import { useContext, useEffect, useState } from "preact/hooks";
 
+import { getState } from "../../../redux";
+
 import { useIntermediate } from "../../../context/intermediate/Intermediate";
 import {
-    AppContext,
     ClientStatus,
     StatusContext,
+    useClient,
 } from "../../../context/revoltjs/RevoltClient";
-import {
-    HookContext,
-    useChannel,
-    useForceUpdate,
-    useUsers,
-} from "../../../context/revoltjs/hooks";
 
 import CollapsibleSection from "../../common/CollapsibleSection";
+import Button from "../../ui/Button";
 import Category from "../../ui/Category";
+import InputBox from "../../ui/InputBox";
 import Preloader from "../../ui/Preloader";
 import placeholderSVG from "../items/placeholder.svg";
 
@@ -28,36 +28,30 @@ import { GenericSidebarBase, GenericSidebarList } from "../SidebarBase";
 import { UserButton } from "../items/ButtonItem";
 import { ChannelDebugInfo } from "./ChannelDebugInfo";
 
-interface Props {
-    ctx: HookContext;
-}
-
-export default function MemberSidebar(props: { channel?: Channels.Channel }) {
-    const ctx = useForceUpdate();
-    const { channel: cid } = useParams<{ channel: string }>();
-    const channel = props.channel ?? useChannel(cid, ctx);
+export default function MemberSidebar({ channel: obj }: { channel?: Channel }) {
+    const { channel: channel_id } = useParams<{ channel: string }>();
+    const client = useClient();
+    const channel = obj ?? client.channels.get(channel_id);
 
     switch (channel?.channel_type) {
         case "Group":
-            return <GroupMemberSidebar channel={channel} ctx={ctx} />;
+            return <GroupMemberSidebar channel={channel} />;
         case "TextChannel":
-            return <ServerMemberSidebar channel={channel} ctx={ctx} />;
+            return <ServerMemberSidebar channel={channel} />;
         default:
             return null;
     }
 }
 
-export function GroupMemberSidebar({
-    channel,
-    ctx,
-}: Props & { channel: Channels.GroupChannel }) {
-    const { openScreen } = useIntermediate();
-    const users = useUsers(undefined, ctx);
-    let members = channel.recipients
-        .map((x) => users.find((y) => y?._id === x))
-        .filter((x) => typeof x !== "undefined") as User[];
-
-    /*const voice = useContext(VoiceContext);
+export const GroupMemberSidebar = observer(
+    ({ channel }: { channel: Channel }) => {
+        const { openScreen } = useIntermediate();
+
+        const members = channel.recipients?.filter(
+            (x) => typeof x !== "undefined",
+        );
+
+        /*const voice = useContext(VoiceContext);
     const voiceActive = voice.roomId === channel._id;
 
     let voiceParticipants: User[] = [];
@@ -72,32 +66,34 @@ export function GroupMemberSidebar({
         voiceParticipants.sort((a, b) => a.username.localeCompare(b.username));
     }*/
 
-    members.sort((a, b) => {
-        // ! FIXME: should probably rewrite all this code
-        let l =
-            +(
-                (a.online && a.status?.presence !== Users.Presence.Invisible) ??
-                false
-            ) | 0;
-        let r =
-            +(
-                (b.online && b.status?.presence !== Users.Presence.Invisible) ??
-                false
-            ) | 0;
-
-        let n = r - l;
-        if (n !== 0) {
-            return n;
-        }
-
-        return a.username.localeCompare(b.username);
-    });
+        members?.sort((a, b) => {
+            // ! FIXME: should probably rewrite all this code
+            const l =
+                +(
+                    (a!.online && a!.status?.presence !== Presence.Invisible) ??
+                    false
+                ) | 0;
+            const r =
+                +(
+                    (b!.online && b!.status?.presence !== Presence.Invisible) ??
+                    false
+                ) | 0;
 
-    return (
-        <GenericSidebarBase>
-            <GenericSidebarList>
-                <ChannelDebugInfo id={channel._id} />
-                {/*voiceActive && voiceParticipants.length !== 0 && (
+            const n = r - l;
+            if (n !== 0) {
+                return n;
+            }
+
+            return a!.username.localeCompare(b!.username);
+        });
+
+        return (
+            <GenericSidebarBase>
+                <GenericSidebarList>
+                    <ChannelDebugInfo id={channel._id} />
+                    <Search channel={channel} />
+
+                    {/*voiceActive && voiceParticipants.length !== 0 && (
                     <Fragment>
                         <Category
                             type="members"
@@ -122,123 +118,6 @@ export function GroupMemberSidebar({
                         )}
                     </Fragment>
                 )*/}
-                <CollapsibleSection
-                    sticky
-                    id="members"
-                    defaultValue
-                    summary={
-                        <Category
-                            variant="uniform"
-                            text={
-                                <span>
-                                    <Text id="app.main.categories.members" /> —{" "}
-                                    {channel.recipients.length}
-                                </span>
-                            }
-                        />
-                    }>
-                    {members.length === 0 && <img src={placeholderSVG} />}
-                    {members.map(
-                        (user) =>
-                            user && (
-                                <UserButton
-                                    key={user._id}
-                                    user={user}
-                                    context={channel}
-                                    onClick={() =>
-                                        openScreen({
-                                            id: "profile",
-                                            user_id: user._id,
-                                        })
-                                    }
-                                />
-                            ),
-                    )}
-                </CollapsibleSection>
-            </GenericSidebarList>
-        </GenericSidebarBase>
-    );
-}
-
-export function ServerMemberSidebar({
-    channel,
-    ctx,
-}: Props & { channel: Channels.TextChannel }) {
-    const [members, setMembers] = useState<Servers.Member[] | undefined>(
-        undefined,
-    );
-    const users = useUsers(members?.map((x) => x._id.user) ?? []).filter(
-        (x) => typeof x !== "undefined",
-        ctx,
-    ) as Users.User[];
-    const { openScreen } = useIntermediate();
-    const status = useContext(StatusContext);
-    const client = useContext(AppContext);
-
-    useEffect(() => {
-        if (status === ClientStatus.ONLINE && typeof members === "undefined") {
-            client.servers.members
-                .fetchMembers(channel.server)
-                .then((members) => setMembers(members));
-        }
-    }, [status]);
-
-    // ! FIXME: temporary code
-    useEffect(() => {
-        function onPacket(packet: ClientboundNotification) {
-            if (!members) return;
-            if (packet.type === "ServerMemberJoin") {
-                if (packet.id !== channel.server) return;
-                setMembers([
-                    ...members,
-                    { _id: { server: packet.id, user: packet.user } },
-                ]);
-            } else if (packet.type === "ServerMemberLeave") {
-                if (packet.id !== channel.server) return;
-                setMembers(
-                    members.filter(
-                        (x) =>
-                            !(
-                                x._id.user === packet.user &&
-                                x._id.server === packet.id
-                            ),
-                    ),
-                );
-            }
-        }
-
-        client.addListener("packet", onPacket);
-        return () => client.removeListener("packet", onPacket);
-    }, [members]);
-
-    // copy paste from above
-    users.sort((a, b) => {
-        // ! FIXME: should probably rewrite all this code
-        let l =
-            +(
-                (a.online && a.status?.presence !== Users.Presence.Invisible) ??
-                false
-            ) | 0;
-        let r =
-            +(
-                (b.online && b.status?.presence !== Users.Presence.Invisible) ??
-                false
-            ) | 0;
-
-        let n = r - l;
-        if (n !== 0) {
-            return n;
-        }
-
-        return a.username.localeCompare(b.username);
-    });
-
-    return (
-        <GenericSidebarBase>
-            <GenericSidebarList>
-                <ChannelDebugInfo id={channel._id} />
-                <div>{!members && <Preloader type="ring" />}</div>
-                {members && (
                     <CollapsibleSection
                         sticky
                         id="members"
@@ -249,19 +128,21 @@ export function ServerMemberSidebar({
                                 text={
                                     <span>
                                         <Text id="app.main.categories.members" />{" "}
-                                        — {users.length}
+                                        — {channel.recipients?.length ?? 0}
                                     </span>
                                 }
                             />
                         }>
-                        {users.length === 0 && <img src={placeholderSVG} />}
-                        {users.map(
+                        {members?.length === 0 && (
+                            <img src={placeholderSVG} loading="eager" />
+                        )}
+                        {members?.map(
                             (user) =>
                                 user && (
                                     <UserButton
                                         key={user._id}
                                         user={user}
-                                        context={channel}
+                                        context={channel!}
                                         onClick={() =>
                                             openScreen({
                                                 id: "profile",
@@ -272,8 +153,168 @@ export function ServerMemberSidebar({
                                 ),
                         )}
                     </CollapsibleSection>
-                )}
-            </GenericSidebarList>
-        </GenericSidebarBase>
+                </GenericSidebarList>
+            </GenericSidebarBase>
+        );
+    },
+);
+
+export const ServerMemberSidebar = observer(
+    ({ channel }: { channel: Channel }) => {
+        const client = useClient();
+        const { openScreen } = useIntermediate();
+        const status = useContext(StatusContext);
+
+        useEffect(() => {
+            if (status === ClientStatus.ONLINE) {
+                channel.server!.fetchMembers();
+            }
+        }, [status, channel.server]);
+
+        const users = [...client.members.keys()]
+            .map((x) => JSON.parse(x))
+            .filter((x) => x.server === channel.server_id)
+            .map((y) => client.users.get(y.user)!)
+            .filter((z) => typeof z !== "undefined");
+
+        // copy paste from above
+        users.sort((a, b) => {
+            // ! FIXME: should probably rewrite all this code
+            const l =
+                +(
+                    (a.online && a.status?.presence !== Presence.Invisible) ??
+                    false
+                ) | 0;
+            const r =
+                +(
+                    (b.online && b.status?.presence !== Presence.Invisible) ??
+                    false
+                ) | 0;
+
+            const n = r - l;
+            if (n !== 0) {
+                return n;
+            }
+
+            return a.username.localeCompare(b.username);
+        });
+
+        return (
+            <GenericSidebarBase>
+                <GenericSidebarList>
+                    <ChannelDebugInfo id={channel._id} />
+                    <Search channel={channel} />
+                    <div>{users.length === 0 && <Preloader type="ring" />}</div>
+                    {users.length > 0 && (
+                        <CollapsibleSection
+                            //sticky //will re-add later, need to fix css
+                            id="members"
+                            defaultValue
+                            summary={
+                                <span>
+                                    <Text id="app.main.categories.members" /> —{" "}
+                                    {users?.length ?? 0}
+                                </span>
+                            }>
+                            {users.map(
+                                (user) =>
+                                    user && (
+                                        <UserButton
+                                            key={user._id}
+                                            user={user}
+                                            context={channel}
+                                            onClick={() =>
+                                                openScreen({
+                                                    id: "profile",
+                                                    user_id: user._id,
+                                                })
+                                            }
+                                        />
+                                    ),
+                            )}
+                        </CollapsibleSection>
+                    )}
+                </GenericSidebarList>
+            </GenericSidebarBase>
+        );
+    },
+);
+
+function Search({ channel }: { channel: Channel }) {
+    if (!getState().experiments.enabled?.includes("search")) return null;
+
+    type Sort = "Relevance" | "Latest" | "Oldest";
+    const [sort, setSort] = useState<Sort>("Relevance");
+
+    const [query, setV] = useState("");
+    const [results, setResults] = useState<Message[]>([]);
+
+    async function search() {
+        const data = await channel.searchWithUsers({ query, sort });
+        setResults(data.messages);
+    }
+
+    return (
+        <CollapsibleSection
+            sticky
+            id="search"
+            defaultValue={false}
+            summary={
+                <>
+                    <Text id="app.main.channel.search.title" /> (BETA)
+                </>
+            }>
+            <div style={{ display: "flex" }}>
+                {["Relevance", "Latest", "Oldest"].map((key) => (
+                    <Button
+                        key={key}
+                        style={{ flex: 1, minWidth: 0 }}
+                        compact
+                        error={sort === key}
+                        onClick={() => setSort(key as Sort)}>
+                        <Text
+                            id={`app.main.channel.search.sort.${key.toLowerCase()}`}
+                        />
+                    </Button>
+                ))}
+            </div>
+            <InputBox
+                style={{ width: "100%" }}
+                onKeyDown={(e) => e.key === "Enter" && search()}
+                value={query}
+                onChange={(e) => setV(e.currentTarget.value)}
+            />
+            <div
+                style={{
+                    display: "flex",
+                    flexDirection: "column",
+                    gap: "4px",
+                    marginTop: "8px",
+                }}>
+                {results.map((message) => {
+                    let href = "";
+                    if (channel?.channel_type === "TextChannel") {
+                        href += `/server/${channel.server_id}`;
+                    }
+
+                    href += `/channel/${message.channel_id}/${message._id}`;
+
+                    return (
+                        <Link to={href} key={message._id}>
+                            <div
+                                style={{
+                                    margin: "2px",
+                                    padding: "6px",
+                                    background: "var(--primary-background)",
+                                }}>
+                                <b>@{message.author?.username}</b>
+                                <br />
+                                {message.content}
+                            </div>
+                        </Link>
+                    );
+                })}
+            </div>
+        </CollapsibleSection>
     );
 }

src/components/ui/Button.tsx

@@ -6,6 +6,8 @@ interface Props {
     readonly contrast?: boolean;
     readonly plain?: boolean;
     readonly error?: boolean;
+    readonly gold?: boolean;
+    readonly iconbutton?: boolean;
 }
 
 export type ButtonProps = Props &
@@ -29,7 +31,7 @@ export default styled.button<Props>`
     background: var(--primary-background);
     color: var(--foreground);
 
-    border-radius: 4px;
+    border-radius: var(--border-radius);
     cursor: pointer;
     border: none;
 
@@ -51,6 +53,15 @@ export default styled.button<Props>`
         css`
             height: 32px !important;
             padding: 2px 12px !important;
+            font-size: 13px;
+        `}
+
+    ${(props) =>
+        props.iconbutton &&
+        css`
+            height: 38px !important;
+            width: 38px !important;
+            min-width: unset !important;
         `}
 
     ${(props) =>
@@ -102,6 +113,7 @@ export default styled.button<Props>`
         props.error &&
         css`
             color: white;
+            font-weight: 600;
             background: var(--error);
 
             &:hover {
@@ -114,4 +126,22 @@ export default styled.button<Props>`
                 background: var(--error);
             }
         `}
+    
+    ${(props) =>
+        props.gold &&
+        css`
+            color: black;
+            font-weight: 600;
+            background: goldenrod;
+
+            &:hover {
+                filter: brightness(1.2);
+                background: goldenrod;
+            }
+
+            &:disabled {
+                cursor: not-allowed;
+                background: goldenrod;
+            }
+        `}
 `;

src/components/ui/Category.tsx

@@ -44,7 +44,7 @@ type Props = Omit<
 };
 
 export default function Category(props: Props) {
-    let { text, action, ...otherProps } = props;
+    const { text, action, ...otherProps } = props;
 
     return (
         <CategoryBase {...otherProps}>

src/components/ui/Checkbox.tsx

@@ -4,12 +4,12 @@ import styled, { css } from "styled-components";
 import { Children } from "../../types/Preact";
 
 const CheckboxBase = styled.label`
-    margin-top: 20px;
     gap: 4px;
     z-index: 1;
     display: flex;
-    border-radius: 4px;
+    margin-top: 20px;
     align-items: center;
+    border-radius: var(--border-radius);
 
     cursor: pointer;
     font-size: 18px;
@@ -57,9 +57,9 @@ const Checkmark = styled.div<{ checked: boolean }>`
     height: 24px;
     display: grid;
     flex-shrink: 0;
-    border-radius: 4px;
     place-items: center;
     transition: 0.2s ease all;
+    border-radius: var(--border-radius);
     background: var(--secondary-background);
 
     svg {

src/components/ui/ColourSwatches.tsx

@@ -34,21 +34,40 @@ const presets = [
 ];
 
 const SwatchesBase = styled.div`
-    gap: 8px;
+    /*gap: 8px;*/
     display: flex;
 
     input {
+        width: 0;
+        height: 0;
+        top: 72px;
         opacity: 0;
-        margin-top: 44px;
-        position: absolute;
+        padding: 0;
+        border: 0;
+        position: relative;
         pointer-events: none;
     }
+
+    .overlay {
+        position: relative;
+        width: 0;
+
+        div {
+            width: 8px;
+            height: 68px;
+            background: linear-gradient(
+                to right,
+                var(--primary-background),
+                transparent
+            );
+        }
+    }
 `;
 
 const Swatch = styled.div<{ type: "small" | "large"; colour: string }>`
     flex-shrink: 0;
     cursor: pointer;
-    border-radius: 4px;
+    border-radius: var(--border-radius);
     background-color: ${(props) => props.colour};
 
     display: grid;
@@ -83,11 +102,14 @@ const Rows = styled.div`
     gap: 8px;
     display: flex;
     flex-direction: column;
+    overflow: auto;
+    padding-bottom: 4px;
 
     > div {
         gap: 8px;
         display: flex;
         flex-direction: row;
+        padding-inline-start: 8px;
     }
 `;
 
@@ -96,18 +118,23 @@ export default function ColourSwatches({ value, onChange }: Props) {
 
     return (
         <SwatchesBase>
-            <Swatch
-                colour={value}
-                type="large"
-                onClick={() => ref.current?.click()}>
-                <Palette size={32} />
-            </Swatch>
             <input
                 type="color"
                 value={value}
                 ref={ref}
                 onChange={(ev) => onChange(ev.currentTarget.value)}
             />
+            <Swatch
+                colour={value}
+                type="large"
+                onClick={() => ref.current?.click()}>
+                <Palette size={32} />
+            </Swatch>
+
+            <div class="overlay">
+                <div />
+            </div>
+
             <Rows>
                 {presets.map((row, i) => (
                     <div key={i}>

src/components/ui/ComboBox.tsx

 import styled from "styled-components";
 
 export default styled.select`
+    width: 100%;
     padding: 10px;
-    border-radius: 6px;
+    cursor: pointer;
+    border-radius: var(--border-radius);
+
     font-family: inherit;
+    font-size: var(--text-size);
     color: var(--secondary-foreground);
     background: var(--secondary-background);
-    font-size: var(--text-size);
+
     border: none;
     outline: 2px solid transparent;
-    transition: outline-color 0.2s ease-in-out;
     transition: box-shadow 0.2s ease-in-out;
-    cursor: pointer;
-    width: 100%;
+    transition: outline-color 0.2s ease-in-out;
 
     &:focus {
         box-shadow: 0 0 0 1.5pt var(--accent);

src/components/ui/DateDivider.tsx

@@ -14,7 +14,8 @@ const Base = styled.div<{ unread?: boolean }>`
         margin-top: -2px;
         font-size: 0.6875rem;
         line-height: 0.6875rem;
-        padding: 2px 5px 2px 0;
+        padding: 2px 0 2px 0;
+        padding-inline-end: 5px;
         color: var(--tertiary-foreground);
         background: var(--primary-background);
     }

src/components/ui/Header.tsx

@@ -25,6 +25,11 @@ export default styled.div<Props>`
         flex-shrink: 0;
     }
 
+    .menu {
+        margin-inline-end: 8px;
+        color: var(--secondary-foreground);
+    }
+
     /*@media only screen and (max-width: 768px) {
         padding: 0 12px;
     }*/

src/components/ui/InputBox.tsx

@@ -6,9 +6,9 @@ interface Props {
 
 export default styled.input<Props>`
     z-index: 1;
-    padding: 8px 16px;
-    border-radius: 6px;
     font-size: 1rem;
+    padding: 8px 16px;
+    border-radius: var(--border-radius);
 
     font-family: inherit;
     color: var(--foreground);

src/components/ui/Masks.tsx

@@ -12,6 +12,10 @@ export default function Masks() {
                     <rect x="0" y="0" width="32" height="32" fill="white" />
                     <circle cx="27" cy="27" r="7" fill={"black"} />
                 </mask>
+                <mask id="session">
+                    <rect x="0" y="0" width="32" height="32" fill="white" />
+                    <circle cx="26" cy="28" r="10" fill={"black"} />
+                </mask>
                 <mask id="overlap">
                     <rect x="0" y="0" width="32" height="32" fill="white" />
                     <circle cx="32" cy="16" r="18" fill={"black"} />

src/components/ui/Modal.tsx

+/* eslint-disable react-hooks/rules-of-hooks */
 import styled, { css, keyframes } from "styled-components";
 
-import { createPortal, useEffect } from "preact/compat";
+import { createPortal, useCallback, useEffect, useState } from "preact/compat";
+
+import { internalSubscribe } from "../../lib/eventEmitter";
 
 import { Children } from "../../types/Preact";
 import Button, { ButtonProps } from "./Button";
@@ -11,12 +14,23 @@ const open = keyframes`
     100% {opacity: 1;}
 `;
 
+const close = keyframes`
+    0% {opacity: 1;}
+    70% {opacity: 0;}
+    100% {opacity: 0;}
+`;
+
 const zoomIn = keyframes`
     0% {transform: scale(0.5);}
     98% {transform: scale(1.01);}
     100% {transform: scale(1);}
 `;
 
+const zoomOut = keyframes`
+    0% {transform: scale(1);}
+    100% {transform: scale(0.5);}
+`;
+
 const ModalBase = styled.div`
     top: 0;
     left: 0;
@@ -36,12 +50,20 @@ const ModalBase = styled.div`
 
     color: var(--foreground);
     background: rgba(0, 0, 0, 0.8);
+
+    &.closing {
+        animation-name: ${close};
+    }
+
+    &.closing > div {
+        animation-name: ${zoomOut};
+    }
 `;
 
 const ModalContainer = styled.div`
     overflow: hidden;
-    border-radius: 8px;
     max-width: calc(100vw - 20px);
+    border-radius: var(--border-radius);
 
     animation-name: ${zoomIn};
     animation-duration: 0.25s;
@@ -51,8 +73,8 @@ const ModalContainer = styled.div`
 const ModalContent = styled.div<
     { [key in "attachment" | "noBackground" | "border" | "padding"]?: boolean }
 >`
-    border-radius: 8px;
     text-overflow: ellipsis;
+    border-radius: var(--border-radius);
 
     h3 {
         margin-top: 0;
@@ -78,13 +100,13 @@ const ModalContent = styled.div<
     ${(props) =>
         props.attachment &&
         css`
-            border-radius: 8px 8px 0 0;
+            border-radius: var(--border-radius) var(--border-radius) 0 0;
         `}
 
     ${(props) =>
         props.border &&
         css`
-            border-radius: 10px;
+            border-radius: var(--border-radius);
             border: 2px solid var(--secondary-background);
         `}
 `;
@@ -113,17 +135,19 @@ interface Props {
     dontModal?: boolean;
     padding?: boolean;
 
-    onClose: () => void;
+    onClose?: () => void;
     actions?: Action[];
     disabled?: boolean;
     border?: boolean;
     visible: boolean;
 }
 
+export let isModalClosing = false;
+
 export default function Modal(props: Props) {
     if (!props.visible) return null;
 
-    let content = (
+    const content = (
         <ModalContent
             attachment={!!props.actions}
             noBackground={props.noBackground}
@@ -138,26 +162,36 @@ export default function Modal(props: Props) {
         return content;
     }
 
+    const [animateClose, setAnimateClose] = useState(false);
+    isModalClosing = animateClose;
+    const onClose = useCallback(() => {
+        setAnimateClose(true);
+        setTimeout(() => props.onClose?.(), 2e2);
+    }, [setAnimateClose, props]);
+
+    useEffect(() => internalSubscribe("Modal", "close", onClose), [onClose]);
+
     useEffect(() => {
         if (props.disallowClosing) return;
 
         function keyDown(e: KeyboardEvent) {
             if (e.key === "Escape") {
-                props.onClose();
+                onClose();
             }
         }
 
         document.body.addEventListener("keydown", keyDown);
         return () => document.body.removeEventListener("keydown", keyDown);
-    }, [props.disallowClosing, props.onClose]);
+    }, [props.disallowClosing, onClose]);
 
-    let confirmationAction = props.actions?.find(
+    const confirmationAction = props.actions?.find(
         (action) => action.confirmation,
     );
+
     useEffect(() => {
         if (!confirmationAction) return;
 
-        // ! FIXME: this may be done better if we
+        // ! TODO: this may be done better if we
         // ! can focus the button although that
         // ! doesn't seem to work...
         function keyDown(e: KeyboardEvent) {
@@ -172,13 +206,18 @@ export default function Modal(props: Props) {
 
     return createPortal(
         <ModalBase
+            className={animateClose ? "closing" : undefined}
             onClick={(!props.disallowClosing && props.onClose) || undefined}>
             <ModalContainer onClick={(e) => (e.cancelBubble = true)}>
                 {content}
                 {props.actions && (
                     <ModalActions>
-                        {props.actions.map((x) => (
-                            <Button {...x} disabled={props.disabled} />
+                        {props.actions.map((x, index) => (
+                            <Button
+                                key={index}
+                                {...x}
+                                disabled={props.disabled}
+                            />
                         ))}
                     </ModalActions>
                 )}

src/components/ui/Overline.tsx

@@ -8,13 +8,19 @@ type Props = Omit<JSX.HTMLAttributes<HTMLDivElement>, "children" | "as"> & {
     error?: string;
     block?: boolean;
     spaced?: boolean;
+    noMargin?: boolean;
     children?: Children;
     type?: "default" | "subtle" | "error";
 };
 
 const OverlineBase = styled.div<Omit<Props, "children" | "error">>`
     display: inline;
-    margin: 0.4em 0;
+
+    ${(props) =>
+        !props.noMargin &&
+        css`
+            margin: 0.4em 0;
+        `}
 
     ${(props) =>
         props.spaced &&

src/components/ui/Radio.tsx

@@ -27,8 +27,8 @@ const RadioBase = styled.label<BaseProps>`
     font-size: 1rem;
     font-weight: 600;
     user-select: none;
-    border-radius: 4px;
     transition: 0.2s ease all;
+    border-radius: var(--border-radius);
 
     &:hover {
         background: var(--hover);

src/components/ui/TextArea.tsx

@@ -30,7 +30,7 @@ export default styled.textarea<TextAreaProps>`
     ${(props) =>
         !props.hideBorder &&
         css`
-            border-radius: 4px;
+            border-radius: var(--border-radius);
             transition: border-color 0.2s ease-in-out;
             border: var(--input-border-width) solid transparent;
         `}
@@ -48,7 +48,7 @@ export default styled.textarea<TextAreaProps>`
     ${(props) =>
         props.code
             ? css`
-                  font-family: var(--monoscape-font-font), monospace;
+                  font-family: var(--monospace-font), monospace;
               `
             : css`
                   font-family: inherit;

src/components/ui/Tip.tsx

@@ -22,8 +22,8 @@ export const TipBase = styled.div<Props>`
     align-items: center;
 
     font-size: 14px;
-    border-radius: 7px;
     background: var(--primary-header);
+    border-radius: var(--border-radius);
     border: 2px solid var(--secondary-header);
 
     a {
@@ -55,14 +55,16 @@ export const TipBase = styled.div<Props>`
         `}
 `;
 
-export default function Tip(props: Props & { children: Children }) {
-    const { children, ...tipProps } = props;
+export default function Tip(
+    props: Props & { children: Children; hideSeparator?: boolean },
+) {
+    const { children, hideSeparator, ...tipProps } = props;
     return (
         <>
-            <Separator />
+            {!hideSeparator && <Separator />}
             <TipBase {...tipProps}>
                 <InfoCircle size={20} />
-                <span>{props.children}</span>
+                <span>{children}</span>
             </TipBase>
         </>
     );

src/components/ui/fluent/CategoryButton.tsx

+import { ChevronRight, LinkExternal } from "@styled-icons/boxicons-regular";
+import styled, { css } from "styled-components";
+
+import { Children } from "../../../types/Preact";
+
+interface BaseProps {
+    readonly hover?: boolean;
+    readonly account?: boolean;
+    readonly disabled?: boolean;
+    readonly largeDescription?: boolean;
+}
+
+const CategoryBase = styled.div<BaseProps>`
+    /*height: 54px;*/
+    padding: 9.8px 12px;
+    border-radius: 6px;
+    margin-bottom: 10px;
+    color: var(--foreground);
+    background: var(--secondary-header);
+    gap: 12px;
+    display: flex;
+    align-items: center;
+    flex-direction: row;
+
+    > svg {
+        flex-shrink: 0;
+    }
+
+    .content {
+        display: flex;
+        flex-grow: 1;
+        flex-direction: column;
+        font-weight: 600;
+        font-size: 14px;
+
+        .title {
+            display: -webkit-box;
+            -webkit-box-orient: vertical;
+            -webkit-line-clamp: 2;
+            overflow: hidden;
+        }
+
+        .description {
+            ${(props) =>
+                props.largeDescription
+                    ? css`
+                          font-size: 14px;
+                      `
+                    : css`
+                          font-size: 11px;
+                      `}
+
+            font-weight: 400;
+            display: -webkit-box;
+            -webkit-box-orient: vertical;
+            -webkit-line-clamp: 3;
+            overflow: hidden;
+
+            a:hover {
+                text-decoration: underline;
+            }
+        }
+    }
+
+    ${(props) =>
+        props.hover &&
+        css`
+            cursor: pointer;
+            opacity: 1;
+            transition: 0.1s ease background-color;
+
+            &:hover {
+                background: var(--secondary-background);
+            }
+        `}
+
+    ${(props) =>
+        props.disabled &&
+        css`
+            opacity: 0.4;
+            /*.content,
+            .action {
+                color: var(--tertiary-foreground);
+            }*/
+
+            .action {
+                font-size: 14px;
+            }
+        `}
+    
+    ${(props) =>
+        props.account &&
+        css`
+            height: 54px;
+
+            .content {
+                text-overflow: ellipsis;
+                overflow: hidden;
+                white-space: nowrap;
+                .title {
+                    text-transform: uppercase;
+                    font-size: 12px;
+                    color: var(--secondary-foreground);
+                }
+
+                .description {
+                    font-size: 15px;
+
+                    text-overflow: ellipsis;
+                    white-space: nowrap;
+                    overflow: hidden;
+                }
+            }
+        `}
+`;
+
+interface Props extends BaseProps {
+    icon?: Children;
+    children?: Children;
+    description?: Children;
+
+    onClick?: () => void;
+    action?: "chevron" | "external" | Children;
+}
+
+export default function CategoryButton({
+    icon,
+    children,
+    description,
+    account,
+    disabled,
+    onClick,
+    hover,
+    action,
+}: Props) {
+    return (
+        <CategoryBase
+            hover={hover || typeof onClick !== "undefined"}
+            onClick={onClick}
+            disabled={disabled}
+            account={account}>
+            {icon}
+            <div class="content">
+                <div className="title">{children}</div>
+
+                <div className="description">{description}</div>
+            </div>
+            <div class="action">
+                {typeof action === "string" ? (
+                    action === "chevron" ? (
+                        <ChevronRight size={24} />
+                    ) : (
+                        <LinkExternal size={20} />
+                    )
+                ) : (
+                    action
+                )}
+            </div>
+        </CategoryBase>
+    );
+}

src/context/Locale.tsx

@@ -5,7 +5,7 @@ import update from "dayjs/plugin/updateLocale";
 import defaultsDeep from "lodash.defaultsdeep";
 
 import { IntlProvider } from "preact-i18n";
-import { useEffect, useState } from "preact/hooks";
+import { useCallback, useEffect, useState } from "preact/hooks";
 
 import { connectState } from "../redux/connector";
 
@@ -24,6 +24,7 @@ export enum Language {
     AZERBAIJANI = "az",
     CZECH = "cs",
     GERMAN = "de",
+    GREEK = "el",
     SPANISH = "es",
     FINNISH = "fi",
     FRENCH = "fr",
@@ -31,6 +32,7 @@ export enum Language {
     CROATIAN = "hr",
     HUNGARIAN = "hu",
     INDONESIAN = "id",
+    ITALIAN = "it",
     LITHUANIAN = "lt",
     MACEDONIAN = "mk",
     DUTCH = "nl",
@@ -40,6 +42,7 @@ export enum Language {
     RUSSIAN = "ru",
     SERBIAN = "sr",
     SWEDISH = "sv",
+    TOKIPONA = "tokipona",
     TURKISH = "tr",
     UKRANIAN = "uk",
     CHINESE_SIMPLIFIED = "zh_Hans",
@@ -56,7 +59,7 @@ export interface LanguageEntry {
     i18n: string;
     dayjs?: string;
     rtl?: boolean;
-    alt?: boolean;
+    cat?: "const" | "alt";
 }
 
 export const Languages: { [key in Language]: LanguageEntry } = {
@@ -71,13 +74,15 @@ export const Languages: { [key in Language]: LanguageEntry } = {
     az: { display: "Azərbaycan dili", emoji: "🇦🇿", i18n: "az" },
     cs: { display: "Čeština", emoji: "🇨🇿", i18n: "cs" },
     de: { display: "Deutsch", emoji: "🇩🇪", i18n: "de" },
+    el: { display: "Ελληνικά", emoji: "🇬🇷", i18n: "el" },
     es: { display: "Español", emoji: "🇪🇸", i18n: "es" },
     fi: { display: "suomi", emoji: "🇫🇮", i18n: "fi" },
     fr: { display: "Français", emoji: "🇫🇷", i18n: "fr" },
     hi: { display: "हिन्दी", emoji: "🇮🇳", i18n: "hi" },
     hr: { display: "Hrvatski", emoji: "🇭🇷", i18n: "hr" },
-    hu: { display: "magyar", emoji: "🇭🇺", i18n: "hu" },
+    hu: { display: "Magyar", emoji: "🇭🇺", i18n: "hu" },
     id: { display: "bahasa Indonesia", emoji: "🇮🇩", i18n: "id" },
+    it: { display: "Italiano", emoji: "🇮🇹", i18n: "it" },
     lt: { display: "Lietuvių", emoji: "🇱🇹", i18n: "lt" },
     mk: { display: "Македонски", emoji: "🇲🇰", i18n: "mk" },
     nl: { display: "Nederlands", emoji: "🇳🇱", i18n: "nl" },
@@ -101,33 +106,41 @@ export const Languages: { [key in Language]: LanguageEntry } = {
         dayjs: "zh",
     },
 
+    tokipona: {
+        display: "Toki Pona",
+        emoji: "🙂",
+        i18n: "tokipona",
+        dayjs: "en-gb",
+        cat: "const",
+    },
+
     owo: {
         display: "OwO",
         emoji: "🐱",
         i18n: "owo",
         dayjs: "en-gb",
-        alt: true,
+        cat: "alt",
     },
     pr: {
         display: "Pirate",
         emoji: "🏴‍☠️",
         i18n: "pr",
         dayjs: "en-gb",
-        alt: true,
+        cat: "alt",
     },
     bottom: {
         display: "Bottom",
         emoji: "🥺",
         i18n: "bottom",
         dayjs: "en-gb",
-        alt: true,
+        cat: "alt",
     },
     piglatin: {
         display: "Pig Latin",
         emoji: "🐖",
         i18n: "piglatin",
         dayjs: "en-gb",
-        alt: true,
+        cat: "alt",
     },
 };
 
@@ -136,32 +149,62 @@ interface Props {
     locale: Language;
 }
 
+export interface Dictionary {
+    dayjs?: {
+        defaults?: {
+            twelvehour?: "yes" | "no";
+            separator?: string;
+            date?: "traditional" | "simplified" | "ISO8601";
+        };
+        timeFormat?: string;
+    };
+    [key: string]:
+        | Record<string, Omit<Dictionary, "dayjs">>
+        | string
+        | undefined;
+}
+
 function Locale({ children, locale }: Props) {
-    // TODO: create and use LanguageDefinition type here
-    const [defns, setDefinition] =
-        useState<Record<string, unknown>>(definition);
-    const lang = Languages[locale];
+    const [defns, setDefinition] = useState<Dictionary>(
+        definition as Dictionary,
+    );
+
+    // Load relevant language information, fallback to English if invalid.
+    const lang = Languages[locale] ?? Languages.en;
 
-    // TODO: clean this up and use the built in Intl API
-    function transformLanguage(source: { [key: string]: any }) {
+    function transformLanguage(source: Dictionary) {
+        // Fallback untranslated strings to English (UK)
         const obj = defaultsDeep(source, definition);
-        const dayjs = obj.dayjs;
-        const defaults = dayjs.defaults;
 
-        const twelvehour = defaults?.twelvehour === "yes" || true;
+        // Take relevant objects out, dayjs and defaults
+        // should exist given we just took defaults above.
+        const { dayjs } = obj;
+        const { defaults } = dayjs;
+
+        // Determine whether we are using 12-hour clock.
+        const twelvehour = defaults?.twelvehour
+            ? defaults.twelvehour === "yes"
+            : false;
+
+        // Determine what date separator we are using.
         const separator: string = defaults?.date_separator ?? "/";
+
+        // Determine what date format we are using.
         const date: "traditional" | "simplified" | "ISO8601" =
             defaults?.date_format ?? "traditional";
 
+        // Available date formats.
         const DATE_FORMATS = {
             traditional: `DD${separator}MM${separator}YYYY`,
             simplified: `MM${separator}DD${separator}YYYY`,
             ISO8601: "YYYY-MM-DD",
         };
 
-        dayjs["sameElse"] = DATE_FORMATS[date];
+        // Replace data in dayjs object, make sure to provide fallbacks.
+        dayjs["sameElse"] = DATE_FORMATS[date] ?? DATE_FORMATS.traditional;
         dayjs["timeFormat"] = twelvehour ? "hh:mm A" : "HH:mm";
 
+        // Replace {{time}} format string in dayjs strings with the time format.
         Object.keys(dayjs)
             .filter((k) => typeof dayjs[k] === "string")
             .forEach(
@@ -175,38 +218,49 @@ function Locale({ children, locale }: Props) {
         return obj;
     }
 
-    dayjs.updateLocale("en", {
-        calendar: { ...definition.dayjs, sameDay: "sussy baka" },
-    });
-    useEffect(() => {
-        if (locale === "en") {
-            const defn = transformLanguage(definition);
-            setDefinition(defn);
-            dayjs.locale("en");
-            dayjs.updateLocale("en", { calendar: defn.dayjs });
-            return;
-        }
-
-        import(`../../external/lang/${lang.i18n}.json`).then(
-            async (lang_file) => {
-                const defn = transformLanguage(lang_file.default);
-                const target = lang.dayjs ?? lang.i18n;
-                const dayjs_locale = await import(
-                    `../../node_modules/dayjs/esm/locale/${target}.js`
-                );
-
-                dayjs.locale(target, dayjs_locale.default);
-
-                if (defn.dayjs) {
-                    dayjs.updateLocale(target, { calendar: defn.dayjs });
-                }
-
+    const loadLanguage = useCallback(
+        (locale: string) => {
+            if (locale === "en") {
+                // If English, make sure to restore everything to defaults.
+                // Use what we already have.
+                const defn = transformLanguage(definition as Dictionary);
                 setDefinition(defn);
-            },
-        );
-    }, [locale, lang]);
+                dayjs.locale("en");
+                dayjs.updateLocale("en", { calendar: defn.dayjs });
+                return;
+            }
+
+            import(`../../external/lang/${lang.i18n}.json`).then(
+                async (lang_file) => {
+                    // Transform the definitions data.
+                    const defn = transformLanguage(lang_file.default);
+
+                    // Determine and load dayjs locales.
+                    const target = lang.dayjs ?? lang.i18n;
+                    const dayjs_locale = await import(
+                        `../../node_modules/dayjs/esm/locale/${target}.js`
+                    );
+
+                    // Load dayjs locales.
+                    dayjs.locale(target, dayjs_locale.default);
+
+                    if (defn.dayjs) {
+                        // Override dayjs calendar locales with our own.
+                        dayjs.updateLocale(target, { calendar: defn.dayjs });
+                    }
+
+                    // Apply definition to app.
+                    setDefinition(defn);
+                },
+            );
+        },
+        [lang.dayjs, lang.i18n],
+    );
+
+    useEffect(() => loadLanguage(locale), [locale, lang, loadLanguage]);
 
     useEffect(() => {
+        // Apply RTL language format.
         document.body.style.direction = lang.rtl ? "rtl" : "";
     }, [lang.rtl]);
 

src/context/Theme.tsx

@@ -4,8 +4,6 @@ import { createGlobalStyle } from "styled-components";
 import { createContext } from "preact";
 import { useEffect } from "preact/hooks";
 
-import { isTouchscreenDevice } from "../lib/isTouchscreenDevice";
-
 import { connectState } from "../redux/connector";
 
 import { Children } from "../types/Preact";
@@ -57,7 +55,7 @@ export type Fonts =
     | "Raleway"
     | "Ubuntu"
     | "Comic Neue";
-export type MonoscapeFonts =
+export type MonospaceFonts =
     | "Fira Code"
     | "Roboto Mono"
     | "Source Code Pro"
@@ -70,7 +68,7 @@ export type Theme = {
     light?: boolean;
     font?: Fonts;
     css?: string;
-    monoscapeFont?: MonoscapeFonts;
+    monospaceFont?: MonospaceFonts;
 };
 
 export interface ThemeOptions {
@@ -190,8 +188,8 @@ export const FONTS: Record<Fonts, { name: string; load: () => void }> = {
     },
 };
 
-export const MONOSCAPE_FONTS: Record<
-    MonoscapeFonts,
+export const MONOSPACE_FONTS: Record<
+    MonospaceFonts,
     { name: string; load: () => void }
 > = {
     "Fira Code": {
@@ -217,7 +215,7 @@ export const MONOSCAPE_FONTS: Record<
 };
 
 export const FONT_KEYS = Object.keys(FONTS).sort();
-export const MONOSCAPE_FONT_KEYS = Object.keys(MONOSCAPE_FONTS).sort();
+export const MONOSPACE_FONT_KEYS = Object.keys(MONOSPACE_FONTS).sort();
 
 export const DEFAULT_FONT = "Open Sans";
 export const DEFAULT_MONO_FONT = "Fira Code";
@@ -234,7 +232,7 @@ export const PRESETS: Record<string, Theme> = {
         mention: "rgba(251, 255, 0, 0.40)",
         success: "#65E572",
         warning: "#FAA352",
-        error: "#F06464",
+        error: "#ED4245",
         hover: "rgba(0, 0, 0, 0.2)",
         "scrollbar-thumb": "#CA525A",
         "scrollbar-track": "transparent",
@@ -261,7 +259,7 @@ export const PRESETS: Record<string, Theme> = {
         mention: "rgba(251, 255, 0, 0.06)",
         success: "#65E572",
         warning: "#FAA352",
-        error: "#F06464",
+        error: "#ED4245",
         hover: "rgba(0, 0, 0, 0.1)",
         "scrollbar-thumb": "#CA525A",
         "scrollbar-track": "transparent",
@@ -311,17 +309,17 @@ function Theme({ children, options }: Props) {
         const font = theme.font ?? DEFAULT_FONT;
         root.setProperty("--font", `"${font}"`);
         FONTS[font].load();
-    }, [theme.font]);
+    }, [root, theme.font]);
 
     useEffect(() => {
-        const font = theme.monoscapeFont ?? DEFAULT_MONO_FONT;
-        root.setProperty("--monoscape-font", `"${font}"`);
-        MONOSCAPE_FONTS[font].load();
-    }, [theme.monoscapeFont]);
+        const font = theme.monospaceFont ?? DEFAULT_MONO_FONT;
+        root.setProperty("--monospace-font", `"${font}"`);
+        MONOSPACE_FONTS[font].load();
+    }, [root, theme.monospaceFont]);
 
     useEffect(() => {
         root.setProperty("--ligatures", options?.ligatures ? "normal" : "none");
-    }, [options?.ligatures]);
+    }, [root, options?.ligatures]);
 
     useEffect(() => {
         const resize = () =>
@@ -330,19 +328,12 @@ function Theme({ children, options }: Props) {
 
         window.addEventListener("resize", resize);
         return () => window.removeEventListener("resize", resize);
-    }, []);
+    }, [root]);
 
     return (
         <ThemeContext.Provider value={theme}>
             <Helmet>
-                <meta
-                    name="theme-color"
-                    content={
-                        isTouchscreenDevice
-                            ? theme["primary-header"]
-                            : theme["background"]
-                    }
-                />
+                <meta name="theme-color" content={theme["background"]} />
             </Helmet>
             <GlobalTheme theme={theme} />
             {theme.css && (