diff --git a/ts/deckoptions/CheckBox.svelte b/ts/deckoptions/CheckBox.svelte
index c4e6638af..22b584719 100644
--- a/ts/deckoptions/CheckBox.svelte
+++ b/ts/deckoptions/CheckBox.svelte
@@ -4,13 +4,11 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="ts">
     import ConfigEntry from "./ConfigEntry.svelte";
-    export let subLabel: string;
+    export let label: string;
     export let value: boolean;
     export let defaultValue: boolean;
 </script>
 
 <ConfigEntry label="" wholeLine={true} bind:value {defaultValue}>
-    <div>
-        <label> <input type="checkbox" bind:checked={value} /> {subLabel} </label>
-    </div>
+    <div><label> <input type="checkbox" bind:checked={value} /> {label} </label></div>
 </ConfigEntry>
diff --git a/ts/deckoptions/ConfigEntry.svelte b/ts/deckoptions/ConfigEntry.svelte
index e8d7a64b2..2ad682703 100644
--- a/ts/deckoptions/ConfigEntry.svelte
+++ b/ts/deckoptions/ConfigEntry.svelte
@@ -8,7 +8,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import HelpPopup from "./HelpPopup.svelte";
 
     export let label: string;
-    export let subLabel = "";
+    export let tooltip = "";
     export let value: any;
     export let defaultValue: any;
     /// empty strings will be ignored
@@ -58,8 +58,8 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         <div class="table">
             <span class="vcenter">
                 {label}
