diff --git a/core/ui/EditTemplate.tid b/core/ui/EditTemplate.tid
index 4e4b496b2..5b351bf1e 100644
--- a/core/ui/EditTemplate.tid
+++ b/core/ui/EditTemplate.tid
@@ -29,11 +29,10 @@ modifier: JeremyRuston
 <$edit field="text"/>
 </$reveal>
 
-<$fieldmangler>
-<$fieldlist exclude="title tags text modified modifier draft.title draft.of">
-<span class="tw-edit-field-name"><$info type="currentField"/>:</span> <span class="tw-edit-field-value"><$edit/></span> <span class="tw-edit-field-remove"><$button message="tw-remove-field" class="">remove</$button></span>
+<$fieldmangler><div class="tw-edit-fields"><$fieldlist exclude="title tags text modified modifier draft.title draft.of"><div class="tw-edit-field"><span class="tw-edit-field-name"><$info type="currentField"/>:</span> <span class="tw-edit-field-value"><$edit placeholder="field value"/></span> <span class="tw-edit-field-remove"><$button message="tw-remove-field" class="btn-invisible">{{$:/core/images/delete-button}}</$button></span></div>
 </$fieldlist>
+</div>
 
-<div class="tw-edit-field-add">Add a new field: <span class="tw-edit-field-add-name"><$edit tiddler="$:/NewFieldName" type="input" default=""/></span> <span class="tw-edit-field-add-button"><$button message="tw-add-field" param={{$:/NewFieldName}} set="$:/NewFieldName" setTo="" class="">add</$button></span></div>
+<div class="tw-edit-field-add">Add a new field: <span class="tw-edit-field-add-name"><$edit tiddler="$:/NewFieldName" type="input" default="" placeholder="field name"/></span> <span class="tw-edit-field-add-button"><$button message="tw-add-field" param={{$:/NewFieldName}} set="$:/NewFieldName" setTo="" class="">add</$button></span></div>
 
 </$fieldmangler>
diff --git a/themes/tiddlywiki/snowwhite/base.tid b/themes/tiddlywiki/snowwhite/base.tid
index 029aefdd0..7ad040078 100644
--- a/themes/tiddlywiki/snowwhite/base.tid
+++ b/themes/tiddlywiki/snowwhite/base.tid
@@ -63,6 +63,7 @@ html {
 body {
 	font-size: {{$:/themes/tiddlywiki/snowwhite/metrics##fontsize}};
 	line-height: {{$:/themes/tiddlywiki/snowwhite/metrics##lineheight}};
+	color: {{$:/themes/tiddlywiki/snowwhite/colourmappings##foreground}};
 	background-color: {{$:/themes/tiddlywiki/snowwhite/colourmappings##pagebackground}};
 	word-wrap: break-word;
 }
@@ -486,6 +487,14 @@ canvas.tw-edit-bitmapeditor  {
 	width: 48%;
 }
 
+.tw-fieldlist > div:nth-child(odd) {
+	background-color: #f0f4f0;
+}
+
+.tw-fieldlist > div:nth-child(even) {
+	background-color: #e0e8e0;
+}
+
 .tw-edit-field-name {
 	display: inline-block;
 	width: 15%;
@@ -494,12 +503,18 @@ canvas.tw-edit-bitmapeditor  {
 
 .tw-edit-field-value {
 	display: inline-block;
-	width: 70%;
+	width: 75%;
 }
 
 .tw-edit-field-remove {
 	display: inline-block;
-	width: 10%;
+	width: 5%;
+}
+
+.tw-edit-field-remove svg {
+	height: 1em;
+	fill: #888;
+	vertical-align: middle;
 }
 
 .tw-edit-field-add-name {
diff --git a/themes/tiddlywiki/snowwhite/colourmappings.tid b/themes/tiddlywiki/snowwhite/colourmappings.tid
index 1278835eb..7bfbfffcd 100644
--- a/themes/tiddlywiki/snowwhite/colourmappings.tid
+++ b/themes/tiddlywiki/snowwhite/colourmappings.tid
@@ -2,6 +2,7 @@ title: $:/themes/tiddlywiki/snowwhite/colourmappings
 type: application/x-tiddler-dictionary
 
 tiddlerbackground: {{$:/themes/tiddlywiki/snowwhite/colours##background}}
+foreground: {{$:/themes/tiddlywiki/snowwhite/colours##foreground}}
 pagebackground: {{$:/themes/tiddlywiki/snowwhite/colours##pagebackground}}
 linkbackground: {{$:/themes/tiddlywiki/snowwhite/colours##background}}
 linkforeground: {{$:/themes/tiddlywiki/snowwhite/colours##primary}}
diff --git a/themes/tiddlywiki/snowwhite/colours.tid b/themes/tiddlywiki/snowwhite/colours.tid
index 35b3e9271..fb4f653b9 100644
--- a/themes/tiddlywiki/snowwhite/colours.tid
+++ b/themes/tiddlywiki/snowwhite/colours.tid
@@ -3,5 +3,6 @@ type: application/x-tiddler-dictionary
 
 primary: `#5959C0`
 background: `#fff`
+foreground: `#333`
 pagebackground: `#ececec`
 medium: `#bbb`
\ No newline at end of file