diff --git a/editions/de-AT-DE/tiddlers/icon/AT-DE-CH-favicon.png b/editions/de-AT-DE/tiddlers/icon/AT-DE-CH-favicon.png
deleted file mode 100644
index 62d04831f..000000000
Binary files a/editions/de-AT-DE/tiddlers/icon/AT-DE-CH-favicon.png and /dev/null differ
diff --git a/editions/de-AT-DE/tiddlers/icon/AT-DE-CH-favicon.png.meta b/editions/de-AT-DE/tiddlers/icon/AT-DE-CH-favicon.png.meta
deleted file mode 100644
index 2f3e81713..000000000
--- a/editions/de-AT-DE/tiddlers/icon/AT-DE-CH-favicon.png.meta
+++ /dev/null
@@ -1,2 +0,0 @@
-title: $:/favicon.ico
-type: image/x-icon
diff --git a/editions/de-AT-DE-server/tiddlers/system/favicon.ico b/editions/de-AT-server/tiddlers/system/favicon.ico
similarity index 100%
rename from editions/de-AT-DE-server/tiddlers/system/favicon.ico
rename to editions/de-AT-server/tiddlers/system/favicon.ico
diff --git a/editions/de-AT-DE-server/tiddlers/system/favicon.ico.meta b/editions/de-AT-server/tiddlers/system/favicon.ico.meta
similarity index 100%
rename from editions/de-AT-DE-server/tiddlers/system/favicon.ico.meta
rename to editions/de-AT-server/tiddlers/system/favicon.ico.meta
diff --git a/editions/de-AT-DE-server/tiddlywiki.info b/editions/de-AT-server/tiddlywiki.info
similarity index 60%
rename from editions/de-AT-DE-server/tiddlywiki.info
rename to editions/de-AT-server/tiddlywiki.info
index b2b432bb8..8478e81eb 100644
--- a/editions/de-AT-DE-server/tiddlywiki.info
+++ b/editions/de-AT-server/tiddlywiki.info
@@ -7,10 +7,15 @@
 		"tiddlywiki/vanilla",
 		"tiddlywiki/snowwhite"
 	],
+	"languages": [
+		"en-GB",
+		"de-AT",
+		"de-DE"
+	],
 	"includeWikis": [
-		"../de-AT-DE"
+		"../de-AT"
 	],
 	"config": {
-		"default-tiddler-location": "../de-AT-DE/tiddlers"
+		"default-tiddler-location": "../de-AT/tiddlers"
 	}
 }
