diff --git a/editions/tw5.com/tiddlers/Core Classes.tid b/editions/tw5.com/tiddlers/Core Classes.tid
new file mode 100644
index 000000000..ea21246df
--- /dev/null
+++ b/editions/tw5.com/tiddlers/Core Classes.tid	
@@ -0,0 +1,16 @@
+created: 20240421142359127
+modified: 20240422090116239
+tags: Reference
+title: Core Classes
+
+~TiddlyWiki class definitions are ''prefixed'' with `tc-` and are mainly used in the "vanilla base" theme. The ''tc-'' prefix ''is reserved'' for ~TiddlyWiki, so it should not be used for user defined classes.
+
+Users, especially plugin developers, should use their own prefixes eg: mytc- or something similar. 
+
+The following info can also be found in the $:/ControlPanel ''-> Advanced -> Stylesheets'' tab
+
+All stylesheets used in this wiki are: <small>(shadow tiddlers are bold)</small>
+
+<<list-links filter:"[all[shadows+tiddlers]tag[$:/tags/Stylesheet]]">>
+
+Also see: [[Utility Classes]]
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/Core Functions.tid b/editions/tw5.com/tiddlers/Core Functions.tid
new file mode 100644
index 000000000..cf9e6b300
--- /dev/null
+++ b/editions/tw5.com/tiddlers/Core Functions.tid	
@@ -0,0 +1,8 @@
+created: 20240421144224104
+modified: 20240422090925417
+tags: Reference
+title: Core Functions
+
+<!-- TODO Placeholder - Can be improved once the new "dumpvariables" macro is finished -->
+
+Also see: [[Functions]]
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/Core Messages.tid b/editions/tw5.com/tiddlers/Core Messages.tid
new file mode 100644
index 000000000..597bc6643
--- /dev/null
+++ b/editions/tw5.com/tiddlers/Core Messages.tid	
@@ -0,0 +1,10 @@
+created: 20240421144407522
+modified: 20240422091247905
+tags: Reference
+title: Core Messages
+
+{{||Messages}}
+
+The following widget messages are implemented by the core:
+
+<<list-links filter:"[tag[Messages]]" class:"multi-columns">>
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/Core Procedures.tid b/editions/tw5.com/tiddlers/Core Procedures.tid
new file mode 100644
index 000000000..ce2a01719
--- /dev/null
+++ b/editions/tw5.com/tiddlers/Core Procedures.tid	
@@ -0,0 +1,8 @@
+created: 20240422090331513
+modified: 20240422090918289
+tags: Reference
+title: Core Procedures
+
+<!-- TODO Placeholder - Can be improved once the new "dumpvariables" macro is finished -->
+
+Also see: [[Procedures]]
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/Core Widgets.tid b/editions/tw5.com/tiddlers/Core Widgets.tid
new file mode 100644
index 000000000..c38a3e0c0
--- /dev/null
+++ b/editions/tw5.com/tiddlers/Core Widgets.tid	
@@ -0,0 +1,10 @@
+created: 20240422083130158
+modified: 20240422083155753
+tags: Reference
+title: Core Widgets
+
+{{Widgets}}
+
+The following classes of widget are built into the core:
+
+<<list-links "[tag[Widgets]]" class:"multi-columns">>
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/concepts/Macros.tid b/editions/tw5.com/tiddlers/concepts/Macros.tid
index 884551996..e71f80077 100644
--- a/editions/tw5.com/tiddlers/concepts/Macros.tid
+++ b/editions/tw5.com/tiddlers/concepts/Macros.tid
@@ -1,6 +1,6 @@
 created: 20140211171341271
-modified: 20230922094937115
-tags: Concepts Reference
+modified: 20240422084520179
+tags: Concepts [[Core Macros]]
 title: Macros
 type: text/vnd.tiddlywiki
 
diff --git a/editions/tw5.com/tiddlers/concepts/Messages.tid b/editions/tw5.com/tiddlers/concepts/Messages.tid
index 77c9df290..968a2509f 100644
--- a/editions/tw5.com/tiddlers/concepts/Messages.tid
+++ b/editions/tw5.com/tiddlers/concepts/Messages.tid
@@ -1,11 +1,8 @@
 created: 20140226083311937
-modified: 20211117042057208
-tags: Concepts Reference
+modified: 20240422091319082
+tags: Concepts [[Core Messages]]
 title: Messages
 type: text/vnd.tiddlywiki
 
-Widget ''messages'' are generated by  [[Widgets]] in response to user actions.  Messages have a <<.param name>>, an optional primary <<.param parameter>>, and one or more optional named parameters. These messages travel up the widget tree where they are handled by ancestor widgets or the core itself.
+Widget [[messages|Core Messages]] are generated by  [[Widgets]] in response to user actions.  Messages have a <<.param name>>, an optional primary <<.param parameter>>, and one or more optional named parameters. These messages travel up the widget tree where they are handled by ancestor widgets or the core itself.
 