-                {#if subLabel}
-                    <HelpPopup html={subLabel} />
+                {#if tooltip}
+                    <HelpPopup html={tooltip} />
                 {/if}
             </span>
         </div>
diff --git a/ts/deckoptions/DailyLimits.svelte b/ts/deckoptions/DailyLimits.svelte
index e9ce7fb73..3116d5b12 100644
--- a/ts/deckoptions/DailyLimits.svelte
+++ b/ts/deckoptions/DailyLimits.svelte
@@ -38,7 +38,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
     <SpinBox
         label={tr.schedulingNewCardsday()}
-        subLabel="The maximum number of new cards to introduce in a day."
+        tooltip="The maximum number of new cards to introduce in a day."
         min={0}
         warnings={[newCardsGreaterThanParent]}
         defaultValue={defaults.newPerDay}
@@ -46,7 +46,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
     <SpinBox
         label={tr.schedulingMaximumReviewsday()}
-        subLabel="The maximum number of reviews cards to show in a day."
+        tooltip="The maximum number of reviews cards to show in a day."
         min={0}
         warnings={[reviewsTooLow]}
         defaultValue={defaults.reviewsPerDay}
diff --git a/ts/deckoptions/EnumSelector.svelte b/ts/deckoptions/EnumSelector.svelte
index abe5706d4..2594e9cbe 100644
--- a/ts/deckoptions/EnumSelector.svelte
+++ b/ts/deckoptions/EnumSelector.svelte
@@ -6,13 +6,13 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import ConfigEntry from "./ConfigEntry.svelte";
 
     export let label: string;
-    export let subLabel: string;
+    export let tooltip: string;
     export let choices: string[];
     export let value: number = 0;
     export let defaultValue: number;
 </script>
 
-<ConfigEntry {label} {subLabel} wholeLine={true} bind:value {defaultValue}>
+<ConfigEntry {label} {tooltip} wholeLine={true} bind:value {defaultValue}>
     <select bind:value class="form-select">
         {#each choices as choice, idx}
             <option value={idx}>{choice}</option>
diff --git a/ts/deckoptions/GeneralOptions.svelte b/ts/deckoptions/GeneralOptions.svelte
index b80778b7c..6716f59cd 100644
--- a/ts/deckoptions/GeneralOptions.svelte
+++ b/ts/deckoptions/GeneralOptions.svelte
@@ -18,24 +18,24 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
     <SpinBox
         label={tr.schedulingIgnoreAnswerTimesLongerThan()}
-        subLabel="The maximum number of seconds to record for a single review."
+        tooltip="The maximum number of seconds to record for a single review."
         min={30}
         max={600}
         defaultValue={defaults.capAnswerTimeToSecs}
         bind:value={$config.capAnswerTimeToSecs} />
 
     <CheckBox
-        subLabel={tr.schedulingShowAnswerTimer()}
+        label={tr.schedulingShowAnswerTimer()}
         defaultValue={defaults.showTimer}
         bind:value={$config.showTimer} />
 
     <CheckBox
-        subLabel="Don't play audio automatically"
+        label="Don't play audio automatically"
         defaultValue={defaults.disableAutoplay}
         bind:value={$config.disableAutoplay} />
 
     <CheckBox
-        subLabel={tr.schedulingAlwaysIncludeQuestionSideWhenReplaying()}
+        label={tr.schedulingAlwaysIncludeQuestionSideWhenReplaying()}
         defaultValue={defaults.skipQuestionWhenReplayingAnswer}
         bind:value={$config.skipQuestionWhenReplayingAnswer} />
 </div>
diff --git a/ts/deckoptions/LapseOptions.svelte b/ts/deckoptions/LapseOptions.svelte
index ceda3b7f2..19d17ccf1 100644
--- a/ts/deckoptions/LapseOptions.svelte
+++ b/ts/deckoptions/LapseOptions.svelte
@@ -22,14 +22,14 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
     <StepsInput
         label="Relearning steps"
-        subLabel="Relearning steps, separated by spaces."
+        tooltip="Relearning steps, separated by spaces."
         defaultValue={defaults.relearnSteps}
         value={$config.relearnSteps}
         on:changed={(evt) => ($config.relearnSteps = evt.detail.value)} />
 
     <SpinBoxFloat
         label={tr.schedulingNewInterval()}
-        subLabel="The multiplier applied to review cards when answering Again."
+        tooltip="The multiplier applied to review cards when answering Again."
         min={0}
         max={1}
         defaultValue={defaults.lapseMultiplier}
@@ -38,21 +38,21 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
     <SpinBox
         label={tr.schedulingMinimumInterval()}
-        subLabel="The minimum new interval a lapsed card will be given after relearning."
+        tooltip="The minimum new interval a lapsed card will be given after relearning."
         min={1}
         defaultValue={defaults.minimumLapseInterval}
         bind:value={$config.minimumLapseInterval} />
 
     <SpinBox
         label={tr.schedulingLeechThreshold()}
-        subLabel="Number of times Again needs to be pressed on a review card to make it a leech."
+        tooltip="Number of times Again needs to be pressed on a review card to make it a leech."
         min={1}
         defaultValue={defaults.leechThreshold}
         bind:value={$config.leechThreshold} />
 
     <EnumSelector
         label={tr.schedulingLeechAction()}
-        subLabel=""
+        tooltip=""
         choices={leechChoices}
         defaultValue={defaults.leechAction}
         bind:value={$config.leechAction} />
diff --git a/ts/deckoptions/NewOptions.svelte b/ts/deckoptions/NewOptions.svelte
index 7e778db33..35e29148b 100644
--- a/ts/deckoptions/NewOptions.svelte
+++ b/ts/deckoptions/NewOptions.svelte
@@ -42,35 +42,35 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
     <StepsInput
         label="Learning steps"
-        subLabel="Learning steps, separated by spaces."
+        tooltip="Learning steps, separated by spaces."
         defaultValue={defaults.learnSteps}
         value={$config.learnSteps}
         on:changed={(evt) => ($config.learnSteps = evt.detail.value)} />
 
     <EnumSelector
         label={tr.schedulingOrder()}
-        subLabel=""
+        tooltip=""
         choices={newOrderChoices}
         defaultValue={defaults.newCardOrder}
         bind:value={$config.newCardOrder} />
 
     <SpinBox
         label={tr.schedulingGraduatingInterval()}
-        subLabel="Days to wait after answering Good on the last learning step."
+        tooltip="Days to wait after answering Good on the last learning step."
         warnings={[stepsExceedGraduatingInterval]}
         defaultValue={defaults.graduatingIntervalGood}
         bind:value={$config.graduatingIntervalGood} />
 
     <SpinBox
         label={tr.schedulingEasyInterval()}
-        subLabel="Days to wait after answering Easy on the first learning step."
+        tooltip="Days to wait after answering Easy on the first learning step."
         warnings={[goodExceedsEasy]}
         defaultValue={defaults.graduatingIntervalEasy}
         bind:value={$config.graduatingIntervalEasy} />
 
     <SpinBoxFloat
         label={tr.schedulingStartingEase()}
-        subLabel="The default multiplier when a review is answered Good."
+        tooltip="The default multiplier when a review is answered Good."
         min={1.31}
         max={5}
         defaultValue={defaults.initialEase}
@@ -78,7 +78,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         on:changed={(evt) => ($config.initialEase = evt.detail.value)} />
 
     <CheckBox
-        subLabel={tr.schedulingBuryRelatedNewCardsUntilThe()}
+        label={tr.schedulingBuryRelatedNewCardsUntilThe()}
         defaultValue={defaults.buryNew}
         bind:value={$config.buryNew} />
 </div>
diff --git a/ts/deckoptions/ReviewOptions.svelte b/ts/deckoptions/ReviewOptions.svelte
index 11974e72b..bd0b89e17 100644
--- a/ts/deckoptions/ReviewOptions.svelte
+++ b/ts/deckoptions/ReviewOptions.svelte
@@ -19,7 +19,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
     <SpinBoxFloat
         label={tr.schedulingEasyBonus()}
-        subLabel="Extra multiplier applied when answering Easy on a review card."
+        tooltip="Extra multiplier applied when answering Easy on a review card."
         min={1}
         max={3}
         defaultValue={defaults.easyMultiplier}
@@ -28,7 +28,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
     <SpinBoxFloat
         label={tr.schedulingIntervalModifier()}
-        subLabel="Multiplier applied to all reviews."
+        tooltip="Multiplier applied to all reviews."
         min={0.5}
         max={2}
         defaultValue={defaults.intervalMultiplier}
@@ -37,7 +37,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
     <SpinBox
         label={tr.schedulingMaximumInterval()}
-        subLabel="The longest number of days a review card will wait."
+        tooltip="The longest number of days a review card will wait."
         min={1}
         max={365 * 100}
         defaultValue={defaults.maximumReviewInterval}
@@ -45,7 +45,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
     <SpinBoxFloat
         label={tr.schedulingHardInterval()}
-        subLabel="Multiplier applied to review interval when Hard is pressed."
+        tooltip="Multiplier applied to review interval when Hard is pressed."
         min={0.5}
         max={1.3}
         defaultValue={defaults.hardMultiplier}
@@ -53,7 +53,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         on:changed={(evt) => ($config.hardMultiplier = evt.detail.value)} />
 
     <CheckBox
-        subLabel={tr.schedulingBuryRelatedReviewsUntilTheNext()}
+        label={tr.schedulingBuryRelatedReviewsUntilTheNext()}
         defaultValue={defaults.buryReviews}
         bind:value={$config.buryReviews} />
 </div>
diff --git a/ts/deckoptions/SpinBox.svelte b/ts/deckoptions/SpinBox.svelte
index 984e51a59..03dbb4ec2 100644
--- a/ts/deckoptions/SpinBox.svelte
+++ b/ts/deckoptions/SpinBox.svelte
@@ -6,7 +6,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import ConfigEntry from "./ConfigEntry.svelte";
 
     export let label: string;
-    export let subLabel: string;
+    export let tooltip: string;
     export let value: number;
     export let min = 1;
     export let max = 9999;
@@ -20,6 +20,6 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     }
 </script>
 
-<ConfigEntry {label} {subLabel} {warnings} bind:value {defaultValue}>
+<ConfigEntry {label} {tooltip} {warnings} bind:value {defaultValue}>
     <input type="number" {min} {max} bind:value class="form-control" />
 </ConfigEntry>
diff --git a/ts/deckoptions/SpinBoxFloat.svelte b/ts/deckoptions/SpinBoxFloat.svelte
index b7a550ef1..34f4912a6 100644
--- a/ts/deckoptions/SpinBoxFloat.svelte
+++ b/ts/deckoptions/SpinBoxFloat.svelte
@@ -8,7 +8,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import type { NumberValueEvent } from "./events";
 
     export let label: string;
-    export let subLabel: string;
+    export let tooltip: string;
     export let value: number;
     export let defaultValue: number;
     export let min = 1;
@@ -30,7 +30,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     }
 </script>
 
-<ConfigEntry {label} {subLabel} {value} {defaultValue} on:revert={revert}>
+<ConfigEntry {label} {tooltip} {value} {defaultValue} on:revert={revert}>
     <input
         type="number"
         {min}
diff --git a/ts/deckoptions/StepsInput.svelte b/ts/deckoptions/StepsInput.svelte
index 141cc6307..a8ef674ee 100644
--- a/ts/deckoptions/StepsInput.svelte
+++ b/ts/deckoptions/StepsInput.svelte
@@ -9,7 +9,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import type { NumberValueEvent } from "./events";
 
     export let label: string;
-    export let subLabel: string;
+    export let tooltip: string;
     export let value: number[];
     export let defaultValue: number[];
     export let warnings: string[] = [];
@@ -31,7 +31,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
 <ConfigEntry
     {label}
-    {subLabel}
+    {tooltip}
     {value}
     {defaultValue}
     {warnings}