190 files changed, 43 insertions, 16 deletions

diff --git a/.gitignore b/.gitignore
index e4979f31..94f83ba4 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 35c8ca2e..00000000
--- 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 93169e4e..00000000
--- 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 09095235..f77ef566 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 3d1a8e43..9e9e52cb 100755
--- a/app/db/poche.sqlite
+++ b/app/db/poche.sqlite
diff --git a/composer.json b/composer.json
index a1dee410..e04ec252 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 9888e4c4..f2c17481 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 afda69de..fa132910 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 43411817..a8fbbc35 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 e8a6daa3..d0fc9b07 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 19d98614..9350c660 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 c172a95d..0a498ebf 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
index 5690172f..5690172f 100644
--- a/themes/_global/css/jquery-ui-1.10.4.custom.css
+++ b/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
index 4dba92a8..4dba92a8 100644
--- 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
diff --git a/themes/_global/img/appicon/apple-touch-icon-114.png b/themes/_global/public/img/appicon/apple-touch-icon-114.png
index 0e96edd5..0e96edd5 100755
--- a/themes/_global/img/appicon/apple-touch-icon-114.png
+++ b/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
index dc5aab1c..dc5aab1c 100755
--- a/themes/_global/img/appicon/apple-touch-icon-120.png
+++ b/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
index 1d005db6..1d005db6 100755
--- a/themes/_global/img/appicon/apple-touch-icon-144.png
+++ b/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
index f915231f..f915231f 100755
--- a/themes/_global/img/appicon/apple-touch-icon-152.png
+++ b/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
index 5aa19ed9..5aa19ed9 100755
--- a/themes/_global/img/appicon/apple-touch-icon-57.png
+++ b/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
index b8b48e1b..b8b48e1b 100755
--- a/themes/_global/img/appicon/apple-touch-icon-72.png
+++ b/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
index 9f9dba27..9f9dba27 100755
--- a/themes/_global/img/appicon/apple-touch-icon-76.png
+++ b/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
index 9cf29e2b..9cf29e2b 100755
--- a/themes/_global/img/appicon/apple-touch-icon.png
+++ b/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
index 0346558b..0346558b 100755
--- a/themes/_global/img/appicon/favicon.ico
+++ b/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
index 6da7925b..6da7925b 100644
--- a/themes/_global/img/icons/carrot-icon--black.png
+++ b/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
index a70044b6..a70044b6 100644
--- a/themes/_global/img/icons/carrot-icon--white.png
+++ b/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
index 32bca194..32bca194 100644
--- a/themes/_global/img/icons/diaspora-icon--black.png
+++ b/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
index fc48d47c..fc48d47c 100644
--- a/themes/_global/img/icons/diaspora-icon--white.png
+++ b/themes/_global/public/img/icons/diaspora-icon--white.png
diff --git a/themes/_global/js/autoClose.js b/themes/_global/public/js/autoClose.js
index e9145b7e..e9145b7e 100644
--- a/themes/_global/js/autoClose.js
+++ b/themes/_global/public/js/autoClose.js
diff --git a/themes/_global/js/autoCompleteTags.js b/themes/_global/public/js/autoCompleteTags.js
index 90bc982c..90bc982c 100755
--- a/themes/_global/js/autoCompleteTags.js
+++ b/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
index a4dd0a2f..a4dd0a2f 100644
--- a/themes/_global/js/jquery-2.0.3.min.js
+++ b/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
index 6f599fca..6f599fca 100644
--- a/themes/_global/js/jquery-ui-1.10.4.custom.js
+++ b/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
index 31635026..31635026 100644
--- 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
diff --git a/themes/_global/js/popupForm.js b/themes/_global/public/js/popupForm.js
index d233e600..d233e600 100644
--- a/themes/_global/js/popupForm.js
+++ b/themes/_global/public/js/popupForm.js
diff --git a/themes/_global/js/restoreScroll.js b/themes/_global/public/js/restoreScroll.js
index 331c9e19..331c9e19 100644
--- a/themes/_global/js/restoreScroll.js
+++ b/themes/_global/public/js/restoreScroll.js
diff --git a/themes/_global/js/saveLink.js b/themes/_global/public/js/saveLink.js
index a7acd84c..a7acd84c 100755
--- a/themes/_global/js/saveLink.js
+++ b/themes/_global/public/js/saveLink.js
diff --git a/themes/baggy/about.twig b/themes/baggy/about.twig
index 110196a6..d18fe156 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 a5a61559..6031f489 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
index 7c02a16f..7c02a16f 100755
--- a/themes/baggy/css/font.css
+++ b/themes/baggy/public/css/font.css
diff --git a/themes/baggy/css/main.css b/themes/baggy/public/css/main.css
index 1df82910..1df82910 100755
--- a/themes/baggy/css/main.css
+++ b/themes/baggy/public/css/main.css
diff --git a/themes/baggy/css/messages.css b/themes/baggy/public/css/messages.css
index 42da70b3..42da70b3 100755
--- a/themes/baggy/css/messages.css
+++ b/themes/baggy/public/css/messages.css
diff --git a/themes/baggy/css/print.css b/themes/baggy/public/css/print.css
index 9dd6d295..9dd6d295 100755
--- a/themes/baggy/css/print.css
+++ b/themes/baggy/public/css/print.css
diff --git a/themes/baggy/css/ratatouille.css b/themes/baggy/public/css/ratatouille.css
index b203cbb8..b203cbb8 100644
--- a/themes/baggy/css/ratatouille.css
+++ b/themes/baggy/public/css/ratatouille.css
diff --git a/themes/baggy/fonts/icomoon.eot b/themes/baggy/public/fonts/icomoon.eot
index 56323516..56323516 100644
--- a/themes/baggy/fonts/icomoon.eot
+++ b/themes/baggy/public/fonts/icomoon.eot
diff --git a/themes/baggy/fonts/icomoon.svg b/themes/baggy/public/fonts/icomoon.svg
index b4586136..b4586136 100644
--- a/themes/baggy/fonts/icomoon.svg
+++ b/themes/baggy/public/fonts/icomoon.svg
diff --git a/themes/baggy/fonts/icomoon.ttf b/themes/baggy/public/fonts/icomoon.ttf
index bb1f21f8..bb1f21f8 100644
--- a/themes/baggy/fonts/icomoon.ttf
+++ b/themes/baggy/public/fonts/icomoon.ttf
diff --git a/themes/baggy/fonts/icomoon.woff b/themes/baggy/public/fonts/icomoon.woff
index bab13779..bab13779 100644
--- a/themes/baggy/fonts/icomoon.woff
+++ b/themes/baggy/public/fonts/icomoon.woff
diff --git a/themes/baggy/fonts/ptsans.woff b/themes/baggy/public/fonts/ptsans.woff
index cf7c62e1..cf7c62e1 100644
--- a/themes/baggy/fonts/ptsans.woff
+++ b/themes/baggy/public/fonts/ptsans.woff
diff --git a/themes/baggy/img/baggy/blank.png b/themes/baggy/public/img/baggy/blank.png
index 63e09844..63e09844 100755
--- a/themes/baggy/img/baggy/blank.png
+++ b/themes/baggy/public/img/baggy/blank.png
diff --git a/themes/baggy/img/baggy/down.png b/themes/baggy/public/img/baggy/down.png
index b9d536a7..b9d536a7 100644
--- a/themes/baggy/img/baggy/down.png
+++ b/themes/baggy/public/img/baggy/down.png
diff --git a/themes/baggy/img/baggy/list.png b/themes/baggy/public/img/baggy/list.png
index bd5aff5a..bd5aff5a 100755
--- a/themes/baggy/img/baggy/list.png
+++ b/themes/baggy/public/img/baggy/list.png
diff --git a/themes/baggy/img/baggy/table.png b/themes/baggy/public/img/baggy/table.png
index 859c4cd8..859c4cd8 100755
--- a/themes/baggy/img/baggy/table.png
+++ b/themes/baggy/public/img/baggy/table.png
diff --git a/themes/baggy/img/baggy/top.png b/themes/baggy/public/img/baggy/top.png
index 954a8c0a..954a8c0a 100644
--- a/themes/baggy/img/baggy/top.png
+++ b/themes/baggy/public/img/baggy/top.png
diff --git a/themes/baggy/img/bg-select.png b/themes/baggy/public/img/bg-select.png
index 95120441..95120441 100644
--- a/themes/baggy/img/bg-select.png
+++ b/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
index 32543a44..32543a44 100755
--- a/themes/baggy/img/logo-other_themes.png
+++ b/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
index 65dc607b..65dc607b 100755
--- a/themes/baggy/img/logo-w.png
+++ b/themes/baggy/public/img/logo-w.png
diff --git a/themes/baggy/img/logo-wallabag.svg b/themes/baggy/public/img/logo-wallabag.svg
index 40193e1c..40193e1c 100644
--- a/themes/baggy/img/logo-wallabag.svg
+++ b/themes/baggy/public/img/logo-wallabag.svg
diff --git a/themes/baggy/img/logo.png b/themes/baggy/public/img/logo.png
index 5305c77d..5305c77d 100755
--- a/themes/baggy/img/logo.png
+++ b/themes/baggy/public/img/logo.png
diff --git a/themes/baggy/img/logo.svg b/themes/baggy/public/img/logo.svg
index 865da440..865da440 100644
--- a/themes/baggy/img/logo.svg
+++ b/themes/baggy/public/img/logo.svg
diff --git a/themes/baggy/js/closeMessage.js b/themes/baggy/public/js/closeMessage.js
index 527719d5..527719d5 100644
--- a/themes/baggy/js/closeMessage.js
+++ b/themes/baggy/public/js/closeMessage.js
diff --git a/themes/baggy/js/init.js b/themes/baggy/public/js/init.js
index 74cbae68..74cbae68 100755
--- a/themes/baggy/js/init.js
+++ b/themes/baggy/public/js/init.js
diff --git a/themes/baggy/js/jquery.cookie.js b/themes/baggy/public/js/jquery.cookie.js
index 92719000..92719000 100755
--- a/themes/baggy/js/jquery.cookie.js
+++ b/themes/baggy/public/js/jquery.cookie.js
diff --git a/themes/baggy/js/restoreScroll.js b/themes/baggy/public/js/restoreScroll.js
index 331c9e19..331c9e19 100644
--- a/themes/baggy/js/restoreScroll.js
+++ b/themes/baggy/public/js/restoreScroll.js
diff --git a/themes/dark/css/style-dark.css b/themes/dark/public/css/style-dark.css
index 41782c48..41782c48 100644
--- a/themes/dark/css/style-dark.css
+++ b/themes/dark/public/css/style-dark.css
diff --git a/themes/dark/img/dark/backtotop.png b/themes/dark/public/img/dark/backtotop.png
index c885086d..c885086d 100644
--- a/themes/dark/img/dark/backtotop.png
+++ b/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
index 66ea2e16..66ea2e16 100644
--- a/themes/dark/img/dark/bad-display.png
+++ b/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
index 661ea997..661ea997 100644
--- a/themes/dark/img/dark/checkmark-off.png
+++ b/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
index 5ee8c8d3..5ee8c8d3 100644
--- a/themes/dark/img/dark/checkmark-on.png
+++ b/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
index 4150e17c..4150e17c 100644
--- a/themes/dark/img/dark/down.png
+++ b/themes/dark/public/img/dark/down.png
diff --git a/themes/dark/img/dark/envelop.png b/themes/dark/public/img/dark/envelop.png
index 73d9b0b9..73d9b0b9 100644
--- a/themes/dark/img/dark/envelop.png
+++ b/themes/dark/public/img/dark/envelop.png
diff --git a/themes/dark/img/dark/flattr.png b/themes/dark/public/img/dark/flattr.png
index b457d080..b457d080 100644
--- a/themes/dark/img/dark/flattr.png
+++ b/themes/dark/public/img/dark/flattr.png
diff --git a/themes/dark/img/dark/left.png b/themes/dark/public/img/dark/left.png
index c2f7a20e..c2f7a20e 100644
--- a/themes/dark/img/dark/left.png
+++ b/themes/dark/public/img/dark/left.png
diff --git a/themes/dark/img/dark/link.png b/themes/dark/public/img/dark/link.png
index a5b8d8d2..a5b8d8d2 100644
--- a/themes/dark/img/dark/link.png
+++ b/themes/dark/public/img/dark/link.png
diff --git a/themes/dark/img/dark/remove.png b/themes/dark/public/img/dark/remove.png
index 0c3dcfdf..0c3dcfdf 100644
--- a/themes/dark/img/dark/remove.png
+++ b/themes/dark/public/img/dark/remove.png
diff --git a/themes/dark/img/dark/rss.png b/themes/dark/public/img/dark/rss.png
index 21bad1a1..21bad1a1 100644
--- a/themes/dark/img/dark/rss.png
+++ b/themes/dark/public/img/dark/rss.png
diff --git a/themes/dark/img/dark/shaarli.png b/themes/dark/public/img/dark/shaarli.png
index e68ac8b5..e68ac8b5 100644
--- a/themes/dark/img/dark/shaarli.png
+++ b/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
index 8194bc2d..8194bc2d 100644
--- a/themes/dark/img/dark/star-off.png
+++ b/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
index 109c3aec..109c3aec 100644
--- a/themes/dark/img/dark/star-on.png
+++ b/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
index d137bd24..d137bd24 100644
--- a/themes/dark/img/dark/top.png
+++ b/themes/dark/public/img/dark/top.png
diff --git a/themes/dark/img/dark/twitter.png b/themes/dark/public/img/dark/twitter.png
index 6ce8a4d9..6ce8a4d9 100644
--- a/themes/dark/img/dark/twitter.png
+++ b/themes/dark/public/img/dark/twitter.png
diff --git a/themes/dark/public/public b/themes/dark/public/public
new file mode 120000
index 00000000..fd316b37
--- /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 3057cb75..213a4aca 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 5ca3217c..50ffd8ef 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 bac563cf..b7d91937 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
index d441f75e..d441f75e 100644
--- a/themes/default/css/images/animated-overlay.gif
+++ b/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
index 9f10cb65..9f10cb65 100644
--- 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
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
index b89b914b..b89b914b 100644
--- 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
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
index 780d3ffd..780d3ffd 100644
--- 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
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
index da53255b..da53255b 100644
--- 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
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
index f6306608..f6306608 100644
--- 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
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
index 7d347065..7d347065 100644
--- 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
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
index 533c4900..533c4900 100644
--- 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
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
index bf3a9481..bf3a9481 100644
--- 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
diff --git a/themes/default/css/images/ui-icons_222222_256x240.png b/themes/default/public/css/images/ui-icons_222222_256x240.png
index c1cb1170..c1cb1170 100644
--- a/themes/default/css/images/ui-icons_222222_256x240.png
+++ b/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
index 84b601bf..84b601bf 100644
--- a/themes/default/css/images/ui-icons_2e83ff_256x240.png
+++ b/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
index b6db1acd..b6db1acd 100644
--- a/themes/default/css/images/ui-icons_454545_256x240.png
+++ b/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
index feea0e20..feea0e20 100644
--- a/themes/default/css/images/ui-icons_888888_256x240.png
+++ b/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
index ed5b6b09..ed5b6b09 100644
--- a/themes/default/css/images/ui-icons_cd0a0a_256x240.png
+++ b/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
index ca0696b7..ca0696b7 100644
--- a/themes/default/css/knacss.css
+++ b/themes/default/public/css/knacss.css
diff --git a/themes/default/css/messages.css b/themes/default/public/css/messages.css
index 46b54795..46b54795 100644
--- a/themes/default/css/messages.css
+++ b/themes/default/public/css/messages.css
diff --git a/themes/default/css/print.css b/themes/default/public/css/print.css
index 625478e1..625478e1 100644
--- a/themes/default/css/print.css
+++ b/themes/default/public/css/print.css
diff --git a/themes/default/css/style-default.css b/themes/default/public/css/style-default.css
index 4406d48f..4406d48f 100755
--- a/themes/default/css/style-default.css
+++ b/themes/default/public/css/style-default.css
diff --git a/themes/default/css/style.css b/themes/default/public/css/style.css
index b25373d6..b25373d6 100755
--- a/themes/default/css/style.css
+++ b/themes/default/public/css/style.css
diff --git a/themes/default/fonts/Roboto.woff b/themes/default/public/fonts/Roboto.woff
index 1440b1be..1440b1be 100644
--- a/themes/default/fonts/Roboto.woff
+++ b/themes/default/public/fonts/Roboto.woff
diff --git a/themes/default/highlightjs/highlight.pack.js b/themes/default/public/highlightjs/highlight.pack.js
index 10a21c34..10a21c34 100644
--- a/themes/default/highlightjs/highlight.pack.js
+++ b/themes/default/public/highlightjs/highlight.pack.js
diff --git a/themes/default/highlightjs/styles/default.css b/themes/default/public/highlightjs/styles/default.css
index e5bd2801..e5bd2801 100644
--- a/themes/default/highlightjs/styles/default.css
+++ b/themes/default/public/highlightjs/styles/default.css
diff --git a/themes/default/highlightjs/styles/github.css b/themes/default/public/highlightjs/styles/github.css
index 47fc2651..47fc2651 100644
--- a/themes/default/highlightjs/styles/github.css
+++ b/themes/default/public/highlightjs/styles/github.css
diff --git a/themes/default/highlightjs/styles/googlecode.css b/themes/default/public/highlightjs/styles/googlecode.css
index fd237367..fd237367 100644
--- a/themes/default/highlightjs/styles/googlecode.css
+++ b/themes/default/public/highlightjs/styles/googlecode.css
diff --git a/themes/default/img/default/backtotop.png b/themes/default/public/img/default/backtotop.png
index 051238ef..051238ef 100644
--- a/themes/default/img/default/backtotop.png
+++ b/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
index 6866799f..6866799f 100755
--- a/themes/default/img/default/bad-display.png
+++ b/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
index 3db5a06d..3db5a06d 100644
--- a/themes/default/img/default/checkmark-off.png
+++ b/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
index cd3abb2c..cd3abb2c 100644
--- a/themes/default/img/default/checkmark-on.png
+++ b/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
index b9d536a7..b9d536a7 100644
--- a/themes/default/img/default/down.png
+++ b/themes/default/public/img/default/down.png
diff --git a/themes/default/img/default/envelop.png b/themes/default/public/img/default/envelop.png
index 6be1c886..6be1c886 100644
--- a/themes/default/img/default/envelop.png
+++ b/themes/default/public/img/default/envelop.png
diff --git a/themes/default/img/default/flattr.png b/themes/default/public/img/default/flattr.png
index 0404aaea..0404aaea 100755
--- a/themes/default/img/default/flattr.png
+++ b/themes/default/public/img/default/flattr.png
diff --git a/themes/default/img/default/left.png b/themes/default/public/img/default/left.png
index a0a53631..a0a53631 100644
--- a/themes/default/img/default/left.png
+++ b/themes/default/public/img/default/left.png
diff --git a/themes/default/img/default/link.png b/themes/default/public/img/default/link.png
index db62819d..db62819d 100755
--- a/themes/default/img/default/link.png
+++ b/themes/default/public/img/default/link.png
diff --git a/themes/default/img/default/print.png b/themes/default/public/img/default/print.png
index 83d6445b..83d6445b 100755
--- a/themes/default/img/default/print.png
+++ b/themes/default/public/img/default/print.png
diff --git a/themes/default/img/default/remove.png b/themes/default/public/img/default/remove.png
index f8ad56a3..f8ad56a3 100644
--- a/themes/default/img/default/remove.png
+++ b/themes/default/public/img/default/remove.png
diff --git a/themes/default/img/default/rss.png b/themes/default/public/img/default/rss.png
index 21bad1a1..21bad1a1 100644
--- a/themes/default/img/default/rss.png
+++ b/themes/default/public/img/default/rss.png
diff --git a/themes/default/img/default/shaarli.png b/themes/default/public/img/default/shaarli.png
index 1eb30f60..1eb30f60 100644
--- a/themes/default/img/default/shaarli.png
+++ b/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
index 6a0133a7..6a0133a7 100644
--- a/themes/default/img/default/star-off.png
+++ b/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
index a9f96eaa..a9f96eaa 100644
--- a/themes/default/img/default/star-on.png
+++ b/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
index 954a8c0a..954a8c0a 100644
--- a/themes/default/img/default/top.png
+++ b/themes/default/public/img/default/top.png
diff --git a/themes/default/img/default/twitter.png b/themes/default/public/img/default/twitter.png
index cfcfe419..cfcfe419 100644
--- a/themes/default/img/default/twitter.png
+++ b/themes/default/public/img/default/twitter.png
diff --git a/themes/default/img/logo.svg b/themes/default/public/img/logo.svg
index 865da440..865da440 100644
--- a/themes/default/img/logo.svg
+++ b/themes/default/public/img/logo.svg
diff --git a/themes/default/img/messages/close.png b/themes/default/public/img/messages/close.png
index 731aa018..731aa018 100644
--- a/themes/default/img/messages/close.png
+++ b/themes/default/public/img/messages/close.png
diff --git a/themes/default/img/messages/cross.png b/themes/default/public/img/messages/cross.png
index 1514d51a..1514d51a 100644
--- a/themes/default/img/messages/cross.png
+++ b/themes/default/public/img/messages/cross.png
diff --git a/themes/default/img/messages/help.png b/themes/default/public/img/messages/help.png
index 5c870176..5c870176 100644
--- a/themes/default/img/messages/help.png
+++ b/themes/default/public/img/messages/help.png
diff --git a/themes/default/img/messages/tick.png b/themes/default/public/img/messages/tick.png
index a9925a06..a9925a06 100644
--- a/themes/default/img/messages/tick.png
+++ b/themes/default/public/img/messages/tick.png
diff --git a/themes/default/img/messages/warning.png b/themes/default/public/img/messages/warning.png
index 628cf2da..628cf2da 100644
--- a/themes/default/img/messages/warning.png
+++ b/themes/default/public/img/messages/warning.png
diff --git a/themes/default/js/closeMessage.js b/themes/default/public/js/closeMessage.js
index b57fe4a8..b57fe4a8 100644
--- a/themes/default/js/closeMessage.js
+++ b/themes/default/public/js/closeMessage.js
diff --git a/themes/dmagenta/css/style-dmagenta.css b/themes/dmagenta/public/css/style-dmagenta.css
index 4dc592d2..4dc592d2 100644
--- a/themes/dmagenta/css/style-dmagenta.css
+++ b/themes/dmagenta/public/css/style-dmagenta.css
diff --git a/themes/dmagenta/img/dmagenta/backtotop.png b/themes/dmagenta/public/img/dmagenta/backtotop.png
index 051238ef..051238ef 100755
--- a/themes/dmagenta/img/dmagenta/backtotop.png
+++ b/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
index 6866799f..6866799f 100755
--- a/themes/dmagenta/img/dmagenta/bad-display.png
+++ b/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
index 3db5a06d..3db5a06d 100644
--- a/themes/dmagenta/img/dmagenta/checkmark-off.png
+++ b/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
index cd3abb2c..cd3abb2c 100644
--- a/themes/dmagenta/img/dmagenta/checkmark-on.png
+++ b/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
index b9d536a7..b9d536a7 100644
--- a/themes/dmagenta/img/dmagenta/down.png
+++ b/themes/dmagenta/public/img/dmagenta/down.png
diff --git a/themes/dmagenta/img/dmagenta/envelop.png b/themes/dmagenta/public/img/dmagenta/envelop.png
index 6be1c886..6be1c886 100644
--- a/themes/dmagenta/img/dmagenta/envelop.png
+++ b/themes/dmagenta/public/img/dmagenta/envelop.png
diff --git a/themes/dmagenta/img/dmagenta/flattr.png b/themes/dmagenta/public/img/dmagenta/flattr.png
index 0404aaea..0404aaea 100755
--- a/themes/dmagenta/img/dmagenta/flattr.png
+++ b/themes/dmagenta/public/img/dmagenta/flattr.png
diff --git a/themes/dmagenta/img/dmagenta/left.png b/themes/dmagenta/public/img/dmagenta/left.png
index a0a53631..a0a53631 100644
--- a/themes/dmagenta/img/dmagenta/left.png
+++ b/themes/dmagenta/public/img/dmagenta/left.png
diff --git a/themes/dmagenta/img/dmagenta/link.png b/themes/dmagenta/public/img/dmagenta/link.png
index db62819d..db62819d 100755
--- a/themes/dmagenta/img/dmagenta/link.png
+++ b/themes/dmagenta/public/img/dmagenta/link.png
diff --git a/themes/dmagenta/img/dmagenta/remove.png b/themes/dmagenta/public/img/dmagenta/remove.png
index f8ad56a3..f8ad56a3 100644
--- a/themes/dmagenta/img/dmagenta/remove.png
+++ b/themes/dmagenta/public/img/dmagenta/remove.png
diff --git a/themes/dmagenta/img/dmagenta/rss.png b/themes/dmagenta/public/img/dmagenta/rss.png
index 21bad1a1..21bad1a1 100644
--- a/themes/dmagenta/img/dmagenta/rss.png
+++ b/themes/dmagenta/public/img/dmagenta/rss.png
diff --git a/themes/dmagenta/img/dmagenta/shaarli.png b/themes/dmagenta/public/img/dmagenta/shaarli.png
index 1eb30f60..1eb30f60 100644
--- a/themes/dmagenta/img/dmagenta/shaarli.png
+++ b/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
index 6a0133a7..6a0133a7 100644
--- a/themes/dmagenta/img/dmagenta/star-off.png
+++ b/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
index a9f96eaa..a9f96eaa 100644
--- a/themes/dmagenta/img/dmagenta/star-on.png
+++ b/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
index 954a8c0a..954a8c0a 100644
--- a/themes/dmagenta/img/dmagenta/top.png
+++ b/themes/dmagenta/public/img/dmagenta/top.png
diff --git a/themes/dmagenta/img/dmagenta/twitter.png b/themes/dmagenta/public/img/dmagenta/twitter.png
index cfcfe419..cfcfe419 100644
--- a/themes/dmagenta/img/dmagenta/twitter.png
+++ b/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
index 77a97d38..77a97d38 100644
--- a/themes/solarized-dark/css/style-solarized-dark.css
+++ b/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
index 1501c2a5..1501c2a5 100644
--- a/themes/solarized-dark/img/solarized-dark/backtotop.png
+++ b/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
index b2c3ca17..b2c3ca17 100644
--- a/themes/solarized-dark/img/solarized-dark/bad-display.png
+++ b/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
index fd7d92fa..fd7d92fa 100644
--- a/themes/solarized-dark/img/solarized-dark/checkmark-off.png
+++ b/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
index 592965dd..592965dd 100644
--- a/themes/solarized-dark/img/solarized-dark/checkmark-on.png
+++ b/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
index 5de30315..5de30315 100644
--- a/themes/solarized-dark/img/solarized-dark/down.png
+++ b/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
index d3468885..d3468885 100644
--- a/themes/solarized-dark/img/solarized-dark/envelop.png
+++ b/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
index 73e3f421..73e3f421 100644
--- a/themes/solarized-dark/img/solarized-dark/flattr.png
+++ b/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
index a953d831..a953d831 100644
--- a/themes/solarized-dark/img/solarized-dark/left.png
+++ b/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
index 5e859a0e..5e859a0e 100644
--- a/themes/solarized-dark/img/solarized-dark/link.png
+++ b/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
index 66a5c1ab..66a5c1ab 100644
--- a/themes/solarized-dark/img/solarized-dark/remove.png
+++ b/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
index 21bad1a1..21bad1a1 100644
--- a/themes/solarized-dark/img/solarized-dark/rss.png
+++ b/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
index 1eb30f60..1eb30f60 100644
--- a/themes/solarized-dark/img/solarized-dark/shaarli.png
+++ b/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
index 1c603ecc..1c603ecc 100644
--- a/themes/solarized-dark/img/solarized-dark/star-off.png
+++ b/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
index bc37772a..bc37772a 100644
--- a/themes/solarized-dark/img/solarized-dark/star-on.png
+++ b/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
index b3f44f31..b3f44f31 100644
--- a/themes/solarized-dark/img/solarized-dark/top.png
+++ b/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
index c4a25334..c4a25334 100644
--- a/themes/solarized-dark/img/solarized-dark/twitter.png
+++ b/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
index cf16338f..cf16338f 100644
--- a/themes/solarized/css/style-solarized.css
+++ b/themes/solarized/public/css/style-solarized.css
diff --git a/themes/solarized/img/solarized/backtotop.png b/themes/solarized/public/img/solarized/backtotop.png
index a3e52318..a3e52318 100644
--- a/themes/solarized/img/solarized/backtotop.png
+++ b/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
index ae99ab37..ae99ab37 100644
--- a/themes/solarized/img/solarized/bad-display.png
+++ b/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
index 20cd26b3..20cd26b3 100644
--- a/themes/solarized/img/solarized/checkmark-off.png
+++ b/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
index 87a2b799..87a2b799 100644
--- a/themes/solarized/img/solarized/checkmark-on.png
+++ b/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
index 622ff87b..622ff87b 100644
--- a/themes/solarized/img/solarized/down.png
+++ b/themes/solarized/public/img/solarized/down.png
diff --git a/themes/solarized/img/solarized/envelop.png b/themes/solarized/public/img/solarized/envelop.png
index 1caf7d43..1caf7d43 100644
--- a/themes/solarized/img/solarized/envelop.png
+++ b/themes/solarized/public/img/solarized/envelop.png
diff --git a/themes/solarized/img/solarized/flattr.png b/themes/solarized/public/img/solarized/flattr.png
index 18e00f86..18e00f86 100644
--- a/themes/solarized/img/solarized/flattr.png
+++ b/themes/solarized/public/img/solarized/flattr.png
diff --git a/themes/solarized/img/solarized/left.png b/themes/solarized/public/img/solarized/left.png
index 9780faee..9780faee 100644
--- a/themes/solarized/img/solarized/left.png
+++ b/themes/solarized/public/img/solarized/left.png
diff --git a/themes/solarized/img/solarized/link.png b/themes/solarized/public/img/solarized/link.png
index d0e12862..d0e12862 100644
--- a/themes/solarized/img/solarized/link.png
+++ b/themes/solarized/public/img/solarized/link.png
diff --git a/themes/solarized/img/solarized/remove.png b/themes/solarized/public/img/solarized/remove.png
index d5113d17..d5113d17 100644
--- a/themes/solarized/img/solarized/remove.png
+++ b/themes/solarized/public/img/solarized/remove.png
diff --git a/themes/solarized/img/solarized/rss.png b/themes/solarized/public/img/solarized/rss.png
index 21bad1a1..21bad1a1 100644
--- a/themes/solarized/img/solarized/rss.png
+++ b/themes/solarized/public/img/solarized/rss.png
diff --git a/themes/solarized/img/solarized/shaarli.png b/themes/solarized/public/img/solarized/shaarli.png
index 1eb30f60..1eb30f60 100644
--- a/themes/solarized/img/solarized/shaarli.png
+++ b/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
index afd7d80c..afd7d80c 100644
--- a/themes/solarized/img/solarized/star-off.png
+++ b/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
index 3a772512..3a772512 100644
--- a/themes/solarized/img/solarized/star-on.png
+++ b/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
index d20001a4..d20001a4 100644
--- a/themes/solarized/img/solarized/top.png
+++ b/themes/solarized/public/img/solarized/top.png
diff --git a/themes/solarized/img/solarized/twitter.png b/themes/solarized/public/img/solarized/twitter.png
index 109d7151..109d7151 100644
--- a/themes/solarized/img/solarized/twitter.png
+++ b/themes/solarized/public/img/solarized/twitter.png
diff --git a/web/index.php b/web/index.php
index 05355727..84e49eb1 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 00000000..47904264
--- /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 00000000..9e84890c
--- /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 00000000..b5b4c1dd
--- /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 00000000..fd316b37
--- /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 00000000..222bb6d5
--- /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 00000000..426a3acc
--- /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 00000000..822b6121
--- /dev/null
+++ b/web/themes/solarized-dark
@@ -0,0 +1 @@
+../../themes/solarized-dark/public
\ No newline at end of file