diff --git a/src/content/themes/default/dark.css b/src/content/theme/dark.css
similarity index 100%
rename from src/content/themes/default/dark.css
rename to src/content/theme/dark.css
diff --git a/src/content/themes/default/images/COPYRIGHT b/src/content/theme/images/COPYRIGHT
similarity index 100%
rename from src/content/themes/default/images/COPYRIGHT
rename to src/content/theme/images/COPYRIGHT
diff --git a/src/content/themes/default/images/add.svg b/src/content/theme/images/add.svg
similarity index 100%
rename from src/content/themes/default/images/add.svg
rename to src/content/theme/images/add.svg
diff --git a/src/content/themes/default/images/arr-left.svg b/src/content/theme/images/arr-left.svg
similarity index 100%
rename from src/content/themes/default/images/arr-left.svg
rename to src/content/theme/images/arr-left.svg
diff --git a/src/content/themes/default/images/arr-right.svg b/src/content/theme/images/arr-right.svg
similarity index 100%
rename from src/content/themes/default/images/arr-right.svg
rename to src/content/theme/images/arr-right.svg
diff --git a/src/content/themes/default/images/arrdown2.svg b/src/content/theme/images/arrdown2.svg
similarity index 100%
rename from src/content/themes/default/images/arrdown2.svg
rename to src/content/theme/images/arrdown2.svg
diff --git a/src/content/themes/default/images/back.svg b/src/content/theme/images/back.svg
similarity index 100%
rename from src/content/themes/default/images/back.svg
rename to src/content/theme/images/back.svg
diff --git a/src/content/themes/default/images/calendar.svg b/src/content/theme/images/calendar.svg
similarity index 100%
rename from src/content/themes/default/images/calendar.svg
rename to src/content/theme/images/calendar.svg
diff --git a/src/content/themes/default/images/checkmark.svg b/src/content/theme/images/checkmark.svg
similarity index 100%
rename from src/content/themes/default/images/checkmark.svg
rename to src/content/theme/images/checkmark.svg
diff --git a/src/content/themes/default/images/closetag.svg b/src/content/theme/images/closetag.svg
similarity index 100%
rename from src/content/themes/default/images/closetag.svg
rename to src/content/theme/images/closetag.svg
diff --git a/src/content/themes/default/images/index.html b/src/content/theme/images/index.html
similarity index 100%
rename from src/content/themes/default/images/index.html
rename to src/content/theme/images/index.html
diff --git a/src/content/themes/default/images/loading48.gif b/src/content/theme/images/loading48.gif
similarity index 100%
rename from src/content/themes/default/images/loading48.gif
rename to src/content/theme/images/loading48.gif
diff --git a/src/content/themes/default/images/logo-loading.gif b/src/content/theme/images/logo-loading.gif
similarity index 100%
rename from src/content/themes/default/images/logo-loading.gif
rename to src/content/theme/images/logo-loading.gif
diff --git a/src/content/themes/default/images/logo.gif b/src/content/theme/images/logo.gif
similarity index 100%
rename from src/content/themes/default/images/logo.gif
rename to src/content/theme/images/logo.gif
diff --git a/src/content/themes/default/images/newtask-ext.svg b/src/content/theme/images/newtask-ext.svg
similarity index 100%
rename from src/content/themes/default/images/newtask-ext.svg
rename to src/content/theme/images/newtask-ext.svg
diff --git a/src/content/themes/default/images/note-toggle.svg b/src/content/theme/images/note-toggle.svg
similarity index 100%
rename from src/content/themes/default/images/note-toggle.svg
rename to src/content/theme/images/note-toggle.svg
diff --git a/src/content/themes/default/images/plus.svg b/src/content/theme/images/plus.svg
similarity index 100%
rename from src/content/themes/default/images/plus.svg
rename to src/content/theme/images/plus.svg
diff --git a/src/content/themes/default/images/rss-disabled.svg b/src/content/theme/images/rss-disabled.svg
similarity index 100%
rename from src/content/themes/default/images/rss-disabled.svg
rename to src/content/theme/images/rss-disabled.svg
diff --git a/src/content/themes/default/images/rss.svg b/src/content/theme/images/rss.svg
similarity index 100%
rename from src/content/themes/default/images/rss.svg
rename to src/content/theme/images/rss.svg
diff --git a/src/content/themes/default/images/search-cancel.svg b/src/content/theme/images/search-cancel.svg
similarity index 100%
rename from src/content/themes/default/images/search-cancel.svg
rename to src/content/theme/images/search-cancel.svg
diff --git a/src/content/themes/default/images/search.svg b/src/content/theme/images/search.svg
similarity index 100%
rename from src/content/themes/default/images/search.svg
rename to src/content/theme/images/search.svg
diff --git a/src/content/themes/default/images/selectlist.svg b/src/content/theme/images/selectlist.svg
similarity index 100%
rename from src/content/themes/default/images/selectlist.svg
rename to src/content/theme/images/selectlist.svg
diff --git a/src/content/themes/default/images/selectlist2.svg b/src/content/theme/images/selectlist2.svg
similarity index 100%
rename from src/content/themes/default/images/selectlist2.svg
rename to src/content/theme/images/selectlist2.svg
diff --git a/src/content/themes/default/images/task-menu.svg b/src/content/theme/images/task-menu.svg
similarity index 100%
rename from src/content/themes/default/images/task-menu.svg
rename to src/content/theme/images/task-menu.svg
diff --git a/src/content/themes/default/images/task-menu2.svg b/src/content/theme/images/task-menu2.svg
similarity index 100%
rename from src/content/themes/default/images/task-menu2.svg
rename to src/content/theme/images/task-menu2.svg
diff --git a/src/content/themes/index.html b/src/content/theme/index.html
similarity index 100%
rename from src/content/themes/index.html
rename to src/content/theme/index.html
diff --git a/src/content/themes/default/markdown.css b/src/content/theme/markdown.css
similarity index 100%
rename from src/content/themes/default/markdown.css
rename to src/content/theme/markdown.css
diff --git a/src/content/themes/default/print.css b/src/content/theme/print.css
similarity index 100%
rename from src/content/themes/default/print.css
rename to src/content/theme/print.css
diff --git a/src/content/themes/default/style.css b/src/content/theme/style.css
similarity index 100%
rename from src/content/themes/default/style.css
rename to src/content/theme/style.css
diff --git a/src/content/themes/default/style_rtl.css b/src/content/theme/style_rtl.css
similarity index 100%
rename from src/content/themes/default/style_rtl.css
rename to src/content/theme/style_rtl.css
diff --git a/src/content/themes/default/index.php b/src/includes/theme.php
similarity index 94%
rename from src/content/themes/default/index.php
rename to src/includes/theme.php
index 427bdca..2a0fe2c 100644
--- a/src/content/themes/default/index.php
+++ b/src/includes/theme.php
@@ -9,14 +9,14 @@
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <title><?php mttinfo('title'); ?></title>
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <link rel="stylesheet" type="text/css" href="<?php mttinfo('template_url'); ?>style.css?v=<?php mttinfo('version'); ?>" media="all" />
-  <link rel="stylesheet" type="text/css" href="<?php mttinfo('template_url'); ?>markdown.css?v=<?php mttinfo('version'); ?>" media="all" />
+  <link rel="stylesheet" type="text/css" href="<?php mttinfo('theme_url'); ?>style.css?v=<?php mttinfo('version'); ?>" media="all" />
+  <link rel="stylesheet" type="text/css" href="<?php mttinfo('theme_url'); ?>markdown.css?v=<?php mttinfo('version'); ?>" media="all" />
   <?php if (get_mttinfo('appearance') == 'system'): ?>
