diff --git a/core/palettes/Blanca.tid b/core/palettes/Blanca.tid
@@ -0,0 +1,103 @@
+title: $:/palettes/Blanca
+name: Blanca
+description: A clean white palette to let you focus
+tags: $:/tags/Palette
+type: application/x-tiddler-dictionary
+
+alert-background: #ffe476
+alert-border: #b99e2f
+alert-highlight: #881122
+alert-muted-foreground: #b99e2f
+background: #ffffff
+blockquote-bar: <<colour muted-foreground>>
+code-background: #f7f7f9
+code-border: #e1e1e8
+code-foreground: #dd1144
+download-background: #66cccc
+download-foreground: <<colour background>>
+dragger-background: <<colour foreground>>
+dragger-foreground: <<colour background>>
+dropdown-background: <<colour background>>
+dropdown-border: <<colour muted-foreground>>
+dropdown-tab-background-selected: #fff
+dropdown-tab-background: #ececec
+dropzone-background: rgba(0,200,0,0.7)
+external-link-background-hover: 
+external-link-background-visited: 
+external-link-background: 
+external-link-foreground-hover: 
+external-link-foreground-visited: #0000aa
+external-link-foreground: #0000ee
+foreground: #333333
+message-background: #ecf2ff
+message-border: #cfd6e6
+message-foreground: #547599
+modal-backdrop: <<colour foreground>>
+modal-background: <<colour background>>
+modal-border: #999999
+modal-footer-background: #f5f5f5
+modal-footer-border: #dddddd
+modal-header-border: #eeeeee
+muted-foreground: #999999
+notification-background: #ffffdd
+notification-border: #999999
+page-background: #ffffff
+pre-background: #f5f5f5
+pre-border: #cccccc
+primary: #7897f3
+sidebar-controls-foreground-hover: #000000
+sidebar-controls-foreground: #ccc
+sidebar-foreground-shadow: rgba(255,255,255, 0.8)
+sidebar-foreground: #acacac
+sidebar-muted-foreground-hover: #444444
+sidebar-muted-foreground: #c0c0c0
+sidebar-tab-background-selected: #ffffff
+sidebar-tab-background: <<colour tab-background>>
+sidebar-tab-border-selected: <<colour tab-border-selected>>
+sidebar-tab-border: <<colour tab-border>>
+sidebar-tab-divider: <<colour tab-divider>>
+sidebar-tab-foreground-selected: 
+sidebar-tab-foreground: <<colour tab-foreground>>
+sidebar-tiddler-link-foreground-hover: #444444
+sidebar-tiddler-link-foreground: #7897f3
+static-alert-foreground: #aaaaaa
+tab-background-selected: #fffffffff
+tab-background: #eeeeee
+tab-border-selected: #cccccc
+tab-border: #cccccc
+tab-divider: #d8d8d8
+tab-foreground-selected: <<colour tab-foreground>>
+tab-foreground: #666666
+table-border: #dddddd
+table-footer-background: #a8a8a8
+table-header-background: #f0f0f0
+tag-background: #ffeedd
+tag-foreground: #000
+tiddler-background: <<colour background>>
+tiddler-border: #eee
+tiddler-controls-foreground-hover: #888888
+tiddler-controls-foreground-selected: #444444
+tiddler-controls-foreground: #cccccc
+tiddler-editor-background: #f8f8f8
+tiddler-editor-border-image: #ffffff
+tiddler-editor-border: #cccccc
+tiddler-editor-fields-even: #e0e8e0
+tiddler-editor-fields-odd: #f0f4f0
+tiddler-info-background: #f8f8f8
+tiddler-info-border: #dddddd
+tiddler-info-tab-background: #f8f8f8
+tiddler-link-background: <<colour background>>
+tiddler-link-foreground: <<colour primary>>
+tiddler-subtitle-foreground: #c0c0c0
+tiddler-title-foreground: #ff9900
+toolbar-new-button:
+toolbar-options-button:
+toolbar-save-button:
+toolbar-info-button:
+toolbar-edit-button:
+toolbar-close-button:
+toolbar-delete-button:
+toolbar-cancel-button:
+toolbar-done-button:
+untagged-background: #999999
+very-muted-foreground: #888888
diff --git a/core/palettes/Blue.tid b/core/palettes/Blue.tid
@@ -0,0 +1,103 @@
+title: $:/palettes/Blue
+name: Blue
+description: A blue theme
+tags: $:/tags/Palette
+type: application/x-tiddler-dictionary
+
+alert-background: #ffe476
+alert-border: #b99e2f
+alert-highlight: #881122
+alert-muted-foreground: #b99e2f
+background: #fff
+blockquote-bar: <<colour muted-foreground>>
+code-background: #f7f7f9
+code-border: #e1e1e8
+code-foreground: #dd1144
+download-background: #34c734
+download-foreground: <<colour foreground>>
+dragger-background: <<colour foreground>>
+dragger-foreground: <<colour background>>
+dropdown-background: <<colour background>>
+dropdown-border: <<colour muted-foreground>>
+dropdown-tab-background-selected: #fff
+dropdown-tab-background: #ececec
+dropzone-background: rgba(0,200,0,0.7)
+external-link-background-hover: 
+external-link-background-visited: 
+external-link-background: 
+external-link-foreground-hover: 
+external-link-foreground-visited: #0000aa
+external-link-foreground: #0000ee
+foreground: #333353
+message-background: #ecf2ff
+message-border: #cfd6e6
+message-foreground: #547599
+modal-backdrop: <<colour foreground>>
+modal-background: <<colour background>>
+modal-border: #999999
+modal-footer-background: #f5f5f5
+modal-footer-border: #dddddd
+modal-header-border: #eeeeee
+muted-foreground: #999999
+notification-background: #ffffdd
+notification-border: #999999
+page-background: #ddddff
+pre-background: #f5f5f5
+pre-border: #cccccc
+primary: #5778d8
+sidebar-controls-foreground-hover: #000000
+sidebar-controls-foreground: #ffffff
+sidebar-foreground-shadow: rgba(255,255,255, 0.8)
+sidebar-foreground: #acacac
+sidebar-muted-foreground-hover: #444444
+sidebar-muted-foreground: #c0c0c0
+sidebar-tab-background-selected: <<colour page-background>>
+sidebar-tab-background: <<colour tab-background>>
+sidebar-tab-border-selected: <<colour tab-border-selected>>
+sidebar-tab-border: <<colour tab-border>>
+sidebar-tab-divider: <<colour tab-divider>>
+sidebar-tab-foreground-selected: 
+sidebar-tab-foreground: <<colour tab-foreground>>
+sidebar-tiddler-link-foreground-hover: #444444
+sidebar-tiddler-link-foreground: #5959c0
+static-alert-foreground: #aaaaaa
+tab-background-selected: <<colour background>>
+tab-background: #ccccdd
+tab-border-selected: #ccccdd
+tab-border: #cccccc
+tab-divider: #d8d8d8
+tab-foreground-selected: <<colour tab-foreground>>
+tab-foreground: #666666
+table-border: #dddddd
+table-footer-background: #a8a8a8
+table-header-background: #f0f0f0
+tag-background: #eeeeff
+tag-foreground: #000
+tiddler-background: <<colour background>>
+tiddler-border: <<colour background>>
+tiddler-controls-foreground-hover: #666666
+tiddler-controls-foreground-selected: #444444
+tiddler-controls-foreground: #cccccc
+tiddler-editor-background: #f8f8f8
+tiddler-editor-border-image: #ffffff
+tiddler-editor-border: #cccccc
+tiddler-editor-fields-even: #e0e8e0
+tiddler-editor-fields-odd: #f0f4f0
+tiddler-info-background: #ffffff
+tiddler-info-border: #dddddd
+tiddler-info-tab-background: #ffffff
+tiddler-link-background: <<colour background>>
+tiddler-link-foreground: <<colour primary>>
+tiddler-subtitle-foreground: #c0c0c0
+tiddler-title-foreground: #5959c0
+toolbar-new-button: #5eb95e
+toolbar-options-button: rgb(128, 88, 165)
+toolbar-save-button: #0e90d2
+toolbar-info-button: #0e90d2
+toolbar-edit-button: rgb(243, 123, 29)
+toolbar-close-button: #dd514c
+toolbar-delete-button: #dd514c
+toolbar-cancel-button: rgb(243, 123, 29)
+toolbar-done-button: #5eb95e
+untagged-background: #999999
+very-muted-foreground: #888888
diff --git a/core/palettes/Contrast.tid b/core/palettes/Contrast.tid
@@ -0,0 +1,103 @@
+title: $:/palettes/Contrast
+name: Contrast
+description: High contrast and unambiguous
+tags: $:/tags/Palette
+type: application/x-tiddler-dictionary
+
+alert-background: #ffe476
+alert-border: #b99e2f
+alert-highlight: #881122
+alert-muted-foreground: #b99e2f
+background: #ffffff
+blockquote-bar: <<colour muted-foreground>>
+code-background: #f7f7f9
+code-border: #e1e1e8
+code-foreground: #dd1144
+download-background: #34c734
+download-foreground: <<colour background>>
+dragger-background: <<colour foreground>>
+dragger-foreground: <<colour background>>
+dropdown-background: <<colour background>>
+dropdown-border: <<colour muted-foreground>>
+dropdown-tab-background-selected: #fff
+dropdown-tab-background: #ececec
+dropzone-background: rgba(0,200,0,0.7)
+external-link-background-hover: 
+external-link-background-visited: 
+external-link-background: 
+external-link-foreground-hover: 
+external-link-foreground-visited: #0000aa
+external-link-foreground: #0000ee
+foreground: #333333
+message-background: #ecf2ff
+message-border: #cfd6e6
+message-foreground: #547599
+modal-backdrop: <<colour foreground>>
+modal-background: <<colour background>>
+modal-border: #999999
+modal-footer-background: #f5f5f5
+modal-footer-border: #dddddd
+modal-header-border: #eeeeee
+muted-foreground: #999999
+notification-background: #ffffdd
+notification-border: #999999
+page-background: #000000
+pre-background: #f5f5f5
+pre-border: #cccccc
+primary: #5778d8
+sidebar-controls-foreground-hover: #000000
+sidebar-controls-foreground: #ffffff
+sidebar-foreground-shadow: rgba(255,0,0, 0.5)
+sidebar-foreground: #ffffff
+sidebar-muted-foreground-hover: #444444
+sidebar-muted-foreground: #c0c0c0
+sidebar-tab-background-selected: #ececec
+sidebar-tab-background: <<colour tab-background>>
+sidebar-tab-border-selected: <<colour tab-border-selected>>
+sidebar-tab-border: <<colour tab-border>>
+sidebar-tab-divider: <<colour tab-divider>>
+sidebar-tab-foreground-selected: 
+sidebar-tab-foreground: <<colour tab-foreground>>
+sidebar-tiddler-link-foreground-hover: #444444
+sidebar-tiddler-link-foreground: #999999
+static-alert-foreground: #aaaaaa
+tab-background-selected: #ffffff
+tab-background: #d8d8d8
+tab-border-selected: #d8d8d8
+tab-border: #cccccc
+tab-divider: #d8d8d8
+tab-foreground-selected: <<colour tab-foreground>>
+tab-foreground: #666666
+table-border: #dddddd
+table-footer-background: #a8a8a8
+table-header-background: #f0f0f0
+tag-background: #d5ad34
+tag-foreground: #ffffff
+tiddler-background: <<colour background>>
+tiddler-border: <<colour background>>
+tiddler-controls-foreground-hover: #888888
+tiddler-controls-foreground-selected: #444444
+tiddler-controls-foreground: #cccccc
+tiddler-editor-background: #f8f8f8
+tiddler-editor-border-image: #ffffff
+tiddler-editor-border: #cccccc
+tiddler-editor-fields-even: #e0e8e0
+tiddler-editor-fields-odd: #f0f4f0
+tiddler-info-background: #f8f8f8
+tiddler-info-border: #dddddd
+tiddler-info-tab-background: #f8f8f8
+tiddler-link-background: <<colour background>>
+tiddler-link-foreground: <<colour primary>>
+tiddler-subtitle-foreground: #c0c0c0
+tiddler-title-foreground: #182955
+toolbar-new-button:
+toolbar-options-button:
+toolbar-save-button:
+toolbar-info-button:
+toolbar-edit-button:
+toolbar-close-button:
+toolbar-delete-button:
+toolbar-cancel-button:
+toolbar-done-button:
+untagged-background: #999999
+very-muted-foreground: #888888
diff --git a/core/palettes/Rocker.tid b/core/palettes/Rocker.tid
@@ -0,0 +1,103 @@
+title: $:/palettes/Rocker
+name: Rocker
+description: A dark theme
+tags: $:/tags/Palette
+type: application/x-tiddler-dictionary
+
+alert-background: #ffe476
+alert-border: #b99e2f
+alert-highlight: #881122
+alert-muted-foreground: #b99e2f
+background: #ffffff
+blockquote-bar: <<colour muted-foreground>>
+code-background: #f7f7f9
+code-border: #e1e1e8
+code-foreground: #dd1144
+download-background: #34c734
+download-foreground: <<colour background>>
+dragger-background: <<colour foreground>>
+dragger-foreground: <<colour background>>
+dropdown-background: <<colour background>>
+dropdown-border: <<colour muted-foreground>>
+dropdown-tab-background-selected: #fff
+dropdown-tab-background: #ececec
+dropzone-background: rgba(0,200,0,0.7)
+external-link-background-hover: 
+external-link-background-visited: 
+external-link-background: 
+external-link-foreground-hover: 
+external-link-foreground-visited: #0000aa
+external-link-foreground: #0000ee
+foreground: #333333
+message-background: #ecf2ff
+message-border: #cfd6e6
+message-foreground: #547599
+modal-backdrop: <<colour foreground>>
+modal-background: <<colour background>>
+modal-border: #999999
+modal-footer-background: #f5f5f5
+modal-footer-border: #dddddd
+modal-header-border: #eeeeee
+muted-foreground: #999999
+notification-background: #ffffdd
+notification-border: #999999
+page-background: #000
+pre-background: #f5f5f5
+pre-border: #cccccc
+primary: #cc0000
+sidebar-controls-foreground-hover: #000000
+sidebar-controls-foreground: #ffffff
+sidebar-foreground-shadow: rgba(255,255,255, 0.0)
+sidebar-foreground: #acacac
+sidebar-muted-foreground-hover: #444444
+sidebar-muted-foreground: #c0c0c0
+sidebar-tab-background-selected: #000
+sidebar-tab-background: <<colour tab-background>>
+sidebar-tab-border-selected: <<colour tab-border-selected>>
+sidebar-tab-border: <<colour tab-border>>
+sidebar-tab-divider: <<colour tab-divider>>
+sidebar-tab-foreground-selected: 
+sidebar-tab-foreground: <<colour tab-foreground>>
+sidebar-tiddler-link-foreground-hover: #ffbb99
+sidebar-tiddler-link-foreground: #cc0000
+static-alert-foreground: #aaaaaa
+tab-background-selected: #ffffff
+tab-background: #d8d8d8
+tab-border-selected: #d8d8d8
+tab-border: #cccccc
+tab-divider: #d8d8d8
+tab-foreground-selected: <<colour tab-foreground>>
+tab-foreground: #666666
+table-border: #dddddd
+table-footer-background: #a8a8a8
+table-header-background: #f0f0f0
+tag-background: #ffbb99
+tag-foreground: #000
+tiddler-background: <<colour background>>
+tiddler-border: <<colour background>>
+tiddler-controls-foreground-hover: #888888
+tiddler-controls-foreground-selected: #444444
+tiddler-controls-foreground: #cccccc
+tiddler-editor-background: #f8f8f8
+tiddler-editor-border-image: #ffffff
+tiddler-editor-border: #cccccc
+tiddler-editor-fields-even: #e0e8e0
+tiddler-editor-fields-odd: #f0f4f0
+tiddler-info-background: #f8f8f8
+tiddler-info-border: #dddddd
+tiddler-info-tab-background: #f8f8f8
+tiddler-link-background: <<colour background>>
+tiddler-link-foreground: <<colour primary>>
+tiddler-subtitle-foreground: #c0c0c0
+tiddler-title-foreground: #cc0000
+toolbar-new-button:
+toolbar-options-button:
+toolbar-save-button:
+toolbar-info-button:
+toolbar-edit-button:
+toolbar-close-button:
+toolbar-delete-button:
+toolbar-cancel-button:
+toolbar-done-button:
+untagged-background: #999999
+very-muted-foreground: #888888
diff --git a/core/palettes/Vanilla.tid b/core/palettes/Vanilla.tid
@@ -0,0 +1,103 @@
+title: $:/palettes/Vanilla
+name: Vanilla
+description: Pale and unobtrusive
+tags: $:/tags/Palette
+type: application/x-tiddler-dictionary
+
+alert-background: #ffe476
+alert-border: #b99e2f
+alert-highlight: #881122
+alert-muted-foreground: #b99e2f
+background: #ffffff
+blockquote-bar: <<colour muted-foreground>>
+code-background: #f7f7f9
+code-border: #e1e1e8
+code-foreground: #dd1144
+download-background: #34c734
+download-foreground: <<colour background>>
+dragger-background: <<colour foreground>>
+dragger-foreground: <<colour background>>
+dropdown-background: <<colour background>>
+dropdown-border: <<colour muted-foreground>>
+dropdown-tab-background-selected: #fff
+dropdown-tab-background: #ececec
+dropzone-background: rgba(0,200,0,0.7)
+external-link-background-hover: 
+external-link-background-visited: 
+external-link-background: 
+external-link-foreground-hover: 
+external-link-foreground-visited: #0000aa
+external-link-foreground: #0000ee
+foreground: #333333
+message-background: #ecf2ff
+message-border: #cfd6e6
+message-foreground: #547599
+modal-backdrop: <<colour foreground>>
+modal-background: <<colour background>>
+modal-border: #999999
+modal-footer-background: #f5f5f5
+modal-footer-border: #dddddd
+modal-header-border: #eeeeee
+muted-foreground: #999999
+notification-background: #ffffdd
+notification-border: #999999
+page-background: #ececec
+pre-background: #f5f5f5
+pre-border: #cccccc
+primary: #5778d8
+sidebar-controls-foreground-hover: #000000
+sidebar-controls-foreground: #ffffff
+sidebar-foreground-shadow: rgba(255,255,255, 0.8)
+sidebar-foreground: #acacac
+sidebar-muted-foreground-hover: #444444
+sidebar-muted-foreground: #c0c0c0
+sidebar-tab-background-selected: #ececec
+sidebar-tab-background: <<colour tab-background>>
+sidebar-tab-border-selected: <<colour tab-border-selected>>
+sidebar-tab-border: <<colour tab-border>>
+sidebar-tab-divider: #e4e4e4
+sidebar-tab-foreground-selected: 
+sidebar-tab-foreground: <<colour tab-foreground>>
+sidebar-tiddler-link-foreground-hover: #444444
+sidebar-tiddler-link-foreground: #999999
+static-alert-foreground: #aaaaaa
+tab-background-selected: #ffffff
+tab-background: #d8d8d8
+tab-border-selected: #d8d8d8
+tab-border: #cccccc
+tab-divider: #d8d8d8
+tab-foreground-selected: <<colour tab-foreground>>
+tab-foreground: #666666
+table-border: #dddddd
+table-footer-background: #a8a8a8
+table-header-background: #f0f0f0
+tag-background: #d5ad34
+tag-foreground: #ffffff
+tiddler-background: <<colour background>>
+tiddler-border: <<colour background>>
+tiddler-controls-foreground-hover: #888888
+tiddler-controls-foreground-selected: #444444
+tiddler-controls-foreground: #cccccc
+tiddler-editor-background: #f8f8f8
+tiddler-editor-border-image: #ffffff
+tiddler-editor-border: #cccccc
+tiddler-editor-fields-even: #e0e8e0
+tiddler-editor-fields-odd: #f0f4f0
+tiddler-info-background: #f8f8f8
+tiddler-info-border: #dddddd
+tiddler-info-tab-background: #f8f8f8
+tiddler-link-background: <<colour background>>
+tiddler-link-foreground: <<colour primary>>
+tiddler-subtitle-foreground: #c0c0c0
+tiddler-title-foreground: #182955
+toolbar-new-button:
+toolbar-options-button:
+toolbar-save-button:
+toolbar-info-button:
+toolbar-edit-button:
+toolbar-close-button:
+toolbar-delete-button:
+toolbar-cancel-button:
+toolbar-done-button:
+untagged-background: #999999
+very-muted-foreground: #888888
diff --git a/core/templates/alltiddlers.template.html.tid b/core/templates/alltiddlers.template.html.tid
@@ -13,10 +13,10 @@ type: text/vnd.tiddlywiki-html
 <link id="faviconLink" rel="shortcut icon" href="favicon.ico">
 <title>{{$:/core/wiki/title}}</title>
 <div id="styleArea">
