src/components/ui/Modal.tsx

-import Button from "./Button";
-import classNames from "classnames";
-import { Children } from "../../types/Preact";
-import { createPortal, useEffect } from "preact/compat";
+/* eslint-disable react-hooks/rules-of-hooks */
 import styled, { css, keyframes } from "styled-components";
 
+import { createPortal, useCallback, useEffect, useState } from "preact/compat";
+
+import { internalSubscribe } from "../../lib/eventEmitter";
+
+import { Children } from "../../types/Preact";
+import Button, { ButtonProps } from "./Button";
+
 const open = keyframes`
     0% {opacity: 0;}
     70% {opacity: 0;}
     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;
@@ -35,21 +50,31 @@ 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;
-    animation-timing-function: cubic-bezier(.3,.3,.18,1.1);
+    animation-timing-function: cubic-bezier(0.3, 0.3, 0.18, 1.1);
 `;
 
-const ModalContent = styled.div<{ [key in 'attachment' | 'noBackground' | 'border' | 'padding']?: boolean }>`
-    border-radius: 8px;
+const ModalContent = styled.div<
+    { [key in "attachment" | "noBackground" | "border" | "padding"]?: boolean }
+>`
     text-overflow: ellipsis;
+    border-radius: var(--border-radius);
 
     h3 {
         margin-top: 0;
@@ -60,22 +85,30 @@ const ModalContent = styled.div<{ [key in 'attachment' | 'noBackground' | 'borde
         flex-direction: column;
     }
 
-    ${ props => !props.noBackground && css`
-        background: var(--secondary-header);
-    ` }
-
-    ${ props => props.padding && css`
-        padding: 1.5em;
-    ` }
-
-    ${ props => props.attachment && css`
-        border-radius: 8px 8px 0 0;
-    ` }
-
-    ${ props => props.border && css`
-        border-radius: 10px;
-        border: 2px solid var(--secondary-background);
-    ` }
+    ${(props) =>
+        !props.noBackground &&
+        css`
+            background: var(--secondary-header);
+        `}
+
+    ${(props) =>
+        props.padding &&
+        css`
+            padding: 1.5em;
+        `}
+
+    ${(props) =>
+        props.attachment &&
+        css`
+            border-radius: var(--border-radius) var(--border-radius) 0 0;
+        `}
+
+    ${(props) =>
+        props.border &&
+        css`
+            border-radius: var(--border-radius);
+            border: 2px solid var(--secondary-background);
+        `}
 `;
 
 const ModalActions = styled.div`
@@ -88,13 +121,10 @@ const ModalActions = styled.div`
     background: var(--secondary-background);
 `;
 
-export interface Action {
-    text: Children;
-    onClick: () => void;
+export type Action = Omit<ButtonProps, "onClick"> & {
     confirmation?: boolean;
-    contrast?: boolean;
-    error?: boolean;
-}
+    onClick: () => void;
+};
 
 interface Props {
     children?: Children;
@@ -105,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}
@@ -130,24 +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]);
+
+    const confirmationAction = props.actions?.find(
+        (action) => action.confirmation,
+    );
 
-    let 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) {
@@ -158,27 +202,27 @@ export default function Modal(props: Props) {
 
         document.body.addEventListener("keydown", keyDown);
         return () => document.body.removeEventListener("keydown", keyDown);
-    }, [ confirmationAction ]);
+    }, [confirmationAction]);
 
     return createPortal(
-        <ModalBase onClick={(!props.disallowClosing && props.onClose) || undefined}>
-            <ModalContainer onClick={e => (e.cancelBubble = true)}>
+        <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 => (
+                        {props.actions.map((x, index) => (
                             <Button
-                                contrast={x.contrast ?? true}
-                                error={x.error ?? false}
-                                onClick={x.onClick}
-                                disabled={props.disabled}>
-                                {x.text}
-                            </Button>
+                                key={index}
+                                {...x}
+                                disabled={props.disabled}
+                            />
                         ))}
                     </ModalActions>
                 )}
             </ModalContainer>
         </ModalBase>,
-        document.body
+        document.body,
     );
 }

src/components/ui/Overline.tsx

 import styled, { css } from "styled-components";
+
+import { Text } from "preact-i18n";
+
 import { Children } from "../../types/Preact";
-import { Text } from 'preact-i18n';
 
-type Props = Omit<JSX.HTMLAttributes<HTMLDivElement>, 'children' | 'as'> & {
+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.spaced && css`
-        margin-top: 0.8em;
-    ` }
+    ${(props) =>
+        !props.noMargin &&
+        css`
+            margin: 0.4em 0;
+        `}
+
+    ${(props) =>
+        props.spaced &&
+        css`
+            margin-top: 0.8em;
+        `}
 
     font-size: 14px;
     font-weight: 600;
@@ -50,9 +60,11 @@ export default function Overline(props: Props) {
         <OverlineBase {...props}>
             {props.children}
             {props.children && props.error && <> &middot; </>}
-            {props.error && <Overline type="error">
-                <Text id={`error.${props.error}`}>{props.error}</Text>
-            </Overline>}
+            {props.error && (
+                <Overline type="error">
+                    <Text id={`error.${props.error}`}>{props.error}</Text>
+                </Overline>
+            )}
         </OverlineBase>
     );
 }

src/components/ui/Preloader.tsx

@@ -87,7 +87,7 @@ const PreloaderBase = styled.div`
 `;
 
 interface Props {
-    type: 'spinner' | 'ring'
+    type: "spinner" | "ring";
 }
 
 export default function Preloader({ type }: Props) {

src/components/ui/Radio.tsx

-import { Children } from "../../types/Preact";
-import styled, { css } from "styled-components";
 import { Circle } from "@styled-icons/boxicons-regular";
+import styled, { css } from "styled-components";
+
+import { Children } from "../../types/Preact";
 
 interface Props {
     children: Children;
@@ -26,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);
@@ -92,8 +93,7 @@ export default function Radio(props: Props) {
             disabled={props.disabled}
             onClick={() =>
                 !props.disabled && props.onSelect && props.onSelect()
-            }
-        >
+            }>
             <div>
                 <Circle size={12} />
             </div>

src/components/ui/TextArea.module.scss

 .container {
-    font-size: 0.875rem;
+    font-size: .875rem;
     line-height: 20px;
     position: relative;
 }

src/components/ui/TextArea.tsx

@@ -2,8 +2,8 @@ import styled, { css } from "styled-components";
 
 export interface TextAreaProps {
     code?: boolean;
-    padding?: number;
-    lineHeight?: number;
+    padding?: string;
+    lineHeight?: string;
     hideBorder?: boolean;
 }
 
@@ -17,32 +17,42 @@ export default styled.textarea<TextAreaProps>`
     display: block;
     color: var(--foreground);
     background: var(--secondary-background);
-    padding: ${ props => props.padding ?? DEFAULT_TEXT_AREA_PADDING }px;
-    line-height: ${ props => props.lineHeight ?? DEFAULT_LINE_HEIGHT }px;
-
-    ${ props => props.hideBorder && css`
-        border: none;
-    ` }
-
-    ${ props => !props.hideBorder && css`
-        border-radius: 4px;
-        transition: border-color .2s ease-in-out;
-        border: ${TEXT_AREA_BORDER_WIDTH}px solid transparent;
-    ` }
+    padding: ${(props) => props.padding ?? "var(--textarea-padding)"};
+    line-height: ${(props) =>
+        props.lineHeight ?? "var(--textarea-line-height)"};
+
+    ${(props) =>
+        props.hideBorder &&
+        css`
+            border: none;
+        `}
+
+    ${(props) =>
+        !props.hideBorder &&
+        css`
+            border-radius: var(--border-radius);
+            transition: border-color 0.2s ease-in-out;
+            border: var(--input-border-width) solid transparent;
+        `}
 
     &:focus {
         outline: none;
 
-        ${ props => !props.hideBorder && css`
-            border: ${TEXT_AREA_BORDER_WIDTH}px solid var(--accent);
-        ` }
+        ${(props) =>
+            !props.hideBorder &&
+            css`
+                border: var(--input-border-width) solid var(--accent);
+            `}
     }
 
-    ${ props => props.code ? css`
-        font-family: var(--monoscape-font-font), monospace;
-    ` : css`
-        font-family: inherit;
-    ` }
-    
+    ${(props) =>
+        props.code
+            ? css`
+                  font-family: var(--monospace-font), monospace;
+              `
+            : css`
+                  font-family: inherit;
+              `}
+
     font-variant-ligatures: var(--ligatures);
 `;

src/components/ui/Tip.tsx

-import { Children } from "../../types/Preact";
-import styled, { css } from "styled-components";
 import { InfoCircle } from "@styled-icons/boxicons-regular";
+import styled, { css } from "styled-components";
+
+import { Children } from "../../types/Preact";
 
 interface Props {
-    warning?: boolean
-    error?: boolean
+    warning?: boolean;
+    error?: boolean;
 }
 
 export const Separator = styled.div<Props>`
@@ -21,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 {
@@ -37,29 +38,34 @@ export const TipBase = styled.div<Props>`
         margin-inline-end: 10px;
     }
 
