26 files changed, 18 insertions, 494 deletions

diff --git a/src/Wallabag/CoreBundle/Controller/DeveloperController.php b/src/Wallabag/CoreBundle/Controller/DeveloperController.php
index 63386db0..f3492b74 100644
--- a/src/Wallabag/CoreBundle/Controller/DeveloperController.php
+++ b/src/Wallabag/CoreBundle/Controller/DeveloperController.php
@@ -21,7 +21,7 @@ class DeveloperController extends Controller
     {
         $clients = $this->getDoctrine()->getRepository('WallabagApiBundle:Client')->findAll();
 
-        return $this->render('WallabagCoreBundle:Developer:index.html.twig', [
+        return $this->render('@WallabagCore/themes/common/Developer/index.html.twig', [
             'clients' => $clients,
         ]);
     }
@@ -52,14 +52,14 @@ class DeveloperController extends Controller
                 $this->get('translator')->trans('flashes.developer.notice.client_created', ['%name%' => $client->getName()])
             );
 
-            return $this->render('WallabagCoreBundle:Developer:client_parameters.html.twig', [
+            return $this->render('@WallabagCore/themes/common/Developer/client_parameters.html.twig', [
                 'client_id' => $client->getPublicId(),
                 'client_secret' => $client->getSecret(),
                 'client_name' => $client->getName(),
             ]);
         }
 
-        return $this->render('WallabagCoreBundle:Developer:client.html.twig', [
+        return $this->render('@WallabagCore/themes/common/Developer/client.html.twig', [
             'form' => $clientForm->createView(),
         ]);
     }
@@ -96,6 +96,6 @@ class DeveloperController extends Controller
      */
     public function howtoFirstAppAction()
     {
-        return $this->render('WallabagCoreBundle:Developer:howto_app.html.twig');
+        return $this->render('@WallabagCore/themes/common/Developer/howto_app.html.twig');
     }
 }
diff --git a/src/Wallabag/CoreBundle/Controller/EntryController.php b/src/Wallabag/CoreBundle/Controller/EntryController.php
index 40111af0..3b28e635 100644
--- a/src/Wallabag/CoreBundle/Controller/EntryController.php
+++ b/src/Wallabag/CoreBundle/Controller/EntryController.php
@@ -531,7 +531,7 @@ class EntryController extends Controller
         }
 
         return $this->render(
-            '@WallabagCore/themes/share.html.twig',
+            '@WallabagCore/themes/common/Entry/share.html.twig',
             ['entry' => $entry]
         );
     }
diff --git a/src/Wallabag/CoreBundle/Controller/RssController.php b/src/Wallabag/CoreBundle/Controller/RssController.php
index 2118885c..38e3b5a0 100644
--- a/src/Wallabag/CoreBundle/Controller/RssController.php
+++ b/src/Wallabag/CoreBundle/Controller/RssController.php
@@ -87,7 +87,7 @@ class RssController extends Controller
         $perPage = $user->getConfig()->getRssLimit() ?: $this->getParameter('wallabag_core.rss_limit');
         $entries->setMaxPerPage($perPage);
 