-{{{ [is[system]type[text/css]] ||$:/core/templates/css-tiddler}}}
+{{$:/boot/boot.css||$:/core/templates/css-tiddler}}
 </div>
 <style type="text/css">
-{{{ [tag[$:/tags/stylesheet]] [is[shadow]tag[$:/tags/stylesheet]] ||$:/core/templates/wikified-tiddler}}}
+{{$:/core/ui/PageStylesheet||$:/core/templates/wikified-tiddler}}
 </style>
 </head>
 <body class="tw-body">

diff --git a/core/templates/save-all.tid b/core/templates/save-all.tid
@@ -1,6 +1,6 @@
 title: $:/core/save/all
 
 \define saveTiddlerFilter()
-[is[tiddler]] -[type[text/css]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] +[sort[title]]
+[is[tiddler]] -[[$:/boot/boot.css]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] +[sort[title]]
 \end
 {{$:/core/templates/tiddlywiki5.html}}
diff --git a/core/templates/save-empty.tid b/core/templates/save-empty.tid
@@ -1,6 +1,6 @@
 title: $:/core/save/empty
 
 \define saveTiddlerFilter()
-[is[system]] -[type[text/css]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] +[sort[title]]
+[is[system]] -[[$:/boot/boot.css]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] +[sort[title]]
 \end
 {{$:/core/templates/tiddlywiki5.html}}
diff --git a/core/templates/save-lazy-images.tid b/core/templates/save-lazy-images.tid
@@ -0,0 +1,6 @@
+title: $:/core/save/lazy-images
+
+\define saveTiddlerFilter()
+[is[tiddler]] -[[$:/boot/boot.css]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] -[!is[system]is[image]] +[sort[title]] 
+\end
+{{$:/core/templates/tiddlywiki5.html}}
diff --git a/core/templates/static.template.css.tid b/core/templates/static.template.css.tid
@@ -1,4 +1,5 @@
 title: $:/core/templates/static.template.css
 
-{{{ [is[system]type[text/css]] ||$:/core/templates/plain-text-tiddler}}}
-{{{ [tag[$:/tags/stylesheet]] [is[shadow]tag[$:/tags/stylesheet]] ||$:/core/templates/wikified-tiddler}}}
+{{$:/boot/boot.css||$:/core/templates/plain-text-tiddler}}
+
+{{$:/core/ui/PageStylesheet||$:/core/templates/wikified-tiddler}}
diff --git a/core/templates/static.template.html.tid b/core/templates/static.template.html.tid
@@ -13,10 +13,10 @@ type: text/vnd.tiddlywiki-html
 <link id="faviconLink" rel="shortcut icon" href="favicon.ico">
 <title>{{$:/core/wiki/title}}</title>
 <div id="styleArea">
-{{{ [is[system]type[text/css]] ||$:/core/templates/css-tiddler}}}
+{{$:/boot/boot.css||$:/core/templates/css-tiddler}}
 </div>
 <style type="text/css">
-{{{ [tag[$:/tags/stylesheet]] [is[shadow]tag[$:/tags/stylesheet]] ||$:/core/templates/wikified-tiddler}}}
+{{$:/core/ui/PageStylesheet||$:/core/templates/wikified-tiddler}}
 </style>
 </head>
 <body class="tw-body">

diff --git a/core/templates/tiddlywiki5.html.tid b/core/templates/tiddlywiki5.html.tid
@@ -24,7 +24,7 @@ title: $:/core/templates/tiddlywiki5.html
 <body class="tw-body">
 <!--~~ Static styles ~~-->
 <div id="styleArea">
-{{{ [is[system]type[text/css]] ||$:/core/templates/css-tiddler}}}
+{{$:/boot/boot.css||$:/core/templates/css-tiddler}}
 </div>
 <!--~~ Static content for Google and browsers without JavaScript ~~-->
 <noscript>

diff --git a/core/ui/AdvancedSearch.tid b/core/ui/AdvancedSearch.tid
@@ -1,3 +1,5 @@
 title: $:/AdvancedSearch
 
-<div class="tw-advanced-search"><<tabs "[is[shadow]!has[draft.of]tag[$:/tags/AdvancedSearch]] [!is[shadow]!has[draft.of]tag[$:/tags/AdvancedSearch]] +[tag[$:/tags/AdvancedSearch]]" "$:/core/ui/AdvancedSearch/System">></div>
+<div class="tw-advanced-search">
+<<tabs "[is[shadow]!has[draft.of]tag[$:/tags/AdvancedSearch]] [!is[shadow]!has[draft.of]tag[$:/tags/AdvancedSearch]] +[tag[$:/tags/AdvancedSearch]]" "$:/core/ui/AdvancedSearch/System">>
+</div>
diff --git a/core/ui/AdvancedSearch/Filter.tid b/core/ui/AdvancedSearch/Filter.tid
@@ -0,0 +1,28 @@
+title: $:/core/ui/AdvancedSearch/Filter
+tags: $:/tags/AdvancedSearch
+caption: {{$:/language/Search/Filter/Caption}}
+
+\define lingo-base() $:/language/Search/
+<$linkcatcher to="$:/temp/advancedsearch">
+
+<<lingo Filter/Hint>>
+
+<div class="tw-search"><$edit-text tiddler="$:/temp/advancedsearch" type="search" tag="input"/><$reveal state="$:/temp/advancedsearch" type="nomatch" text=""> <$link to="" class="btn-invisible">{{$:/core/images/close-button}}</$link></$reveal></div>
+
+</$linkcatcher>
+
+<$reveal state="$:/temp/advancedsearch" type="nomatch" text="">
+
+<div class="tw-search-results">
+
+<<lingo Advanced/Matches>>
+
+<$list filter={{$:/temp/advancedsearch}} template="$:/core/ui/ListItemTemplate"/>
+
+</div>
+
+</$reveal>
+
+<$reveal state="$:/temp/advancedsearch" type="match" text="">
+
+</$reveal>
diff --git a/core/ui/AdvancedSearch/Shadows.tid b/core/ui/AdvancedSearch/Shadows.tid
@@ -1,10 +1,11 @@
 title: $:/core/ui/AdvancedSearch/Shadows
 tags: $:/tags/AdvancedSearch
-caption: Shadows
+caption: {{$:/language/Search/Shadows/Caption}}
 
+\define lingo-base() $:/language/Search/
 <$linkcatcher to="$:/temp/advancedsearch">
 
-Search for shadow tiddlers:
+<<lingo Shadows/Hint>>
 
 <div class="tw-search"><$edit-text tiddler="$:/temp/advancedsearch" type="search" tag="input"/><$reveal state="$:/temp/advancedsearch" type="nomatch" text=""> <$link to="" class="btn-invisible">{{$:/core/images/close-button}}</$link></$reveal></div>
 
@@ -14,7 +15,7 @@ Search for shadow tiddlers:
 
 <div class="tw-search-results">
 
-//<small><$count filter="[is[shadow]search{$:/temp/advancedsearch}]"/> matches</small>//
+<<lingo Advanced/Matches>>
 
 <$list filter="[is[shadow]search{$:/temp/advancedsearch}sort[title]limit[250]]" template="$:/core/ui/ListItemTemplate"/>
 

diff --git a/core/ui/AdvancedSearch/System.tid b/core/ui/AdvancedSearch/System.tid
@@ -1,10 +1,11 @@
 title: $:/core/ui/AdvancedSearch/System
 tags: $:/tags/AdvancedSearch
-caption: System
+caption: {{$:/language/Search/System/Caption}}
 
+\define lingo-base() $:/language/Search/
 <$linkcatcher to="$:/temp/advancedsearch">
 
-Search for system tiddlers:
+<<lingo System/Hint>>
 
 <div class="tw-search"><$edit-text tiddler="$:/temp/advancedsearch" type="search" tag="input"/><$reveal state="$:/temp/advancedsearch" type="nomatch" text=""> <$link to="" class="btn-invisible">{{$:/core/images/close-button}}</$link></$reveal></div>
 
@@ -14,7 +15,7 @@ Search for system tiddlers:
 
 <div class="tw-search-results">
 
-//<small><$count filter="[is[system]search{$:/temp/advancedsearch}]"/> matches</small>//
+<<lingo Advanced/Matches>>
 
 <$list filter="[is[system]search{$:/temp/advancedsearch}sort[title]limit[250]]" template="$:/core/ui/ListItemTemplate"/>
 

diff --git a/core/ui/AlertTemplate.tid b/core/ui/AlertTemplate.tid
@@ -0,0 +1,16 @@
+title: $:/core/ui/AlertTemplate
+
+<div class="tw-alert">
+<div class="tw-alert-toolbar">
+<$button message="tw-delete-tiddler" class="btn-invisible">
+{{$:/core/images/delete-button}}</$button>
+</div>
+<div class="tw-alert-subtitle">
+<$view field="component"/> - <$view field="modified" format="date" template="0hh:0mm:0ss DD MM YYYY"/> <$reveal type="nomatch" state="!!count" text=""><span class="tw-alert-highlight">(count: <$view field="count"/>)</span></$reveal>
+</div>
+<div class="tw-alert-body">
+
+<$transclude/>
+
+</div>
+</div>
diff --git a/core/ui/ControlPanel/Advanced.tid b/core/ui/ControlPanel/Advanced.tid
@@ -0,0 +1,7 @@
+title: $:/core/ui/ControlPanel/Advanced
+tags: $:/tags/ControlPanel
+caption: {{$:/language/ControlPanel/Advanced/Caption}}
+
+{{$:/language/ControlPanel/Advanced/Hint}}
+
+<div class="tw-control-panel"><<tabs "[is[shadow]!has[draft.of]tag[$:/tags/ControlPanel/Advanced]] [!is[shadow]!has[draft.of]tag[$:/tags/ControlPanel/Advanced]] +[tag[$:/tags/ControlPanel/Advanced]]" "$:/core/ui/ControlPanel/Advanced/TiddlerFields">></div>
diff --git a/core/ui/ControlPanel/Advanced/LoadedModules.tid b/core/ui/ControlPanel/Advanced/LoadedModules.tid
@@ -0,0 +1,8 @@
+title: $:/core/ui/ControlPanel/Advanced/LoadedModules
+tags: $:/tags/ControlPanel/Advanced
+caption: {{$:/language/ControlPanel/Advanced/LoadedModules/Caption}}
+
+\define lingo-base() $:/language/ControlPanel/Advanced/
+<<lingo LoadedModules/Hint>>
+
+{{$:/snippets/modules}}
diff --git a/core/ui/ControlPanel/Advanced/TiddlerFields.tid b/core/ui/ControlPanel/Advanced/TiddlerFields.tid
@@ -0,0 +1,9 @@
+title: $:/core/ui/ControlPanel/Advanced/TiddlerFields
+tags: $:/tags/ControlPanel/Advanced
+caption: {{$:/language/ControlPanel/Advanced/TiddlerFields/Caption}}
+
+\define lingo-base() $:/language/ControlPanel/Advanced/
+
+<<lingo TiddlerFields/Hint>>
+
+{{$:/snippets/allfields}}
diff --git a/core/ui/ControlPanel/Appearance.tid b/core/ui/ControlPanel/Appearance.tid
@@ -1,11 +1,7 @@
 title: $:/core/ui/ControlPanel/Appearance
 tags: $:/tags/ControlPanel
-caption: Appearance
+caption: {{$:/language/ControlPanel/Appearance/Caption}}
 
-! Theme
+{{$:/language/ControlPanel/Appearance/Hint}}
 
-{{$:/snippets/themeswitcher}}
-
-! Story View
-
-{{$:/snippets/viewswitcher}}
+<div class="tw-control-panel"><<tabs "[is[shadow]!has[draft.of]tag[$:/tags/ControlPanel/Appearance]] [!is[shadow]!has[draft.of]tag[$:/tags/ControlPanel/Appearance]] +[tag[$:/tags/ControlPanel/Appearance]]" "$:/core/ui/ControlPanel/Appearance/Theme">></div>
diff --git a/core/ui/ControlPanel/Appearance/Palette.tid b/core/ui/ControlPanel/Appearance/Palette.tid
@@ -0,0 +1,21 @@
+title: $:/core/ui/ControlPanel/Appearance/Palette
+tags: $:/tags/ControlPanel/Appearance
+caption: {{$:/language/ControlPanel/Appearance/Palette/Caption}}
+
+\define lingo-base() $:/language/ControlPanel/Appearance/Palette/
+
+{{$:/snippets/paletteswitcher}}
+
+<$reveal type="nomatch" state="$:/state/ShowPaletteEditor" text="yes">
+
+<$button set="$:/state/ShowPaletteEditor" setTo="yes"><<lingo ShowEditor/Caption>></$button>
+
+</$reveal>
+
+<$reveal type="match" state="$:/state/ShowPaletteEditor" text="yes">
+
+<$button set="$:/state/ShowPaletteEditor" setTo="no"><<lingo HideEditor/Caption>></$button>
+{{$:/snippets/paletteeditor}}
+
+</$reveal>
+
diff --git a/core/ui/ControlPanel/Appearance/StoryView.tid b/core/ui/ControlPanel/Appearance/StoryView.tid
@@ -0,0 +1,5 @@
+title: $:/core/ui/ControlPanel/Appearance/StoryView
+tags: $:/tags/ControlPanel/Appearance
+caption: {{$:/language/ControlPanel/Appearance/StoryView/Caption}}
+
+{{$:/snippets/viewswitcher}}
diff --git a/core/ui/ControlPanel/Appearance/Theme.tid b/core/ui/ControlPanel/Appearance/Theme.tid
@@ -0,0 +1,5 @@
+title: $:/core/ui/ControlPanel/Appearance/Theme
+tags: $:/tags/ControlPanel/Appearance
+caption: {{$:/language/ControlPanel/Appearance/Theme/Caption}}
+
+{{$:/snippets/themeswitcher}}
diff --git a/core/ui/ControlPanel/Basics.tid b/core/ui/ControlPanel/Basics.tid
@@ -1,14 +1,17 @@
 title: $:/core/ui/ControlPanel/Basics
 tags: $:/tags/ControlPanel