-    ${ props => props.warning && css`
-        color: var(--warning);
-        border: 2px solid var(--warning);
-        background: var(--secondary-header);
-    ` }
+    ${(props) =>
+        props.warning &&
+        css`
+            color: var(--warning);
+            border: 2px solid var(--warning);
+            background: var(--secondary-header);
+        `}
 
-    ${ props => props.error && css`
-        color: var(--error);
-        border: 2px solid var(--error);
-        background: var(--secondary-header);
-    ` }
+    ${(props) =>
+        props.error &&
+        css`
+            color: var(--error);
+            border: 2px solid var(--error);
+            background: var(--secondary-header);
+        `}
 `;
 
-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

-import { IntlProvider } from "preact-i18n";
+import dayJS from "dayjs";
+import calendar from "dayjs/plugin/calendar";
+import format from "dayjs/plugin/localizedFormat";
+import update from "dayjs/plugin/updateLocale";
 import defaultsDeep from "lodash.defaultsdeep";
+
+import { IntlProvider } from "preact-i18n";
+import { useCallback, useEffect, useState } from "preact/hooks";
+
 import { connectState } from "../redux/connector";
-import { useEffect, useState } from "preact/hooks";
+
 import definition from "../../external/lang/en.json";
 
-import dayjs from "dayjs";
-import calendar from "dayjs/plugin/calendar";
-import update from "dayjs/plugin/updateLocale";
-import format from "dayjs/plugin/localizedFormat";
+export const dayjs = dayJS;
+
 dayjs.extend(calendar);
 dayjs.extend(format);
 dayjs.extend(update);
@@ -19,6 +24,7 @@ export enum Language {
     AZERBAIJANI = "az",
     CZECH = "cs",
     GERMAN = "de",
+    GREEK = "el",
     SPANISH = "es",
     FINNISH = "fi",
     FRENCH = "fr",
@@ -26,6 +32,7 @@ export enum Language {
     CROATIAN = "hr",
     HUNGARIAN = "hu",
     INDONESIAN = "id",
+    ITALIAN = "it",
     LITHUANIAN = "lt",
     MACEDONIAN = "mk",
     DUTCH = "nl",
@@ -35,6 +42,7 @@ export enum Language {
     RUSSIAN = "ru",
     SERBIAN = "sr",
     SWEDISH = "sv",
+    TOKIPONA = "tokipona",
     TURKISH = "tr",
     UKRANIAN = "uk",
     CHINESE_SIMPLIFIED = "zh_Hans",
@@ -51,7 +59,7 @@ export interface LanguageEntry {
     i18n: string;
     dayjs?: string;
     rtl?: boolean;
-    alt?: boolean;
+    cat?: "const" | "alt";
 }
 
 export const Languages: { [key in Language]: LanguageEntry } = {
@@ -66,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" },
@@ -96,15 +106,41 @@ export const Languages: { [key in Language]: LanguageEntry } = {
         dayjs: "zh",
     },
 
-    owo: { display: "OwO", emoji: "🐱", i18n: "owo", dayjs: "en-gb", alt: true },
-    pr: { display: "Pirate", emoji: "🏴‍☠️", i18n: "pr", dayjs: "en-gb", alt: true },
-    bottom: { display: "Bottom", emoji: "🥺", i18n: "bottom", dayjs: "en-gb", alt: true },
+    tokipona: {
+        display: "Toki Pona",
+        emoji: "🙂",
+        i18n: "tokipona",
+        dayjs: "en-gb",
+        cat: "const",
+    },
+
+    owo: {
+        display: "OwO",
+        emoji: "🐱",
+        i18n: "owo",
+        dayjs: "en-gb",
+        cat: "alt",
+    },
+    pr: {
+        display: "Pirate",
+        emoji: "🏴‍☠️",
+        i18n: "pr",
+        dayjs: "en-gb",
+        cat: "alt",
+    },
+    bottom: {
+        display: "Bottom",
+        emoji: "🥺",
+        i18n: "bottom",
+        dayjs: "en-gb",
+        cat: "alt",
+    },
     piglatin: {
         display: "Pig Latin",
         emoji: "🐖",
         i18n: "piglatin",
         dayjs: "en-gb",
-        alt: true
+        cat: "alt",
     },
 };
 
@@ -113,60 +149,118 @@ 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) {
-    const [defns, setDefinition] = useState(definition);
-    const lang = Languages[locale];
+    const [defns, setDefinition] = useState<Dictionary>(
+        definition as Dictionary,
+    );
 
-    function transformLanguage(source: { [key: string]: any }) {
+    // Load relevant language information, fallback to English if invalid.
+    const lang = Languages[locale] ?? Languages.en;
+
+    function transformLanguage(source: Dictionary) {
+        // Fallback untranslated strings to English (UK)
         const obj = defaultsDeep(source, definition);
 
-        const dayjs = obj.dayjs;
-        const defaults = dayjs.defaults;
+        // 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 ?? "/";
 
-        const twelvehour = defaults?.twelvehour === 'yes' || true;
-        const separator: '/' | '-' | '.' = defaults?.date_separator ?? '/';
-        const date: 'traditional' | 'simplified' | 'ISO8601' = defaults?.date_format ?? 'traditional';
-    
+        // 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'
-        }
+            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 => k !== 'defaults')
-            .forEach(k => dayjs[k] = dayjs[k].replace(/{{time}}/g, twelvehour ? 'LT' : 'HH:mm'));
-        
+            .filter((k) => typeof dayjs[k] === "string")
+            .forEach(
+                (k) =>
+                    (dayjs[k] = dayjs[k].replace(
+                        /{{time}}/g,
+                        dayjs["timeFormat"],
+                    )),
+            );
+
         return obj;
     }
 
-    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`);
-
-                if (defn.dayjs) {
-                    dayjs.updateLocale(target, { calendar: defn.dayjs });
-                }
-
-                dayjs.locale(dayjs_locale.default);
+    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);
+                dayjs.locale("en");
+                dayjs.updateLocale("en", { calendar: defn.dayjs });
+                return;
             }
