diff --git a/buildzip.php b/buildzip.php
index ac13a40..88dc532 100755
--- a/buildzip.php
+++ b/buildzip.php
@@ -47,14 +47,15 @@ print "> Version is $ver\n";
 rename('db/todolist.db.empty', 'db/todolist.db');
 rename('db/config.php.default', 'db/config.php');
 
-
-$fh = fopen("./themes/default/index.php", 'a') or die("cant write index.php\n");
+/*
+$fh = fopen("./content/themes/default/index.php", 'a') or die("cant write index.php\n");
 fwrite($fh, "\n<!-- $rev -->");
 fclose($fh);
 
-$fh = fopen("./themes/ie8/index.php", 'a') or die("cant write index.php\n");
+$fh = fopen("./content/themes/ie8/index.php", 'a') or die("cant write ie8/index.php\n");
 fwrite($fh, "\n<!-- $rev -->");
 fclose($fh);
+*/
 
 #replace @VERSION
 replaceVer('./setup.php', $ver);
@@ -73,10 +74,10 @@ closedir($dh);
 
 
 # pack ie8 theme
-chdir('themes');
+chdir('content/themes');
 `zip -9 -r ie8.zip ie8`; #OS dep.!!!
 deleteTreeIfDir('ie8');
-chdir('..');
+chdir('../..');
 
 
 chdir('..'); # to the root of repo
diff --git a/src/COPYRIGHT b/src/COPYRIGHT
index 3bb194b..0fb00a4 100644
--- a/src/COPYRIGHT
+++ b/src/COPYRIGHT
@@ -16,7 +16,7 @@ http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
 myTinyTodo
 --------------
 Url:		http://www.mytinytodo.net/
-Copyright:	2009-2010,2020 Max Pozdeev <maxpozdeev@gmail.com>
+Copyright:	2009-2011,2019-2020 Max Pozdeev <maxpozdeev@gmail.com>
 License:	GPL version 2 (see LICENSE file)
 
 
@@ -35,4 +35,4 @@ Copyright:	Copyright jQuery Foundation and other contributors
 License:	MIT license. Compatible with GNU GPL.
 
 
