diff --git a/src/uix/eidos/components/words/words-drawer.svelte b/src/uix/eidos/components/words/words-drawer.svelte
index cc4a303f0..e91f19b1f 100644
--- a/src/uix/eidos/components/words/words-drawer.svelte
+++ b/src/uix/eidos/components/words/words-drawer.svelte
@@ -305,7 +305,7 @@
 				title={preset}
 				aria-label={`Set foreground to ${preset}`}
 				onmousedown={(e) => e.preventDefault()}
-				onclick={() => s.runCommand(`color:${preset}` as never)}
+				onclick={() => s.applyCommand({ type: 'toggleMark', mark: `color:${preset}` as never })}
 			></button>
 		{/each}
 		<input
@@ -313,9 +313,9 @@
 			data-words-drawer-color-input
 			value={currentParametricMark(s.activeMarks, 'color') || '#000000'}
 			aria-label="Pick custom foreground color"
-			oninput={(e) => {
+			onchange={(e) => {
 				const v = (e.currentTarget as HTMLInputElement).value;
-				s.runCommand(`color:${v}` as never);
+				s.applyCommand({ type: 'toggleMark', mark: `color:${v}` as never });
 			}}
 		/>
 		{#if currentParametricMark(s.activeMarks, 'color')}
@@ -325,7 +325,7 @@
 				title="Clear foreground"
 				aria-label="Clear foreground color"
 				onmousedown={(e) => e.preventDefault()}
-				onclick={() => s.runCommand('color:' as never)}
+				onclick={() => s.applyCommand({ type: 'toggleMark', mark: 'color:' as never })}
 			>×</button>
 		{/if}
 	</div>
@@ -341,7 +341,7 @@
 				title={preset}
 				aria-label={`Set background to ${preset}`}
 				onmousedown={(e) => e.preventDefault()}
-				onclick={() => s.runCommand(`bgcolor:${preset}` as never)}
+				onclick={() => s.applyCommand({ type: 'toggleMark', mark: `bgcolor:${preset}` as never })}
 			></button>
 		{/each}
 		<input
@@ -349,9 +349,9 @@
 			data-words-drawer-color-input
 			value={currentParametricMark(s.activeMarks, 'bgcolor') || '#ffff00'}
 			aria-label="Pick custom background color"
-			oninput={(e) => {
+			onchange={(e) => {
 				const v = (e.currentTarget as HTMLInputElement).value;
-				s.runCommand(`bgcolor:${v}` as never);
+				s.applyCommand({ type: 'toggleMark', mark: `bgcolor:${v}` as never });
 			}}
 		/>
 		{#if currentParametricMark(s.activeMarks, 'bgcolor')}
@@ -361,7 +361,7 @@
 				title="Clear background"
 				aria-label="Clear background color"
 				onmousedown={(e) => e.preventDefault()}
-				onclick={() => s.runCommand('bgcolor:' as never)}
+				onclick={() => s.applyCommand({ type: 'toggleMark', mark: 'bgcolor:' as never })}
 			>×</button>
 		{/if}
 	</div>