-        );
-    }, [locale, lang]);
+
+            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]);
 
@@ -180,5 +274,5 @@ export default connectState<Omit<Props, "locale">>(
             locale: state.locale,
         };
     },
-    true
+    true,
 );

src/context/Settings.tsx

@@ -6,44 +6,56 @@
 // if it does cause problems though.
 //
 // This now also supports Audio stuff.
-
-import { DEFAULT_SOUNDS, Settings, SoundOptions } from "../redux/reducers/settings";
-import { playSound, Sounds } from "../assets/sounds/Audio";
-import { connectState } from "../redux/connector";
 import defaultsDeep from "lodash.defaultsdeep";
-import { Children } from "../types/Preact";
+
 import { createContext } from "preact";
 import { useMemo } from "preact/hooks";
 
-export const SettingsContext = createContext<Settings>({} as any);
-export const SoundContext = createContext<(sound: Sounds) => void>({} as any);
+import { connectState } from "../redux/connector";
+import {
+    DEFAULT_SOUNDS,
+    Settings,
+    SoundOptions,
+} from "../redux/reducers/settings";
+
+import { playSound, Sounds } from "../assets/sounds/Audio";
+import { Children } from "../types/Preact";
+
+export const SettingsContext = createContext<Settings>({});
+export const SoundContext = createContext<(sound: Sounds) => void>(null!);
 
 interface Props {
-    children?: Children,
-    settings: Settings
+    children?: Children;
+    settings: Settings;
 }
 
-function Settings({ settings, children }: Props) {
+function SettingsProvider({ settings, children }: Props) {
     const play = useMemo(() => {
-        const enabled: SoundOptions = defaultsDeep(settings.notification?.sounds ?? {}, DEFAULT_SOUNDS);
+        const enabled: SoundOptions = defaultsDeep(
+            settings.notification?.sounds ?? {},
+            DEFAULT_SOUNDS,
+        );
         return (sound: Sounds) => {
             if (enabled[sound]) {
                 playSound(sound);
             }
         };
-    }, [ settings.notification ]);
+    }, [settings.notification]);
 
     return (
         <SettingsContext.Provider value={settings}>
             <SoundContext.Provider value={play}>
-                { children }
+                {children}
             </SoundContext.Provider>
         </SettingsContext.Provider>
-    )
+    );
 }
 
-export default connectState<Omit<Props, 'settings'>>(Settings, state => {
-    return {
-        settings: state.settings
-    }
-});
+export default connectState<Omit<Props, "settings">>(
+    SettingsProvider,
+    (state) => {
+        return {
+            settings: state.settings,
+        };
+    },
+);

src/context/Theme.tsx

-import { isTouchscreenDevice } from "../lib/isTouchscreenDevice";
+import { Helmet } from "react-helmet";
 import { createGlobalStyle } from "styled-components";
+
+import { createContext } from "preact";
+import { useEffect } from "preact/hooks";
+
 import { connectState } from "../redux/connector";
+
 import { Children } from "../types/Preact";
-import { useEffect } from "preact/hooks";
-import { createContext } from "preact";
-import { Helmet } from "react-helmet";
 
 export type Variables =
     | "accent"
@@ -32,8 +34,33 @@ export type Variables =
     | "status-streaming"
     | "status-invisible";
 
