diff --git a/eslint.config.js b/eslint.config.js
index f13c0d9..3984de6 100644
--- a/eslint.config.js
+++ b/eslint.config.js
@@ -23,7 +23,6 @@ export default defineConfig(
     'eslint.config.js',
     'svelte.config.js',
     '**/vite.*.ts',
-    './test/utils/ContextWrapper.svelte',
   ]),
   {
     languageOptions: {
diff --git a/package-lock.json b/package-lock.json
index 55b79c0..e52a5de 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -40,7 +40,7 @@
         "rollup-plugin-copy": "~3.5.0",
         "sass": "~1.93.2",
         "smui-theme": "~8.0.3",
-        "svelte": "~5.39.11",
+        "svelte": "~5.40.1",
         "svelte-check": "~4.3.3",
         "typescript": "~5.9.3",
         "typescript-eslint": "~8.45.0",
@@ -5888,9 +5888,9 @@
       }
     },
     "node_modules/svelte": {
-      "version": "5.39.11",
-      "resolved": "https://registry.npmjs.org/svelte/-/svelte-5.39.11.tgz",
-      "integrity": "sha512-8MxWVm2+3YwrFbPaxOlT1bbMi6OTenrAgks6soZfiaS8Fptk4EVyRIFhJc3RpO264EeSNwgjWAdki0ufg4zkGw==",
+      "version": "5.40.1",
+      "resolved": "https://registry.npmjs.org/svelte/-/svelte-5.40.1.tgz",
+      "integrity": "sha512-0R3t2oiLxJNJb2buz61MNfPdkjeyj2qTCM7TtIv/4ZfF12zD7Ig8iIo+C8febroy+9S4QJ7qfijtearSdO/1ww==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -10731,9 +10731,9 @@
       }
     },
     "svelte": {
-      "version": "5.39.11",
-      "resolved": "https://registry.npmjs.org/svelte/-/svelte-5.39.11.tgz",
-      "integrity": "sha512-8MxWVm2+3YwrFbPaxOlT1bbMi6OTenrAgks6soZfiaS8Fptk4EVyRIFhJc3RpO264EeSNwgjWAdki0ufg4zkGw==",
+      "version": "5.40.1",
+      "resolved": "https://registry.npmjs.org/svelte/-/svelte-5.40.1.tgz",
+      "integrity": "sha512-0R3t2oiLxJNJb2buz61MNfPdkjeyj2qTCM7TtIv/4ZfF12zD7Ig8iIo+C8febroy+9S4QJ7qfijtearSdO/1ww==",
       "dev": true,
       "requires": {
         "@jridgewell/remapping": "^2.3.4",
diff --git a/package.json b/package.json
index c224fdf..b458319 100644
--- a/package.json
+++ b/package.json
@@ -62,7 +62,7 @@
     "rollup-plugin-copy": "~3.5.0",
     "sass": "~1.93.2",
     "smui-theme": "~8.0.3",
-    "svelte": "~5.39.11",
+    "svelte": "~5.40.1",
     "svelte-check": "~4.3.3",
     "typescript": "~5.9.3",
     "typescript-eslint": "~8.45.0",
diff --git a/src/options/Options.svelte.test.ts b/src/options/Options.svelte.test.ts
index acc4124..cabfcc1 100644
--- a/src/options/Options.svelte.test.ts
+++ b/src/options/Options.svelte.test.ts
@@ -3,14 +3,8 @@ import { beforeEach, describe, expect, it, vi } from 'vitest';
 
 import Options from '@Treetop/options/Options.svelte';
 
-import ContextWrapper from '../../test/utils/ContextWrapper.svelte';
-
 const setup = () => {
-  render(ContextWrapper, {
-    Component: Options,
-    Props: {},
-    Context: {},
-  });
+  render(Options);
 };
 
 describe('Options', () => {
diff --git a/src/treetop/Bookmark.svelte b/src/treetop/Bookmark.svelte
index d4e2df7..364fa3e 100644
--- a/src/treetop/Bookmark.svelte
+++ b/src/treetop/Bookmark.svelte
@@ -1,9 +1,12 @@
 <script lang="ts">
-  import { getContext } from 'svelte';
-  import type { SvelteDate } from 'svelte/reactivity';
   import lodashTruncate from 'lodash-es/truncate';
 
-  import type * as Treetop from './types';
+  import {
+    getClock,
+    getLastVisitTimeMap,
+    getTooltips,
+    getTruncate,
+  } from './context';
   import { truncateMiddle } from './utils';
 
   interface Props {
@@ -14,11 +17,10 @@
 
   let { nodeId, title, url }: Props = $props();
 
-  const lastVisitTimeMap: Treetop.LastVisitTimeMap =
-    getContext('lastVisitTimeMap');
-  const truncate = getContext<() => boolean>('truncate');
-  const tooltips = getContext<() => boolean>('tooltips');
-  const clock = getContext<SvelteDate>('clock');
+  const lastVisitTimeMap = getLastVisitTimeMap();
+  const truncate = getTruncate();
+  const tooltips = getTooltips();
+  const clock = getClock();
 
   const lastVisitTime = $derived(lastVisitTimeMap.get(nodeId)!);
 
diff --git a/src/treetop/Bookmark.svelte.test.ts b/src/treetop/Bookmark.svelte.test.ts
index 028994a..3d00a96 100644
--- a/src/treetop/Bookmark.svelte.test.ts
+++ b/src/treetop/Bookmark.svelte.test.ts
@@ -4,10 +4,9 @@ import { render, screen } from '@testing-library/svelte';
 import escapeRegExp from 'lodash-es/escapeRegExp';
 import { beforeEach, describe, expect, it } from 'vitest';
 
-import Bookmark from '@Treetop/treetop/Bookmark.svelte';
 import type * as Treetop from '@Treetop/treetop/types';
 
-import ContextWrapper from '../../test/utils/ContextWrapper.svelte';
+import BookmarkWrapper from '../../test/utils/BookmarkWrapper.svelte';
 
 let lastVisitTimeMap: Treetop.LastVisitTimeMap;
 let currentTruncate: boolean;
@@ -29,15 +28,14 @@ const MILLISECONDS_PER_HOUR =
   60; // minutes per hour
 
 const setup = () => {
-  render(ContextWrapper, {
-    Component: Bookmark,
-    Props: { nodeId, title, url },
-    Context: {
-      lastVisitTimeMap,
-      truncate,
-      tooltips,
-      clock,
-    },
+  render(BookmarkWrapper, {
+    lastVisitTimeMap,
+    truncate,
+    tooltips,
+    clock,
+    nodeId,
+    title,
+    url,
   });
 };
 
diff --git a/src/treetop/Folder.svelte b/src/treetop/Folder.svelte
index e2d38d8..faec420 100644
--- a/src/treetop/Folder.svelte
+++ b/src/treetop/Folder.svelte
@@ -1,7 +1,11 @@
 <script lang="ts">
-  import { getContext } from 'svelte';
-
   import Bookmark from './Bookmark.svelte';
+  import {
+    getBuiltInFolderInfo,
+    getFilterActive,
+    getFilterSet,
+    getFolderNodeMap,
+  } from './context';
   import Folder from './Folder.svelte';
   import * as Treetop from './types';
 
@@ -12,11 +16,10 @@
 
   let { nodeId, root = false }: Props = $props();
 
-  const builtInFolderInfo: Treetop.BuiltInFolderInfo =
-    getContext('builtInFolderInfo');
-  const folderNodeMap = getContext<Treetop.FolderNodeMap>('folderNodeMap');
-  const filterActive = getContext<() => boolean>('filterActive');
-  const filterSet = getContext<Treetop.FilterSet>('filterSet');
+  const builtInFolderInfo = getBuiltInFolderInfo();
+  const folderNodeMap = getFolderNodeMap();
+  const filterActive = getFilterActive();
+  const filterSet = getFilterSet();
 
   const node = $derived(folderNodeMap.get(nodeId)!);
 
diff --git a/src/treetop/Folder.svelte.test.ts b/src/treetop/Folder.svelte.test.ts
index 2842205..b3d3f5e 100644
--- a/src/treetop/Folder.svelte.test.ts
+++ b/src/treetop/Folder.svelte.test.ts
@@ -5,14 +5,13 @@ import { render, screen } from '@testing-library/svelte';
 import type { MockInstance } from 'vitest';
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 
-import Folder from '@Treetop/treetop/Folder.svelte';
 import type * as Treetop from '@Treetop/treetop/types';
 
-import ContextWrapper from '../../test/utils/ContextWrapper.svelte';
 import {
   createBookmarkNode,
   createFolderNode,
 } from '../../test/utils/factories';
+import FolderWrapper from '../../test/utils/FolderWrapper.svelte';
 
 // Folder component requirements
 let builtInFolderInfo: Treetop.BuiltInFolderInfo;
@@ -31,22 +30,17 @@ let clock: SvelteDate;
 let rootNode: Treetop.FolderNode;
 
 const setup = () => {
-  render(ContextWrapper, {
-    Component: Folder,
-    Props: {
-      nodeId,
-      root: true,
-    },
-    Context: {
-      builtInFolderInfo,
-      folderNodeMap,
-      lastVisitTimeMap,
-      filterActive,
-      filterSet,
-      truncate,
-      tooltips,
-      clock,
-    },
+  render(FolderWrapper, {
+    builtInFolderInfo,
+    folderNodeMap,
+    lastVisitTimeMap,
+    filterActive,
+    filterSet,
+    truncate,
+    tooltips,
+    clock,
+    nodeId,
+    root: true,
   });
 };
 
diff --git a/src/treetop/Treetop.svelte b/src/treetop/Treetop.svelte
index e855d33..b479e57 100644
--- a/src/treetop/Treetop.svelte
+++ b/src/treetop/Treetop.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { onDestroy, onMount, setContext } from 'svelte';
+  import { onDestroy, onMount } from 'svelte';
   import { SvelteMap, SvelteSet } from 'svelte/reactivity';
   import { fade } from 'svelte/transition';
   import LinearProgress from '@smui/linear-progress';
@@ -14,6 +14,16 @@
   import { BookmarksManager } from './BookmarksManager';
   import { createClock } from './clock.svelte';
   import ConfirmationDialog from './ConfirmationDialog.svelte';
+  import {
+    setBuiltInFolderInfo,
+    setClock,
+    setFilterActive,
+    setFilterSet,
+    setFolderNodeMap,
+    setLastVisitTimeMap,
+    setTooltips,
+    setTruncate,
+  } from './context';
   import FilterInput from './FilterInput.svelte';
   import { FilterManager } from './FilterManager';
   import Folder from './Folder.svelte';
@@ -47,8 +57,8 @@
   );
 
   // Make select preferences available to other components
-  setContext('truncate', truncate);
-  setContext('tooltips', tooltips);
+  setTruncate(truncate);
+  setTooltips(tooltips);
 
   //
   // Create bookmarks data and manager
@@ -90,12 +100,12 @@
   const clock = createClock();
 
   // Make bookmark data available to other components
-  setContext('builtInFolderInfo', builtInFolderInfo);
-  setContext('folderNodeMap', folderNodeMap);
-  setContext('lastVisitTimeMap', lastVisitTimeMap);
-  setContext('filterActive', () => filterActive);
-  setContext('filterSet', filterSet);
-  setContext('clock', clock);
+  setBuiltInFolderInfo(builtInFolderInfo);
+  setFolderNodeMap(folderNodeMap);
+  setLastVisitTimeMap(lastVisitTimeMap);
+  setFilterActive(() => filterActive);
+  setFilterSet(filterSet);
+  setClock(clock);
 
   //
   // Error notification
diff --git a/src/treetop/Treetop.svelte.test.ts b/src/treetop/Treetop.svelte.test.ts
index d88fbb2..230fe42 100644
--- a/src/treetop/Treetop.svelte.test.ts
+++ b/src/treetop/Treetop.svelte.test.ts
@@ -3,16 +3,11 @@ import { describe, expect, it, vi } from 'vitest';
 
 import Treetop from '@Treetop/treetop/Treetop.svelte';
 
-import ContextWrapper from '../../test/utils/ContextWrapper.svelte';
 import { createBrowserBookmarksTree } from '../../test/utils/factories';
 
 const setup = () => {
-  render(ContextWrapper, {
-    Component: Treetop,
-    Props: {
-      rootBookmarkId: null,
-    },
-    Context: {},
+  render(Treetop, {
+    rootBookmarkId: null,
   });
 };
 
diff --git a/src/treetop/context.ts b/src/treetop/context.ts
new file mode 100644
index 0000000..a5cc9b0
--- /dev/null
+++ b/src/treetop/context.ts
@@ -0,0 +1,26 @@
+import { createContext } from 'svelte';
+import type { SvelteDate } from 'svelte/reactivity';
+
+import * as Treetop from './types';
+
+export const [getBuiltInFolderInfo, setBuiltInFolderInfo] =
+  createContext<Treetop.BuiltInFolderInfo>();
+
+export const [getClock, setClock] = createContext<SvelteDate>();
+
+export const [getFilterActive, setFilterActive] =
+  createContext<() => boolean>();
+
+export const [getFilterSet, setFilterSet] = createContext<Treetop.FilterSet>();
+
+export const [getFolderNodeMap, setFolderNodeMap] =
+  createContext<Treetop.FolderNodeMap>();
+
+export const [getLastVisitTimeMap, setLastVisitTimeMap] =
+  createContext<Treetop.LastVisitTimeMap>();
+
+export const [getTooltips, setTooltips] =
+  createContext<() => Treetop.PreferenceValue>();
+
+export const [getTruncate, setTruncate] =
+  createContext<() => Treetop.PreferenceValue>();
diff --git a/test/utils/BookmarkWrapper.svelte b/test/utils/BookmarkWrapper.svelte
new file mode 100644
index 0000000..58a0a93
--- /dev/null
+++ b/test/utils/BookmarkWrapper.svelte
@@ -0,0 +1,33 @@
+<script lang="ts">
+  // Wrapper component to test Bookmark component with context.
+  import type { ComponentProps } from 'svelte';
+  import type { SvelteDate } from 'svelte/reactivity';
+
+  import Bookmark from '@Treetop/treetop/Bookmark.svelte';
+  import {
+    setClock,
+    setLastVisitTimeMap,
+    setTooltips,
+    setTruncate,
+  } from '@Treetop/treetop/context';
+  import * as Treetop from '@Treetop/treetop/types';
+
+  type BookmarkProps = ComponentProps<typeof Bookmark>;
+
+  type Props = BookmarkProps & {
+    lastVisitTimeMap: Treetop.LastVisitTimeMap;
+    truncate: () => boolean;
+    tooltips: () => boolean;
+    clock: SvelteDate;
+  };
+
+  const { lastVisitTimeMap, truncate, tooltips, clock, ...props }: Props =
+    $props();
+
+  setLastVisitTimeMap(lastVisitTimeMap);
+  setTruncate(truncate);
+  setTooltips(tooltips);
+  setClock(clock);
+</script>
+
+<Bookmark {...props} />
diff --git a/test/utils/ContextWrapper.svelte b/test/utils/ContextWrapper.svelte
deleted file mode 100644
index e5e5c6b..0000000
--- a/test/utils/ContextWrapper.svelte
+++ /dev/null
@@ -1,23 +0,0 @@
-<script lang="ts" generics="TComponent extends Component<any>">
-  // Wrapper component to test Svelte components that use the Context API.
-  // See https://github.com/svelte-society/recipes-mvp/blob/master/testing.md#testing-the-context-api
-  import type { Component, ComponentProps } from 'svelte';
-  import { setContext } from 'svelte';
-
-  interface Props {
-    // Component
-    Component: TComponent;
-    Props: ComponentProps<TComponent>;
-
-    // Context
-    Context: Record<string, any>;
-  }
-
-  let { Component: WrappedComponent, Props, Context }: Props = $props();
-
-  for (const [key, value] of Object.entries(Context)) {
-    setContext(key, value);
-  }
-</script>
-
-<WrappedComponent {...Props} />
diff --git a/test/utils/FolderWrapper.svelte b/test/utils/FolderWrapper.svelte
new file mode 100644
index 0000000..739c901
--- /dev/null
+++ b/test/utils/FolderWrapper.svelte
@@ -0,0 +1,54 @@
+<script lang="ts">
+  // Wrapper component to test Folder component with context.
+  import type { ComponentProps } from 'svelte';
+  import type { SvelteDate } from 'svelte/reactivity';
+
+  import {
+    setBuiltInFolderInfo,
+    setClock,
+    setFilterActive,
+    setFilterSet,
+    setFolderNodeMap,
+    setLastVisitTimeMap,
+    setTooltips,
+    setTruncate,
+  } from '@Treetop/treetop/context';
+  import Folder from '@Treetop/treetop/Folder.svelte';
+  import * as Treetop from '@Treetop/treetop/types';
+
+  type FolderProps = ComponentProps<typeof Folder>;
+
+  type Props = FolderProps & {
+    builtInFolderInfo: Treetop.BuiltInFolderInfo;
+    folderNodeMap: Treetop.FolderNodeMap;
+    filterActive: () => boolean;
+    filterSet: Treetop.FilterSet;
+    lastVisitTimeMap: Treetop.LastVisitTimeMap;
+    truncate: () => boolean;
+    tooltips: () => boolean;
+    clock: SvelteDate;
+  };
+
+  const {
+    builtInFolderInfo,
+    folderNodeMap,
+    lastVisitTimeMap,
+    filterActive,
+    filterSet,
+    truncate,
+    tooltips,
+    clock,
+    ...props
+  }: Props = $props();
+
+  setBuiltInFolderInfo(builtInFolderInfo);
+  setFolderNodeMap(folderNodeMap);
+  setLastVisitTimeMap(lastVisitTimeMap);
+  setFilterActive(filterActive);
+  setFilterSet(filterSet);
+  setTruncate(truncate);
+  setTooltips(tooltips);
+  setClock(clock);
+</script>
+
+<Folder {...props} />