diff --git a/editions/de-AT-server/tiddlywiki.info b/editions/de-AT-server/tiddlywiki.info
index 59780efac..12c109150 100644
--- a/editions/de-AT-server/tiddlywiki.info
+++ b/editions/de-AT-server/tiddlywiki.info
@@ -2,7 +2,8 @@
 	"description": "Server configuration of the German (Österreich) edition",
 	"plugins": [
 		"tiddlywiki/tiddlyweb",
-		"tiddlywiki/filesystem"
+		"tiddlywiki/filesystem",
+		"tiddlywiki/highlight"
 	],
 	"themes": [
 		"tiddlywiki/vanilla",
diff --git a/editions/de-AT/tiddlywiki.info b/editions/de-AT/tiddlywiki.info
index a04bf3087..57d062d9a 100755
--- a/editions/de-AT/tiddlywiki.info
+++ b/editions/de-AT/tiddlywiki.info
@@ -5,9 +5,10 @@
 	"themes": [
 		"tiddlywiki/vanilla",
 		"tiddlywiki/snowwhite",
-		"tiddlywiki/nighttime",
 		"tiddlywiki/starlight",
+		"tiddlywiki/seamless",
 		"tiddlywiki/centralised",
+		"tiddlywiki/tight",
 		"tiddlywiki/readonly"
 	],
 	"languages": [
@@ -19,7 +20,8 @@
 		"index": [
 			"--rendertiddler","$:/core/save/all","index.html","text/plain"],
 		"empty": [
-			"--rendertiddler","$:/editions/de-AT-DE/download-empty","empty.html","text/plain"],
+			"--rendertiddler","$:/editions/de-AT-DE/download-empty","empty.html","text/plain",
+			"--rendertiddler","$:/editions/de-AT-DE/download-empty","empty.hta","text/plain"],
 		"favicon": [
 			"--savetiddler","$:/favicon.ico","favicon.ico"],
 		"static": [
@@ -28,4 +30,4 @@
 			"--rendertiddlers","[!is[system]]","$:/core/templates/static.tiddler.html","static","text/plain",
 			"--rendertiddler","$:/core/templates/static.template.css","static/static.css","text/plain"]
 	}
-}
+}
\ No newline at end of file
diff --git a/editions/de-DE/tiddlywiki.info b/editions/de-DE/tiddlywiki.info
index 25c8e32ca..6138d40bb 100755
--- a/editions/de-DE/tiddlywiki.info
+++ b/editions/de-DE/tiddlywiki.info
@@ -5,9 +5,10 @@
 	"themes": [
 		"tiddlywiki/vanilla",
 		"tiddlywiki/snowwhite",
-		"tiddlywiki/nighttime",
 		"tiddlywiki/starlight",
+		"tiddlywiki/seamless",
 		"tiddlywiki/centralised",
+		"tiddlywiki/tight",
 		"tiddlywiki/readonly"
 	],
 	"languages": [
@@ -22,7 +23,8 @@
 		"index": [
 			"--rendertiddler","$:/core/save/all","index.html","text/plain"],
 		"empty": [
-			"--rendertiddler","$:/editions/de-AT-DE/download-empty","empty.html","text/plain"],
+			"--rendertiddler","$:/editions/de-AT-DE/download-empty","empty.html","text/plain",
+			"--rendertiddler","$:/editions/de-AT-DE/download-empty","empty.hta","text/plain"],
 		"favicon": [
 			"--savetiddler","$:/favicon.ico","favicon.ico"],
 		"static": [
@@ -31,4 +33,4 @@
 			"--rendertiddlers","[!is[system]]","$:/core/templates/static.tiddler.html","static","text/plain",
 			"--rendertiddler","$:/core/templates/static.template.css","static/static.css","text/plain"]
 	}