-This software contains images by 3d-parties. See file themes/default/images/COPYRIGHT for details. 
\ No newline at end of file
+This software contains images by 3d-parties. See files content/themes/default/images/COPYRIGHT and content/themes/ie8/images/COPYRIGHT for details. 
\ No newline at end of file
diff --git a/src/themes/default/images/COPYRIGHT b/src/content/themes/default/images/COPYRIGHT
similarity index 100%
rename from src/themes/default/images/COPYRIGHT
rename to src/content/themes/default/images/COPYRIGHT
diff --git a/src/themes/default/images/add.svg b/src/content/themes/default/images/add.svg
similarity index 100%
rename from src/themes/default/images/add.svg
rename to src/content/themes/default/images/add.svg
diff --git a/src/themes/default/images/arr-left.svg b/src/content/themes/default/images/arr-left.svg
similarity index 100%
rename from src/themes/default/images/arr-left.svg
rename to src/content/themes/default/images/arr-left.svg
diff --git a/src/themes/default/images/arr-right.svg b/src/content/themes/default/images/arr-right.svg
similarity index 100%
rename from src/themes/default/images/arr-right.svg
rename to src/content/themes/default/images/arr-right.svg
diff --git a/src/themes/default/images/arrdown-hover.svg b/src/content/themes/default/images/arrdown-hover.svg
similarity index 100%
rename from src/themes/default/images/arrdown-hover.svg
rename to src/content/themes/default/images/arrdown-hover.svg
diff --git a/src/themes/default/images/arrdown.svg b/src/content/themes/default/images/arrdown.svg
similarity index 100%
rename from src/themes/default/images/arrdown.svg
rename to src/content/themes/default/images/arrdown.svg
diff --git a/src/themes/default/images/arrdown2.svg b/src/content/themes/default/images/arrdown2.svg
similarity index 100%
rename from src/themes/default/images/arrdown2.svg
rename to src/content/themes/default/images/arrdown2.svg
diff --git a/src/themes/default/images/calendar.svg b/src/content/themes/default/images/calendar.svg
similarity index 100%
rename from src/themes/default/images/calendar.svg
rename to src/content/themes/default/images/calendar.svg
diff --git a/src/themes/default/images/checkmark.svg b/src/content/themes/default/images/checkmark.svg
similarity index 100%
rename from src/themes/default/images/checkmark.svg
rename to src/content/themes/default/images/checkmark.svg
diff --git a/src/themes/default/images/close.svg b/src/content/themes/default/images/close.svg
similarity index 100%
rename from src/themes/default/images/close.svg
rename to src/content/themes/default/images/close.svg
diff --git a/src/themes/default/images/closetag.svg b/src/content/themes/default/images/closetag.svg
similarity index 100%
rename from src/themes/default/images/closetag.svg
rename to src/content/themes/default/images/closetag.svg
diff --git a/src/themes/default/images/index.html b/src/content/themes/default/images/index.html
similarity index 100%
rename from src/themes/default/images/index.html
rename to src/content/themes/default/images/index.html
diff --git a/src/themes/default/images/loading48.gif b/src/content/themes/default/images/loading48.gif
similarity index 100%
rename from src/themes/default/images/loading48.gif
rename to src/content/themes/default/images/loading48.gif
diff --git a/src/themes/default/images/newtask-ext.svg b/src/content/themes/default/images/newtask-ext.svg
similarity index 100%
rename from src/themes/default/images/newtask-ext.svg
rename to src/content/themes/default/images/newtask-ext.svg
diff --git a/src/themes/default/images/note-toggle.svg b/src/content/themes/default/images/note-toggle.svg
similarity index 100%
rename from src/themes/default/images/note-toggle.svg
rename to src/content/themes/default/images/note-toggle.svg
diff --git a/src/themes/default/images/note.svg b/src/content/themes/default/images/note.svg
similarity index 100%
rename from src/themes/default/images/note.svg
rename to src/content/themes/default/images/note.svg
diff --git a/src/themes/default/images/plus.svg b/src/content/themes/default/images/plus.svg
similarity index 100%
rename from src/themes/default/images/plus.svg
rename to src/content/themes/default/images/plus.svg
diff --git a/src/themes/default/images/rss-disabled.svg b/src/content/themes/default/images/rss-disabled.svg
similarity index 100%
rename from src/themes/default/images/rss-disabled.svg
rename to src/content/themes/default/images/rss-disabled.svg
diff --git a/src/themes/default/images/rss.svg b/src/content/themes/default/images/rss.svg
similarity index 100%
rename from src/themes/default/images/rss.svg
rename to src/content/themes/default/images/rss.svg
diff --git a/src/themes/default/images/search-cancel.svg b/src/content/themes/default/images/search-cancel.svg
similarity index 100%
rename from src/themes/default/images/search-cancel.svg
rename to src/content/themes/default/images/search-cancel.svg
diff --git a/src/themes/default/images/search.svg b/src/content/themes/default/images/search.svg
similarity index 100%
rename from src/themes/default/images/search.svg
rename to src/content/themes/default/images/search.svg
diff --git a/src/themes/default/images/selectlist.svg b/src/content/themes/default/images/selectlist.svg
similarity index 100%
rename from src/themes/default/images/selectlist.svg
rename to src/content/themes/default/images/selectlist.svg
diff --git a/src/themes/default/images/task-menu.svg b/src/content/themes/default/images/task-menu.svg
similarity index 100%
rename from src/themes/default/images/task-menu.svg
rename to src/content/themes/default/images/task-menu.svg
diff --git a/src/themes/default/index.php b/src/content/themes/default/index.php
similarity index 100%
rename from src/themes/default/index.php
rename to src/content/themes/default/index.php
diff --git a/src/themes/default/mobile.css b/src/content/themes/default/mobile.css
similarity index 100%
rename from src/themes/default/mobile.css
rename to src/content/themes/default/mobile.css
diff --git a/src/themes/default/print.css b/src/content/themes/default/print.css
similarity index 100%
rename from src/themes/default/print.css
rename to src/content/themes/default/print.css
diff --git a/src/themes/default/style.css b/src/content/themes/default/style.css
similarity index 100%
rename from src/themes/default/style.css
rename to src/content/themes/default/style.css
diff --git a/src/themes/default/style_rtl.css b/src/content/themes/default/style_rtl.css
similarity index 100%
rename from src/themes/default/style_rtl.css
rename to src/content/themes/default/style_rtl.css
diff --git a/src/themes/ie8/README.txt b/src/content/themes/ie8/README.txt
similarity index 100%
rename from src/themes/ie8/README.txt
rename to src/content/themes/ie8/README.txt
diff --git a/src/themes/ie8/images/COPYRIGHT b/src/content/themes/ie8/images/COPYRIGHT
similarity index 100%
rename from src/themes/ie8/images/COPYRIGHT
rename to src/content/themes/ie8/images/COPYRIGHT
diff --git a/src/themes/ie8/images/arrdown.gif b/src/content/themes/ie8/images/arrdown.gif
similarity index 100%
rename from src/themes/ie8/images/arrdown.gif
rename to src/content/themes/ie8/images/arrdown.gif
diff --git a/src/themes/ie8/images/arrdown2.gif b/src/content/themes/ie8/images/arrdown2.gif
similarity index 100%
rename from src/themes/ie8/images/arrdown2.gif
rename to src/content/themes/ie8/images/arrdown2.gif
diff --git a/src/themes/ie8/images/buttons.png b/src/content/themes/ie8/images/buttons.png
similarity index 100%
rename from src/themes/ie8/images/buttons.png
rename to src/content/themes/ie8/images/buttons.png
diff --git a/src/themes/ie8/images/calendar.png b/src/content/themes/ie8/images/calendar.png
similarity index 100%
rename from src/themes/ie8/images/calendar.png
rename to src/content/themes/ie8/images/calendar.png
diff --git a/src/themes/ie8/images/closetag.gif b/src/content/themes/ie8/images/closetag.gif
similarity index 100%
rename from src/themes/ie8/images/closetag.gif
rename to src/content/themes/ie8/images/closetag.gif
diff --git a/src/themes/ie8/images/corner_left.gif b/src/content/themes/ie8/images/corner_left.gif
similarity index 100%
rename from src/themes/ie8/images/corner_left.gif
rename to src/content/themes/ie8/images/corner_left.gif
diff --git a/src/themes/ie8/images/corner_right.gif b/src/content/themes/ie8/images/corner_right.gif
similarity index 100%
rename from src/themes/ie8/images/corner_right.gif
rename to src/content/themes/ie8/images/corner_right.gif
diff --git a/src/themes/ie8/images/icons.gif b/src/content/themes/ie8/images/icons.gif
similarity index 100%
rename from src/themes/ie8/images/icons.gif
rename to src/content/themes/ie8/images/icons.gif
diff --git a/src/themes/ie8/images/index.html b/src/content/themes/ie8/images/index.html
similarity index 100%
rename from src/themes/ie8/images/index.html
rename to src/content/themes/ie8/images/index.html
diff --git a/src/themes/ie8/images/loading1.gif b/src/content/themes/ie8/images/loading1.gif
similarity index 100%
rename from src/themes/ie8/images/loading1.gif
rename to src/content/themes/ie8/images/loading1.gif
diff --git a/src/themes/ie8/images/loading1_24.gif b/src/content/themes/ie8/images/loading1_24.gif
similarity index 100%
rename from src/themes/ie8/images/loading1_24.gif
rename to src/content/themes/ie8/images/loading1_24.gif
diff --git a/src/themes/ie8/images/mzl.png b/src/content/themes/ie8/images/mzl.png
similarity index 100%
rename from src/themes/ie8/images/mzl.png
rename to src/content/themes/ie8/images/mzl.png
diff --git a/src/themes/ie8/images/page_white_text.png b/src/content/themes/ie8/images/page_white_text.png
similarity index 100%
rename from src/themes/ie8/images/page_white_text.png
rename to src/content/themes/ie8/images/page_white_text.png
diff --git a/src/themes/ie8/images/tab_hover.gif b/src/content/themes/ie8/images/tab_hover.gif
similarity index 100%
rename from src/themes/ie8/images/tab_hover.gif
rename to src/content/themes/ie8/images/tab_hover.gif
diff --git a/src/themes/ie8/index.php b/src/content/themes/ie8/index.php
similarity index 100%
rename from src/themes/ie8/index.php
rename to src/content/themes/ie8/index.php
diff --git a/src/themes/ie8/jquery-1.8.3.min.js b/src/content/themes/ie8/jquery-1.8.3.min.js
similarity index 100%
rename from src/themes/ie8/jquery-1.8.3.min.js
rename to src/content/themes/ie8/jquery-1.8.3.min.js
diff --git a/src/themes/ie8/mtt.js b/src/content/themes/ie8/mtt.js
similarity index 100%
rename from src/themes/ie8/mtt.js
rename to src/content/themes/ie8/mtt.js
diff --git a/src/themes/ie8/pda.css b/src/content/themes/ie8/pda.css
similarity index 100%
rename from src/themes/ie8/pda.css
rename to src/content/themes/ie8/pda.css
diff --git a/src/themes/ie8/print.css b/src/content/themes/ie8/print.css
similarity index 100%
rename from src/themes/ie8/print.css
rename to src/content/themes/ie8/print.css
diff --git a/src/themes/ie8/style.css b/src/content/themes/ie8/style.css
similarity index 100%
rename from src/themes/ie8/style.css
rename to src/content/themes/ie8/style.css
diff --git a/src/themes/ie8/style_rtl.css b/src/content/themes/ie8/style_rtl.css
similarity index 100%
rename from src/themes/ie8/style_rtl.css
rename to src/content/themes/ie8/style_rtl.css
diff --git a/src/content/themes/index.php b/src/content/themes/index.php
new file mode 100644
index 0000000..a710241
--- /dev/null
+++ b/src/content/themes/index.php
@@ -0,0 +1,2 @@
+<?php
+//empty
diff --git a/src/index.php b/src/index.php
index 87a1936..e6d9ee2 100644
--- a/src/index.php
+++ b/src/index.php
@@ -42,7 +42,7 @@ else if ( isset($_GET['mobile']) || isset($_GET['pda']) ) {
 	Config::set('mobile', 1);
 }
 