-        return $this->render('WallabagCoreBundle:Entry:entries.xml.twig', [
+        return $this->render('@WallabagCore/themes/common/Entry/entries.xml.twig', [
             'type' => $type,
             'entries' => $entries,
         ]);
diff --git a/src/Wallabag/CoreBundle/Controller/StaticController.php b/src/Wallabag/CoreBundle/Controller/StaticController.php
index 2a57f06f..82714217 100644
--- a/src/Wallabag/CoreBundle/Controller/StaticController.php
+++ b/src/Wallabag/CoreBundle/Controller/StaticController.php
@@ -15,7 +15,7 @@ class StaticController extends Controller
         $addonsUrl = $this->container->getParameter('addons_url');
 
         return $this->render(
-            'WallabagCoreBundle:Static:howto.html.twig',
+            '@WallabagCore/themes/common/Static/howto.html.twig',
             ['addonsUrl' => $addonsUrl]
         );
     }
@@ -26,7 +26,7 @@ class StaticController extends Controller
     public function aboutAction()
     {
         return $this->render(
-            'WallabagCoreBundle:Static:about.html.twig',
+            '@WallabagCore/themes/common/Static/about.html.twig',
             [
                 'version' => $this->getParameter('wallabag_core.version'),
                 'paypal_url' => $this->getParameter('wallabag_core.paypal_url'),
@@ -40,7 +40,7 @@ class StaticController extends Controller
     public function quickstartAction()
     {
         return $this->render(
-            'WallabagCoreBundle:Static:quickstart.html.twig',
+            '@WallabagCore/themes/common/Static/quickstart.html.twig',
             []
         );
     }
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig
index 1554cce4..ffc5bec6 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig
@@ -1,7 +1,7 @@
 {% extends "WallabagCoreBundle::layout.html.twig" %}
 
 {% block title %}
-    {% include "@WallabagCore/themes/_title.html.twig" %}
+    {% include "@WallabagCore/themes/common/Entry/_title.html.twig" %}
 {% endblock %}
 
 {% block content %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/about.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/about.html.twig
deleted file mode 100644
index 918249dc..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/about.html.twig
+++ /dev/null
@@ -1,169 +0,0 @@
-{% extends "WallabagCoreBundle::layout.html.twig" %}
-
-{% block title %}{{ 'about.page_title'|trans }}{% endblock %}
-
-{% block content %}
-    <h2>{{ 'about.top_menu.who_behind_wallabag'|trans }}</h2>
-
-    <dl>
-        <dt>{{ 'about.who_behind_wallabag.developped_by'|trans }}</dt>
-        <dd><a href="mailto:nicolas@loeuillet.org">Nicolas Lœuillet</a> — <a href="http://www.loeuillet.org">{{ 'about.who_behind_wallabag.website'|trans }}</a></dd>
-        <dd>Thomas Citharel — <a href="https://tcit.fr">{{ 'about.who_behind_wallabag.website'|trans }}</a></dd>
-        <dd>Jérémy Benoist — <a href="http://www.j0k3r.net">{{ 'about.who_behind_wallabag.website'|trans }}</a></dd>
-
-        <dt>{{ 'about.who_behind_wallabag.many_contributors'|trans|raw }}</dt>
-
-        <dt>{{ 'about.who_behind_wallabag.project_website'|trans }}</dt>
-        <dd><a href="https://www.wallabag.org">https://www.wallabag.org</a></dd>
-
-        <dt>{{ 'about.who_behind_wallabag.license'|trans }}: <a href="http://en.wikipedia.org/wiki/MIT_License">MIT</a></dt>
-
-        <dt>{{ 'about.who_behind_wallabag.version'|trans }}: {{ version }}</dt>
-    </dl>
-
-    <h2>{{ 'about.top_menu.getting_help'|trans }}</h2>
-
-    <dl>
-        <dt>{{ 'about.getting_help.documentation'|trans }}</dt>
-        <dd><a href="http://doc.wallabag.org/en/master/">english</a></dd>
-        <dd><a href="http://doc.wallabag.org/fr/master/">français</a></dd>
-
-        <dt>{{ 'about.getting_help.bug_reports'|trans }}</dt>
-        <dd>{{ 'about.getting_help.support'|trans|raw }}</dd>
-    </dl>
-
-    <h2>{{ 'about.top_menu.helping'|trans }}</h2>
-
-    <p>{{ 'about.helping.description'|trans }}</p>
-
-    <dl>
-        <dd>{{ 'about.helping.by_contributing_2'|trans }} <a href="https://github.com/wallabag/wallabag/issues/1254">{{ 'about.helping.by_contributing'|trans }}</a></dd>
-        <dd><a href="{{ paypal_url }}">{{ 'about.helping.by_paypal'|trans }}</a></dd>
-    </dl>
-
-    <h2>{{ 'about.top_menu.contributors'|trans }}</h2>
-    <p><a href="https://github.com/wallabag/wallabag/graphs/contributors">{{ 'about.contributors.description'|trans }}</a></p>
-
-    <h2>{{ 'about.top_menu.third_party'|trans }}</h2>
-    <p>{{ 'about.third_party.description'|trans }}</p>
-    <table class="striped">
-        <tr>
-            <th>{{ 'about.third_party.package'|trans }}</th>
-            <th>{{ 'about.third_party.license'|trans }}</th>
-        </tr>
-        <tr><td>behat/transliterator</td><td>Artistic 1.0</td></tr>
-        <tr><td>CraueConfigBundle</td><td>MIT</td></tr>
-        <tr><td>doctrine/annotations</td><td>MIT</td></tr>
-        <tr><td>doctrine/cache</td><td>MIT</td></tr>
-        <tr><td>doctrine/collections</td><td>MIT</td></tr>
-        <tr><td>doctrine/common</td><td>MIT</td></tr>
-        <tr><td>doctrine/dbal</td><td>MIT</td></tr>
-        <tr><td>doctrine/doctrine-bundle</td><td>MIT</td></tr>
-        <tr><td>doctrine/doctrine-cache-bundle</td><td>MIT</td></tr>
-        <tr><td>doctrine/doctrine-migrations-bundle</td><td>MIT</td></tr>
-        <tr><td>doctrine/inflector</td><td>MIT</td></tr>
-        <tr><td>doctrine/instantiator</td><td>MIT</td></tr>
-        <tr><td>doctrine/lexer</td><td>MIT</td></tr>
-        <tr><td>doctrine/migrations</td><td>LGPL-2.1</td></tr>
-        <tr><td>doctrine/orm</td><td>MIT</td></tr>
-        <tr><td>friendsofsymfony/oauth-server-bundle</td><td>MIT</td></tr>
-        <tr><td>friendsofsymfony/oauth2-php</td><td>MIT</td></tr>
-        <tr><td>friendsofsymfony/rest-bundle</td><td>MIT</td></tr>
-        <tr><td>friendsofsymfony/user-bundle</td><td>MIT</td></tr>
-        <tr><td>gedmo/doctrine-extensions</td><td>MIT</td></tr>
-        <tr><td>grandt/binstring</td><td>LGPL-2.1</td></tr>
-        <tr><td>grandt/phpepub</td><td>LGPL-2.1</td></tr>
-        <tr><td>grandt/phpresizegif</td><td>LGPL-2.1</td></tr>
-        <tr><td>grandt/phpzipmerge</td><td>LGPL-2.1</td></tr>
-        <tr><td>grandt/relativepath</td><td>LGPL-2.1</td></tr>
-        <tr><td>guzzlehttp/guzzle</td><td>MIT</td></tr>
-        <tr><td>guzzlehttp/ringphp</td><td>MIT</td></tr>
-        <tr><td>guzzlehttp/streams</td><td>MIT</td></tr>
-        <tr><td>hoa/compiler</td><td>BSD-3-Clause</td></tr>
-        <tr><td>hoa/consistency</td><td>BSD-3-Clause</td></tr>
-        <tr><td>hoa/event</td><td>BSD-3-Clause</td></tr>
-        <tr><td>hoa/exception</td><td>BSD-3-Clause</td></tr>
-        <tr><td>hoa/file</td><td>BSD-3-Clause</td></tr>
-        <tr><td>hoa/iterator</td><td>BSD-3-Clause</td></tr>
-        <tr><td>hoa/math</td><td>BSD-3-Clause</td></tr>
-        <tr><td>hoa/protocol</td><td>BSD-3-Clause</td></tr>
-        <tr><td>hoa/regex</td><td>BSD-3-Clause</td></tr>
-        <tr><td>hoa/ruler</td><td>BSD-3-Clausev
-        <tr><td>hoa/stream</td><td>BSD-3-Clause</td></tr>
-        <tr><td>hoa/ustring</td><td>BSD-3-Clause</td></tr>
-        <tr><td>hoa/visitor</td><td>BSD-3-Clause</td></tr>
-        <tr><td>hoa/zformat</td><td>BSD-3-Clause</td></tr>
-        <tr><td>htmlawed/htmlawed</td><td>GPL-2.0+ or LGPL-3.0</td></tr>
-        <tr><td>incenteev/composer-parameter-handler</td><td>MIT</td></tr>
-        <tr><td>j0k3r/graby</td><td>AGPL-3.0</td></tr>
-        <tr><td>j0k3r/graby-site-config</td><td>AGPL-3.0</td></tr>
-        <tr><td>j0k3r/php-readability</td><td>Apache-2.0</td></tr>
-        <tr><td>j0k3r/safecurl</td><td>MIT</td></tr>
-        <tr><td>jdorn/sql-formatter</td><td>MIT</td></tr>
-        <tr><td>jms/metadata</td><td>Apache</td></tr>
-        <tr><td>jms/parser-lib</td><td>Apache2</td></tr>
-        <tr><td>jms/serializer</td><td>Apache2</td></tr>
-        <tr><td>jms/serializer-bundle</td><td>Apache2</td></tr>
-        <tr><td>kphoen/rulerz</td><td>MIT</td></tr>
-        <tr><td>kphoen/rulerz-bundle</td><td>MIT</td></tr>
-        <tr><td>kriswallsmith/assetic</td><td>MIT</td></tr>
-        <tr><td>lexik/form-filter-bundle</td><td>MIT</td></tr>
-        <tr><td>liip/theme-bundle</td><td>MIT</td></tr>
-        <tr><td>mgargano/simplehtmldom</td><td>MIT</td></tr>
-        <tr><td>michelf/php-markdown</td><td>BSD-3-Clause</td></tr>
-        <tr><td>monolog/monolog</td><td>MIT</td></tr>
-        <tr><td>neitanod/forceutf8</td><td>BSD-3-Clause</td></tr>
-        <tr><td>nelmio/api-doc-bundle</td><td>MIT</td></tr>
-        <tr><td>nelmio/cors-bundle</td><td>MIT</td></tr>
-        <tr><td>ocramius/proxy-manager</td><td>MIT</td></tr>
-        <tr><td>pagerfanta/pagerfanta</td><td>MIT</td></tr>
-        <tr><td>paragonie/random_compat</td><td>MIT</td></tr>
-        <tr><td>phpcollection/phpcollection</td><td>Apache2</td></tr>
-        <tr><td>phpoption/phpoption</td><td>Apache2</td></tr>
-        <tr><td>phpzip/phpzip</td><td>LGPL-2.1</td></tr>
-        <tr><td>psr/log</td><td>MIT</td></tr>
-        <tr><td>react/promise</td><td>MIT</td></tr>
-        <tr><td>scheb/two-factor-bundle</td><td>MIT</td></tr>
-        <tr><td>sensio/distribution-bundle</td><td>MIT</td></tr>
-        <tr><td>sensio/framework-extra-bundle</td><td>MIT</td></tr>
-        <tr><td>sensiolabs/security-checker</td><td>MIT</td></tr>
-        <tr><td>simplepie/simplepie</td><td>BSD-3-Clause</td></tr>
-        <tr><td>smalot/pdfparser</td><td>GPL-3.0</td></tr>
-        <tr><td>sonata-project/google-authenticator</td><td>MIT</td></tr>
-        <tr><td>stof/doctrine-extensions-bundle</td><td>MIT</td></tr>
-        <tr><td>swiftmailer/swiftmailer</td><td>MIT</td></tr>
-        <tr><td>symfony/assetic-bundle</td><td>MIT</td></tr>
-        <tr><td>symfony/monolog-bundle</td><td>MIT</td></tr>
-        <tr><td>All of Symfony</td><td>MIT-licenced</td></tr>
-        <tr><td>tecnickcom/tcpdf</td><td>LGPLv3</td></tr>
-        <tr><td>twig/extensions</td><td>MIT</td></tr>
-        <tr><td>twig/twig</td><td>BSD-3-Clause</td></tr>
-        <tr><td>wallabag/php-mobi</td><td>Apache-2.0</td></tr>
-        <tr><td>willdurand/hateoas</td><td>MIT</td></tr>
-        <tr><td>willdurand/hateoas-bundle</td><td>MIT</td></tr>
-        <tr><td>willdurand/jsonp-callback-validator</td><td>MIT</td></tr>
-        <tr><td>willdurand/negotiation</td><td>MIT</td></tr>
-        <tr><td>zendframework/zend-code</td><td>BSD-3-Clause</td></tr>
-        <tr><td>zendframework/zend-eventmanager</td><td>BSD-3-Clause</td></tr>
-        <tr><td>doctrine/data-fixtures</td><td>MIT</td></tr>
-        <tr><td>doctrine/doctrine-fixtures-bundle</td><td>MIT</td></tr>
-        <tr><td>phpdocumentor/reflection-docblock</td><td>MIT</td></tr>
-        <tr><td>phpspec/prophecy</td><td>MIT</td></tr>
-        <tr><td>phpunit/php-code-coverage</td><td>BSD-3-Clause</td></tr>
-        <tr><td>phpunit/php-file-iterator</td><td>BSD-3-Clause</td></tr>
-        <tr><td>phpunit/php-text-template</td><td>BSD-3-Clause</td></tr>
-        <tr><td>phpunit/php-timer</td><td>BSD-3-Clause</td></tr>
-        <tr><td>phpunit/php-token-stream</td><td>BSD-3-Clause</td></tr>
-        <tr><td>phpunit/phpunit</td><td>BSD-3-Clause</td></tr>
-        <tr><td>phpunit/phpunit-mock-objects</td><td>BSD-3-Clause</td></tr>
-        <tr><td>sebastian/comparator</td><td>BSD-3-Clause</td></tr>
-        <tr><td>sebastian/diff</td><td>BSD-3-Clause</td></tr>
-        <tr><td>sebastian/environment</td><td>BSD-3-Clause</td></tr>
-        <tr><td>sebastian/exporter</td><td>BSD-3-Clause</td></tr>
-        <tr><td>sebastian/global-state</td><td>BSD-3-Clause</td></tr>
-        <tr><td>sebastian/recursion-context</td><td>BSD-3-Clause</td></tr>
-        <tr><td>sebastian/version</td><td>BSD-3-Clause</td></tr>
-        <tr><td>sensio/generator-bundle</td><td>MIT</td></tr>
-        <tr><td>symfony/phpunit-bridge</td><td>MIT</td></tr>
-    </table>
-{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/howto.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/howto.html.twig
deleted file mode 100644
index b529a0ac..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/howto.html.twig
+++ /dev/null
@@ -1,28 +0,0 @@
-{% extends "WallabagCoreBundle::layout.html.twig" %}
-
-{% block title %}{{ 'howto.page_title'|trans }}{% endblock %}
-
-{% block content %}
-    <h2>{{ 'howto.page_title'|trans }}</h2>
-
-    <p>{{ 'howto.page_description'|trans }}</p>
-    <ul>
-        <li><a href="{{ path('new') }}">{{ 'howto.form.description'|trans }}</a></li>
-    </ul>
-    <h3>{{ 'howto.top_menu.browser_addons'|trans }}</h3>
-    <ul>
-        <li><a href="{{ addonsUrl.firefox }}" target="_blank">{{ 'howto.browser_addons.firefox'|trans }}</a></li>
-        <li><a href="{{ addonsUrl.chrome }}" target="_blank">{{ 'howto.browser_addons.chrome'|trans }}</a></li>
-    </ul>
-    <h3>{{ 'howto.top_menu.mobile_apps'|trans }}</h3>
-    <ul>
-        <li>Android: <a href="{{ addonsUrl.f_droid }}" target="_blank">{{ 'howto.mobile_apps.android.via_f_droid'|trans }}</a> / <a href="{{ addonsUrl.google_play }}" target="_blank">{{ 'howto.mobile_apps.android.via_google_play'|trans }}</a></li>
-        <li>iOS: <a href="{{ addonsUrl.ios }}" target="_blank">{{ 'howto.mobile_apps.ios'|trans }}</a></li>
-        <li>Windows Phone: <a href="{{ addonsUrl.windows }}" target="_blank">{{ 'howto.mobile_apps.windows'|trans }}</a></li>
-    </ul>
-    <h3>{{ 'howto.top_menu.bookmarklet'|trans }}</h3>
-    <p>
-    {{ 'howto.bookmarklet.description'|trans }}
-    {% include 'WallabagCoreBundle::_bookmarklet.html.twig' %}
-
-{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/quickstart.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/quickstart.html.twig
deleted file mode 100644
index ea1c1cbe..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/quickstart.html.twig
+++ /dev/null
@@ -1,67 +0,0 @@
-{% extends "WallabagCoreBundle::layout.html.twig" %}
-
-{% block title %}{{ 'quickstart.page_title'|trans }}{% endblock %}
-
-{% block content %}
-
-    <h3>{{ 'quickstart.intro.title'|trans }}</h3>
-    <p>{{ 'quickstart.intro.paragraph_1'|trans }}</p>
-    <p>{{ 'quickstart.intro.paragraph_2'|trans }}</p>
-
-    <h4>{{ 'quickstart.configure.title'|trans }}</h4>
-    <ul>
-        <li><a href="{{ path('config') }}">{{ 'quickstart.configure.language'|trans }}</a></li>
-        <li><a href="{{ path('config') }}#set2">{{ 'quickstart.configure.rss'|trans }}</a></li>
-        <li><a href="{{ path('config') }}#set5">{{ 'quickstart.configure.tagging_rules'|trans }}</a></li>
-    </ul>
-
-    {% if is_granted('ROLE_SUPER_ADMIN') %}
-    <h4>{{ 'quickstart.admin.title'|trans }}</h4>
-    <p>{{ 'quickstart.admin.description'|trans }}</p>
-    <ul>
-        <li><a href="{{ path('config') }}#set6">{{ 'quickstart.admin.new_user'|trans }}</a></li>
-        <li><a href="{{ path('craue_config_settings_modify') }}#set-analytics">{{ 'quickstart.admin.analytics'|trans }}</a></li>
-        <li><a href="{{ path('craue_config_settings_modify') }}#set-entry">{{ 'quickstart.admin.sharing'|trans }}</a></li>
-        <li><a href="{{ path('craue_config_settings_modify') }}#set-export">{{ 'quickstart.admin.export'|trans }}</a></li>
-        <li><a href="{{ path('craue_config_settings_modify') }}#set-import">{{ 'quickstart.admin.import'|trans }}</a></li>
-    </ul>
-    {% endif %}
-
-    <h4>{{ 'quickstart.first_steps.title'|trans }}</h4>
-    <ul>
-        <li><a href="{{ path('new') }}">{{ 'quickstart.first_steps.new_article'|trans }}</a></li>
-        <li><a href="{{ path('unread') }}">{{ 'quickstart.first_steps.unread_articles'|trans }}</a></li>
-    </ul>
-
-    <h4>{{ 'quickstart.migrate.title'|trans }}</h4>
-    <p>{{ 'quickstart.migrate.description'|trans }}</p>
-    <ul>
-        <li><a href="{{ path('import_pocket') }}">{{ 'quickstart.migrate.pocket'|trans }}</a></li>
-        <li><a href="{{ path('import_wallabag_v1') }}">{{ 'quickstart.migrate.wallabag_v1'|trans }}</a></li>
-        <li><a href="{{ path('import_wallabag_v2') }}">{{ 'quickstart.migrate.wallabag_v2'|trans }}</a></li>
-        <li><a href="{{ path('import_readability') }}">{{ 'quickstart.migrate.readability'|trans }}</a></li>
-    </ul>
-
-    <h4>{{ 'quickstart.developer.title'|trans }}</h4>
-    <ul>
-        <li><a href="{{ path('developer') }}">{{ 'quickstart.developer.create_application'|trans }}</a></li>
-    </ul>
-
-    <h4>{{ 'quickstart.docs.title'|trans }}</h4>
-    <ul>
-        <li><a href="http://doc.wallabag.org/en/master/user/annotations.html">{{ 'quickstart.docs.annotate'|trans }}</a></li>
-        <li><a href="http://doc.wallabag.org/en/master/user/download_articles.html">{{ 'quickstart.docs.export'|trans }}</a></li>
-        <li><a href="http://doc.wallabag.org/en/master/user/filters.html">{{ 'quickstart.docs.search_filters'|trans }}</a></li>
-        <li><a href="http://doc.wallabag.org/en/master/user/errors_during_fetching.html">{{ 'quickstart.docs.fetching_errors'|trans }}</a></li>
-        <li><a href="http://doc.wallabag.org/">{{ 'quickstart.docs.all_docs'|trans }}</a></li>
-    </ul>
-
-    <h4>{{ 'quickstart.support.title'|trans }}</h4>
-    <p>{{ 'quickstart.support.description'|trans }}</p>
-    <ul>
-        <li><a href="https://github.com/wallabag/wallabag/issues/">{{ 'quickstart.support.github'|trans }}</a></li>
-        <li><a href="mailto:hello@wallabag.org">{{ 'quickstart.support.email'|trans }}</a></li>
-        <li><a href="https://gitter.im/wallabag/wallabag">{{ 'quickstart.support.gitter'|trans }}</a></li>
-    </ul>
-
-{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/client.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/client.html.twig
index 8a5da71a..8a5da71a 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/client.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/client.html.twig
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/client_parameters.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/client_parameters.html.twig
index b498cceb..b498cceb 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/client_parameters.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/client_parameters.html.twig
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/howto_app.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/howto_app.html.twig
index acbc2c88..acbc2c88 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/howto_app.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/howto_app.html.twig
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/index.html.twig
index 3430c0d4..3430c0d4 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/index.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/index.html.twig
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/_title.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/_title.html.twig
index d1c2f203..d1c2f203 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/_title.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/_title.html.twig
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.xml.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/entries.xml.twig
index 288bb54f..288bb54f 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.xml.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/entries.xml.twig
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/share.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/share.html.twig
index b82b3d3d..b82b3d3d 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/share.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/share.html.twig
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Mail/forgotPassword.txt.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Mail/forgotPassword.txt.twig
new file mode 100644
index 00000000..631bcb88
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Mail/forgotPassword.txt.twig
@@ -0,0 +1,6 @@
+Hello {{username}}!
+
+To reset your password - please visit {{confirmationUrl}}
+
+Regards,
+Wallabag bot
diff --git a/src/Wallabag/CoreBundle/Resources/views/_bookmarklet.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/_bookmarklet.html.twig
index 966a84db..966a84db 100644
--- a/src/Wallabag/CoreBundle/Resources/views/_bookmarklet.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/_bookmarklet.html.twig
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/about.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/about.html.twig
index d0b94279..d0b94279 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/about.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/about.html.twig
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/howto.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/howto.html.twig
index 6a177d6b..67a10190 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/howto.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/howto.html.twig
@@ -35,7 +35,7 @@
                     <div class="col s12">
                         <h5>{{ 'howto.top_menu.bookmarklet'|trans }}</h5>
                         {{ 'howto.bookmarklet.description'|trans }}
-                        {% include 'WallabagCoreBundle::_bookmarklet.html.twig' %}
+                        {% include '@WallabagCore/themes/common/Static/_bookmarklet.html.twig' %}
                     </div>
 
                 </div>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/quickstart.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/quickstart.html.twig
index 8cbf4ab4..8cbf4ab4 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/quickstart.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/quickstart.html.twig
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/client.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/client.html.twig
deleted file mode 100644
index 8a5da71a..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/client.html.twig
+++ /dev/null
@@ -1,37 +0,0 @@
-{% extends "WallabagCoreBundle::layout.html.twig" %}
-
-{% block title %}{{ 'developer.client.page_title'|trans }}{% endblock %}
-
-{% block content %}
-<div class="row">
-    <div class="col s12">
-        <div class="card-panel settings">
-
-            <div class="row">
-                <p>{{ 'developer.client.page_description'|trans }}</p>
-                {{ form_start(form) }}
-                {{ form_errors(form) }}
-
-                <div class="input-field col s12">
-                    {{ form_label(form.name) }}
-                    {{ form_errors(form.name) }}
-                    {{ form_widget(form.name) }}
-                </div>
-
-                <div class="input-field col s12">
-                    {{ form_label(form.redirect_uris) }}
-                    {{ form_errors(form.redirect_uris) }}
-                    {{ form_widget(form.redirect_uris) }}
-                </div>
-
-                <a href="{{ path('developer') }}" class="waves-effect waves-light grey btn">{{ 'developer.client.action_back'|trans }}</a>
-                {{ form_widget(form.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }}
-
-                {{ form_rest(form) }}
-            </div>
-
-        </div>
-    </div>
-</div>
-
-{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/client_parameters.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/client_parameters.html.twig
deleted file mode 100644
index b498cceb..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/client_parameters.html.twig
+++ /dev/null
@@ -1,23 +0,0 @@
-{% extends "WallabagCoreBundle::layout.html.twig" %}
-
-{% block title %}{{ 'developer.client_parameter.page_title'|trans }}{% endblock %}
-
-{% block content %}
-<div class="row">
-    <div class="col s12">
-        <div class="card-panel settings">
-            <div class="row">
-                <p>{{ 'developer.client_parameter.page_description'|trans }}</p>
-                <ul>
-                    <li>{{ 'developer.client_parameter.field_name'|trans }}: <strong><pre>{{ client_name }}</pre></strong></li>
-                    <li>{{ 'developer.client_parameter.field_id'|trans }}: <strong><pre>{{ client_id }}</pre></strong></li>
-                    <li>{{ 'developer.client_parameter.field_secret'|trans }}: <strong><pre>{{ client_secret }}</pre></strong></li>
-                </ul>
-
-                <a href="{{ path('developer') }}" class="waves-effect waves-light grey btn">{{ 'developer.client_parameter.back'|trans }}</a>
-                <a href="{{ path('developer_howto_firstapp') }}" class="btn waves-effect waves-light">{{ 'developer.client_parameter.read_howto'|trans }}</a>
-            </div>
-        </div>
-    </div>
-</div>
-{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/howto_app.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/howto_app.html.twig
deleted file mode 100644
index acbc2c88..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/howto_app.html.twig
+++ /dev/null
@@ -1,63 +0,0 @@
-{% extends "WallabagCoreBundle::layout.html.twig" %}
-
-{% block title %}{{ 'developer.howto.page_title'|trans }}{% endblock %}
-
-{% block css %}
-    {{ parent() }}
-    <link rel="stylesheet" href="{{ asset('https://cdnjs.cloudflare.com/ajax/libs/prism/1.4.1/themes/prism-dark.min.css') }}">
-{% endblock %}
-
-{% block content %}
-<div class="row">
-    <div class="col s12">
-        <div class="card-panel settings">
-
-            <div class="row">
-                <p>{{ 'developer.howto.description.paragraph_1'|trans|raw }}</p>
-                <p>{{ 'developer.howto.description.paragraph_2'|trans }}</p>
-                <p>{{ 'developer.howto.description.paragraph_3'|trans({'%link%': path('developer_create_client')})|raw }}</p>
-                <p>{{ 'developer.howto.description.paragraph_4'|trans }}</p>
-                <p>
-                    <pre><code class="language-bash">http POST http://v2.wallabag.org/oauth/v2/token \
-    grant_type=password \
-    client_id=12_5um6nz50ceg4088c0840wwc0kgg44g00kk84og044ggkscso0k \
-    client_secret=3qd12zpeaxes8cwg8c0404g888co4wo8kc4gcw0occww8cgw4k \
-    username=yourUsername \
-    password=yourPassw0rd</code></pre>
-                </p>
-                <p>{{ 'developer.howto.description.paragraph_5'|trans }}</p>
-                <p>
-                    <pre><code class="language-bash">HTTP/1.1 200 OK
-Cache-Control: no-store, private
-Connection: close
-Content-Type: application/json
-Date: Tue, 06 Oct 2015 18:24:03 GMT
-Host: localhost:8000
-Pragma: no-cache
-X-Debug-Token: be00a1
-X-Debug-Token-Link: /profiler/be00a1
-X-Powered-By: PHP/5.5.9-1ubuntu4.13
-{
-    "access_token": "ZWFjNjA3ZWMwYWVmYzRkYTBlMmQ3NTllYmVhOGJiZDE0ZTg1NjE4MjczOTVlNzM0ZTRlMWQ0MmRlMmYwNTk5Mw",
-    "expires_in": 3600,
-    "refresh_token": "ODBjODU1NWUwNmUzZTBkNDQ5YWVlZTVlMjQ2Y2I0OWM2NTM1ZGM2M2Y3MDhjMTViM2U2MzYxYzRkMDk5ODRlZg",
-    "scope": null,
-    "token_type": "bearer"
-}</code></pre>
-                </p>
-                <p>{{ 'developer.howto.description.paragraph_6'|trans }}</p>
-                <p>
-                    <pre><code class="language-bash">http GET http://v2.wallabag.org/api/entries.json \
-    "Authorization:Bearer ZWFjNjA3ZWMwYWVmYzRkYTBlMmQ3NTllYmVhOGJiZDE0ZTg1NjE4MjczOTVlNzM0ZTRlMWQ0MmRlMmYwNTk5Mw"</code></pre>
-                </p>
-                <p>{{ 'developer.howto.description.paragraph_7'|trans }}</p>
-                <p>{{ 'developer.howto.description.paragraph_8'|trans({'%link%': path('nelmio_api_doc_index')})|raw }}</p>
-                <p><a href="{{ path('developer') }}" class="waves-effect waves-light grey btn">{{ 'developer.howto.back'|trans }}</a></p>
-            </div>
-
-        </div>
-    </div>
-</div>
-<script src="{{ asset('https://cdnjs.cloudflare.com/ajax/libs/prism/1.4.1/prism.min.js') }}"></script>
-<script src="{{ asset('https://cdnjs.cloudflare.com/ajax/libs/prism/1.4.1/components/prism-bash.min.js') }}"></script>
-{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/index.html.twig
deleted file mode 100644
index 3430c0d4..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/index.html.twig
+++ /dev/null
@@ -1,69 +0,0 @@
-{% extends "WallabagCoreBundle::layout.html.twig" %}
-
-{% block title %}{{ 'developer.page_title'|trans }}{% endblock %}
-
-{% block content %}
-<div class="row">
-    <div class="col s12">
-        <div class="card-panel settings">
-
-            <div class="row">
-                <h3>{{ 'developer.welcome_message'|trans }}</h3>
-
-                <h4>{{ 'developer.documentation'|trans }}</h4>
-
-                <ul>
-                    <li><a href="{{ path('developer_howto_firstapp') }}">{{ 'developer.how_to_first_app'|trans }}</a></li>
-                    <li><a href="http://doc.wallabag.org/en/master/developer/api.html">{{ 'developer.full_documentation'|trans }}</a></li>
-                    <li><a href="{{ path('nelmio_api_doc_index') }}">{{ 'developer.list_methods'|trans }}</a></li>
-                </ul>
-
-                <h4>{{ 'developer.clients.title'|trans }}</h4>
-                <ul>
-                    <li><a href="{{ path('developer_create_client') }}">{{ 'developer.clients.create_new'|trans }}</a></li>
-                </ul>
-
-                <h4>{{ 'developer.existing_clients.title'|trans }}</h4>
-                {% if clients %}
-                    <ul class="collapsible" data-collapsible="expandable">
-                        {% for client in clients %}
-                            <li>
-                                <div class="collapsible-header">{{ client.name }} - #{{ client.id }}</div>
-                                <div class="collapsible-body">
-                                    <table class="striped">
-                                        <tr>
-                                            <td>{{ 'developer.existing_clients.field_id'|trans }}</td>
-                                            <td><strong><code>{{ client.id }}_{{ client.randomId }}</code></strong></td>
-                                        </tr>
-                                        <tr>
-                                            <td>{{ 'developer.existing_clients.field_secret'|trans }}</td>
-                                            <td><strong><code>{{ client.secret }}</code></strong></td>
-                                        </tr>
-                                        <tr>
-                                            <td>{{ 'developer.existing_clients.field_uris'|trans }}</td>
-                                            <td><strong><code>{{ client.redirectUris|json_encode() }}</code></strong></td>
-                                        </tr>
-                                        <tr>
-                                            <td>{{ 'developer.existing_clients.field_grant_types'|trans }}</td>
-                                            <td><strong><code>{{ client.allowedGrantTypes|json_encode() }}</code></strong></td>
-                                        </tr>
-                                    </table>
-                                    <p>
-                                        {{ 'developer.remove.warn_message_1'|trans({'%name%': client.name }) }}<br/>
-                                        {{ 'developer.remove.warn_message_2'|trans({'%name%': client.name }) }}<br/>
-                                        <a class="waves-effect waves-light red btn" href="{{ path('developer_delete_client', {'id': client.id}) }}">{{ 'developer.remove.action'|trans({'%name%': client.name }) }}</a>
-                                    </p>
-                                </div>
-                            </li>
-                        {% endfor %}
-                    </ul>
-                {% else %}
-                    {{ 'developer.existing_clients.no_client'|trans }}
-                {% endif %}
-            </div>
-
-        </div>
-    </div>
-</div>
-
-{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
index 806a4eef..e889dea8 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
@@ -1,7 +1,7 @@
 {% extends "WallabagCoreBundle::layout.html.twig" %}
 
 {% block title %}
-  {% include "@WallabagCore/themes/_title.html.twig" %}
+  {% include "@WallabagCore/themes/common/Entry/_title.html.twig" %}
 {% endblock %}
 
 {% block content %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.xml.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.xml.twig
deleted file mode 100644
index 288bb54f..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.xml.twig
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<rss version="2.0" xmlns:content="http://purl.org/rss/1.0/modules/content/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:media="http://search.yahoo.com/mrss/">
-    <channel>
-        <title>wallabag — {{type}} feed</title>
-        <link>{{ url('unread') }}</link>
-        <pubDate>{{ "now"|date('D, d M Y H:i:s') }}</pubDate>
-        <generator>wallabag</generator>
-        <description>wallabag {{type}} elements</description>
-
-        {% for entry in entries %}
-
-            <item>
-                <title><![CDATA[{{ entry.title }}]]></title>
-                <source url="{{ url('view', { 'id': entry.id }) }}">wallabag</source>
-                <link>{{ entry.url }}</link>
-                <guid>{{ entry.url }}</guid>
-                <pubDate>{{ entry.createdAt|date('D, d M Y H:i:s') }}</pubDate>
-                <description>
-                    <![CDATA[{%- if entry.readingTime > 0 -%}{{ 'entry.list.reading_time_minutes'|trans({'%readingTime%': entry.readingTime}) }}{%- else -%}{{ 'entry.list.reading_time_less_one_minute'|trans|raw }}{%- endif %}{{ entry.content|raw -}}]]>
-                </description>
-            </item>
-
-        {% endfor %}
-
-    </channel>
-</rss>