diff --git a/core/modules/commands/build.js b/core/modules/commands/build.js
index 8471119d7..60456372d 100644
--- a/core/modules/commands/build.js
+++ b/core/modules/commands/build.js
@@ -24,7 +24,7 @@ var Command = function(params,commander) {
 
 Command.prototype.execute = function() {
 	// Get the build targets defined in the wiki
-	var buildTargets = $tw.boot.wikiInfo.build;
+	var buildTargets = $tw.boot.wikiInfo && $tw.boot.wikiInfo.build;
 	if(!buildTargets) {
 		return "No build targets defined";
 	}
diff --git a/core/wiki/macros/CSS.tid b/core/wiki/macros/CSS.tid
index 3702b1ff1..f80958a02 100644
--- a/core/wiki/macros/CSS.tid
+++ b/core/wiki/macros/CSS.tid
@@ -1,5 +1,5 @@
 title: $:/core/macros/CSS
-tags: $:/tags/Macro $:/tags/Global
+tags: $:/tags/Macro
 
 <!-- Needs to stay that way for backwards compatibility. See GH issue: #8326 -->
 \function colour(name)
@@ -10,42 +10,54 @@ tags: $:/tags/Macro $:/tags/Global
 [function[colour],<name>]
 \end function
 
-\function box-shadow(shadow)
-[[ -webkit-box-shadow: $(shadow)$;
-	-moz-box-shadow: $(shadow)$;
-	box-shadow: $(shadow)$;]substitute[]]
+\define box-shadow(shadow)
+``
+-webkit-box-shadow: $shadow$;
+	-moz-box-shadow: $shadow$;
+		box-shadow: $shadow$;
+``
 \end
 
-\function filter(filter)
-[[ -webkit-filter: $(filter)$;
-	-moz-filter: $(filter)$;
-	filter: $(filter)$;]substitute[]]
+\define filter(filter)
+``
+-webkit-filter: $filter$;
+	-moz-filter: $filter$;
+		filter: $filter$;
+``
 \end
 
-\function transition(transition)
-[[ -webkit-transition: $(transition)$;
-	-moz-transition: $(transition)$;
-	transition: $(transition)$;]substitute[]]
+\define transition(transition)
+``
+-webkit-transition: $transition$;
+	-moz-transition: $transition$;
+		transition: $transition$;
+``
 \end
 
-\function transform-origin(origin)
-[[ -webkit-transform-origin: $(origin)$;
-	-moz-transform-origin: $(origin)$;
-	transform-origin: $(origin)$;]substitute[]]
+\define transform-origin(origin)
+``
+-webkit-transform-origin: $origin$;
+	-moz-transform-origin: $origin$;
+		transform-origin: $origin$;
+``
 \end
 
-\function 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)$);]substitute[]]
+\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
 
-\function column-count(columns)
-[[-moz-column-count: $(columns)$;
-	-webkit-column-count: $(columns)$;
-	column-count: $(columns)$;]substitute[]]
+\define column-count(columns)
+``
+-moz-column-count: $columns$;
+-webkit-column-count: $columns$;
+column-count: $columns$;
+``
 \end
 
 \procedure datauri(title)
diff --git a/core/wiki/macros/copy-to-clipboard.tid b/core/wiki/macros/copy-to-clipboard.tid
index c0d177d7e..d05d014e2 100644
--- a/core/wiki/macros/copy-to-clipboard.tid
+++ b/core/wiki/macros/copy-to-clipboard.tid
@@ -1,5 +1,5 @@
 title: $:/core/macros/copy-to-clipboard
-tags: $:/tags/Macro $:/tags/Global
+tags: $:/tags/Macro
 
 \whitespace trim
 
diff --git a/core/wiki/macros/diff.tid b/core/wiki/macros/diff.tid
index ed7ebfcf9..9c9a9849b 100644
--- a/core/wiki/macros/diff.tid
+++ b/core/wiki/macros/diff.tid
@@ -1,5 +1,5 @@
 title: $:/core/macros/diff
-tags: $:/tags/Macro $:/tags/Global
+tags: $:/tags/Macro
 
 \whitespace trim
 
diff --git a/core/wiki/macros/export.tid b/core/wiki/macros/export.tid
index 5233da385..117359e08 100644
--- a/core/wiki/macros/export.tid
+++ b/core/wiki/macros/export.tid
@@ -1,5 +1,5 @@
 title: $:/core/macros/export
-tags: $:/tags/Macro $:/tags/Global
+tags: $:/tags/Macro
 
 \function exportButtonFilename(baseFilename)
 [<baseFilename>] [<extension>] +[join[]]
diff --git a/core/wiki/macros/show-filter-count.tid b/core/wiki/macros/show-filter-count.tid
index be06fcde1..cf6f7570c 100644
--- a/core/wiki/macros/show-filter-count.tid
+++ b/core/wiki/macros/show-filter-count.tid
@@ -1,5 +1,5 @@
 title: $:/core/macros/show-filter-count
