diff --git a/core/templates/TagTemplate.tid b/core/templates/TagTemplate.tid
index 874da32ef..3e64270cc 100644
--- a/core/templates/TagTemplate.tid
+++ b/core/templates/TagTemplate.tid
@@ -1,30 +1,5 @@
 title: $:/templates/TagTemplate
 
-{{btn-invisible tw-tag-button{
-<<button popup:"$:/temp/TagDropDownLocation" qualifyTiddlerTitles:yes><
-{{label{
-<<color background:yes default:#aaa><
-<<view title>>
->>
-}}}
->>
-}}}
-<<reveal state:"$:/temp/TagDropDownLocation" type:popup qualifyTiddlerTitles:yes><
-
-<div class="open">
-
-{{dropdown-menu{
-
-* <<view title link>>
-*.divider
-* <<list filter:"[is[current]tagging[]]"><
-
-<li><<view title link>></li>
-
->>
-
-}}}
-
-</div>
-
->>
+@@.label
+<_view field="title" format="text" />
+@@
diff --git a/core/templates/ViewTemplate.tid b/core/templates/ViewTemplate.tid
index d2a9b9a2b..7e3e4c43c 100644
--- a/core/templates/ViewTemplate.tid
+++ b/core/templates/ViewTemplate.tid
@@ -2,16 +2,18 @@ title: $:/templates/ViewTemplate
 modifier: JeremyRuston
 
 <span class="title">
-	<_view field="title"/>
-	<_button message="tw-close">close</_button>
+	<$view field="title"/>
+	<$button message="tw-close">close</$button>
 </span>
 
 <div class="small">
-	<_view field="modifier" format="link"/>
-	<_view field="modified" format="date"/>
+	<$view field="modifier" format="link"/>
+	<$view field="modified" format="date"/>
 </div>
 
+@@.tw-tags-wrapper <$list filter="[is[current]tags[]]" template="$:/templates/TagTemplate" />@@
+
 <div class="body">
-	<_view field="text" format="wikified">
-	</_view>
+	<$view field="text" format="wikified">
+	</$view>
 </div>