-define('TEMPLATEPATH', MTTPATH. 'themes/'. Config::get('template'). '/');
+define('TEMPLATEPATH', MTTTHEMES. Config::get('template'). '/');
 
 require(TEMPLATEPATH. 'index.php');
 
diff --git a/src/init.php b/src/init.php
index 066d10c..bc5a767 100644
--- a/src/init.php
+++ b/src/init.php
@@ -16,6 +16,7 @@ if(!defined('MTTPATH')) define('MTTPATH', dirname(__FILE__) .'/');
 if(!defined('MTTINC'))  define('MTTINC', MTTPATH. 'includes/');
 if(!defined('MTTCONTENT'))  define('MTTCONTENT', MTTPATH. 'content/');
 if(!defined('MTTLANG'))  define('MTTLANG', MTTCONTENT. 'lang/');
+if(!defined('MTTTHEMES'))  define('MTTTHEMES', MTTCONTENT. 'themes/');
 
 require_once(MTTINC. 'common.php');
 require_once(MTTPATH. 'db/config.php');
@@ -154,7 +155,7 @@ function get_unsafe_mttinfo($v)
 	switch($v)
 	{
 		case 'template_url':
-			$_mttinfo['template_url'] = get_unsafe_mttinfo('mtt_url'). 'themes/'. Config::get('template') . '/';
+			$_mttinfo['template_url'] = get_unsafe_mttinfo('mtt_url'). 'content/themes/'. Config::get('template') . '/';
 			return $_mttinfo['template_url'];
 		case 'includes_url':
 			$_mttinfo['includes_url'] = get_unsafe_mttinfo('mtt_url'). 'includes/';
diff --git a/src/themes/index.html b/src/themes/index.html
deleted file mode 100644
index fe49470..0000000
--- a/src/themes/index.html
+++ /dev/null
@@ -1 +0,0 @@
-somewhere
\ No newline at end of file