diff --git a/.gitignore b/.gitignore
index e4979f318..94f83ba4b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+.idea
 .DS_Store
 .vagrant
 app/assets/*
diff --git a/app/cache/.gitignore b/app/cache/.gitignore
deleted file mode 100644
index 35c8ca2ee..000000000
--- a/app/cache/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-!.htaccess
diff --git a/app/cache/.htaccess b/app/cache/.htaccess
deleted file mode 100644
index 93169e4eb..000000000
--- a/app/cache/.htaccess
+++ /dev/null
@@ -1,2 +0,0 @@
-Order deny,allow
-Deny from all
diff --git a/app/config/config.inc.default.php b/app/config/config.inc.default.php
index 09095235d..f77ef5660 100755
--- a/app/config/config.inc.default.php
+++ b/app/config/config.inc.default.php
@@ -67,7 +67,7 @@
 @define ('DEFAULT_THEME', 'baggy');
 
 @define ('THEME', ROOT . '/themes');
-@define ('LOCALE', ROOT . '/src/Wallabag/Wallabag/Resources/translations/locale');
+@define ('LOCALE', ROOT . '/src/Wallabag/Wallabag/Resources/translations');
 @define ('CACHE', ROOT . '/app/cache');
 
 @define ('PAGINATION', '12');
diff --git a/app/db/poche.sqlite b/app/db/poche.sqlite
index 3d1a8e43b..9e9e52cb1 100755
Binary files a/app/db/poche.sqlite and b/app/db/poche.sqlite differ
diff --git a/composer.json b/composer.json
index a1dee4108..e04ec2526 100644
--- a/composer.json
+++ b/composer.json
@@ -75,7 +75,7 @@
         "phpunit/phpunit": "~3.7"
     },
     "autoload": {
-        "psr-0": { "Wallabag\\Wallabag": "src/" }
+        "psr-4": { "Wallabag\\": "src/Wallabag" }
     },
     "config": {
         "bin-dir": "bin"
diff --git a/composer.lock b/composer.lock
index 9888e4c42..f2c174810 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "7915fd3c1343f447145fb167b0bb4d36",
+    "hash": "6fa216371c9d7577a117526db6f07407",
     "packages": [
         {
             "name": "ezyang/htmlpurifier",
diff --git a/src/Wallabag/Wallabag/Database.php b/src/Wallabag/Wallabag/Database.php
index afda69de5..fa1329101 100755
--- a/src/Wallabag/Wallabag/Database.php
+++ b/src/Wallabag/Wallabag/Database.php
@@ -10,6 +10,8 @@
 
 namespace Wallabag\Wallabag;
 
+use \PDO;
+
 class Database {
 
     var $handle;
diff --git a/src/Wallabag/Wallabag/Language.php b/src/Wallabag/Wallabag/Language.php
index 434118176..a8fbbc355 100644
--- a/src/Wallabag/Wallabag/Language.php
+++ b/src/Wallabag/Wallabag/Language.php
@@ -10,6 +10,8 @@
 
 namespace Wallabag\Wallabag;
 
+use \Session;
+
 class Language
 {
     protected $wallabag;
@@ -38,7 +40,7 @@ class Language
         $pocheUser = Session::getParam('poche_user');
         $language  = (is_null($pocheUser) ? LANG : $pocheUser->getConfigValue('language'));
 
-        @putenv('LC_ALL=' . $language);
+        putenv('LC_ALL=' . $language);
         setlocale(LC_ALL, $language);
         bindtextdomain($language, LOCALE);
         textdomain($language);
diff --git a/src/Wallabag/Wallabag/Template.php b/src/Wallabag/Wallabag/Template.php
index e8a6daa3b..d0fc9b071 100644
--- a/src/Wallabag/Wallabag/Template.php
+++ b/src/Wallabag/Wallabag/Template.php
@@ -10,6 +10,13 @@
 
 namespace Wallabag\Wallabag;
 
+use \Twig_Environment;
+use \Session;
+use \Twig_Loader_Chain;
+use \Twig_Loader_Filesystem;
+use \Twig_Extensions_Extension_I18n;
+use \Twig_SimpleFilter;
+
 class Template extends Twig_Environment
 {
     protected $wallabag;
@@ -117,11 +124,11 @@ class Template extends Twig_Environment
         $this->addExtension(new Twig_Extensions_Extension_I18n());
 
         # filter to display domain name of an url
-        $filter = new Twig_SimpleFilter('getDomain', 'Tools::getDomain');
+        $filter = new Twig_SimpleFilter('getDomain', 'Wallabag\\Wallabag\\Tools::getDomain');
         $this->addFilter($filter);
 
         # filter for reading time
-        $filter = new Twig_SimpleFilter('getReadingTime', 'Tools::getReadingTime');
+        $filter = new Twig_SimpleFilter('getReadingTime', 'Wallabag\\Wallabag\\Tools::getReadingTime');
         $this->addFilter($filter);
     }
 
diff --git a/src/Wallabag/Wallabag/Tools.php b/src/Wallabag/Wallabag/Tools.php
index 19d98614a..9350c6601 100755
--- a/src/Wallabag/Wallabag/Tools.php
+++ b/src/Wallabag/Wallabag/Tools.php
@@ -10,6 +10,9 @@
 
 namespace Wallabag\Wallabag;
 
+use \RecursiveIteratorIterator;
+use \RecursiveDirectoryIterator;
+
 final class Tools
 {
     /**
diff --git a/src/Wallabag/Wallabag/Wallabag.php b/src/Wallabag/Wallabag/Wallabag.php
index c172a95d1..0a498ebf1 100755
--- a/src/Wallabag/Wallabag/Wallabag.php
+++ b/src/Wallabag/Wallabag/Wallabag.php
@@ -10,6 +10,11 @@
 
 namespace Wallabag\Wallabag;
 
+use \Paginator;
+use \Session;
+use \Messages;
+use \FeedWriter;
+
 class Wallabag
 {
     /**
@@ -50,7 +55,7 @@ class Wallabag
     {
         Tools::initPhp();
 
-        $pocheUser = Session::getParam('poche_user');
+        $pocheUser = \Session::getParam('poche_user');
 
         if ($pocheUser && $pocheUser != array()) {
             $this->user = $pocheUser;
diff --git a/themes/_global/css/jquery-ui-1.10.4.custom.css b/themes/_global/public/css/jquery-ui-1.10.4.custom.css
similarity index 100%
rename from themes/_global/css/jquery-ui-1.10.4.custom.css
rename to themes/_global/public/css/jquery-ui-1.10.4.custom.css
diff --git a/themes/_global/css/jquery-ui-1.10.4.custom.min.css b/themes/_global/public/css/jquery-ui-1.10.4.custom.min.css
similarity index 100%
rename from themes/_global/css/jquery-ui-1.10.4.custom.min.css
rename to themes/_global/public/css/jquery-ui-1.10.4.custom.min.css
diff --git a/themes/_global/img/appicon/apple-touch-icon-114.png b/themes/_global/public/img/appicon/apple-touch-icon-114.png
similarity index 100%
rename from themes/_global/img/appicon/apple-touch-icon-114.png
rename to themes/_global/public/img/appicon/apple-touch-icon-114.png
diff --git a/themes/_global/img/appicon/apple-touch-icon-120.png b/themes/_global/public/img/appicon/apple-touch-icon-120.png
similarity index 100%
rename from themes/_global/img/appicon/apple-touch-icon-120.png
rename to themes/_global/public/img/appicon/apple-touch-icon-120.png
diff --git a/themes/_global/img/appicon/apple-touch-icon-144.png b/themes/_global/public/img/appicon/apple-touch-icon-144.png
similarity index 100%
rename from themes/_global/img/appicon/apple-touch-icon-144.png
rename to themes/_global/public/img/appicon/apple-touch-icon-144.png
diff --git a/themes/_global/img/appicon/apple-touch-icon-152.png b/themes/_global/public/img/appicon/apple-touch-icon-152.png
similarity index 100%
rename from themes/_global/img/appicon/apple-touch-icon-152.png
rename to themes/_global/public/img/appicon/apple-touch-icon-152.png
diff --git a/themes/_global/img/appicon/apple-touch-icon-57.png b/themes/_global/public/img/appicon/apple-touch-icon-57.png
similarity index 100%
rename from themes/_global/img/appicon/apple-touch-icon-57.png
rename to themes/_global/public/img/appicon/apple-touch-icon-57.png
diff --git a/themes/_global/img/appicon/apple-touch-icon-72.png b/themes/_global/public/img/appicon/apple-touch-icon-72.png
similarity index 100%
rename from themes/_global/img/appicon/apple-touch-icon-72.png
rename to themes/_global/public/img/appicon/apple-touch-icon-72.png
diff --git a/themes/_global/img/appicon/apple-touch-icon-76.png b/themes/_global/public/img/appicon/apple-touch-icon-76.png
similarity index 100%
rename from themes/_global/img/appicon/apple-touch-icon-76.png
rename to themes/_global/public/img/appicon/apple-touch-icon-76.png
diff --git a/themes/_global/img/appicon/apple-touch-icon.png b/themes/_global/public/img/appicon/apple-touch-icon.png
similarity index 100%
rename from themes/_global/img/appicon/apple-touch-icon.png
rename to themes/_global/public/img/appicon/apple-touch-icon.png
diff --git a/themes/_global/img/appicon/favicon.ico b/themes/_global/public/img/appicon/favicon.ico
similarity index 100%
rename from themes/_global/img/appicon/favicon.ico
rename to themes/_global/public/img/appicon/favicon.ico
diff --git a/themes/_global/img/icons/carrot-icon--black.png b/themes/_global/public/img/icons/carrot-icon--black.png
similarity index 100%
rename from themes/_global/img/icons/carrot-icon--black.png
rename to themes/_global/public/img/icons/carrot-icon--black.png
diff --git a/themes/_global/img/icons/carrot-icon--white.png b/themes/_global/public/img/icons/carrot-icon--white.png
similarity index 100%
rename from themes/_global/img/icons/carrot-icon--white.png
rename to themes/_global/public/img/icons/carrot-icon--white.png
diff --git a/themes/_global/img/icons/diaspora-icon--black.png b/themes/_global/public/img/icons/diaspora-icon--black.png
similarity index 100%
rename from themes/_global/img/icons/diaspora-icon--black.png
rename to themes/_global/public/img/icons/diaspora-icon--black.png
diff --git a/themes/_global/img/icons/diaspora-icon--white.png b/themes/_global/public/img/icons/diaspora-icon--white.png
similarity index 100%
rename from themes/_global/img/icons/diaspora-icon--white.png
rename to themes/_global/public/img/icons/diaspora-icon--white.png
diff --git a/themes/_global/js/autoClose.js b/themes/_global/public/js/autoClose.js
similarity index 100%
rename from themes/_global/js/autoClose.js
rename to themes/_global/public/js/autoClose.js
diff --git a/themes/_global/js/autoCompleteTags.js b/themes/_global/public/js/autoCompleteTags.js
similarity index 100%
rename from themes/_global/js/autoCompleteTags.js
rename to themes/_global/public/js/autoCompleteTags.js
diff --git a/themes/_global/js/jquery-2.0.3.min.js b/themes/_global/public/js/jquery-2.0.3.min.js
similarity index 100%
rename from themes/_global/js/jquery-2.0.3.min.js
rename to themes/_global/public/js/jquery-2.0.3.min.js
diff --git a/themes/_global/js/jquery-ui-1.10.4.custom.js b/themes/_global/public/js/jquery-ui-1.10.4.custom.js
similarity index 100%
rename from themes/_global/js/jquery-ui-1.10.4.custom.js
rename to themes/_global/public/js/jquery-ui-1.10.4.custom.js
diff --git a/themes/_global/js/jquery-ui-1.10.4.custom.min.js b/themes/_global/public/js/jquery-ui-1.10.4.custom.min.js
similarity index 100%
rename from themes/_global/js/jquery-ui-1.10.4.custom.min.js
rename to themes/_global/public/js/jquery-ui-1.10.4.custom.min.js
diff --git a/themes/_global/js/popupForm.js b/themes/_global/public/js/popupForm.js
similarity index 100%
rename from themes/_global/js/popupForm.js
rename to themes/_global/public/js/popupForm.js
diff --git a/themes/_global/js/restoreScroll.js b/themes/_global/public/js/restoreScroll.js
similarity index 100%
rename from themes/_global/js/restoreScroll.js
rename to themes/_global/public/js/restoreScroll.js
diff --git a/themes/_global/js/saveLink.js b/themes/_global/public/js/saveLink.js
similarity index 100%
rename from themes/_global/js/saveLink.js
rename to themes/_global/public/js/saveLink.js
diff --git a/themes/baggy/about.twig b/themes/baggy/about.twig
index 110196a62..d18fe1567 100755
--- a/themes/baggy/about.twig
+++ b/themes/baggy/about.twig
@@ -24,7 +24,7 @@
         <dd><a href="http://en.wikipedia.org/wiki/MIT_License">MIT</a></dd>
 
         <dt>{% trans "Version" %}</dt>
-        <dd>{{ constant('POCHE') }}</dd>
+        <dd>{{ constant('WALLABAG') }}</dd>
     </dl>
 
     <p>{% trans "wallabag is a read-it-later application: you can save a web page by keeping only content. Elements like ads or menus are deleted." %}</p>
diff --git a/themes/baggy/config.twig b/themes/baggy/config.twig
index a5a615597..6031f489c 100755
--- a/themes/baggy/config.twig
+++ b/themes/baggy/config.twig
@@ -178,7 +178,7 @@
 
             <h2>{% trans "Upgrading wallabag" %}</h2>
             <ul>
-                <li>{% trans "Installed version" %}: <strong>{{ constant('POCHE') }}</strong></li>
+                <li>{% trans "Installed version" %}: <strong>{{ constant('WALLABAG') }}</strong></li>
                 <li>{% trans "Latest stable version" %}: {{ prod }}. {% if compare_prod == -1 %}<strong><a href="http://wallabag.org/">{% trans "A more recent stable version is available." %}</a></strong>{% else %}{% trans "You are up to date." %}{% endif %} ({% trans "Last check:" %} {{ check_time_prod }})</li>
                 {% if constant('DEBUG_POCHE') == 1 %}<li>{% trans "Latest dev version" %}: {{ dev }}. {% if compare_dev == -1 %}<strong><a href="http://wallabag.org/">{% trans "A more recent development version is available." %}</a></strong>{% else %}{% trans "You are up to date." %}{% endif %} ({% trans "Last check:" %} {{ check_time_dev }}){% endif %}</li>
             </ul>
diff --git a/themes/baggy/css/font.css b/themes/baggy/public/css/font.css
similarity index 100%
rename from themes/baggy/css/font.css
rename to themes/baggy/public/css/font.css
diff --git a/themes/baggy/css/main.css b/themes/baggy/public/css/main.css
similarity index 100%
rename from themes/baggy/css/main.css
rename to themes/baggy/public/css/main.css
diff --git a/themes/baggy/css/messages.css b/themes/baggy/public/css/messages.css
similarity index 100%
rename from themes/baggy/css/messages.css
rename to themes/baggy/public/css/messages.css
diff --git a/themes/baggy/css/print.css b/themes/baggy/public/css/print.css
similarity index 100%
rename from themes/baggy/css/print.css
rename to themes/baggy/public/css/print.css
diff --git a/themes/baggy/css/ratatouille.css b/themes/baggy/public/css/ratatouille.css
similarity index 100%
rename from themes/baggy/css/ratatouille.css
rename to themes/baggy/public/css/ratatouille.css
diff --git a/themes/baggy/fonts/icomoon.eot b/themes/baggy/public/fonts/icomoon.eot
similarity index 100%
rename from themes/baggy/fonts/icomoon.eot
rename to themes/baggy/public/fonts/icomoon.eot
diff --git a/themes/baggy/fonts/icomoon.svg b/themes/baggy/public/fonts/icomoon.svg
similarity index 100%
rename from themes/baggy/fonts/icomoon.svg
rename to themes/baggy/public/fonts/icomoon.svg
diff --git a/themes/baggy/fonts/icomoon.ttf b/themes/baggy/public/fonts/icomoon.ttf
similarity index 100%
rename from themes/baggy/fonts/icomoon.ttf
rename to themes/baggy/public/fonts/icomoon.ttf
diff --git a/themes/baggy/fonts/icomoon.woff b/themes/baggy/public/fonts/icomoon.woff
similarity index 100%
rename from themes/baggy/fonts/icomoon.woff
rename to themes/baggy/public/fonts/icomoon.woff
diff --git a/themes/baggy/fonts/ptsans.woff b/themes/baggy/public/fonts/ptsans.woff
similarity index 100%
rename from themes/baggy/fonts/ptsans.woff
rename to themes/baggy/public/fonts/ptsans.woff
diff --git a/themes/baggy/img/baggy/blank.png b/themes/baggy/public/img/baggy/blank.png
similarity index 100%
rename from themes/baggy/img/baggy/blank.png
rename to themes/baggy/public/img/baggy/blank.png
diff --git a/themes/baggy/img/baggy/down.png b/themes/baggy/public/img/baggy/down.png
similarity index 100%
rename from themes/baggy/img/baggy/down.png
rename to themes/baggy/public/img/baggy/down.png
diff --git a/themes/baggy/img/baggy/list.png b/themes/baggy/public/img/baggy/list.png
similarity index 100%
rename from themes/baggy/img/baggy/list.png
rename to themes/baggy/public/img/baggy/list.png
diff --git a/themes/baggy/img/baggy/table.png b/themes/baggy/public/img/baggy/table.png
similarity index 100%
rename from themes/baggy/img/baggy/table.png
rename to themes/baggy/public/img/baggy/table.png
diff --git a/themes/baggy/img/baggy/top.png b/themes/baggy/public/img/baggy/top.png
similarity index 100%
rename from themes/baggy/img/baggy/top.png
rename to themes/baggy/public/img/baggy/top.png
diff --git a/themes/baggy/img/bg-select.png b/themes/baggy/public/img/bg-select.png
similarity index 100%
rename from themes/baggy/img/bg-select.png
rename to themes/baggy/public/img/bg-select.png
diff --git a/themes/baggy/img/logo-other_themes.png b/themes/baggy/public/img/logo-other_themes.png
similarity index 100%
rename from themes/baggy/img/logo-other_themes.png
rename to themes/baggy/public/img/logo-other_themes.png
diff --git a/themes/baggy/img/logo-w.png b/themes/baggy/public/img/logo-w.png
similarity index 100%
rename from themes/baggy/img/logo-w.png
rename to themes/baggy/public/img/logo-w.png
diff --git a/themes/baggy/img/logo-wallabag.svg b/themes/baggy/public/img/logo-wallabag.svg
similarity index 100%
rename from themes/baggy/img/logo-wallabag.svg
rename to themes/baggy/public/img/logo-wallabag.svg
diff --git a/themes/baggy/img/logo.png b/themes/baggy/public/img/logo.png
similarity index 100%
rename from themes/baggy/img/logo.png
rename to themes/baggy/public/img/logo.png
diff --git a/themes/baggy/img/logo.svg b/themes/baggy/public/img/logo.svg
similarity index 100%
rename from themes/baggy/img/logo.svg
rename to themes/baggy/public/img/logo.svg
diff --git a/themes/baggy/js/closeMessage.js b/themes/baggy/public/js/closeMessage.js
similarity index 100%
rename from themes/baggy/js/closeMessage.js
rename to themes/baggy/public/js/closeMessage.js
diff --git a/themes/baggy/js/init.js b/themes/baggy/public/js/init.js
similarity index 100%
rename from themes/baggy/js/init.js
rename to themes/baggy/public/js/init.js
diff --git a/themes/baggy/js/jquery.cookie.js b/themes/baggy/public/js/jquery.cookie.js
similarity index 100%
rename from themes/baggy/js/jquery.cookie.js
rename to themes/baggy/public/js/jquery.cookie.js
diff --git a/themes/baggy/js/restoreScroll.js b/themes/baggy/public/js/restoreScroll.js
similarity index 100%
rename from themes/baggy/js/restoreScroll.js
rename to themes/baggy/public/js/restoreScroll.js
diff --git a/themes/dark/css/style-dark.css b/themes/dark/public/css/style-dark.css
similarity index 100%
rename from themes/dark/css/style-dark.css
rename to themes/dark/public/css/style-dark.css
diff --git a/themes/dark/img/dark/backtotop.png b/themes/dark/public/img/dark/backtotop.png
similarity index 100%
rename from themes/dark/img/dark/backtotop.png
rename to themes/dark/public/img/dark/backtotop.png
diff --git a/themes/dark/img/dark/bad-display.png b/themes/dark/public/img/dark/bad-display.png
similarity index 100%
rename from themes/dark/img/dark/bad-display.png
rename to themes/dark/public/img/dark/bad-display.png
diff --git a/themes/dark/img/dark/checkmark-off.png b/themes/dark/public/img/dark/checkmark-off.png
similarity index 100%
rename from themes/dark/img/dark/checkmark-off.png
rename to themes/dark/public/img/dark/checkmark-off.png
diff --git a/themes/dark/img/dark/checkmark-on.png b/themes/dark/public/img/dark/checkmark-on.png
similarity index 100%
rename from themes/dark/img/dark/checkmark-on.png
rename to themes/dark/public/img/dark/checkmark-on.png
diff --git a/themes/dark/img/dark/down.png b/themes/dark/public/img/dark/down.png
similarity index 100%
rename from themes/dark/img/dark/down.png
rename to themes/dark/public/img/dark/down.png
diff --git a/themes/dark/img/dark/envelop.png b/themes/dark/public/img/dark/envelop.png
similarity index 100%
rename from themes/dark/img/dark/envelop.png
rename to themes/dark/public/img/dark/envelop.png
diff --git a/themes/dark/img/dark/flattr.png b/themes/dark/public/img/dark/flattr.png
similarity index 100%
rename from themes/dark/img/dark/flattr.png
rename to themes/dark/public/img/dark/flattr.png
diff --git a/themes/dark/img/dark/left.png b/themes/dark/public/img/dark/left.png
similarity index 100%
rename from themes/dark/img/dark/left.png
rename to themes/dark/public/img/dark/left.png
diff --git a/themes/dark/img/dark/link.png b/themes/dark/public/img/dark/link.png
similarity index 100%
rename from themes/dark/img/dark/link.png
rename to themes/dark/public/img/dark/link.png
diff --git a/themes/dark/img/dark/remove.png b/themes/dark/public/img/dark/remove.png
similarity index 100%
rename from themes/dark/img/dark/remove.png
rename to themes/dark/public/img/dark/remove.png
diff --git a/themes/dark/img/dark/rss.png b/themes/dark/public/img/dark/rss.png
similarity index 100%
rename from themes/dark/img/dark/rss.png
rename to themes/dark/public/img/dark/rss.png
diff --git a/themes/dark/img/dark/shaarli.png b/themes/dark/public/img/dark/shaarli.png
similarity index 100%
rename from themes/dark/img/dark/shaarli.png
rename to themes/dark/public/img/dark/shaarli.png
diff --git a/themes/dark/img/dark/star-off.png b/themes/dark/public/img/dark/star-off.png
similarity index 100%
rename from themes/dark/img/dark/star-off.png
rename to themes/dark/public/img/dark/star-off.png
diff --git a/themes/dark/img/dark/star-on.png b/themes/dark/public/img/dark/star-on.png
similarity index 100%
rename from themes/dark/img/dark/star-on.png
rename to themes/dark/public/img/dark/star-on.png
diff --git a/themes/dark/img/dark/top.png b/themes/dark/public/img/dark/top.png
similarity index 100%
rename from themes/dark/img/dark/top.png
rename to themes/dark/public/img/dark/top.png
diff --git a/themes/dark/img/dark/twitter.png b/themes/dark/public/img/dark/twitter.png
similarity index 100%
rename from themes/dark/img/dark/twitter.png
rename to themes/dark/public/img/dark/twitter.png
diff --git a/themes/dark/public/public b/themes/dark/public/public
new file mode 120000
index 000000000..fd316b377
--- /dev/null
+++ b/themes/dark/public/public
@@ -0,0 +1 @@
+../../themes/default/public
\ No newline at end of file
diff --git a/themes/default/_footer.twig b/themes/default/_footer.twig
index 3057cb755..213a4acad 100644
--- a/themes/default/_footer.twig
+++ b/themes/default/_footer.twig
@@ -1,4 +1,4 @@
         <footer class="w600p center mt3 mb3 smaller txtright">
             <p>{% trans "powered by" %} <a href="http://wallabag.org">wallabag</a></p>
-            {% if constant('DEBUG_POCHE') == 1 %}<p><strong>{% trans "debug mode is on so cache is off." %} {% trans "your wallabag version:" %}{{constant('POCHE')}}. {% trans "storage:" %} {{constant('STORAGE')}}</strong></p>{% endif %}
+            {% if constant('DEBUG_POCHE') == 1 %}<p><strong>{% trans "debug mode is on so cache is off." %} {% trans "your wallabag version:" %}{{constant('WALLABAG')}}. {% trans "storage:" %} {{constant('STORAGE')}}</strong></p>{% endif %}
         </footer>
\ No newline at end of file
diff --git a/themes/default/about.twig b/themes/default/about.twig
index 5ca3217c9..50ffd8ef4 100755
--- a/themes/default/about.twig
+++ b/themes/default/about.twig
@@ -24,7 +24,7 @@
         <dd><a href="http://en.wikipedia.org/wiki/MIT_License">MIT</a></dd>
 
         <dt>{% trans "Version" %}</dt>
-        <dd>{{ constant('POCHE') }}</dd>
+        <dd>{{ constant('WALLABAG') }}</dd>
     </dl>
 
     <p>{% trans "wallabag is a read-it-later application: you can save a web page by keeping only content. Elements like ads or menus are deleted." %}</p>
diff --git a/themes/default/config.twig b/themes/default/config.twig
index bac563cf2..b7d91937b 100755
--- a/themes/default/config.twig
+++ b/themes/default/config.twig
@@ -179,7 +179,7 @@
 
             <h2>{% trans "Upgrading wallabag" %}</h2>
             <ul>
-                <li>{% trans "Installed version" %}: <strong>{{ constant('POCHE') }}</strong></li>
+                <li>{% trans "Installed version" %}: <strong>{{ constant('WALLABAG') }}</strong></li>
                 <li>{% trans "Latest stable version" %}: {{ prod }}. {% if compare_prod == -1 %}<strong><a href="http://wallabag.org/">{% trans "A more recent stable version is available." %}</a></strong>{% else %}{% trans "You are up to date." %}{% endif %} ({% trans "Last check:" %} {{ check_time_prod }})</li>
                 {% if constant('DEBUG_POCHE') == 1 %}<li>{% trans "Latest dev version" %}: {{ dev }}. {% if compare_dev == -1 %}<strong><a href="http://wallabag.org/">{% trans "A more recent development version is available." %}</a></strong>{% else %}{% trans "You are up to date." %}{% endif %} ({% trans "Last check:" %} {{ check_time_dev }}){% endif %}</li>
             </ul>
diff --git a/themes/default/css/images/animated-overlay.gif b/themes/default/public/css/images/animated-overlay.gif
similarity index 100%
rename from themes/default/css/images/animated-overlay.gif
rename to themes/default/public/css/images/animated-overlay.gif
diff --git a/themes/default/css/images/ui-bg_flat_0_aaaaaa_40x100.png b/themes/default/public/css/images/ui-bg_flat_0_aaaaaa_40x100.png
similarity index 100%
rename from themes/default/css/images/ui-bg_flat_0_aaaaaa_40x100.png
rename to themes/default/public/css/images/ui-bg_flat_0_aaaaaa_40x100.png
diff --git a/themes/default/css/images/ui-bg_flat_75_ffffff_40x100.png b/themes/default/public/css/images/ui-bg_flat_75_ffffff_40x100.png
similarity index 100%
rename from themes/default/css/images/ui-bg_flat_75_ffffff_40x100.png
rename to themes/default/public/css/images/ui-bg_flat_75_ffffff_40x100.png
diff --git a/themes/default/css/images/ui-bg_glass_55_fbf9ee_1x400.png b/themes/default/public/css/images/ui-bg_glass_55_fbf9ee_1x400.png
similarity index 100%
rename from themes/default/css/images/ui-bg_glass_55_fbf9ee_1x400.png
rename to themes/default/public/css/images/ui-bg_glass_55_fbf9ee_1x400.png
diff --git a/themes/default/css/images/ui-bg_glass_65_ffffff_1x400.png b/themes/default/public/css/images/ui-bg_glass_65_ffffff_1x400.png
similarity index 100%
rename from themes/default/css/images/ui-bg_glass_65_ffffff_1x400.png
rename to themes/default/public/css/images/ui-bg_glass_65_ffffff_1x400.png
diff --git a/themes/default/css/images/ui-bg_glass_75_dadada_1x400.png b/themes/default/public/css/images/ui-bg_glass_75_dadada_1x400.png
similarity index 100%
rename from themes/default/css/images/ui-bg_glass_75_dadada_1x400.png
rename to themes/default/public/css/images/ui-bg_glass_75_dadada_1x400.png
diff --git a/themes/default/css/images/ui-bg_glass_75_e6e6e6_1x400.png b/themes/default/public/css/images/ui-bg_glass_75_e6e6e6_1x400.png
similarity index 100%
rename from themes/default/css/images/ui-bg_glass_75_e6e6e6_1x400.png
rename to themes/default/public/css/images/ui-bg_glass_75_e6e6e6_1x400.png
diff --git a/themes/default/css/images/ui-bg_glass_95_fef1ec_1x400.png b/themes/default/public/css/images/ui-bg_glass_95_fef1ec_1x400.png
similarity index 100%
rename from themes/default/css/images/ui-bg_glass_95_fef1ec_1x400.png
rename to themes/default/public/css/images/ui-bg_glass_95_fef1ec_1x400.png
diff --git a/themes/default/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/themes/default/public/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png
similarity index 100%
rename from themes/default/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png
rename to themes/default/public/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png
diff --git a/themes/default/css/images/ui-icons_222222_256x240.png b/themes/default/public/css/images/ui-icons_222222_256x240.png
similarity index 100%
rename from themes/default/css/images/ui-icons_222222_256x240.png
rename to themes/default/public/css/images/ui-icons_222222_256x240.png
diff --git a/themes/default/css/images/ui-icons_2e83ff_256x240.png b/themes/default/public/css/images/ui-icons_2e83ff_256x240.png
similarity index 100%
rename from themes/default/css/images/ui-icons_2e83ff_256x240.png
rename to themes/default/public/css/images/ui-icons_2e83ff_256x240.png
diff --git a/themes/default/css/images/ui-icons_454545_256x240.png b/themes/default/public/css/images/ui-icons_454545_256x240.png
similarity index 100%
rename from themes/default/css/images/ui-icons_454545_256x240.png
rename to themes/default/public/css/images/ui-icons_454545_256x240.png
diff --git a/themes/default/css/images/ui-icons_888888_256x240.png b/themes/default/public/css/images/ui-icons_888888_256x240.png
similarity index 100%
rename from themes/default/css/images/ui-icons_888888_256x240.png
rename to themes/default/public/css/images/ui-icons_888888_256x240.png
diff --git a/themes/default/css/images/ui-icons_cd0a0a_256x240.png b/themes/default/public/css/images/ui-icons_cd0a0a_256x240.png
similarity index 100%
rename from themes/default/css/images/ui-icons_cd0a0a_256x240.png
rename to themes/default/public/css/images/ui-icons_cd0a0a_256x240.png
diff --git a/themes/default/css/knacss.css b/themes/default/public/css/knacss.css
similarity index 100%
rename from themes/default/css/knacss.css
rename to themes/default/public/css/knacss.css
diff --git a/themes/default/css/messages.css b/themes/default/public/css/messages.css
similarity index 100%
rename from themes/default/css/messages.css
rename to themes/default/public/css/messages.css
diff --git a/themes/default/css/print.css b/themes/default/public/css/print.css
similarity index 100%
rename from themes/default/css/print.css
rename to themes/default/public/css/print.css
diff --git a/themes/default/css/style-default.css b/themes/default/public/css/style-default.css
similarity index 100%
rename from themes/default/css/style-default.css
rename to themes/default/public/css/style-default.css
diff --git a/themes/default/css/style.css b/themes/default/public/css/style.css
similarity index 100%
rename from themes/default/css/style.css
rename to themes/default/public/css/style.css
diff --git a/themes/default/fonts/Roboto.woff b/themes/default/public/fonts/Roboto.woff
similarity index 100%
rename from themes/default/fonts/Roboto.woff
rename to themes/default/public/fonts/Roboto.woff
diff --git a/themes/default/highlightjs/highlight.pack.js b/themes/default/public/highlightjs/highlight.pack.js
similarity index 100%
rename from themes/default/highlightjs/highlight.pack.js
rename to themes/default/public/highlightjs/highlight.pack.js
diff --git a/themes/default/highlightjs/styles/default.css b/themes/default/public/highlightjs/styles/default.css
similarity index 100%
rename from themes/default/highlightjs/styles/default.css
rename to themes/default/public/highlightjs/styles/default.css
diff --git a/themes/default/highlightjs/styles/github.css b/themes/default/public/highlightjs/styles/github.css
similarity index 100%
rename from themes/default/highlightjs/styles/github.css
rename to themes/default/public/highlightjs/styles/github.css
diff --git a/themes/default/highlightjs/styles/googlecode.css b/themes/default/public/highlightjs/styles/googlecode.css
similarity index 100%
rename from themes/default/highlightjs/styles/googlecode.css
rename to themes/default/public/highlightjs/styles/googlecode.css
diff --git a/themes/default/img/default/backtotop.png b/themes/default/public/img/default/backtotop.png
similarity index 100%
rename from themes/default/img/default/backtotop.png
rename to themes/default/public/img/default/backtotop.png
diff --git a/themes/default/img/default/bad-display.png b/themes/default/public/img/default/bad-display.png
similarity index 100%
rename from themes/default/img/default/bad-display.png
rename to themes/default/public/img/default/bad-display.png
diff --git a/themes/default/img/default/checkmark-off.png b/themes/default/public/img/default/checkmark-off.png
similarity index 100%
rename from themes/default/img/default/checkmark-off.png
rename to themes/default/public/img/default/checkmark-off.png
diff --git a/themes/default/img/default/checkmark-on.png b/themes/default/public/img/default/checkmark-on.png
similarity index 100%
rename from themes/default/img/default/checkmark-on.png
rename to themes/default/public/img/default/checkmark-on.png
diff --git a/themes/default/img/default/down.png b/themes/default/public/img/default/down.png
similarity index 100%
rename from themes/default/img/default/down.png
rename to themes/default/public/img/default/down.png
diff --git a/themes/default/img/default/envelop.png b/themes/default/public/img/default/envelop.png
similarity index 100%
rename from themes/default/img/default/envelop.png
rename to themes/default/public/img/default/envelop.png
diff --git a/themes/default/img/default/flattr.png b/themes/default/public/img/default/flattr.png
similarity index 100%
rename from themes/default/img/default/flattr.png
rename to themes/default/public/img/default/flattr.png
diff --git a/themes/default/img/default/left.png b/themes/default/public/img/default/left.png
similarity index 100%
rename from themes/default/img/default/left.png
rename to themes/default/public/img/default/left.png
diff --git a/themes/default/img/default/link.png b/themes/default/public/img/default/link.png
similarity index 100%
rename from themes/default/img/default/link.png
rename to themes/default/public/img/default/link.png
diff --git a/themes/default/img/default/print.png b/themes/default/public/img/default/print.png
similarity index 100%
rename from themes/default/img/default/print.png
rename to themes/default/public/img/default/print.png
diff --git a/themes/default/img/default/remove.png b/themes/default/public/img/default/remove.png
similarity index 100%
rename from themes/default/img/default/remove.png
rename to themes/default/public/img/default/remove.png
diff --git a/themes/default/img/default/rss.png b/themes/default/public/img/default/rss.png
similarity index 100%
rename from themes/default/img/default/rss.png
rename to themes/default/public/img/default/rss.png
diff --git a/themes/default/img/default/shaarli.png b/themes/default/public/img/default/shaarli.png
similarity index 100%
rename from themes/default/img/default/shaarli.png
rename to themes/default/public/img/default/shaarli.png
diff --git a/themes/default/img/default/star-off.png b/themes/default/public/img/default/star-off.png
similarity index 100%
rename from themes/default/img/default/star-off.png
rename to themes/default/public/img/default/star-off.png
diff --git a/themes/default/img/default/star-on.png b/themes/default/public/img/default/star-on.png
similarity index 100%
rename from themes/default/img/default/star-on.png
rename to themes/default/public/img/default/star-on.png
diff --git a/themes/default/img/default/top.png b/themes/default/public/img/default/top.png
similarity index 100%
rename from themes/default/img/default/top.png
rename to themes/default/public/img/default/top.png
diff --git a/themes/default/img/default/twitter.png b/themes/default/public/img/default/twitter.png
similarity index 100%
rename from themes/default/img/default/twitter.png
rename to themes/default/public/img/default/twitter.png
diff --git a/themes/default/img/logo.svg b/themes/default/public/img/logo.svg
similarity index 100%
rename from themes/default/img/logo.svg
rename to themes/default/public/img/logo.svg
diff --git a/themes/default/img/messages/close.png b/themes/default/public/img/messages/close.png
similarity index 100%
rename from themes/default/img/messages/close.png
rename to themes/default/public/img/messages/close.png
diff --git a/themes/default/img/messages/cross.png b/themes/default/public/img/messages/cross.png
similarity index 100%
rename from themes/default/img/messages/cross.png
rename to themes/default/public/img/messages/cross.png
diff --git a/themes/default/img/messages/help.png b/themes/default/public/img/messages/help.png
similarity index 100%
rename from themes/default/img/messages/help.png
rename to themes/default/public/img/messages/help.png
diff --git a/themes/default/img/messages/tick.png b/themes/default/public/img/messages/tick.png
similarity index 100%
rename from themes/default/img/messages/tick.png
rename to themes/default/public/img/messages/tick.png
diff --git a/themes/default/img/messages/warning.png b/themes/default/public/img/messages/warning.png
similarity index 100%
rename from themes/default/img/messages/warning.png
rename to themes/default/public/img/messages/warning.png
diff --git a/themes/default/js/closeMessage.js b/themes/default/public/js/closeMessage.js
similarity index 100%
rename from themes/default/js/closeMessage.js
rename to themes/default/public/js/closeMessage.js
diff --git a/themes/dmagenta/css/style-dmagenta.css b/themes/dmagenta/public/css/style-dmagenta.css
similarity index 100%
rename from themes/dmagenta/css/style-dmagenta.css
rename to themes/dmagenta/public/css/style-dmagenta.css
diff --git a/themes/dmagenta/img/dmagenta/backtotop.png b/themes/dmagenta/public/img/dmagenta/backtotop.png
similarity index 100%
rename from themes/dmagenta/img/dmagenta/backtotop.png
rename to themes/dmagenta/public/img/dmagenta/backtotop.png
diff --git a/themes/dmagenta/img/dmagenta/bad-display.png b/themes/dmagenta/public/img/dmagenta/bad-display.png
similarity index 100%
rename from themes/dmagenta/img/dmagenta/bad-display.png
rename to themes/dmagenta/public/img/dmagenta/bad-display.png
diff --git a/themes/dmagenta/img/dmagenta/checkmark-off.png b/themes/dmagenta/public/img/dmagenta/checkmark-off.png
similarity index 100%
rename from themes/dmagenta/img/dmagenta/checkmark-off.png
rename to themes/dmagenta/public/img/dmagenta/checkmark-off.png
diff --git a/themes/dmagenta/img/dmagenta/checkmark-on.png b/themes/dmagenta/public/img/dmagenta/checkmark-on.png
similarity index 100%
rename from themes/dmagenta/img/dmagenta/checkmark-on.png
rename to themes/dmagenta/public/img/dmagenta/checkmark-on.png
diff --git a/themes/dmagenta/img/dmagenta/down.png b/themes/dmagenta/public/img/dmagenta/down.png
similarity index 100%
rename from themes/dmagenta/img/dmagenta/down.png
rename to themes/dmagenta/public/img/dmagenta/down.png
diff --git a/themes/dmagenta/img/dmagenta/envelop.png b/themes/dmagenta/public/img/dmagenta/envelop.png
similarity index 100%
rename from themes/dmagenta/img/dmagenta/envelop.png
rename to themes/dmagenta/public/img/dmagenta/envelop.png
diff --git a/themes/dmagenta/img/dmagenta/flattr.png b/themes/dmagenta/public/img/dmagenta/flattr.png
similarity index 100%
rename from themes/dmagenta/img/dmagenta/flattr.png
rename to themes/dmagenta/public/img/dmagenta/flattr.png
diff --git a/themes/dmagenta/img/dmagenta/left.png b/themes/dmagenta/public/img/dmagenta/left.png
similarity index 100%
rename from themes/dmagenta/img/dmagenta/left.png
rename to themes/dmagenta/public/img/dmagenta/left.png
diff --git a/themes/dmagenta/img/dmagenta/link.png b/themes/dmagenta/public/img/dmagenta/link.png
similarity index 100%
rename from themes/dmagenta/img/dmagenta/link.png
rename to themes/dmagenta/public/img/dmagenta/link.png
diff --git a/themes/dmagenta/img/dmagenta/remove.png b/themes/dmagenta/public/img/dmagenta/remove.png
similarity index 100%
rename from themes/dmagenta/img/dmagenta/remove.png
rename to themes/dmagenta/public/img/dmagenta/remove.png
diff --git a/themes/dmagenta/img/dmagenta/rss.png b/themes/dmagenta/public/img/dmagenta/rss.png
similarity index 100%
rename from themes/dmagenta/img/dmagenta/rss.png
rename to themes/dmagenta/public/img/dmagenta/rss.png
diff --git a/themes/dmagenta/img/dmagenta/shaarli.png b/themes/dmagenta/public/img/dmagenta/shaarli.png
similarity index 100%
rename from themes/dmagenta/img/dmagenta/shaarli.png
rename to themes/dmagenta/public/img/dmagenta/shaarli.png
diff --git a/themes/dmagenta/img/dmagenta/star-off.png b/themes/dmagenta/public/img/dmagenta/star-off.png
similarity index 100%
rename from themes/dmagenta/img/dmagenta/star-off.png
rename to themes/dmagenta/public/img/dmagenta/star-off.png
diff --git a/themes/dmagenta/img/dmagenta/star-on.png b/themes/dmagenta/public/img/dmagenta/star-on.png
similarity index 100%
rename from themes/dmagenta/img/dmagenta/star-on.png
rename to themes/dmagenta/public/img/dmagenta/star-on.png
diff --git a/themes/dmagenta/img/dmagenta/top.png b/themes/dmagenta/public/img/dmagenta/top.png
similarity index 100%
rename from themes/dmagenta/img/dmagenta/top.png
rename to themes/dmagenta/public/img/dmagenta/top.png
diff --git a/themes/dmagenta/img/dmagenta/twitter.png b/themes/dmagenta/public/img/dmagenta/twitter.png
similarity index 100%
rename from themes/dmagenta/img/dmagenta/twitter.png
rename to themes/dmagenta/public/img/dmagenta/twitter.png
diff --git a/themes/solarized-dark/css/style-solarized-dark.css b/themes/solarized-dark/public/css/style-solarized-dark.css
similarity index 100%
rename from themes/solarized-dark/css/style-solarized-dark.css
rename to themes/solarized-dark/public/css/style-solarized-dark.css
diff --git a/themes/solarized-dark/img/solarized-dark/backtotop.png b/themes/solarized-dark/public/img/solarized-dark/backtotop.png
similarity index 100%
rename from themes/solarized-dark/img/solarized-dark/backtotop.png
rename to themes/solarized-dark/public/img/solarized-dark/backtotop.png
diff --git a/themes/solarized-dark/img/solarized-dark/bad-display.png b/themes/solarized-dark/public/img/solarized-dark/bad-display.png
similarity index 100%
rename from themes/solarized-dark/img/solarized-dark/bad-display.png
rename to themes/solarized-dark/public/img/solarized-dark/bad-display.png
diff --git a/themes/solarized-dark/img/solarized-dark/checkmark-off.png b/themes/solarized-dark/public/img/solarized-dark/checkmark-off.png
similarity index 100%
rename from themes/solarized-dark/img/solarized-dark/checkmark-off.png
rename to themes/solarized-dark/public/img/solarized-dark/checkmark-off.png
diff --git a/themes/solarized-dark/img/solarized-dark/checkmark-on.png b/themes/solarized-dark/public/img/solarized-dark/checkmark-on.png
similarity index 100%
rename from themes/solarized-dark/img/solarized-dark/checkmark-on.png
rename to themes/solarized-dark/public/img/solarized-dark/checkmark-on.png
diff --git a/themes/solarized-dark/img/solarized-dark/down.png b/themes/solarized-dark/public/img/solarized-dark/down.png
similarity index 100%
rename from themes/solarized-dark/img/solarized-dark/down.png
rename to themes/solarized-dark/public/img/solarized-dark/down.png
diff --git a/themes/solarized-dark/img/solarized-dark/envelop.png b/themes/solarized-dark/public/img/solarized-dark/envelop.png
similarity index 100%
rename from themes/solarized-dark/img/solarized-dark/envelop.png
rename to themes/solarized-dark/public/img/solarized-dark/envelop.png
diff --git a/themes/solarized-dark/img/solarized-dark/flattr.png b/themes/solarized-dark/public/img/solarized-dark/flattr.png
similarity index 100%
rename from themes/solarized-dark/img/solarized-dark/flattr.png
rename to themes/solarized-dark/public/img/solarized-dark/flattr.png
diff --git a/themes/solarized-dark/img/solarized-dark/left.png b/themes/solarized-dark/public/img/solarized-dark/left.png
similarity index 100%
rename from themes/solarized-dark/img/solarized-dark/left.png
rename to themes/solarized-dark/public/img/solarized-dark/left.png
diff --git a/themes/solarized-dark/img/solarized-dark/link.png b/themes/solarized-dark/public/img/solarized-dark/link.png
similarity index 100%
rename from themes/solarized-dark/img/solarized-dark/link.png
rename to themes/solarized-dark/public/img/solarized-dark/link.png
diff --git a/themes/solarized-dark/img/solarized-dark/remove.png b/themes/solarized-dark/public/img/solarized-dark/remove.png
similarity index 100%
rename from themes/solarized-dark/img/solarized-dark/remove.png
rename to themes/solarized-dark/public/img/solarized-dark/remove.png
diff --git a/themes/solarized-dark/img/solarized-dark/rss.png b/themes/solarized-dark/public/img/solarized-dark/rss.png
similarity index 100%
rename from themes/solarized-dark/img/solarized-dark/rss.png
rename to themes/solarized-dark/public/img/solarized-dark/rss.png
diff --git a/themes/solarized-dark/img/solarized-dark/shaarli.png b/themes/solarized-dark/public/img/solarized-dark/shaarli.png
similarity index 100%
rename from themes/solarized-dark/img/solarized-dark/shaarli.png
rename to themes/solarized-dark/public/img/solarized-dark/shaarli.png
diff --git a/themes/solarized-dark/img/solarized-dark/star-off.png b/themes/solarized-dark/public/img/solarized-dark/star-off.png
similarity index 100%
rename from themes/solarized-dark/img/solarized-dark/star-off.png
rename to themes/solarized-dark/public/img/solarized-dark/star-off.png
diff --git a/themes/solarized-dark/img/solarized-dark/star-on.png b/themes/solarized-dark/public/img/solarized-dark/star-on.png
similarity index 100%
rename from themes/solarized-dark/img/solarized-dark/star-on.png
rename to themes/solarized-dark/public/img/solarized-dark/star-on.png
diff --git a/themes/solarized-dark/img/solarized-dark/top.png b/themes/solarized-dark/public/img/solarized-dark/top.png
similarity index 100%
rename from themes/solarized-dark/img/solarized-dark/top.png
rename to themes/solarized-dark/public/img/solarized-dark/top.png
diff --git a/themes/solarized-dark/img/solarized-dark/twitter.png b/themes/solarized-dark/public/img/solarized-dark/twitter.png
similarity index 100%
rename from themes/solarized-dark/img/solarized-dark/twitter.png
rename to themes/solarized-dark/public/img/solarized-dark/twitter.png
diff --git a/themes/solarized/css/style-solarized.css b/themes/solarized/public/css/style-solarized.css
similarity index 100%
rename from themes/solarized/css/style-solarized.css
rename to themes/solarized/public/css/style-solarized.css
diff --git a/themes/solarized/img/solarized/backtotop.png b/themes/solarized/public/img/solarized/backtotop.png
similarity index 100%
rename from themes/solarized/img/solarized/backtotop.png
rename to themes/solarized/public/img/solarized/backtotop.png
diff --git a/themes/solarized/img/solarized/bad-display.png b/themes/solarized/public/img/solarized/bad-display.png
similarity index 100%
rename from themes/solarized/img/solarized/bad-display.png
rename to themes/solarized/public/img/solarized/bad-display.png
diff --git a/themes/solarized/img/solarized/checkmark-off.png b/themes/solarized/public/img/solarized/checkmark-off.png
similarity index 100%
rename from themes/solarized/img/solarized/checkmark-off.png
rename to themes/solarized/public/img/solarized/checkmark-off.png
diff --git a/themes/solarized/img/solarized/checkmark-on.png b/themes/solarized/public/img/solarized/checkmark-on.png
similarity index 100%
rename from themes/solarized/img/solarized/checkmark-on.png
rename to themes/solarized/public/img/solarized/checkmark-on.png
diff --git a/themes/solarized/img/solarized/down.png b/themes/solarized/public/img/solarized/down.png
similarity index 100%
rename from themes/solarized/img/solarized/down.png
rename to themes/solarized/public/img/solarized/down.png
diff --git a/themes/solarized/img/solarized/envelop.png b/themes/solarized/public/img/solarized/envelop.png
similarity index 100%
rename from themes/solarized/img/solarized/envelop.png
rename to themes/solarized/public/img/solarized/envelop.png
diff --git a/themes/solarized/img/solarized/flattr.png b/themes/solarized/public/img/solarized/flattr.png
similarity index 100%
rename from themes/solarized/img/solarized/flattr.png
rename to themes/solarized/public/img/solarized/flattr.png
diff --git a/themes/solarized/img/solarized/left.png b/themes/solarized/public/img/solarized/left.png
similarity index 100%
rename from themes/solarized/img/solarized/left.png
rename to themes/solarized/public/img/solarized/left.png
diff --git a/themes/solarized/img/solarized/link.png b/themes/solarized/public/img/solarized/link.png
similarity index 100%
rename from themes/solarized/img/solarized/link.png
rename to themes/solarized/public/img/solarized/link.png
diff --git a/themes/solarized/img/solarized/remove.png b/themes/solarized/public/img/solarized/remove.png
similarity index 100%
rename from themes/solarized/img/solarized/remove.png
rename to themes/solarized/public/img/solarized/remove.png
diff --git a/themes/solarized/img/solarized/rss.png b/themes/solarized/public/img/solarized/rss.png
similarity index 100%
rename from themes/solarized/img/solarized/rss.png
rename to themes/solarized/public/img/solarized/rss.png
diff --git a/themes/solarized/img/solarized/shaarli.png b/themes/solarized/public/img/solarized/shaarli.png
similarity index 100%
rename from themes/solarized/img/solarized/shaarli.png
rename to themes/solarized/public/img/solarized/shaarli.png
diff --git a/themes/solarized/img/solarized/star-off.png b/themes/solarized/public/img/solarized/star-off.png
similarity index 100%
rename from themes/solarized/img/solarized/star-off.png
rename to themes/solarized/public/img/solarized/star-off.png
diff --git a/themes/solarized/img/solarized/star-on.png b/themes/solarized/public/img/solarized/star-on.png
similarity index 100%
rename from themes/solarized/img/solarized/star-on.png
rename to themes/solarized/public/img/solarized/star-on.png
diff --git a/themes/solarized/img/solarized/top.png b/themes/solarized/public/img/solarized/top.png
similarity index 100%
rename from themes/solarized/img/solarized/top.png
rename to themes/solarized/public/img/solarized/top.png
diff --git a/themes/solarized/img/solarized/twitter.png b/themes/solarized/public/img/solarized/twitter.png
similarity index 100%
rename from themes/solarized/img/solarized/twitter.png
rename to themes/solarized/public/img/solarized/twitter.png
diff --git a/web/index.php b/web/index.php
index 053557271..84e49eb1c 100644
--- a/web/index.php
+++ b/web/index.php
@@ -10,6 +10,8 @@
 
 define ('WALLABAG', '2.0.0-alpha');
 
+use Wallabag\Wallabag\Wallabag;
+
 require_once '../app/check_essentials.php';
 require_once '../app/check_setup.php';
 require_once '../app/config/global.inc.php';
@@ -23,5 +25,5 @@ Session::$sessionName = 'wallabag';
 Session::init();
 
 // Let's rock !
-$wallabag = new Wallabag\Wallabag\Wallabag();
+$wallabag = new Wallabag();
 $wallabag->run();
\ No newline at end of file
diff --git a/web/themes/_global b/web/themes/_global
new file mode 120000
index 000000000..479042645
--- /dev/null
+++ b/web/themes/_global
@@ -0,0 +1 @@
+../../themes/_global/public
\ No newline at end of file
diff --git a/web/themes/baggy b/web/themes/baggy
new file mode 120000
index 000000000..9e84890c7
--- /dev/null
+++ b/web/themes/baggy
@@ -0,0 +1 @@
+../../themes/baggy/public
\ No newline at end of file
diff --git a/web/themes/dark b/web/themes/dark
new file mode 120000
index 000000000..b5b4c1dd6
--- /dev/null
+++ b/web/themes/dark
@@ -0,0 +1 @@
+../../themes/dark/public
\ No newline at end of file
diff --git a/web/themes/default b/web/themes/default
new file mode 120000
index 000000000..fd316b377
--- /dev/null
+++ b/web/themes/default
@@ -0,0 +1 @@
+../../themes/default/public
\ No newline at end of file
diff --git a/web/themes/dmagenta b/web/themes/dmagenta
new file mode 120000
index 000000000..222bb6d5b
--- /dev/null
+++ b/web/themes/dmagenta
@@ -0,0 +1 @@
+../../themes/dmagenta/public
\ No newline at end of file
diff --git a/web/themes/solarized b/web/themes/solarized
new file mode 120000
index 000000000..426a3acc3
--- /dev/null
+++ b/web/themes/solarized
@@ -0,0 +1 @@
+../../themes/solarized/public
\ No newline at end of file
diff --git a/web/themes/solarized-dark b/web/themes/solarized-dark
new file mode 120000
index 000000000..822b61214
--- /dev/null
+++ b/web/themes/solarized-dark
@@ -0,0 +1 @@
+../../themes/solarized-dark/public
\ No newline at end of file