diff --git a/editions/de-AT-DE/tiddlers/Stil und CSS Klassen in WikiText.tid b/editions/de-AT/tiddlers/Stil und CSS Klassen in WikiText.tid
similarity index 100%
rename from editions/de-AT-DE/tiddlers/Stil und CSS Klassen in WikiText.tid
rename to editions/de-AT/tiddlers/Stil und CSS Klassen in WikiText.tid
diff --git a/editions/de-AT-DE/tiddlers/Transklusion in WikiText.tid b/editions/de-AT/tiddlers/Transklusion in WikiText.tid
similarity index 100%
rename from editions/de-AT-DE/tiddlers/Transklusion in WikiText.tid
rename to editions/de-AT/tiddlers/Transklusion in WikiText.tid
diff --git a/editions/de-AT-DE/tiddlers/Was geschah mit dem alten TiddlyWiki.tid b/editions/de-AT/tiddlers/Was geschah mit dem alten TiddlyWiki.tid
similarity index 100%
rename from editions/de-AT-DE/tiddlers/Was geschah mit dem alten TiddlyWiki.tid
rename to editions/de-AT/tiddlers/Was geschah mit dem alten TiddlyWiki.tid
diff --git a/editions/de-AT-DE/tiddlers/Willkommen.tid b/editions/de-AT/tiddlers/Willkommen.tid
similarity index 100%
rename from editions/de-AT-DE/tiddlers/Willkommen.tid
rename to editions/de-AT/tiddlers/Willkommen.tid
diff --git a/editions/de-AT-DE/tiddlers/bilder/AT-DE-CH-favicon.png b/editions/de-AT/tiddlers/bilder/AT-DE-CH-favicon.png
similarity index 100%
rename from editions/de-AT-DE/tiddlers/bilder/AT-DE-CH-favicon.png
rename to editions/de-AT/tiddlers/bilder/AT-DE-CH-favicon.png
diff --git a/editions/de-AT-DE/tiddlers/bilder/AT-DE-CH-favicon.png.meta b/editions/de-AT/tiddlers/bilder/AT-DE-CH-favicon.png.meta
similarity index 100%
rename from editions/de-AT-DE/tiddlers/bilder/AT-DE-CH-favicon.png.meta
rename to editions/de-AT/tiddlers/bilder/AT-DE-CH-favicon.png.meta
diff --git a/editions/de-AT-DE/tiddlers/bilder/Motovun Jack.jpg b/editions/de-AT/tiddlers/bilder/Motovun Jack.jpg
similarity index 100%
rename from editions/de-AT-DE/tiddlers/bilder/Motovun Jack.jpg
rename to editions/de-AT/tiddlers/bilder/Motovun Jack.jpg
diff --git a/editions/de-AT-DE/tiddlers/bilder/Motovun Jack.jpg.meta b/editions/de-AT/tiddlers/bilder/Motovun Jack.jpg.meta
similarity index 100%
rename from editions/de-AT-DE/tiddlers/bilder/Motovun Jack.jpg.meta
rename to editions/de-AT/tiddlers/bilder/Motovun Jack.jpg.meta
diff --git a/editions/de-AT-DE/tiddlers/howto/Installation von TiddlyWiki mit Node.js.tid b/editions/de-AT/tiddlers/howto/Installation von TiddlyWiki mit Node.js.tid
similarity index 100%
rename from editions/de-AT-DE/tiddlers/howto/Installation von TiddlyWiki mit Node.js.tid
rename to editions/de-AT/tiddlers/howto/Installation von TiddlyWiki mit Node.js.tid
diff --git a/editions/de-AT-DE/tiddlers/howto/Installation.tid b/editions/de-AT/tiddlers/howto/Installation.tid
similarity index 100%
rename from editions/de-AT-DE/tiddlers/howto/Installation.tid
rename to editions/de-AT/tiddlers/howto/Installation.tid
diff --git a/editions/de-AT-DE/tiddlers/howto/Speichern auf TiddlySpot.tid b/editions/de-AT/tiddlers/howto/Speichern auf TiddlySpot.tid
similarity index 100%
rename from editions/de-AT-DE/tiddlers/howto/Speichern auf TiddlySpot.tid
rename to editions/de-AT/tiddlers/howto/Speichern auf TiddlySpot.tid
diff --git a/editions/de-AT-DE/tiddlers/howto/Speichern mit Android.tid b/editions/de-AT/tiddlers/howto/Speichern mit Android.tid
similarity index 100%
rename from editions/de-AT-DE/tiddlers/howto/Speichern mit Android.tid
rename to editions/de-AT/tiddlers/howto/Speichern mit Android.tid
diff --git a/editions/de-AT-DE/tiddlers/howto/Speichern mit Chrome.tid b/editions/de-AT/tiddlers/howto/Speichern mit Chrome.tid
similarity index 100%
rename from editions/de-AT-DE/tiddlers/howto/Speichern mit Chrome.tid
rename to editions/de-AT/tiddlers/howto/Speichern mit Chrome.tid
diff --git a/editions/de-AT-DE/tiddlers/howto/Speichern mit Safari.tid b/editions/de-AT/tiddlers/howto/Speichern mit Safari.tid
similarity index 100%
rename from editions/de-AT-DE/tiddlers/howto/Speichern mit Safari.tid
rename to editions/de-AT/tiddlers/howto/Speichern mit Safari.tid
diff --git a/editions/de-AT-DE/tiddlers/howto/Speichern mit TiddlyFox - Android.tid b/editions/de-AT/tiddlers/howto/Speichern mit TiddlyFox - Android.tid
similarity index 100%
rename from editions/de-AT-DE/tiddlers/howto/Speichern mit TiddlyFox - Android.tid
rename to editions/de-AT/tiddlers/howto/Speichern mit TiddlyFox - Android.tid
diff --git a/editions/de-AT-DE/tiddlers/howto/Speichern mit TiddlyFox.tid b/editions/de-AT/tiddlers/howto/Speichern mit TiddlyFox.tid
similarity index 100%
rename from editions/de-AT-DE/tiddlers/howto/Speichern mit TiddlyFox.tid
rename to editions/de-AT/tiddlers/howto/Speichern mit TiddlyFox.tid
diff --git a/editions/de-AT-DE/tiddlers/howto/Speichern mit TiddlyIE.tid b/editions/de-AT/tiddlers/howto/Speichern mit TiddlyIE.tid
similarity index 100%
rename from editions/de-AT-DE/tiddlers/howto/Speichern mit TiddlyIE.tid
rename to editions/de-AT/tiddlers/howto/Speichern mit TiddlyIE.tid
diff --git a/editions/de-AT-DE/tiddlers/howto/Speichern mit Verschlusselung.tid b/editions/de-AT/tiddlers/howto/Speichern mit Verschlusselung.tid
similarity index 100%
rename from editions/de-AT-DE/tiddlers/howto/Speichern mit Verschlusselung.tid
rename to editions/de-AT/tiddlers/howto/Speichern mit Verschlusselung.tid
diff --git a/editions/de-AT-DE/tiddlers/howto/Speichern mit iPad_iPhone.tid b/editions/de-AT/tiddlers/howto/Speichern mit iPad_iPhone.tid
similarity index 100%
rename from editions/de-AT-DE/tiddlers/howto/Speichern mit iPad_iPhone.tid
rename to editions/de-AT/tiddlers/howto/Speichern mit iPad_iPhone.tid
diff --git a/editions/de-AT-DE/tiddlers/howto/TiddlyWiki mit Node.js.tid b/editions/de-AT/tiddlers/howto/TiddlyWiki mit Node.js.tid
similarity index 100%
rename from editions/de-AT-DE/tiddlers/howto/TiddlyWiki mit Node.js.tid
rename to editions/de-AT/tiddlers/howto/TiddlyWiki mit Node.js.tid
diff --git a/editions/de-AT-DE/tiddlers/howto/TiddlyWiki und TiddlyDesktop.tid b/editions/de-AT/tiddlers/howto/TiddlyWiki und TiddlyDesktop.tid
similarity index 100%
rename from editions/de-AT-DE/tiddlers/howto/TiddlyWiki und TiddlyDesktop.tid
rename to editions/de-AT/tiddlers/howto/TiddlyWiki und TiddlyDesktop.tid
diff --git a/editions/de-AT-DE/tiddlers/howto/Windows HTA Hack.tid b/editions/de-AT/tiddlers/howto/Windows HTA Hack.tid
similarity index 100%
rename from editions/de-AT-DE/tiddlers/howto/Windows HTA Hack.tid
rename to editions/de-AT/tiddlers/howto/Windows HTA Hack.tid
diff --git a/editions/de-AT-DE/tiddlers/intro/ErsteSchritte - Android.tid b/editions/de-AT/tiddlers/intro/ErsteSchritte - Android.tid
similarity index 100%
rename from editions/de-AT-DE/tiddlers/intro/ErsteSchritte - Android.tid
rename to editions/de-AT/tiddlers/intro/ErsteSchritte - Android.tid
diff --git a/editions/de-AT-DE/tiddlers/intro/ErsteSchritte - Chrome.tid b/editions/de-AT/tiddlers/intro/ErsteSchritte - Chrome.tid
similarity index 100%
rename from editions/de-AT-DE/tiddlers/intro/ErsteSchritte - Chrome.tid
rename to editions/de-AT/tiddlers/intro/ErsteSchritte - Chrome.tid
diff --git a/editions/de-AT-DE/tiddlers/intro/ErsteSchritte - Firefox.tid b/editions/de-AT/tiddlers/intro/ErsteSchritte - Firefox.tid
similarity index 100%
rename from editions/de-AT-DE/tiddlers/intro/ErsteSchritte - Firefox.tid
rename to editions/de-AT/tiddlers/intro/ErsteSchritte - Firefox.tid
diff --git a/editions/de-AT-DE/tiddlers/intro/ErsteSchritte - Internet Explorer.tid b/editions/de-AT/tiddlers/intro/ErsteSchritte - Internet Explorer.tid
similarity index 100%
rename from editions/de-AT-DE/tiddlers/intro/ErsteSchritte - Internet Explorer.tid
rename to editions/de-AT/tiddlers/intro/ErsteSchritte - Internet Explorer.tid
diff --git a/editions/de-AT-DE/tiddlers/intro/ErsteSchritte - Node.js.tid b/editions/de-AT/tiddlers/intro/ErsteSchritte - Node.js.tid
similarity index 100%
rename from editions/de-AT-DE/tiddlers/intro/ErsteSchritte - Node.js.tid
rename to editions/de-AT/tiddlers/intro/ErsteSchritte - Node.js.tid
diff --git a/editions/de-AT-DE/tiddlers/intro/ErsteSchritte - Safari.tid b/editions/de-AT/tiddlers/intro/ErsteSchritte - Safari.tid
similarity index 100%
rename from editions/de-AT-DE/tiddlers/intro/ErsteSchritte - Safari.tid
rename to editions/de-AT/tiddlers/intro/ErsteSchritte - Safari.tid
diff --git a/editions/de-AT-DE/tiddlers/intro/ErsteSchritte - iOS.tid b/editions/de-AT/tiddlers/intro/ErsteSchritte - iOS.tid
similarity index 100%
rename from editions/de-AT-DE/tiddlers/intro/ErsteSchritte - iOS.tid
rename to editions/de-AT/tiddlers/intro/ErsteSchritte - iOS.tid
diff --git a/editions/de-AT-DE/tiddlers/intro/ErsteSchritte.tid b/editions/de-AT/tiddlers/intro/ErsteSchritte.tid
similarity index 100%
rename from editions/de-AT-DE/tiddlers/intro/ErsteSchritte.tid
rename to editions/de-AT/tiddlers/intro/ErsteSchritte.tid
diff --git a/editions/de-AT-DE/tiddlers/konzept/TiddlyWiki Speichern.tid b/editions/de-AT/tiddlers/konzept/TiddlyWiki Speichern.tid
similarity index 100%
rename from editions/de-AT-DE/tiddlers/konzept/TiddlyWiki Speichern.tid
rename to editions/de-AT/tiddlers/konzept/TiddlyWiki Speichern.tid
diff --git a/editions/de-AT-DE/tiddlers/lexikon/AddOn.tid b/editions/de-AT/tiddlers/lexikon/AddOn.tid
similarity index 100%
rename from editions/de-AT-DE/tiddlers/lexikon/AddOn.tid
rename to editions/de-AT/tiddlers/lexikon/AddOn.tid
diff --git a/editions/de-AT-DE/tiddlers/lexikon/AndTidWiki.tid b/editions/de-AT/tiddlers/lexikon/AndTidWiki.tid
similarity index 100%
rename from editions/de-AT-DE/tiddlers/lexikon/AndTidWiki.tid
rename to editions/de-AT/tiddlers/lexikon/AndTidWiki.tid
diff --git a/editions/de-AT-DE/tiddlers/lexikon/CSS Klassen.tid b/editions/de-AT/tiddlers/lexikon/CSS Klassen.tid
similarity index 100%
rename from editions/de-AT-DE/tiddlers/lexikon/CSS Klassen.tid
rename to editions/de-AT/tiddlers/lexikon/CSS Klassen.tid
diff --git a/editions/de-AT-DE/tiddlers/lexikon/DataTiddlers.tid b/editions/de-AT/tiddlers/lexikon/DataTiddlers.tid
similarity index 100%
rename from editions/de-AT-DE/tiddlers/lexikon/DataTiddlers.tid
rename to editions/de-AT/tiddlers/lexikon/DataTiddlers.tid
diff --git a/editions/de-AT-DE/tiddlers/lexikon/FireFox.tid b/editions/de-AT/tiddlers/lexikon/FireFox.tid
similarity index 100%
rename from editions/de-AT-DE/tiddlers/lexikon/FireFox.tid
rename to editions/de-AT/tiddlers/lexikon/FireFox.tid
diff --git a/editions/de-AT-DE/tiddlers/lexikon/Geviertstrich.tid b/editions/de-AT/tiddlers/lexikon/Geviertstrich.tid
similarity index 100%
rename from editions/de-AT-DE/tiddlers/lexikon/Geviertstrich.tid
rename to editions/de-AT/tiddlers/lexikon/Geviertstrich.tid
diff --git a/editions/de-AT-DE/tiddlers/lexikon/GitHub.tid b/editions/de-AT/tiddlers/lexikon/GitHub.tid
similarity index 100%
rename from editions/de-AT-DE/tiddlers/lexikon/GitHub.tid
rename to editions/de-AT/tiddlers/lexikon/GitHub.tid
diff --git a/editions/de-AT-DE/tiddlers/lexikon/Halbgeviertstrich.tid b/editions/de-AT/tiddlers/lexikon/Halbgeviertstrich.tid
similarity index 100%
rename from editions/de-AT-DE/tiddlers/lexikon/Halbgeviertstrich.tid
rename to editions/de-AT/tiddlers/lexikon/Halbgeviertstrich.tid
diff --git a/editions/de-AT-DE/tiddlers/lexikon/Hyperlinks.tid b/editions/de-AT/tiddlers/lexikon/Hyperlinks.tid
similarity index 100%
rename from editions/de-AT-DE/tiddlers/lexikon/Hyperlinks.tid
rename to editions/de-AT/tiddlers/lexikon/Hyperlinks.tid
diff --git a/editions/de-AT-DE/tiddlers/lexikon/JeremyRuston.tid b/editions/de-AT/tiddlers/lexikon/JeremyRuston.tid
similarity index 100%
rename from editions/de-AT-DE/tiddlers/lexikon/JeremyRuston.tid
rename to editions/de-AT/tiddlers/lexikon/JeremyRuston.tid
diff --git a/editions/de-AT-DE/tiddlers/lexikon/MIME-Type.tid b/editions/de-AT/tiddlers/lexikon/MIME-Type.tid
similarity index 100%
rename from editions/de-AT-DE/tiddlers/lexikon/MIME-Type.tid
rename to editions/de-AT/tiddlers/lexikon/MIME-Type.tid
diff --git a/editions/de-AT-DE/tiddlers/lexikon/Makro.tid b/editions/de-AT/tiddlers/lexikon/Makro.tid
similarity index 100%
rename from editions/de-AT-DE/tiddlers/lexikon/Makro.tid
rename to editions/de-AT/tiddlers/lexikon/Makro.tid
diff --git a/editions/de-AT-DE/tiddlers/lexikon/MarkDown.tid b/editions/de-AT/tiddlers/lexikon/MarkDown.tid
similarity index 100%
rename from editions/de-AT-DE/tiddlers/lexikon/MarkDown.tid
rename to editions/de-AT/tiddlers/lexikon/MarkDown.tid
diff --git a/editions/de-AT-DE/tiddlers/lexikon/Node.js.tid b/editions/de-AT/tiddlers/lexikon/Node.js.tid
similarity index 100%
rename from editions/de-AT-DE/tiddlers/lexikon/Node.js.tid
rename to editions/de-AT/tiddlers/lexikon/Node.js.tid
diff --git a/editions/de-AT-DE/tiddlers/lexikon/Stanford JavaScript Crypto Library.tid b/editions/de-AT/tiddlers/lexikon/Stanford JavaScript Crypto Library.tid
similarity index 100%
rename from editions/de-AT-DE/tiddlers/lexikon/Stanford JavaScript Crypto Library.tid
rename to editions/de-AT/tiddlers/lexikon/Stanford JavaScript Crypto Library.tid
diff --git a/editions/de-AT-DE/tiddlers/lexikon/Tags.tid b/editions/de-AT/tiddlers/lexikon/Tags.tid
similarity index 100%
rename from editions/de-AT-DE/tiddlers/lexikon/Tags.tid
rename to editions/de-AT/tiddlers/lexikon/Tags.tid
diff --git a/editions/de-AT-DE/tiddlers/lexikon/TextReferenz.tid b/editions/de-AT/tiddlers/lexikon/TextReferenz.tid
similarity index 100%
rename from editions/de-AT-DE/tiddlers/lexikon/TextReferenz.tid
rename to editions/de-AT/tiddlers/lexikon/TextReferenz.tid
diff --git a/editions/de-AT-DE/tiddlers/lexikon/Tiddler.tid b/editions/de-AT/tiddlers/lexikon/Tiddler.tid
similarity index 100%
rename from editions/de-AT-DE/tiddlers/lexikon/Tiddler.tid
rename to editions/de-AT/tiddlers/lexikon/Tiddler.tid
diff --git a/editions/de-AT-DE/tiddlers/lexikon/TiddlyDesktop.tid b/editions/de-AT/tiddlers/lexikon/TiddlyDesktop.tid
similarity index 100%
rename from editions/de-AT-DE/tiddlers/lexikon/TiddlyDesktop.tid
rename to editions/de-AT/tiddlers/lexikon/TiddlyDesktop.tid
diff --git a/editions/de-AT-DE/tiddlers/lexikon/TiddlyFox.tid b/editions/de-AT/tiddlers/lexikon/TiddlyFox.tid
similarity index 100%
rename from editions/de-AT-DE/tiddlers/lexikon/TiddlyFox.tid
rename to editions/de-AT/tiddlers/lexikon/TiddlyFox.tid
diff --git a/editions/de-AT-DE/tiddlers/lexikon/TiddlyIE.tid b/editions/de-AT/tiddlers/lexikon/TiddlyIE.tid
similarity index 100%
rename from editions/de-AT-DE/tiddlers/lexikon/TiddlyIE.tid
rename to editions/de-AT/tiddlers/lexikon/TiddlyIE.tid
diff --git a/editions/de-AT-DE/tiddlers/lexikon/TiddlySpot.tid b/editions/de-AT/tiddlers/lexikon/TiddlySpot.tid
similarity index 100%
rename from editions/de-AT-DE/tiddlers/lexikon/TiddlySpot.tid
rename to editions/de-AT/tiddlers/lexikon/TiddlySpot.tid
diff --git a/editions/de-AT-DE/tiddlers/lexikon/TiddlyWiki mit node.js.tid b/editions/de-AT/tiddlers/lexikon/TiddlyWiki mit node.js.tid
similarity index 100%
rename from editions/de-AT-DE/tiddlers/lexikon/TiddlyWiki mit node.js.tid
rename to editions/de-AT/tiddlers/lexikon/TiddlyWiki mit node.js.tid
diff --git a/editions/de-AT-DE/tiddlers/lexikon/TiddlyWiki on node-webkit.tid b/editions/de-AT/tiddlers/lexikon/TiddlyWiki on node-webkit.tid
similarity index 100%
rename from editions/de-AT-DE/tiddlers/lexikon/TiddlyWiki on node-webkit.tid
rename to editions/de-AT/tiddlers/lexikon/TiddlyWiki on node-webkit.tid
diff --git a/editions/de-AT-DE/tiddlers/lexikon/TiddlyWiki.tid b/editions/de-AT/tiddlers/lexikon/TiddlyWiki.tid
similarity index 100%
rename from editions/de-AT-DE/tiddlers/lexikon/TiddlyWiki.tid
rename to editions/de-AT/tiddlers/lexikon/TiddlyWiki.tid
diff --git a/editions/de-AT-DE/tiddlers/lexikon/Transklusion.tid b/editions/de-AT/tiddlers/lexikon/Transklusion.tid
similarity index 100%
rename from editions/de-AT-DE/tiddlers/lexikon/Transklusion.tid
rename to editions/de-AT/tiddlers/lexikon/Transklusion.tid
diff --git a/editions/de-AT-DE/tiddlers/lexikon/URL.tid b/editions/de-AT/tiddlers/lexikon/URL.tid
similarity index 100%
rename from editions/de-AT-DE/tiddlers/lexikon/URL.tid
rename to editions/de-AT/tiddlers/lexikon/URL.tid
diff --git a/editions/de-AT-DE/tiddlers/lexikon/UnaMesa.tid b/editions/de-AT/tiddlers/lexikon/UnaMesa.tid
similarity index 100%
rename from editions/de-AT-DE/tiddlers/lexikon/UnaMesa.tid
rename to editions/de-AT/tiddlers/lexikon/UnaMesa.tid
diff --git a/editions/de-AT-DE/tiddlers/system/$__DefaultTiddlers.tid b/editions/de-AT/tiddlers/system/$__DefaultTiddlers.tid
similarity index 100%
rename from editions/de-AT-DE/tiddlers/system/$__DefaultTiddlers.tid
rename to editions/de-AT/tiddlers/system/$__DefaultTiddlers.tid
diff --git a/editions/de-AT-DE/tiddlers/system/$__config_PageControlButtons_Visibility_$__core_ui_Buttons_home.tid b/editions/de-AT/tiddlers/system/$__config_PageControlButtons_Visibility_$__core_ui_Buttons_home.tid
similarity index 100%
rename from editions/de-AT-DE/tiddlers/system/$__config_PageControlButtons_Visibility_$__core_ui_Buttons_home.tid
rename to editions/de-AT/tiddlers/system/$__config_PageControlButtons_Visibility_$__core_ui_Buttons_home.tid
diff --git a/editions/de-AT-DE/tiddlers/system/$__config_PageControlButtons_Visibility_$__core_ui_Buttons_language.tid b/editions/de-AT/tiddlers/system/$__config_PageControlButtons_Visibility_$__core_ui_Buttons_language.tid
similarity index 100%
rename from editions/de-AT-DE/tiddlers/system/$__config_PageControlButtons_Visibility_$__core_ui_Buttons_language.tid
rename to editions/de-AT/tiddlers/system/$__config_PageControlButtons_Visibility_$__core_ui_Buttons_language.tid
diff --git a/editions/de-AT-DE/tiddlers/system/$__editions_de-AT-DE_download-empty.tid b/editions/de-AT/tiddlers/system/$__editions_de-AT-DE_download-empty.tid
similarity index 100%
rename from editions/de-AT-DE/tiddlers/system/$__editions_de-AT-DE_download-empty.tid
rename to editions/de-AT/tiddlers/system/$__editions_de-AT-DE_download-empty.tid
diff --git a/editions/de-AT-DE/tiddlers/system/$__editions_de-AT-DE_snippets_download-empty-button.tid b/editions/de-AT/tiddlers/system/$__editions_de-AT-DE_snippets_download-empty-button.tid
similarity index 100%
rename from editions/de-AT-DE/tiddlers/system/$__editions_de-AT-DE_snippets_download-empty-button.tid
rename to editions/de-AT/tiddlers/system/$__editions_de-AT-DE_snippets_download-empty-button.tid
diff --git a/editions/de-AT-DE/tiddlers/system/$__editions_de-AT-DE_wikitext-macros.tid b/editions/de-AT/tiddlers/system/$__editions_de-AT-DE_wikitext-macros.tid
similarity index 100%
rename from editions/de-AT-DE/tiddlers/system/$__editions_de-AT-DE_wikitext-macros.tid
rename to editions/de-AT/tiddlers/system/$__editions_de-AT-DE_wikitext-macros.tid
diff --git a/editions/de-AT-DE/tiddlers/system/$__language.tid b/editions/de-AT/tiddlers/system/$__language.tid
similarity index 100%
rename from editions/de-AT-DE/tiddlers/system/$__language.tid
rename to editions/de-AT/tiddlers/system/$__language.tid
diff --git a/editions/de-AT-DE/tiddlers/video/TiddlyWiki mit Firefox fur Android Video.tid b/editions/de-AT/tiddlers/video/TiddlyWiki mit Firefox fur Android Video.tid
similarity index 100%
rename from editions/de-AT-DE/tiddlers/video/TiddlyWiki mit Firefox fur Android Video.tid
rename to editions/de-AT/tiddlers/video/TiddlyWiki mit Firefox fur Android Video.tid
diff --git a/editions/de-AT-DE/tiddlers/widgets/ImageWidget.tid b/editions/de-AT/tiddlers/widgets/ImageWidget.tid
similarity index 100%
rename from editions/de-AT-DE/tiddlers/widgets/ImageWidget.tid
rename to editions/de-AT/tiddlers/widgets/ImageWidget.tid
diff --git a/editions/de-AT-DE/tiddlers/widgets/ImportVariablesWidget.tid b/editions/de-AT/tiddlers/widgets/ImportVariablesWidget.tid
similarity index 100%
rename from editions/de-AT-DE/tiddlers/widgets/ImportVariablesWidget.tid
rename to editions/de-AT/tiddlers/widgets/ImportVariablesWidget.tid
diff --git a/editions/de-AT-DE/tiddlers/widgets/LinkWidget.tid b/editions/de-AT/tiddlers/widgets/LinkWidget.tid
similarity index 100%
rename from editions/de-AT-DE/tiddlers/widgets/LinkWidget.tid
rename to editions/de-AT/tiddlers/widgets/LinkWidget.tid
diff --git a/editions/de-AT-DE/tiddlers/wikitext/Absatz in WikiText.tid b/editions/de-AT/tiddlers/wikitext/Absatz in WikiText.tid
similarity index 100%
rename from editions/de-AT-DE/tiddlers/wikitext/Absatz in WikiText.tid
rename to editions/de-AT/tiddlers/wikitext/Absatz in WikiText.tid
diff --git a/editions/de-AT-DE/tiddlers/wikitext/Bilder in WikiText.tid b/editions/de-AT/tiddlers/wikitext/Bilder in WikiText.tid
similarity index 100%
rename from editions/de-AT-DE/tiddlers/wikitext/Bilder in WikiText.tid
rename to editions/de-AT/tiddlers/wikitext/Bilder in WikiText.tid
diff --git a/editions/de-AT-DE/tiddlers/wikitext/Code Block in WikiText.tid b/editions/de-AT/tiddlers/wikitext/Code Block in WikiText.tid
similarity index 100%
rename from editions/de-AT-DE/tiddlers/wikitext/Code Block in WikiText.tid
rename to editions/de-AT/tiddlers/wikitext/Code Block in WikiText.tid
diff --git a/editions/de-AT-DE/tiddlers/wikitext/Definitionen in WikiText.tid b/editions/de-AT/tiddlers/wikitext/Definitionen in WikiText.tid
similarity index 100%
rename from editions/de-AT-DE/tiddlers/wikitext/Definitionen in WikiText.tid
rename to editions/de-AT/tiddlers/wikitext/Definitionen in WikiText.tid
diff --git a/editions/de-AT-DE/tiddlers/wikitext/Formatierungen in WikiText.tid b/editions/de-AT/tiddlers/wikitext/Formatierungen in WikiText.tid
similarity index 100%
rename from editions/de-AT-DE/tiddlers/wikitext/Formatierungen in WikiText.tid
rename to editions/de-AT/tiddlers/wikitext/Formatierungen in WikiText.tid
diff --git a/editions/de-AT-DE/tiddlers/wikitext/Gedankenstrich in WikiText.tid b/editions/de-AT/tiddlers/wikitext/Gedankenstrich in WikiText.tid
similarity index 100%
rename from editions/de-AT-DE/tiddlers/wikitext/Gedankenstrich in WikiText.tid
rename to editions/de-AT/tiddlers/wikitext/Gedankenstrich in WikiText.tid
diff --git a/editions/de-AT-DE/tiddlers/wikitext/HTML in WikiText.tid b/editions/de-AT/tiddlers/wikitext/HTML in WikiText.tid
similarity index 100%
rename from editions/de-AT-DE/tiddlers/wikitext/HTML in WikiText.tid
rename to editions/de-AT/tiddlers/wikitext/HTML in WikiText.tid
diff --git a/editions/de-AT-DE/tiddlers/wikitext/Listen in WikiText.tid b/editions/de-AT/tiddlers/wikitext/Listen in WikiText.tid
similarity index 100%
rename from editions/de-AT-DE/tiddlers/wikitext/Listen in WikiText.tid
rename to editions/de-AT/tiddlers/wikitext/Listen in WikiText.tid
diff --git a/editions/de-AT-DE/tiddlers/wikitext/Makros in WikiText.tid b/editions/de-AT/tiddlers/wikitext/Makros in WikiText.tid
similarity index 100%
rename from editions/de-AT-DE/tiddlers/wikitext/Makros in WikiText.tid
rename to editions/de-AT/tiddlers/wikitext/Makros in WikiText.tid
diff --git a/editions/de-AT-DE/tiddlers/wikitext/Tabellen in WikiText.tid b/editions/de-AT/tiddlers/wikitext/Tabellen in WikiText.tid
similarity index 100%
rename from editions/de-AT-DE/tiddlers/wikitext/Tabellen in WikiText.tid
rename to editions/de-AT/tiddlers/wikitext/Tabellen in WikiText.tid
diff --git a/editions/de-AT-DE/tiddlers/wikitext/Trennlinie in WikiText.tid b/editions/de-AT/tiddlers/wikitext/Trennlinie in WikiText.tid
similarity index 100%
rename from editions/de-AT-DE/tiddlers/wikitext/Trennlinie in WikiText.tid
rename to editions/de-AT/tiddlers/wikitext/Trennlinie in WikiText.tid
diff --git a/editions/de-AT-DE/tiddlers/wikitext/Typisierte Blocke in WikiText.tid b/editions/de-AT/tiddlers/wikitext/Typisierte Blocke in WikiText.tid
similarity index 100%
rename from editions/de-AT-DE/tiddlers/wikitext/Typisierte Blocke in WikiText.tid
rename to editions/de-AT/tiddlers/wikitext/Typisierte Blocke in WikiText.tid
diff --git a/editions/de-AT-DE/tiddlers/wikitext/Uberschriften in WikiText.tid b/editions/de-AT/tiddlers/wikitext/Uberschriften in WikiText.tid
similarity index 100%
rename from editions/de-AT-DE/tiddlers/wikitext/Uberschriften in WikiText.tid
rename to editions/de-AT/tiddlers/wikitext/Uberschriften in WikiText.tid
diff --git a/editions/de-AT-DE/tiddlers/wikitext/Verknupfungen in WikiText.tid b/editions/de-AT/tiddlers/wikitext/Verknupfungen in WikiText.tid
similarity index 100%
rename from editions/de-AT-DE/tiddlers/wikitext/Verknupfungen in WikiText.tid
rename to editions/de-AT/tiddlers/wikitext/Verknupfungen in WikiText.tid
diff --git a/editions/de-AT-DE/tiddlers/wikitext/Widgets in WikiText.tid b/editions/de-AT/tiddlers/wikitext/Widgets in WikiText.tid
similarity index 100%
rename from editions/de-AT-DE/tiddlers/wikitext/Widgets in WikiText.tid
rename to editions/de-AT/tiddlers/wikitext/Widgets in WikiText.tid
diff --git a/editions/de-AT-DE/tiddlers/wikitext/WikiText.tid b/editions/de-AT/tiddlers/wikitext/WikiText.tid
similarity index 100%
rename from editions/de-AT-DE/tiddlers/wikitext/WikiText.tid
rename to editions/de-AT/tiddlers/wikitext/WikiText.tid
diff --git a/editions/de-AT-DE/tiddlers/wikitext/Zeilenumbruch in WikiText.tid b/editions/de-AT/tiddlers/wikitext/Zeilenumbruch in WikiText.tid
similarity index 100%
rename from editions/de-AT-DE/tiddlers/wikitext/Zeilenumbruch in WikiText.tid
rename to editions/de-AT/tiddlers/wikitext/Zeilenumbruch in WikiText.tid
diff --git a/editions/de-AT-DE/tiddlers/wikitext/Zitate in WikiText.tid b/editions/de-AT/tiddlers/wikitext/Zitate in WikiText.tid
similarity index 100%
rename from editions/de-AT-DE/tiddlers/wikitext/Zitate in WikiText.tid
rename to editions/de-AT/tiddlers/wikitext/Zitate in WikiText.tid
diff --git a/editions/de-AT-DE/tiddlywiki.info b/editions/de-AT/tiddlywiki.info
similarity index 100%
rename from editions/de-AT-DE/tiddlywiki.info
rename to editions/de-AT/tiddlywiki.info
diff --git a/editions/de-DE/tiddlywiki.info b/editions/de-DE/tiddlywiki.info
new file mode 100644
index 000000000..3173c4262
--- /dev/null
+++ b/editions/de-DE/tiddlywiki.info
@@ -0,0 +1,27 @@
+{
+	"plugins": [
+		"tiddlywiki/github-fork-ribbon",
+		"tiddlywiki/browser-sniff"],
+	"themes": [
+		"tiddlywiki/vanilla",
+		"tiddlywiki/snowwhite",
+		"tiddlywiki/nighttime",
+		"tiddlywiki/starlight",
+		"tiddlywiki/centralised",
+		"tiddlywiki/readonly"
+	],
+	"languages": [
+		"en-GB",
+		"de-AT",
+		"de-DE"
+	],
+	"includeWikis": [
+		"../de-AT"
+	],
+	"build": {
+		"index": [
+			"--rendertiddler","$:/core/save/all","de-de-demo.html","text/plain"],
+		"favicon": [
+			"--savetiddler","$:/favicon.ico","favicon.ico"]
+	}
+}