-tags: $:/tags/Macro $:/tags/Global
+tags: $:/tags/Macro
 
 \whitespace trim
 
diff --git a/core/wiki/macros/tag-picker.tid b/core/wiki/macros/tag-picker.tid
index 1aeb41e9d..ae3e16818 100644
--- a/core/wiki/macros/tag-picker.tid
+++ b/core/wiki/macros/tag-picker.tid
@@ -1,5 +1,5 @@
 title: $:/core/macros/tag-picker
-tags: $:/tags/Macro $:/tags/Global
+tags: $:/tags/Macro
 first-search-filter: [subfilter<tagListFilter>!is[system]search:title<userInput>]
 second-search-filter: [subfilter<tagListFilter>is[system]search:title<userInput>]
 
diff --git a/core/wiki/macros/testcase.tid b/core/wiki/macros/testcase.tid
index a04cb540d..4417939d2 100644
--- a/core/wiki/macros/testcase.tid
+++ b/core/wiki/macros/testcase.tid
@@ -1,5 +1,5 @@
 title: $:/core/macros/testcase
-tags: $:/tags/Macro $:/tags/Global
+tags: $:/tags/Macro
 
 \whitespace trim
 
diff --git a/core/wiki/macros/timeline.tid b/core/wiki/macros/timeline.tid
index 244de2c2b..ee3ecc49b 100644
--- a/core/wiki/macros/timeline.tid
+++ b/core/wiki/macros/timeline.tid
@@ -1,4 +1,4 @@
-tags: $:/tags/Macro $:/tags/Global
+tags: $:/tags/Macro
 title: $:/core/macros/timeline
 
 <!-- Override one or both of the following two macros with a global or local macro of the same name 
diff --git a/editions/tw5.com/tiddlers/Welcome.tid b/editions/tw5.com/tiddlers/Welcome.tid
new file mode 100644
index 000000000..e857c0023
--- /dev/null
+++ b/editions/tw5.com/tiddlers/Welcome.tid
@@ -0,0 +1,9 @@
+list: HelloThere [[Quick Start]] [[Find Out More]] [[TiddlyWiki on the Web]] [[Testimonials and Reviews]] GettingStarted Community
+tags: TableOfContents
+title: Welcome
+type: text/vnd.tiddlywiki
+
+<$transclude $tiddler="HelloThere"/>
+
+''For more information, please select a topic:''
+<div class="tc-table-of-contents"><<toc-selective-expandable "Welcome">></div>
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/about/History of TiddlyWiki.tid b/editions/tw5.com/tiddlers/about/History of TiddlyWiki.tid
index a4ee6d3c3..8893bde71 100644
--- a/editions/tw5.com/tiddlers/about/History of TiddlyWiki.tid	
+++ b/editions/tw5.com/tiddlers/about/History of TiddlyWiki.tid	
@@ -1,5 +1,5 @@
 created: 20140908114400000
-modified: 20230803053808167
+modified: 20241016125145988
 tags: About
 title: History of TiddlyWiki
 type: text/vnd.tiddlywiki
diff --git a/editions/tw5.com/tiddlers/commands/Commands.tid b/editions/tw5.com/tiddlers/commands/Commands.tid
index c103258c3..51d83c740 100644
--- a/editions/tw5.com/tiddlers/commands/Commands.tid
+++ b/editions/tw5.com/tiddlers/commands/Commands.tid
@@ -1,9 +1,15 @@
 created: 20150117174359000
-modified: 20180626122309578
+modified: 20241018094151786
 tags: Concepts Reference
 title: Commands
 type: text/vnd.tiddlywiki
 
 A <<.def command>> is one of the following words, written with a `--` prefix and used as a command-line option under Node.js, indicating which action is desired. See [[Using TiddlyWiki on Node.js]] for details of how to use them.
 
-<<list-links "[tag[Commands]]">>
+''Commands''
+
+<<list-links "[tag[Commands]] -[tag[$:/deprecated]]" class:"multi-columns">>
+
+''Deprecated Commands''
+
+<<list-links "[tag[Commands]] :and[tag[$:/deprecated]]" class:"multi-columns">>
diff --git a/editions/tw5.com/tiddlers/commands/ServerCommand.tid b/editions/tw5.com/tiddlers/commands/ServerCommand.tid
index 73483ea15..3d5e9c11e 100644
--- a/editions/tw5.com/tiddlers/commands/ServerCommand.tid
+++ b/editions/tw5.com/tiddlers/commands/ServerCommand.tid
@@ -1,10 +1,12 @@
 caption: server
 created: 20131219163923630
 modified: 20180626150505679
-tags: Commands
+tags: Commands $:/deprecated
 title: ServerCommand
 type: text/vnd.tiddlywiki
 
