diff --git a/ts/addons/BUILD.bazel b/ts/addons/BUILD.bazel
new file mode 100644
index 00000000000..4eb92f4b9dc
--- /dev/null
+++ b/ts/addons/BUILD.bazel
@@ -0,0 +1,77 @@
+load("@npm//@bazel/typescript:index.bzl", "ts_library")
+load("//ts/svelte:svelte.bzl", "compile_svelte", "svelte_check")
+load("//ts:prettier.bzl", "prettier_test")
+load("//ts:eslint.bzl", "eslint_test")
+load("//ts:esbuild.bzl", "esbuild")
+
+svelte_files = glob(["*.svelte"])
+
+svelte_names = [f.replace(".svelte", "") for f in svelte_files]
+
+filegroup(
+    name = "svelte_components",
+    srcs = svelte_names,
+    visibility = ["//visibility:public"],
+)
+
+compile_svelte(
+    name = "svelte",
+    srcs = svelte_files,
+    visibility = ["//visibility:public"],
+    deps = [
+        "//ts/sass:button_mixins_lib",
+        "//ts/sass/bootstrap",
+    ],
+)
+
+ts_library(
+    name = "addons",
+    srcs = glob(
+        ["*.ts"],
+        exclude = ["*.test.ts"],
+    ),
+    module_name = "addons",
+    tsconfig = "//ts:tsconfig.json",
+    visibility = ["//visibility:public"],
+    deps = [
+        "//ts/components",
+        "//ts/lib",
+        "//ts/sveltelib",
+        "@npm//@popperjs/core",
+        "@npm//@types/bootstrap",
+        "@npm//bootstrap",
+        "@npm//svelte",
+    ] + svelte_names,
+)
+
+# Tests
+################
+
+prettier_test(
+    name = "format_check",
+    srcs = glob([
+        "*.ts",
+        "*.svelte",
+    ]),
+)
+
+eslint_test(
+    name = "eslint",
+    srcs = glob(
+        [
+            "*.ts",
+        ],
+    ),
+)
+
+svelte_check(
+    name = "svelte_check",
+    srcs = glob([
+        "*.ts",
+        "*.svelte",
+    ]) + [
+        "//ts/sass:button_mixins_lib",
+        "//ts/sass/bootstrap",
+        "@npm//@types/bootstrap",
+    ],
+)
diff --git a/ts/addons/IconButton.svelte b/ts/addons/IconButton.svelte
new file mode 100644
index 00000000000..e955ff78b83
--- /dev/null
+++ b/ts/addons/IconButton.svelte
@@ -0,0 +1,36 @@
+<!--
+Copyright: Ankitects Pty Ltd and contributors
+License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
+-->
+<script lang="typescript">
+    import IconButton from "components/IconButton.svelte";
+
+    export let id: string;
+    export let className: string;
+
+    export let tooltip: string;
+    export let active: boolean;
+    export let disabled: boolean;
+    export let tabbable: boolean;
+
+    export let iconSize: number;
+    export let widthMultiplier: number;
+
+    export let onClick: (event: MouseEvent) => void;
+    export let onMount: (event: CustomEvent) => void;
+</script>
+
+<IconButton
+    {id}
+    class={className}
+    {tooltip}
+    {active}
+    {disabled}
+    {tabbable}
+    {iconSize}
+    {widthMultiplier}
+    on:click={onClick}
+    on:mount={onMount}
+>
+    <slot />
+</IconButton>
diff --git a/ts/addons/Slotted.svelte b/ts/addons/Slotted.svelte
new file mode 100644
index 00000000000..bec833df3f5
--- /dev/null
+++ b/ts/addons/Slotted.svelte
@@ -0,0 +1,12 @@
+<!--
+Copyright: Ankitects Pty Ltd and contributors
+License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
+-->
+<script>
+    export let component;
+    export let slotted;
+</script>
+
+<svelte:component this={component.component} {...component.props}>
+    {slotted}
+</svelte:component>
diff --git a/ts/addons/SlottedHTML.svelte b/ts/addons/SlottedHTML.svelte
new file mode 100644
index 00000000000..45c8fb3f5f5
--- /dev/null
+++ b/ts/addons/SlottedHTML.svelte
@@ -0,0 +1,12 @@
+<!--
+Copyright: Ankitects Pty Ltd and contributors
+License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
+-->
+<script>
+    export let component;
+    export let slotted;
+</script>
+
+<svelte:component this={component.component} {...component.props}>
+    {@html slotted}
+</svelte:component>
diff --git a/ts/addons/WithContext.svelte b/ts/addons/WithContext.svelte
new file mode 100644
index 00000000000..9ac3dd27d74
--- /dev/null
+++ b/ts/addons/WithContext.svelte
@@ -0,0 +1,17 @@
+<!--
+Copyright: Ankitects Pty Ltd and contributors
+License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
+-->
+<script lang="typescript">
+    import type { SvelteComponentTyped } from "svelte/internal";
+    import WithContext from "components/WithContext.svelte";
+
+    export let key: string;
+    export let getComponent: ({ context }) => SvelteComponentTyped;
+</script>
+
+<WithContext {key} let:context>
+    {#each [getComponent({ context })] as data}
+        <svelte:component this={data.component} {...data.props} />
+    {/each}
+</WithContext>
diff --git a/ts/addons/WithShortcut.svelte b/ts/addons/WithShortcut.svelte
new file mode 100644
index 00000000000..1beed958836
--- /dev/null
+++ b/ts/addons/WithShortcut.svelte
@@ -0,0 +1,20 @@
+<!--
+Copyright: Ankitects Pty Ltd and contributors
+License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
+-->
+<script lang="typescript">
+    import type { SvelteComponentTyped } from "svelte/internal";
+    import WithShortcut from "components/WithShortcut.svelte";
+
+    export let shortcut: string;
+    export let getComponent: ({
+        createShortcut,
+        shortcutLabel,
+    }) => SvelteComponentTyped;
+</script>
+
+<WithShortcut {shortcut} let:createShortcut let:shortcutLabel>
+    {#each [getComponent({ createShortcut, shortcutLabel })] as data}
+        <svelte:component this={data.component} {...data.props} />
+    {/each}
+</WithShortcut>
diff --git a/ts/addons/WithState.svelte b/ts/addons/WithState.svelte
new file mode 100644
index 00000000000..ce5a1f3ac14
--- /dev/null
+++ b/ts/addons/WithState.svelte
@@ -0,0 +1,19 @@
+<!--
+Copyright: Ankitects Pty Ltd and contributors
+License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
+-->
+<script lang="typescript">
+    import type { SvelteComponentTyped } from "svelte/internal";
+    import WithState from "components/WithState.svelte";
+
+    export let key: string;
+    export let update: (event: Event) => boolean;
+
+    export let getComponent: ({ state, updateState }) => SvelteComponentTyped;
+</script>
+
+<WithState {key} {update} let:state let:updateState>
+    {#each [getComponent({ state, updateState })] as data}
+        <svelte:component this={data.component} {...data.props} />
+    {/each}
+</WithState>
diff --git a/ts/addons/dynamic-components.ts b/ts/addons/dynamic-components.ts
new file mode 100644
index 00000000000..5a082ee8a9b
--- /dev/null
+++ b/ts/addons/dynamic-components.ts
@@ -0,0 +1,25 @@
+// Copyright: Ankitects Pty Ltd and contributors
+// License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
+
+import { dynamicComponent } from "sveltelib/dynamicComponent";
+
+/* components */
+import IconButton from "./IconButton.svelte";
+export const iconButton = dynamicComponent(IconButton);
+
+/* decorators */
+import WithContext from "./WithContext.svelte";
+export const withContext = dynamicComponent(WithContext);
+
+import WithState from "./WithState.svelte";
+export const withState = dynamicComponent(WithState);
+
+import WithShortcut from "./WithShortcut.svelte";
+export const withShortcut = dynamicComponent(WithShortcut);
+
+/* slots */
+import Slotted from "./Slotted.svelte";
+export const slotted = dynamicComponent(Slotted);
+
+import SlottedHTML from "./SlottedHTML.svelte";
+export const slottedHtml = dynamicComponent(SlottedHTML);
diff --git a/ts/components/IconButton.svelte b/ts/components/IconButton.svelte
index 300a551eb4c..0d1ee32f710 100644
--- a/ts/components/IconButton.svelte
+++ b/ts/components/IconButton.svelte
@@ -31,12 +31,12 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 <button
     bind:this={buttonRef}
     {id}
-    class={`btn ${className}`}
+    class="btn {className}"
     class:active
     class:dropdown-toggle={dropdownProps.dropdown}
     class:btn-day={!nightMode}
     class:btn-night={nightMode}
-    style={`--icon-size: ${iconSize}%`}
+    style="--icon-size: {iconSize}%"
     title={tooltip}
     {...dropdownProps}
     {disabled}
diff --git a/ts/deck-options/DeckOptionsPage.svelte b/ts/deck-options/DeckOptionsPage.svelte
index d7b94a3ec70..f2d74431cc6 100644
--- a/ts/deck-options/DeckOptionsPage.svelte
+++ b/ts/deck-options/DeckOptionsPage.svelte
@@ -39,7 +39,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
                 component: HtmlAddon,
                 html,
                 mounted,
-            },
+            } as unknown as DynamicSvelteComponent,
         ];
     }
 