-  <link rel="stylesheet" type="text/css" href="<?php mttinfo('template_url'); ?>dark.css?v=<?php mttinfo('version'); ?>" media="screen" />
+  <link rel="stylesheet" type="text/css" href="<?php mttinfo('theme_url'); ?>dark.css?v=<?php mttinfo('version'); ?>" media="screen" />
   <?php endif; ?>
-  <link rel="stylesheet" type="text/css" href="<?php mttinfo('template_url'); ?>print.css?v=<?php mttinfo('version'); ?>" media="print" />
+  <link rel="stylesheet" type="text/css" href="<?php mttinfo('theme_url'); ?>print.css?v=<?php mttinfo('version'); ?>" media="print" />
   <?php if(Config::get('rtl')): ?>
-  <link rel="stylesheet" type="text/css" href="<?php mttinfo('template_url'); ?>style_rtl.css?v=<?php mttinfo('version'); ?>" media="all" />
+  <link rel="stylesheet" type="text/css" href="<?php mttinfo('theme_url'); ?>style_rtl.css?v=<?php mttinfo('version'); ?>" media="all" />
   <?php endif; ?>
 </head>
 
diff --git a/src/index.php b/src/index.php
index 83f454b..692998f 100644
--- a/src/index.php
+++ b/src/index.php
@@ -27,9 +27,7 @@ if (need_auth() && access_token() == '') {
     update_token();
 }
 
-define('TEMPLATEPATH', MTTTHEMES. Config::get('template'). '/');
-
-require(TEMPLATEPATH. 'index.php');
+require(MTTINC. 'theme.php');
 
 // end
 
@@ -79,7 +77,7 @@ function js_options()
         "showdate" => Config::get('showdate') ? true : false,
         "duedatepickerformat" => htmlspecialchars(Config::get('dateformat2')),
         "firstdayofweek" => (int) Config::get('firstdayofweek'),
-        "calendarIcon" => get_mttinfo('template_url'). 'images/calendar.svg',
+        "calendarIcon" => get_mttinfo('theme_url'). 'images/calendar.svg',
         "autotag" => Config::get('autotag') ? true : false,
         "markdown" => Config::get('markup') == 'v1' ? false : true
     );
diff --git a/src/init.php b/src/init.php
index 629b0f7..1a305b9 100644
--- a/src/init.php
+++ b/src/init.php
@@ -251,9 +251,9 @@ function get_unsafe_mttinfo($v)
     }
     switch($v)
     {
-        case 'template_url':
-            $_mttinfo['template_url'] = get_unsafe_mttinfo('mtt_url'). 'content/themes/'. Config::get('template') . '/';
-            return $_mttinfo['template_url'];
+        case 'theme_url':
+            $_mttinfo['theme_url'] = get_unsafe_mttinfo('mtt_url'). 'content/theme/';
+            return $_mttinfo['theme_url'];
         case 'includes_url':
             $_mttinfo['includes_url'] = get_unsafe_mttinfo('mtt_url'). 'includes/';
             return $_mttinfo['includes_url'];