diff --git a/core/palettes/Blanca.tid b/core/palettes/Blanca.tid
index 55d303bf1..7bae2a26c 100644
--- a/core/palettes/Blanca.tid
+++ b/core/palettes/Blanca.tid
@@ -10,6 +10,9 @@ alert-highlight: #881122
 alert-muted-foreground: #b99e2f
 background: #ffffff
 blockquote-bar: <<colour muted-foreground>>
+button-background:
+button-foreground:
+button-border:
 code-background: #f7f7f9
 code-border: #e1e1e8
 code-foreground: #dd1144
diff --git a/core/palettes/Blue.tid b/core/palettes/Blue.tid
index a194a9ed9..8068e5fc5 100644
--- a/core/palettes/Blue.tid
+++ b/core/palettes/Blue.tid
@@ -10,6 +10,9 @@ alert-highlight: #881122
 alert-muted-foreground: #b99e2f
 background: #fff
 blockquote-bar: <<colour muted-foreground>>
+button-background:
+button-foreground:
+button-border:
 code-background: #f7f7f9
 code-border: #e1e1e8
 code-foreground: #dd1144
diff --git a/core/palettes/BrightMute.tid b/core/palettes/BrightMute.tid
index 977efcd13..1a74ce3fa 100644
--- a/core/palettes/BrightMute.tid
+++ b/core/palettes/BrightMute.tid
@@ -10,6 +10,9 @@ alert-highlight: #881122
 alert-muted-foreground: #b99e2f
 background: #ffffff
 blockquote-bar: <<colour muted-foreground>>
+button-background:
+button-foreground:
+button-border:
 code-background: #f7f7f9
 code-border: #e1e1e8
 code-foreground: #dd1144
diff --git a/core/palettes/DarkPhotos.tid b/core/palettes/DarkPhotos.tid
index 3cab7281e..43a4559c2 100644
--- a/core/palettes/DarkPhotos.tid
+++ b/core/palettes/DarkPhotos.tid
@@ -13,6 +13,9 @@ alert-highlight: #881122
 alert-muted-foreground: #b99e2f
 background: #ffffff
 blockquote-bar: <<colour muted-foreground>>
+button-background:
+button-foreground:
+button-border:
 code-background: #f7f7f9
 code-border: #e1e1e8
 code-foreground: #dd1144
diff --git a/core/palettes/Rocker.tid b/core/palettes/Rocker.tid
index 8af3c0b85..4b0cbed78 100644
--- a/core/palettes/Rocker.tid
+++ b/core/palettes/Rocker.tid
@@ -10,6 +10,9 @@ alert-highlight: #881122
 alert-muted-foreground: #b99e2f
 background: #ffffff
 blockquote-bar: <<colour muted-foreground>>
+button-background:
+button-foreground:
+button-border:
 code-background: #f7f7f9
 code-border: #e1e1e8
 code-foreground: #dd1144
diff --git a/core/palettes/Vanilla.tid b/core/palettes/Vanilla.tid
index cc27fb5e5..df86fe5ae 100644
--- a/core/palettes/Vanilla.tid
+++ b/core/palettes/Vanilla.tid
@@ -10,6 +10,9 @@ alert-highlight: #881122
 alert-muted-foreground: #b99e2f
 background: #ffffff
 blockquote-bar: <<colour muted-foreground>>
+button-background:
+button-foreground:
+button-border:
 code-background: #f7f7f9
 code-border: #e1e1e8
 code-foreground: #dd1144
diff --git a/themes/tiddlywiki/vanilla/base.tid b/themes/tiddlywiki/vanilla/base.tid
index e88afea2a..5744053d9 100644
--- a/themes/tiddlywiki/vanilla/base.tid
+++ b/themes/tiddlywiki/vanilla/base.tid
@@ -37,6 +37,9 @@ background-size:` {{$:/themes/tiddlywiki/vanilla/settings/backgroundimagesize}}`
 
 html button {
 	line-height: 1.2;
+	color: <<colour button-foreground>>;
+	background: <<colour button-background>>;
+	border-color: <<colour button-border>>;
 }
 
 /*
@@ -105,9 +108,12 @@ dl dt {
 	margin-top: 6px;
 }
 
-textarea, input[type=text] {
+textarea,
+input[type=text],
+input[type=""],
+input:not([type]) {
 	color: <<colour foreground>>;
-	background-color: <<colour background>>;
+	background: <<colour background>>;
 }
 
 .tc-muted {