-caption: Basics
+caption: {{$:/language/ControlPanel/Basics/Caption}}
 
-|TiddlyWiki version |''<<version>>'' |
-|[[Title of this TiddlyWiki|SiteTitle]] |<$edit-text tiddler="SiteTitle" default="" tag="input"/> |
-|[[Subtitle|SiteSubtitle]] |<$edit-text tiddler="SiteSubtitle" default="" tag="input"/> |
-|[[Username for signing edits|$:/status/UserName]] |<$edit-text tiddler="$:/status/UserName" default="" tag="input"/> |
-|[[Animation duration|$:/config/AnimationDuration]] |<$edit-text tiddler="$:/config/AnimationDuration" default="" tag="input"/> |
-|[[DefaultTiddlers|$:/DefaultTiddlers]] |Choose which tiddlers are displayed at startup:<br> <$edit-text tag="textarea" tiddler="$:/DefaultTiddlers"/><br>//Use &#91;&#91;double square brackets&#93;&#93; for titles with spaces. Or you can choose to <$button set="$:/DefaultTiddlers" setTo="[list[$:/StoryList]]">retain story ordering</$button>// |
-|Tiddlers |''<$count filter="[!is[system]]"/>'' |
-|System tiddlers |''<$count filter="[is[system]]"/>'' |
-|Shadow tiddlers |''<$count filter="[is[shadow]]"/>'' |
-|Overridden shadow tiddlers |''<$count filter="[!is[system]is[shadow]]"/>'' |
+\define lingo-base() $:/language/ControlPanel/Basics/
+|<<lingo Version/Prompt>> |''<<version>>'' |
+|<$link to="$:/SiteTitle"><<lingo Title/Prompt>></$link> |<$edit-text tiddler="$:/SiteTitle" default="" tag="input"/> |
+|<$link to="$:/SiteSubtitle"><<lingo Subtitle/Prompt>></$link> |<$edit-text tiddler="$:/SiteSubtitle" default="" tag="input"/> |
+|<$link to="$:/status/UserName"><<lingo Username/Prompt>></$link> |<$edit-text tiddler="$:/status/UserName" default="" tag="input"/> |
+|<$link to="$:/config/AnimationDuration"><<lingo AnimDuration/Prompt>></$link> |<$edit-text tiddler="$:/config/AnimationDuration" default="" tag="input"/> |
+|<$link to="$:/DefaultTiddlers"><<lingo DefaultTiddlers/Prompt>></$link> |<<lingo DefaultTiddlers/TopHint>><br> <$edit-text tag="textarea" tiddler="$:/DefaultTiddlers"/><br>//<<lingo DefaultTiddlers/BottomHint>>// |
+|<<lingo Language/Prompt>> |{{$:/snippets/minilanguageswitcher}} |
+|<<lingo Tiddlers/Prompt>> |''<$count filter="[!is[system]]"/>'' |
+|<<lingo Tags/Prompt>> |''<$count filter="[tags[]]"/>'' |
+|<<lingo SystemTiddlers/Prompt>> |''<$count filter="[is[system]]"/>'' |
+|<<lingo ShadowTiddlers/Prompt>> |''<$count filter="[is[shadow]]"/>'' |
+|<<lingo OverriddenShadowTiddlers/Prompt>> |''<$count filter="[!is[system]is[shadow]]"/>'' |
diff --git a/core/ui/ControlPanel/Internals.tid b/core/ui/ControlPanel/Internals.tid
diff --git a/core/ui/ControlPanel/Plugins.tid b/core/ui/ControlPanel/Plugins.tid
@@ -1,7 +1,8 @@
 title: $:/core/ui/ControlPanel/Plugins
 tags: $:/tags/ControlPanel
-caption: Plugins
+caption: {{$:/language/ControlPanel/Plugins/Caption}}
 
-<table><tbody><tr><th>Title</th><th>Description</th><th>Version</th></tr><$list filter="[!has[draft.of]has[plugin-type]sort[title]]"><tr><td><$link to={{!!title}}><$view field="title"/></$link></td><td><$view field="description"/></td><td><$view field="version"/></td></tr></$list>
+\define lingo-base() $:/language/ControlPanel/Plugins/
+<table><tbody><tr><th><<lingo Fields/Title>></th><th><<lingo Fields/Description>></th><th><<lingo Fields/Version>></th></tr><$list filter="[!has[draft.of]has[plugin-type]sort[title]]"><tr><td><$link to={{!!title}}><$view field="title"/></$link></td><td><$view field="description"/></td><td><$view field="version"/></td></tr></$list>
 </tbody>
 </table>
diff --git a/core/ui/ControlPanel/Saving.tid b/core/ui/ControlPanel/Saving.tid
@@ -1,7 +1,8 @@
 title: $:/core/ui/ControlPanel/Saving
 tags: $:/tags/ControlPanel
-caption: Saving
+caption: {{$:/language/ControlPanel/Saving/Caption}}
 
+\define lingo-base() $:/language/ControlPanel/Saving/
 \define backupURL()
 http://$(userName)$.tiddlyspot.com/backup/
 \end
@@ -12,18 +13,22 @@ http://$(userName)$.tiddlyspot.com/backup/
 </$set>
 </$reveal>
 \end
-! TiddlySpot
+! <<lingo Saving/Heading>>
 
-|[[Wiki name|$:/UploadName]] |<$edit-text tiddler="$:/UploadName" default="" tag="input"/> |
-|Password |<$password name="upload"/> |
-|Backups |<<backupLink>> |
+|<<lingo AutoSave>> |{{$:/snippets/autosavestatus}} |
 
-!! Advanced settings
+! <<lingo TiddlySpot/Heading>>
 
-|Server URL |<$edit-text tiddler="$:/UploadURL" default="" tag="input"/> |
-|Upload filename |<$edit-text tiddler="$:/UploadFilename" default="index.html" tag="input"/> |
-|Upload directory |<$edit-text tiddler="$:/UploadDir" default="." tag="input"/> |
-|Backup directory |<$edit-text tiddler="$:/UploadBackupDir" default="." tag="input"/> |
+|<<lingo TiddlySpot/UserName>> |<$edit-text tiddler="$:/UploadName" default="" tag="input"/> |
+|<<lingo TiddlySpot/Password>> |<$password name="upload"/> |
+|<<lingo TiddlySpot/Backups>> |<<backupLink>> |
 
+!! <<lingo TiddlySpot/Advanced/Heading>>
+
+|<<lingo TiddlySpot/ServerURL>>  |<$edit-text tiddler="$:/UploadURL" default="" tag="input"/> |
+|<<lingo TiddlySpot/Filename>> |<$edit-text tiddler="$:/UploadFilename" default="index.html" tag="input"/> |
+|<<lingo TiddlySpot/UploadDir>> |<$edit-text tiddler="$:/UploadDir" default="." tag="input"/> |
+|<<lingo TiddlySpot/BackupDir>> |<$edit-text tiddler="$:/UploadBackupDir" default="." tag="input"/> |
+
+<<lingo TiddlySpot/Hint>>
 
-//The server URL defaults to `http://<wikiname>.tiddlyspot.com/store.cgi` and can be changed to use a custom server address//
diff --git a/core/ui/ControlPanel/Tools.tid b/core/ui/ControlPanel/Tools.tid
@@ -1,17 +1,18 @@
 title: $:/core/ui/ControlPanel/Tools
 tags: $:/tags/ControlPanel
-caption: Tools
+caption: {{$:/language/ControlPanel/Tools/Caption}}
 
-! Import
+\define lingo-base() $:/language/ControlPanel/Tools/
+! <<lingo Import/Heading>>
 
 <$browse/>
 
-Browse for files on your computer to import their contents (the individual tiddlers within TiddlyWiki HTML files are imported separately). You can also drag and drop files directly to the browser window.
+<<lingo Import/Hint>>
 
-! Export
+! <<lingo Export/Heading>>
 
-<$button message="tw-download-file" param="$:/core/templates/alltiddlers.template.html" class="btn-big-green">Download all tiddlers as static HTML {{$:/core/images/save-button}}</$button>
+<$button message="tw-download-file" param="$:/core/templates/alltiddlers.template.html" class="btn-big-green"><<lingo Export/AllAsStaticHTML/Caption>> {{$:/core/images/save-button}}</$button>
 
-! Encryption
+! <<lingo Encryption/Heading>>
 
 {{$:/snippets/encryptionstatus}}
diff --git a/core/ui/EditTemplate.tid b/core/ui/EditTemplate.tid
@@ -3,4 +3,12 @@ title: $:/core/ui/EditTemplate
 \define frame-classes()
 tw-tiddler-frame tw-tiddler-edit-frame $(missingTiddlerClass)$ $(shadowTiddlerClass)$ $(systemTiddlerClass)$
 \end
-<$set name="storyTiddler" value=<<currentTiddler>>><div class=<<frame-classes>>><$list filter="[is[shadow]!has[draft.of]tag[$:/tags/EditTemplate]] [!is[shadow]!has[draft.of]tag[$:/tags/EditTemplate]] +[tag[$:/tags/EditTemplate]]" variable="listItem"><$transclude tiddler=<<listItem>>/></$list></div></$set>
+<div class=<<frame-classes>>>
+<$set name="storyTiddler" value=<<currentTiddler>>>
+<$keyboard key="ctrl+enter" message="tw-save-tiddler">
+<$list filter="[is[shadow]!has[draft.of]tag[$:/tags/EditTemplate]] [!is[shadow]!has[draft.of]tag[$:/tags/EditTemplate]] +[tag[$:/tags/EditTemplate]]" variable="listItem">
+<$transclude tiddler=<<listItem>>/>
+</$list>
+</$keyboard>
+</$set>
+</div>
diff --git a/core/ui/EditTemplate/body.tid b/core/ui/EditTemplate/body.tid
@@ -1,21 +1,30 @@
 title: $:/core/ui/EditTemplate/body
 tags: $:/tags/EditTemplate
 
-\define prompt()
-Type the text for this tiddler
-\end
+\define lingo-base() $:/language/EditTemplate/
 <$reveal state="$:/ShowEditPreview" type="match" text="yes">
-<em class="tw-edit"><$transclude tiddler="$:/core/ui/EditorHint"/></em> <$button type="set" set="$:/ShowEditPreview" setTo="no">hide preview</$button>
+
+<em class="tw-edit"><<lingo Body/Hint>></em> <$button type="set" set="$:/ShowEditPreview" setTo="no"><<lingo Body/Preview/Button/Hide>></$button>
+
 <div class="tw-tiddler-preview">
 <div class="tw-tiddler-preview-preview">
+
 <$transclude />
+
 </div>
+
 <div class="tw-tiddler-preview-edit">
-<$edit field="text" class="tw-edit-texteditor" placeholder=<<prompt>>/>
+<$edit field="text" class="tw-edit-texteditor" placeholder={{$:/language/EditTemplate/Body/Placeholder}}/>
+
 </div>
+
 </div>
+
 </$reveal>
+
 <$reveal state="$:/ShowEditPreview" type="nomatch" text="yes">
-<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>>/>
+
+<em class="tw-edit"><<lingo Body/Hint>></em> <$button type="set" set="$:/ShowEditPreview" setTo="yes"><<lingo Body/Preview/Button/Show>></$button>
+<$edit field="text" class="tw-edit-texteditor" placeholder={{$:/language/EditTemplate/Body/Placeholder}}/>
+
 </$reveal>
diff --git a/core/ui/EditTemplate/fields.tid b/core/ui/EditTemplate/fields.tid
@@ -1,14 +1,15 @@
 title: $:/core/ui/EditTemplate/fields
 tags: $:/tags/EditTemplate
 
+\define lingo-base() $:/language/EditTemplate/
 <$fieldmangler><div class="tw-edit-fields">
-<table class="tw-edit-fields"><tbody><$list filter="[is[current]fields[]] -title -tags -text -creator -created -modified -modifier -type -[[draft.title]] -[[draft.of]]" variable="currentField"><tr class="tw-edit-field"><td class="tw-edit-field-name"><<currentField>>:</td><td class="tw-edit-field-value"><$edit-text tiddler=<<currentTiddler>> field=<<currentField>> placeholder="field value"/></td><td class="tw-edit-field-remove"><$button message="tw-remove-field" param=<<currentField>> class="btn-invisible">{{$:/core/images/delete-button}}</$button></td>
+<table class="tw-edit-fields"><tbody><$list filter="[is[current]fields[]] -title -tags -text -creator -created -modified -modifier -type -[[draft.title]] -[[draft.of]]" variable="currentField"><tr class="tw-edit-field"><td class="tw-edit-field-name"><<currentField>>:</td><td class="tw-edit-field-value"><$edit-text tiddler=<<currentTiddler>> field=<<currentField>> placeholder={{$:/language/EditTemplate/Fields/Add/Value/Placeholder}}/></td><td class="tw-edit-field-remove"><$button message="tw-remove-field" param=<<currentField>> class="btn-invisible">{{$:/core/images/delete-button}}</$button></td>
 </tr>
 </$list>
 </tbody>
 </table>
 </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>
+<div class="tw-edit-field-add"><em class="tw-edit"><<lingo Fields/Add/Prompt>></em> <span class="tw-edit-field-add-name"><$edit-text tiddler="$:/temp/NewFieldName" tag="input" default="" placeholder={{$:/language/EditTemplate/Fields/Add/Name/Placeholder}} class="tw-edit-texteditor"/></span> <span class="tw-edit-field-add-button"><$button message="tw-add-field" param={{$:/temp/NewFieldName}} set="$:/temp/NewFieldName" setTo="" class=""><<lingo Fields/Add/Button>></$button></span></div>
 
 </$fieldmangler>
diff --git a/core/ui/EditTemplate/tags.tid b/core/ui/EditTemplate/tags.tid
@@ -1,20 +1,27 @@
 title: $:/core/ui/EditTemplate/tags
 tags: $:/tags/EditTemplate
 
+\define lingo-base() $:/language/EditTemplate/
 \define tag-styles()
 background-color:$(backgroundColor)$;
 \end
 <div class="tw-edit-tags"><$fieldmangler><$list filter="[is[current]tags[]sort[title]]" storyview="pop"><$set name="backgroundColor" value={{!!color}}><span style=<<tag-styles>> class="tw-tag-label"><$view field="title" format="text" /><$button message="tw-remove-tag" param={{!!title}} class="btn-invisible tw-remove-tag-button">&times;</$button></span></$set>
 </$list>
 
-<div class="tw-edit-add-tag"><span class="tw-add-tag-name"><$edit-text tiddler="$:/NewTagName" tag="input" default="" placeholder="tag name" focusPopup=<<qualify "$:/state/tagsAutoComplete">> class="tw-edit-texteditor"/></span> <$button popup=<<qualify "$:/state/tagsAutoComplete">> class="btn-invisible btn-dropdown">{{$:/core/images/down-arrow}}</$button> <span class="tw-add-tag-button"><$button message="tw-add-tag" param={{$:/NewTagName}} set="$:/NewTagName" setTo="" class="">add</$button></span></div>
+<div class="tw-edit-add-tag"><span class="tw-add-tag-name"><$edit-text tiddler="$:/temp/NewTagName" tag="input" default="" placeholder={{$:/language/EditTemplate/Tags/Add/Placeholder}} focusPopup=<<qualify "$:/state/tagsAutoComplete">> class="tw-edit-texteditor"/></span> <$button popup=<<qualify "$:/state/tagsAutoComplete">> class="btn-invisible btn-dropdown">{{$:/core/images/down-arrow}}</$button> <span class="tw-add-tag-button"><$button message="tw-add-tag" param={{$:/temp/NewTagName}} set="$:/temp/NewTagName" setTo="" class=""><<lingo Tags/Add/Button>></$button></span></div>
 
 <div class="tw-block-dropdown-wrapper">
+
 <$reveal state=<<qualify "$:/state/tagsAutoComplete">> type="nomatch" text="" default="">
+
 <div class="tw-block-dropdown">
-<$linkcatcher set="$:/NewTagName" setTo="" message="tw-add-tag"><$list filter="[!is[shadow]tags[]search{$:/NewTagName}sort[title]]"><$link><$set name="backgroundColor" value={{!!color}}><span style=<<tag-styles>> class="tw-tag-label"><$view field="title" format="text"/></span></$set></$link>
+
+<$linkcatcher set="$:/temp/NewTagName" setTo="" message="tw-add-tag">
+<$list filter="[!is[shadow]tags[]search{$:/temp/NewTagName}sort[title]]">
+<$link><$set name="backgroundColor" value={{!!color}}><span style=<<tag-styles>> class="tw-tag-label"><$view field="title" format="text"/></span></$set></$link>
 </$list>
 </$linkcatcher>
