From 623a3ec8f8a13b72129a6f75f9c10781e7276347 Mon Sep 17 00:00:00 2001
From: Jeremy Ruston <jeremy@osmosoft.com>
Date: Fri, 15 Mar 2013 22:00:19 +0000
Subject: [PATCH] Rename "shadow" tiddlers to "system" tiddlers

What we have at the moment isn't really the same as TiddlyWiki
classic's shadow tiddlers, it's a much simpler system for excluding
tiddlers. We'll use the term "shadow" instead to refer to the way that
tiddlers in plugins behave, which is exactly like TiddlyWiki classic's
shadow tiddlers.
---
 bld.sh                                               |  2 +-
 core/boot.js                                         |  6 +++---
 core/modules/commands/dump.js                        |  6 +++---
 core/modules/filters.js                              |  8 ++++----
 core/modules/tiddler.js                              |  8 ++++----
 core/modules/widgets/list/list.js                    |  8 ++++----
 core/modules/wiki.js                                 |  8 ++++----
 core/templates/StaticContent.tid                     |  2 +-
 core/templates/static.template.css.tid               |  2 +-
 core/templates/static.template.html.tid              |  2 +-
 core/templates/store.area.template.html.tid          |  4 ++--
 core/templates/tiddlywiki5.template.html.tid         | 12 ++++++------
 editions/tw2/wiki/tiddlywiki2.template.html.tid      |  4 ++--
 editions/tw5.com/tiddlers/Demos.tid                  |  2 +-
 editions/tw5.com/tiddlers/Docs.tid                   |  2 +-
 editions/tw5.com/tiddlers/commands/DumpCommand.tid   |  6 +++---
 .../tiddlers/commands/SaveTiddlersCommand.tid        |  2 +-
 .../tw5.com/tiddlers/concepts/ShadowTiddlers.tid     | 10 ----------
 .../tw5.com/tiddlers/concepts/SystemTiddlers.tid     | 10 ++++++++++
 .../tw5.com/tiddlers/concepts/TiddlerFilters.tid     |  2 +-
 .../editions/TiddlyWiki5_Static_Site_Generation.tid  |  2 +-
 .../tw5.com/tiddlers/mechanisms/BootMechanism.tid    |  2 +-
 editions/tw5dropbox/appwiki/wiki/AllTiddlers.tid     |  2 +-
 .../tw5dropbox/appwiki/wiki/index.template.html.tid  |  2 +-
 .../tw5dropbox/appwiki/wiki/styles.template.css.tid  |  2 +-
 .../appwiki/wiki/tw5dropbox.template.js.tid          |  6 +++---
 .../tw5dropbox/mainwiki/wiki/index.template.html.tid | 12 ++++++------
 plugins/tiddlywiki/dropbox-app/dropbox-app.js        |  2 +-
 plugins/tiddlywiki/dropbox/dropbox.js                |  8 ++++----
 readme.md                                            |  8 ++++----
 30 files changed, 76 insertions(+), 76 deletions(-)
 delete mode 100644 editions/tw5.com/tiddlers/concepts/ShadowTiddlers.tid
 create mode 100644 editions/tw5.com/tiddlers/concepts/SystemTiddlers.tid

diff --git a/bld.sh b/bld.sh
index 14f29ae1e..4300b0e73 100755
--- a/bld.sh
+++ b/bld.sh
@@ -35,7 +35,7 @@ node ./tiddlywiki.js \
 	--savetiddler $:/core/templates/tiddlywiki5.template.html $TW5_BUILD_OUTPUT/index.html text/plain \
 	--savetiddler $:/core/templates/static.template.html $TW5_BUILD_OUTPUT/static.html text/plain \
 	--savetiddler $:/core/templates/static.template.css $TW5_BUILD_OUTPUT/static/static.css text/plain \
-	--savetiddlers [!is[shadow]] $:/core/templates/static.tiddler.html $TW5_BUILD_OUTPUT/static text/plain \
+	--savetiddlers [!is[system]] $:/core/templates/static.tiddler.html $TW5_BUILD_OUTPUT/static text/plain \
 	|| exit 1
 
 # Second, encrypted.html: a version of the main file encrypted with the password "password"
diff --git a/core/boot.js b/core/boot.js
index 168b2014a..b7400e96e 100644
--- a/core/boot.js
+++ b/core/boot.js
@@ -57,7 +57,7 @@ $tw.config = $tw.config || {};
 $tw.config.pluginsPath = "../plugins/";
 $tw.config.wikiInfo = $tw.config.wikiInfo || "./tiddlywiki.info";
 $tw.config.wikiPluginsSubDir = $tw.config.wikiPluginsSubDir || "./plugins";