+<<.deprecated-since "5.1.18" "ListenCommand">>.
+
 ''Note that the `--server` command is now deprecated in favour of the new ListenCommand''.
 
 See WebServer for details of TiddlyWiki's web server functionality.
diff --git a/editions/tw5.com/tiddlers/community/resources/Grok TiddlyWiki by Soren Bjornstad.tid b/editions/tw5.com/tiddlers/community/resources/Grok TiddlyWiki by Soren Bjornstad.tid
index 50f1972ef..efeec6f27 100644
--- a/editions/tw5.com/tiddlers/community/resources/Grok TiddlyWiki by Soren Bjornstad.tid	
+++ b/editions/tw5.com/tiddlers/community/resources/Grok TiddlyWiki by Soren Bjornstad.tid	
@@ -1,15 +1,15 @@
 created: 20210519110226889
-modified: 20210519110226889
+modified: 20241021161007731
 tags: [[Other Resources]]
 title: "Grok TiddlyWiki" by Soren Bjornstad
 type: text/vnd.tiddlywiki
 url: https://groktiddlywiki.com/read/
 
-This new textbook from Soren Bjornstad is highly recommended for learning ~TiddlyWiki. The presentation and design are also a first class example of using ~TiddlyWiki.
+Grok ~TiddlyWiki by Soren Bjornstad is an interactive learning environment for TiddlyWiki. It bundles three complementary modes of learning into one TiddlyWiki:
 
-From the site:
-
-> Grok ~TiddlyWiki is a textbook that helps you build a deep, lasting understanding of and proficiency with ~TiddlyWiki through a combination of detailed explanations, practical exercises, and spaced-repetition reviews of prompts called takeaways.
+* It ''explains concepts'' using English text and code examples
+* It ''assigns exercises'' that help you apply and practice what you've learned
+* It ''presents takeaways'', questions about key terms, concepts, or skills, for review as you continue through the book, to help you retain what you've learned over a longer period of time
 
 {{!!url}}
 
diff --git a/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - Grok TiddlyWiki.tid b/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - Grok TiddlyWiki.tid
index 1fd773caa..ead8e2124 100644
--- a/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - Grok TiddlyWiki.tid	
+++ b/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - Grok TiddlyWiki.tid	
@@ -2,7 +2,8 @@ title: HelloThumbnail - Grok TiddlyWiki
 tags: HelloThumbnail
 color: #D5B7EA
 image: Grok TiddlyWiki Banner
-caption: Grok ~TiddlyWiki
+caption: Grok ~TiddlyWiki 2.0
 link: "Grok TiddlyWiki" by Soren Bjornstad
+ribbon-text: NEW 2.0
 
-Everything you need to know to get the best out of ~TiddlyWiki
\ No newline at end of file
+A comprehensive interactive guide to ~TiddlyWiki, from the very basics to the advanced concepts, featuring exercises and takeaways to aid learning
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/images/Grok TiddlyWiki.png b/editions/tw5.com/tiddlers/images/Grok TiddlyWiki.png
index 1a2bec578..4295a2856 100644
Binary files a/editions/tw5.com/tiddlers/images/Grok TiddlyWiki.png and b/editions/tw5.com/tiddlers/images/Grok TiddlyWiki.png differ
diff --git a/editions/tw5.com/tiddlers/system/tw5.com-styles.tid b/editions/tw5.com/tiddlers/system/tw5.com-styles.tid
index 8a8484d35..ced42e64d 100644
--- a/editions/tw5.com/tiddlers/system/tw5.com-styles.tid
+++ b/editions/tw5.com/tiddlers/system/tw5.com-styles.tid
@@ -117,12 +117,19 @@ type: text/vnd.tiddlywiki
 	-webkit-column-gap: 1em;
 }
 
-@media (max-width: {{$:/themes/tiddlywiki/vanilla/metrics/sidebarbreakpoint}}) {
+/* Switch to 2 columns for 780x1280 displays which is 780p */
+@media (max-width: 1279px) {
 	.multi-columns {
 		column-count: 2;
 	}
 }
 
+@media (max-width: {{$:/themes/tiddlywiki/vanilla/metrics/sidebarbreakpoint}}) {
+	.multi-columns {
+		column-count: 1;
+	}
+}
+
 .tc-saving-sidebar-category { margin-bottom:10px; }
 .tc-saving-sidebar-category-title { margin-bottom:5px; font-weight:bold; }
 .tc-saving-sidebar-category-item { margin-left:10px; white-space:nowrap; }
diff --git a/licenses/cla-individual.md b/licenses/cla-individual.md
index de28728dc..826f5e194 100644
--- a/licenses/cla-individual.md
+++ b/licenses/cla-individual.md
@@ -593,3 +593,5 @@ Val Packett, @valpackett, 2024/07/26
 @IchijikuIchigo, 2024/09/29
 
 JC John Sese Cuneta, @techmagus, 2024/10/07
+
+@zorrox1024, 2024/10/20