+
 </div>
 
 </$reveal>

diff --git a/core/ui/EditTemplate/type.tid b/core/ui/EditTemplate/type.tid
@@ -1,13 +1,14 @@
 title: $:/core/ui/EditTemplate/type
 tags: $:/tags/EditTemplate
 
-<p><$fieldmangler><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> <$button message="tw-remove-field" param="type" class="btn-invisible btn-icon">{{$:/core/images/delete-button}}</$button></$fieldmangler></p>
+\define lingo-base() $:/language/EditTemplate/
+<p><$fieldmangler><em class="tw-edit"><<lingo Type/Prompt>></em> <$edit-text field="type" tag="input" default="" placeholder={{$:/language/EditTemplate/Type/Placeholder}} focusPopup=<<qualify "$:/state/typeDropdown">> class="tw-edit-typeeditor"/> <$button popup=<<qualify "$:/state/typeDropdown">> class="btn-invisible btn-dropdown">{{$:/core/images/down-arrow}}</$button> <$button message="tw-remove-field" param="type" class="btn-invisible btn-icon">{{$:/core/images/delete-button}}</$button></$fieldmangler></p>
 
 <div class="tw-block-dropdown-wrapper">
 <$reveal state=<<qualify "$:/state/typeDropdown">> type="nomatch" text="" default="">
 <div class="tw-block-dropdown tw-edit-type-dropdown">
 <$linkcatcher to="!!type">
-<$list filter="[is[shadow]prefix[$:/docs/types/]] [!is[shadow]prefix[$:/docs/types/]] +[sort[description]]"><$link to={{!!name}}><$view field="description"/> (<$view field="name"/>)</$link>
+<$list filter="[is[shadow]prefix[$:/language/Docs/Types/]] [!is[shadow]prefix[$:/language/Docs/Types/]] +[sort[description]]"><$link to={{!!name}}><$view field="description"/> (<$view field="name"/>)</$link>
 </$list>
 </$linkcatcher>
 </div>

diff --git a/core/ui/EditorHint.tid b/core/ui/EditorHint.tid
diff --git a/core/ui/MoreSideBar/All.tid b/core/ui/MoreSideBar/All.tid
@@ -1,5 +1,5 @@
 title: $:/core/ui/MoreSideBar/All
 tags: $:/tags/MoreSideBar
-caption: All
+caption: {{$:/language/SideBar/All/Caption}}
 
 <$list filter="[!is[system]sort[title]]" template="$:/core/ui/ListItemTemplate"/>
diff --git a/core/ui/MoreSideBar/Drafts.tid b/core/ui/MoreSideBar/Drafts.tid
@@ -1,5 +1,5 @@
 title: $:/core/ui/MoreSideBar/Drafts
 tags: $:/tags/MoreSideBar
-caption: Drafts
+caption: {{$:/language/SideBar/Drafts/Caption}}
 
 <$list filter="[has[draft.of]sort[title]]" template="$:/core/ui/ListItemTemplate"/>
diff --git a/core/ui/MoreSideBar/Missing.tid b/core/ui/MoreSideBar/Missing.tid
@@ -1,5 +1,5 @@
 title: $:/core/ui/MoreSideBar/Missing
 tags: $:/tags/MoreSideBar
-caption: Missing
+caption: {{$:/language/SideBar/Missing/Caption}}
 
 <$list filter="[is[missing]sort[title]]" template="$:/core/ui/MissingTemplate"/>
diff --git a/core/ui/MoreSideBar/Orphans.tid b/core/ui/MoreSideBar/Orphans.tid
@@ -1,5 +1,5 @@
 title: $:/core/ui/MoreSideBar/Orphans
 tags: $:/tags/MoreSideBar
-caption: Orphans
+caption: {{$:/language/SideBar/Orphans/Caption}}
 
 <$list filter="[is[orphan]sort[title]]" template="$:/core/ui/ListItemTemplate"/>
diff --git a/core/ui/MoreSideBar/Recent.tid b/core/ui/MoreSideBar/Recent.tid
@@ -1,5 +1,5 @@
 title: $:/core/ui/MoreSideBar/Recent
 tags: $:/tags/MoreSideBar
-caption: Recent
+caption: {{$:/language/SideBar/Recent/Caption}}
 
 {{$:/snippets/recentchanges}}
diff --git a/core/ui/MoreSideBar/Shadows.tid b/core/ui/MoreSideBar/Shadows.tid
@@ -1,5 +1,5 @@
 title: $:/core/ui/MoreSideBar/Shadows
 tags: $:/tags/MoreSideBar
-caption: Shadows
+caption: {{$:/language/SideBar/Shadows/Caption}}
 
 <$list filter="[is[shadow]sort[title]]" template="$:/core/ui/ListItemTemplate"/>
diff --git a/core/ui/MoreSideBar/System.tid b/core/ui/MoreSideBar/System.tid
@@ -1,5 +1,5 @@
 title: $:/core/ui/MoreSideBar/System
 tags: $:/tags/MoreSideBar
-caption: System
+caption: {{$:/language/SideBar/System/Caption}}
 
 <$list filter="[is[system]sort[title]]" template="$:/core/ui/ListItemTemplate"/>
diff --git a/core/ui/MoreSideBar/Tags.tid b/core/ui/MoreSideBar/Tags.tid
@@ -1,9 +1,16 @@
 title: $:/core/ui/MoreSideBar/Tags
 tags: $:/tags/MoreSideBar
-caption: Tags
+caption: {{$:/language/SideBar/Tags/Caption}}
+
+\define lingo-base() $:/language/SideBar/Tags/
+<$button to="$:/TagManager"><<lingo TagManager/Caption>></$button>
 
 <$list filter="[tags[]sort[title]]">
+
 <$transclude tiddler="$:/core/ui/TagTemplate"/> <small class="tw-menu-list-count"><$count filter="[is[current]tagging[]]"/></small>
+
 </$list>
+
 ----
+
 {{$:/core/ui/UntaggedTemplate}} <small class="tw-menu-list-count"><$count filter="[untagged[]!is[system]] -[tags[]]"/></small>
diff --git a/core/ui/MoreSideBar/Types.tid b/core/ui/MoreSideBar/Types.tid
@@ -1,6 +1,6 @@
 title: $:/core/ui/MoreSideBar/Types
 tags: $:/tags/MoreSideBar
-caption: Types
+caption: {{$:/language/SideBar/Types/Caption}}
 
 <$list filter="[!is[system]has[type]each[type]sort[type]]">
 <div class="tw-menu-list-item">

diff --git a/core/ui/PageControls/controlpanel.tid b/core/ui/PageControls/controlpanel.tid
@@ -1,4 +1,4 @@
 title: $:/core/ui/PageControls/control-panel
 tags: $:/tags/PageControls
 
-<$link to="$:/ControlPanel">{{$:/core/images/options-button}}</$link>
+<$button to="$:/ControlPanel" class="btn-invisible">{{$:/core/images/options-button}}</$button>
diff --git a/core/ui/PageMacros.tid b/core/ui/PageMacros.tid
@@ -1,15 +1,23 @@
 title: $:/core/ui/PageMacros
 
+\define colour(name)
+<$transclude tiddler={{$:/palette}} index="$name$"/>
+\end
+\define color(name)
+<<colour $name$>>
+\end
 \define tabs(tabsList,default,state:"$:/state/tab")
-<div class="tw-tab-buttons"><$list filter="$tabsList$" variable="currentTab"><$button set=<<qualify "$state$">> setTo=<<currentTab>> default="$default$" selectedClass="tw-tab-selected"><$view tiddler=<<currentTab>> field="caption"><$macrocall $name="currentTab" $type="text/plain" $output="text/plain"/></$view> </$button>
+<div class="tw-tab-buttons"><$list filter="$tabsList$" variable="currentTab"><$button set=<<qualify "$state$">> setTo=<<currentTab>> default="$default$" selectedClass="tw-tab-selected"><$transclude tiddler=<<currentTab>> field="caption"><$macrocall $name="currentTab" $type="text/plain" $output="text/plain"/></$transclude> </$button>
 </$list>
 </div>
-<div class="tw-tab-divider">
-</div>
+<div class="tw-tab-divider"/>
 <div class="tw-tab-content">
+
 <$list filter="$tabsList$" variable="currentTab">
 <$reveal type="match" state=<<qualify "$state$">> text=<<currentTab>> default="$default$">
+
 <$transclude tiddler=<<currentTab>>/>
+
 </$reveal>
 </$list>
 </div>
@@ -29,5 +37,11 @@ $$$text/vnd.tiddlywiki>text/html
 $src$
 $$$
 
+\end
+\define lingo-base()
+$:/lingo/
+\end
+\define lingo(title)
+{{$(lingo-base)$$title$}}
 \end
 {{$:/core/ui/PageTemplate}}
diff --git a/core/ui/PageStylesheet.tid b/core/ui/PageStylesheet.tid
@@ -1,5 +1,59 @@
 title: $:/core/ui/PageStylesheet
 
+\define colour(name)
+<$transclude tiddler={{$:/palette}} index="$name$"/>
+\end
+\define color(name)
+<<colour $name$>>
+\end
+\define border-radius(radius)
+```
+  -webkit-border-radius: $radius$;
+     -moz-border-radius: $radius$;
+          border-radius: $radius$;
+```
+\end
+\define box-shadow(shadow)
+```
+  -webkit-box-shadow: $shadow$;
+     -moz-box-shadow: $shadow$;
+          box-shadow: $shadow$;
+```
+\end
+\define filter(filter)
+```
+  -webkit-filter: $filter$;
+     -moz-filter: $filter$;
+          filter: $filter$;
+```
+\end
+\define transition(transition)
+```
+  -webkit-transition: $transition$;
+     -moz-transition: $transition$;
+          transition: $transition$;
+```
+\end
+\define transform-origin(origin)
+```
+  -webkit-transform-origin: $origin$;
+     -moz-transform-origin: $origin$;
+          transform-origin: $origin$;
+```
+\end
+\define background-linear-gradient(gradient)
+```
+background-image: linear-gradient($gradient$);
+background-image: -o-linear-gradient($gradient$);
+background-image: -moz-linear-gradient($gradient$);
+background-image: -webkit-linear-gradient($gradient$);
+background-image: -ms-linear-gradient($gradient$);
+```
+\end
+\define datauri(title)
+<$macrocall $name="makedatauri" type={{$title$!!type}} text={{$title$}}/>
+\end
+
 <$list filter="[is[shadow]tag[$:/tags/stylesheet]] [!is[shadow]tag[$:/tags/stylesheet]]">
 <$transclude/>
 </$list>
diff --git a/core/ui/PageTemplate/sidebar.tid b/core/ui/PageTemplate/sidebar.tid
@@ -2,11 +2,14 @@ title: $:/core/ui/PageTemplate/sidebar
 tags: $:/tags/PageTemplate
 
 <header class="sidebar-header">
-<div class="titlebar">{{SiteTitle}}</div>
-<div class="tw-subtitle">{{SiteSubtitle}}</div>
+
+<div class="titlebar">{{$:/SiteTitle}}</div>
+<div class="tw-subtitle">{{$:/SiteSubtitle}}</div>
 
 <div class="tw-page-controls">
+
 <$list filter="[is[shadow]!has[draft.of]tag[$:/tags/PageControls]] [!is[shadow]!has[draft.of]tag[$:/tags/PageControls]] +[tag[$:/tags/PageControls]]" variable="listItem"><$transclude tiddler=<<listItem>>/></$list>
+
 </div>
 
 {{$:/core/ui/SideBarLists}}

diff --git a/core/ui/PageTemplate/story.tid b/core/ui/PageTemplate/story.tid
@@ -3,6 +3,13 @@ tags: $:/tags/PageTemplate
 
 <section class="story-river">
 
+<!-- Alerts -->
+<div class="tw-alerts">
+
+<$list filter="[is[shadow]!has[draft.of]tag[$:/tags/Alert]] [!is[shadow]!has[draft.of]tag[$:/tags/Alert]] +[sort[modified]]" template="$:/core/ui/AlertTemplate" storyview="pop"/>
+
+</div>
+
 <!-- The main story -->
 <$list filter="[list[$:/StoryList]]" history="$:/HistoryList" template="$:/core/ui/ViewTemplate" editTemplate="$:/core/ui/EditTemplate" storyview={{$:/view}} />
 

diff --git a/core/ui/SideBar/More.tid b/core/ui/SideBar/More.tid
@@ -1,7 +1,7 @@
 title: $:/core/ui/SideBar/More
 tags: $:/tags/SideBar
-caption: More
+caption: {{$:/language/SideBar/More/Caption}}
 
 <div class="tw-more-sidebar">
-<<tabs "[is[shadow]!has[draft.of]tag[$:/tags/MoreSideBar]] [!is[shadow]!has[draft.of]tag[$:/tags/MoreSideBar]] +[tag[$:/tags/MoreSideBar]]" "$:/core/ui/MoreSideBar/Open" "$:/state/tab/moresidebar">>
+<<tabs "[is[shadow]!has[draft.of]tag[$:/tags/MoreSideBar]] [!is[shadow]!has[draft.of]tag[$:/tags/MoreSideBar]] +[tag[$:/tags/MoreSideBar]]" "$:/core/ui/MoreSideBar/Tags" "$:/state/tab/moresidebar">>
 </div>
diff --git a/core/ui/SideBar/Open.tid b/core/ui/SideBar/Open.tid
@@ -1,8 +1,12 @@
 title: $:/core/ui/SideBar/Open
 tags: $:/tags/SideBar
-caption: Open
+caption: {{$:/language/SideBar/Open/Caption}}
 
+\define lingo-base() $:/language/CloseAll/
 <$list filter="[list[$:/StoryList]]" history="$:/HistoryList" storyview="pop">
+
 <$button message="tw-close-tiddler" class="btn-invisible btn-mini">&times;</$button> <$link to={{!!title}}><$view field="title"/></$link>
+
 </$list>
-<$button message="tw-close-all-tiddlers" class="btn-invisible btn-mini">close all</$button>
+
+<$button message="tw-close-all-tiddlers" class="btn-invisible btn-mini"><<lingo Button>></$button>
diff --git a/core/ui/SideBar/Recent.tid b/core/ui/SideBar/Recent.tid
@@ -1,5 +1,5 @@
 title: $:/core/ui/SideBar/Recent
 tags: $:/tags/SideBar
-caption: Recent
+caption: {{$:/language/SideBar/Recent/Caption}}
 
 {{$:/snippets/recentchanges}}
diff --git a/core/ui/SideBar/Tools.tid b/core/ui/SideBar/Tools.tid
@@ -1,25 +1,26 @@
 title: $:/core/ui/SideBar/Tools
 tags: $:/tags/SideBar
-caption: Tools
+caption: {{$:/language/SideBar/Tools/Caption}}
 
-{{$:/snippets/viewswitcher}}
+\define lingo-base() $:/language/ControlPanel/
+<<lingo Tools/Import/Prompt>> <$browse/>
 
 ---
 
-[[AdvancedSearch|$:/AdvancedSearch]]
+{{$:/snippets/encryptionstatus}}
 
 ---
 
-{{$:/snippets/minithemeswitcher}}
+<<lingo Basics/Version/Prompt>> <<version>>
 
 ---
 
-Import: <$browse/>
+{{$:/snippets/viewswitcher}}
 
 ---
 
-{{$:/snippets/encryptionstatus}}
+{{$:/snippets/minithemeswitcher}}
 
 ---
 
-TiddlyWiki5 version <<version>>
+{{$:/snippets/languageswitcher}}
diff --git a/core/ui/SideBarLists.tid b/core/ui/SideBarLists.tid
@@ -8,7 +8,7 @@ title: $:/core/ui/SideBarLists
 
 <div class="tw-search-results">
 
-//<small><$count filter="[!is[system]search{$:/temp/search}]"/> matches</small>//
+{{$:/language/Search/Matches}}
 
 <$list filter="[!is[system]search{$:/temp/search}sort[title]limit[250]]" template="$:/core/ui/ListItemTemplate"/>
 

diff --git a/core/ui/TagManager.tid b/core/ui/TagManager.tid
@@ -0,0 +1,18 @@
+title: $:/TagManager
+
+<table>
+<tbody>
+<tr>
+<th>Tag</th>
+<th>Count</th>
+<th>Colour</th>
+</tr>
+<$list filter="[tags[]sort[title]]">
+<tr>
+<td><$transclude tiddler="$:/core/ui/TagTemplate"/></td>
+<td><$count filter="[is[current]tagging[]]"/></td>
+<td><$edit-text field="color" tag="input" type="color"/></td>
+</tr>
+</$list>
+</tbody>
+</table>
diff --git a/core/ui/TagTemplate.tid b/core/ui/TagTemplate.tid
@@ -3,8 +3,15 @@ title: $:/core/ui/TagTemplate
 \define tag-styles()
 background-color:$(backgroundColor)$;
 \end