-}
+}
\ No newline at end of file
diff --git a/editions/fr-FR-server/tiddlywiki.info b/editions/fr-FR-server/tiddlywiki.info
index c75481757..464f7e4e6 100644
--- a/editions/fr-FR-server/tiddlywiki.info
+++ b/editions/fr-FR-server/tiddlywiki.info
@@ -1,13 +1,14 @@
 {
     "description": "Configuration en mode serveur de l'édition fr-FR",
-    "plugins": [
-        "tiddlywiki/tiddlyweb",
-        "tiddlywiki/filesystem",
-        "tiddlywiki/highlight"
-    ],
-    "themes": [
-        "tiddlywiki/vanilla"
-    ],
+	"plugins": [
+		"tiddlywiki/tiddlyweb",
+		"tiddlywiki/filesystem",
+		"tiddlywiki/highlight"
+	],
+	"themes": [
+		"tiddlywiki/vanilla",
+		"tiddlywiki/snowwhite"
+	],
     "includeWikis": [
         "../fr-FR"
     ],
diff --git a/editions/fr-FR/tiddlers/system/download-empty-button.tid b/editions/fr-FR/tiddlers/system/download-empty-button.tid
index 4c85fb20c..ac59f51b6 100644
--- a/editions/fr-FR/tiddlers/system/download-empty-button.tid
+++ b/editions/fr-FR/tiddlers/system/download-empty-button.tid
@@ -3,4 +3,4 @@ title: $:/editions/fr-FR/snippets/download-empty-button
 <$button class="tc-btn-big-green">
 <$action-sendmessage $message="tm-download-file" $param="$:/editions/fr-FR/download-empty" filename="empty_fr.html"/>
 Télécharger un wiki vide {{$:/core/images/save-button}}
-</$button>
+</$button>
\ No newline at end of file
diff --git a/editions/fr-FR/tiddlywiki.info b/editions/fr-FR/tiddlywiki.info
index 31ae42437..5ba89354b 100644
--- a/editions/fr-FR/tiddlywiki.info
+++ b/editions/fr-FR/tiddlywiki.info
@@ -5,9 +5,10 @@
 	"themes": [
 		"tiddlywiki/vanilla",
 		"tiddlywiki/snowwhite",
-		"tiddlywiki/nighttime",
 		"tiddlywiki/starlight",
+		"tiddlywiki/seamless",
 		"tiddlywiki/centralised",
+		"tiddlywiki/tight",
 		"tiddlywiki/readonly"
 	],
 	"languages": [
@@ -22,10 +23,12 @@
 		"empty": [
 			"--rendertiddler","$:/editions/fr-FR/download-empty","empty.html","text/plain",
 			"--rendertiddler","$:/editions/fr-FR/download-empty","empty.hta","text/plain"],
+		"favicon": [
+			"--savetiddler","$:/favicon.ico","favicon.ico"],
 		"static": [
 			"--rendertiddler","$:/core/templates/static.template.html","static.html","text/plain",
 			"--rendertiddler","$:/core/templates/alltiddlers.template.html","alltiddlers.html","text/plain",
 			"--rendertiddlers","[!is[system]]","$:/core/templates/static.tiddler.html","static","text/plain",
 			"--rendertiddler","$:/core/templates/static.template.css","static/static.css","text/plain"]
 	}
-}
+}
\ No newline at end of file
diff --git a/editions/ko-KR/tiddlers/system/download-empty-button.tid b/editions/ko-KR/tiddlers/system/download-empty-button.tid
index d85cf86ba..f11595890 100644
--- a/editions/ko-KR/tiddlers/system/download-empty-button.tid
+++ b/editions/ko-KR/tiddlers/system/download-empty-button.tid
@@ -3,4 +3,4 @@ title: $:/editions/ko-KR/snippets/download-empty-button
 <$button class="tc-btn-big-green">
 <$action-sendmessage $message="tm-download-file" $param="$:/editions/ko-KR/download-empty" filename="empty_ko.html"/>
 빈 위키 다운로드 {{$:/core/images/save-button}}
-</$button>
+</$button>
\ No newline at end of file
diff --git a/editions/ko-KR/tiddlywiki.info b/editions/ko-KR/tiddlywiki.info
index 73e817d43..920fc9c5c 100644
--- a/editions/ko-KR/tiddlywiki.info
+++ b/editions/ko-KR/tiddlywiki.info
@@ -8,6 +8,7 @@
 		"tiddlywiki/starlight",
 		"tiddlywiki/seamless",
 		"tiddlywiki/centralised",
+		"tiddlywiki/tight",
 		"tiddlywiki/readonly"
 	],
 	"languages": [
@@ -30,4 +31,4 @@
 			"--rendertiddlers","[!is[system]]","$:/core/templates/static.tiddler.html","static","text/plain",
 			"--rendertiddler","$:/core/templates/static.template.css","static/static.css","text/plain"]
 	}
-}
+}
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlywiki.info b/editions/tw5.com/tiddlywiki.info
index 1d6574311..465c66fe3 100644
--- a/editions/tw5.com/tiddlywiki.info
+++ b/editions/tw5.com/tiddlywiki.info
@@ -10,7 +10,6 @@
 	"themes": [
 		"tiddlywiki/vanilla",
 		"tiddlywiki/snowwhite",
-		"tiddlywiki/nighttime",
 		"tiddlywiki/starlight",
 		"tiddlywiki/seamless",
 		"tiddlywiki/centralised",
diff --git a/editions/zh-Hans/tiddlers/language.tid b/editions/zh-Hans/tiddlers/system/language.tid
similarity index 100%
rename from editions/zh-Hans/tiddlers/language.tid
rename to editions/zh-Hans/tiddlers/system/language.tid
diff --git a/editions/zh-Hans/tiddlywiki.info b/editions/zh-Hans/tiddlywiki.info
index f584583ad..55db85771 100644
--- a/editions/zh-Hans/tiddlywiki.info
+++ b/editions/zh-Hans/tiddlywiki.info
@@ -8,6 +8,7 @@
 		"tiddlywiki/starlight",
 		"tiddlywiki/seamless",
 		"tiddlywiki/centralised",
+		"tiddlywiki/tight",
 		"tiddlywiki/readonly"
 	],
 	"languages": [
diff --git a/editions/zh-Hant/tiddlers/language.tid b/editions/zh-Hant/tiddlers/system/language.tid
similarity index 100%
rename from editions/zh-Hant/tiddlers/language.tid
rename to editions/zh-Hant/tiddlers/system/language.tid
diff --git a/editions/zh-Hant/tiddlywiki.info b/editions/zh-Hant/tiddlywiki.info
index 26b4e9d89..a6dbc4908 100644
--- a/editions/zh-Hant/tiddlywiki.info
+++ b/editions/zh-Hant/tiddlywiki.info
@@ -8,6 +8,7 @@
 		"tiddlywiki/starlight",
 		"tiddlywiki/seamless",
 		"tiddlywiki/centralised",
+		"tiddlywiki/tight",
 		"tiddlywiki/readonly"
 	],
 	"languages": [