diff --git a/ts/editor/BUILD.bazel b/ts/editor/BUILD.bazel
index 18221bd9ef3..f26493a1df9 100644
--- a/ts/editor/BUILD.bazel
+++ b/ts/editor/BUILD.bazel
@@ -22,6 +22,7 @@ compile_svelte(
     visibility = ["//visibility:public"],
     deps = [
         "//ts/components",
+        "//ts/addons",
     ],
 )
 
@@ -71,6 +72,7 @@ ts_library(
         "//ts/lib",
         "//ts/sveltelib",
         "//ts/components",
+        "//ts/addons",
         "//ts/html-filter",
         "//ts:image_module_support",
         "@npm//svelte",
@@ -141,6 +143,8 @@ esbuild(
         "svelte_components",
         "//ts/components",
         "//ts/components:svelte_components",
+        "//ts/addons",
+        "//ts/addons:svelte_components",
         "@npm//protobufjs",
     ],
 )
@@ -175,5 +179,6 @@ svelte_check(
         "//ts/sass/bootstrap",
         "@npm//@types/bootstrap",
         "//ts/components",
+        "//ts/addons",
     ],
 )
diff --git a/ts/editor/Components.svelte b/ts/editor/Components.svelte
index e6c14f10422..b4b6bac662a 100644
--- a/ts/editor/Components.svelte
+++ b/ts/editor/Components.svelte
@@ -3,19 +3,23 @@ Copyright: Ankitects Pty Ltd and contributors
 License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script context="module" lang="typescript">