-<span class="tw-tag-list-item"><$set name="backgroundColor" value={{!!color}}><$button popup=<<qualify "$:/state/tagpopup">> class="btn-invisible tw-tag-label" style=<<tag-styles>>><$transclude tiddler={{!!icon}}/> <$view field="title" format="text" /></$button></$set>
+<span class="tw-tag-list-item">
+<$set name="backgroundColor" value={{!!color}}>
+<$button popup=<<qualify "$:/state/tagpopup">> class="btn-invisible tw-tag-label" style=<<tag-styles>>>
+<$transclude tiddler={{!!icon}}/> <$view field="title" format="text" />
+</$button>
+</$set>
 <$reveal state=<<qualify "$:/state/tagpopup">> type="popup" position="below" animate="yes"><div class="tw-drop-down"><$transclude tiddler="$:/core/ui/ListItemTemplate"/>
 <hr>
 <$list filter="[is[current]tagging[]]" template="$:/core/ui/ListItemTemplate"/>
-</div></$reveal></span>
+</div>
+</$reveal>
+</span>
diff --git a/core/ui/TiddlerInfo/Fields.tid b/core/ui/TiddlerInfo/Fields.tid
@@ -1,5 +1,5 @@
 title: $:/core/ui/TiddlerInfo/Fields
 tags: $:/tags/TiddlerInfo
-caption: Fields
+caption: {{$:/language/TiddlerInfo/Fields/Caption}}
 
 <$transclude tiddler="$:/core/ui/TiddlerFields"/>
diff --git a/core/ui/TiddlerInfo/List.tid b/core/ui/TiddlerInfo/List.tid
@@ -1,5 +1,6 @@
 title: $:/core/ui/TiddlerInfo/List
 tags: $:/tags/TiddlerInfo
-caption: List
+caption: {{$:/language/TiddlerInfo/List/Caption}}
 
-<$list filter="[list{!!title}]" emptyMessage="This tiddler does not have a list" template="$:/core/ui/ListItemTemplate"/>
+\define lingo-base() $:/language/TiddlerInfo/
+<$list filter="[list{!!title}]" emptyMessage=<<lingo List/Empty>> template="$:/core/ui/ListItemTemplate"/>
diff --git a/core/ui/TiddlerInfo/Listed.tid b/core/ui/TiddlerInfo/Listed.tid
@@ -1,5 +1,6 @@
 title: $:/core/ui/TiddlerInfo/Listed
 tags: $:/tags/TiddlerInfo
-caption: Listed
+caption: {{$:/language/TiddlerInfo/Listed/Caption}}
 
-<$list filter="[is[current]listed[]!is[system]]" emptyMessage="This tiddler is not listed by any others" template="$:/core/ui/ListItemTemplate"/>
+\define lingo-base() $:/language/TiddlerInfo/
+<$list filter="[is[current]listed[]!is[system]]" emptyMessage=<<lingo Listed/Empty>> template="$:/core/ui/ListItemTemplate"/>
diff --git a/core/ui/TiddlerInfo/References.tid b/core/ui/TiddlerInfo/References.tid
@@ -1,6 +1,7 @@
 title: $:/core/ui/TiddlerInfo/References
 tags: $:/tags/TiddlerInfo
-caption: References
+caption: {{$:/language/TiddlerInfo/References/Caption}}
 
-<$list filter="[is[current]backlinks[]sort[title]]" emptyMessage="No tiddlers link to this one" template="$:/core/ui/ListItemTemplate">
+\define lingo-base() $:/language/TiddlerInfo/
+<$list filter="[is[current]backlinks[]sort[title]]" emptyMessage=<<lingo References/Empty>> template="$:/core/ui/ListItemTemplate">
 </$list>
diff --git a/core/ui/TiddlerInfo/Tagging.tid b/core/ui/TiddlerInfo/Tagging.tid
@@ -1,5 +1,6 @@
 title: $:/core/ui/TiddlerInfo/Tagging
 tags: $:/tags/TiddlerInfo
-caption: Tagging
+caption: {{$:/language/TiddlerInfo/Tagging/Caption}}
 
-<$list filter="[is[current]tagging[]]" emptyMessage="No tiddlers are tagged with this one" template="$:/core/ui/ListItemTemplate"/>
+\define lingo-base() $:/language/TiddlerInfo/
+<$list filter="[is[current]tagging[]]" emptyMessage=<<lingo Tagging/Empty>> template="$:/core/ui/ListItemTemplate"/>
diff --git a/core/ui/UntaggedTemplate.tid b/core/ui/UntaggedTemplate.tid
@@ -1,6 +1,7 @@
 title: $:/core/ui/UntaggedTemplate
 
-<$button popup=<<qualify "$:/state/tagpopup">> class="btn-invisible tw-untagged-label tw-tag-label">untagged</$button>
+\define lingo-base() $:/language/SideBar/
+<$button popup=<<qualify "$:/state/tagpopup">> class="btn-invisible tw-untagged-label tw-tag-label"><<lingo Tags/Untagged/Caption>></$button>
 <$reveal state=<<qualify "$:/state/tagpopup">> type="popup" position="below"><div class="tw-drop-down">
 <$list filter="[untagged[]!is[system]] -[tags[]] +[sort[title]]" template="$:/core/ui/ListItemTemplate"/>
 </div></$reveal>
diff --git a/core/ui/ViewTemplate/body.tid b/core/ui/ViewTemplate/body.tid
@@ -2,5 +2,7 @@ title: $:/core/ui/ViewTemplate/body
 tags: $:/tags/ViewTemplate
 
 <div class="body">
+
 <$transclude />
+
 </div>
diff --git a/core/ui/ViewTemplate/title.tid b/core/ui/ViewTemplate/title.tid
@@ -8,7 +8,7 @@ fill:$(foregroundColor)$;
 
 </span><$set name="foregroundColor" value={{!!color}}><span style=<<title-styles>>><$transclude tiddler={{!!icon}}/></span></$set> <span class="title"><$view field="title"/></span></div>
 
-<$reveal type="nomatch" text="" default="" state=<<tiddlerInfoState>> class="tw-tiddler-info tw-popup" animate="yes">
+<$reveal type="nomatch" text="" default="" state=<<tiddlerInfoState>> class="tw-tiddler-info tw-popup" animate="yes" retain="yes">
 
 <$transclude tiddler="$:/core/ui/TiddlerInfo"/>
 

diff --git a/core/wiki/SiteTitle.tid b/core/wiki/SiteTitle.tid
diff --git a/core/wiki/allfields.tid b/core/wiki/allfields.tid
@@ -1,7 +1,7 @@
 title: $:/snippets/allfields
 
 \define renderfield(title)
-<tr class="tw-view-field"><td class="tw-view-field-name">''$title$'':</td><td class="tw-view-field-value">//{{$:/docs/fields/$title$}}//</td></tr>
+<tr class="tw-view-field"><td class="tw-view-field-name">''$title$'':</td><td class="tw-view-field-value">//{{$:/language/Docs/Fields/$title$}}//</td></tr>
 \end
 <table class="tw-view-field-table"><tbody><$list filter="[fields[]sort[title]]" variable="listItem"><$macrocall $name="renderfield" title=<<listItem>>/></$list>
 </tbody></table>
diff --git a/core/wiki/autosavestatus.tid b/core/wiki/autosavestatus.tid
@@ -0,0 +1,12 @@
+title: $:/snippets/autosavestatus
+
+\define lingo-base() $:/language/ControlPanel/Saving/
+<$reveal type="match" state="$:/config/AutoSave" text="yes">
+<<lingo AutoSave/Enabled/Prompt>>
+<$linkcatcher to="$:/config/AutoSave"><$button to="no"><<lingo AutoSave/Enabled/Button>>
+</$button></$linkcatcher>
+</$reveal>
+<$reveal type="nomatch" state="$:/config/AutoSave" text="yes">
+<<lingo AutoSave/Disabled/Prompt>>
+<$linkcatcher to="$:/config/AutoSave"><$button to="yes"><<lingo AutoSave/Disabled/Button>></$button></$linkcatcher>
+</$reveal>
diff --git a/core/wiki/config/AutoSave.tid b/core/wiki/config/AutoSave.tid
@@ -0,0 +1,3 @@
+title: $:/config/AutoSave
+
+yes
diff --git a/core/wiki/config/BitmapEditorColour.tid b/core/wiki/config/BitmapEditorColour.tid
@@ -0,0 +1,3 @@
+title: $:/config/BitmapEditor/Colour
+
+#ff0
diff --git a/core/wiki/config/BitmapEditorLineWidth.tid b/core/wiki/config/BitmapEditorLineWidth.tid
@@ -0,0 +1,3 @@
+title: $:/config/BitmapEditor/LineWidth
+
+3
diff --git a/core/wiki/config/SyncFilter.tid b/core/wiki/config/SyncFilter.tid
@@ -0,0 +1,3 @@
+title: $:/config/SyncFilter
+
+[is[tiddler]] -[[$:/HistoryList]] -[[$:/StoryList]] -[[$:/isEncrypted]] -[prefix[$:/status]] -[prefix[$:/state]] -[prefix[$:/temp]]
diff --git a/core/wiki/currpalettepreview.tid b/core/wiki/currpalettepreview.tid
@@ -0,0 +1,19 @@
+title: $:/snippets/currpalettepreview
+
+\define swatchStyle()
+background-color: $(swatchColour)$;
+\end
+\define swatch(colour)
+<$set name="swatchColour" value={{##$colour$}}>
+<div class="tw-swatch" style=<<swatchStyle>>/>
+</$set>
+\end
+<div class="tw-swatches-horiz">
+<<swatch foreground>>
+<<swatch background>>
+<<swatch muted-foreground>>
+<<swatch primary>>
+<<swatch page-background>>
+<<swatch tab-background>>
+<<swatch tiddler-info-background>>
+</div>
diff --git a/core/wiki/download-wiki-button.tid b/core/wiki/download-wiki-button.tid
@@ -1,3 +1,4 @@
 title: $:/snippets/download-wiki-button
 
-<$button message="tw-download-file" param="$:/core/save/all" class="btn-big-green">Download Full {{$:/core/images/save-button}}</$button>
+\define lingo-base() $:/language/ControlPanel/Tools/Download/
+<$button message="tw-download-file" param="$:/core/save/all" class="btn-big-green"><<lingo Full/Caption>> {{$:/core/images/save-button}}</$button>
diff --git a/core/wiki/encryptionstatus.tid b/core/wiki/encryptionstatus.tid
@@ -1,11 +1,12 @@
 title: $:/snippets/encryptionstatus
 
+\define lingo-base() $:/language/ControlPanel/Tools/Encryption/
 <$reveal type="match" state="$:/isEncrypted" text="yes">
-This wiki is encrypted.
-<$button message="tw-clear-password" class="btn btn-danger">Clear password</$button>
-<$button message="tw-set-password" class="btn btn-warning">Change password</$button>
+<<lingo Enabled/Prompt>>
+<$button message="tw-clear-password" class="btn btn-danger"><<lingo ClearPassword/Button>></$button>
+<$button message="tw-set-password" class="btn btn-warning"><<lingo ChangePassword/Button>></$button>
 </$reveal>
 <$reveal type="nomatch" state="$:/isEncrypted" text="yes">
-This wiki is not encrypted.
-<$button message="tw-set-password" class="btn btn-warning">Set password</$button>
+<<lingo Disabled/Prompt>>
+<$button message="tw-set-password" class="btn btn-warning"><<lingo SetPassword/Button>></$button>
 </$reveal>
diff --git a/core/wiki/languageswitcher.tid b/core/wiki/languageswitcher.tid
@@ -0,0 +1,8 @@
+title: $:/snippets/languageswitcher
+
+{{$:/language/ControlPanel/Basics/Language/Prompt}} <$view tiddler={{$:/language}} field="description" format="text"><$view tiddler={{$:/language}} field="name" format="text"><$view tiddler={{$:/language}} field="title" format="text"/></$view></$view>
+
+<$linkcatcher to="$:/language">
+<$list filter="[[$:/languages/en-GB]] [plugin-type[language]sort[title]]"><div><$reveal state="$:/language" type="match" text={{!!title}}>&bull;</$reveal><$reveal state="$:/language" type="nomatch" text={{!!title}}>&nbsp;</$reveal> <$link to={{!!title}}><$view field="description" format="text"><$view field="name" format="text"><$view field="title" format="text"/></$view></$view></$link></div>
+</$list>
+</$linkcatcher>
diff --git a/core/wiki/minilanguageswitcher.tid b/core/wiki/minilanguageswitcher.tid
@@ -0,0 +1,6 @@
+title: $:/snippets/minilanguageswitcher
+
+<$linkcatcher to="$:/language">
+<$list filter="[[$:/languages/en-GB]] [plugin-type[language]sort[title]]"><div><$reveal state="$:/language" type="match" text={{!!title}}>&bull;</$reveal><$reveal state="$:/language" type="nomatch" text={{!!title}}>&nbsp;</$reveal> <$link to={{!!title}}><$view field="description" format="text"><$view field="name" format="text"><$view field="title" format="text"/></$view></$view></$link></div>
+</$list>
+</$linkcatcher>
diff --git a/core/wiki/minithemeswitcher.tid b/core/wiki/minithemeswitcher.tid
@@ -1,6 +1,7 @@
 title: $:/snippets/minithemeswitcher
 
-Current theme: <$link to={{$:/theme}}><$view tiddler={{$:/theme}} field="name"/></$link>
+\define lingo-base() $:/language/ControlPanel/Appearance/Theme/
+<<lingo Prompt>> <$view tiddler={{$:/theme}} field="name"/>
 
 <$linkcatcher to="$:/theme">
 <$list filter="[plugin-type[theme]sort[title]]"><div><$reveal state="$:/theme" type="match" text={{!!title}}>&bull;</$reveal><$reveal state="$:/theme" type="nomatch" text={{!!title}}>&nbsp;</$reveal> <$link to={{!!title}}><$view field="name" format="text"/></$link></div>

diff --git a/core/wiki/modules.tid b/core/wiki/modules.tid
@@ -1,11 +1,14 @@
 title: $:/snippets/modules
 
 \define describeModuleType(type)
-{{$:/docs/moduletypes/$type$}}
+{{$:/language/Docs/ModuleTypes/$type$}}
 \end
 <$list filter="[moduletypes[]]">
+
 !! <$macrocall $name="currentTiddler" $type="text/plain" $output="text/plain"/>
+
 <$macrocall $name="describeModuleType" type=<<currentTiddler>>/>
+
 <ul><$list filter="[is[current]modules[]]"><li><$link><<currentTiddler>></$link>
 </li>
 </$list>

diff --git a/core/wiki/moreSideBarTabSet.tid b/core/wiki/moreSideBarTabSet.tid
diff --git a/core/wiki/palette.tid b/core/wiki/palette.tid
@@ -0,0 +1,3 @@
+title: $:/palette
+
+$:/palettes/Vanilla
diff --git a/core/wiki/paletteeditor.tid b/core/wiki/paletteeditor.tid
@@ -0,0 +1,26 @@
+title: $:/snippets/paletteeditor
+
+\define lingo-base() $:/language/ControlPanel/Appearance/Palette/Editor/
+<$set name="currentTiddler" value={{$:/palette}}>
+
+<<lingo Prompt>> <$link to={{$:/palette}}><$macrocall $name="currentTiddler" $output="text/plain"/></$link>
+
+<$list filter="[is[current]is[shadow]is[tiddler]]" variable="listItem">
+<<lingo Prompt/Modified>>
+<$button message="tw-delete-tiddler" param={{$:/palette}}><<lingo Reset/Caption>></$button>
+</$list>
+
+<$list filter="[is[current]is[shadow]!is[tiddler]]" variable="listItem">
+<<lingo Clone/Prompt>>
+</$list>
+
+<$button message="tw-new-tiddler" param={{$:/palette}}><<lingo Clone/Caption>></$button>
+
+<table><tbody><$list filter="[is[current]indexes[]]" variable="colourName"><tr><td><$macrocall $name="colourName" $output="text/plain"/></td>
+<td><$edit-text index=<<colourName>> tag="input"/></td>
+<td><$edit-text index=<<colourName>> type="color" tag="input"/></td>
+</tr>
+</$list>
+</tbody>
+</table>
+</$set>
diff --git a/core/wiki/palettepreview.tid b/core/wiki/palettepreview.tid
@@ -0,0 +1,5 @@
+title: $:/snippets/palettepreview
+
+<$set name="currentTiddler" value={{$:/palette}}>
+<$transclude tiddler="$:/snippets/currpalettepreview"/>
+</$set>
diff --git a/core/wiki/paletteswitcher.tid b/core/wiki/paletteswitcher.tid
@@ -0,0 +1,10 @@
+title: $:/snippets/paletteswitcher
+
+\define lingo-base() $:/language/ControlPanel/Appearance/Palette/
+<<lingo Prompt>> <$view tiddler={{$:/palette}} field="name"/>
+
+<$linkcatcher to="$:/palette">
+<div class="tw-chooser"><$list filter="[is[shadow]tag[$:/tags/Palette]] [!is[shadow]tag[$:/tags/Palette]] +[sort[description]]"><div class="tw-chooser-item"><$link to={{!!title}}><div><$reveal state="$:/palette" type="match" text={{!!title}}>&bull;</$reveal><$reveal state="$:/palette" type="nomatch" text={{!!title}}>&nbsp;</$reveal> ''<$view field="name" format="text"/>'' - <$view field="description" format="text"/></div><$transclude tiddler="$:/snippets/currpalettepreview"/></$link></div>
+</$list>
+</div>
+</$linkcatcher>
diff --git a/core/wiki/recentchanges.tid b/core/wiki/recentchanges.tid
@@ -2,7 +2,7 @@ title: $:/snippets/recentchanges
 
 <$list filter="[!is[system]has[modified]!sort[modified]limit[100]eachday[modified]]">
 <div class="tw-menu-list-item">
-<$view field="modified" format="date" template="DDth MMM YYYY"/>
+<$view field="modified" format="date" template={{$:/language/RecentChanges/DateFormat}}/>
 <$list filter="[sameday{!!modified}!is[system]!sort[modified]]">
 <div class="tw-menu-list-subitem">
 <$link to={{!!title}}>

diff --git a/core/wiki/sideBarTabSet.tid b/core/wiki/sideBarTabSet.tid
diff --git a/core/wiki/themeswitcher.tid b/core/wiki/themeswitcher.tid
@@ -1,6 +1,7 @@
 title: $:/snippets/themeswitcher
 
-Current theme: <$link to={{$:/theme}}><$view tiddler={{$:/theme}} field="name"/></$link>
+\define lingo-base() $:/language/ControlPanel/Appearance/Theme/
+<<lingo Prompt>> <$view tiddler={{$:/theme}} field="name"/>
 
 <$linkcatcher to="$:/theme">
 <$list filter="[plugin-type[theme]sort[title]]"><div><$reveal state="$:/theme" type="match" text={{!!title}}>&bull;</$reveal><$reveal state="$:/theme" type="nomatch" text={{!!title}}>&nbsp;</$reveal> <$link to={{!!title}}>''<$view field="name" format="text"/>'' <$view field="description" format="text"/></$link></div>

diff --git a/core/wiki/title.tid b/core/wiki/title.tid
@@ -1,4 +1,4 @@
 title: $:/core/wiki/title
 type: text/vnd.tiddlywiki
 
-{{SiteTitle}} --- {{SiteSubtitle}}
+{{$:/SiteTitle}} --- {{$:/SiteSubtitle}}
diff --git a/core/wiki/viewswitcher.tid b/core/wiki/viewswitcher.tid
@@ -1,6 +1,7 @@
 title: $:/snippets/viewswitcher
 
-Current view: {{$:/view}}
+\define lingo-base() $:/language/ControlPanel/Appearance/StoryView/
+<<lingo Prompt>> {{$:/view}}
 
 <$linkcatcher to="$:/view"><$list filter="classic zoomin pop"><div><$reveal state="$:/view" type="match" text={{!!title}}>&bull;</$reveal><$reveal state="$:/view" type="nomatch" text={{!!title}}>&nbsp;</$reveal> <$link to={{!!title}}><$view field="title"/></$link>
 </div>

diff --git a/editions/codemirrordemo/tiddlers/SiteSubtitle.tid b/editions/codemirrordemo/tiddlers/SiteSubtitle.tid
@@ -1,3 +1,3 @@
-title: SiteSubtitle
+title: $:/SiteSubtitle
 
 a demo of the CodeMirror plugin for TiddlyWiki5
diff --git a/editions/codemirrordemo/tiddlers/SiteTitle.tid b/editions/codemirrordemo/tiddlers/SiteTitle.tid
@@ -1,3 +1,3 @@
-title: SiteTitle
+title: $:/SiteTitle
 
 codemirrordemo
diff --git a/editions/codemirrordemo/tiddlywiki.info b/editions/codemirrordemo/tiddlywiki.info
@@ -6,8 +6,6 @@
 		"tiddlywiki/vanilla",
 		"tiddlywiki/snowwhite"
 	],
-	"doNotSave": [
-	],
 	"includeWikis": [
 	]
 }
