diff --git a/core/images/default-layout.tid b/core/images/default-layout.tid
new file mode 100644
index 000000000..4e5295d76
--- /dev/null
+++ b/core/images/default-layout.tid
@@ -0,0 +1,7 @@
+title: $:/core/images/default-layout
+tags: $:/tags/Image
+
+\parameters (size:"22pt")
+
\ No newline at end of file
diff --git a/core/ui/PageTemplate.tid b/core/ui/PageTemplate.tid
index 20891e35d..7e78f1e20 100644
--- a/core/ui/PageTemplate.tid
+++ b/core/ui/PageTemplate.tid
@@ -1,7 +1,7 @@
title: $:/core/ui/PageTemplate
name: {{$:/language/PageTemplate/Name}}
description: {{$:/language/PageTemplate/Description}}
-icon: $:/core/images/layout-button
+icon: $:/core/images/default-layout
code-body: yes
\whitespace trim
diff --git a/core/wiki/macros/CSS.tid b/core/wiki/macros/CSS.tid
index 0fcf5d86d..2aca2c363 100644
--- a/core/wiki/macros/CSS.tid
+++ b/core/wiki/macros/CSS.tid
@@ -1,5 +1,5 @@
title: $:/core/macros/CSS
-tags: $:/tags/Global
+tags: $:/tags/Macro $:/tags/Global
\procedure colour(name)
\whitespace trim
diff --git a/core/wiki/macros/copy-to-clipboard.tid b/core/wiki/macros/copy-to-clipboard.tid
index 8903e6722..c0d177d7e 100644
--- a/core/wiki/macros/copy-to-clipboard.tid
+++ b/core/wiki/macros/copy-to-clipboard.tid
@@ -1,5 +1,5 @@
title: $:/core/macros/copy-to-clipboard
-tags: $:/tags/Global
+tags: $:/tags/Macro $:/tags/Global
\whitespace trim
diff --git a/core/wiki/macros/diff.tid b/core/wiki/macros/diff.tid
index 541ab1a05..ed7ebfcf9 100644
--- a/core/wiki/macros/diff.tid
+++ b/core/wiki/macros/diff.tid
@@ -1,5 +1,5 @@
title: $:/core/macros/diff
-tags: $:/tags/Global
+tags: $:/tags/Macro $:/tags/Global
\whitespace trim
diff --git a/core/wiki/macros/tag-picker.tid b/core/wiki/macros/tag-picker.tid
index 1eb5cb683..80086e4d3 100644
--- a/core/wiki/macros/tag-picker.tid
+++ b/core/wiki/macros/tag-picker.tid
@@ -1,5 +1,5 @@
title: $:/core/macros/tag-picker
-tags: $:/tags/Global
+tags: $:/tags/Macro $:/tags/Global
first-search-filter: [tags[]!is[system]search:titlesort[]]
second-search-filter: [tags[]is[system]search:titlesort[]]
diff --git a/editions/tw5.com/tiddlers/mechanisms/RefreshThrottling.tid b/editions/tw5.com/tiddlers/mechanisms/RefreshThrottling.tid
index 344cd0ee7..5ae3d9645 100644
--- a/editions/tw5.com/tiddlers/mechanisms/RefreshThrottling.tid
+++ b/editions/tw5.com/tiddlers/mechanisms/RefreshThrottling.tid
@@ -12,6 +12,6 @@ The rules governing refresh throttling are:
** Has the field `draft.of`
** Has the field `throttle.refresh`
** Has a title prefixed with `$:/temp/volatile/`
-* If the refresh cycle is to be throttled, a timer is set for the internal specified in [[$:/config/Drafts/TypingTimeout|Hidden Setting: Typing Refresh Delay]] (cancelling any preciously set timer)
+* If the refresh cycle is to be throttled, a timer is set for the internal specified in [[$:/config/Drafts/TypingTimeout|Hidden Setting: Typing Refresh Delay]] (cancelling any previously set timer)
** When the timer fires, the refresh cycle is triggered, passing the aggregated titles of all the deferred refresh cycles
diff --git a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-http-request Example Random Dog.tid b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-http-request Example Random Dog.tid
index 958c31bae..892b4926f 100644
--- a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-http-request Example Random Dog.tid
+++ b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-http-request Example Random Dog.tid
@@ -1,5 +1,5 @@
title: WidgetMessage: tm-http-request Example - Random Dog
-tags: $:/tags/Global
+tags: $:/tags/Macro $:/tags/Global
\procedure download-dog(url)
diff --git a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-http-request Example Zotero.tid b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-http-request Example Zotero.tid
index c26eb9895..78a3a0651 100644
--- a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-http-request Example Zotero.tid
+++ b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-http-request Example Zotero.tid
@@ -1,5 +1,5 @@
title: WidgetMessage: tm-http-request Example - Zotero
-tags: $:/tags/Global
+tags: $:/tags/Macro $:/tags/Global
\procedure select-zotero-group()
Specify the Zotero group ID to import
diff --git a/editions/tw5.com/tiddlers/variables/tv-filter-export-link Variable.tid b/editions/tw5.com/tiddlers/variables/tv-filter-export-link Variable.tid
index f9800b43f..7f3f06c4d 100644
--- a/editions/tw5.com/tiddlers/variables/tv-filter-export-link Variable.tid
+++ b/editions/tw5.com/tiddlers/variables/tv-filter-export-link Variable.tid
@@ -7,8 +7,6 @@ type: text/vnd.tiddlywiki
<<.from-version "5.1.15">> The <<.def tv-filter-export-link>> [[variable|Variables]] controls the value of the `href` attribute on the HTML `a` element generated by the <<.wlink LinkWidget>> widget. If defined, it takes precedence over the [[tv-wikilink-template Variable]].
-<<.this-is-static-link-variable>>
-
The variable is treated as a filter that is given the target tiddler title as input. The filter is evaluated and the first result is used as the `href` attribute.
For example:
@@ -18,3 +16,5 @@ For example:
```
See also the <<.vlink tv-get-export-link>> variable, which dominates over this one.
+
+<<.this-is-static-link-variable>>
diff --git a/editions/tw5.com/tiddlers/variables/tv-get-export-link.tid b/editions/tw5.com/tiddlers/variables/tv-get-export-link.tid
index 890cf265c..d632aab18 100644
--- a/editions/tw5.com/tiddlers/variables/tv-get-export-link.tid
+++ b/editions/tw5.com/tiddlers/variables/tv-get-export-link.tid
@@ -1,17 +1,17 @@
+caption: tv-get-export-link
created: 20150228114004000
modified: 20150228130943000
-title: tv-get-export-link Variable
tags: Variables [[Core Variables]] [[Configuration Variables]]
+title: tv-get-export-link Variable
type: text/vnd.tiddlywiki
-caption: tv-get-export-link
The <<.def tv-get-export-link>> [[variable|Variables]] controls the value of the `href` attribute on the HTML `a` element generated by the <<.wlink LinkWidget>> widget.
-<<.this-is-static-link-variable>>
-
The variable should be a [[macro|Macros]] with the following parameter:
;to
: The title of the target tiddler of the link, with no escaping
See also <<.vlink tv-wikilink-template>>. If both that variable and this one exist, this one dominates.
+
+<<.this-is-static-link-variable>>
diff --git a/editions/tw5.com/tiddlers/variables/tv-wikilink-template.tid b/editions/tw5.com/tiddlers/variables/tv-wikilink-template.tid
index 6fdac1410..acb005eec 100644
--- a/editions/tw5.com/tiddlers/variables/tv-wikilink-template.tid
+++ b/editions/tw5.com/tiddlers/variables/tv-wikilink-template.tid
@@ -7,8 +7,6 @@ type: text/vnd.tiddlywiki
The <<.def tv-wikilink-template>> [[variable|Variables]] controls the value of the `href` attribute on the HTML `a` element generated by the <<.wlink LinkWidget>> widget. The <<.vlink tv-filter-export-link>>, if defined, it takes precedence over the <<.vlink tv-wikilink-template>> variable.
-<<.this-is-static-link-variable>>
-
The variable is treated as if it was a [[macro|Macros]] with the following parameters:
;uri_encoded
@@ -21,3 +19,5 @@ The variable is treated as if it was a [[macro|Macros]] with the following param
The variable defaults to `#$uri_encoded$`.
See also the <<.vlink tv-get-export-link>> variable, which dominates over this one.
+
+<<.this-is-static-link-variable>>
\ No newline at end of file
diff --git a/languages/zh-Hans/Buttons.multids b/languages/zh-Hans/Buttons.multids
index f33169778..c56e41ffe 100644
--- a/languages/zh-Hans/Buttons.multids
+++ b/languages/zh-Hans/Buttons.multids
@@ -28,6 +28,7 @@ Encryption/ClearPassword/Caption: 清除密码
Encryption/ClearPassword/Hint: 清除密码且不加密保存此维基
Encryption/SetPassword/Caption: 设置密码
Encryption/SetPassword/Hint: 设置加密保存此维基的密码
+EmergencyDownload/Caption: 下载条目为 json
ExportPage/Caption: 导出所有条目
ExportPage/Hint: 导出所有条目
ExportTiddler/Caption: 导出此条目
diff --git a/languages/zh-Hant/Buttons.multids b/languages/zh-Hant/Buttons.multids
index cc5ebba6b..75514b6da 100644
--- a/languages/zh-Hant/Buttons.multids
+++ b/languages/zh-Hant/Buttons.multids
@@ -28,6 +28,7 @@ Encryption/ClearPassword/Caption: 清除密碼
Encryption/ClearPassword/Hint: 清除密碼且不加密儲存此維基
Encryption/SetPassword/Caption: 設定密碼
Encryption/SetPassword/Hint: 設定加密儲存此維基的密碼
+EmergencyDownload/Caption: 下載條目為 json
ExportPage/Caption: 導出所有條目
ExportPage/Hint: 導出所有條目
ExportTiddler/Caption: 導出此條目
diff --git a/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/steps/recent.tid b/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/steps/recent.tid
index c0c3957a2..5c894741f 100644
--- a/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/steps/recent.tid
+++ b/plugins/tiddlywiki/tour/tours/introduction-to-tiddlywiki/steps/recent.tid
@@ -2,7 +2,7 @@ title: $:/plugins/tiddlywiki/tour/introduction-to-tiddlywiki/steps/recent
caption: Finding recent tiddlers
tags: $:/tags/Tour/IntroductionToTiddlyWiki
hint-selector: .tc-sidebar-tabs-main .tc-timeline > .tc-menu-list-item:nth-child(1) .tc-menu-list-subitem:nth-child(1) .tc-tiddlylink
-hint-selector-fallback-1: .tc-sidebar-tabs-main button:nth-child(3)
+hint-selector-fallback-1: .tc-sidebar-tabs-main button[data-tab-title="\$\:\/core\/ui\/SideBar\/Recent"]
step-success-filter: [list[$:/StoryList]match]
step-success-filter-var: [all[tiddlers]!is[system]!sort[modified]]