diff --git a/core/ui/EditTemplate/body.tid b/core/ui/EditTemplate/body.tid
index ac094876e..bd289ade3 100644
--- a/core/ui/EditTemplate/body.tid
+++ b/core/ui/EditTemplate/body.tid
@@ -5,7 +5,7 @@ tags: $:/tags/EditTemplate
 Type the text for this tiddler
 \end
 <$reveal state="$:/ShowEditPreview" type="match" text="yes">
-//<$transclude tiddler="$:/core/ui/EditorHint"/>// <$button type="set" set="$:/ShowEditPreview" setTo="no">hide preview</$button>
+<em class="tw-edit"><$transclude tiddler="$:/core/ui/EditorHint"/></em> <$button type="set" set="$:/ShowEditPreview" setTo="no">hide preview</$button>
 <div class="tw-tiddler-preview">
 <div class="tw-tiddler-preview-preview">
 <$transclude />
@@ -16,6 +16,6 @@ Type the text for this tiddler
 </div>
 </$reveal>
 <$reveal state="$:/ShowEditPreview" type="nomatch" text="yes">
-//<$transclude tiddler="$:/core/ui/EditorHint"/>// <$button type="set" set="$:/ShowEditPreview" setTo="yes">show preview</$button>
+<em class="tw-edit"><$transclude tiddler="$:/core/ui/EditorHint"/></em> <$button type="set" set="$:/ShowEditPreview" setTo="yes">show preview</$button>
 <$edit field="text" class="tw-edit-texteditor" placeholder=<<prompt>>/>
 </$reveal>
diff --git a/core/ui/EditTemplate/fields.tid b/core/ui/EditTemplate/fields.tid
index c76810166..d7e3c08db 100644
--- a/core/ui/EditTemplate/fields.tid
+++ b/core/ui/EditTemplate/fields.tid
@@ -9,6 +9,6 @@ tags: $:/tags/EditTemplate
 </table>
 </div>
 
-<div class="tw-edit-field-add">//Add a new field:// <span class="tw-edit-field-add-name"><$edit-text tiddler="$:/NewFieldName" tag="input" default="" placeholder="field name" class="tw-edit-texteditor"/></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"><em class="tw-edit">Add a new field:</em> <span class="tw-edit-field-add-name"><$edit-text tiddler="$:/NewFieldName" tag="input" default="" placeholder="field name" class="tw-edit-texteditor"/></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/core/ui/EditTemplate/type.tid b/core/ui/EditTemplate/type.tid
index 3edae2068..59a9ed739 100644
--- a/core/ui/EditTemplate/type.tid
+++ b/core/ui/EditTemplate/type.tid
@@ -1,7 +1,7 @@
 title: $:/core/ui/EditTemplate/type
 tags: $:/tags/EditTemplate
 
-<p>//Type:// <$edit-text field="type" tag="input" default="" placeholder="type" focusPopup=<<qualify "$:/state/typeDropdown">> class="tw-edit-typeeditor"/> <$button popup=<<qualify "$:/state/typeDropdown">> class="btn-invisible btn-dropdown">{{$:/core/images/down-arrow}}</$button></p>
+<p><em class="tw-edit">Type:</em> <$edit-text field="type" tag="input" default="" placeholder="type" focusPopup=<<qualify "$:/state/typeDropdown">> class="tw-edit-typeeditor"/> <$button popup=<<qualify "$:/state/typeDropdown">> class="btn-invisible btn-dropdown">{{$:/core/images/down-arrow}}</$button></p>
 
 <div class="tw-block-dropdown-wrapper">
 <$reveal state=<<qualify "$:/state/typeDropdown">> type="nomatch" text="" default="">
diff --git a/themes/tiddlywiki/vanilla/base.tid b/themes/tiddlywiki/vanilla/base.tid
index 71d19ac11..2e7cd9c36 100644
--- a/themes/tiddlywiki/vanilla/base.tid
+++ b/themes/tiddlywiki/vanilla/base.tid
@@ -547,7 +547,7 @@ canvas.tw-edit-bitmapeditor  {
 ** Tiddler edit mode
 */
 
-.tw-tiddler-edit-frame em {
+.tw-tiddler-edit-frame em.tw-edit {
 	color: #999;
 	font-style: normal;
 }