diff --git a/themes/tiddlywiki/vanilla/base.tid b/themes/tiddlywiki/vanilla/base.tid
index 4e2d22541..1ca85c6a7 100644
--- a/themes/tiddlywiki/vanilla/base.tid
+++ b/themes/tiddlywiki/vanilla/base.tid
@@ -372,24 +372,6 @@ Table utility classes
 	padding: 3px;
 }
 
-/* Labeled text input, where input is max width */
-.tc-labeled-input-wrapper {
-	display: flex;
-	padding: 6px 0;
-}
-
-.tc-align-right {
-	text-align: right;
-}
-
-.tc-fixed-label {
-	flex: auto;
-}
-
-.tc-fluid-input {
-	flex: 20;
-}
-
 /*
 CSV parser plugin
 */
@@ -938,11 +920,7 @@ button.tc-btn-invisible.tc-remove-tag-button {
 }
 
 .tc-advanced-search input {
-	width: 90%;
-}
-
-.tc-advanced-search .tc-flexible-form .txt-input {
-	width: 100%;
+	width: 60%;
 }
 
 .tc-search a svg {
@@ -1958,25 +1936,6 @@ html body.tc-body.tc-single-tiddler-window {
 	text-decoration: none;
 }
 
-.tc-block-dropdown-wrapper .tc-edit-type-dropdown,
-.tc-block-dropdown-wrapper .tc-variables-dropdown {
-	position: relative;
-}
-
-.tc-block-dropdown-wrapper .tc-variables-dropdown a {
-	display: inline-block;
-	width: 90%;
-}
-
-.tc-block-dropdown-wrapper .tc-variables-dropdown svg {
-	height: .9rem;
-	width: .9rem;
-}
-
-.tc-variables-dropdown a.tc-tiddlylink-missing {
-	font-style: normal;
-}
-
 .tc-search-results {
 	padding: 0 7px 0 7px;
 }
diff --git a/themes/tiddlywiki/vanilla/flexible-form-styles.tid b/themes/tiddlywiki/vanilla/flexible-form-styles.tid
index cae773e54..71579a327 100644
--- a/themes/tiddlywiki/vanilla/flexible-form-styles.tid
+++ b/themes/tiddlywiki/vanilla/flexible-form-styles.tid
@@ -1,7 +1,55 @@
 title: /core/template/flexible-form/styles
 tags: $:/tags/Stylesheet
 
-.tc-flexible-form {
+<!-- imported from vanilla base -->
+
+/* Labeled text input, where input is max width */
+.wltc-labeled-input-wrapper {
+	display: flex;
+	padding: 6px 0;
+}
+
+.wltc-align-right {
+	text-align: right;
+}
+
+.wltc-fixed-label {
+	flex: auto;
+}
+
+.wltc-fluid-input {
+	flex: 20;
+}
+
+.tc-advanced-search input {
+	width: 90%;
+}
+
+.tc-advanced-search .wltc-flexible-form .txt-input {
+	width: 100%;
+}
+
+.tc-block-dropdown-wrapper .tc-edit-type-dropdown,
+.tc-block-dropdown-wrapper .wltc-variables-dropdown {
+	position: relative;
+}
+
+.tc-block-dropdown-wrapper .wltc-variables-dropdown a {
+	display: inline-block;
+	width: 90%;
+}
+
+.tc-block-dropdown-wrapper .wltc-variables-dropdown svg {
+	height: .9rem;
+	width: .9rem;
+}
+
+.wltc-variables-dropdown a.tc-tiddlylink-missing {
+	font-style: normal;
+}
+
+<!-- flex form -->
+.wltc-flexible-form {
 	<!-- outline: 1px solid blue; -->
 	overflow: auto;
 	margin-bottom: 1em;