-$tw.config.wikiShadowsSubDir = $tw.config.wikiShadowsSubDir || "./wiki";
+$tw.config.wikiSystemSubDir = $tw.config.wikiSystemSubDir || "./wiki";
 $tw.config.wikiTiddlersSubDir = $tw.config.wikiTiddlersSubDir || "./tiddlers";
 
 $tw.config.jsModuleHeaderRegExpString = "^\\/\\*\\\\\\n((?:^[^\\n]*\\n)+?)(^\\\\\\*\\/$\\n?)";
@@ -880,7 +880,7 @@ $tw.loadTiddlers = function() {
 		"bootKernel",
 		"styleArea",
 		"storeArea",
-		"shadowArea"
+		"systemArea"
 	];
 	for(var t=0; t<containerIds.length; t++) {
 		$tw.wiki.addTiddlers($tw.wiki.deserializeTiddlers("(DOM)",document.getElementById(containerIds[t])));
@@ -1049,7 +1049,7 @@ $tw.loadTiddlers = function() {
 	// On the server, we load tiddlers from specified folders
 	var folders = [
 		$tw.boot.bootPath,
-		path.resolve($tw.boot.wikiPath,$tw.config.wikiShadowsSubDir),
+		path.resolve($tw.boot.wikiPath,$tw.config.wikiSystemSubDir),
 		path.resolve($tw.boot.wikiPath,$tw.config.wikiTiddlersSubDir)
 	];
 	for(var t=0; t<folders.length; t++) {
diff --git a/core/modules/commands/dump.js b/core/modules/commands/dump.js
index 1aafd63ed..4a9c9a184 100644
--- a/core/modules/commands/dump.js
+++ b/core/modules/commands/dump.js
@@ -61,9 +61,9 @@ Command.prototype.subcommands.tiddlers = function() {
 	return null; // No error
 };
 
-Command.prototype.subcommands.shadows = function() {
-	var tiddlers = this.commander.wiki.getShadowTitles();
-	this.output.write("Wiki contains these shadow tiddlers:\n");
+Command.prototype.subcommands.system = function() {
+	var tiddlers = this.commander.wiki.getSystemTitles();
+	this.output.write("Wiki contains these system tiddlers:\n");
 	for(var t=0; t<tiddlers.length; t++) {
 		this.output.write(tiddlers[t] + "\n");
 	}
diff --git a/core/modules/filters.js b/core/modules/filters.js
index b19c9ceea..0de78b685 100644
--- a/core/modules/filters.js
+++ b/core/modules/filters.js
@@ -105,8 +105,8 @@ exports.operators = {
 						return "$tw.utils.pushTop(subResults,currTiddlerTitle);";
 					}
 					break;
-				case "shadow":
-					return "for(title in source) {if(" + op + "this.getTiddler(title).isShadow()) {$tw.utils.pushTop(subResults,title);}}";
+				case "system":
+					return "for(title in source) {if(" + op + "this.getTiddler(title).isSystem()) {$tw.utils.pushTop(subResults,title);}}";
 				default:
 					throw "Unknown operand for 'is' filter operator";
 			}
@@ -121,8 +121,8 @@ exports.operators = {
 						return "r = subResults.indexOf(currTiddlerTitle);\nif(r !== -1) {subResults = [currTiddlerTitle];} else {subResults = [];}";
 					}
 					break;
-				case "shadow":
-					return "for(r=subResults.length-1; r>=0; r--) {if(" + op + "this.getTiddler(subResults[r]).isShadow()) {subResults.splice(r,1);}}";
+				case "system":
+					return "for(r=subResults.length-1; r>=0; r--) {if(" + op + "this.getTiddler(subResults[r]).isSystem()) {subResults.splice(r,1);}}";
 				default:
 					throw "Unknown operand for 'is' filter operator";
 			}
diff --git a/core/modules/tiddler.js b/core/modules/tiddler.js
index f9c74d25d..5ff0c0d4b 100644
--- a/core/modules/tiddler.js
+++ b/core/modules/tiddler.js
@@ -16,11 +16,11 @@ exports.hasTag = function(tag) {
 	return this.fields.tags && this.fields.tags.indexOf(tag) !== -1;
 };
 
-exports.isShadow = function() {
-	if(!$tw.utils.hop(this,"shadowFlag")) {
-		this.shadowFlag = this.fields.title.indexOf("$:/") === 0;
+exports.isSystem = function() {
+	if(!$tw.utils.hop(this,"systemFlag")) {
+		this.systemFlag = this.fields.title.indexOf("$:/") === 0;
 	}
-	return this.shadowFlag;
+	return this.systemFlag;
 };
 
 exports.isTemporary = function() {
diff --git a/core/modules/widgets/list/list.js b/core/modules/widgets/list/list.js
index 06e42fb6c..feb81ef7e 100644
--- a/core/modules/widgets/list/list.js
+++ b/core/modules/widgets/list/list.js
@@ -28,11 +28,11 @@ var ListWidget = function(renderer) {
 These types are shorthands for particular filters
 */
 var typeMappings = {
-	all: "[!is[shadow]sort[title]]",
-	recent: "[!is[shadow]sort[modified]]",
+	all: "[!is[system]sort[title]]",
+	recent: "[!is[system]sort[modified]]",
 	missing: "[is[missing]sort[title]]",
 	orphans: "[is[orphan]sort[title]]",
-	shadows: "[is[shadow]sort[title]]"
+	system: "[is[system]sort[title]]"
 };
 
 ListWidget.prototype.generate = function() {
@@ -70,7 +70,7 @@ ListWidget.prototype.getTiddlerList = function() {
 		filter = this.renderer.getAttribute("filter");
 	}
 	if(!filter) {
-		filter = "[!is[shadow]]";
+		filter = "[!is[system]]";
 	}
 	this.list = this.renderer.renderTree.wiki.filterTiddlers(filter,this.renderer.getContextTiddlerTitle());
 };
diff --git a/core/modules/wiki.js b/core/modules/wiki.js
index c7f79b681..acaaa64bb 100644
--- a/core/modules/wiki.js
+++ b/core/modules/wiki.js
@@ -171,13 +171,13 @@ exports.addTiddler = function(tiddler) {
 };
 
 /*
-Return a sorted array of non-shadow tiddler titles, optionally filtered by a tag 
+Return a sorted array of non-system tiddler titles, optionally filtered by a tag 
 */
 exports.getTiddlers = function(sortField,excludeTag) {
 	sortField = sortField || "title";
 	var tiddlers = [], t, titles = [];
 	for(t in this.tiddlers) {
-		if($tw.utils.hop(this.tiddlers,t) && !this.tiddlers[t].isShadow() && (!excludeTag || !this.tiddlers[t].hasTag(excludeTag))) {
+		if($tw.utils.hop(this.tiddlers,t) && !this.tiddlers[t].isSystem() && (!excludeTag || !this.tiddlers[t].hasTag(excludeTag))) {
 			tiddlers.push(this.tiddlers[t]);
 		}
 	}
@@ -257,10 +257,10 @@ exports.getOrphanTitles = function() {
 	return []; // Todo
 };
 
-exports.getShadowTitles = function() {
+exports.getSystemTitles = function() {
 	var titles = [];
 	for(var title in this.tiddlers) {
-		if(this.tiddlers[title].isShadow()) {
+		if(this.tiddlers[title].isSystem()) {
 			titles.push(title);
 		}
 	}
diff --git a/core/templates/StaticContent.tid b/core/templates/StaticContent.tid
index a02a74e58..ceb153979 100644
--- a/core/templates/StaticContent.tid
+++ b/core/templates/StaticContent.tid
@@ -2,6 +2,6 @@ title: $:/templates/StaticContent
 type: text/vnd.tiddlywiki
 
 <!-- For Google, and people without JavaScript-->
-<$list filter="[!is[shadow]sort[title]]" >
+<$list filter="[!is[system]sort[title]]" >
 <$view field="title" format="text"></$view>
 </$list>
diff --git a/core/templates/static.template.css.tid b/core/templates/static.template.css.tid
index df40bdfde..07399b8a6 100644
--- a/core/templates/static.template.css.tid
+++ b/core/templates/static.template.css.tid
@@ -1,4 +1,4 @@
 title: $:/core/templates/static.template.css
 
-{{{ [is[shadow]type[text/css]] ||$:/core/templates/plain-text-tiddler}}}
+{{{ [is[system]type[text/css]] ||$:/core/templates/plain-text-tiddler}}}
 {{$:/core/styles/base}}
diff --git a/core/templates/static.template.html.tid b/core/templates/static.template.html.tid
index 349e79d6c..808d18df9 100644
--- a/core/templates/static.template.html.tid
+++ b/core/templates/static.template.html.tid
@@ -11,7 +11,7 @@ type: text/vnd.tiddlywiki-html
 <meta name="format-detection" content="telephone=no">
 <title>{{$:/core/wiki/title}}</title>
 <div id="styleArea">
-{{{ [is[shadow]type[text/css]] ||$:/core/templates/css-tiddler}}}
+{{{ [is[system]type[text/css]] ||$:/core/templates/css-tiddler}}}
 </div>
 <style type="text/css">
 {{$:/core/styles/base}}
diff --git a/core/templates/store.area.template.html.tid b/core/templates/store.area.template.html.tid
index 2a930be1a..e57bd0c68 100644
--- a/core/templates/store.area.template.html.tid
+++ b/core/templates/store.area.template.html.tid
@@ -2,12 +2,12 @@ title: $:/core/templates/store.area.template.html
 
 <$reveal type="nomatch" state="$:/isEncrypted" text="yes">
 `<div id="storeArea" style="display:none;">`
-{{{ [!is[shadow]] ||$:/core/templates/html-div-tiddler}}}
+{{{ [!is[system]] ||$:/core/templates/html-div-tiddler}}}
 `</div>`
 </$reveal>
 <$reveal type="match" state="$:/isEncrypted" text="yes">
 `<!------------- Encrypted tiddlers --------->`
 `<pre id="encryptedStoreArea" type="text/plain" style="display:none;">`
-<$encrypt filter="[!is[shadow]]"/>
+<$encrypt filter="[!is[system]]"/>
 `</pre>`
 </$reveal>
\ No newline at end of file
diff --git a/core/templates/tiddlywiki5.template.html.tid b/core/templates/tiddlywiki5.template.html.tid
index 373ea734d..721f65300 100644
--- a/core/templates/tiddlywiki5.template.html.tid
+++ b/core/templates/tiddlywiki5.template.html.tid
@@ -21,7 +21,7 @@ title: $:/core/templates/tiddlywiki5.template.html
 <body>
 <!----------- Static styles ----------->
 <div id="styleArea">
-{{{ [is[shadow]type[text/css]] ||$:/core/templates/css-tiddler}}}
+{{{ [is[system]type[text/css]] ||$:/core/templates/css-tiddler}}}
 </div>
 <!----------- Static content for Google and browsers without JavaScript ----------->
 <noscript>
@@ -29,16 +29,16 @@ title: $:/core/templates/tiddlywiki5.template.html
 {{$:/templates/NewStaticContent||$:/core/templates/html-tiddler}}
 </div>
 </noscript>
-<!----------- Miscellaneous shadow tiddlers ----------->
-<div id="shadowArea" style="display:none;">
-{{{ [is[shadow]] -[type[text/css]] -[type[application/javascript]has[module-type]] -[type[application/javascript]library[yes]] -[[$:/core/boot.js]] -[[$:/core/bootprefix.js]] ||$:/core/templates/html-div-tiddler}}}
+<!----------- Miscellaneous system tiddlers ----------->
+<div id="systemArea" style="display:none;">
+{{{ [is[system]] -[type[text/css]] -[type[application/javascript]has[module-type]] -[type[application/javascript]library[yes]] -[[$:/core/boot.js]] -[[$:/core/bootprefix.js]] ||$:/core/templates/html-div-tiddler}}}
 </div>
 <!----------- Ordinary tiddlers ----------->
 {{$:/core/templates/store.area.template.html}}
 <!----------- Library modules ----------->
 <div id="libraryModules" style="display:none;">
 {{$:/core/lib/jquery.min.js||$:/core/templates/javascript-tiddler}}
-{{{ [is[shadow]type[application/javascript]library[yes]] -[[$:/core/lib/jquery.min.js]] ||$:/core/templates/javascript-tiddler}}}
+{{{ [is[system]type[application/javascript]library[yes]] -[[$:/core/lib/jquery.min.js]] ||$:/core/templates/javascript-tiddler}}}
 </div>
 <!----------- Boot kernel prologue ----------->
 <div id="bootKernelPrefix" style="display:none;">
@@ -46,7 +46,7 @@ title: $:/core/templates/tiddlywiki5.template.html
 </div>
 <!----------- Plugin modules ----------->
 <div id="modules" style="display:none;">
-{{{ [is[shadow]type[application/javascript]has[module-type]] ||$:/core/templates/module-tiddler}}}
+{{{ [is[system]type[application/javascript]has[module-type]] ||$:/core/templates/module-tiddler}}}
 </div>
 <!----------- Boot kernel ----------->
 <div id="bootKernel" style="display:none;">
diff --git a/editions/tw2/wiki/tiddlywiki2.template.html.tid b/editions/tw2/wiki/tiddlywiki2.template.html.tid
index 3471b59dd..3e1e448ec 100644
--- a/editions/tw2/wiki/tiddlywiki2.template.html.tid
+++ b/editions/tw2/wiki/tiddlywiki2.template.html.tid
@@ -45,8 +45,8 @@ Welcome to TiddlyWiki created by Jeremy Ruston; Copyright &copy; 2004-2007 Jerem
 </div>
 <div id="contentWrapper"></div>
 <div id="contentStash"></div>
-<div id="shadowArea">
-{{{ [prefix[{shadow}]] +[sort-case-sensitive[title]] ||$:/core/templates/html-div-tiddler-remove-prefix}}}
+<div id="systemArea">
+{{{ [prefix[{system}]] +[sort-case-sensitive[title]] ||$:/core/templates/html-div-tiddler-remove-prefix}}}
 </div>
 <!--POST-SHADOWAREA-->
 <div id="storeArea">
diff --git a/editions/tw5.com/tiddlers/Demos.tid b/editions/tw5.com/tiddlers/Demos.tid
index 2dfc50021..71d60c8fa 100644
--- a/editions/tw5.com/tiddlers/Demos.tid
+++ b/editions/tw5.com/tiddlers/Demos.tid
@@ -5,7 +5,7 @@ Here are a few features of TiddlyWiki that you can explore:
 
 * Invoke a demonstration wizard: <$button message="tw-modal" param="SampleWizard" class="btn btn-inverse">demo</$button> (the text of the wizard is in the tiddler SampleWizard)
 * Save this wiki as a static HTML file: <$button message="tw-save-wiki" param="$:/core/templates/static.template.html" class="btn">Save Static</$button>
-* Browse the list of AllTiddlers or the ShadowTiddlers
+* Browse the list of AllTiddlers or the SystemTiddlers
 * Examine the example [[bitmap images|Motovun Jack.jpg]] and [[SVG images|Motovun Jack.svg]]
 * Check out the TaskManagementExample
 
diff --git a/editions/tw5.com/tiddlers/Docs.tid b/editions/tw5.com/tiddlers/Docs.tid
index 06d69777a..9624f1d49 100644
--- a/editions/tw5.com/tiddlers/Docs.tid
+++ b/editions/tw5.com/tiddlers/Docs.tid
@@ -29,7 +29,7 @@ The machinery tying those concepts together includes:
 * TiddlerTemplates
 * DataTiddlers
 * ContentType
-* ShadowTiddlers
+* SystemTiddlers
 * [[Plugins]]
 * [[Modules]] and [[ModuleType]]
 
diff --git a/editions/tw5.com/tiddlers/commands/DumpCommand.tid b/editions/tw5.com/tiddlers/commands/DumpCommand.tid
index d618a18c0..cd93ca992 100644
--- a/editions/tw5.com/tiddlers/commands/DumpCommand.tid
+++ b/editions/tw5.com/tiddlers/commands/DumpCommand.tid
@@ -17,12 +17,12 @@ Dump the fields of an individual tiddler
 --dump tiddler <title>
 ```
 
-!!! dump shadows
+!!! dump system
 
-Dump the titles of the shadow tiddlers in the wiki store 
+Dump the titles of the system tiddlers in the wiki store 
 
 ```
---dump shadows
+--dump systems
 ```
 
 !!! dump config
diff --git a/editions/tw5.com/tiddlers/commands/SaveTiddlersCommand.tid b/editions/tw5.com/tiddlers/commands/SaveTiddlersCommand.tid
index 8912f811f..2fb9ea38f 100644
--- a/editions/tw5.com/tiddlers/commands/SaveTiddlersCommand.tid
+++ b/editions/tw5.com/tiddlers/commands/SaveTiddlersCommand.tid
@@ -10,5 +10,5 @@ Save a set of tiddlers matching a filter as separate files of a specified Conten
 For example:
 
 ```
---savetiddlers [!is[shadow]] $:/core/templates/static.tiddler.html ./static text/plain
+--savetiddlers [!is[system]] $:/core/templates/static.tiddler.html ./static text/plain
 ```
diff --git a/editions/tw5.com/tiddlers/concepts/ShadowTiddlers.tid b/editions/tw5.com/tiddlers/concepts/ShadowTiddlers.tid
deleted file mode 100644
index da596c5e6..000000000
--- a/editions/tw5.com/tiddlers/concepts/ShadowTiddlers.tid
+++ /dev/null
@@ -1,10 +0,0 @@
-title: ShadowTiddlers
-tags: docs concepts
-
-TiddlyWiki models everything as [[tiddlers|Tiddlers]], including its internal components and configuration.
-
-Thus, even an apparently empty TiddlyWiki actually contains dozens of tiddlers that are necessary to enable it function correctly. To prevent them from confusing or intimidating casual users, these system tiddlers are designated //shadow tiddlers// which means that they remain invisible unless one looks for them directly. They don't show up in lists or search results, but linking to one directly works in the usual way.
-
-The current shadow tiddlers are:
-
-<$list type="shadows" />
diff --git a/editions/tw5.com/tiddlers/concepts/SystemTiddlers.tid b/editions/tw5.com/tiddlers/concepts/SystemTiddlers.tid
new file mode 100644
index 000000000..37d2f41b8
--- /dev/null
+++ b/editions/tw5.com/tiddlers/concepts/SystemTiddlers.tid
@@ -0,0 +1,10 @@
+title: SystemTiddlers
+tags: docs concepts
+
+TiddlyWiki models everything as [[tiddlers|Tiddlers]], including its internal components and configuration.
+
+Thus, even an apparently empty TiddlyWiki actually contains dozens of tiddlers that are necessary to enable it function correctly. To prevent them from confusing casual users, these system tiddlers are hidden from most operations. They don't show up in lists or search results, but linking to one directly works in the usual way.
+
+The current system tiddlers are:
+
+<$list type="system" />
diff --git a/editions/tw5.com/tiddlers/concepts/TiddlerFilters.tid b/editions/tw5.com/tiddlers/concepts/TiddlerFilters.tid
index 3175c87a4..fbdc87886 100644
--- a/editions/tw5.com/tiddlers/concepts/TiddlerFilters.tid
+++ b/editions/tw5.com/tiddlers/concepts/TiddlerFilters.tid
@@ -48,7 +48,7 @@ The operator defaults to `title` if omitted, so `[[HelloThere]]` is equivalent t
 
 The operands available with the `is` operator are:
 
-* ''shadow'': selects all shadow tiddlers
+* ''system'': selects all system tiddlers
 * ''current'': selects the current ContextTiddler
 
 ! Runs
diff --git a/editions/tw5.com/tiddlers/editions/TiddlyWiki5_Static_Site_Generation.tid b/editions/tw5.com/tiddlers/editions/TiddlyWiki5_Static_Site_Generation.tid
index c2aa865b2..e2e004a17 100644
--- a/editions/tw5.com/tiddlers/editions/TiddlyWiki5_Static_Site_Generation.tid
+++ b/editions/tw5.com/tiddlers/editions/TiddlyWiki5_Static_Site_Generation.tid
@@ -12,6 +12,6 @@ The included `bld.sh` script includes these commands that are involved in genera
 ```
 --savetiddler $:/core/templates/static.template.html $TW5_BUILD_OUTPUT/static.html text/plain \
 --savetiddler $:/core/templates/static.template.css $TW5_BUILD_OUTPUT/static/static.css text/plain \
---savetiddlers [!is[shadow]] $:/core/templates/static.tiddler.html $TW5_BUILD_OUTPUT/static text/plain \
+--savetiddlers [!is[system]] $:/core/templates/static.tiddler.html $TW5_BUILD_OUTPUT/static text/plain \
 ```
 The first SaveTiddlerCommand saves the static version of the DefaulTiddlers, the second saves the stylesheet, and the final SaveTiddlersCommand generates the HTML representations of individual tiddlers.
diff --git a/editions/tw5.com/tiddlers/mechanisms/BootMechanism.tid b/editions/tw5.com/tiddlers/mechanisms/BootMechanism.tid
index 023e1a3db..37a8c17cb 100644
--- a/editions/tw5.com/tiddlers/mechanisms/BootMechanism.tid
+++ b/editions/tw5.com/tiddlers/mechanisms/BootMechanism.tid
@@ -30,7 +30,7 @@ Each module is an ordinary `node.js`-style module, using the `require()` functio
 
 In the browser, `core/boot.js` is packed into a template HTML file that contains the following elements in order:
 
-* Ordinary and shadow tiddlers, packed as HTML `<DIV>` elements
+* Ordinary and system tiddlers, packed as HTML `<DIV>` elements
 * `core/bootprefix.js`, containing a few lines to set up the plugin environment
 * JavaScript modules, packed as HTML `<SCRIPT>` blocks
 * `core/boot.js`, containing the boot kernel
diff --git a/editions/tw5dropbox/appwiki/wiki/AllTiddlers.tid b/editions/tw5dropbox/appwiki/wiki/AllTiddlers.tid
index 67161113b..455bd2266 100644
--- a/editions/tw5dropbox/appwiki/wiki/AllTiddlers.tid
+++ b/editions/tw5dropbox/appwiki/wiki/AllTiddlers.tid
@@ -3,4 +3,4 @@ tags: navigation
 
 Current tiddlers:
 
-{{{ [!is[shadow]sort[title]] }} <div><<view title link>></div> }
+{{{ [!is[system]sort[title]] }} <div><<view title link>></div> }
diff --git a/editions/tw5dropbox/appwiki/wiki/index.template.html.tid b/editions/tw5dropbox/appwiki/wiki/index.template.html.tid
index bb89da615..5d31f07c5 100644
--- a/editions/tw5dropbox/appwiki/wiki/index.template.html.tid
+++ b/editions/tw5dropbox/appwiki/wiki/index.template.html.tid
@@ -20,7 +20,7 @@ type: text/vnd.tiddlywiki-html
 <link rel="stylesheet" href="//dl-web.dropbox.com/spa/4f6lw6nhu5zn5pr/TiddlyWiki5/public/styles.css" type="text/css" />
 </head>
 <body>
-<div id="shadowArea" style="display:none;">
+<div id="systemArea" style="display:none;">
 <<serialize "[[$:/plugins/dropbox/Index]]" application/x-tiddler-html-div>>
 </div>
 </body>
diff --git a/editions/tw5dropbox/appwiki/wiki/styles.template.css.tid b/editions/tw5dropbox/appwiki/wiki/styles.template.css.tid
index 4f5027b0f..f3961a010 100644
--- a/editions/tw5dropbox/appwiki/wiki/styles.template.css.tid
+++ b/editions/tw5dropbox/appwiki/wiki/styles.template.css.tid
@@ -2,4 +2,4 @@ title: $:/plugins/dropbox/styles.template.css
 type: text/vnd.tiddlywiki-html
 
 /* utf8beacon: éçñøåá— */
-<<serialize "[is[shadow]type[text/css]]" text/plain>>
+<<serialize "[is[system]type[text/css]]" text/plain>>
diff --git a/editions/tw5dropbox/appwiki/wiki/tw5dropbox.template.js.tid b/editions/tw5dropbox/appwiki/wiki/tw5dropbox.template.js.tid
index d3e257c77..ad90fac2d 100644
--- a/editions/tw5dropbox/appwiki/wiki/tw5dropbox.template.js.tid
+++ b/editions/tw5dropbox/appwiki/wiki/tw5dropbox.template.js.tid
@@ -2,9 +2,9 @@ title: $:/plugins/dropbox/tw5dropbox.template.js
 type: text/vnd.tiddlywiki-html
 
 /* utf8beacon: éçñøåá— */
-<<serialize "[is[shadow]type[application/javascript]library[yes]] -[[$:/library/sjcl.js]]" text/plain>>
+<<serialize "[is[system]type[application/javascript]library[yes]] -[[$:/library/sjcl.js]]" text/plain>>
 <<serialize "$:/core/bootprefix.js" text/plain>>
-<<serialize "[is[shadow]] -[type[text/css]] -[type[application/javascript]has[module-type]] -[type[application/javascript]library[yes]] -[[$:/core/boot.js]] -[[$:/core/bootprefix.js]]" application/x-tiddler-javascript>>
-<<serialize "[is[shadow]type[application/javascript]has[module-type]]" application/x-tiddler-module-plain>>
+<<serialize "[is[system]] -[type[text/css]] -[type[application/javascript]has[module-type]] -[type[application/javascript]library[yes]] -[[$:/core/boot.js]] -[[$:/core/bootprefix.js]]" application/x-tiddler-javascript>>
+<<serialize "[is[system]type[application/javascript]has[module-type]]" application/x-tiddler-module-plain>>
 <<serialize "$:/core/boot.js" text/plain>>
 
diff --git a/editions/tw5dropbox/mainwiki/wiki/index.template.html.tid b/editions/tw5dropbox/mainwiki/wiki/index.template.html.tid
index 4984575c5..068fe72e6 100644
--- a/editions/tw5dropbox/mainwiki/wiki/index.template.html.tid
+++ b/editions/tw5dropbox/mainwiki/wiki/index.template.html.tid
@@ -25,7 +25,7 @@ type: text/vnd.tiddlywiki-html
 <body>
 <!----------- Static styles ----------->
 <div id="styleArea">
-<<serialize "[is[shadow]type[text/css]]" application/x-tiddler-css>>
+<<serialize "[is[system]type[text/css]]" application/x-tiddler-css>>
 </div>
 <!----------- Static content for Google and browsers without JavaScript ----------->
 <noscript>
@@ -33,9 +33,9 @@ type: text/vnd.tiddlywiki-html
 <<serialize "$:/templates/StaticContent" text/html>>
 </div>
 </noscript>
-<!----------- Miscellaneous shadow tiddlers ----------->
-<div id="shadowArea" style="display:none;">
-<<serialize "[is[shadow]] -[type[text/css]] -[type[application/javascript]has[module-type]] -[type[application/javascript]library[yes]] -[[$:/core/boot.js]] -[[$:/core/bootprefix.js]]" application/x-tiddler-html-div>>
+<!----------- Miscellaneous system tiddlers ----------->
+<div id="systemArea" style="display:none;">
+<<serialize "[is[system]] -[type[text/css]] -[type[application/javascript]has[module-type]] -[type[application/javascript]library[yes]] -[[$:/core/boot.js]] -[[$:/core/bootprefix.js]]" application/x-tiddler-html-div>>
 </div>
 <!----------- Ordinary tiddlers ----------->
 <div id="storeArea" style="display:none;">
@@ -44,7 +44,7 @@ type: text/vnd.tiddlywiki-html
 <!----------- Library modules ----------->
 <div id="libraryModules" style="display:none;">
 <<serialize "[[$:/core/lib/jquery.min.js]]" application/x-tiddler-library>>
-<<serialize "[is[shadow]type[application/javascript]library[yes]] -[[$:/core/lib/jquery.min.js]]" application/x-tiddler-library>>
+<<serialize "[is[system]type[application/javascript]library[yes]] -[[$:/core/lib/jquery.min.js]]" application/x-tiddler-library>>
 </div>
 <!----------- Boot kernel prologue ----------->
 <div id="bootKernelPrefix" style="display:none;">
@@ -52,7 +52,7 @@ type: text/vnd.tiddlywiki-html
 </div>
 <!----------- Plugin modules ----------->
 <div id="modules" style="display:none;">
-<<serialize "[is[shadow]type[application/javascript]has[module-type]]" application/x-tiddler-module>>
+<<serialize "[is[system]type[application/javascript]has[module-type]]" application/x-tiddler-module>>
 </div>
 <!----------- Boot kernel ----------->
 <div id="bootKernel" style="display:none;">
diff --git a/plugins/tiddlywiki/dropbox-app/dropbox-app.js b/plugins/tiddlywiki/dropbox-app/dropbox-app.js
index 73cbcda3f..8d953ff00 100644
--- a/plugins/tiddlywiki/dropbox-app/dropbox-app.js
+++ b/plugins/tiddlywiki/dropbox-app/dropbox-app.js
@@ -17,7 +17,7 @@ exports.startup = function(loggedIn) {
 	var index = $tw.wiki.getTiddlerData($tw.plugins.dropbox.titleTiddlerIndex);
 	if(index) {
 		$tw.wiki.addTiddlers(index.tiddlers);
-		$tw.wiki.addTiddlers(index.shadows,true);
+		$tw.wiki.addTiddlers(index.systemTiddlers,true);
 		$tw.plugins.dropbox.fileInfo = index.fileInfo;
 	}
 	if(loggedIn) {
diff --git a/plugins/tiddlywiki/dropbox/dropbox.js b/plugins/tiddlywiki/dropbox/dropbox.js
index 97380ed13..292a65a95 100644
--- a/plugins/tiddlywiki/dropbox/dropbox.js
+++ b/plugins/tiddlywiki/dropbox/dropbox.js
@@ -26,7 +26,7 @@ $tw.plugins.dropbox = {
 	client: null, // Dropbox.js client object
 	fileInfo: {}, // Hashmap of each filename as retrieved from Dropbox (including .meta files): {versionTag:,title:}
 	titleInfo: {}, // Hashmap of each tiddler title retrieved from Dropbox to filename
-	// Titles of various shadow tiddlers used by the plugin
+	// Titles of various system tiddlers used by the plugin
 	titleIsLoggedIn: "$:/plugins/dropbox/IsLoggedIn",
 	titleUserName: "$:/plugins/dropbox/UserName",
 	titlePublicAppUrl: "$:/plugins/dropbox/PublicAppUrl",
@@ -385,11 +385,11 @@ Save the index file
 */
 $tw.plugins.dropbox.saveTiddlerIndex = function(path,callback) {
 	// Get the tiddler index information
-	var index = {tiddlers: [],shadows: [], fileInfo: $tw.plugins.dropbox.fileInfo};
+	var index = {tiddlers: [],systemTiddlers: [], fileInfo: $tw.plugins.dropbox.fileInfo};
 	// First all the tiddlers
 	$tw.wiki.forEachTiddler(function(title,tiddler) {
-		if(tiddler.isShadow) {
-			index.shadows.push(tiddler.fields);
+		if(tiddler.isSystem) {
+			index.systemTiddlers.push(tiddler.fields);
 		} else {
 			index.tiddlers.push(tiddler.fields);
 		}
diff --git a/readme.md b/readme.md
index 6cf6cdafa..fc28ccefe 100644
--- a/readme.md
+++ b/readme.md
@@ -71,9 +71,9 @@ Dump the titles of the tiddlers in the wiki store </p><pre>
 dump tiddler</h3><p>
 Dump the fields of an individual tiddler </p><pre>
 --dump tiddler &lt;title&gt;</pre><h3 class=''>
-dump shadows</h3><p>
-Dump the titles of the shadow tiddlers in the wiki store </p><pre>
---dump shadows</pre><h3 class=''>
+dump system</h3><p>
+Dump the titles of the system tiddlers in the wiki store </p><pre>
+--dump systems</pre><h3 class=''>
 dump config</h3><p>
 Dump the current core configuration </p><pre>
 --dump config</pre></div></div></span></div><div class='tw-list-element'>
@@ -115,7 +115,7 @@ text/html</code>) and extension (defaults to <code>
 .html</code>).</p><pre>
 --savetiddlers &lt;filter&gt; &lt;template&gt; &lt;pathname&gt; [&lt;type&gt;] [&lt;extension&gt;]</pre><p>
 For example:</p><pre>
---savetiddlers [!is[shadow]] $:/core/templates/static.tiddler.html ./static text/plain</pre></div></div></span></div><div class='tw-list-element'>
+--savetiddlers [!is[system]] $:/core/templates/static.tiddler.html ./static text/plain</pre></div></div></span></div><div class='tw-list-element'>
 <span class='tw-transclude'>
 <h3 class=''>
 <span class='tw-view-link'>