diff --git a/ts/deckoptions/Addons.svelte b/ts/deckoptions/Addons.svelte
index 68f74090c..871748d2f 100644
--- a/ts/deckoptions/Addons.svelte
+++ b/ts/deckoptions/Addons.svelte
@@ -7,12 +7,14 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import type { DeckOptionsState } from "./lib";
 
     export let state: DeckOptionsState;
+    export let api: Record<string, never>;
+
     let components = state.addonComponents;
     const auxData = state.currentAuxData;
 </script>
 
 {#if $components.length || state.haveAddons}
-    <TitledContainer title="Add-ons">
+    <TitledContainer title="Add-ons" {api}>
         <p>
             If you're using an add-on that hasn't been updated to use this new screen
             yet, you can access the old deck options screen by holding down the shift
diff --git a/ts/deckoptions/AdvancedOptions.svelte b/ts/deckoptions/AdvancedOptions.svelte
index 861dfa6c4..e6f8f2375 100644
--- a/ts/deckoptions/AdvancedOptions.svelte
+++ b/ts/deckoptions/AdvancedOptions.svelte
@@ -10,11 +10,13 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import type { DeckOptionsState } from "./lib";
 
     export let state: DeckOptionsState;
+    export let api: Record<string, never>;
+
     let config = state.currentConfig;
     let defaults = state.defaults;
 </script>
 
-<TitledContainer title={tr.deckConfigAdvancedTitle()}>
+<TitledContainer title={tr.deckConfigAdvancedTitle()} {api}>
     <SpinBoxRow
         bind:value={$config.maximumReviewInterval}
         defaultValue={defaults.maximumReviewInterval}
diff --git a/ts/deckoptions/AudioOptions.svelte b/ts/deckoptions/AudioOptions.svelte
index 50ff2e4f2..c48d0caef 100644
--- a/ts/deckoptions/AudioOptions.svelte
+++ b/ts/deckoptions/AudioOptions.svelte
@@ -9,11 +9,13 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import type { DeckOptionsState } from "./lib";
 
     export let state: DeckOptionsState;
+    export let api: Record<string, never>;
+
     let config = state.currentConfig;
     let defaults = state.defaults;
 </script>
 
-<TitledContainer title={tr.deckConfigAudioTitle()}>
+<TitledContainer title={tr.deckConfigAudioTitle()} {api}>
     <CheckBoxRow
         bind:value={$config.disableAutoplay}
         defaultValue={defaults.disableAutoplay}
diff --git a/ts/deckoptions/BuryOptions.svelte b/ts/deckoptions/BuryOptions.svelte
index 4ce27dbaf..ce18650c9 100644
--- a/ts/deckoptions/BuryOptions.svelte
+++ b/ts/deckoptions/BuryOptions.svelte
@@ -4,48 +4,31 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="ts">
     import * as tr from "lib/i18n";
-    import marked from "marked";
     import TitledContainer from "./TitledContainer.svelte";
-    import Col from "./Col.svelte";
-    import Row from "./Row.svelte";
-    import HelpPopup from "./HelpPopup.svelte";
-    import CheckBox from "./CheckBox.svelte";
-    import RevertButton from "./RevertButton.svelte";
+    import CheckBoxRow from "./CheckBoxRow.svelte";
     import type { DeckOptionsState } from "./lib";
 
     export let state: DeckOptionsState;
+    export let api: Record<string, never>;
+
     let config = state.currentConfig;
     let defaults = state.defaults;
 </script>
 
-<TitledContainer title={tr.deckConfigBuryTitle()}>
-    <Row>
-        <Col>
-            <CheckBox bind:value={$config.buryNew}>
-                {tr.deckConfigBuryNewSiblings()}
-                <HelpPopup html={marked(tr.deckConfigBuryTooltip())} />
-            </CheckBox>
-        </Col>
-        <Col grow={false}>
-            <RevertButton
-                defaultValue={defaults.buryNew}
-                bind:value={$config.buryNew}
-            />
-        </Col>
-    </Row>
+<TitledContainer title={tr.deckConfigBuryTitle()} {api}>
+    <CheckBoxRow
+        bind:value={$config.buryNew}
+        defaultValue={defaults.buryNew}
+        markdownTooltip={tr.deckConfigBuryTitle()}
+    >
+        {tr.deckConfigBuryNewSiblings()}
+    </CheckBoxRow>
 
-    <Row>
-        <Col>
-            <CheckBox bind:value={$config.buryReviews}>
-                {tr.deckConfigBuryReviewSiblings()}
-                <HelpPopup html={marked(tr.deckConfigBuryTooltip())} />
-            </CheckBox>
-        </Col>
-        <Col grow={false}>
-            <RevertButton
-                defaultValue={defaults.buryReviews}
-                bind:value={$config.buryReviews}
-            />
-        </Col>
-    </Row>
+    <CheckBoxRow
+        bind:value={$config.buryReviews}
+        defaultValue={defaults.buryReviews}
+        markdownTooltip={tr.deckConfigBuryTooltip()}
+    >
+        {tr.deckConfigBuryReviewSiblings()}
+    </CheckBoxRow>
 </TitledContainer>
diff --git a/ts/deckoptions/ConfigEditor.svelte b/ts/deckoptions/ConfigEditor.svelte
deleted file mode 100644
index a91c1fe14..000000000
--- a/ts/deckoptions/ConfigEditor.svelte
+++ /dev/null
@@ -1,57 +0,0 @@
-<!--
-Copyright: Ankitects Pty Ltd and contributors
-License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
--->
-<script lang="ts">
-    import Container from "components/Container.svelte";
-    import SectionItem from "components/SectionItem.svelte";
-
-    import DailyLimits from "./DailyLimits.svelte";
-    import DisplayOrder from "./DisplayOrder.svelte";
-    import NewOptions from "./NewOptions.svelte";
-    import AdvancedOptions from "./AdvancedOptions.svelte";
-    import BuryOptions from "./BuryOptions.svelte";
-    import LapseOptions from "./LapseOptions.svelte";
-    import TimerOptions from "./TimerOptions.svelte";
-    import AudioOptions from "./AudioOptions.svelte";
-    import Addons from "./Addons.svelte";
-    import type { DeckOptionsState } from "./lib";
-
-    export let state: DeckOptionsState;
-    export let options: Record<string, never>;
-</script>
-
-<Container api={options}>
-    <SectionItem>
-        <DailyLimits {state} />
-    </SectionItem>
-
-    <SectionItem>
-        <NewOptions {state} />
-    </SectionItem>
-    <SectionItem>
-        <LapseOptions {state} />
-    </SectionItem>
-    <SectionItem>
-        <BuryOptions {state} />
-    </SectionItem>
-
-    {#if state.v3Scheduler}
-        <SectionItem>
-            <DisplayOrder {state} />
-        </SectionItem>
-    {/if}
-
-    <SectionItem>
-        <TimerOptions {state} />
-    </SectionItem>
-    <SectionItem>
-        <AudioOptions {state} />
-    </SectionItem>
-    <SectionItem>
-        <Addons {state} />
-    </SectionItem>
-    <SectionItem>
-        <AdvancedOptions {state} />
-    </SectionItem>
-</Container>
diff --git a/ts/deckoptions/DailyLimits.svelte b/ts/deckoptions/DailyLimits.svelte
index 4f1eeaa6c..3c768be55 100644
--- a/ts/deckoptions/DailyLimits.svelte
+++ b/ts/deckoptions/DailyLimits.svelte
@@ -5,11 +5,14 @@
 <script lang="ts">
     import * as tr from "lib/i18n";
     import TitledContainer from "./TitledContainer.svelte";
+    import SectionItem from "components/SectionItem.svelte";
     import SpinBoxRow from "./SpinBoxRow.svelte";
     import Warning from "./Warning.svelte";
     import type { DeckOptionsState } from "./lib";
 
     export let state: DeckOptionsState;
+    export let api: Record<string, never>;
+
     let config = state.currentConfig;
     let defaults = state.defaults;
     let parentLimits = state.parentLimits;
@@ -35,24 +38,28 @@
             : "";
 </script>
 
-<TitledContainer title={tr.deckConfigDailyLimits()}>
-    <SpinBoxRow
-        bind:value={$config.newPerDay}
-        defaultValue={defaults.newPerDay}
-        markdownTooltip={tr.deckConfigNewLimitTooltip() + v3Extra}
-    >
-        {tr.schedulingNewCardsday()}
-    </SpinBoxRow>
+<TitledContainer title={tr.deckConfigDailyLimits()} {api}>
+    <SectionItem>
+        <SpinBoxRow
+            bind:value={$config.newPerDay}
+            defaultValue={defaults.newPerDay}
+            markdownTooltip={tr.deckConfigNewLimitTooltip() + v3Extra}
+        >
+            {tr.schedulingNewCardsday()}
+        </SpinBoxRow>
 
-    <Warning warning={newCardsGreaterThanParent} />
+        <Warning warning={newCardsGreaterThanParent} />
+    </SectionItem>
 
-    <SpinBoxRow
-        bind:value={$config.reviewsPerDay}
-        defaultValue={defaults.reviewsPerDay}
-        markdownTooltip={tr.deckConfigReviewLimitTooltip() + v3Extra}
-    >
-        {tr.schedulingMaximumReviewsday()}
-    </SpinBoxRow>
+    <SectionItem>
+        <SpinBoxRow
+            bind:value={$config.reviewsPerDay}
+            defaultValue={defaults.reviewsPerDay}
+            markdownTooltip={tr.deckConfigReviewLimitTooltip() + v3Extra}
+        >
+            {tr.schedulingMaximumReviewsday()}
+        </SpinBoxRow>
 
-    <Warning warning={reviewsTooLow} />
+        <Warning warning={reviewsTooLow} />
+    </SectionItem>
 </TitledContainer>
diff --git a/ts/deckoptions/DeckOptionsPage.svelte b/ts/deckoptions/DeckOptionsPage.svelte
index 93a474e90..29aa27774 100644
--- a/ts/deckoptions/DeckOptionsPage.svelte
+++ b/ts/deckoptions/DeckOptionsPage.svelte
@@ -4,7 +4,18 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="ts">
     import ConfigSelector from "./ConfigSelector.svelte";
-    import ConfigEditor from "./ConfigEditor.svelte";
+    import Container from "components/Container.svelte";
+    import SectionItem from "components/SectionItem.svelte";
+    import DailyLimits from "./DailyLimits.svelte";
+    import DisplayOrder from "./DisplayOrder.svelte";
+    import NewOptions from "./NewOptions.svelte";
+    import AdvancedOptions from "./AdvancedOptions.svelte";
+    import BuryOptions from "./BuryOptions.svelte";
+    import LapseOptions from "./LapseOptions.svelte";
+    import TimerOptions from "./TimerOptions.svelte";
+    import AudioOptions from "./AudioOptions.svelte";
+    import Addons from "./Addons.svelte";
+
     import type { DeckOptionsState } from "./lib";
     import type { Writable } from "svelte/store";
     import HtmlAddon from "./HtmlAddon.svelte";
@@ -33,7 +44,50 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     }
 
     export const options = {};
+    export const dailyLimits = {};
+    export const newOptions = {};
+    export const lapseOptions = {};
+    export const buryOptions = {};
+    export const displayOrder = {};
+    export const timerOptions = {};
+    export const audioOptions = {};
+    export const addonOptions = {};
+    export const advancedOptions = {};
 </script>
 
 <ConfigSelector {state} />
-<ConfigEditor {state} {options} />
+
+<Container api={options}>
+    <SectionItem>
+        <DailyLimits {state} api={dailyLimits} />
+    </SectionItem>
+
+    <SectionItem>
+        <NewOptions {state} api={newOptions} />
+    </SectionItem>
+    <SectionItem>
+        <LapseOptions {state} api={lapseOptions} />
+    </SectionItem>
+    <SectionItem>
+        <BuryOptions {state} api={buryOptions} />
+    </SectionItem>
+
+    {#if state.v3Scheduler}
+        <SectionItem>
+            <DisplayOrder {state} api={displayOrder} />
+        </SectionItem>
+    {/if}
+
+    <SectionItem>
+        <TimerOptions {state} api={timerOptions} />
+    </SectionItem>
+    <SectionItem>
+        <AudioOptions {state} api={audioOptions} />
+    </SectionItem>
+    <SectionItem>
+        <Addons {state} api={addonOptions} />
+    </SectionItem>
+    <SectionItem>
+        <AdvancedOptions {state} api={advancedOptions} />
+    </SectionItem>
+</Container>
diff --git a/ts/deckoptions/DisplayOrder.svelte b/ts/deckoptions/DisplayOrder.svelte
index 9f80c9ae3..e597d72ef 100644
--- a/ts/deckoptions/DisplayOrder.svelte
+++ b/ts/deckoptions/DisplayOrder.svelte
@@ -11,6 +11,8 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import { reviewMixChoices } from "./strings";
 
     export let state: DeckOptionsState;
+    export let api: Record<string, never>;
+
     let config = state.currentConfig;
     let defaults = state.defaults;
 
@@ -36,7 +38,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     ];
 </script>
 
-<TitledContainer title={tr.deckConfigOrderingTitle()}>
+<TitledContainer title={tr.deckConfigOrderingTitle()} {api}>
     <EnumSelectorRow
         bind:value={$config.newCardGatherPriority}
         defaultValue={defaults.newCardGatherPriority}
diff --git a/ts/deckoptions/LapseOptions.svelte b/ts/deckoptions/LapseOptions.svelte
index e21e4da50..1342a68a1 100644
--- a/ts/deckoptions/LapseOptions.svelte
+++ b/ts/deckoptions/LapseOptions.svelte
@@ -12,6 +12,8 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import type { DeckOptionsState } from "./lib";
 
     export let state: DeckOptionsState;
+    export let api = {};
+
     let config = state.currentConfig;
     let defaults = state.defaults;
 
@@ -29,7 +31,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     const leechChoices = [tr.actionsSuspendCard(), tr.schedulingTagOnly()];
 </script>
 
-<TitledContainer title={tr.schedulingLapses()}>
+<TitledContainer title={tr.schedulingLapses()} {api}>
     <StepsInputRow
         bind:value={$config.relearnSteps}
         defaultValue={defaults.relearnSteps}
diff --git a/ts/deckoptions/NewOptions.svelte b/ts/deckoptions/NewOptions.svelte
index 983e3ebee..bd70f8cef 100644
--- a/ts/deckoptions/NewOptions.svelte
+++ b/ts/deckoptions/NewOptions.svelte
@@ -12,6 +12,8 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import type { DeckOptionsState } from "./lib";
 
     export let state: DeckOptionsState;
+    export let api = {};
+
     let config = state.currentConfig;
     let defaults = state.defaults;
 
@@ -37,7 +39,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
             : "";
 </script>
 
-<TitledContainer title={tr.schedulingNewCards()}>
+<TitledContainer title={tr.schedulingNewCards()} {api}>
     <StepsInputRow
         bind:value={$config.learnSteps}
         defaultValue={defaults.learnSteps}
diff --git a/ts/deckoptions/TimerOptions.svelte b/ts/deckoptions/TimerOptions.svelte
index 2d9a9798b..7721af3aa 100644
--- a/ts/deckoptions/TimerOptions.svelte
+++ b/ts/deckoptions/TimerOptions.svelte
@@ -10,11 +10,13 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import type { DeckOptionsState } from "./lib";
 
     export let state: DeckOptionsState;
+    export let api: Record<string, never>;
+
     let config = state.currentConfig;
     let defaults = state.defaults;
 </script>
 
-<TitledContainer title={tr.deckConfigTimerTitle()}>
+<TitledContainer title={tr.deckConfigTimerTitle()} {api}>
     <SpinBoxRow
         bind:value={$config.capAnswerTimeToSecs}
         defaultValue={defaults.capAnswerTimeToSecs}