From fca2b4dc6a402b7cf34c70d0483b6622f0fff30b Mon Sep 17 00:00:00 2001
From: David Hunt <bitbucket.davidhunt@holodyn.com>
Date: Fri, 31 Jul 2015 11:54:02 -0400
Subject: [PATCH] Refactored /templates and /resources into a single /themes
 folder.

---
 global.json                                   |   1 +
 libs/Daux.php                                 |  19 +++++++++++++++++-
 libs/DauxHelper.php                           |   5 ++---
 libs/Server/Server.php                        |   1 +
 .../daux-blue => themes/core}/config.json     |   0
 {resources => themes/core}/img/favicon.png    | Bin
 {resources => themes/core}/js/daux.js         |   0
 .../core}/js/highlight.min.js                 |   0
 .../core}/js/jquery-1.11.3.min.js             |   0
 .../core}/less/bootstrap/alerts.less          |   0
 .../core}/less/bootstrap/badges.less          |   0
 .../core}/less/bootstrap/bootstrap.less       |   0
 .../core}/less/bootstrap/breadcrumbs.less     |   0
 .../core}/less/bootstrap/button-groups.less   |   0
 .../core}/less/bootstrap/buttons.less         |   0
 .../core}/less/bootstrap/carousel.less        |   0
 .../core}/less/bootstrap/close.less           |   0
 .../core}/less/bootstrap/code.less            |   0
 .../less/bootstrap/component-animations.less  |   0
 .../core}/less/bootstrap/dropdowns.less       |   0
 .../core}/less/bootstrap/forms.less           |   0
 .../core}/less/bootstrap/glyphicons.less      |   0
 .../core}/less/bootstrap/grid.less            |   0
 .../core}/less/bootstrap/input-groups.less    |   0
 .../core}/less/bootstrap/jumbotron.less       |   0
 .../core}/less/bootstrap/labels.less          |   0
 .../core}/less/bootstrap/list-group.less      |   0
 .../core}/less/bootstrap/media.less           |   0
 .../core}/less/bootstrap/mixins.less          |   0
 .../core}/less/bootstrap/mixins/alerts.less   |   0
 .../bootstrap/mixins/background-variant.less  |   0
 .../less/bootstrap/mixins/border-radius.less  |   0
 .../core}/less/bootstrap/mixins/buttons.less  |   0
 .../less/bootstrap/mixins/center-block.less   |   0
 .../core}/less/bootstrap/mixins/clearfix.less |   0
 .../core}/less/bootstrap/mixins/forms.less    |   0
 .../less/bootstrap/mixins/gradients.less      |   0
 .../less/bootstrap/mixins/grid-framework.less |   0
 .../core}/less/bootstrap/mixins/grid.less     |   0
 .../less/bootstrap/mixins/hide-text.less      |   0
 .../core}/less/bootstrap/mixins/image.less    |   0
 .../core}/less/bootstrap/mixins/labels.less   |   0
 .../less/bootstrap/mixins/list-group.less     |   0
 .../less/bootstrap/mixins/nav-divider.less    |   0
 .../bootstrap/mixins/nav-vertical-align.less  |   0
 .../core}/less/bootstrap/mixins/opacity.less  |   0
 .../less/bootstrap/mixins/pagination.less     |   0
 .../core}/less/bootstrap/mixins/panels.less   |   0
 .../less/bootstrap/mixins/progress-bar.less   |   0
 .../less/bootstrap/mixins/reset-filter.less   |   0
 .../less/bootstrap/mixins/reset-text.less     |   0
 .../core}/less/bootstrap/mixins/resize.less   |   0
 .../mixins/responsive-visibility.less         |   0
 .../core}/less/bootstrap/mixins/size.less     |   0
 .../less/bootstrap/mixins/tab-focus.less      |   0
 .../less/bootstrap/mixins/table-row.less      |   0
 .../less/bootstrap/mixins/text-emphasis.less  |   0
 .../less/bootstrap/mixins/text-overflow.less  |   0
 .../bootstrap/mixins/vendor-prefixes.less     |   0
 .../core}/less/bootstrap/modals.less          |   0
 .../core}/less/bootstrap/navbar.less          |   0
 .../core}/less/bootstrap/navs.less            |   0
 .../core}/less/bootstrap/normalize.less       |   0
 .../core}/less/bootstrap/pager.less           |   0
 .../core}/less/bootstrap/pagination.less      |   0
 .../core}/less/bootstrap/panels.less          |   0
 .../core}/less/bootstrap/popovers.less        |   0
 .../core}/less/bootstrap/print.less           |   0
 .../core}/less/bootstrap/progress-bars.less   |   0
 .../less/bootstrap/responsive-embed.less      |   0
 .../less/bootstrap/responsive-utilities.less  |   0
 .../core}/less/bootstrap/scaffolding.less     |   0
 .../core}/less/bootstrap/tables.less          |   0
 .../core}/less/bootstrap/theme.less           |   0
 .../core}/less/bootstrap/thumbnails.less      |   0
 .../core}/less/bootstrap/tooltip.less         |   0
 .../core}/less/bootstrap/type.less            |   0
 .../core}/less/bootstrap/utilities.less       |   0
 .../core}/less/bootstrap/variables.less       |   0
 .../core}/less/bootstrap/wells.less           |   0
 .../core}/less/components.less                |   0
 .../core}/less/daux-base.less                 |   0
 .../core}/less/highlight.less                 |   0
 .../_common => themes/core}/less/mixins.less  |   0
 .../core}/less/structure.less                 |   0
 .../core/templates}/content.php               |   0
 .../core/templates}/error.php                 |   0
 {templates => themes/core/templates}/home.php |   0
 .../core/templates}/layout/00_layout.php      |   0
 .../core/templates}/layout/05_page.php        |   0
 .../templates}/partials/google_analytics.php  |   0
 .../templates}/partials/navbar_content.php    |   0
 .../templates}/partials/piwik_analytics.php   |   0
 themes/daux-blue/config.json                  |   8 ++++++++
 .../daux-blue/css/theme.min.css               |   0
 .../fonts/glyphicons-halflings-regular.eot    | Bin
 .../fonts/glyphicons-halflings-regular.svg    |   0
 .../fonts/glyphicons-halflings-regular.ttf    | Bin
 .../fonts/glyphicons-halflings-regular.woff   | Bin
 .../fonts/glyphicons-halflings-regular.woff2  | Bin
 .../daux-blue/img/favicon-blue.png            | Bin
 .../daux-blue/less/theme.less                 |   2 +-
 .../themes => themes}/daux-green/config.json  |   0
 .../daux-green/css/theme.min.css              |   0
 .../fonts/glyphicons-halflings-regular.eot    | Bin
 .../fonts/glyphicons-halflings-regular.svg    |   0
 .../fonts/glyphicons-halflings-regular.ttf    | Bin
 .../fonts/glyphicons-halflings-regular.woff   | Bin
 .../fonts/glyphicons-halflings-regular.woff2  | Bin
 .../daux-green/img/favicon-green.png          | Bin
 .../daux-green/less/theme.less                |   2 +-
 .../themes => themes}/daux-navy/config.json   |   0
 .../daux-navy/css/theme.min.css               |   0
 .../fonts/glyphicons-halflings-regular.eot    | Bin
 .../fonts/glyphicons-halflings-regular.svg    |   0
 .../fonts/glyphicons-halflings-regular.ttf    | Bin
 .../fonts/glyphicons-halflings-regular.woff   | Bin
 .../fonts/glyphicons-halflings-regular.woff2  | Bin
 .../daux-navy/img/favicon-navy.png            | Bin
 .../daux-navy/less/theme.less                 |   2 +-
 .../themes => themes}/daux-red/config.json    |   0
 .../daux-red/css/theme.min.css                |   0
 .../fonts/glyphicons-halflings-regular.eot    | Bin
 .../fonts/glyphicons-halflings-regular.svg    |   0
 .../fonts/glyphicons-halflings-regular.ttf    | Bin
 .../fonts/glyphicons-halflings-regular.woff   | Bin
 .../fonts/glyphicons-halflings-regular.woff2  | Bin
 .../daux-red/img/favicon-red.png              | Bin
 .../daux-red/less/theme.less                  |   2 +-
 129 files changed, 34 insertions(+), 8 deletions(-)
 rename {resources/themes/daux-blue => themes/core}/config.json (100%)
 rename {resources => themes/core}/img/favicon.png (100%)
 rename {resources => themes/core}/js/daux.js (100%)
 rename {resources => themes/core}/js/highlight.min.js (100%)
 rename {resources => themes/core}/js/jquery-1.11.3.min.js (100%)
 rename {resources/themes/_common => themes/core}/less/bootstrap/alerts.less (100%)
 rename {resources/themes/_common => themes/core}/less/bootstrap/badges.less (100%)
 rename {resources/themes/_common => themes/core}/less/bootstrap/bootstrap.less (100%)
 rename {resources/themes/_common => themes/core}/less/bootstrap/breadcrumbs.less (100%)
 rename {resources/themes/_common => themes/core}/less/bootstrap/button-groups.less (100%)
 rename {resources/themes/_common => themes/core}/less/bootstrap/buttons.less (100%)
 rename {resources/themes/_common => themes/core}/less/bootstrap/carousel.less (100%)
 rename {resources/themes/_common => themes/core}/less/bootstrap/close.less (100%)
 rename {resources/themes/_common => themes/core}/less/bootstrap/code.less (100%)
 rename {resources/themes/_common => themes/core}/less/bootstrap/component-animations.less (100%)
 rename {resources/themes/_common => themes/core}/less/bootstrap/dropdowns.less (100%)
 rename {resources/themes/_common => themes/core}/less/bootstrap/forms.less (100%)
 rename {resources/themes/_common => themes/core}/less/bootstrap/glyphicons.less (100%)
 rename {resources/themes/_common => themes/core}/less/bootstrap/grid.less (100%)
 rename {resources/themes/_common => themes/core}/less/bootstrap/input-groups.less (100%)
 rename {resources/themes/_common => themes/core}/less/bootstrap/jumbotron.less (100%)
 rename {resources/themes/_common => themes/core}/less/bootstrap/labels.less (100%)
 rename {resources/themes/_common => themes/core}/less/bootstrap/list-group.less (100%)
 rename {resources/themes/_common => themes/core}/less/bootstrap/media.less (100%)
 rename {resources/themes/_common => themes/core}/less/bootstrap/mixins.less (100%)
 rename {resources/themes/_common => themes/core}/less/bootstrap/mixins/alerts.less (100%)
 rename {resources/themes/_common => themes/core}/less/bootstrap/mixins/background-variant.less (100%)
 rename {resources/themes/_common => themes/core}/less/bootstrap/mixins/border-radius.less (100%)
 rename {resources/themes/_common => themes/core}/less/bootstrap/mixins/buttons.less (100%)
 rename {resources/themes/_common => themes/core}/less/bootstrap/mixins/center-block.less (100%)
 rename {resources/themes/_common => themes/core}/less/bootstrap/mixins/clearfix.less (100%)
 rename {resources/themes/_common => themes/core}/less/bootstrap/mixins/forms.less (100%)
 rename {resources/themes/_common => themes/core}/less/bootstrap/mixins/gradients.less (100%)
 rename {resources/themes/_common => themes/core}/less/bootstrap/mixins/grid-framework.less (100%)
 rename {resources/themes/_common => themes/core}/less/bootstrap/mixins/grid.less (100%)
 rename {resources/themes/_common => themes/core}/less/bootstrap/mixins/hide-text.less (100%)
 rename {resources/themes/_common => themes/core}/less/bootstrap/mixins/image.less (100%)
 rename {resources/themes/_common => themes/core}/less/bootstrap/mixins/labels.less (100%)
 rename {resources/themes/_common => themes/core}/less/bootstrap/mixins/list-group.less (100%)
 rename {resources/themes/_common => themes/core}/less/bootstrap/mixins/nav-divider.less (100%)
 rename {resources/themes/_common => themes/core}/less/bootstrap/mixins/nav-vertical-align.less (100%)
 rename {resources/themes/_common => themes/core}/less/bootstrap/mixins/opacity.less (100%)
 rename {resources/themes/_common => themes/core}/less/bootstrap/mixins/pagination.less (100%)
 rename {resources/themes/_common => themes/core}/less/bootstrap/mixins/panels.less (100%)
 rename {resources/themes/_common => themes/core}/less/bootstrap/mixins/progress-bar.less (100%)
 rename {resources/themes/_common => themes/core}/less/bootstrap/mixins/reset-filter.less (100%)
 rename {resources/themes/_common => themes/core}/less/bootstrap/mixins/reset-text.less (100%)
 rename {resources/themes/_common => themes/core}/less/bootstrap/mixins/resize.less (100%)
 rename {resources/themes/_common => themes/core}/less/bootstrap/mixins/responsive-visibility.less (100%)
 rename {resources/themes/_common => themes/core}/less/bootstrap/mixins/size.less (100%)
 rename {resources/themes/_common => themes/core}/less/bootstrap/mixins/tab-focus.less (100%)
 rename {resources/themes/_common => themes/core}/less/bootstrap/mixins/table-row.less (100%)
 rename {resources/themes/_common => themes/core}/less/bootstrap/mixins/text-emphasis.less (100%)
 rename {resources/themes/_common => themes/core}/less/bootstrap/mixins/text-overflow.less (100%)
 rename {resources/themes/_common => themes/core}/less/bootstrap/mixins/vendor-prefixes.less (100%)
 rename {resources/themes/_common => themes/core}/less/bootstrap/modals.less (100%)
 rename {resources/themes/_common => themes/core}/less/bootstrap/navbar.less (100%)
 rename {resources/themes/_common => themes/core}/less/bootstrap/navs.less (100%)
 rename {resources/themes/_common => themes/core}/less/bootstrap/normalize.less (100%)
 rename {resources/themes/_common => themes/core}/less/bootstrap/pager.less (100%)
 rename {resources/themes/_common => themes/core}/less/bootstrap/pagination.less (100%)
 rename {resources/themes/_common => themes/core}/less/bootstrap/panels.less (100%)
 rename {resources/themes/_common => themes/core}/less/bootstrap/popovers.less (100%)
 rename {resources/themes/_common => themes/core}/less/bootstrap/print.less (100%)
 rename {resources/themes/_common => themes/core}/less/bootstrap/progress-bars.less (100%)
 rename {resources/themes/_common => themes/core}/less/bootstrap/responsive-embed.less (100%)
 rename {resources/themes/_common => themes/core}/less/bootstrap/responsive-utilities.less (100%)
 rename {resources/themes/_common => themes/core}/less/bootstrap/scaffolding.less (100%)
 rename {resources/themes/_common => themes/core}/less/bootstrap/tables.less (100%)
 rename {resources/themes/_common => themes/core}/less/bootstrap/theme.less (100%)
 rename {resources/themes/_common => themes/core}/less/bootstrap/thumbnails.less (100%)
 rename {resources/themes/_common => themes/core}/less/bootstrap/tooltip.less (100%)
 rename {resources/themes/_common => themes/core}/less/bootstrap/type.less (100%)
 rename {resources/themes/_common => themes/core}/less/bootstrap/utilities.less (100%)
 rename {resources/themes/_common => themes/core}/less/bootstrap/variables.less (100%)
 rename {resources/themes/_common => themes/core}/less/bootstrap/wells.less (100%)
 rename {resources/themes/_common => themes/core}/less/components.less (100%)
 rename {resources/themes/_common => themes/core}/less/daux-base.less (100%)
 rename {resources/themes/_common => themes/core}/less/highlight.less (100%)
 rename {resources/themes/_common => themes/core}/less/mixins.less (100%)
 rename {resources/themes/_common => themes/core}/less/structure.less (100%)
 rename {templates => themes/core/templates}/content.php (100%)
 rename {templates => themes/core/templates}/error.php (100%)
 rename {templates => themes/core/templates}/home.php (100%)
 rename {templates => themes/core/templates}/layout/00_layout.php (100%)
 rename {templates => themes/core/templates}/layout/05_page.php (100%)
 rename {templates => themes/core/templates}/partials/google_analytics.php (100%)
 rename {templates => themes/core/templates}/partials/navbar_content.php (100%)
 rename {templates => themes/core/templates}/partials/piwik_analytics.php (100%)
 create mode 100644 themes/daux-blue/config.json
 rename {resources/themes => themes}/daux-blue/css/theme.min.css (100%)
 rename {resources/themes => themes}/daux-blue/fonts/glyphicons-halflings-regular.eot (100%)
 rename {resources/themes => themes}/daux-blue/fonts/glyphicons-halflings-regular.svg (100%)
 rename {resources/themes => themes}/daux-blue/fonts/glyphicons-halflings-regular.ttf (100%)
 rename {resources/themes => themes}/daux-blue/fonts/glyphicons-halflings-regular.woff (100%)
 rename {resources/themes => themes}/daux-blue/fonts/glyphicons-halflings-regular.woff2 (100%)
 rename {resources/themes => themes}/daux-blue/img/favicon-blue.png (100%)
 rename {resources/themes => themes}/daux-blue/less/theme.less (84%)
 rename {resources/themes => themes}/daux-green/config.json (100%)
 rename {resources/themes => themes}/daux-green/css/theme.min.css (100%)
 rename {resources/themes => themes}/daux-green/fonts/glyphicons-halflings-regular.eot (100%)
 rename {resources/themes => themes}/daux-green/fonts/glyphicons-halflings-regular.svg (100%)
 rename {resources/themes => themes}/daux-green/fonts/glyphicons-halflings-regular.ttf (100%)
 rename {resources/themes => themes}/daux-green/fonts/glyphicons-halflings-regular.woff (100%)
 rename {resources/themes => themes}/daux-green/fonts/glyphicons-halflings-regular.woff2 (100%)
 rename {resources/themes => themes}/daux-green/img/favicon-green.png (100%)
 rename {resources/themes => themes}/daux-green/less/theme.less (84%)
 rename {resources/themes => themes}/daux-navy/config.json (100%)
 rename {resources/themes => themes}/daux-navy/css/theme.min.css (100%)
 rename {resources/themes => themes}/daux-navy/fonts/glyphicons-halflings-regular.eot (100%)
 rename {resources/themes => themes}/daux-navy/fonts/glyphicons-halflings-regular.svg (100%)
 rename {resources/themes => themes}/daux-navy/fonts/glyphicons-halflings-regular.ttf (100%)
 rename {resources/themes => themes}/daux-navy/fonts/glyphicons-halflings-regular.woff (100%)
 rename {resources/themes => themes}/daux-navy/fonts/glyphicons-halflings-regular.woff2 (100%)
 rename {resources/themes => themes}/daux-navy/img/favicon-navy.png (100%)
 rename {resources/themes => themes}/daux-navy/less/theme.less (84%)
 rename {resources/themes => themes}/daux-red/config.json (100%)
 rename {resources/themes => themes}/daux-red/css/theme.min.css (100%)
 rename {resources/themes => themes}/daux-red/fonts/glyphicons-halflings-regular.eot (100%)
 rename {resources/themes => themes}/daux-red/fonts/glyphicons-halflings-regular.svg (100%)
 rename {resources/themes => themes}/daux-red/fonts/glyphicons-halflings-regular.ttf (100%)
 rename {resources/themes => themes}/daux-red/fonts/glyphicons-halflings-regular.woff (100%)
 rename {resources/themes => themes}/daux-red/fonts/glyphicons-halflings-regular.woff2 (100%)
 rename {resources/themes => themes}/daux-red/img/favicon-red.png (100%)
 rename {resources/themes => themes}/daux-red/less/theme.less (84%)

