diff --git a/.changeset/dull-trains-bake.md b/.changeset/dull-trains-bake.md
new file mode 100644
index 000000000..7d71a26c4
--- /dev/null
+++ b/.changeset/dull-trains-bake.md
@@ -0,0 +1,5 @@
+---
+'@ryanatkn/fuz': minor
+---
+
+move theme Svelte helpers to `Themed.svelte` from `theme.ts` to prepare for Moss
diff --git a/src/lib/Color_Scheme_Input.svelte b/src/lib/Color_Scheme_Input.svelte
index 2d78a53b9..7af22803d 100644
--- a/src/lib/Color_Scheme_Input.svelte
+++ b/src/lib/Color_Scheme_Input.svelte
@@ -2,7 +2,8 @@
 	import type {Writable} from 'svelte/store';
 	import {swallow} from '@ryanatkn/belt/dom.js';
 
-	import {color_schemes, type Color_Scheme, get_color_scheme} from '$lib/theme.js';
+	import {color_schemes, type Color_Scheme} from '$lib/theme.js';
+	import {get_color_scheme} from '$lib/Themed.svelte';
 
 	interface Props {
 		selected_color_scheme?: Writable<Color_Scheme | null>;
diff --git a/src/lib/Theme_Input.svelte b/src/lib/Theme_Input.svelte
index fe69df1fa..fce92b753 100644
--- a/src/lib/Theme_Input.svelte
+++ b/src/lib/Theme_Input.svelte
@@ -2,7 +2,8 @@
 	import type {Readable} from 'svelte/store';
 	import {swallow} from '@ryanatkn/belt/dom.js';
 
-	import {get_theme, type Theme} from '$lib/theme.js';
+	import type {Theme} from '$lib/theme.js';
+	import {get_theme} from '$lib/Themed.svelte';
 	import {default_themes} from '$lib/themes.js';
 
 	interface Props {
diff --git a/src/lib/Themed.svelte b/src/lib/Themed.svelte
index ab7468eb7..31d048ae0 100644
--- a/src/lib/Themed.svelte
+++ b/src/lib/Themed.svelte
@@ -1,19 +1,30 @@
 <script lang="ts" context="module">
 	let mounted = false;
+
+	// TODO change API to use runes
+
+	const THEME_KEY = Symbol('theme');
+	export const get_theme = (): Writable<Theme> => getContext(THEME_KEY);
+	export const set_theme = (store: Writable<Theme>): Writable<Theme> =>
+		setContext(THEME_KEY, store);
+
+	const COLOR_SCHEME_KEY = Symbol('color_scheme');
+	export const get_color_scheme = (): Writable<Color_Scheme | null> => getContext(COLOR_SCHEME_KEY);
+	export const set_color_scheme = (
+		store: Writable<Color_Scheme | null>,
+	): Writable<Color_Scheme | null> => setContext(COLOR_SCHEME_KEY, store);
 </script>
 
 <script lang="ts">
-	import {onDestroy, onMount, type Snippet} from 'svelte';
+	import {getContext, onDestroy, onMount, setContext, type Snippet} from 'svelte';
 	import {writable, type Writable} from 'svelte/store';
 
 	import {
 		create_theme_style_html,
 		render_theme_style,
 		type Theme,
-		set_theme,
 		create_theme_setup_script,
 		type Color_Scheme,
-		set_color_scheme,
 		load_color_scheme as default_load_color_scheme,
 		save_color_scheme as default_save_color_scheme,
 		sync_color_scheme as default_sync_color_scheme,
diff --git a/src/lib/Themed_Scope.svelte b/src/lib/Themed_Scope.svelte
index 2ecd965b1..f7afdb4d8 100644
--- a/src/lib/Themed_Scope.svelte
+++ b/src/lib/Themed_Scope.svelte
@@ -5,17 +5,13 @@
 <script lang="ts">
 	import {get, writable, type Writable} from 'svelte/store';
 	import type {Snippet} from 'svelte';
-
 	import {
 		create_theme_style_html,
 		render_theme_style,
 		type Theme,
-		set_theme,
 		type Color_Scheme,
-		set_color_scheme,
-		get_theme,
-		get_color_scheme,
 	} from '$lib/theme.js';
+	import {set_theme, get_theme, set_color_scheme, get_color_scheme} from '$lib/Themed.svelte';
 
 	interface Props {
 		/**
diff --git a/src/lib/theme.ts b/src/lib/theme.ts
index 88fd024b9..21fd5e485 100644
--- a/src/lib/theme.ts
+++ b/src/lib/theme.ts
@@ -1,6 +1,3 @@
-import {getContext, setContext} from 'svelte';
-import type {Writable} from 'svelte/store';
-
 import {default_variables} from '$lib/variables.js';
 import {default_themes} from '$lib/themes.js'; // TODO shoudln't be a dep, see usage below
 
@@ -189,15 +186,3 @@ export const render_theme_variable = (
 		(comments && variable.summary ? ' /* ' + variable.summary + ' */' : '')
 	);
 };
-
-// TODO change API to use runes
-
-const THEME_KEY = Symbol('theme');
-export const get_theme = (): Writable<Theme> => getContext(THEME_KEY);
-export const set_theme = (store: Writable<Theme>): Writable<Theme> => setContext(THEME_KEY, store);
-
-const COLOR_SCHEME_KEY = Symbol('color_scheme');
-export const get_color_scheme = (): Writable<Color_Scheme | null> => getContext(COLOR_SCHEME_KEY);
-export const set_color_scheme = (
-	store: Writable<Color_Scheme | null>,
-): Writable<Color_Scheme | null> => setContext(COLOR_SCHEME_KEY, store);
diff --git a/src/routes/library/light_and_shadow/+page.svelte b/src/routes/library/light_and_shadow/+page.svelte
index 0f0f39eeb..3a320a5f1 100644
--- a/src/routes/library/light_and_shadow/+page.svelte
+++ b/src/routes/library/light_and_shadow/+page.svelte
@@ -6,7 +6,7 @@
 	import Style_Variable_Button from '$routes/Style_Variable_Button.svelte';
 	import Tome_Link from '$lib/Tome_Link.svelte';
 	import {get_tome} from '$lib/tome.js';
-	import {get_color_scheme} from '$lib/theme.js';
+	import {get_color_scheme} from '$lib/Themed.svelte';
 	import Tome_Subheading from '$lib/Tome_Subheading.svelte';
 
 	const LIBRARY_ITEM_NAME = 'light and shadow';
diff --git a/src/routes/library/themes/+page.svelte b/src/routes/library/themes/+page.svelte
index 0ad350115..25ae925de 100644
--- a/src/routes/library/themes/+page.svelte
+++ b/src/routes/library/themes/+page.svelte
@@ -8,7 +8,8 @@
 	import {get_tome} from '$lib/tome.js';
 	import Color_Scheme_Input from '$lib/Color_Scheme_Input.svelte';
 	import Tome_Link from '$lib/Tome_Link.svelte';
-	import {type Theme, save_theme, get_theme, get_color_scheme} from '$lib/theme.js';
+	import {type Theme, save_theme} from '$lib/theme.js';
+	import {get_theme, get_color_scheme} from '$lib/Themed.svelte';
 	import {default_themes} from '$lib/themes.js';
 	import Tome_Subheading from '$lib/Tome_Subheading.svelte';
 	import Theme_Input from '$lib/Theme_Input.svelte';
diff --git a/src/routes/package.ts b/src/routes/package.ts
index 18c21236f..20e406fe0 100644
--- a/src/routes/package.ts
+++ b/src/routes/package.ts
@@ -432,10 +432,6 @@ export const src_json = {
 				{name: 'Render_Theme_Style_Options', kind: 'type'},
 				{name: 'render_theme_style', kind: 'function'},
 				{name: 'render_theme_variable', kind: 'function'},
-				{name: 'get_theme', kind: 'function'},
-				{name: 'set_theme', kind: 'function'},
-				{name: 'get_color_scheme', kind: 'function'},
-				{name: 'set_color_scheme', kind: 'function'},
 			],
 		},
 		'./Themed_Scope.svelte': {path: 'Themed_Scope.svelte', declarations: []},