diff --git a/plugins/tiddlywiki/dynannotate/examples/viewtemplate-text.tid b/plugins/tiddlywiki/dynannotate/examples/viewtemplate-text.tid
new file mode 100644
index 000000000..15588c420
--- /dev/null
+++ b/plugins/tiddlywiki/dynannotate/examples/viewtemplate-text.tid
@@ -0,0 +1,98 @@
+title: $:/plugins/tiddlywiki/dynannotate/examples/viewtemplate/text
+
+\define click-annotation-actions()
+<$action-setfield $tiddler="$:/temp/dynannotate/demo/annotation-title" $value=<<annotationTiddler>>/>
+\end
+
+\define create-annotation-actions()
+<$action-createtiddler
+	$basetitle="$:/plugins/tiddlywiki/dynannotate/demo-annotation"
+	$savetitle={{{ [<currentTiddler>addprefix[$:/state/dynannotate/temp-save-title/]] }}}
+	annotate-tiddler=<<currentTiddler>>
+	annotate-text=<<text>>
+	annotate-prefix=<<prefix>>
+	annotate-suffix=<<suffix>>
+	annotate-colour=<<colour>>
+/>
+<$set name="popup-coords" value={{{ [<currentTiddler>addprefix[$:/state/dynannotate/popup-selection/]get[text]] }}}>
+<$action-deletetiddler $tiddler={{{ [<currentTiddler>addprefix[$:/state/dynannotate/popup-selection/]] }}}/>
+<$action-setfield $tiddler="$:/temp/dynannotate/demo/annotation-title" $value={{{ [<currentTiddler>addprefix[$:/state/dynannotate/temp-save-title/]get[text]] }}}/>
+<$action-popup $state={{{ [<currentTiddler>addprefix[$:/state/dynannotate/popup-annotation/]] }}} $coords=<<popup-coords>>/>
+</$set>
+\end
+
+<$reveal tag="div" class="tc-tiddler-body" type="nomatch" stateTitle=<<folded-state>> text="hide" retain="yes" animate="yes">
+<$list filter="[all[current]!has[plugin-type]!field:hide-body[yes]]">
+<div style="position:relative;"><!-- Needed for the popups to work -->
+<$dynannotate
+	filter="[all[shadows+tiddlers]!has[draft.of]annotate-tiddler<currentTiddler>]"
+	actions=<<click-annotation-actions>>
+	popup={{{ [<currentTiddler>addprefix[$:/state/dynannotate/popup-annotation/]] }}}
+	selection={{{ [<currentTiddler>addprefix[$:/state/dynannotate/selection/]] }}}
+	selectionPrefix={{{ [<currentTiddler>addprefix[$:/state/dynannotate/selection-prefix/]] }}}
+	selectionSuffix={{{ [<currentTiddler>addprefix[$:/state/dynannotate/selection-suffix/]] }}}
+	selectionPopup={{{ [<currentTiddler>addprefix[$:/state/dynannotate/popup-selection/]] }}}
+	search={{$:/temp/search}}
+	searchClass="tc-dynannotation-search-overlay-blurred"
+	searchMinLength={{$:/config/Search/MinLength}}
+>
+<$transclude mode="block">
+<$transclude tiddler="$:/language/MissingTiddler/Hint"/>
+</$transclude>
+</$dynannotate>
+<$reveal type="popup" state={{{ [<currentTiddler>addprefix[$:/state/dynannotate/popup-annotation/]] }}} position="belowright" animate="yes" retain="yes" style="overflow-y:hidden;">
+<div class="tc-drop-down-wrapper">
+<div class="tc-drop-down tc-popup-keep" style="max-width:550px;white-space: normal;overflow-y:hidden;">
+<$tiddler tiddler={{$:/temp/dynannotate/demo/annotation-title}}>
+<p>
+<h2>
+This is an annotation
+</h2>
+</p>
+<p>
+The annotation is stored in the tiddler:
+</p>
+<p>
+<$link><$view field="title"/></$link>
+</p>
+<p>
+The annotated text is ''<$view field="annotate-text"/>''.
+</p>
+<p>
+Annotation Colour:
+<$macrocall $name='colour-picker' actions="""
+<$action-setfield $field="annotate-colour" $value=<<colour-picker-value>>/>
+"""/>
+</p>
+</$tiddler>
+</div>
+</div>
+</$reveal>
+<$reveal type="popup" state={{{ [<currentTiddler>addprefix[$:/state/dynannotate/popup-selection/]] }}} position="belowright" animate="yes" retain="yes" style="overflow-y:hidden;">
+<div class="tc-drop-down-wrapper">
+<div class="tc-drop-down tc-popup-keep" style="max-width:550px;white-space:normal;">
+<$vars
+	text={{{ [<currentTiddler>addprefix[$:/state/dynannotate/selection/]get[text]] }}}
+	prefix={{{ [<currentTiddler>addprefix[$:/state/dynannotate/selection-prefix/]get[text]] }}}
+	suffix={{{ [<currentTiddler>addprefix[$:/state/dynannotate/selection-suffix/]get[text]] }}}
+	colour={{{ [<currentTiddler>addprefix[$:/state/dynannotate/annotation-colour/]get[text]] }}}
+>
+<$button actions=<<create-annotation-actions>>>
+Create annotation
+</$button>
+<p>
+Text: <$text text=<<text>>/>
+</p>
+<p>
+Prefix: <$text text=<<prefix>>/>
+</p>
+<p>
+Suffix: <$text text=<<suffix>>/>
+</p>
+</$vars>
+</div>
+</div>
+</$reveal>
+</div>
+</$list>
+</$reveal>
diff --git a/plugins/tiddlywiki/dynannotate/examples/viewtemplate.tid b/plugins/tiddlywiki/dynannotate/examples/viewtemplate.tid
new file mode 100644
index 000000000..5922fd8d3
--- /dev/null
+++ b/plugins/tiddlywiki/dynannotate/examples/viewtemplate.tid
@@ -0,0 +1,29 @@
+title: $:/plugins/tiddlywiki/dynannotate/examples/viewtemplate
+tags: $:/tags/dynannotateExamples
+caption: View Template
+
+<div class="tc-dynannotation-example-info">
+
+!! Using Dynannotate in the view template
+
+This example shows how to override the core view template with a custom template that includes dynannotate. It is disabled by default but can be enabled by clicking the button below. (Clicking the button below copies the custom view template from $:/plugins/tiddlywiki/dynannotate/examples/viewtemplate/text to $:/core/ui/ViewTemplate/body).
+
+Once enabled, this example demonstrates several features:
+
+* Highlighting of search results within tiddler bodies
+* Creating annotations on any tiddler by selecting text and then clicking a colour in the resulting dropdown
+
+</div>
+
+<$button>
+<$action-setfield $tiddler="$:/core/ui/ViewTemplate/body" $field="text" $value={{$:/plugins/tiddlywiki/dynannotate/examples/viewtemplate/text}}/>
+<$action-setfield $tiddler="$:/core/ui/ViewTemplate/body" $field="tags" $value="$:/tags/ViewTemplate"/>
+Click here to use the custom view template
+</$button>
+
+<$button>
+<$action-deletetiddler $tiddler="$:/core/ui/ViewTemplate/body"/>
+Click here to revert to the core view template
+</$button>
+
+<$codeblock code={{$:/plugins/tiddlywiki/dynannotate/examples/viewtemplate/text}}/>