-    import IconButton from "components/IconButton.svelte";
-    import LabelButton from "components/LabelButton.svelte";
-    import WithContext from "components/WithContext.svelte";
-    import WithState from "components/WithState.svelte";
+    import {
+        iconButton,
+        withContext,
+        withState,
+        withShortcut,
+        slottedHtml,
+    } from "addons/dynamic-components";
 
     import * as contextKeys from "components/context-keys";
     import * as editorContextKeys from "./context-keys";
 
     export const components = {
-        IconButton,
-        LabelButton,
-        WithContext,
-        WithState,
+        iconButton,
+        withContext,
+        withState,
+        withShortcut,
+        slottedHtml,
         contextKeys: { ...contextKeys, ...editorContextKeys },
     };
 </script>
diff --git a/ts/sveltelib/dynamicComponent.ts b/ts/sveltelib/dynamicComponent.ts
index 15e7ba7c734..bb7f0bd13b6 100644
--- a/ts/sveltelib/dynamicComponent.ts
+++ b/ts/sveltelib/dynamicComponent.ts
@@ -1,21 +1,12 @@
 // Copyright: Ankitects Pty Ltd and contributors
 // License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
-import type { SvelteComponentDev } from "svelte/internal";
-
-export interface DynamicSvelteComponent<
-    T extends typeof SvelteComponentDev = typeof SvelteComponentDev
-> {
-    component: T;
-    [k: string]: unknown;
+export interface DynamicSvelteComponent {
+    component: unknown;
+    props: Record<string, unknown>;
 }
 
 export const dynamicComponent =
-    <
-        Comp extends typeof SvelteComponentDev,
-        DefaultProps = NonNullable<ConstructorParameters<Comp>[0]["props"]>
-    >(
-        component: Comp
-    ) =>
-    <Props = DefaultProps>(props: Props): DynamicSvelteComponent<Comp> & Props => {
-        return { component, ...props };
+    <T>(component: T) =>
+    (props: Record<string, unknown>): DynamicSvelteComponent => {
+        return { component, props };
     };