diff --git a/global.json b/global.json
index de192f9..a75c8a0 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,6 @@
 {
     "docs_directory": "docs",
+    "themes_directory": "themes",
 
     "title": "My Project",
     "tagline": "My Stylish Documentation",
diff --git a/libs/Daux.php b/libs/Daux.php
index a29eb07..bedc7f5 100644
--- a/libs/Daux.php
+++ b/libs/Daux.php
@@ -30,6 +30,9 @@ class Daux
     /** @var string */
     private $docs_path;
 
+    /** @var string */
+    private $themes_path;
+
     /** @var Processor */
     protected $processor;
 
@@ -90,6 +93,18 @@ class Daux
         }
     }
 
+    public function setThemesPath($path)
+    {
+        $this->themes_path = $path;
+        if (!is_dir($this->themes_path) &&
+            !is_dir($this->themes_path = $this->local_base . DIRECTORY_SEPARATOR . $this->themes_path)
+        ) {
+            throw new Exception('The Themes directory does not exist. Check the path again : ' . $this->themes_path);
+        }
+        $this->options['themes_path'] = $this->themes_path;
+        $this->options['templates'] = $this->themes_path . DIRECTORY_SEPARATOR . 'core' . DIRECTORY_SEPARATOR . 'templates';
+    }
+
     public function setDocumentationPath($path)
     {
         $this->docs_path = $path;
@@ -98,6 +113,7 @@ class Daux
         ) {
             throw new Exception('The Docs directory does not exist. Check the path again : ' . $this->docs_path);
         }
