diff --git a/editions/ja-JP/tiddlers/system/download-empty-button.tid b/editions/ja-JP/tiddlers/system/download-empty-button.tid
new file mode 100644
index 000000000..64776551a
--- /dev/null
+++ b/editions/ja-JP/tiddlers/system/download-empty-button.tid
@@ -0,0 +1,6 @@
+title: $:/editions/ja-JP/snippets/download-empty-button
+
+<$button class="tc-btn-big-green">
+<$action-sendmessage $message="tm-download-file" $param="$:/editions/ja-JP/download-empty" filename="empty_ja.html"/>
+空のウィキをダウンロード {{$:/core/images/save-button}}
+</$button>
\ No newline at end of file
diff --git a/editions/ja-JP/tiddlers/system/download-empty.tid b/editions/ja-JP/tiddlers/system/download-empty.tid
new file mode 100644
index 000000000..79b98e462
--- /dev/null
+++ b/editions/ja-JP/tiddlers/system/download-empty.tid
@@ -0,0 +1,10 @@
+title: $:/editions/ja-JP/download-empty
+type: text/vnd.tiddlywiki
+
+\define saveTiddlerFilter()
+[[$:/core]] [[$:/isEncrypted]] [[$:/themes/tiddlywiki/snowwhite]] [[$:/themes/tiddlywiki/vanilla]] [[$:/languages/ja-JP]] [[$:/language]] -[[$:/boot/boot.css]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] +[sort[title]]
+\end
+\define savingEmpty()
+yes
+\end
+{{$:/core/templates/tiddlywiki5.html}}
diff --git a/editions/ja-JP/tiddlers/language.tid b/editions/ja-JP/tiddlers/system/language.tid
similarity index 51%
rename from editions/ja-JP/tiddlers/language.tid
rename to editions/ja-JP/tiddlers/system/language.tid
index d79eee390..2ac925395 100644
--- a/editions/ja-JP/tiddlers/language.tid
+++ b/editions/ja-JP/tiddlers/system/language.tid
@@ -1,3 +1,3 @@
 title: $:/language
 
-$:/languages/ja-JP
+$:/languages/ja-JP
\ No newline at end of file
diff --git a/editions/ja-JP/tiddlywiki.info b/editions/ja-JP/tiddlywiki.info
index a0ff6b72f..45ca9a28b 100644
--- a/editions/ja-JP/tiddlywiki.info
+++ b/editions/ja-JP/tiddlywiki.info
@@ -1,21 +1,34 @@
 {
-	"description": "Japanese edition",
+	"description": "Japanese (Japan) edition",
 	"plugins": [
 	],
 	"themes": [
 		"tiddlywiki/vanilla",
 		"tiddlywiki/snowwhite",
-		"tiddlywiki/nighttime",
 		"tiddlywiki/starlight",
 		"tiddlywiki/seamless",
 		"tiddlywiki/centralised",
+		"tiddlywiki/tight",
 		"tiddlywiki/readonly"
 	],
 	"languages": [
 		"ja-JP"
 	],
+    "includeWikis": [
+        {"path": "../tw5.com", "read-only": true}
+    ],
 	"build": {
 		"index": [
-			"--rendertiddler","$:/core/save/all","ja-jp-demo.html","text/plain"]
+			"--rendertiddler","$:/core/save/all","index.html","text/plain"],
+		"empty": [
+			"--rendertiddler","$:/editions/ja-JP/download-empty","empty.html","text/plain",
+			"--rendertiddler","$:/editions/ja-JP/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