diff --git a/editions/d3demo/tiddlers/SiteSubtitle.tid b/editions/d3demo/tiddlers/SiteSubtitle.tid
@@ -1,3 +1,3 @@
-title: SiteSubtitle
+title: $:/SiteSubtitle
 
 a demo of the D3.js plugin for TiddlyWiki5
diff --git a/editions/d3demo/tiddlers/SiteTitle.tid b/editions/d3demo/tiddlers/SiteTitle.tid
@@ -1,3 +1,3 @@
-title: SiteTitle
+title: $:/SiteTitle
 
 d3demo
diff --git a/editions/d3demo/tiddlywiki.info b/editions/d3demo/tiddlywiki.info
@@ -6,12 +6,6 @@
 		"tiddlywiki/vanilla",
 		"tiddlywiki/snowwhite"
 	],
-	"doNotSave": [
-		"$:/StoryList",
-		"$:/HistoryList",
-		"$:/status/IsLoggedIn",
-		"$:/status/UserName"
-	],
 	"includeWikis": [
 	]
 }
diff --git a/editions/de-AT-DE/tiddlers/AT-DE-CH-favicon.png b/editions/de-AT-DE/tiddlers/AT-DE-CH-favicon.png
diff --git a/...ntserver/tiddlers/system/favicon.ico.meta → ...-AT-DE/tiddlers/AT-DE-CH-favicon.png.meta b/...ntserver/tiddlers/system/favicon.ico.meta → ...-AT-DE/tiddlers/AT-DE-CH-favicon.png.meta
diff --git a/editions/de-AT-DE/tiddlywiki.info b/editions/de-AT-DE/tiddlywiki.info
@@ -0,0 +1,19 @@
+{
+	"plugins": [
+		"tiddlywiki/fullscreen",
+		"tiddlywiki/github-fork-ribbon"
+	],
+	"themes": [
+		"tiddlywiki/vanilla",
+		"tiddlywiki/snowwhite",
+		"tiddlywiki/nighttime",
+		"tiddlywiki/starlight",
+		"tiddlywiki/centralised",
+		"tiddlywiki/readonly"
+	],
+	"languages": [
+		"en-GB",
+		"de-AT",
+		"de-DE"
+	]
+}
diff --git a/editions/fr-FR/tiddlers/images/favicon.ico b/editions/fr-FR/tiddlers/images/favicon.ico
diff --git a/editions/fr-FR/tiddlers/images/favicon.ico.meta b/editions/fr-FR/tiddlers/images/favicon.ico.meta
@@ -0,0 +1,2 @@
+title: $:/favicon.ico
+type: image/x-icon
diff --git a/editions/fr-FR/tiddlers/language.tid b/editions/fr-FR/tiddlers/language.tid
@@ -0,0 +1,3 @@
+title: $:/language
+
+$:/languages/fr-FR
diff --git a/editions/fr-FR/tiddlywiki.info b/editions/fr-FR/tiddlywiki.info
@@ -0,0 +1,17 @@
+{
+	"plugins": [
+		"tiddlywiki/fullscreen"
+	],
+	"themes": [
+		"tiddlywiki/vanilla",
+		"tiddlywiki/snowwhite",
+		"tiddlywiki/nighttime",
+		"tiddlywiki/starlight",
+		"tiddlywiki/stickytitles",
+		"tiddlywiki/centralised",
+		"tiddlywiki/readonly"
+	],
+	"languages": [
+		"fr-FR"
+	]
+}
diff --git a/editions/highlightdemo/tiddlers/HelloThere.tid b/editions/highlightdemo/tiddlers/HelloThere.tid
@@ -1,13 +1,19 @@
 title: HelloThere
 