-The following widget messages are implemented by the core:
-
-<<list-links "[tag[Messages]]">>
diff --git a/editions/tw5.com/tiddlers/functions/Functions.tid b/editions/tw5.com/tiddlers/functions/Functions.tid
index 028747a34..0911fdd6d 100644
--- a/editions/tw5.com/tiddlers/functions/Functions.tid
+++ b/editions/tw5.com/tiddlers/functions/Functions.tid
@@ -1,6 +1,6 @@
 created: 20221009124003601
-modified: 20240619211228560
-tags: Concepts Reference
+modified: 20240422084850412
+tags: Concepts [[Core Functions]]
 title: Functions
 type: text/vnd.tiddlywiki
 
diff --git a/editions/tw5.com/tiddlers/macros/CoreMacros.tid b/editions/tw5.com/tiddlers/macros/CoreMacros.tid
index 01879e3ac..2c46555f3 100644
--- a/editions/tw5.com/tiddlers/macros/CoreMacros.tid
+++ b/editions/tw5.com/tiddlers/macros/CoreMacros.tid
@@ -1,5 +1,6 @@
 created: 20150220180315000
-modified: 20150221222052000
+modified: 20240422084600212
+tags: Reference
 title: Core Macros
 type: text/vnd.tiddlywiki
 
diff --git a/editions/tw5.com/tiddlers/procedures/Procedures.tid b/editions/tw5.com/tiddlers/procedures/Procedures.tid
index 321284f93..1643fac18 100644
--- a/editions/tw5.com/tiddlers/procedures/Procedures.tid
+++ b/editions/tw5.com/tiddlers/procedures/Procedures.tid
@@ -1,6 +1,6 @@
 created: 20221007124007426
-modified: 20240310173130052
-tags: Concepts Reference
+modified: 20240422090349758
+tags: Concepts [[Core Procedures]]
 title: Procedures
 type: text/vnd.tiddlywiki
 
diff --git a/editions/tw5.com/tiddlers/variables/Core Variables.tid b/editions/tw5.com/tiddlers/variables/Core Variables.tid
index ab19181eb..3b2fa070b 100644
--- a/editions/tw5.com/tiddlers/variables/Core Variables.tid	
+++ b/editions/tw5.com/tiddlers/variables/Core Variables.tid	
@@ -1,12 +1,13 @@
 created: 20150220161908000
-modified: 20150228134138000
+modified: 20240421144847774
+tags: Reference
 title: Core Variables
 type: text/vnd.tiddlywiki
 
 The following [[variables|Variables]] are built into ~TiddlyWiki's core:
 
-<<list-links "[tag[Core Variables]] -[tag[Configuration Variables]]">>
+<<list-links filter:"[tag[Core Variables]] -[tag[Configuration Variables]]" class:"multi-columns">>
 
 The core will also use various configuration variables and macros if you define them:
 
-<<list-links "[tag[Configuration Variables]]">>
+<<list-links filter:"[tag[Configuration Variables]]"  class:"multi-columns">>
diff --git a/editions/tw5.com/tiddlers/variables/Variables.tid b/editions/tw5.com/tiddlers/variables/Variables.tid
index 116f3c9a0..43387eb4f 100644
--- a/editions/tw5.com/tiddlers/variables/Variables.tid
+++ b/editions/tw5.com/tiddlers/variables/Variables.tid
@@ -1,6 +1,6 @@
 created: 20141002133113496
-modified: 20230422150445336
-tags: Concepts Reference WikiText
+modified: 20240422084347375
+tags: Concepts WikiText
 title: Variables
 type: text/vnd.tiddlywiki
 
diff --git a/editions/tw5.com/tiddlers/widgets/Custom Widgets.tid b/editions/tw5.com/tiddlers/widgets/Custom Widgets.tid
index b8c48b2c3..847bdeed9 100644
--- a/editions/tw5.com/tiddlers/widgets/Custom Widgets.tid	
+++ b/editions/tw5.com/tiddlers/widgets/Custom Widgets.tid	
@@ -1,6 +1,6 @@
 created: 20221007144237585
-modified: 20230921180332436
-tags: Concepts Reference
+modified: 20240422084734129
+tags: Concepts
 title: Custom Widgets
 type: text/vnd.tiddlywiki
 
diff --git a/editions/tw5.com/tiddlers/widgets/Widgets.tid b/editions/tw5.com/tiddlers/widgets/Widgets.tid
index 66793f47d..1b65189b4 100644
--- a/editions/tw5.com/tiddlers/widgets/Widgets.tid
+++ b/editions/tw5.com/tiddlers/widgets/Widgets.tid
@@ -1,6 +1,6 @@
 created: 20140908130500000
-modified: 20240326164134356
-tags: Concepts Reference
+modified: 20240422083334052
+tags: Concepts [[Core Widgets]]
 title: Widgets
 type: text/vnd.tiddlywiki
 
@@ -14,6 +14,4 @@ Each class of widget contributes a specific ability to the overall functionality
 
 The more specialised widgets use a general-purpose [[widget syntax|Widgets in WikiText]] as their only possible WikiText representation.
 
-The following classes of widget are built into the core:
 
-<<list-links "[tag[Widgets]]" class:"multi-columns">>