+        $this->options['docs_path'] = $this->docs_path;
     }
 
     /**
@@ -172,7 +188,8 @@ class Daux
                 'mode' => $this->mode,
                 'local_base' => $this->local_base,
                 'docs_path' => $this->docs_path,
-                'templates' => $this->internal_base . DIRECTORY_SEPARATOR . 'templates',
+                'themes_path' => $this->themes_path,
+                'templates' => $this->themes_path . DIRECTORY_SEPARATOR . 'core' . DIRECTORY_SEPARATOR . 'templates'
             ];
             $this->options->conservativeMerge($default);
 
diff --git a/libs/DauxHelper.php b/libs/DauxHelper.php
index f826fd1..756606f 100644
--- a/libs/DauxHelper.php
+++ b/libs/DauxHelper.php
@@ -30,9 +30,8 @@ class DauxHelper
      */
     public static function getTheme($params, $current_url)
     {
-        $theme_folder = $params['local_base'] . DIRECTORY_SEPARATOR . 'resources' .
-            DIRECTORY_SEPARATOR . 'themes' . DIRECTORY_SEPARATOR . $params['html']['theme'];
-        $theme_url = $params['base_url'] . "resources/themes/" . $params['html']['theme'] . '/';
+        $theme_folder = $params['themes_path'] . DIRECTORY_SEPARATOR . $params['html']['theme'];
+        $theme_url = $params['base_url'] . $params['themes_directory'] . '/' . $params['html']['theme'] . '/';
 
         $theme = array();
         if (is_file($theme_folder . DIRECTORY_SEPARATOR . "config.json")) {
diff --git a/libs/Server/Server.php b/libs/Server/Server.php
index 42746e1..a0d5b61 100644
--- a/libs/Server/Server.php
+++ b/libs/Server/Server.php
@@ -22,6 +22,7 @@ class Server
     public static function serve()
     {
         $daux = new Daux(Daux::LIVE_MODE);
+        $daux->setThemesPath($daux->getParams()['themes_directory']);
         $daux->setDocumentationPath($daux->getParams()['docs_directory']);
         $daux->initializeConfiguration();
 
diff --git a/resources/themes/daux-blue/config.json b/themes/core/config.json
similarity index 100%
rename from resources/themes/daux-blue/config.json
rename to themes/core/config.json
diff --git a/resources/img/favicon.png b/themes/core/img/favicon.png
similarity index 100%
rename from resources/img/favicon.png
rename to themes/core/img/favicon.png
diff --git a/resources/js/daux.js b/themes/core/js/daux.js
similarity index 100%
rename from resources/js/daux.js
rename to themes/core/js/daux.js
diff --git a/resources/js/highlight.min.js b/themes/core/js/highlight.min.js
similarity index 100%
rename from resources/js/highlight.min.js
rename to themes/core/js/highlight.min.js
diff --git a/resources/js/jquery-1.11.3.min.js b/themes/core/js/jquery-1.11.3.min.js
similarity index 100%
rename from resources/js/jquery-1.11.3.min.js
rename to themes/core/js/jquery-1.11.3.min.js
diff --git a/resources/themes/_common/less/bootstrap/alerts.less b/themes/core/less/bootstrap/alerts.less
similarity index 100%
rename from resources/themes/_common/less/bootstrap/alerts.less
rename to themes/core/less/bootstrap/alerts.less
diff --git a/resources/themes/_common/less/bootstrap/badges.less b/themes/core/less/bootstrap/badges.less
similarity index 100%
rename from resources/themes/_common/less/bootstrap/badges.less
rename to themes/core/less/bootstrap/badges.less
diff --git a/resources/themes/_common/less/bootstrap/bootstrap.less b/themes/core/less/bootstrap/bootstrap.less
similarity index 100%
rename from resources/themes/_common/less/bootstrap/bootstrap.less
rename to themes/core/less/bootstrap/bootstrap.less
diff --git a/resources/themes/_common/less/bootstrap/breadcrumbs.less b/themes/core/less/bootstrap/breadcrumbs.less
similarity index 100%
rename from resources/themes/_common/less/bootstrap/breadcrumbs.less
rename to themes/core/less/bootstrap/breadcrumbs.less
diff --git a/resources/themes/_common/less/bootstrap/button-groups.less b/themes/core/less/bootstrap/button-groups.less
similarity index 100%
rename from resources/themes/_common/less/bootstrap/button-groups.less
rename to themes/core/less/bootstrap/button-groups.less
diff --git a/resources/themes/_common/less/bootstrap/buttons.less b/themes/core/less/bootstrap/buttons.less
similarity index 100%
rename from resources/themes/_common/less/bootstrap/buttons.less
rename to themes/core/less/bootstrap/buttons.less
diff --git a/resources/themes/_common/less/bootstrap/carousel.less b/themes/core/less/bootstrap/carousel.less
similarity index 100%
rename from resources/themes/_common/less/bootstrap/carousel.less
rename to themes/core/less/bootstrap/carousel.less
diff --git a/resources/themes/_common/less/bootstrap/close.less b/themes/core/less/bootstrap/close.less
similarity index 100%
rename from resources/themes/_common/less/bootstrap/close.less
rename to themes/core/less/bootstrap/close.less
diff --git a/resources/themes/_common/less/bootstrap/code.less b/themes/core/less/bootstrap/code.less
similarity index 100%
rename from resources/themes/_common/less/bootstrap/code.less
rename to themes/core/less/bootstrap/code.less
diff --git a/resources/themes/_common/less/bootstrap/component-animations.less b/themes/core/less/bootstrap/component-animations.less
similarity index 100%
rename from resources/themes/_common/less/bootstrap/component-animations.less
rename to themes/core/less/bootstrap/component-animations.less
diff --git a/resources/themes/_common/less/bootstrap/dropdowns.less b/themes/core/less/bootstrap/dropdowns.less
similarity index 100%
rename from resources/themes/_common/less/bootstrap/dropdowns.less
rename to themes/core/less/bootstrap/dropdowns.less
diff --git a/resources/themes/_common/less/bootstrap/forms.less b/themes/core/less/bootstrap/forms.less
similarity index 100%
rename from resources/themes/_common/less/bootstrap/forms.less
rename to themes/core/less/bootstrap/forms.less
diff --git a/resources/themes/_common/less/bootstrap/glyphicons.less b/themes/core/less/bootstrap/glyphicons.less
similarity index 100%
rename from resources/themes/_common/less/bootstrap/glyphicons.less
rename to themes/core/less/bootstrap/glyphicons.less
diff --git a/resources/themes/_common/less/bootstrap/grid.less b/themes/core/less/bootstrap/grid.less
similarity index 100%
rename from resources/themes/_common/less/bootstrap/grid.less
rename to themes/core/less/bootstrap/grid.less
diff --git a/resources/themes/_common/less/bootstrap/input-groups.less b/themes/core/less/bootstrap/input-groups.less
similarity index 100%
rename from resources/themes/_common/less/bootstrap/input-groups.less
rename to themes/core/less/bootstrap/input-groups.less
diff --git a/resources/themes/_common/less/bootstrap/jumbotron.less b/themes/core/less/bootstrap/jumbotron.less
similarity index 100%
rename from resources/themes/_common/less/bootstrap/jumbotron.less
rename to themes/core/less/bootstrap/jumbotron.less
diff --git a/resources/themes/_common/less/bootstrap/labels.less b/themes/core/less/bootstrap/labels.less
similarity index 100%
rename from resources/themes/_common/less/bootstrap/labels.less
rename to themes/core/less/bootstrap/labels.less
diff --git a/resources/themes/_common/less/bootstrap/list-group.less b/themes/core/less/bootstrap/list-group.less
similarity index 100%
rename from resources/themes/_common/less/bootstrap/list-group.less
rename to themes/core/less/bootstrap/list-group.less
diff --git a/resources/themes/_common/less/bootstrap/media.less b/themes/core/less/bootstrap/media.less
similarity index 100%
rename from resources/themes/_common/less/bootstrap/media.less
rename to themes/core/less/bootstrap/media.less
diff --git a/resources/themes/_common/less/bootstrap/mixins.less b/themes/core/less/bootstrap/mixins.less
similarity index 100%
rename from resources/themes/_common/less/bootstrap/mixins.less
rename to themes/core/less/bootstrap/mixins.less
diff --git a/resources/themes/_common/less/bootstrap/mixins/alerts.less b/themes/core/less/bootstrap/mixins/alerts.less
similarity index 100%
rename from resources/themes/_common/less/bootstrap/mixins/alerts.less
rename to themes/core/less/bootstrap/mixins/alerts.less
diff --git a/resources/themes/_common/less/bootstrap/mixins/background-variant.less b/themes/core/less/bootstrap/mixins/background-variant.less
similarity index 100%
rename from resources/themes/_common/less/bootstrap/mixins/background-variant.less
rename to themes/core/less/bootstrap/mixins/background-variant.less
diff --git a/resources/themes/_common/less/bootstrap/mixins/border-radius.less b/themes/core/less/bootstrap/mixins/border-radius.less
similarity index 100%
rename from resources/themes/_common/less/bootstrap/mixins/border-radius.less
rename to themes/core/less/bootstrap/mixins/border-radius.less
diff --git a/resources/themes/_common/less/bootstrap/mixins/buttons.less b/themes/core/less/bootstrap/mixins/buttons.less
similarity index 100%
rename from resources/themes/_common/less/bootstrap/mixins/buttons.less
rename to themes/core/less/bootstrap/mixins/buttons.less
diff --git a/resources/themes/_common/less/bootstrap/mixins/center-block.less b/themes/core/less/bootstrap/mixins/center-block.less
similarity index 100%
rename from resources/themes/_common/less/bootstrap/mixins/center-block.less
rename to themes/core/less/bootstrap/mixins/center-block.less
diff --git a/resources/themes/_common/less/bootstrap/mixins/clearfix.less b/themes/core/less/bootstrap/mixins/clearfix.less
similarity index 100%
rename from resources/themes/_common/less/bootstrap/mixins/clearfix.less
rename to themes/core/less/bootstrap/mixins/clearfix.less
diff --git a/resources/themes/_common/less/bootstrap/mixins/forms.less b/themes/core/less/bootstrap/mixins/forms.less
similarity index 100%
rename from resources/themes/_common/less/bootstrap/mixins/forms.less
rename to themes/core/less/bootstrap/mixins/forms.less
diff --git a/resources/themes/_common/less/bootstrap/mixins/gradients.less b/themes/core/less/bootstrap/mixins/gradients.less
similarity index 100%
rename from resources/themes/_common/less/bootstrap/mixins/gradients.less
rename to themes/core/less/bootstrap/mixins/gradients.less
diff --git a/resources/themes/_common/less/bootstrap/mixins/grid-framework.less b/themes/core/less/bootstrap/mixins/grid-framework.less
similarity index 100%
rename from resources/themes/_common/less/bootstrap/mixins/grid-framework.less
rename to themes/core/less/bootstrap/mixins/grid-framework.less
diff --git a/resources/themes/_common/less/bootstrap/mixins/grid.less b/themes/core/less/bootstrap/mixins/grid.less
similarity index 100%
rename from resources/themes/_common/less/bootstrap/mixins/grid.less
rename to themes/core/less/bootstrap/mixins/grid.less
diff --git a/resources/themes/_common/less/bootstrap/mixins/hide-text.less b/themes/core/less/bootstrap/mixins/hide-text.less
similarity index 100%
rename from resources/themes/_common/less/bootstrap/mixins/hide-text.less
rename to themes/core/less/bootstrap/mixins/hide-text.less
diff --git a/resources/themes/_common/less/bootstrap/mixins/image.less b/themes/core/less/bootstrap/mixins/image.less
similarity index 100%
rename from resources/themes/_common/less/bootstrap/mixins/image.less
rename to themes/core/less/bootstrap/mixins/image.less
diff --git a/resources/themes/_common/less/bootstrap/mixins/labels.less b/themes/core/less/bootstrap/mixins/labels.less
similarity index 100%
rename from resources/themes/_common/less/bootstrap/mixins/labels.less
rename to themes/core/less/bootstrap/mixins/labels.less
diff --git a/resources/themes/_common/less/bootstrap/mixins/list-group.less b/themes/core/less/bootstrap/mixins/list-group.less
similarity index 100%
rename from resources/themes/_common/less/bootstrap/mixins/list-group.less
rename to themes/core/less/bootstrap/mixins/list-group.less
diff --git a/resources/themes/_common/less/bootstrap/mixins/nav-divider.less b/themes/core/less/bootstrap/mixins/nav-divider.less
similarity index 100%
rename from resources/themes/_common/less/bootstrap/mixins/nav-divider.less
rename to themes/core/less/bootstrap/mixins/nav-divider.less
diff --git a/resources/themes/_common/less/bootstrap/mixins/nav-vertical-align.less b/themes/core/less/bootstrap/mixins/nav-vertical-align.less
similarity index 100%
rename from resources/themes/_common/less/bootstrap/mixins/nav-vertical-align.less
rename to themes/core/less/bootstrap/mixins/nav-vertical-align.less
diff --git a/resources/themes/_common/less/bootstrap/mixins/opacity.less b/themes/core/less/bootstrap/mixins/opacity.less
similarity index 100%
rename from resources/themes/_common/less/bootstrap/mixins/opacity.less
rename to themes/core/less/bootstrap/mixins/opacity.less
diff --git a/resources/themes/_common/less/bootstrap/mixins/pagination.less b/themes/core/less/bootstrap/mixins/pagination.less
similarity index 100%
rename from resources/themes/_common/less/bootstrap/mixins/pagination.less
rename to themes/core/less/bootstrap/mixins/pagination.less
diff --git a/resources/themes/_common/less/bootstrap/mixins/panels.less b/themes/core/less/bootstrap/mixins/panels.less
similarity index 100%
rename from resources/themes/_common/less/bootstrap/mixins/panels.less
rename to themes/core/less/bootstrap/mixins/panels.less
diff --git a/resources/themes/_common/less/bootstrap/mixins/progress-bar.less b/themes/core/less/bootstrap/mixins/progress-bar.less
similarity index 100%
rename from resources/themes/_common/less/bootstrap/mixins/progress-bar.less
rename to themes/core/less/bootstrap/mixins/progress-bar.less
diff --git a/resources/themes/_common/less/bootstrap/mixins/reset-filter.less b/themes/core/less/bootstrap/mixins/reset-filter.less
similarity index 100%
rename from resources/themes/_common/less/bootstrap/mixins/reset-filter.less
rename to themes/core/less/bootstrap/mixins/reset-filter.less
diff --git a/resources/themes/_common/less/bootstrap/mixins/reset-text.less b/themes/core/less/bootstrap/mixins/reset-text.less
similarity index 100%
rename from resources/themes/_common/less/bootstrap/mixins/reset-text.less
rename to themes/core/less/bootstrap/mixins/reset-text.less
diff --git a/resources/themes/_common/less/bootstrap/mixins/resize.less b/themes/core/less/bootstrap/mixins/resize.less
similarity index 100%
rename from resources/themes/_common/less/bootstrap/mixins/resize.less
rename to themes/core/less/bootstrap/mixins/resize.less
diff --git a/resources/themes/_common/less/bootstrap/mixins/responsive-visibility.less b/themes/core/less/bootstrap/mixins/responsive-visibility.less
similarity index 100%
rename from resources/themes/_common/less/bootstrap/mixins/responsive-visibility.less
rename to themes/core/less/bootstrap/mixins/responsive-visibility.less
diff --git a/resources/themes/_common/less/bootstrap/mixins/size.less b/themes/core/less/bootstrap/mixins/size.less
similarity index 100%
rename from resources/themes/_common/less/bootstrap/mixins/size.less
rename to themes/core/less/bootstrap/mixins/size.less
diff --git a/resources/themes/_common/less/bootstrap/mixins/tab-focus.less b/themes/core/less/bootstrap/mixins/tab-focus.less
similarity index 100%
rename from resources/themes/_common/less/bootstrap/mixins/tab-focus.less
rename to themes/core/less/bootstrap/mixins/tab-focus.less
diff --git a/resources/themes/_common/less/bootstrap/mixins/table-row.less b/themes/core/less/bootstrap/mixins/table-row.less
similarity index 100%
rename from resources/themes/_common/less/bootstrap/mixins/table-row.less
rename to themes/core/less/bootstrap/mixins/table-row.less
diff --git a/resources/themes/_common/less/bootstrap/mixins/text-emphasis.less b/themes/core/less/bootstrap/mixins/text-emphasis.less
similarity index 100%
rename from resources/themes/_common/less/bootstrap/mixins/text-emphasis.less
rename to themes/core/less/bootstrap/mixins/text-emphasis.less
diff --git a/resources/themes/_common/less/bootstrap/mixins/text-overflow.less b/themes/core/less/bootstrap/mixins/text-overflow.less
similarity index 100%
rename from resources/themes/_common/less/bootstrap/mixins/text-overflow.less
rename to themes/core/less/bootstrap/mixins/text-overflow.less
diff --git a/resources/themes/_common/less/bootstrap/mixins/vendor-prefixes.less b/themes/core/less/bootstrap/mixins/vendor-prefixes.less
similarity index 100%
rename from resources/themes/_common/less/bootstrap/mixins/vendor-prefixes.less
rename to themes/core/less/bootstrap/mixins/vendor-prefixes.less
diff --git a/resources/themes/_common/less/bootstrap/modals.less b/themes/core/less/bootstrap/modals.less
similarity index 100%
rename from resources/themes/_common/less/bootstrap/modals.less
rename to themes/core/less/bootstrap/modals.less
diff --git a/resources/themes/_common/less/bootstrap/navbar.less b/themes/core/less/bootstrap/navbar.less
similarity index 100%
rename from resources/themes/_common/less/bootstrap/navbar.less
rename to themes/core/less/bootstrap/navbar.less
diff --git a/resources/themes/_common/less/bootstrap/navs.less b/themes/core/less/bootstrap/navs.less
similarity index 100%
rename from resources/themes/_common/less/bootstrap/navs.less
rename to themes/core/less/bootstrap/navs.less
diff --git a/resources/themes/_common/less/bootstrap/normalize.less b/themes/core/less/bootstrap/normalize.less
similarity index 100%
rename from resources/themes/_common/less/bootstrap/normalize.less
rename to themes/core/less/bootstrap/normalize.less
diff --git a/resources/themes/_common/less/bootstrap/pager.less b/themes/core/less/bootstrap/pager.less
similarity index 100%
rename from resources/themes/_common/less/bootstrap/pager.less
rename to themes/core/less/bootstrap/pager.less
diff --git a/resources/themes/_common/less/bootstrap/pagination.less b/themes/core/less/bootstrap/pagination.less
similarity index 100%
rename from resources/themes/_common/less/bootstrap/pagination.less
rename to themes/core/less/bootstrap/pagination.less
diff --git a/resources/themes/_common/less/bootstrap/panels.less b/themes/core/less/bootstrap/panels.less
similarity index 100%
rename from resources/themes/_common/less/bootstrap/panels.less
rename to themes/core/less/bootstrap/panels.less
diff --git a/resources/themes/_common/less/bootstrap/popovers.less b/themes/core/less/bootstrap/popovers.less
similarity index 100%
rename from resources/themes/_common/less/bootstrap/popovers.less
rename to themes/core/less/bootstrap/popovers.less
diff --git a/resources/themes/_common/less/bootstrap/print.less b/themes/core/less/bootstrap/print.less
similarity index 100%
rename from resources/themes/_common/less/bootstrap/print.less
rename to themes/core/less/bootstrap/print.less
diff --git a/resources/themes/_common/less/bootstrap/progress-bars.less b/themes/core/less/bootstrap/progress-bars.less
similarity index 100%
rename from resources/themes/_common/less/bootstrap/progress-bars.less
rename to themes/core/less/bootstrap/progress-bars.less
diff --git a/resources/themes/_common/less/bootstrap/responsive-embed.less b/themes/core/less/bootstrap/responsive-embed.less
similarity index 100%
rename from resources/themes/_common/less/bootstrap/responsive-embed.less
rename to themes/core/less/bootstrap/responsive-embed.less
diff --git a/resources/themes/_common/less/bootstrap/responsive-utilities.less b/themes/core/less/bootstrap/responsive-utilities.less
similarity index 100%
rename from resources/themes/_common/less/bootstrap/responsive-utilities.less
rename to themes/core/less/bootstrap/responsive-utilities.less
diff --git a/resources/themes/_common/less/bootstrap/scaffolding.less b/themes/core/less/bootstrap/scaffolding.less
similarity index 100%
rename from resources/themes/_common/less/bootstrap/scaffolding.less
rename to themes/core/less/bootstrap/scaffolding.less
diff --git a/resources/themes/_common/less/bootstrap/tables.less b/themes/core/less/bootstrap/tables.less
similarity index 100%
rename from resources/themes/_common/less/bootstrap/tables.less
rename to themes/core/less/bootstrap/tables.less
diff --git a/resources/themes/_common/less/bootstrap/theme.less b/themes/core/less/bootstrap/theme.less
similarity index 100%
rename from resources/themes/_common/less/bootstrap/theme.less
rename to themes/core/less/bootstrap/theme.less
diff --git a/resources/themes/_common/less/bootstrap/thumbnails.less b/themes/core/less/bootstrap/thumbnails.less
similarity index 100%
rename from resources/themes/_common/less/bootstrap/thumbnails.less
rename to themes/core/less/bootstrap/thumbnails.less
diff --git a/resources/themes/_common/less/bootstrap/tooltip.less b/themes/core/less/bootstrap/tooltip.less
similarity index 100%
rename from resources/themes/_common/less/bootstrap/tooltip.less
rename to themes/core/less/bootstrap/tooltip.less
diff --git a/resources/themes/_common/less/bootstrap/type.less b/themes/core/less/bootstrap/type.less
similarity index 100%
rename from resources/themes/_common/less/bootstrap/type.less
rename to themes/core/less/bootstrap/type.less
diff --git a/resources/themes/_common/less/bootstrap/utilities.less b/themes/core/less/bootstrap/utilities.less
similarity index 100%
rename from resources/themes/_common/less/bootstrap/utilities.less
rename to themes/core/less/bootstrap/utilities.less
diff --git a/resources/themes/_common/less/bootstrap/variables.less b/themes/core/less/bootstrap/variables.less
similarity index 100%
rename from resources/themes/_common/less/bootstrap/variables.less
rename to themes/core/less/bootstrap/variables.less
diff --git a/resources/themes/_common/less/bootstrap/wells.less b/themes/core/less/bootstrap/wells.less
similarity index 100%
rename from resources/themes/_common/less/bootstrap/wells.less
rename to themes/core/less/bootstrap/wells.less
diff --git a/resources/themes/_common/less/components.less b/themes/core/less/components.less
similarity index 100%
rename from resources/themes/_common/less/components.less
rename to themes/core/less/components.less
diff --git a/resources/themes/_common/less/daux-base.less b/themes/core/less/daux-base.less
similarity index 100%
rename from resources/themes/_common/less/daux-base.less
rename to themes/core/less/daux-base.less
diff --git a/resources/themes/_common/less/highlight.less b/themes/core/less/highlight.less
similarity index 100%
rename from resources/themes/_common/less/highlight.less
rename to themes/core/less/highlight.less
diff --git a/resources/themes/_common/less/mixins.less b/themes/core/less/mixins.less
similarity index 100%
rename from resources/themes/_common/less/mixins.less
rename to themes/core/less/mixins.less
diff --git a/resources/themes/_common/less/structure.less b/themes/core/less/structure.less
similarity index 100%
rename from resources/themes/_common/less/structure.less
rename to themes/core/less/structure.less
diff --git a/templates/content.php b/themes/core/templates/content.php
similarity index 100%
rename from templates/content.php
rename to themes/core/templates/content.php
diff --git a/templates/error.php b/themes/core/templates/error.php
similarity index 100%
rename from templates/error.php
rename to themes/core/templates/error.php
diff --git a/templates/home.php b/themes/core/templates/home.php
similarity index 100%
rename from templates/home.php
rename to themes/core/templates/home.php
diff --git a/templates/layout/00_layout.php b/themes/core/templates/layout/00_layout.php
similarity index 100%
rename from templates/layout/00_layout.php
rename to themes/core/templates/layout/00_layout.php
diff --git a/templates/layout/05_page.php b/themes/core/templates/layout/05_page.php
similarity index 100%
rename from templates/layout/05_page.php
rename to themes/core/templates/layout/05_page.php
diff --git a/templates/partials/google_analytics.php b/themes/core/templates/partials/google_analytics.php
similarity index 100%
rename from templates/partials/google_analytics.php
rename to themes/core/templates/partials/google_analytics.php
diff --git a/templates/partials/navbar_content.php b/themes/core/templates/partials/navbar_content.php
similarity index 100%
rename from templates/partials/navbar_content.php
rename to themes/core/templates/partials/navbar_content.php
diff --git a/templates/partials/piwik_analytics.php b/themes/core/templates/partials/piwik_analytics.php
similarity index 100%
rename from templates/partials/piwik_analytics.php
rename to themes/core/templates/partials/piwik_analytics.php
diff --git a/themes/daux-blue/config.json b/themes/daux-blue/config.json
new file mode 100644
index 0000000..67968d8
--- /dev/null
+++ b/themes/daux-blue/config.json
@@ -0,0 +1,8 @@
+{
+    "favicon": "<theme_url>img/favicon-blue.png",
+    "css": ["<theme_url>css/theme.min.css"],
+    "fonts": ["//fonts.googleapis.com/css?family=Roboto+Slab:400,100,300,700&subset=latin,cyrillic-ext,cyrillic"],
+    "js": [],
+    "require-jquery": true,
+    "bootstrap-js": false
+}
diff --git a/resources/themes/daux-blue/css/theme.min.css b/themes/daux-blue/css/theme.min.css
similarity index 100%
rename from resources/themes/daux-blue/css/theme.min.css
rename to themes/daux-blue/css/theme.min.css
diff --git a/resources/themes/daux-blue/fonts/glyphicons-halflings-regular.eot b/themes/daux-blue/fonts/glyphicons-halflings-regular.eot
similarity index 100%
rename from resources/themes/daux-blue/fonts/glyphicons-halflings-regular.eot
rename to themes/daux-blue/fonts/glyphicons-halflings-regular.eot
diff --git a/resources/themes/daux-blue/fonts/glyphicons-halflings-regular.svg b/themes/daux-blue/fonts/glyphicons-halflings-regular.svg
similarity index 100%
rename from resources/themes/daux-blue/fonts/glyphicons-halflings-regular.svg
rename to themes/daux-blue/fonts/glyphicons-halflings-regular.svg
diff --git a/resources/themes/daux-blue/fonts/glyphicons-halflings-regular.ttf b/themes/daux-blue/fonts/glyphicons-halflings-regular.ttf
similarity index 100%
rename from resources/themes/daux-blue/fonts/glyphicons-halflings-regular.ttf
rename to themes/daux-blue/fonts/glyphicons-halflings-regular.ttf
diff --git a/resources/themes/daux-blue/fonts/glyphicons-halflings-regular.woff b/themes/daux-blue/fonts/glyphicons-halflings-regular.woff
similarity index 100%
rename from resources/themes/daux-blue/fonts/glyphicons-halflings-regular.woff
rename to themes/daux-blue/fonts/glyphicons-halflings-regular.woff
diff --git a/resources/themes/daux-blue/fonts/glyphicons-halflings-regular.woff2 b/themes/daux-blue/fonts/glyphicons-halflings-regular.woff2
similarity index 100%
rename from resources/themes/daux-blue/fonts/glyphicons-halflings-regular.woff2
rename to themes/daux-blue/fonts/glyphicons-halflings-regular.woff2
diff --git a/resources/themes/daux-blue/img/favicon-blue.png b/themes/daux-blue/img/favicon-blue.png
similarity index 100%
rename from resources/themes/daux-blue/img/favicon-blue.png
rename to themes/daux-blue/img/favicon-blue.png
diff --git a/resources/themes/daux-blue/less/theme.less b/themes/daux-blue/less/theme.less
similarity index 84%
rename from resources/themes/daux-blue/less/theme.less
rename to themes/daux-blue/less/theme.less
index 34e67ae..024d3a1 100644
--- a/resources/themes/daux-blue/less/theme.less
+++ b/themes/daux-blue/less/theme.less
@@ -10,4 +10,4 @@
 @syntax-number: #2f9b92;
 @syntax-label: #840d7a;
 
-@import "../../_common/less/daux-base.less";
+@import "../../core/less/daux-base.less";
diff --git a/resources/themes/daux-green/config.json b/themes/daux-green/config.json
similarity index 100%
rename from resources/themes/daux-green/config.json
rename to themes/daux-green/config.json
diff --git a/resources/themes/daux-green/css/theme.min.css b/themes/daux-green/css/theme.min.css
similarity index 100%
rename from resources/themes/daux-green/css/theme.min.css
rename to themes/daux-green/css/theme.min.css
diff --git a/resources/themes/daux-green/fonts/glyphicons-halflings-regular.eot b/themes/daux-green/fonts/glyphicons-halflings-regular.eot
similarity index 100%
rename from resources/themes/daux-green/fonts/glyphicons-halflings-regular.eot
rename to themes/daux-green/fonts/glyphicons-halflings-regular.eot
diff --git a/resources/themes/daux-green/fonts/glyphicons-halflings-regular.svg b/themes/daux-green/fonts/glyphicons-halflings-regular.svg
similarity index 100%
rename from resources/themes/daux-green/fonts/glyphicons-halflings-regular.svg
rename to themes/daux-green/fonts/glyphicons-halflings-regular.svg
diff --git a/resources/themes/daux-green/fonts/glyphicons-halflings-regular.ttf b/themes/daux-green/fonts/glyphicons-halflings-regular.ttf
similarity index 100%
rename from resources/themes/daux-green/fonts/glyphicons-halflings-regular.ttf
rename to themes/daux-green/fonts/glyphicons-halflings-regular.ttf
diff --git a/resources/themes/daux-green/fonts/glyphicons-halflings-regular.woff b/themes/daux-green/fonts/glyphicons-halflings-regular.woff
similarity index 100%
rename from resources/themes/daux-green/fonts/glyphicons-halflings-regular.woff
rename to themes/daux-green/fonts/glyphicons-halflings-regular.woff
diff --git a/resources/themes/daux-green/fonts/glyphicons-halflings-regular.woff2 b/themes/daux-green/fonts/glyphicons-halflings-regular.woff2
similarity index 100%
rename from resources/themes/daux-green/fonts/glyphicons-halflings-regular.woff2
rename to themes/daux-green/fonts/glyphicons-halflings-regular.woff2
diff --git a/resources/themes/daux-green/img/favicon-green.png b/themes/daux-green/img/favicon-green.png
similarity index 100%
rename from resources/themes/daux-green/img/favicon-green.png
rename to themes/daux-green/img/favicon-green.png
diff --git a/resources/themes/daux-green/less/theme.less b/themes/daux-green/less/theme.less
similarity index 84%
rename from resources/themes/daux-green/less/theme.less
rename to themes/daux-green/less/theme.less
index 1798077..5125a12 100644
--- a/resources/themes/daux-green/less/theme.less
+++ b/themes/daux-green/less/theme.less
@@ -10,4 +10,4 @@
 @syntax-number: #097c4e;
 @syntax-label: #022e99;
 
-@import "../../_common/less/daux-base.less";
+@import "../../core/less/daux-base.less";
diff --git a/resources/themes/daux-navy/config.json b/themes/daux-navy/config.json
similarity index 100%
rename from resources/themes/daux-navy/config.json
rename to themes/daux-navy/config.json
diff --git a/resources/themes/daux-navy/css/theme.min.css b/themes/daux-navy/css/theme.min.css
similarity index 100%
rename from resources/themes/daux-navy/css/theme.min.css
rename to themes/daux-navy/css/theme.min.css
diff --git a/resources/themes/daux-navy/fonts/glyphicons-halflings-regular.eot b/themes/daux-navy/fonts/glyphicons-halflings-regular.eot
similarity index 100%
rename from resources/themes/daux-navy/fonts/glyphicons-halflings-regular.eot
rename to themes/daux-navy/fonts/glyphicons-halflings-regular.eot
diff --git a/resources/themes/daux-navy/fonts/glyphicons-halflings-regular.svg b/themes/daux-navy/fonts/glyphicons-halflings-regular.svg
similarity index 100%
rename from resources/themes/daux-navy/fonts/glyphicons-halflings-regular.svg
rename to themes/daux-navy/fonts/glyphicons-halflings-regular.svg
diff --git a/resources/themes/daux-navy/fonts/glyphicons-halflings-regular.ttf b/themes/daux-navy/fonts/glyphicons-halflings-regular.ttf
similarity index 100%
rename from resources/themes/daux-navy/fonts/glyphicons-halflings-regular.ttf
rename to themes/daux-navy/fonts/glyphicons-halflings-regular.ttf
diff --git a/resources/themes/daux-navy/fonts/glyphicons-halflings-regular.woff b/themes/daux-navy/fonts/glyphicons-halflings-regular.woff
similarity index 100%
rename from resources/themes/daux-navy/fonts/glyphicons-halflings-regular.woff
rename to themes/daux-navy/fonts/glyphicons-halflings-regular.woff
diff --git a/resources/themes/daux-navy/fonts/glyphicons-halflings-regular.woff2 b/themes/daux-navy/fonts/glyphicons-halflings-regular.woff2
similarity index 100%
rename from resources/themes/daux-navy/fonts/glyphicons-halflings-regular.woff2
rename to themes/daux-navy/fonts/glyphicons-halflings-regular.woff2
diff --git a/resources/themes/daux-navy/img/favicon-navy.png b/themes/daux-navy/img/favicon-navy.png
similarity index 100%
rename from resources/themes/daux-navy/img/favicon-navy.png
rename to themes/daux-navy/img/favicon-navy.png
diff --git a/resources/themes/daux-navy/less/theme.less b/themes/daux-navy/less/theme.less
similarity index 84%
rename from resources/themes/daux-navy/less/theme.less
rename to themes/daux-navy/less/theme.less
index c28f574..b6ca0f6 100644
--- a/resources/themes/daux-navy/less/theme.less
+++ b/themes/daux-navy/less/theme.less
@@ -10,4 +10,4 @@
 @syntax-number: #09559b;
 @syntax-label: #001775;
 
-@import "../../_common/less/daux-base.less";
+@import "../../core/less/daux-base.less";
diff --git a/resources/themes/daux-red/config.json b/themes/daux-red/config.json
similarity index 100%
rename from resources/themes/daux-red/config.json
rename to themes/daux-red/config.json
diff --git a/resources/themes/daux-red/css/theme.min.css b/themes/daux-red/css/theme.min.css
similarity index 100%
rename from resources/themes/daux-red/css/theme.min.css
rename to themes/daux-red/css/theme.min.css
diff --git a/resources/themes/daux-red/fonts/glyphicons-halflings-regular.eot b/themes/daux-red/fonts/glyphicons-halflings-regular.eot
similarity index 100%
rename from resources/themes/daux-red/fonts/glyphicons-halflings-regular.eot
rename to themes/daux-red/fonts/glyphicons-halflings-regular.eot
diff --git a/resources/themes/daux-red/fonts/glyphicons-halflings-regular.svg b/themes/daux-red/fonts/glyphicons-halflings-regular.svg
similarity index 100%
rename from resources/themes/daux-red/fonts/glyphicons-halflings-regular.svg
rename to themes/daux-red/fonts/glyphicons-halflings-regular.svg
diff --git a/resources/themes/daux-red/fonts/glyphicons-halflings-regular.ttf b/themes/daux-red/fonts/glyphicons-halflings-regular.ttf
similarity index 100%
rename from resources/themes/daux-red/fonts/glyphicons-halflings-regular.ttf
rename to themes/daux-red/fonts/glyphicons-halflings-regular.ttf
diff --git a/resources/themes/daux-red/fonts/glyphicons-halflings-regular.woff b/themes/daux-red/fonts/glyphicons-halflings-regular.woff
similarity index 100%
rename from resources/themes/daux-red/fonts/glyphicons-halflings-regular.woff
rename to themes/daux-red/fonts/glyphicons-halflings-regular.woff
diff --git a/resources/themes/daux-red/fonts/glyphicons-halflings-regular.woff2 b/themes/daux-red/fonts/glyphicons-halflings-regular.woff2
similarity index 100%
rename from resources/themes/daux-red/fonts/glyphicons-halflings-regular.woff2
rename to themes/daux-red/fonts/glyphicons-halflings-regular.woff2
diff --git a/resources/themes/daux-red/img/favicon-red.png b/themes/daux-red/img/favicon-red.png
similarity index 100%
rename from resources/themes/daux-red/img/favicon-red.png
rename to themes/daux-red/img/favicon-red.png
diff --git a/resources/themes/daux-red/less/theme.less b/themes/daux-red/less/theme.less
similarity index 84%
rename from resources/themes/daux-red/less/theme.less
rename to themes/daux-red/less/theme.less
index 217d9f0..93355a0 100644
--- a/resources/themes/daux-red/less/theme.less
+++ b/themes/daux-red/less/theme.less
@@ -10,4 +10,4 @@
 @syntax-number: #9b2f7d;
 @syntax-label: #a31621;
 
-@import "../../_common/less/daux-base.less";
+@import "../../core/less/daux-base.less";