-This is a demo of TiddlyWiki5 incorporating a plugin for the [[highlight.js|https://github.com/isagalaev/highlight.js]] Syntax highlighting for the Web from Ivan Sagalaev.
+This is a demo of TiddlyWiki5 incorporating a plugin for the [[highlight.js|https://github.com/isagalaev/highlight.js]] syntax highlighting library from Ivan Sagalaev.
 
-The HighlightExample tiddler have fenced blocks of code.
+! Usage
 
-To add the plugin to your own TiddlyWiki5, just drag this link to the browser window:
+The HighlightExample tiddler shows how fenced code blocks can have a language specifier added to trigger highlighting.
+
+! Installation
+
+To add this plugin to your own TiddlyWiki5, just drag this link to the browser window:
 
 [[$:/plugins/tiddlywiki/highlight]]
 
-To add your prefered [[theme|http://highlightjs.org/static/test.html]] append to your:
+! Adding Themes
+
+You can add themes from highlight.js by copying the CSS to a new tiddler and tagging it with [[$:/tags/stylesheet]]. The available themes can be found on GitHub:
 
-[[$:/tags/stylesheet]]
+https://github.com/isagalaev/highlight.js/tree/master/src/styles
diff --git a/editions/highlightdemo/tiddlers/HighlightExample.tid b/editions/highlightdemo/tiddlers/HighlightExample.tid
@@ -1,6 +1,6 @@
 title: HighlightExample
 
-''Javascript'' fenced code:
+''Javascript'' code:
 
 ```javascript
 (function(a,b){
@@ -9,7 +9,7 @@ title: HighlightExample
 })(10,20)
 ```
 
-''CSS'' fenced code:
+''CSS'' code:
 
 ```css
  * { margin: 0; padding: 0; } /* micro reset */
@@ -19,7 +19,7 @@ body { font-size: 14px; font-size: 1.4rem; } /* =14px */
 h1   { font-size: 24px; font-size: 2.4rem; } /* =24px */
 ```
 
-''Perl'' fenced code:
+''Perl'' code:
 
 ```perl
 package Name;
@@ -39,19 +39,13 @@ sub new {
 }
 ```
 
-''Python'' fenced code:
+''Python'' code:
 
-```
+```python
 class Singleton:
     __single = None
     def __init__( self ):
         if Singleton.__single:
             raise Singleton.__single
         Singleton.__single = self
 ```
-
-''~No-Highlight'' now
-
-```no-highlight
-$ TW5_BUILD_OUTPUT=tmp/ ./bld.sh
-```
diff --git a/editions/highlightdemo/tiddlers/SiteSubtitle.tid b/editions/highlightdemo/tiddlers/SiteSubtitle.tid
@@ -1,3 +1,3 @@
-title: SiteSubtitle
+title: $:/SiteSubtitle
 
 a demo of the Highlight plugin for TiddlyWiki5
diff --git a/editions/highlightdemo/tiddlers/SiteTitle.tid b/editions/highlightdemo/tiddlers/SiteTitle.tid
@@ -1,3 +1,3 @@
-title: SiteTitle
+title: $:/SiteTitle
 
 highlightdemo
diff --git a/editions/highlightdemo/tiddlywiki.info b/editions/highlightdemo/tiddlywiki.info
@@ -6,8 +6,6 @@
 		"tiddlywiki/vanilla",
 		"tiddlywiki/snowwhite"
 	],
-	"doNotSave": [
-	],
 	"includeWikis": [
 	]
 }
diff --git a/editions/markdowndemo/tiddlers/SiteSubtitle.tid b/editions/markdowndemo/tiddlers/SiteSubtitle.tid
@@ -1,3 +1,3 @@
-title: SiteSubtitle
+title: $:/SiteSubtitle
 
 a demo of the Markdown plugin for TiddlyWiki5
diff --git a/editions/markdowndemo/tiddlers/SiteTitle.tid b/editions/markdowndemo/tiddlers/SiteTitle.tid
@@ -1,3 +1,3 @@
-title: SiteTitle
+title: $:/SiteTitle
 
 markdowndemo
diff --git a/editions/markdowndemo/tiddlywiki.info b/editions/markdowndemo/tiddlywiki.info
@@ -6,8 +6,6 @@
 		"tiddlywiki/vanilla",
 		"tiddlywiki/snowwhite"
 	],
-	"doNotSave": [
-	],
 	"includeWikis": [
 	]
 }
diff --git a/editions/server/tiddlywiki.info b/editions/server/tiddlywiki.info
@@ -0,0 +1,12 @@
+{
+	"plugins": [
+		"tiddlywiki/tiddlyweb",
+		"tiddlywiki/filesystem",
+		"tiddlywiki/codemirror",
+		"tiddlywiki/highlight"
+	],
+	"themes": [
+		"tiddlywiki/vanilla",
+		"tiddlywiki/snowwhite"
+	]
+}
diff --git a/editions/tahoelafs/tiddlers/SiteSubtitle.tid b/editions/tahoelafs/tiddlers/SiteSubtitle.tid
@@ -1,3 +1,3 @@
-title: SiteSubtitle
+title: $:/SiteSubtitle
 
 Tahoe-LAFS edition
diff --git a/editions/tahoelafs/tiddlers/SiteTitle.tid b/editions/tahoelafs/tiddlers/SiteTitle.tid
@@ -1,3 +1,3 @@
-title: SiteTitle
+title: $:/SiteTitle
 
 TiddlyWiki5
diff --git a/editions/test/tiddlers/SiteSubtitle.tid b/editions/test/tiddlers/SiteSubtitle.tid
@@ -1,3 +1,3 @@
-title: SiteSubtitle
+title: $:/SiteSubtitle
 
 browser-based test runner
diff --git a/editions/test/tiddlers/SiteTitle.tid b/editions/test/tiddlers/SiteTitle.tid
@@ -1,3 +1,3 @@
-title: SiteTitle
+title: $:/SiteTitle
 
 TiddlyWiki5
diff --git a/editions/test/tiddlers/tests/test-filters.js b/editions/test/tiddlers/tests/test-filters.js
@@ -29,19 +29,19 @@ describe("Filter tests", function() {
 		text: "The quick brown fox in $:/TiddlerTwo",
 		tags: ["one"],
 		modifier: "JoeBloggs",
-		modified: "201304152219"});
+		modified: "201304152222"});
 	wiki.addTiddler({
 		title: "$:/TiddlerTwo",
 		text: "The rain in Spain\nfalls mainly on the plain and [[a fourth tiddler]]",
 		tags: ["two"],
 		modifier: "JohnDoe",
-		modified: "201304151756"});
+		modified: "201304152211"});
 	wiki.addTiddler({
 		title: "Tiddler Three",
 		text: "The speed of sound in light\n\nThere is no TiddlerZero but TiddlerSix",
 		tags: ["one","two"],
 		modifier: "JohnDoe",
-		modified: "201304161643"});
+		modified: "201304162202"});
 	wiki.addTiddler({
 		title: "a fourth tiddler",
 		text: "The quality of mercy is not drained by [[Tiddler Three]]",
@@ -206,7 +206,7 @@ describe("Filter tests", function() {
 	});
 
 	it("should handle the sameday operator", function() {
-		expect(wiki.filterTiddlers("[sameday[201304151312]sort[title]]").join(",")).toBe("$:/TiddlerTwo,TiddlerOne");
+		expect(wiki.filterTiddlers("[sameday[201304152200]sort[title]]").join(",")).toBe("$:/TiddlerTwo,TiddlerOne");
 	});
 
 	describe("testing the is operator",function() {

diff --git a/editions/test/tiddlers/tests/test-wikitext-parser.js b/editions/test/tiddlers/tests/test-wikitext-parser.js
@@ -83,16 +83,26 @@ describe("WikiText parser tests", function() {
 			[ { type : 'element', tag : 'p', children : [ { type : 'element', tag : 'div', isBlock : false, attributes : { attribute : { type : 'indirect', name : 'attribute', textReference : 'Tiddler Title!!field', start : 4, end : 39 } }, children : [ { type : 'text', text : 'some text' } ], start : 0, end : 40 } ] } ]
 
 		);
-		expect(parse("<div attribute={{TiddlerTitle!!field}}>\nsome text</div>")).toEqual(
+		expect(parse("<div attribute={{TiddlerTitle!!field}}>\n\nsome text</div>")).toEqual(
 
 			[ { type : 'element', start : 0, attributes : { attribute : { start : 4, name : 'attribute', type : 'indirect', textReference : 'TiddlerTitle!!field', end : 38 } }, tag : 'div', end : 39, isBlock : true, children : [ { type : 'element', tag : 'p', children : [ { type : 'text', text : 'some text' } ] } ] } ]
 
 		);
-		expect(parse("<div><div attribute={{TiddlerTitle!!field}}>\nsome text</div></div>")).toEqual(
+		expect(parse("<div><div attribute={{TiddlerTitle!!field}}>\n\nsome text</div></div>")).toEqual(
 
 			[ { type : 'element', tag : 'p', children : [ { type : 'element', start : 0, attributes : {  }, tag : 'div', end : 5, isBlock : false, children : [ { type : 'element', start : 5, attributes : { attribute : { start : 9, name : 'attribute', type : 'indirect', textReference : 'TiddlerTitle!!field', end : 43 } }, tag : 'div', end : 44, isBlock : true, children : [ { type : 'element', tag : 'p', children : [ { type : 'text', text : 'some text' } ] } ] } ] } ] } ]
 
 		);
+		expect(parse("<div><div attribute={{TiddlerTitle!!field}}>\n\n!some heading</div></div>")).toEqual(
+
+			[ { type : 'element', tag : 'p', children : [ { type : 'element', start : 0, attributes : {  }, tag : 'div', end : 5, isBlock : false, children : [ { type : 'element', start : 5, attributes : { attribute : { start : 9, name : 'attribute', type : 'indirect', textReference : 'TiddlerTitle!!field', end : 43 } }, tag : 'div', end : 44, isBlock : true, children : [ { type : 'element', tag : 'h1', attributes : { class : { type : 'string', value : '' } }, children : [ { type : 'text', text : 'some heading</div></div>' } ] } ] } ] } ] } ]
+
+		);
+		expect(parse("<div><div attribute={{TiddlerTitle!!field}}>\n!some heading</div></div>")).toEqual(
+
+			[ { type : 'element', tag : 'p', children : [ { type : 'element', start : 0, attributes : {  }, tag : 'div', end : 5, isBlock : false, children : [ { type : 'element', start : 5, attributes : { attribute : { start : 9, name : 'attribute', type : 'indirect', textReference : 'TiddlerTitle!!field', end : 43 } }, tag : 'div', end : 44, isBlock : false, children : [ { type : 'text', text : '\n!some heading' } ] } ] } ] } ]
+
+		);
 	});
 
 	it("should parse macro definitions", function() {

diff --git a/editions/tw2/readme.md b/editions/tw2/readme.md
@@ -1,5 +1,5 @@
-<h1 class=''>Building <span>TiddlyWikiClassic</span></h1><p><span>TiddlyWiki5</span> can be used to build older 2.x.x versions of <span>TiddlyWikiClassic</span> from their constituent components. Doing so involves these  features:</p><ul><li>The <code>tiddlywiki/classictools</code> plugin, containing a deserializer module which allows tiddlers to be loaded from <span>TiddlyWiki</span> 2.x.x <code>.recipe</code> files</li><li>The <code>stripcomments</code> format for the <span>ViewWidget</span>, which strips single line <span>JavaScript</span> comments starting <code>//#</code></li><li>The <code>stripTitlePrefix='yes'</code> attribute of the <span>FieldsWidget</span>, which removes prefixes wrapped in curly braces from the <code>title</code> attribute<ul><li>For example, <code>{tiddler}HelloThere</code> would be transformed to <code>HelloThere</code></li></ul></li></ul><h1 class=''>Usage</h1><p><span>TiddlyWikiClassic</span> is built from the command line by running <span>TiddlyWiki on Node.js</span>. A typical usage would be:</p><pre>node ../../tiddlywiki.js \
+<h1 class=''>Building <span>TiddlyWikiClassic</span></h1><p><span>TiddlyWiki5</span> can be used to build older 2.x.x versions of <span>TiddlyWikiClassic</span> from their constituent components. Doing so involves these  features:</p><ul><li>The <code>tiddlywiki/classictools</code> plugin, containing a deserializer module which allows tiddlers to be loaded from <span>TiddlyWiki</span> 2.x.x <code>.recipe</code> files</li><li>The <code>stripcomments</code> format for the <span>ViewWidget</span>, which strips single line <span>JavaScript</span> comments starting <code>//#</code></li><li>The <code>stripTitlePrefix='yes'</code> attribute of the <span>FieldsWidget</span>, which removes prefixes wrapped in curly braces from the <code>title</code> attribute<ul><li>For example, <code>{tiddler}HelloThere</code> would be transformed to <code>HelloThere</code></li></ul></li></ul><h1 class=''>Usage</h1><p><span>TiddlyWikiClassic</span> is built from the command line by running <span>TiddlyWiki on Node.js</span>. A typical usage would be:</p><pre><code>node ../../tiddlywiki.js \
 	--verbose \
 	--load &lt;path_to_recipe_file&gt; \
 	--rendertiddler $:/core/templates/tiddlywiki2.template.html &lt;path_to_write_index_file&gt; text/plain \
-	|| exit 1</pre>
+	|| exit 1</code></pre>
diff --git a/...iddlers/system/GoogleAnalyticsAccount.tid → ...iddlers/system/GoogleAnalyticsAccount.tid b/...iddlers/system/GoogleAnalyticsAccount.tid → ...iddlers/system/GoogleAnalyticsAccount.tid
diff --git a/...tiddlers/system/GoogleAnalyticsDomain.tid → ...tiddlers/system/GoogleAnalyticsDomain.tid b/...tiddlers/system/GoogleAnalyticsDomain.tid → ...tiddlers/system/GoogleAnalyticsDomain.tid
diff --git a/.../clientserver/tiddlers/system/favicon.ico → ...w5.com-server/tiddlers/system/favicon.ico b/.../clientserver/tiddlers/system/favicon.ico → ...w5.com-server/tiddlers/system/favicon.ico
diff --git a/editions/tw5.com-server/tiddlers/system/favicon.ico.meta b/editions/tw5.com-server/tiddlers/system/favicon.ico.meta
@@ -0,0 +1,2 @@
+title: $:/favicon.ico
+type: image/x-icon
diff --git a/editions/clientserver/tiddlywiki.info → editions/tw5.com-server/tiddlywiki.info b/editions/clientserver/tiddlywiki.info → editions/tw5.com-server/tiddlywiki.info
@@ -9,12 +9,6 @@
 		"tiddlywiki/vanilla",
 		"tiddlywiki/snowwhite"
 	],
-	"doNotSave": [
-		"$:/StoryList",
-		"$:/HistoryList",
-		"$:/status/IsLoggedIn",
-		"$:/status/UserName"
-	],
 	"includeWikis": [
 		"../tw5.com"
 	]

diff --git a/editions/tw5.com/tiddlers/Acknowledgements.tid b/editions/tw5.com/tiddlers/Acknowledgements.tid
@@ -1,11 +1,13 @@
-modified: 201305070956
-title: Acknowledgements
+created: 20140129204112515
+modified: 20140129204114743
 tags: introduction
+title: Acknowledgements
+type: text/vnd.tiddlywiki
 
 TiddlyWiki5 wouldn't be possible without the ongoing support of the TiddlyWiki user and developer community. Their attention and feedback has made it possible to gain an understanding of what is wanted from the product, and their passion for it has taught me that it is worth the investment that I am making.
 
 TiddlyWiki5 stands on the shoulders of giants by incorporating code from these fine OpenSource projects:
 
-* [[The Stanford Javascript Crypto Library|http://crypto.stanford.edu/sjcl/]]
+* [[The Stanford Javascript Crypto Library|http://bitwiseshiftleft.github.io/sjcl/]]
 * [[The Jasmine JavaScript Test Framework|http://pivotal.github.io/jasmine/]]
 * [[Normalize.css by Nicolas Gallagher|http://necolas.github.io/normalize.css/]]
diff --git a/editions/tw5.com/tiddlers/AllTiddlers.tid b/editions/tw5.com/tiddlers/AllTiddlers.tid
@@ -1,5 +1,7 @@
+created: 20140225211938920
+modified: 20140225211938920
 title: AllTiddlers
-tags: navigation
+type: text/vnd.tiddlywiki
 
 Current tiddlers:
 

diff --git a/editions/tw5.com/tiddlers/Community.tid b/editions/tw5.com/tiddlers/Community.tid
@@ -1,5 +1,5 @@
 created: 20130909151600000
-modified: 20140125145115633
+modified: 20140226202356584
 tags: community
 title: Community
 type: text/vnd.tiddlywiki
@@ -8,14 +8,17 @@ TiddlyWiki is made much more useful by its vibrant community of users and OpenSo
 
 ! Community Forums
 
-The TiddlyWiki discussion groups are mailing lists for talking about TiddlyWiki: requests for help, announcements of new releases and plugins, debating new features, or just sharing experiences.
+The ~TiddlyWiki discussion groups are mailing lists for talking about ~TiddlyWiki: requests for help, announcements of new releases and plugins, debating new features, or just sharing experiences.
 
-* The main TiddlyWiki group: http://groups.google.com/group/TiddlyWiki
+* The main ~TiddlyWiki group: http://groups.google.com/group/TiddlyWiki
 * The TiddlyWikiDev group for developers: http://groups.google.com/group/TiddlyWikiDev
+*> Note that you do not need a Google Account to join the discussion groups. Subscribe by sending an email to mailto:tiddlywiki+subscribe@googlegroups.com or mailto:tiddlywikidev+subscribe@googlegroups.com.
 * Follow [[@TiddlyWiki on Twitter|http://twitter.com/#!/TiddlyWiki]] for the latest news
 * Get involved in the [[development on GitHub|https://github.com/Jermolene/TiddlyWiki5]]
 * Watch recordings of our regular [[TiddlyWiki Hangouts]]
 
+New releases of TiddlyWiki, TiddlyDesktop and TiddlyFox are announced via the discussion groups and Twitter.
+
 ! Resources for TiddlyWiki5
 
 * [[TW5 Mall|http://www.giffmex.org/tw5mall.htm]] -- DaveGifford's growing catalogue of hints and tips
@@ -24,7 +27,7 @@ The TiddlyWiki discussion groups are mailing lists for talking about TiddlyWiki:
 * A [[collection of articles|http://blog.jeffreykishner.com/tiddlywiki/]] from JeffreyKishner
 * A new theme from [[BobRobison|http://tw5gray.tiddlyspot.com]]
 * [[Bestrew|http://nocategories.net/tiddlywiki/bestrew.html]] -- DylanKinnett's adaptation of TiddlyWiki5 as a writers manuscript submission tracker
-* [[tw5-zh|http://tw5-zh.tiddlyspot.com]], a Chinese translation of TiddlyWiki5 by BramChen
+* [[BrainTest|http://braintest.tiddlyspot.com]], a collection of tips and experiments from DanieloRodriguez
 * [[Coding for TiddlyWiki5|http://cjhunt.github.io]], an introduction to developing extensions and plugins from ChrisHunt
 * [[Hosting TiddlyWiki5 on GoogleDrive|https://googledrive.com/host/0B51gSXixfJ2Qb0I4R2M4MWJVMlU]] from TonyChing
 
@@ -42,3 +45,11 @@ The TiddlyWiki discussion groups are mailing lists for talking about TiddlyWiki:
 : A study notebook for the Bible
 ; http://tesis.tiddlyspot.com/
 : A thesis notebook
+
+! Local ~TiddlyWiki Interest Groups
+
+Local meetings of ~TiddlyWiki enthusiasts around the world:
+
+* [[OXTWIG]], the ''Oxford ~TiddlyWiki Interest Group'' meets monthly in Oxford, UK to share experiences of using TiddlyWiki
+
+//If you are a ~TiddlyWiki enthusiast please consider starting a local TWIG in your area, it's a great way to spread the word about using TiddlyWiki// 
diff --git a/editions/tw5.com/tiddlers/Docs.tid b/editions/tw5.com/tiddlers/Docs.tid
@@ -1,5 +1,5 @@
 created: 20130824141800000
-modified: 20131212093542990
+modified: 20140211165927396
 tags: introduction
 title: Docs
 type: text/vnd.tiddlywiki
@@ -11,10 +11,6 @@ type: text/vnd.tiddlywiki
 \end
 This is the main documentation hub for TiddlyWiki. See also [[TiddlyWiki for Developers]].
 
-! How to use ~TiddlyWiki5
-
-<<bulletList "howto">>
-
 ! Concepts
 
 <<bulletList "concepts">>
@@ -31,6 +27,10 @@ This is the main documentation hub for TiddlyWiki. See also [[TiddlyWiki for Dev
 
 <<bulletList "command">>
 
+! How to use ~TiddlyWiki5
+
+<<bulletList "howto">>
+
 ! Tips
 
 <<bulletList "tips">>

diff --git a/editions/tw5.com/tiddlers/Features.tid b/editions/tw5.com/tiddlers/Features.tid
@@ -1,15 +1,21 @@
 created: 20130822172800000
-modified: 20131213100612914
+modified: 20140228154616490
 tags: introduction
 title: Features
 type: text/vnd.tiddlywiki
 
+\define alert-demo()
+<$fieldmangler tiddler="SampleAlert"><$set name="currentTiddler" value="SampleAlert"><$button message="tw-add-tag" param="$:/tags/Alert" class="btn btn-inverse">alerts</$button></$set></$fieldmangler>
+\end
 * The ability to save changes on almost any desktop HTML5 compatible-browser, with custom apps to enable [[Saving on iPad/iPhone]] and [[Android|Saving on Android]], and a cross-platform [[Firefox extension|Saving with TiddlyFox]] that even runs on Android
+* Support for pluggable themes and colour palettes (see the [[control panel|$:/ControlPanel]])
+* The ability to [[render static HTML snapshots|Generating Static Sites with TiddlyWiki]] that can be used without JavaScript
 * [[Bitmap images|Motovun Jack.jpg]] and [[SVG images|UsingSVG]] are first-class citizens alongside text
 * Concise and expressive WikiText that generates semantic HTML
 * Integrated [[AES encryption|Saving with Encryption]]
 * TiddlyWiki isn't just a wiki - you can build custom applications with it like this TaskManagementExample
-* Familiar user interface elements like <$button message="tw-modal" param="SampleWizard" class="btn btn-inverse">wizards</$button> and <$button message="tw-notify" param="SampleNotification" class="btn btn-inverse">notifications</$button>
+* Full internationalization support, with TiddlyWiki itself available in several languages (see the [[control panel|$:/ControlPanel]])
+* Familiar user interface elements like <<alert-demo>>, <$button message="tw-modal" param="SampleWizard" class="btn btn-inverse">wizards</$button> and <$button message="tw-notify" param="SampleNotification" class="btn btn-inverse">notifications</$button>
 * Easily [[import|ImportTiddlers]] content via drag and drop, copy and paste, or browsing for local files
 * Clone existing tiddlers (for example, <$button message="tw-new-tiddler" param=<<currentTiddler>>>clone this tiddler</$button>)
 * TiddlyWiki is [[surprisingly scalable|Scalability]] to many thousands of tiddlers and megabytes of content

diff --git a/editions/tw5.com/tiddlers/Future of TiddlyWiki.tid b/editions/tw5.com/tiddlers/Future of TiddlyWiki.tid
@@ -1,7 +1,7 @@
 created: 20131213101024997
-modified: 20131213101420914
+modified: 20140211195603512
 title: Future of TiddlyWiki
 type: text/vnd.tiddlywiki
 
-TiddlyWiki is designed with the long term needs of its users in mind. Because it is OpenSource and needs no infrastructure, we can be confident that all we'll need to access a TiddlyWiki file even in the far future is an ordinary HTML browser. If you're starting to use TiddlyWiki at the beginning of your career you can be confident that it will carry you through to retirement.
+TiddlyWiki is designed with the long term needs of its users in mind. Because it is OpenSource and needs no infrastructure, we can be confident that all we'll need to access a ~TiddlyWiki file even in the far future is an ordinary HTML browser. If you're starting to use ~TiddlyWiki at the beginning of your career you can be confident that it will carry you through to retirement.
 
diff --git a/editions/tw5.com/tiddlers/GettingStarted.tid b/editions/tw5.com/tiddlers/GettingStarted.tid
@@ -1,5 +1,5 @@
 created: 20131129090249275
-modified: 20140126130155435
+modified: 20140206212022007
 tags: introduction
 title: GettingStarted
 type: text/vnd.tiddlywiki

diff --git a/editions/tw5.com/tiddlers/HelloThere.tid b/editions/tw5.com/tiddlers/HelloThere.tid
@@ -1,21 +1,24 @@
 created: 20130822170200000
-modified: 20140126155953512
+modified: 20140226201004198
 tags: introduction
 title: HelloThere
 type: text/vnd.tiddlywiki
 
 Welcome to TiddlyWiki, a complete interactive wiki in JavaScript. It can be used as a [[single HTML file in the browser|SingleFileApplication]] or as a powerful [[Node.js application|Node.js]]. It is highly customisable: the entire user interface is itself implemented in hackable WikiText.
 
-This is version <<version>> of TiddlyWiki, a major reboot designed [[for the next 25 years|Future of TiddlyWiki]]. It is currently in beta (see the detailed ReleaseHistory). There is a RoadMap for moving to the full release. It is a great time to [[get involved|Community]] and support the future development of TiddlyWiki.
+This is version <<version>> of ~TiddlyWiki, a major reboot designed [[for the next 25 years|Future of TiddlyWiki]]. It is currently in beta (see the detailed ReleaseHistory). There is a RoadMap for moving to the full release. It is a great time to [[get involved|Community]] and support the future development of ~TiddlyWiki.
 
-//TiddlyWiki is a free, open source project that depends on [[your love and support|HelpingTiddlyWiki]] for its survival//.
+Version 5.0.8-beta will require some changes to content created for earlier betas -- see: [[Notes for upgrading to 5.0.8-beta]] and ReleaseHistory
+
+//~TiddlyWiki is a free, open source project that depends on [[your love and support|HelpingTiddlyWiki]] for its survival//.
 
 <div class="tw-message-box">
+
 <a class="tw-message-icon" href="http://tiddlywiki.com/" target="_blank">{{TiddlyWiki Classic.png}}</a>
 
 !! TiddlyWikiClassic - http://classic.tiddlywiki.com
 
 On this site, unless noted otherwise, "~TiddlyWiki" refers to the new version 5, and "~TiddlyWikiClassic" is used to identify the older version.
 
-The deep internal improvements mean that the new version of TiddlyWiki is not fully compatible with TiddlyWikiClassic. Existing content will need massaging, while plugins and themes will have to be completely rewritten. The upgrade path will get smoother as the new version matures.
+The deep internal improvements mean that the new version of ~TiddlyWiki is not fully compatible with ~TiddlyWikiClassic. Existing content will need massaging, while plugins and themes will have to be completely rewritten. The upgrade path will get smoother as the new version matures.
 </div>
diff --git a/editions/tw5.com/tiddlers/HelpingTiddlyWiki.tid b/editions/tw5.com/tiddlers/HelpingTiddlyWiki.tid
@@ -1,5 +1,5 @@
 created: 20130825160500000
-modified: 20131206172505397
+modified: 20140211195805579
 tags: community
 title: HelpingTiddlyWiki
 type: text/vnd.tiddlywiki
@@ -8,21 +8,21 @@ If you find TiddlyWiki useful, there are lots of ways you can help assure its fu
 
 ! Teach and Tell
 
-OpenSource projects like TiddlyWiki thrive on the feedback and engagement of users. TiddlyWiki becomes more useful to everyone as more and more people use it. So, if you find TiddlyWiki useful, spread the word. The best possible way to assure its future is for it to become a hundred times more popular than before.
+OpenSource projects like ~TiddlyWiki thrive on the feedback and engagement of users. ~TiddlyWiki becomes more useful to everyone as more and more people use it. So, if you find ~TiddlyWiki useful, spread the word. The best possible way to assure its future is for it to become a hundred times more popular than before.
 
 * [[Tweet about TiddlyWiki|https://twitter.com/intent/tweet?text=I+love+TiddlyWiki+because...&source=tiddlywiki5]]
 * [[Star the TiddlyWiki5 GitHub Repository|https://github.com/Jermolene/TiddlyWiki5/star]]
 
 ! Help improve the documentation and code
 
-There are many ways you can contribute to TiddlyWiki:
+There are many ways you can contribute to ~TiddlyWiki:
 
 * Writing tutorials
 * Contributing to the documentation on tiddlywiki.com
 * Making video screencasts
 * Curating relevant links, hints and tips on a wiki
 
-The main TiddlyWiki documentation and code lives on GitHub, and welcomes [[contributions|Contributing]]:
+The main ~TiddlyWiki documentation and code lives on GitHub, and welcomes [[contributions|Contributing]]:
 
 * https://github.com/Jermolene/TiddlyWiki5
 
diff --git a/editions/tw5.com/tiddlers/Release 5.0.7beta.tid b/editions/tw5.com/tiddlers/Release 5.0.7beta.tid
@@ -3,6 +3,7 @@ modified: 20140125191028534
 tags: releasenote
 title: Release 5.0.7-beta
 type: text/vnd.tiddlywiki
+released: 201401262107
 
 //[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.0.6-beta...v5.0.7-beta]]//
 

diff --git a/editions/tw5.com/tiddlers/Release 5.0.8beta.tid b/editions/tw5.com/tiddlers/Release 5.0.8beta.tid
@@ -0,0 +1,73 @@
+created: 20140127143652456
+modified: 20140228154939681
+tags: releasenote
+title: Release 5.0.8-beta
+type: text/vnd.tiddlywiki
+released: 201402281551
+
+//[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.0.7-beta...v5.0.8-beta]]//
+
+!! Breaking Changes
+
+See [[Notes for upgrading to 5.0.8-beta]] for more details of these changes:
+
+* Changed rules for parsing content of HTML elements
+* Switched SiteTitle and SiteSubtitle to [[$:/SiteTitle]] and [[$:/SiteSubtitle]]
+* Changes to commands used with [[TiddlyWiki on Node.js]]
+* Changes to naming of some editions
+** Notably ''clientserver'' has changed to ''server''
+
+!! Documentation Improvements
+
+* Improved documentation for TiddlerFilters, including a notation of the [[TiddlerFilter Formal Grammar]] contributed by [[@Tikkoneus|https://github.com/Tikkoneus]]
+* Improved documentation for WidgetMessages
+* Tiddlers on tiddlywiki.com now have a link to the original source on ~GitHub for pull requests (see the "Sources" tab of the tiddler info panel)
+
+!! Usability Improvements
+
+* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/a01bbd4b9c7ca284141078340c8f568b1e0561a2]] [[automatic saving|AutoSave]] on editing a tiddler and a warning when attempting to close the window with unsaved changes
+* Added confirmation dialogue when deleting tiddlers
+* Add support for switchable (and editable) ColourPalettes
+* Added TranslationMechanism and translations for:
+** Deutsch (Österreich and Deutschland) by [[@pmario]]
+** Français (France) by [[@xcazin]]
+** Chinese (Simplified and Traditional) by [[@BramChen]]
+* Add error alerts when syncing to a server
+* Rejigged [[$:/ControlPanel]] to use nested tabs
+* Added [[$:/TagManager]] for easy management of tags
+* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/e3a05625b2368b2167a2a1b30aa82369e96a7538]] experimental KeyboardWidget, including support for ''ctrl-enter'' (or ''cmd-enter'') to finish editing a tiddler
+* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/e6fa9b8a859867c147fb289859169b204dea003e]] number of tags to control panel ''Basics'' tab
+* Enhanced link handling so that control/command clicking a link opens the target tiddler without navigating to it
+* Importing tiddlers via drag and drop no longer opens all the tiddlers
+
+!! Scalability Improvements
+
+* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/fa5938221552846c255eb50004996528a09534a9]] support for LazyLoading of images
+* Extended RevealWidget to allow control over content retention
+
+!! Hackability Improvements
+
+* Added HelpCommand and InitCommand for [[TiddlyWiki on Node.js]]
+* Extended ButtonWidget to allow navigating to a tiddler
+* Added experimental support for building plugins in the browser: [[How to create plugins in the browser]]
+* Extend the TranscludeWidget to display its content as a fallback if the tiddler or field is missing
+* Add logging and AlertMechanism
+* Added a ''Filter'' tab to [[advanced search|$:/AdvancedSearch]]
+* Add ''indexes'' [[filter operator|TiddlerFilters]]
+* Control over line width and colour for EditBitmapWidget
+* Add support for `.multids` MultiTiddlerFiles
+* Extend ViewWidget so that it works with indexes
+* Added support for Tank, a new service built on TiddlyWeb: https://tank.peermore.com
+* Extend relative dates to work in the future
+
+!! Bug Fixes
+
+* Fixed problem with pasting items into the browser
+* Fixed problem with colour pickers not showing correct colour in Chrome
+* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/commit/8e8e31fb9f5ed8f2e5deff0271d434dbe91f503c]] problem with tag pills not working inside table cells
+* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/commit/6d3d3322e5c676e63d1f64dce89ce86e58dcd715]] problem in client server configuration with ''%'' in tiddler titles
+* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/commit/7eafd51a7dd89d2174be3dec97033dc0bb206677]] problem with not using placeholder text when editing missing tiddlers
+* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/commit/1a54d590e1e67825057d7693ac89466a093b4577]] problem with test data in certain time zones
+* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/commit/5af30086c02b9d4466c133c87aca76f9b85eea49]] problem with non-breaking space characters being converted into '@' symbols
+* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/commit/5d3dda1a1721af05e56e301a8b896e53f9868540]] problem with highlighting plugin only working in the browser
+* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/commit/175e86078ce2fed34953f337baf2f0edfc093742]] crash when wiki/themes folder contains files that are not themes
diff --git a/editions/tw5.com/tiddlers/ReleaseHistory.tid b/editions/tw5.com/tiddlers/ReleaseHistory.tid
@@ -6,11 +6,17 @@ type: text/vnd.tiddlywiki
 Here are the details of recent releases of TiddlyWiki5. See [[TiddlyWiki5 Versioning]] for details of how releases are named.
 
 <$list filter="[tag[releasenote]!sort[created]]">
+
 <div>
+
 <h1><$link to={{!!title}}><$view field="title"/></$link></h1>
 <div>''Release date: <$view field="released" format="date" template="DDth MMM YYYY at 0hh:0mm">TBA</$view>''</div>
 <div>
+
 <$transclude/>
+
 </div>
+
 </div>
+
 </$list>
diff --git a/editions/tw5.com/tiddlers/TiddlyWiki Hangouts.tid b/editions/tw5.com/tiddlers/TiddlyWiki Hangouts.tid
@@ -1,11 +1,11 @@
-created: 201308230917000
-modified: 201311091500004
-tags: community
+created: 20130823091700000
+modified: 20140226200048000
+tags: community video
 title: TiddlyWiki Hangouts
 type: text/vnd.tiddlywiki
 
 The TiddlyWiki community holds regular Google Hangouts, usually every Tuesday from 4pm to 6pm (UK time). They are announced in the [[TiddlyWiki Google group|https://groups.google.com/d/forum/tiddlywiki]] and on the [[TiddlyWiki Twitter account|https://twitter.com/TiddlyWiki]].
 
 Past Hangouts are archived in this YouTube playlist:
 
-http://www.youtube.com/playlist?list=PLVT_2PPd-1p34gGCQ5qpwC8QdykxVAI3u
+<iframe width="560" height="315" src="//www.youtube.com/embed/videoseries?list=PLVT_2PPd-1p34gGCQ5qpwC8QdykxVAI3u" frameborder="0" allowfullscreen></iframe>
diff --git a/editions/tw5.com/tiddlers/Upgrading.tid b/editions/tw5.com/tiddlers/Upgrading.tid
@@ -7,6 +7,7 @@ type: text/vnd.tiddlywiki
 There are several methods for upgrading an existing TiddlyWiki version 5 document to a new release. There is a [[different procedure|Upgrading TiddlyWiki on Node.js]] for upgrading [[TiddlyWiki on Node.js]].
 
 <div class="tw-message-box">
+
 <a class="tw-message-icon" href="http://tiddlywiki.com/" target="_blank">{{TiddlyWiki Classic.png}}</a>
 
 !! Upgrading from TiddlyWikiClassic

diff --git a/editions/tw5.com/tiddlers/commands/HelpCommand.tid b/editions/tw5.com/tiddlers/commands/HelpCommand.tid
@@ -0,0 +1,7 @@
+created: 20140225195548209
+modified: 20140225195738745
+tags: command
+title: HelpCommand
+type: text/vnd.tiddlywiki
+
+{{$:/language/Help/help}}
diff --git a/editions/tw5.com/tiddlers/commands/InitCommand.tid b/editions/tw5.com/tiddlers/commands/InitCommand.tid
@@ -0,0 +1,7 @@
+created: 20140223195548209
+modified: 20140223195738745
+tags: command
+title: InitCommand
+type: text/vnd.tiddlywiki
+
+{{$:/language/Help/init}}
diff --git a/editions/tw5.com/tiddlers/commands/LoadCommand.tid b/editions/tw5.com/tiddlers/commands/LoadCommand.tid
@@ -4,14 +4,4 @@ tags: command
 title: LoadCommand
 type: text/vnd.tiddlywiki
 
-Load tiddlers from 2.x.x TiddlyWiki files (`.html`), `.tiddler`, `.tid`, `.json` or other files 
-
-```
---load <filepath>
-```
-
-To load tiddlers from an encrypted TiddlyWiki file you should first specify the password with the PasswordCommand. For example:
-
-```
-tiddlywiki ./MyWiki --password pa55w0rd --load my_encrypted_wiki.html
-```
+{{$:/language/Help/load}}
diff --git a/editions/tw5.com/tiddlers/commands/PasswordCommand.tid b/editions/tw5.com/tiddlers/commands/PasswordCommand.tid
@@ -1,9 +1,4 @@
 title: PasswordCommand
 tags: command
 
-Set a password for subsequent crypto operations
-
-```
---password <password>
-```
-
+{{$:/language/Help/password}}
diff --git a/editions/tw5.com/tiddlers/commands/PrintCommand.tid b/editions/tw5.com/tiddlers/commands/PrintCommand.tid
diff --git a/editions/tw5.com/tiddlers/commands/RenderTiddlerCommand.tid b/editions/tw5.com/tiddlers/commands/RenderTiddlerCommand.tid
@@ -1,8 +1,4 @@
 title: RenderTiddlerCommand
 tags: command
 
-Render an individual tiddler as a specified ContentType, defaults to `text/html` and save it to the specified filename 
-
-```
---rendertiddler <title> <filename> [<type>]
-```
+{{$:/language/Help/rendertiddler}}
diff --git a/editions/tw5.com/tiddlers/commands/RenderTiddlersCommand.tid b/editions/tw5.com/tiddlers/commands/RenderTiddlersCommand.tid
@@ -1,14 +1,4 @@
 title: RenderTiddlersCommand
 tags: command
 
-Render a set of tiddlers matching a filter to separate files of a specified ContentType (defaults to `text/html`) and extension (defaults to `.html`).
-
-```
---rendertiddlers <filter> <template> <pathname> [<type>] [<extension>]
-```
-
-For example:
-
-```
---rendertiddlers [!is[system]] $:/core/templates/static.tiddler.html ./static text/plain
-```
+{{$:/language/Help/rendertiddlers}}
diff --git a/editions/tw5.com/tiddlers/commands/SaveTiddlerCommand.tid b/editions/tw5.com/tiddlers/commands/SaveTiddlerCommand.tid
@@ -3,8 +3,4 @@ tags: command
 created: 20131218121606089
 modified: 20131218121606089
 
-Saves an individual tiddler in its raw text or binary format to the specified filename. 
-
-```
---savetiddler <title> <filename>
-```
+{{$:/language/Help/savetiddler}}
diff --git a/editions/tw5.com/tiddlers/commands/ServerCommand.tid b/editions/tw5.com/tiddlers/commands/ServerCommand.tid
@@ -4,30 +4,4 @@ tags: command
 title: ServerCommand
 type: text/vnd.tiddlywiki
 
-The server built in to TiddlyWiki5 is very simple. Although compatible with TiddlyWeb it doesn't support many of the features needed for robust Internet-facing usage.
-
-At the root, it serves a rendering of a specified tiddler. Away from the root, it serves individual tiddlers encoded in JSON, and supports the basic HTTP operations for `GET`, `PUT` and `DELETE`.
-
-```
---server <port> <roottiddler> <rendertype> <servetype> <username> <password> <host>
-```
-
-The parameters are:
-
-* ''port'' - port number to serve from (defaults to "8080")
-* ''roottiddler'' - the tiddler to serve at the root (defaults to "$:/core/save/all") 
-* ''rendertype'' - the content type to which the root tiddler should be rendered (defaults to "text/plain")
-* ''servetype'' - the content type with which the root tiddler should be served (defaults to "text/html")
-* ''username'' - the default username for signing edits
-* ''password'' - optional password for basic authentication
-* ''host'' - optional hostname to serve from (defaults to "127.0.0.1" aka "localhost")
-
-If the password parameter is specified then the browser will prompt the user for the username and password. Note that the password is transmitted in plain text so this implementation isn't suitable for general use.
-
-For example:
-
-```
---server 8080 $:/core/save/all text/plain text/html MyUserName passw0rd
-```
-
-To run multiple TiddlyWiki servers at the same time you'll need to put each one on a different port.
+{{$:/language/Help/server}}
diff --git a/editions/tw5.com/tiddlers/commands/VerboseCommand.tid b/editions/tw5.com/tiddlers/commands/VerboseCommand.tid
@@ -1,8 +1,4 @@
 title: VerboseCommand
 tags: command
 
-Triggers verbose output, useful for debugging 
-
-```
---verbose
-```
+{{$:/language/Help/verbose}}
diff --git a/editions/tw5.com/tiddlers/commands/VersionCommand.tid b/editions/tw5.com/tiddlers/commands/VersionCommand.tid
@@ -1,8 +1,4 @@
 title: VersionCommand
 tags: command
 
-Displays the version number of TiddlyWiki.
-
-```
---version
-```
+{{$:/language/Help/version}}
diff --git a/editions/tw5.com/tiddlers/community/OXTWIG.tid b/editions/tw5.com/tiddlers/community/OXTWIG.tid
@@ -0,0 +1,23 @@
+created: 20140222133223882
+modified: 20140226200036324
+tags: community video
+title: OXTWIG
+type: text/vnd.tiddlywiki
+
+The ''Oxford ~TiddlyWiki Interest Group'' meets monthly for discussions and demonstrations about TiddlyWiki.
+
+See https://oxtwig.eventbrite.co.uk/ for details of our next meeting.
+
+We have an email discussion list, too: https://groups.google.com/forum/#!members/oxtwig
+
+! OXTWIG #2
+
+The second OXTWIG meeting was held on Thursday 16th January 2014:
+
+<iframe width="560" height="315" src="//www.youtube.com/embed/WOK_nVBf_6U" frameborder="0" allowfullscreen></iframe>
+
+! OXTWIG #1
+
+The first OXTWIG meeting was held on Thursday 21st November 2013:
+
+<iframe width="560" height="315" src="//www.youtube.com/embed/tpNf_Dms_TE" frameborder="0" allowfullscreen></iframe>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		title: $:/config/SyncFilter

		[is[tiddler]] -[[$:/HistoryList]] -[[$:/StoryList]] -[[$:/isEncrypted]] -[prefix[$:/status]] -[prefix[$:/state]] -[prefix[$:/temp]]