diff --git a/editions/server/tiddlers/test-defer/misc.card-and-board-games.gridcannon.md b/editions/server-defer/tiddlers/test-defer/misc.card-and-board-games.gridcannon.md
similarity index 100%
rename from editions/server/tiddlers/test-defer/misc.card-and-board-games.gridcannon.md
rename to editions/server-defer/tiddlers/test-defer/misc.card-and-board-games.gridcannon.md
diff --git a/editions/server/tiddlers/test-defer/tiddlywiki.files b/editions/server-defer/tiddlers/test-defer/tiddlywiki.files
similarity index 100%
rename from editions/server/tiddlers/test-defer/tiddlywiki.files
rename to editions/server-defer/tiddlers/test-defer/tiddlywiki.files
diff --git a/editions/server-defer/tiddlywiki.info b/editions/server-defer/tiddlywiki.info
new file mode 100644
index 000000000..d477b904e
--- /dev/null
+++ b/editions/server-defer/tiddlywiki.info
@@ -0,0 +1,23 @@
+{
+	"description": "Basic client-server edition, showing off deferred loading",
+	"plugins": [
+		"tiddlywiki/tiddlyweb",
+		"tiddlywiki/filesystem",
+		"tiddlywiki/highlight",
+		"tiddlywiki/markdown",
+		"cyberfoxar/frontmatter-tiddler"
+	],
+	"themes": [
+		"tiddlywiki/vanilla",
+		"tiddlywiki/snowwhite"
+	],
+	"build": {
+		"index": [
+			"--render","$:/plugins/tiddlywiki/tiddlyweb/save/offline","index.html","text/plain"],
+		"static": [
+			"--render","$:/core/templates/static.template.html","static.html","text/plain",
+			"--render","$:/core/templates/alltiddlers.template.html","alltiddlers.html","text/plain",
+			"--render","[!is[system]]","[encodeuricomponent[]addprefix[static/]addsuffix[.html]]","text/plain","$:/core/templates/static.tiddler.html",
+			"--render","$:/core/templates/static.template.css","static/static.css","text/plain"]
+	}
+}
\ No newline at end of file
diff --git a/editions/server/tiddlywiki.info b/editions/server/tiddlywiki.info
index 6371786f5..e35ff95f8 100644
--- a/editions/server/tiddlywiki.info
+++ b/editions/server/tiddlywiki.info
@@ -3,9 +3,7 @@
 	"plugins": [
 		"tiddlywiki/tiddlyweb",
 		"tiddlywiki/filesystem",
-		"tiddlywiki/highlight",
-		"tiddlywiki/markdown",
-		"cyberfoxar/fm-md"
+		"tiddlywiki/highlight"
 	],
 	"themes": [
 		"tiddlywiki/vanilla",