-export type Fonts = 'Open Sans' | 'Inter' | 'Atkinson Hyperlegible' | 'Roboto' | 'Noto Sans' | 'Lato' | 'Bree Serif' | 'Montserrat' | 'Poppins' | 'Raleway' | 'Ubuntu' | 'Comic Neue';
-export type MonoscapeFonts = 'Fira Code' | 'Roboto Mono' | 'Source Code Pro' | 'Space Mono' | 'Ubuntu Mono';
+// While this isn't used, it'd be good to keep this up to date as a reference or for future use
+export type HiddenVariables =
+    | "font"
+    | "ligatures"
+    | "app-height"
+    | "sidebar-active"
+    | "monospace-font";
+
+export type Fonts =
+    | "Open Sans"
+    | "Inter"
+    | "Atkinson Hyperlegible"
+    | "Roboto"
+    | "Noto Sans"
+    | "Lato"
+    | "Bree Serif"
+    | "Montserrat"
+    | "Poppins"
+    | "Raleway"
+    | "Ubuntu"
+    | "Comic Neue";
+export type MonospaceFonts =
+    | "Fira Code"
+    | "Roboto Mono"
+    | "Source Code Pro"
+    | "Space Mono"
+    | "Ubuntu Mono";
 
 export type Theme = {
     [variable in Variables]: string;
@@ -41,7 +68,7 @@ export type Theme = {
     light?: boolean;
     font?: Fonts;
     css?: string;
-    monoscapeFont?: MonoscapeFonts;
+    monospaceFont?: MonospaceFonts;
 };
 
 export interface ThemeOptions {
@@ -53,7 +80,7 @@ export interface ThemeOptions {
 // import aaa from "@fontsource/open-sans/300.css?raw";
 // console.info(aaa);
 
-export const FONTS: Record<Fonts, { name: string, load: () => void }> = {
+export const FONTS: Record<Fonts, { name: string; load: () => void }> = {
     "Open Sans": {
         name: "Open Sans",
         load: async () => {
@@ -62,7 +89,7 @@ export const FONTS: Record<Fonts, { name: string, load: () => void }> = {
             await import("@fontsource/open-sans/600.css");
             await import("@fontsource/open-sans/700.css");
             await import("@fontsource/open-sans/400-italic.css");
-        }
+        },
     },
     Inter: {
         name: "Inter",
@@ -71,7 +98,7 @@ export const FONTS: Record<Fonts, { name: string, load: () => void }> = {
             await import("@fontsource/inter/400.css");
             await import("@fontsource/inter/600.css");
             await import("@fontsource/inter/700.css");
-        }
+        },
     },
     "Atkinson Hyperlegible": {
         name: "Atkinson Hyperlegible",
@@ -79,15 +106,15 @@ export const FONTS: Record<Fonts, { name: string, load: () => void }> = {
             await import("@fontsource/atkinson-hyperlegible/400.css");
             await import("@fontsource/atkinson-hyperlegible/700.css");
             await import("@fontsource/atkinson-hyperlegible/400-italic.css");
-        }
+        },
     },
-    "Roboto": {
+    Roboto: {
         name: "Roboto",
         load: async () => {
             await import("@fontsource/roboto/400.css");
             await import("@fontsource/roboto/700.css");
             await import("@fontsource/roboto/400-italic.css");
-        }
+        },
     },
     "Noto Sans": {
         name: "Noto Sans",
@@ -95,22 +122,22 @@ export const FONTS: Record<Fonts, { name: string, load: () => void }> = {
             await import("@fontsource/noto-sans/400.css");
             await import("@fontsource/noto-sans/700.css");
             await import("@fontsource/noto-sans/400-italic.css");
-        }
+        },
     },
     "Bree Serif": {
         name: "Bree Serif",
-        load: () => import("@fontsource/bree-serif/400.css")
+        load: () => import("@fontsource/bree-serif/400.css"),
     },
-    "Lato": {
+    Lato: {
         name: "Lato",
         load: async () => {
             await import("@fontsource/lato/300.css");
             await import("@fontsource/lato/400.css");
             await import("@fontsource/lato/700.css");
             await import("@fontsource/lato/400-italic.css");
-        }
+        },
     },
-    "Montserrat": {
+    Montserrat: {
         name: "Montserrat",
         load: async () => {
             await import("@fontsource/montserrat/300.css");
@@ -118,9 +145,9 @@ export const FONTS: Record<Fonts, { name: string, load: () => void }> = {
             await import("@fontsource/montserrat/600.css");
             await import("@fontsource/montserrat/700.css");
             await import("@fontsource/montserrat/400-italic.css");
-        }
+        },
     },
-    "Poppins": {
+    Poppins: {
         name: "Poppins",
         load: async () => {
             await import("@fontsource/poppins/300.css");
@@ -128,9 +155,9 @@ export const FONTS: Record<Fonts, { name: string, load: () => void }> = {
             await import("@fontsource/poppins/600.css");
             await import("@fontsource/poppins/700.css");
             await import("@fontsource/poppins/400-italic.css");
-        }
+        },
     },
-    "Raleway": {
+    Raleway: {
         name: "Raleway",
         load: async () => {
             await import("@fontsource/raleway/300.css");
@@ -138,9 +165,9 @@ export const FONTS: Record<Fonts, { name: string, load: () => void }> = {
             await import("@fontsource/raleway/600.css");
             await import("@fontsource/raleway/700.css");
             await import("@fontsource/raleway/400-italic.css");
-        }
+        },
     },
-    "Ubuntu": {
+    Ubuntu: {
         name: "Ubuntu",
         load: async () => {
             await import("@fontsource/ubuntu/300.css");
@@ -148,7 +175,7 @@ export const FONTS: Record<Fonts, { name: string, load: () => void }> = {
             await import("@fontsource/ubuntu/500.css");
             await import("@fontsource/ubuntu/700.css");
             await import("@fontsource/ubuntu/400-italic.css");
-        }
+        },
     },
     "Comic Neue": {
         name: "Comic Neue",
@@ -157,38 +184,44 @@ export const FONTS: Record<Fonts, { name: string, load: () => void }> = {
             await import("@fontsource/comic-neue/400.css");
             await import("@fontsource/comic-neue/700.css");
             await import("@fontsource/comic-neue/400-italic.css");
-        }
-    }
+        },
+    },
 };
 
-export const MONOSCAPE_FONTS: Record<MonoscapeFonts, { name: string, load: () => void }> = {
+export const MONOSPACE_FONTS: Record<
+    MonospaceFonts,
+    { name: string; load: () => void }
+> = {
     "Fira Code": {
         name: "Fira Code",
-        load: () => import("@fontsource/fira-code/400.css")
+        load: () => import("@fontsource/fira-code/400.css"),
     },
     "Roboto Mono": {
         name: "Roboto Mono",
-        load: () => import("@fontsource/roboto-mono/400.css")
+        load: () => import("@fontsource/roboto-mono/400.css"),
     },
     "Source Code Pro": {
         name: "Source Code Pro",
-        load: () => import("@fontsource/source-code-pro/400.css")
+        load: () => import("@fontsource/source-code-pro/400.css"),
     },
     "Space Mono": {
         name: "Space Mono",
-        load: () => import("@fontsource/space-mono/400.css")
+        load: () => import("@fontsource/space-mono/400.css"),
     },
     "Ubuntu Mono": {
         name: "Ubuntu Mono",
-        load: () => import("@fontsource/ubuntu-mono/400.css")
-    }
+        load: () => import("@fontsource/ubuntu-mono/400.css"),
+    },
 };
 
 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";
 
 // Generated from https://gitlab.insrt.uk/revolt/community/themes
-export const PRESETS: { [key: string]: Theme } = {
+export const PRESETS: Record<string, Theme> = {
     light: {
         light: true,
         accent: "#FD6671",
@@ -199,7 +232,7 @@ export const PRESETS: { [key: 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",
@@ -226,7 +259,7 @@ export const PRESETS: { [key: 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",
@@ -256,7 +289,8 @@ const GlobalTheme = createGlobalStyle<{ theme: Theme }>`
 }
 `;
 
-export const ThemeContext = createContext<Theme>({} as any);
+// Load the default default them and apply extras later
+export const ThemeContext = createContext<Theme>(PRESETS["dark"]);
 
 interface Props {
     children: Children;
@@ -266,58 +300,52 @@ interface Props {
 function Theme({ children, options }: Props) {
     const theme: Theme = {
         ...PRESETS["dark"],
-        ...(PRESETS as any)[options?.preset as any],
-        ...options?.custom
+        ...PRESETS[options?.preset ?? ""],
+        ...options?.custom,
     };
 
     const root = document.documentElement.style;
     useEffect(() => {
-        const font = theme.font ?? 'Inter';
-        root.setProperty('--font', `"${font}"`);
+        const font = theme.font ?? DEFAULT_FONT;
+        root.setProperty("--font", `"${font}"`);
         FONTS[font].load();
-    }, [ theme.font ]);
+    }, [root, theme.font]);
 
     useEffect(() => {
-        const font = theme.monoscapeFont ?? 'Fira Code';
-        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.setProperty("--ligatures", options?.ligatures ? "normal" : "none");
+    }, [root, options?.ligatures]);
 
     useEffect(() => {
-        const resize = () => root.setProperty('--app-height', `${window.innerHeight}px`);
+        const resize = () =>
+            root.setProperty("--app-height", `${window.innerHeight}px`);
         resize();
 
-        window.addEventListener('resize', resize);
-        return () => window.removeEventListener('resize', resize);
-    }, []);
+        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 && (
                 <style dangerouslySetInnerHTML={{ __html: theme.css }} />
             )}
-            { children }
+            {children}
         </ThemeContext.Provider>
     );
 }
 
-export default connectState<{ children: Children }>(Theme, state => {
+export default connectState<{ children: Children }>(Theme, (state) => {
     return {
-        options: state.settings.theme
+        options: state.settings.theme,
     };
 });

src/context/Voice.tsx

+import { Channel } from "revolt.js/dist/maps/Channels";
+
 import { createContext } from "preact";
-import { Children } from "../types/Preact";
-import { useForceUpdate } from "./revoltjs/hooks";
-import { AppContext } from "./revoltjs/RevoltClient";
-import type VoiceClient from "../lib/vortex/VoiceClient";
+import {
+    useCallback,
+    useContext,
+    useEffect,
+    useMemo,
+    useRef,
+    useState,
+} from "preact/hooks";
+
 import type { ProduceType, VoiceUser } from "../lib/vortex/Types";
-import { useContext, useEffect, useMemo, useRef, useState } from "preact/hooks";
+import type VoiceClient from "../lib/vortex/VoiceClient";
+
+import { Children } from "../types/Preact";
 import { SoundContext } from "./Settings";
 
 export enum VoiceStatus {
@@ -15,12 +24,12 @@ export enum VoiceStatus {
     CONNECTING = 4,
     AUTHENTICATING,
     RTC_CONNECTING,
-    CONNECTED
+    CONNECTED,
     // RECONNECTING
 }
 
 export interface VoiceOperations {
-    connect: (channelId: string) => Promise<void>;
+    connect: (channel: Channel) => Promise<Channel>;
     disconnect: () => void;
     isProducing: (type: ProduceType) => boolean;
     startProducing: (type: ProduceType) => Promise<void>;
@@ -33,31 +42,34 @@ export interface VoiceState {
     participants?: Readonly<Map<string, VoiceUser>>;
 }
 
-export const VoiceContext = createContext<VoiceState>(undefined as any);
-export const VoiceOperationsContext = createContext<VoiceOperations>(undefined as any);
+// They should be present from first render. - insert's words
+export const VoiceContext = createContext<VoiceState>(null!);
+export const VoiceOperationsContext = createContext<VoiceOperations>(null!);
 
 type Props = {
     children: Children;
 };
 
 export default function Voice({ children }: Props) {
-    const revoltClient = useContext(AppContext);
     const [client, setClient] = useState<VoiceClient | undefined>(undefined);
     const [state, setState] = useState<VoiceState>({
         status: VoiceStatus.LOADING,
-        participants: new Map()
+        participants: new Map(),
     });
 
-    function setStatus(status: VoiceStatus, roomId?: string) {
-        setState({
-            status,
-            roomId: roomId ?? client?.roomId,
-            participants: client?.participants ?? new Map(),
-        });
-    }
+    const setStatus = useCallback(
+        (status: VoiceStatus, roomId?: string) => {
+            setState({
+                status,
+                roomId: roomId ?? client?.roomId,
+                participants: client?.participants ?? new Map(),
+            });
+        },
+        [client?.participants, client?.roomId],
+    );
 
     useEffect(() => {
-        import('../lib/vortex/VoiceClient')
+        import("../lib/vortex/VoiceClient")
             .then(({ default: VoiceClient }) => {
                 const client = new VoiceClient();
                 setClient(client);
@@ -68,35 +80,35 @@ export default function Voice({ children }: Props) {
                     setStatus(VoiceStatus.READY);
                 }
             })
-            .catch(err => {
-                console.error('Failed to load voice library!', err);
+            .catch((err) => {
+                console.error("Failed to load voice library!", err);
                 setStatus(VoiceStatus.UNAVAILABLE);
-            })
-    }, []);
+            });
+    }, [setStatus]);
 
     const isConnecting = useRef(false);
     const operations: VoiceOperations = useMemo(() => {
         return {
-            connect: async channelId => {
-                if (!client?.supported())
-                    throw new Error("RTC is unavailable");
-                
+            connect: async (channel) => {
+                if (!client?.supported()) throw new Error("RTC is unavailable");
+
                 isConnecting.current = true;
-                setStatus(VoiceStatus.CONNECTING, channelId);
+                setStatus(VoiceStatus.CONNECTING, channel._id);
 
                 try {
-                    const call = await revoltClient.channels.joinCall(
-                        channelId
-                    );
+                    const call = await channel.joinCall();
 
                     if (!isConnecting.current) {
                         setStatus(VoiceStatus.READY);
-                        return;
+                        return channel;
                     }
 
-                    // ! FIXME: use configuration to check if voso is enabled
+                    // ! TODO: use configuration to check if voso is enabled
                     // await client.connect("wss://voso.revolt.chat/ws");
-                    await client.connect("wss://voso.revolt.chat/ws", channelId);
+                    await client.connect(
+                        "wss://voso.revolt.chat/ws",
+                        channel._id,
+                    );
 
                     setStatus(VoiceStatus.AUTHENTICATING);
 
@@ -107,16 +119,16 @@ export default function Voice({ children }: Props) {
                 } catch (error) {
                     console.error(error);
                     setStatus(VoiceStatus.READY);
-                    return;
+                    return channel;
                 }
 
                 setStatus(VoiceStatus.CONNECTED);
                 isConnecting.current = false;
+                return channel;
             },
             disconnect: () => {
-                if (!client?.supported())
-                    throw new Error("RTC is unavailable");
-            
+                if (!client?.supported()) throw new Error("RTC is unavailable");
+
                 // if (status <= VoiceStatus.READY) return;
                 // this will not update in this context
 
@@ -133,17 +145,18 @@ export default function Voice({ children }: Props) {
             startProducing: async (type: ProduceType) => {
                 switch (type) {
                     case "audio": {
-                        if (client?.audioProducer !== undefined) return console.log('No audio producer.'); // ! FIXME: let the user know
-                        if (navigator.mediaDevices === undefined) return console.log('No media devices.'); // ! FIXME: let the user know
-                        const mediaStream = await navigator.mediaDevices.getUserMedia(
-                            {
-                                audio: true
-                            }
-                        );
+                        if (client?.audioProducer !== undefined)
+                            return console.log("No audio producer."); // ! TODO: let the user know
+                        if (navigator.mediaDevices === undefined)
+                            return console.log("No media devices."); // ! TODO: let the user know
+                        const mediaStream =
+                            await navigator.mediaDevices.getUserMedia({
+                                audio: true,
+                            });
 
                         await client?.startProduce(
                             mediaStream.getAudioTracks()[0],
-                            "audio"
+                            "audio",
                         );
                         return;
                     }
@@ -151,51 +164,56 @@ export default function Voice({ children }: Props) {
             },
             stopProducing: (type: ProduceType) => {
                 return client?.stopProduce(type);
-            }
-        }
-    }, [ client ]);
+            },
+        };
+    }, [client, setStatus]);
 
-    const { forceUpdate } = useForceUpdate();
     const playSound = useContext(SoundContext);
 
     useEffect(() => {
         if (!client?.supported()) return;
 
-        // ! FIXME: message for fatal:
+        // ! TODO: message for fatal:
         // ! get rid of these force updates
         // ! handle it through state or smth
 
-        client.on("startProduce",  forceUpdate);
-        client.on("stopProduce", forceUpdate);
+        function stateUpdate() {
+            setStatus(state.status);
+        }
+
+        client.on("startProduce", stateUpdate);
+        client.on("stopProduce", stateUpdate);
 
         client.on("userJoined", () => {
-            playSound('call_join');
-            forceUpdate();
+            playSound("call_join");
+            stateUpdate();
         });
         client.on("userLeft", () => {
-            playSound('call_leave');
-            forceUpdate();
+            playSound("call_leave");
+            stateUpdate();
         });
-        client.on("userStartProduce", forceUpdate);
-        client.on("userStopProduce", forceUpdate);
-        client.on("close", forceUpdate);
+
+        client.on("userStartProduce", stateUpdate);
+        client.on("userStopProduce", stateUpdate);
+
+        client.on("close", stateUpdate);
 
         return () => {
-            client.removeListener("startProduce", forceUpdate);
-            client.removeListener("stopProduce", forceUpdate);
-
-            client.removeListener("userJoined", forceUpdate);
-            client.removeListener("userLeft", forceUpdate);
-            client.removeListener("userStartProduce", forceUpdate);
-            client.removeListener("userStopProduce", forceUpdate);
-            client.removeListener("close", forceUpdate);
+            client.removeListener("startProduce", stateUpdate);
+            client.removeListener("stopProduce", stateUpdate);
+
+            client.removeListener("userJoined", stateUpdate);
+            client.removeListener("userLeft", stateUpdate);
+            client.removeListener("userStartProduce", stateUpdate);
+            client.removeListener("userStopProduce", stateUpdate);
+            client.removeListener("close", stateUpdate);
         };
-    }, [ client, state ]);
+    }, [client, state, playSound, setStatus]);
 
     return (
         <VoiceContext.Provider value={state}>
             <VoiceOperationsContext.Provider value={operations}>
-                { children }
+                {children}
             </VoiceOperationsContext.Provider>
         </VoiceContext.Provider>
     );

src/context/index.tsx

-import State from "../redux/State";
-import { Children } from "../types/Preact";
 import { BrowserRouter as Router } from "react-router-dom";
 
-import Intermediate from './intermediate/Intermediate';
-import Client from './revoltjs/RevoltClient';
-import Settings from "./Settings";
+import State from "../redux/State";
+
+import { Children } from "../types/Preact";
 import Locale from "./Locale";
-import Voice from "./Voice";
+import Settings from "./Settings";
 import Theme from "./Theme";
+import Voice from "./Voice";
+import Intermediate from "./intermediate/Intermediate";
+import Client from "./revoltjs/RevoltClient";
 
 export default function Context({ children }: { children: Children }) {
     return (
@@ -18,9 +19,7 @@ export default function Context({ children }: { children: Children }) {
                         <Locale>
                             <Intermediate>
                                 <Client>
-                                    <Voice>
-                                        {children}
-                                    </Voice>
+                                    <Voice>{children}</Voice>
                                 </Client>
                             </Intermediate>
                         </Locale>

src/context/intermediate/Intermediate.tsx

-import { Attachment, Channels, EmbedImage, Servers, Users } from "revolt.js/dist/api/objects";
+import { Prompt } from "react-router";
+import { useHistory } from "react-router-dom";
+import type { Attachment } from "revolt-api/types/Autumn";
+import type { EmbedImage } from "revolt-api/types/January";
+import { Channel } from "revolt.js/dist/maps/Channels";
+import { Message } from "revolt.js/dist/maps/Messages";
+import { Server } from "revolt.js/dist/maps/Servers";
+import { User } from "revolt.js/dist/maps/Users";
+
+import { createContext } from "preact";
 import { useContext, useEffect, useMemo, useState } from "preact/hooks";
+
 import { internalSubscribe } from "../../lib/eventEmitter";
+
 import { Action } from "../../components/ui/Modal";
-import { useHistory } from "react-router-dom";
+
 import { Children } from "../../types/Preact";
-import { createContext } from "preact";
-import { Prompt } from "react-router";
-import Modals from './Modals';
+import Modals from "./Modals";
 
 export type Screen =
-| { id: "none" }
-
-// Modals
-| { id: "signed_out" }
-| { id: "error"; error: string }
-| { id: "clipboard"; text: string }
-| { id: "_prompt"; question: Children; content?: Children; actions: Action[] }
-| ({ id: "special_prompt" } & (
-    { type: "leave_group", target: Channels.GroupChannel } |
-    { type: "close_dm", target: Channels.DirectMessageChannel } |
-    { type: "leave_server", target: Servers.Server } |
-    { type: "delete_server", target: Servers.Server } |
-    { type: "delete_channel", target: Channels.TextChannel } |
-    { type: "delete_message", target: Channels.Message } |
-    { type: "create_invite", target: Channels.TextChannel | Channels.GroupChannel } |
-    { type: "kick_member", target: Servers.Server, user: string } |
-    { type: "ban_member", target: Servers.Server, user: string } |
-    { type: "unfriend_user", target: Users.User } |
-    { type: "block_user", target: Users.User } |
-    { type: "create_channel", target: Servers.Server }
-)) |
-({ id: "special_input" } & (
-    { type: "create_group" | "create_server" | "set_custom_status" | "add_friend" } |
-    { type: "create_role", server: string, callback: (id: string) => void }
-))
-| {
-      id: "_input";
-      question: Children;
-      field: Children;
-      defaultValue?: string;
-      callback: (value: string) => Promise<void>;
-  }
-| {
-      id: "onboarding";
-      callback: (
-          username: string,
-          loginAfterSuccess?: true
-      ) => Promise<void>;
-  }
-
-// Pop-overs
-| { id: "image_viewer"; attachment?: Attachment; embed?: EmbedImage; }
-| { id: "modify_account"; field: "username" | "email" | "password" }
-| { id: "profile"; user_id: string }
-| { id: "channel_info"; channel_id: string }
-| { id: "pending_requests"; users: string[] }
-| {
-      id: "user_picker";
-      omit?: string[];
-      callback: (users: string[]) => Promise<void>;
-  };
+    | { id: "none" }
+
+    // Modals
+    | { id: "signed_out" }
+    | { id: "error"; error: string }
+    | { id: "clipboard"; text: string }
+    | {
+          id: "_prompt";
+          question: Children;
+          content?: Children;
+          actions: Action[];
+      }
+    | ({ id: "special_prompt" } & (
+          | { type: "leave_group"; target: Channel }
+          | { type: "close_dm"; target: Channel }
+          | { type: "leave_server"; target: Server }
+          | { type: "delete_server"; target: Server }
+          | { type: "delete_channel"; target: Channel }
+          | { type: "delete_message"; target: Message }
+          | {
+                type: "create_invite";
+                target: Channel;
+            }
+          | { type: "kick_member"; target: Server; user: User }
+          | { type: "ban_member"; target: Server; user: User }
+          | { type: "unfriend_user"; target: User }
+          | { type: "block_user"; target: User }
+          | { type: "create_channel"; target: Server }
+      ))
+    | ({ id: "special_input" } & (
+          | {
+                type:
+                    | "create_group"
+                    | "create_server"
+                    | "set_custom_status"
+                    | "add_friend";
+            }
+          | {
+                type: "create_role";
+                server: Server;
+                callback: (id: string) => void;
+            }
+      ))
+    | {
+          id: "_input";
+          question: Children;
+          field: Children;
+          defaultValue?: string;
+          callback: (value: string) => Promise<void>;
+      }
+    | {
+          id: "onboarding";
+          callback: (
+              username: string,
+              loginAfterSuccess?: true,
+          ) => Promise<void>;
+      }
+
+    // Pop-overs
+    | { id: "image_viewer"; attachment?: Attachment; embed?: EmbedImage }
+    | { id: "modify_account"; field: "username" | "email" | "password" }
+    | { id: "profile"; user_id: string }
+    | { id: "channel_info"; channel: Channel }
+    | { id: "pending_requests"; users: User[] }
+    | {
+          id: "user_picker";
+          omit?: string[];
+          callback: (users: string[]) => Promise<void>;
+      };
 
 export const IntermediateContext = createContext({
-    screen: { id: "none" } as Screen,
-    focusTaken: false
+    screen: { id: "none" },
+    focusTaken: false,
 });
 
-export const IntermediateActionsContext = createContext({
-    openScreen: (screen: Screen) => {},
-    writeClipboard: (text: string) => {}
+export const IntermediateActionsContext = createContext<{
+    openScreen: (screen: Screen) => void;
+    writeClipboard: (text: string) => void;
+}>({
+    openScreen: null!,
+    writeClipboard: null!,
 });
 
 interface Props {
@@ -81,7 +111,7 @@ export default function Intermediate(props: Props) {
 
     const value = {
         screen,
-        focusTaken: screen.id !== 'none'
+        focusTaken: screen.id !== "none",
     };
 
     const actions = useMemo(() => {
@@ -93,26 +123,35 @@ export default function Intermediate(props: Props) {
                 } else {
                     actions.openScreen({ id: "clipboard", text });
                 }
-            }
-        }
+            },
+        };
     }, []);
 
     useEffect(() => {
-        const openProfile = (user_id: string) => openScreen({ id: "profile", user_id });
+        const openProfile = (user_id: string) =>
+            openScreen({ id: "profile", user_id });
         const navigate = (path: string) => history.push(path);
 
         const subs = [
-            internalSubscribe("Intermediate", "openProfile", openProfile),
-            internalSubscribe("Intermediate", "navigate", navigate)
-        ]
-
-        return () => subs.map(unsub => unsub());
-    }, []);
+            internalSubscribe(
+                "Intermediate",
+                "openProfile",
+                openProfile as (...args: unknown[]) => void,
+            ),
+            internalSubscribe(
+                "Intermediate",
+                "navigate",
+                navigate as (...args: unknown[]) => void,
+            ),
+        ];
+
+        return () => subs.map((unsub) => unsub());
+    }, [history]);
 
     return (
         <IntermediateContext.Provider value={value}>
             <IntermediateActionsContext.Provider value={actions}>
-                { screen.id !== 'onboarding' && props.children }
+                {screen.id !== "onboarding" && props.children}
                 <Modals
                     {...value}
                     {...actions}
@@ -121,10 +160,19 @@ export default function Intermediate(props: Props) {
                     } /** By specifying a key, we reset state whenever switching screen. */
                 />
                 <Prompt
-                    when={[ 'modify_account', 'special_prompt', 'special_input', 'image_viewer', 'profile', 'channel_info', 'pending_requests', 'user_picker' ].includes(screen.id)}
+                    when={[
+                        "modify_account",
+                        "special_prompt",
+                        "special_input",
+                        "image_viewer",
+                        "profile",
+                        "channel_info",
+                        "pending_requests",
+                        "user_picker",
+                    ].includes(screen.id)}
                     message={(_, action) => {
-                        if (action === 'POP') {
-                            openScreen({ id: 'none' });
+                        if (action === "POP") {
+                            openScreen({ id: "none" });
                             setTimeout(() => history.push(history.location), 0);
 
                             return false;

src/context/intermediate/Modals.tsx

-import { Screen } from "./Intermediate";
+import { internalEmit } from "../../lib/eventEmitter";
+
+import { isModalClosing } from "../../components/ui/Modal";
 
+import { Screen } from "./Intermediate";
+import { ClipboardModal } from "./modals/Clipboard";
 import { ErrorModal } from "./modals/Error";
 import { InputModal } from "./modals/Input";
+import { OnboardingModal } from "./modals/Onboarding";
 import { PromptModal } from "./modals/Prompt";
 import { SignedOutModal } from "./modals/SignedOut";
-import { ClipboardModal } from "./modals/Clipboard";
-import { OnboardingModal } from "./modals/Onboarding";
 
 export interface Props {
     screen: Screen;
-    openScreen: (id: any) => void;
+    openScreen: (screen: Screen) => void;
 }
 
 export default function Modals({ screen, openScreen }: Props) {
-    const onClose = () => openScreen({ id: "none" });
+    const onClose = () =>
+        isModalClosing || screen.id === "onboarding"
+            ? openScreen({ id: "none" })
+            : internalEmit("Modal", "close");
 
     switch (screen.id) {
         case "_prompt":

src/context/intermediate/Popovers.tsx

-import { IntermediateContext, useIntermediate } from "./Intermediate";
 import { useContext } from "preact/hooks";
 
-import { UserPicker } from "./popovers/UserPicker";
+import { internalEmit } from "../../lib/eventEmitter";
+
+import { isModalClosing } from "../../components/ui/Modal";
+
+import { IntermediateContext, useIntermediate } from "./Intermediate";
 import { SpecialInputModal } from "./modals/Input";
 import { SpecialPromptModal } from "./modals/Prompt";
-import { UserProfile } from "./popovers/UserProfile";
-import { ImageViewer } from "./popovers/ImageViewer";
 import { ChannelInfo } from "./popovers/ChannelInfo";
-import { PendingRequests } from "./popovers/PendingRequests";
+import { ImageViewer } from "./popovers/ImageViewer";
 import { ModifyAccountModal } from "./popovers/ModifyAccount";
+import { PendingRequests } from "./popovers/PendingRequests";
+import { UserPicker } from "./popovers/UserPicker";
+import { UserProfile } from "./popovers/UserProfile";
 
 export default function Popovers() {
     const { screen } = useContext(IntermediateContext);
     const { openScreen } = useIntermediate();
 
-    const onClose = () => openScreen({ id: "none" });
+    const onClose = () =>
+        isModalClosing
+            ? openScreen({ id: "none" })
+            : internalEmit("Modal", "close");
 
     switch (screen.id) {
         case "profile":

src/context/intermediate/modals/Clipboard.tsx

 import { Text } from "preact-i18n";
+
 import Modal from "../../../components/ui/Modal";
 
 interface Props {
@@ -16,10 +17,9 @@ export function ClipboardModal({ onClose, text }: Props) {
                 {
                     onClick: onClose,
                     confirmation: true,
-                    text: <Text id="app.special.modals.actions.close" />
-                }
-            ]}
-        >
+                    children: <Text id="app.special.modals.actions.close" />,
+                },
+            ]}>
             {location.protocol !== "https:" && (
                 <p>
                     <Text id="app.special.modals.clipboard.https" />

src/context/intermediate/modals/Error.tsx

 import { Text } from "preact-i18n";
+
 import Modal from "../../../components/ui/Modal";
 
 interface Props {
@@ -16,14 +17,13 @@ export function ErrorModal({ onClose, error }: Props) {
                 {
                     onClick: onClose,
                     confirmation: true,
-                    text: <Text id="app.special.modals.actions.ok" />
+                    children: <Text id="app.special.modals.actions.ok" />,
                 },
                 {
                     onClick: () => location.reload(),
-                    text: <Text id="app.special.modals.actions.reload" />
-                }
-            ]}
-        >
+                    children: <Text id="app.special.modals.actions.reload" />,
+                },
+            ]}>
             <Text id={`error.${error}`}>{error}</Text>
         </Modal>
     );

src/context/intermediate/modals/Input.tsx

+import { useHistory } from "react-router";
+import { Server } from "revolt.js/dist/maps/Servers";
 import { ulid } from "ulid";
+
 import { Text } from "preact-i18n";
-import { useHistory } from "react-router";
+import { useContext, useState } from "preact/hooks";
+
+import InputBox from "../../../components/ui/InputBox";
 import Modal from "../../../components/ui/Modal";
+import Overline from "../../../components/ui/Overline";
+
 import { Children } from "../../../types/Preact";
-import { takeError } from "../../revoltjs/util";
-import { useContext, useState } from "preact/hooks";
-import Overline from '../../../components/ui/Overline';
-import InputBox from '../../../components/ui/InputBox';
 import { AppContext } from "../../revoltjs/RevoltClient";
+import { takeError } from "../../revoltjs/util";
 
 interface Props {
     onClose: () => void;
@@ -22,7 +26,7 @@ export function InputModal({
     question,
     field,
     defaultValue,
-    callback
+    callback,
 }: Props) {
     const [processing, setProcessing] = useState(false);
     const [value, setValue] = useState(defaultValue ?? "");
@@ -36,31 +40,34 @@ export function InputModal({
             actions={[
                 {
                     confirmation: true,
-                    text: <Text id="app.special.modals.actions.ok" />,
+                    children: <Text id="app.special.modals.actions.ok" />,
                     onClick: () => {
                         setProcessing(true);
                         callback(value)
                             .then(onClose)
-                            .catch(err => {
+                            .catch((err) => {
                                 setError(takeError(err));
-                                setProcessing(false)
-                            })
-                    }
+                                setProcessing(false);
+                            });
+                    },
                 },
                 {
-                    text: <Text id="app.special.modals.actions.cancel" />,
-                    onClick: onClose
-                }
+                    children: <Text id="app.special.modals.actions.cancel" />,
+                    onClick: onClose,
+                },
             ]}
-            onClose={onClose}
-        >
+            onClose={onClose}>
             <form>
-                { field ? <Overline error={error} block>
-                    {field}
-                </Overline> : (error && <Overline error={error} type="error" block />) }
+                {field ? (
+                    <Overline error={error} block>
+                        {field}
+                    </Overline>
+                ) : (
+                    error && <Overline error={error} type="error" block />
+                )}
                 <InputBox
                     value={value}
-                    onChange={e => setValue(e.currentTarget.value)}
+                    onChange={(e) => setValue(e.currentTarget.value)}
                 />
             </form>
         </Modal>
@@ -68,9 +75,15 @@ export function InputModal({
 }
 
 type SpecialProps = { onClose: () => void } & (
-    { type: "create_group" | "create_server" | "set_custom_status" | "add_friend" } |
-    { type: "create_role", server: string, callback: (id: string) => void }
-)
+    | {
+          type:
+              | "create_group"
+              | "create_server"
+              | "set_custom_status"
+              | "add_friend";
+      }
+    | { type: "create_role"; server: Server; callback: (id: string) => void }
+);
 
 export function SpecialInputModal(props: SpecialProps) {
     const history = useHistory();
@@ -79,76 +92,90 @@ export function SpecialInputModal(props: SpecialProps) {
     const { onClose } = props;
     switch (props.type) {
         case "create_group": {
-            return <InputModal
-                onClose={onClose}
-                question={<Text id="app.main.groups.create" />}
-                field={<Text id="app.main.groups.name" />}
-                callback={async name => {
-                    const group = await client.channels.createGroup(
-                        {
+            return (
+                <InputModal
+                    onClose={onClose}
+                    question={<Text id="app.main.groups.create" />}
+                    field={<Text id="app.main.groups.name" />}
+                    callback={async (name) => {
+                        const group = await client.channels.createGroup({
                             name,
                             nonce: ulid(),
-                            users: []
-                        }
-                    );
+                            users: [],
+                        });
 
-                    history.push(`/channel/${group._id}`);
-                }}
-            />;
+                        history.push(`/channel/${group._id}`);
+                    }}
+                />
+            );
         }
         case "create_server": {
-            return <InputModal
-                onClose={onClose}
-                question={<Text id="app.main.servers.create" />}
-                field={<Text id="app.main.servers.name" />}
-                callback={async name => {
-                    const server = await client.servers.createServer(
-                        {
+            return (
+                <InputModal
+                    onClose={onClose}
+                    question={<Text id="app.main.servers.create" />}
+                    field={<Text id="app.main.servers.name" />}
+                    callback={async (name) => {
+                        const server = await client.servers.createServer({
                             name,
-                            nonce: ulid()
-                        }
-                    );
+                            nonce: ulid(),
+                        });
 
-                    history.push(`/server/${server._id}`);
-                }}
-            />;
+                        history.push(`/server/${server._id}`);
+                    }}
+                />
+            );
         }
         case "create_role": {
-            return <InputModal
-                onClose={onClose}
-                question={<Text id="app.settings.permissions.create_role" />}
-                field={<Text id="app.settings.permissions.role_name" />}
-                callback={async name => {
-                    const role = await client.servers.createRole(props.server, name);
-                    props.callback(role.id);
-                }}
-            />;
+            return (
+                <InputModal
+                    onClose={onClose}
+                    question={
+                        <Text id="app.settings.permissions.create_role" />
+                    }
+                    field={<Text id="app.settings.permissions.role_name" />}
+                    callback={async (name) => {
+                        const role = await props.server.createRole(name);
+                        props.callback(role.id);
+                    }}
+                />
+            );
         }
         case "set_custom_status": {
-            return <InputModal
-                onClose={onClose}
-                question={<Text id="app.context_menu.set_custom_status" />}
-                field={<Text id="app.context_menu.custom_status" />}
-                defaultValue={client.user?.status?.text}
-                callback={text =>
-                    client.users.editUser({
-                        status: {
-                            ...client.user?.status,
-                            text: text.trim().length > 0 ? text : undefined
-                        }
-                    })
-                }
-            />;
+            return (
+                <InputModal
+                    onClose={onClose}
+                    question={<Text id="app.context_menu.set_custom_status" />}
+                    field={<Text id="app.context_menu.custom_status" />}
+                    defaultValue={client.user?.status?.text}
+                    callback={(text) =>
+                        client.users.edit({
+                            status: {
+                                ...client.user?.status,
+                                text: text.trim().length > 0 ? text : undefined,
+                            },
+                        })
+                    }
+                />
+            );
         }
         case "add_friend": {
-            return <InputModal
-                onClose={onClose}
-                question={"Add Friend"}
-                callback={username =>
-                    client.users.addFriend(username)
-                }
-            />;
+            return (
+                <InputModal
+                    onClose={onClose}
+                    question={"Add Friend"}
+                    callback={(username) =>
+                        client
+                            .req(
+                                "PUT",
+                                `/users/${username}/friend` as "/users/id/friend",
+                            )
+                            .then(undefined)
+                    }
+                />
+            );
         }
-        default: return null;
+        default:
+            return null;
     }
 }

src/context/intermediate/modals/Onboarding.module.scss

@@ -26,7 +26,7 @@
                 margin: auto;
                 display: block;
                 max-height: 420px;
-                border-radius: 8px;
+                border-radius: var(--border-radius);
             }
 
             input {