diff --git a/core/templates/single.tiddler.window.tid b/core/templates/single.tiddler.window.tid
index a790878a7..1efb2b0b9 100644
--- a/core/templates/single.tiddler.window.tid
+++ b/core/templates/single.tiddler.window.tid
@@ -6,17 +6,13 @@ tc-page-container tc-page-view-$(storyviewTitle)$ tc-language-$(languageTitle)$
\end
\import [[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]]
-<$set name="tv-config-toolbar-icons" value={{$:/config/Toolbar/Icons}}>
-
-<$set name="tv-config-toolbar-text" value={{$:/config/Toolbar/Text}}>
-
-<$set name="tv-config-toolbar-class" value={{$:/config/Toolbar/ButtonClass}}>
-
-<$set name="tv-show-missing-links" value={{$:/config/MissingLinks}}>
-
-<$set name="storyviewTitle" value={{$:/view}}>
-
-<$set name="languageTitle" value={{{ [{$:/language}get[name]] }}}>
+<$vars
+ tv-config-toolbar-icons={{$:/config/Toolbar/Icons}}
+ tv-config-toolbar-text={{$:/config/Toolbar/Text}}
+ tv-config-toolbar-class={{$:/config/Toolbar/ButtonClass}}
+ tv-show-missing-links={{$:/config/MissingLinks}}
+ storyviewTitle={{$:/view}}
+ languageTitle={{{ [{$:/language}get[name]] }}}>
>>
@@ -28,14 +24,4 @@ tc-page-container tc-page-view-$(storyviewTitle)$ tc-language-$(languageTitle)$
-$set>
-
-$set>
-
-$set>
-
-$set>
-
-$set>
-
-$set>
+$vars>
diff --git a/core/ui/PageTemplate.tid b/core/ui/PageTemplate.tid
index ccb560c69..abb23a104 100644
--- a/core/ui/PageTemplate.tid
+++ b/core/ui/PageTemplate.tid
@@ -6,19 +6,14 @@ tc-page-container tc-page-view-$(storyviewTitle)$ tc-language-$(languageTitle)$
\end
\import [[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]]
-<$set name="tv-config-toolbar-icons" value={{$:/config/Toolbar/Icons}}>
-
-<$set name="tv-config-toolbar-text" value={{$:/config/Toolbar/Text}}>
-
-<$set name="tv-config-toolbar-class" value={{$:/config/Toolbar/ButtonClass}}>
-
-<$set name="tv-enable-drag-and-drop" value={{$:/config/DragAndDrop/Enable}}>
-
-<$set name="tv-show-missing-links" value={{$:/config/MissingLinks}}>
-
-<$set name="storyviewTitle" value={{$:/view}}>
-
-<$set name="languageTitle" value={{{ [{$:/language}get[name]] }}}>
+<$vars
+ tv-config-toolbar-icons={{$:/config/Toolbar/Icons}}
+ tv-config-toolbar-text={{$:/config/Toolbar/Text}}
+ tv-config-toolbar-class={{$:/config/Toolbar/ButtonClass}}
+ tv-enable-drag-and-drop={{$:/config/DragAndDrop/Enable}}
+ tv-show-missing-links={{$:/config/MissingLinks}}
+ storyviewTitle={{$:/view}}
+ languageTitle={{{ [{$:/language}get[name]] }}}>
>>
@@ -38,16 +33,4 @@ tc-page-container tc-page-view-$(storyviewTitle)$ tc-language-$(languageTitle)$
-$set>
-
-$set>
-
-$set>
-
-$set>
-
-$set>
-
-$set>
-
-$set>
+$vars>