69 files changed, 5 insertions, 5 deletions
diff --git a/.ht-nginx b/.ht-nginx
index 010f488..9f85d41 100644
--- a/.ht-nginx
+++ b/.ht-nginx
@@ -18,7 +18,7 @@ error_page 404 /404.php;
 #===============================================================================
 # Forbidden directories
 #===============================================================================
-location ~ ^/(core|template/([^/]+)/(html|lang)/) {
+location ~ ^/(core|theme/([^/]+)/(html|lang)/) {
 	return 403;
 }
 
diff --git a/.htaccess b/.htaccess
index 950f985..f42f718 100644
--- a/.htaccess
+++ b/.htaccess
@@ -23,7 +23,7 @@ ErrorDocument 404 /404.php
 #===============================================================================
 # Forbidden directories
 #===============================================================================
-RewriteRule ^(core|template/([^/]+)/(html|lang)/) - [F]
+RewriteRule ^(core|theme/([^/]+)/(html|lang)/) - [F]
 
 #===============================================================================
 # Main rules
diff --git a/core/namespace/Application.php b/core/namespace/Application.php
index 8c3be12..a45e1e8 100644
--- a/core/namespace/Application.php
+++ b/core/namespace/Application.php
@@ -59,7 +59,7 @@ class Application {
 
 			$Language = new Language(self::get('CORE.LANGUAGE'));
 			$Language->load(sprintf(ROOT.'core/language/%s.php', Application::get('CORE.LANGUAGE')));
-			$Language->load(sprintf(ROOT.'template/%s/lang/%s.php', $template_name, $template_lang));
+			$Language->load(sprintf(ROOT.'theme/%s/lang/%s.php', $template_name, $template_lang));
 
 			self::$Language = $Language;
 		}
@@ -136,7 +136,7 @@ class Application {
 	#===============================================================================
 	public static function getTemplateURL($more = ''): string {
 		$template = self::get('TEMPLATE.NAME');
-		return self::getURL("template/{$template}/{$more}");
+		return self::getURL("theme/{$template}/{$more}");
 	}
 
 	#===============================================================================
diff --git a/core/namespace/Template/Factory.php b/core/namespace/Template/Factory.php
index a90c61e..3b40998 100644
--- a/core/namespace/Template/Factory.php
+++ b/core/namespace/Template/Factory.php
@@ -3,7 +3,7 @@ namespace Template;
 
 class Factory extends \Factory implements \FactoryInterface {
 	public static function build($template): Template {
-		$Template = new Template(ROOT.'template/'.\Application::get('TEMPLATE.NAME')."/html/{$template}.php");
+		$Template = new Template(ROOT.'theme/'.\Application::get('TEMPLATE.NAME')."/html/{$template}.php");
 		$Template->set('Language', \Application::getLanguage());
 		$Template->set('BLOGMETA', [
 			'NAME' => \Application::get('BLOGMETA.NAME'),
diff --git a/template/admin/html/403.php b/theme/admin/html/403.php
index 6fb3d16..6fb3d16 100644
--- a/template/admin/html/403.php
+++ b/theme/admin/html/403.php
diff --git a/template/admin/html/404.php b/theme/admin/html/404.php
index aa264cd..aa264cd 100644
--- a/template/admin/html/404.php
+++ b/theme/admin/html/404.php
diff --git a/template/admin/html/auth.php b/theme/admin/html/auth.php
index e6bfb1e..e6bfb1e 100644
--- a/template/admin/html/auth.php
+++ b/theme/admin/html/auth.php
diff --git a/template/admin/html/database.php b/theme/admin/html/database.php
index 983dee7..983dee7 100644
--- a/template/admin/html/database.php
+++ b/theme/admin/html/database.php
diff --git a/template/admin/html/home.php b/theme/admin/html/home.php
index a8b003e..a8b003e 100644
--- a/template/admin/html/home.php
+++ b/theme/admin/html/home.php
diff --git a/template/admin/html/main.php b/theme/admin/html/main.php
index 794f9ec..794f9ec 100644
--- a/template/admin/html/main.php
+++ b/theme/admin/html/main.php
diff --git a/template/admin/html/page/delete.php b/theme/admin/html/page/delete.php
index ccc569f..ccc569f 100644
--- a/template/admin/html/page/delete.php
+++ b/theme/admin/html/page/delete.php
diff --git a/template/admin/html/page/form.php b/theme/admin/html/page/form.php
index 6a4be33..6a4be33 100644
--- a/template/admin/html/page/form.php
+++ b/theme/admin/html/page/form.php
diff --git a/template/admin/html/page/index.php b/theme/admin/html/page/index.php
index 7067c40..7067c40 100644
--- a/template/admin/html/page/index.php
+++ b/theme/admin/html/page/index.php
diff --git a/template/admin/html/page/insert.php b/theme/admin/html/page/insert.php
index 7442200..7442200 100644
--- a/template/admin/html/page/insert.php
+++ b/theme/admin/html/page/insert.php
diff --git a/template/admin/html/page/item.php b/theme/admin/html/page/item.php
index a92b2fd..a92b2fd 100644
--- a/template/admin/html/page/item.php
+++ b/theme/admin/html/page/item.php
diff --git a/template/admin/html/page/search.php b/theme/admin/html/page/search.php
index a48f604..a48f604 100644
--- a/template/admin/html/page/search.php
+++ b/theme/admin/html/page/search.php
diff --git a/template/admin/html/page/update.php b/theme/admin/html/page/update.php
index 77a7eb2..77a7eb2 100644
--- a/template/admin/html/page/update.php
+++ b/theme/admin/html/page/update.php
diff --git a/template/admin/html/pagination.php b/theme/admin/html/pagination.php
index 42eb378..42eb378 100644
--- a/template/admin/html/pagination.php
+++ b/theme/admin/html/pagination.php
diff --git a/template/admin/html/post/delete.php b/theme/admin/html/post/delete.php
index 6654377..6654377 100644
--- a/template/admin/html/post/delete.php
+++ b/theme/admin/html/post/delete.php
diff --git a/template/admin/html/post/form.php b/theme/admin/html/post/form.php
index 50f8fa6..50f8fa6 100644
--- a/template/admin/html/post/form.php
+++ b/theme/admin/html/post/form.php
diff --git a/template/admin/html/post/index.php b/theme/admin/html/post/index.php
index f884b05..f884b05 100644
--- a/template/admin/html/post/index.php
+++ b/theme/admin/html/post/index.php
diff --git a/template/admin/html/post/insert.php b/theme/admin/html/post/insert.php
index dc32c24..dc32c24 100644
--- a/template/admin/html/post/insert.php
+++ b/theme/admin/html/post/insert.php
diff --git a/template/admin/html/post/item.php b/theme/admin/html/post/item.php
index 8258d30..8258d30 100644
--- a/template/admin/html/post/item.php
+++ b/theme/admin/html/post/item.php
diff --git a/template/admin/html/post/search.php b/theme/admin/html/post/search.php
index 4476786..4476786 100644
--- a/template/admin/html/post/search.php
+++ b/theme/admin/html/post/search.php
diff --git a/template/admin/html/post/update.php b/theme/admin/html/post/update.php
index a577bec..a577bec 100644
--- a/template/admin/html/post/update.php
+++ b/theme/admin/html/post/update.php
diff --git a/template/admin/html/user/delete.php b/theme/admin/html/user/delete.php
index 01927b2..01927b2 100644
--- a/template/admin/html/user/delete.php
+++ b/theme/admin/html/user/delete.php
diff --git a/template/admin/html/user/form.php b/theme/admin/html/user/form.php
index 9f17cac..9f17cac 100644
--- a/template/admin/html/user/form.php
+++ b/theme/admin/html/user/form.php
diff --git a/template/admin/html/user/index.php b/theme/admin/html/user/index.php
index aae8ee8..aae8ee8 100644
--- a/template/admin/html/user/index.php
+++ b/theme/admin/html/user/index.php
diff --git a/template/admin/html/user/insert.php b/theme/admin/html/user/insert.php
index 5cbdd06..5cbdd06 100644
--- a/template/admin/html/user/insert.php
+++ b/theme/admin/html/user/insert.php
diff --git a/template/admin/html/user/item.php b/theme/admin/html/user/item.php
index d8e43cf..d8e43cf 100644
--- a/template/admin/html/user/item.php
+++ b/theme/admin/html/user/item.php
diff --git a/template/admin/html/user/update.php b/theme/admin/html/user/update.php
index e023925..e023925 100644
--- a/template/admin/html/user/update.php
+++ b/theme/admin/html/user/update.php
diff --git a/template/admin/lang/de.php b/theme/admin/lang/de.php
index 5fabdc3..5fabdc3 100644
--- a/template/admin/lang/de.php
+++ b/theme/admin/lang/de.php
diff --git a/template/admin/lang/en.php b/theme/admin/lang/en.php
index b082cca..b082cca 100644
--- a/template/admin/lang/en.php
+++ b/theme/admin/lang/en.php
diff --git a/template/admin/rsrc/font/font-awesome-fontello.json b/theme/admin/rsrc/font/font-awesome-fontello.json
index 515e8a7..515e8a7 100644
--- a/template/admin/rsrc/font/font-awesome-fontello.json
+++ b/theme/admin/rsrc/font/font-awesome-fontello.json
diff --git a/template/admin/rsrc/font/font-awesome-fontello.woff2 b/theme/admin/rsrc/font/font-awesome-fontello.woff2
index 5b5c567..5b5c567 100644
--- a/template/admin/rsrc/font/font-awesome-fontello.woff2
+++ b/theme/admin/rsrc/font/font-awesome-fontello.woff2
diff --git a/template/admin/rsrc/font/kadwa-n-400.woff2 b/theme/admin/rsrc/font/kadwa-n-400.woff2
index 1566426..1566426 100644
--- a/template/admin/rsrc/font/kadwa-n-400.woff2
+++ b/theme/admin/rsrc/font/kadwa-n-400.woff2
diff --git a/template/admin/rsrc/font/ruda-n-400.woff2 b/theme/admin/rsrc/font/ruda-n-400.woff2
index 6435a0d..6435a0d 100644
--- a/template/admin/rsrc/font/ruda-n-400.woff2
+++ b/theme/admin/rsrc/font/ruda-n-400.woff2
diff --git a/template/admin/rsrc/font/ruda-n-700.woff2 b/theme/admin/rsrc/font/ruda-n-700.woff2
index 0066431..0066431 100644
--- a/template/admin/rsrc/font/ruda-n-700.woff2
+++ b/theme/admin/rsrc/font/ruda-n-700.woff2
diff --git a/template/admin/rsrc/icon-public-domain.svg b/theme/admin/rsrc/icon-public-domain.svg
index e0f0b0f..e0f0b0f 100644
--- a/template/admin/rsrc/icon-public-domain.svg
+++ b/theme/admin/rsrc/icon-public-domain.svg
diff --git a/template/admin/rsrc/main.css b/theme/admin/rsrc/main.css
index f6a82ac..f6a82ac 100644
--- a/template/admin/rsrc/main.css
+++ b/theme/admin/rsrc/main.css
diff --git a/template/admin/rsrc/main.js b/theme/admin/rsrc/main.js
index 46880f2..46880f2 100644
--- a/template/admin/rsrc/main.js
+++ b/theme/admin/rsrc/main.js
diff --git a/template/default/html/403.php b/theme/default/html/403.php
index 337dd44..337dd44 100644
--- a/template/default/html/403.php
+++ b/theme/default/html/403.php
diff --git a/template/default/html/404.php b/theme/default/html/404.php
index 54866a4..54866a4 100644
--- a/template/default/html/404.php
+++ b/theme/default/html/404.php
diff --git a/template/default/html/feed/item_page.php b/theme/default/html/feed/item_page.php
index ff9f209..ff9f209 100644
--- a/template/default/html/feed/item_page.php
+++ b/theme/default/html/feed/item_page.php
diff --git a/template/default/html/feed/item_post.php b/theme/default/html/feed/item_post.php
index 07d400d..07d400d 100644
--- a/template/default/html/feed/item_post.php
+++ b/theme/default/html/feed/item_post.php
diff --git a/template/default/html/feed/main.php b/theme/default/html/feed/main.php
index 588ee02..588ee02 100644
--- a/template/default/html/feed/main.php
+++ b/theme/default/html/feed/main.php
diff --git a/template/default/html/home.php b/theme/default/html/home.php
index 3f6ba47..3f6ba47 100644
--- a/template/default/html/home.php
+++ b/theme/default/html/home.php
diff --git a/template/default/html/main.php b/theme/default/html/main.php
index 46f4f09..46f4f09 100644
--- a/template/default/html/main.php
+++ b/theme/default/html/main.php
diff --git a/template/default/html/page/item.php b/theme/default/html/page/item.php
index 00da4c2..00da4c2 100644
--- a/template/default/html/page/item.php
+++ b/theme/default/html/page/item.php
diff --git a/template/default/html/page/list.php b/theme/default/html/page/list.php
index c4a04b2..c4a04b2 100644
--- a/template/default/html/page/list.php
+++ b/theme/default/html/page/list.php
diff --git a/template/default/html/page/main.php b/theme/default/html/page/main.php
index 1f8e140..1f8e140 100644
--- a/template/default/html/page/main.php
+++ b/theme/default/html/page/main.php
diff --git a/template/default/html/pagination.php b/theme/default/html/pagination.php
index 48e353f..48e353f 100644
--- a/template/default/html/pagination.php
+++ b/theme/default/html/pagination.php
diff --git a/template/default/html/post/item.php b/theme/default/html/post/item.php
index e0d49bd..e0d49bd 100644
--- a/template/default/html/post/item.php
+++ b/theme/default/html/post/item.php
diff --git a/template/default/html/post/list.php b/theme/default/html/post/list.php
index f16fd52..f16fd52 100644
--- a/template/default/html/post/list.php
+++ b/theme/default/html/post/list.php
diff --git a/template/default/html/post/main.php b/theme/default/html/post/main.php
index b84fc63..b84fc63 100644
--- a/template/default/html/post/main.php
+++ b/theme/default/html/post/main.php
diff --git a/template/default/html/search/main.php b/theme/default/html/search/main.php
index 61bd6a5..61bd6a5 100644
--- a/template/default/html/search/main.php
+++ b/theme/default/html/search/main.php
diff --git a/template/default/html/search/result.php b/theme/default/html/search/result.php
index 044afe1..044afe1 100644
--- a/template/default/html/search/result.php
+++ b/theme/default/html/search/result.php
diff --git a/template/default/html/user/item.php b/theme/default/html/user/item.php
index d03d330..d03d330 100644
--- a/template/default/html/user/item.php
+++ b/theme/default/html/user/item.php
diff --git a/template/default/html/user/list.php b/theme/default/html/user/list.php
index 98fa840..98fa840 100644
--- a/template/default/html/user/list.php
+++ b/theme/default/html/user/list.php
diff --git a/template/default/html/user/main.php b/theme/default/html/user/main.php
index 7c19b96..7c19b96 100644
--- a/template/default/html/user/main.php
+++ b/theme/default/html/user/main.php
diff --git a/template/default/lang/de.php b/theme/default/lang/de.php
index bf1b3a4..bf1b3a4 100644
--- a/template/default/lang/de.php
+++ b/theme/default/lang/de.php
diff --git a/template/default/lang/en.php b/theme/default/lang/en.php
index 0c7f557..0c7f557 100644
--- a/template/default/lang/en.php
+++ b/theme/default/lang/en.php
diff --git a/template/default/rsrc/font-awesome.min.css b/theme/default/rsrc/font-awesome.min.css
index 540440c..540440c 100644
--- a/template/default/rsrc/font-awesome.min.css
+++ b/theme/default/rsrc/font-awesome.min.css
diff --git a/template/default/rsrc/font/font-awesome.woff2 b/theme/default/rsrc/font/font-awesome.woff2
index 4d13fc6..4d13fc6 100644
--- a/template/default/rsrc/font/font-awesome.woff2
+++ b/theme/default/rsrc/font/font-awesome.woff2
diff --git a/template/default/rsrc/font/ruda-n-400.woff2 b/theme/default/rsrc/font/ruda-n-400.woff2
index 6435a0d..6435a0d 100644
--- a/template/default/rsrc/font/ruda-n-400.woff2
+++ b/theme/default/rsrc/font/ruda-n-400.woff2
diff --git a/template/default/rsrc/font/ruda-n-700.woff2 b/theme/default/rsrc/font/ruda-n-700.woff2
index 0066431..0066431 100644
--- a/template/default/rsrc/font/ruda-n-700.woff2
+++ b/theme/default/rsrc/font/ruda-n-700.woff2
diff --git a/template/default/rsrc/logo.png b/theme/default/rsrc/logo.png
index 7a62549..7a62549 100644
--- a/template/default/rsrc/logo.png
+++ b/theme/default/rsrc/logo.png
diff --git a/template/default/rsrc/main.css b/theme/default/rsrc/main.css
index a736b18..a736b18 100644
--- a/template/default/rsrc/main.css
+++ b/theme/default/rsrc/main.css
diff --git a/template/default/rsrc/main.js b/theme/default/rsrc/main.js
index f73d061..f73d061 100644
--- a/template/default/rsrc/main.js
+++ b/theme/default/rsrc/main.js