237 files changed, 280 insertions, 2567 deletions

diff --git a/src/Wallabag/CoreBundle/Controller/ConfigController.php b/src/Wallabag/CoreBundle/Controller/ConfigController.php
index 68e034fa..4e895875 100644
--- a/src/Wallabag/CoreBundle/Controller/ConfigController.php
+++ b/src/Wallabag/CoreBundle/Controller/ConfigController.php
@@ -7,7 +7,6 @@ use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\HttpFoundation\Request;
 use Wallabag\CoreBundle\Entity\Config;
 use Wallabag\CoreBundle\Entity\User;
-use Wallabag\CoreBundle\Form\Type\ConfigType;
 use Wallabag\CoreBundle\Form\Type\ChangePasswordType;
 use Wallabag\CoreBundle\Form\Type\UserType;
 use Wallabag\CoreBundle\Form\Type\NewUserType;
@@ -25,14 +24,18 @@ class ConfigController extends Controller
         $config = $this->getConfig();
         $user = $this->getUser();
 
-        // handle basic config detail
-        $configForm = $this->createForm(new ConfigType(), $config);
+        // handle basic config detail (this form is defined as a service)
+        $configForm = $this->createForm('config', $config);
         $configForm->handleRequest($request);
 
         if ($configForm->isValid()) {
             $em->persist($config);
             $em->flush();
 
+            // switch active theme
+            $activeTheme = $this->get('liip_theme.active_theme');
+            $activeTheme->setName($config->getTheme());
+
             $this->get('session')->getFlashBag()->add(
                 'notice',
                 'Config saved'
diff --git a/src/Wallabag/CoreBundle/Entity/Config.php b/src/Wallabag/CoreBundle/Entity/Config.php
index 7b4464a1..91f9bfe8 100644
--- a/src/Wallabag/CoreBundle/Entity/Config.php
+++ b/src/Wallabag/CoreBundle/Entity/Config.php
@@ -48,7 +48,7 @@ class Config
     private $language;
 
     /**
-     * @ORM\ManyToOne(targetEntity="User", inversedBy="config")
+     * @ORM\OneToOne(targetEntity="User", inversedBy="config")
      */
     private $user;
 
diff --git a/src/Wallabag/CoreBundle/Entity/User.php b/src/Wallabag/CoreBundle/Entity/User.php
index 193dfebc..ed5cfe53 100644
--- a/src/Wallabag/CoreBundle/Entity/User.php
+++ b/src/Wallabag/CoreBundle/Entity/User.php
@@ -92,6 +92,11 @@ class User implements AdvancedUserInterface, \Serializable
      */
     private $entries;
 
+    /**
+     * @ORM\OneToOne(targetEntity="Config", mappedBy="user")
+     */
+    private $config;
+
     public function __construct()
     {
         $this->salt    = md5(uniqid(null, true));
@@ -320,4 +325,26 @@ class User implements AdvancedUserInterface, \Serializable
     {
         return $this->isActive;
     }
+    /**
+     * Set config
+     *
+     * @param  \Wallabag\CoreBundle\Entity\Config $config
+     * @return User
+     */
+    public function setConfig(\Wallabag\CoreBundle\Entity\Config $config = null)
+    {
+        $this->config = $config;
+
+        return $this;
+    }
+
+    /**
+     * Get config
+     *
+     * @return \Wallabag\CoreBundle\Entity\Config
+     */
+    public function getConfig()
+    {
+        return $this->config;
+    }
 }
diff --git a/src/Wallabag/CoreBundle/Form/Type/ConfigType.php b/src/Wallabag/CoreBundle/Form/Type/ConfigType.php
index a1e0ce47..0c8706e2 100644
--- a/src/Wallabag/CoreBundle/Form/Type/ConfigType.php
+++ b/src/Wallabag/CoreBundle/Form/Type/ConfigType.php
@@ -7,20 +7,23 @@ use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 class ConfigType extends AbstractType
 {
+    private $themes = array();
+
+    /**
+     * @param array $themes Themes come from the LiipThemeBundle (liip_theme.themes)
+     */
+    public function __construct($themes)
+    {
+        $this->themes = array_combine(
+            $themes,
+            array_map(function ($s) { return ucwords(strtolower(str_replace('-', ' ', $s))); }, $themes)
+        );
+    }
+
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
-            ->add('theme', 'choice', array(
-                'choices' => array(
-                    'baggy' => 'Baggy',
-                    'courgette' => 'Courgette',
-                    'dark' => 'Dark',
-                    'default' => 'Default',
-                    'dmagenta' => 'Dmagenta',
-                    'solarized' => 'Solarized',
-                    'solarized_dark' => 'Solarized Dark',
-                ),
-            ))
+            ->add('theme', 'choice', array('choices' => $this->themes))
             ->add('items_per_page', 'text')
             ->add('language')
             ->add('save', 'submit')
diff --git a/src/Wallabag/CoreBundle/Helper/DetectActiveTheme.php b/src/Wallabag/CoreBundle/Helper/DetectActiveTheme.php
new file mode 100644
index 00000000..446629db
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Helper/DetectActiveTheme.php
@@ -0,0 +1,59 @@
+<?php
+
+namespace Wallabag\CoreBundle\Helper;
+
+use Liip\ThemeBundle\Helper\DeviceDetectionInterface;
+use Symfony\Component\Security\Core\SecurityContextInterface;
+use Wallabag\CoreBundle\Entity\User;
+
+/**
+ * This class intend to detect the active theme for the logged in user.
+ * It will retrieve the configured theme of the user.
+ *
+ * If no user where logged in, it will returne the default theme
+ */
+class DetectActiveTheme implements DeviceDetectionInterface
+{
+    protected $securityContext;
+    protected $defaultTheme;
+
+    /**
+     * @param SecurityContextInterface $securityContext Needed to retrieve the current user
+     * @param string                   $defaultTheme    Default theme when user isn't logged in
+     */
+    public function __construct(SecurityContextInterface $securityContext, $defaultTheme)
+    {
+        $this->securityContext = $securityContext;
+        $this->defaultTheme = $defaultTheme;
+    }
+
+    public function setUserAgent($userAgent)
+    {
+    }
+
+    /**
+     * This should return the active theme for the logged in user.
+     *
+     * Default theme for:
+     *     - anonymous user
+     *     - user without a config (shouldn't happen ..)
+     *
+     * @return string
+     */
+    public function getType()
+    {
+        $user = $this->securityContext->getToken()->getUser();
+
+        if (!$user instanceof User) {
+            return $this->defaultTheme;
+        }
+
+        $config = $user->getConfig();
+
+        if (!$config) {
+            return $this->defaultTheme;
+        }
+
+        return $config->getTheme();
+    }
+}
diff --git a/src/Wallabag/CoreBundle/Resources/config/services.yml b/src/Wallabag/CoreBundle/Resources/config/services.yml
index b066c1a3..c734a3a5 100644
--- a/src/Wallabag/CoreBundle/Resources/config/services.yml
+++ b/src/Wallabag/CoreBundle/Resources/config/services.yml
@@ -1,15 +1,30 @@
 services:
-    wallabag_core.twig.wallabag:
+    wallabag_core.twig.extension:
         class: Wallabag\CoreBundle\Twig\Extension\WallabagExtension
         tags:
             - { name: twig.extension }
+
     wsse.security.authentication.provider:
         class: Wallabag\CoreBundle\Security\Authentication\Provider\WsseProvider
         public: false
         arguments: ['', '%kernel.cache_dir%/security/nonces']
+
     wsse.security.authentication.listener:
         class: Wallabag\CoreBundle\Security\Firewall\WsseListener
         public: false
         tags:
             - { name: monolog.logger, channel: wsse }
         arguments: ['@security.context', '@security.authentication.manager', '@logger']
+
+    wallabag_core.helper.detect_active_theme:
+        class: Wallabag\CoreBundle\Helper\DetectActiveTheme
+        arguments:
+            - @security.context
+            - %theme% # default theme from parameters.yml
+
+    wallabag_core.form.type.config:
+        class: Wallabag\CoreBundle\Form\Type\ConfigType
+        arguments:
+            - %liip_theme.themes%
+        tags:
+            - { name: form.type, alias: config }
diff --git a/src/Wallabag/CoreBundle/Resources/views/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/Config/index.html.twig
index 051dafd6..1835d26e 100644
--- a/src/Wallabag/CoreBundle/Resources/views/Config/index.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/Config/index.html.twig
@@ -2,10 +2,6 @@
 
 {% block title %}{% trans %}Config{% endtrans %}{% endblock %}
 
-{% block menu %}
-    {% include "WallabagCoreBundle::_menu.html.twig" %}
-{% endblock %}
-
 {% block content %}
     <h2>{% trans %}Wallabag configuration{% endtrans %}</h2>
 
diff --git a/src/Wallabag/CoreBundle/Resources/views/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/Entry/entries.html.twig
index dfce4b3c..acb96420 100644
--- a/src/Wallabag/CoreBundle/Resources/views/Entry/entries.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/Entry/entries.html.twig
@@ -2,10 +2,6 @@
 
 {% block title "Unread" %}
 
-{% block menu %}
-    {% include "WallabagCoreBundle::_menu.html.twig" %}
-{% endblock %}
-
 {% block content %}
     {% block pager %}
     {% if entries is not empty %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/Entry/entry.html.twig
index f0c00509..f23ab968 100644
--- a/src/Wallabag/CoreBundle/Resources/views/Entry/entry.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/Entry/entry.html.twig
@@ -2,10 +2,6 @@
 
 {% block title %}{{ entry.title|raw }} ({{ entry.url | e | domainName }}){% endblock %}
 
-{% block menu %}
-    {% include "WallabagCoreBundle::_menu.html.twig" %}
-{% endblock %}
-
 {% block content %}
     <div id="article_toolbar">
         <ul class="links">
diff --git a/src/Wallabag/CoreBundle/Resources/views/Entry/new.html.twig b/src/Wallabag/CoreBundle/Resources/views/Entry/new.html.twig
index b6de7d23..b11512a4 100644
--- a/src/Wallabag/CoreBundle/Resources/views/Entry/new.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/Entry/new.html.twig
@@ -2,10 +2,6 @@
 
 {% block title %}{% trans %}Save new entry{% endtrans %}{% endblock %}
 
-{% block menu %}
-    {% include "WallabagCoreBundle::_menu.html.twig" %}
-{% endblock %}
-
 {% block content %}
     {{ form(form) }}
 {% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/Security/login.html.twig b/src/Wallabag/CoreBundle/Resources/views/Security/login.html.twig
index 2437e3b0..eb8f08c8 100644
--- a/src/Wallabag/CoreBundle/Resources/views/Security/login.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/Security/login.html.twig
@@ -1,6 +1,11 @@
-{% extends "WallabagCoreBundle::layout-login.html.twig" %}
+{% extends "WallabagCoreBundle::layout.html.twig" %}
 
 {% block title %}{% trans %}login to your wallabag{% endtrans %}{% endblock %}
+
+{% block body_class %}login{% endblock %}
+
+{% block menu %}{% endblock %}
+
 {% block content %}
     {% if error %}
         <div>{{ error.message }}</div>
@@ -19,11 +24,7 @@
                     <label class="col w150p" for="password">{% trans %}Password{% endtrans %}</label>
                     <input type="password" id="password" name="_password" />
                 </div>
-            {#
-                Si vous voulez contrôler l'URL vers laquelle l'utilisateur est redirigé en cas de succès
-                (plus de détails ci-dessous)
-                <input type="hidden" name="_target_path" value="/account" />
-            #}
+
                 <div class="row mts txtcenter">
                     <button type="submit">login</button>
                 </div>
diff --git a/src/Wallabag/CoreBundle/Resources/views/Static/about.html.twig b/src/Wallabag/CoreBundle/Resources/views/Static/about.html.twig
index b8d3c7b6..9e188cd9 100755
--- a/src/Wallabag/CoreBundle/Resources/views/Static/about.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/Static/about.html.twig
@@ -1,9 +1,7 @@
 {% extends "WallabagCoreBundle::layout.html.twig" %}
 
 {% block title %}{% trans %}About{% endtrans %}{% endblock %}
-{% block menu %}
-{% include "WallabagCoreBundle::_menu.html.twig" %}
-{% endblock %}
+
 {% block content %}
     <h2>{% trans %}About wallabag{% endtrans %}</h2>
 
diff --git a/src/Wallabag/CoreBundle/Resources/views/_footer.html.twig b/src/Wallabag/CoreBundle/Resources/views/_footer.html.twig
deleted file mode 100644
index 1b5f9a0f..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/_footer.html.twig
+++ /dev/null
@@ -1,3 +0,0 @@
-<footer class="w600p center mt3 mb3 smaller txtright">
-    <p>{% trans %}powered by{% endtrans %} <a href="http://wallabag.org">wallabag</a></p>
-</footer>
diff --git a/src/Wallabag/CoreBundle/Resources/views/_head.html.twig b/src/Wallabag/CoreBundle/Resources/views/_head.html.twig
deleted file mode 100755
index 3bdbe812..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/_head.html.twig
+++ /dev/null
@@ -1,40 +0,0 @@
-<link rel="apple-touch-icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-152.png') }}" sizes="152x152">
-<link rel="icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-152.png') }}" sizes="152x152">
-
-<link rel="apple-touch-icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-144.png') }}" sizes="144x144">
-<link rel="icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-144.png') }}" sizes="144x144">
-
-<link rel="apple-touch-icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-120.png') }}" sizes="120x120">
-<link rel="icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-120.png') }}" sizes="120x120">
-
-<link rel="apple-touch-icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-114.png') }}" sizes="114x114">
-<link rel="icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-114.png') }}" sizes="114x114">
-
-<link rel="apple-touch-icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-76.png') }}" sizes="76x76">
-<link rel="icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-76.png') }}" sizes="76x76">
-
-<link rel="apple-touch-icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-72.png') }}" sizes="72x72">
-<link rel="icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-72.png') }}" sizes="72x72">
-
-<link rel="apple-touch-icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-57.png') }}" sizes="57x57">
-<link rel="icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-57.png') }}" sizes="57x57">
-
-<link rel="apple-touch-icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon.png') }}">
-<link rel="icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon.png') }}">
-
-<link rel="shortcut icon" type="image/x-icon" href="{{ asset('themes/_global/img/appicon/favicon.ico') }}">
-
-<link rel="stylesheet" href="{{ asset('themes/baggy/css/ratatouille.css') }}" media="all">
-<link rel="stylesheet" href="{{ asset('themes/baggy/css/font.css') }}" media="all">
-<link rel="stylesheet" href="{{ asset('themes/baggy/css/main.css') }}" media="all">
-<link rel="stylesheet" href="{{ asset('themes/baggy/css/messages.css') }}" media="all">
-<link rel="stylesheet" href="{{ asset('themes/baggy/css/print.css') }}" media="print">
-
-<script src="{{ asset('themes/_global/js/jquery-2.0.3.min.js') }}"></script>
-<script src="{{ asset('themes/_global/js/autoClose.js') }}"></script>
-<script src="{{ asset('themes/baggy/js/jquery.cookie.js') }}"></script>
-<script src="{{ asset('themes/baggy/js/init.js') }}"></script>
-<script src="{{ asset('themes/_global/js/saveLink.js') }}"></script>
-<script src="{{ asset('themes/_global/js/popupForm.js') }}"></script>
-<script src="{{ asset('themes/baggy/js/closeMessage.js') }}"></script>
-<script src="{{ asset('bundles/wallabagcore/js/bookmarklet.js') }}"></script>
diff --git a/src/Wallabag/CoreBundle/Resources/views/_menu.html.twig b/src/Wallabag/CoreBundle/Resources/views/_menu.html.twig
deleted file mode 100644
index 9a3cf053..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/_menu.html.twig
+++ /dev/null
@@ -1,14 +0,0 @@
-<button id="menu" class="icon icon-menu desktopHide"><span>Menu</span></button>
-<ul id="links" class="links">
-    <li><a href="{{ path('unread') }}">{% trans %}unread{% endtrans %}</a></li>
-    <li><a href="{{ path('starred') }}">{% trans %}favorites{% endtrans %}</a></li>
-    <li><a href="{{ path('archive') }}"}>{% trans %}archive{% endtrans %}</a></li>
-    <li><a href="?view=tags">{% trans %}tags{% endtrans %}</a></li>
-    <li><a href="{{ path('new_entry') }}">{% trans %}save a link{% endtrans %}</a></li>
-    <li style="position: relative;"><a href="javascript: void(null);" id="search">{% trans %}search{% endtrans %}</a>
-        {% include "WallabagCoreBundle::_search_form.html.twig" %}
-    </li>
-    <li><a href="{{ path('config') }}">{% trans %}config{% endtrans %}</a></li>
-    <li><a href="{{ path('about') }}">{% trans %}about{% endtrans %}</a></li>
-    <li><a class="icon icon-power" href="{{ path('logout') }}" title="{% trans %}logout{% endtrans %}">{% trans %}logout{% endtrans %}</a></li>
-</ul>
diff --git a/src/Wallabag/CoreBundle/Resources/views/_messages.html.twig b/src/Wallabag/CoreBundle/Resources/views/_messages.html.twig
deleted file mode 100644
index e69de29b..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/_messages.html.twig
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/_save_form.html.twig b/src/Wallabag/CoreBundle/Resources/views/_save_form.html.twig
deleted file mode 100755
index acaa5dbc..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/_save_form.html.twig
+++ /dev/null
@@ -1,10 +0,0 @@
-<div id="bagit-form" class="messages info popup-form">
-    <form method="get" action="index.php" target="_blank" id="bagit-form-form">
-        <h2>{% trans %}Save a link{% endtrans %}</h2>
-        <a href="javascript: void(null);" id="bagit-form-close" class="close-button--popup close-button">&times;</a>
-        <input type="hidden" name="autoclose" value="1" />
-        <input required placeholder="example.com/article" class="addurl" id="plainurl" name="plainurl" type="url" />
-        <span id="add-link-result"></span>
-        <input type="submit" value="{% trans %}save link!"{% endtrans %} />
-    </form>
-</div>
diff --git a/src/Wallabag/CoreBundle/Resources/views/_search_form.html.twig b/src/Wallabag/CoreBundle/Resources/views/_search_form.html.twig
deleted file mode 100644
index 1e6f327d..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/_search_form.html.twig
+++ /dev/null
@@ -1,9 +0,0 @@
-<div id="search-form" class="messages info popup-form">
-    <form method="get" action="index.php">
-        <h2>{% trans %}Search{% endtrans %}</h2>
-        <a href="javascript: void(null);" id="search-form-close" class="close-button--popup close-button">&times;</a>
-        <input type="hidden" name="view" value="search"></input>
-        <input required placeholder="{% trans %}Enter your search here{% endtrans %}" type="text" name="search" id="searchfield"><br>
-        <input id="submit-search" type="submit" value="{% trans %}Search{% endtrans %}"></input>
-    </form>
-</div>
diff --git a/src/Wallabag/CoreBundle/Resources/views/_top.html.twig b/src/Wallabag/CoreBundle/Resources/views/_top.html.twig
deleted file mode 100755
index 9313071d..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/_top.html.twig
+++ /dev/null
@@ -1,5 +0,0 @@
-<header class="w600p center mbm">
-    <h1>
-        {% block logo %}<img width="100" height="100" src="{{ asset('themes/baggy/img/logo-w.png') }}" alt="wallabag logo" />{% endblock %}
-    </h1>
-</header>
diff --git a/src/Wallabag/CoreBundle/Resources/views/baggy/_display-mode.twig b/src/Wallabag/CoreBundle/Resources/views/baggy/_display-mode.twig
deleted file mode 100755
index 382dd5f1..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/baggy/_display-mode.twig
+++ /dev/null
@@ -1,5 +0,0 @@
-<div id="display-mode">
-  <a href="javascript: void(null);" id="listmode" class="listmode">
-    <img src="{{ poche_url }}themes/{{ theme }}/img/{{ theme }}/blank.png" alt="{% trans "toggle view mode" %}" title="{% trans "toggle view mode" %}" width="16" height="16">
-  </a>
-</div>
diff --git a/src/Wallabag/CoreBundle/Resources/views/baggy/config.twig b/src/Wallabag/CoreBundle/Resources/views/baggy/config.twig
deleted file mode 100755
index c5c07d49..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/baggy/config.twig
+++ /dev/null
@@ -1,187 +0,0 @@
-{% extends "layout.twig" %}
-
-{% block title %}{% trans "config" %}{% endblock %}
-{% block menu %}
-{% include '_menu.twig' %}
-{% endblock %}
-{% block content %}
-            <h2>{% trans "Saving articles" %}</h2>
-            <p>{% trans "There are several ways to save an article:" %} {% trans "(<a href=\"http://doc.wallabag.org/en/User_documentation/Save_your_first_article\" target=\"_blank\" title=\"Documentation\">?</a>)" %}</p>
-            <p>
-                <form method="get" action="index.php">
-                    <label class="addurl" for="config_plainurl">{% trans "By filling this field" %}:</label><br>
-                    <input required placeholder="example.com/article" class="addurl" id="config_plainurl" name="plainurl" type="url" />
-                    <input type="submit" value="{% trans "bag it!" %}" />
-                </form>
-            </p>
-            <h3>Browser Plugins</h3>
-            <ul>
-                <li><a href="https://addons.mozilla.org/firefox/addon/wallabag/" target="_blank">{% trans "Firefox Add-On" %}</a></li>
-                <li><a href="https://chrome.google.com/webstore/detail/wallabag/bepdcjnnkglfjehplaogpoonpffbdcdj" target="_blank">{% trans "Chrome Extension" %}</a></li>
-            </ul>
-            <h3>Mobile Apps</h3>
-            <ul>
-                <li>Android: <a href="https://f-droid.org/app/fr.gaulupeau.apps.InThePoche" target="_blank">{% trans "via F-Droid" %}</a> {% trans " or " %} <a href="https://play.google.com/store/apps/details?id=fr.gaulupeau.apps.InThePoche" target="_blank">{% trans "via Google Play" %}</a></li>
-                <li>iOS: <a href="https://itunes.apple.com/app/wallabag/id828331015?mt=8" target="_blank">{% trans "download the application" %}</a></li>
-                <li>Windows Phone: <a href="http://www.windowsphone.com/en-us/store/app/wallabag/ff890514-348c-4d0b-9b43-153fff3f7450" target="_blank">{% trans "download the application" %}</a></li>
-            </ul>
-                <h3>{% trans "Bookmarklet" %}</h3>
-                <p>
-                {% trans "Drag &amp; drop this link to your bookmarks bar:" %} <a id="bookmarklet" ondragend="this.click();" href="javascript:if(top['bookmarklet-url@wallabag.org']){top['bookmarklet-url@wallabag.org'];}else{(function(){var%20url%20=%20location.href%20||%20url;window.open('{{ poche_url }}?action=add&url='%20+%20btoa(url),'_self');})();void(0);}">{% trans "bag it!" %}</a>
-                </p>
-
-            <h2>{% trans "Feeds" %}</h2>
-            {% if token == '' %}
-                <p>{% trans "Your feed token is currently empty and must first be generated to enable feeds. Click <a href='?feed&amp;action=generate'>here to generate it</a>." %}</p>
-            {% else %}
-            <ul>
-                <li><a href="?feed&amp;type=home&amp;user_id={{ user_id }}&amp;token={{ token }}" target="_blank">{% trans "Unread feed" %}</a></li>
-                <li><a href="?feed&amp;type=fav&amp;user_id={{ user_id }}&amp;token={{ token }}" target="_blank">{% trans "Favorites feed" %}</a></li>
-                <li><a href="?feed&amp;type=archive&amp;user_id={{ user_id }}&amp;token={{ token }}" target="_blank">{% trans "Archive feed" %}</a></li>
-            </ul>
-            <p class="more-info">
-              {% trans "Your token:" %} <strong>{{token}}</strong><br>
-              {% trans "Your user id:" %} <strong>{{user_id}}</strong><br>
-              {% trans "You can regenerate your token: <a href='?feed&amp;action=generate'>generate!</a>." %}
-            </p>
-            {% endif %}
-
-            <h2>{% trans "Change your theme" %}</h2>
-            <form method="post" action="?updatetheme" name="changethemeform">
-                <fieldset class="w500p inline">
-                    <div class="row">
-                        <label class="col w150p" for="theme">{% trans "Theme:" %}</label>
-                        <select class="col" id="theme" name="theme">
-                            {% for key, theme in themes %}
-                            <option value="{{ key }}" {{ theme.current ? 'selected' : '' }}>{{ theme.name }}</option>
-                            {% endfor %}
-                        </select>
-                    </div>
-                    <div class="row mts txtcenter">
-                        <button class="bouton" type="submit" tabindex="4">{% trans "Update" %}</button>
-                    </div>
-                </fieldset>
-                <input type="hidden" name="returnurl" value="{{ referer }}">
-                <input type="hidden" name="token" value="{{ token }}">
-            </form>
-
-            <h2>{% trans "Change your language" %}</h2>
-            <form method="post" action="?updatelanguage" name="changelanguageform">
-                <fieldset class="w500p inline">
-                    <div class="row">
-                        <label class="col w150p" for="language">{% trans "Language:" %}</label>
-                        <select class="col" id="language" name="language">
-                            {% for language in languages %}
-                            <option value="{{ language.value }}" {{ language.current ? 'selected' : '' }}>{{ language.name }}</option>
-                            {% endfor %}
-                        </select>
-                    </div>
-                    <div class="row mts txtcenter">
-                        <button class="bouton" type="submit" tabindex="4">{% trans "Update" %}</button>
-                    </div>
-                </fieldset>
-                <input type="hidden" name="returnurl" value="{{ referer }}">
-                <input type="hidden" name="token" value="{{ token }}">
-            </form>
-
-            <h2><a name="import"></a>{% trans "Import" %}</h2>
-            <p>{% trans "You can import your Pocket, Readability, Instapaper, Wallabag or any data in appropriate json or html format." %}</p>
-            <p>{% trans "Please select export file on your computer and press \"Import\" button below. Wallabag will parse your file, insert all URLs and start fetching of articles if required." %}</p>
-            <form method="post" action="?import" name="uploadfile" enctype="multipart/form-data">
-                <fieldset class="w500p">
-                    <div class="row">
-                        <label class="col w150p" for="file">{% trans "File:" %}</label>
-                        <input class="col" type="file" id="file" name="file" tabindex="4" required="required">
-                    </div>
-                    <div class="row mts txtcenter">
-                        <button class="bouton" type="submit" tabindex="4">{% trans "Import" %}</button>
-                    </div>
-                </fieldset>
-            </form>
-            <p><a href="?import">{% trans "You can click here to fetch content for articles with no content." %}</a></p>
-            <p class="more-info">{% trans "Fetching process is controlled by two constants in your config file: IMPORT_LIMIT (how many articles are fetched at once) and IMPORT_DELAY (delay between fetch of next batch of articles)." %}</p>
-
-            <h2>{% trans "Export your wallabag data" %}</h2>
-            <p><a href="?export" target="_blank">{% trans "Export JSON" %}</a><br>
-            <span class="more-info">Data will be exported in a single JSON file.</span></p>
-
-            <h2>{% trans "Fancy an E-Book ?" %}</h2>
-            <p>{% trans "Click to get all your articles in one ebook :" %}
-            <ul>
-            <li><a href="./?epub&amp;method=all" title="{% trans 'Generate ePub file' %}">ePub 3</a></li>
-            <li><a href="./?mobi&amp;method=all" title="{% trans 'Generate Mobi file' %}">Mobi</a></li>
-            <li><a href="./?pdf&amp;method=all" title="{% trans 'Generate PDF file' %}">PDF</a></li>
-            </ul>
-
-            <span class="more-info">{% trans "This can <b>take a while</b> and can <b>even fail</b> if you have too many articles, depending on your server configuration." %}</span></p>
-
-            <h2><a name="cache"></a>{% trans "Cache" %}</h2>
-            <p><a href="?empty-cache">{% trans "Delete Cache" %}</a><br>
-            <span class="more-info">Deleting the cache may help with display or other problems.</span></p>
-
-            {% if http_auth == 0 %}
-            <h2>{% trans "Change your password" %}</h2>
-            <form method="post" action="?config" name="loginform">
-                <fieldset class="w500p">
-                    <div class="row">
-                        <label class="col w150p" for="password">{% trans "New password:" %}</label>
-                        <input class="col" type="password" id="password" name="password" placeholder="{% trans "Password" %}" tabindex="2">
-                    </div>
-                    <div class="row">
-                        <label class="col w150p" for="password_repeat">{% trans "Repeat your new password:" %}</label>
-                        <input class="col" type="password" id="password_repeat" name="password_repeat" placeholder="{% trans "Password" %}" tabindex="3">
-                    </div>
-                    <div class="row mts txtcenter">
-                        <button class="bouton" type="submit" tabindex="4">{% trans "Update" %}</button>
-                    </div>
-                </fieldset>
-                <input type="hidden" name="returnurl" value="{{ referer }}">
-                <input type="hidden" name="token" value="{{ token }}">
-            </form>
-            {% endif %}
-
-            <h2>{% trans 'Add user' %}</h2>
-            <form method="post" action="?newuser">
-                <fieldset class="w500p">
-                <div class="row">
-                    <label class="col w150p" for="newusername">{% trans 'Login for new user' %}</label>
-                    <input class="col" type="text" id="newusername" name="newusername" placeholder="{% trans 'Login' %}" required>
-                </div>
-                <div class="row">
-                    <label class="col w150p" for="password4newuser">{% trans "Password for new user" %}</label>
-                    <input class="col" type="password" id="password4newuser" name="password4newuser" placeholder="{% trans 'Password' %}" required>
-                </div>
-                <div class="row">
-                    <label class="col w150p" for="newuseremail">{% trans 'Email for new user (not required)' %}</label>
-                    <input class="col" type="email" id="newuseremail" name="newuseremail" placeholder="{% trans 'Email' %}">
-                </div>
-                <div class="row mts txtcenter">
-                    <button type="submit">{% trans "Add user" %}</button>
-                </div>
-                </fieldset>
-            </form>
-
-            <h2>{% trans "Delete account" %}</h2>
-            {% if not only_user %}<form method="post" action="?deluser">
-            <p>{% trans "You can delete your account by entering your password and validating." %}<br /><b>{% trans "Be careful, data will be erased forever (that is a very long time)." %}</b></p>
-            <fieldset class="w500p">
-                <div class="row">
-                    <label class="col w150p" for="password4deletinguser">{% trans "Type here your password" %}</label>
-                    <input class="col" type="password" id="password4deletinguser" name="password4deletinguser" placeholder="{% trans "Password" %}">
-                </div>
-            <div class="row mts txtcenter">
-                <button type="submit">{% trans "Delete account" %}</button>
-            </div>
-            </form>
-            {% else %}<p>{% trans "You are the only user, you cannot delete your own account." %}</p>
-            <p>{% trans "To completely remove wallabag, delete the wallabag folder on your web server (and eventual databases)." %}</p>{% endif %}
-
-            <h2>{% trans "Upgrading wallabag" %}</h2>
-            <ul>
-                <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>
-            <p class="more-info">{% trans "You can clear cache to check the latest release." %}</p>
-
-{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/baggy/edit-tags.twig b/src/Wallabag/CoreBundle/Resources/views/baggy/edit-tags.twig
deleted file mode 100755
index 15f15560..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/baggy/edit-tags.twig
+++ /dev/null
@@ -1,29 +0,0 @@
-{% extends "layout.twig" %}
-{% block title %}edit tags{% endblock %}
-{% block menu %}
-{% include '_menu.twig' %}
-{% endblock %}
-{% block content %}
-
-<script src="{{ poche_url }}themes/_global/js/jquery-ui-1.10.4.custom.min.js"></script>
-<script src="{{ poche_url }}themes/_global/js/autoCompleteTags.js"></script>
-<link rel="stylesheet" href="{{ poche_url }}themes/_global/css/jquery-ui-1.10.4.custom.min.css" media="all">
-
-<div id="article">
-  <h2>{{ entry.title|raw }}</21>
-</div>
-{% if tags is empty %}
-<div class="notags">{% trans "no tags" %}</div>
-{% endif %}
-<ul>
-{% for tag in tags %}<li>{{ tag.value }} <a href="./?action=remove_tag&amp;tag_id={{ tag.id }}&amp;id={{ entry_id }}">✘</a></li>{% endfor %}
-</ul>
-<form method="post" action="./?action=add_tag">
-    <input type="hidden" name="entry_id" value="{{ entry_id }}" />
-    <label for="value">{% trans "Add tags:" %}</label><input type="text" placeholder="{% trans "interview" %}, {% trans "editorial" %}, {% trans "video" %}" id="value" name="value" required="required" />
-    <input type="submit" value="Tag" />
-    <p>{% trans "Start typing for auto complete." %}<br>
-    {% trans "You can enter multiple tags, separated by commas." %}</p>
-</form>
-<a class="icon icon-reply return" href="./?view=view&id={{ entry_id }}">{% trans "return to article" %}</a>
-{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/baggy/layout-login.twig b/src/Wallabag/CoreBundle/Resources/views/baggy/layout-login.twig
deleted file mode 100644
index ae3f086c..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/baggy/layout-login.twig
+++ /dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE html>
-<!--[if lte IE 6]><html class="no-js ie6 ie67 ie678" lang="{{ lang }}"><![endif]-->
-<!--[if lte IE 7]><html class="no-js ie7 ie67 ie678" lang="{{ lang }}"><![endif]-->
-<!--[if IE 8]><html class="no-js ie8 ie678" lang="{{ lang }}"><![endif]-->
-<!--[if gt IE 8]><html class="no-js" lang="{{ lang }}"><![endif]-->
-<html lang="{{ lang }}">
-    <head>
-        <meta name="viewport" content="initial-scale=1.0">
-        <meta charset="utf-8">
-        <!--[if IE]>
-        <meta http-equiv="X-UA-Compatible" content="IE=10">
-        <![endif]-->
-        <title>{% block title %}{% endblock %} - wallabag</title>
-{% include '_head.twig' %}
-{% include '_bookmarklet.twig' %}
-    </head>
-    <body class="login">
-        {% include '_top.twig' %}
-        <div id="main">
-            {% block menu %}{% endblock %}
-            {% block precontent %}{% endblock %}
-            {% block messages %}
-            {% include '_messages.twig' %}
-            {% endblock %}
-            <div id="content" class="w600p center">
-            {% block content %}{% endblock %}
-            </div>
-        </div>
-{% include '_footer.twig' %}
-    </body>
-</html>
diff --git a/src/Wallabag/CoreBundle/Resources/views/baggy/login.twig b/src/Wallabag/CoreBundle/Resources/views/baggy/login.twig
deleted file mode 100644
index d4eb46d2..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/baggy/login.twig
+++ /dev/null
@@ -1,34 +0,0 @@
-{% extends "layout-login.twig" %}
-
-{% block title %}{% trans "login to your wallabag" %}{% endblock %}
-{% block content %}
-    {% if http_auth == 0 %}
-            <form method="post" action="?login" name="loginform">
-                <fieldset class="w500p center">
-                    <h2 class="mbs txtcenter">{% trans "Login to wallabag" %}</h2>
-                    {% if constant('MODE_DEMO') == 1 %}<p>{% trans "you are in demo mode, some features may be disabled." %}</p>{% endif %}
-                                        <div class="row">
-                                                <label class="col w150p" for="login">{% trans "Username" %}</label>
-                                                <input class="col" type="text" id="login" name="login" placeholder="{% trans "Username" %}" tabindex="1" autofocus {% if constant('MODE_DEMO') == 1 %}value="poche"{% endif %} />
-                                        </div>
-
-                                        <div class="row">
-                                                <label class="col w150p" for="password">{% trans "Password" %}</label>
-                                                <input class="col" type="password" id="password" name="password" placeholder="{% trans "Password" %}" tabindex="2" {% if constant('MODE_DEMO') == 1 %}value="poche"{% endif %} />
-                                        </div>
-                                        <div class="row">
-
-                                                <div class="col">
-                                                        <input type="checkbox" id="longlastingsession" name="longlastingsession" tabindex="3" /> <label for="longlastingsession">{% trans "Stay signed in" %}</label><br />
-                                                        <small class="inbl">{% trans "(Do not check on public computers)" %}</small>
-                                                </div>
-                                        </div>
-                                        <div class="row mts txtcenter">
-                                                <button class="bouton" type="submit" tabindex="4">{% trans "Sign in" %}</button>
-                                        </div>
-                </fieldset>
-                <input type="hidden" name="returnurl" value="{{ referer }}">
-                <input type="hidden" name="token" value="{{ token }}">
-            </form>
-    {% endif %}
-{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/baggy/tags.twig b/src/Wallabag/CoreBundle/Resources/views/baggy/tags.twig
deleted file mode 100755
index 65930eb2..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/baggy/tags.twig
+++ /dev/null
@@ -1,13 +0,0 @@
-{% extends "layout.twig" %}
-{% block title %}Tags{% endblock %}
-{% block menu %}
-{% include '_menu.twig' %}
-{% endblock %}
-{% block content %}
-<h2>{% trans "Tags" %}</h2>
-<ul class="list-tags">
-{% for tag in tags %}<li>{% if token != '' %}<a class="icon icon-rss" href="?feed&amp;type=tag&amp;user_id={{ user_id }}&amp;tag_id={{ tag.id }}&amp;token={{ token }}" target="_blank"><span>rss</span></a>{% endif %} <a href="./?view=tag&amp;id={{ tag.id }}">{{ tag.value }}</a> ({{ tag.entriescount }})
-</li>
-{% endfor %}
-</ul>
-{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/baggy/theme.ini b/src/Wallabag/CoreBundle/Resources/views/baggy/theme.ini
deleted file mode 100644
index 31665e18..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/baggy/theme.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-name = Baggy
-description = Responsive black and white theme especially adapted to smartphones.
-requirements[] = default
diff --git a/src/Wallabag/CoreBundle/Resources/views/base.html.twig b/src/Wallabag/CoreBundle/Resources/views/base.html.twig
new file mode 100644
index 00000000..4f27f413
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/views/base.html.twig
@@ -0,0 +1,115 @@
+<!DOCTYPE html>
+<!--[if lte IE 6]><html class="no-js ie6 ie67 ie678" lang="en"><![endif]-->
+<!--[if lte IE 7]><html class="no-js ie7 ie67 ie678" lang="en"><![endif]-->
+<!--[if IE 8]><html class="no-js ie8 ie678" lang="en"><![endif]-->
+<!--[if gt IE 8]><html class="no-js" lang="en"><![endif]-->
+<html lang="fr">
+    <head>
+        {% block head %}
+            <meta name="viewport" content="initial-scale=1.0">
+            <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+            <!--[if IE]>
+            <meta http-equiv="X-UA-Compatible" content="IE=10">
+            <![endif]-->
+
+            <link rel="apple-touch-icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-152.png') }}" sizes="152x152">
+            <link rel="icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-152.png') }}" sizes="152x152">
+
+            <link rel="apple-touch-icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-144.png') }}" sizes="144x144">
+            <link rel="icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-144.png') }}" sizes="144x144">
+
+            <link rel="apple-touch-icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-120.png') }}" sizes="120x120">
+            <link rel="icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-120.png') }}" sizes="120x120">
+
+            <link rel="apple-touch-icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-114.png') }}" sizes="114x114">
+            <link rel="icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-114.png') }}" sizes="114x114">
+
+            <link rel="apple-touch-icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-76.png') }}" sizes="76x76">
+            <link rel="icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-76.png') }}" sizes="76x76">
+
+            <link rel="apple-touch-icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-72.png') }}" sizes="72x72">
+            <link rel="icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-72.png') }}" sizes="72x72">
+
+            <link rel="apple-touch-icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-57.png') }}" sizes="57x57">
+            <link rel="icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-57.png') }}" sizes="57x57">
+
+            <link rel="apple-touch-icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon.png') }}">
+            <link rel="icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon.png') }}">
+
+            <link rel="shortcut icon" type="image/x-icon" href="{{ asset('themes/_global/img/appicon/favicon.ico') }}">
+
+            {% block css %}{% endblock %}
+            {% block scripts %}
+                <script src="{{ asset('themes/_global/js/jquery-2.0.3.min.js') }}"></script>
+                <script src="{{ asset('themes/_global/js/autoClose.js') }}"></script>
+                <script src="{{ asset('themes/_global/js/saveLink.js') }}"></script>
+                <script src="{{ asset('themes/_global/js/popupForm.js') }}"></script>
+                <script src="{{ asset('themes/_global/js/jquery.cookie.js') }}"></script>
+                <script src="{{ asset('themes/_global/js/bookmarklet.js') }}"></script>
+                <script src="{{ asset('themes/_global/js/closeMessage.js') }}"></script>
+            {% endblock %}
+
+            <title>{% block title %}{% endblock %} - wallabag</title>
+        {% endblock %}
+    </head>
+
+    <body class="{% block body_class %}{% endblock %}">
+        {% block header %}
+            <header class="w600p center mbm">
+                <h1 class="logo">
+                    {% block logo %}
+                        <img width="100" height="100" src="{{ asset('themes/baggy/img/logo-w.png') }}" alt="wallabag logo" />
+                    {% endblock %}
+                </h1>
+            </header>
+        {% endblock %}
+
+        <div id="main">
+            {% block menu %}
+                <button id="menu" class="icon icon-menu desktopHide"><span>Menu</span></button>
+                <ul id="links" class="links">
+                    <li><a href="{{ path('unread') }}">{% trans %}unread{% endtrans %}</a></li>
+                    <li><a href="{{ path('starred') }}">{% trans %}favorites{% endtrans %}</a></li>
+                    <li><a href="{{ path('archive') }}"}>{% trans %}archive{% endtrans %}</a></li>
+                    <li><a href="?view=tags">{% trans %}tags{% endtrans %}</a></li>
+                    <li><a href="{{ path('new_entry') }}">{% trans %}save a link{% endtrans %}</a></li>
+                    <li style="position: relative;"><a href="javascript: void(null);" id="search">{% trans %}search{% endtrans %}</a>
+                        <div id="search-form" class="messages info popup-form">
+                            <form method="get" action="index.php">
+                                <h2>{% trans %}Search{% endtrans %}</h2>
+                                <a href="javascript: void(null);" id="search-form-close" class="close-button--popup close-button">&times;</a>
+                                <input type="hidden" name="view" value="search"></input>
+                                <input required placeholder="{% trans %}Enter your search here{% endtrans %}" type="text" name="search" id="searchfield"><br>
+                                <input id="submit-search" type="submit" value="{% trans %}Search{% endtrans %}"></input>
+                            </form>
+                        </div>
+                    </li>
+                    <li><a href="{{ path('config') }}">{% trans %}config{% endtrans %}</a></li>
+                    <li><a href="{{ path('about') }}">{% trans %}about{% endtrans %}</a></li>
+                    <li><a class="icon icon-power" href="{{ path('logout') }}" title="{% trans %}logout{% endtrans %}">{% trans %}logout{% endtrans %}</a></li>
+                </ul>
+            {% endblock %}
+
+            {% block precontent %}{% endblock %}
+
+            {% block messages %}
+                {% for flashMessage in app.session.flashbag.get('notice') %}
+                    <div class="messages success">
+                        <a href="#" class="closeMessage">×</a>
+                        <p>{{ flashMessage }}</p>
+                    </div>
+                {% endfor %}
+            {% endblock %}
+
+            <div id="content" class="w600p center">
+                {% block content %}{% endblock %}
+            </div>
+        </div>
+
+        {% block footer %}
+            <footer class="w600p center mt3 mb3 smaller txtright">
+                <p>{% trans %}powered by{% endtrans %} <a href="http://wallabag.org">wallabag</a></p>
+            </footer>
+        {% endblock %}
+    </body>
+</html>
diff --git a/src/Wallabag/CoreBundle/Resources/views/dark/README.md b/src/Wallabag/CoreBundle/Resources/views/dark/README.md
deleted file mode 100644
index 92077994..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/dark/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# dark theme
-
-theme created by Nicolas Lœuillet aka nico_somb
\ No newline at end of file
diff --git a/src/Wallabag/CoreBundle/Resources/views/dark/dark b/src/Wallabag/CoreBundle/Resources/views/dark/dark
deleted file mode 120000
index 5743bc49..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/dark/dark
+++ /dev/null
@@ -1 +0,0 @@
-../../src/Wallabag/CoreBundle/Resources/views/dark
\ No newline at end of file
diff --git a/src/Wallabag/CoreBundle/Resources/views/dark/public/css/style-dark.css b/src/Wallabag/CoreBundle/Resources/views/dark/public/css/style-dark.css
deleted file mode 100644
index 41782c48..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/dark/public/css/style-dark.css
+++ /dev/null
@@ -1,74 +0,0 @@
-body {
-    color: #d4d4d4;
-    background-color: #262627;
-}
-
-a,
-a:hover,
-a:visited {
-    color: #d4d4d4;
-}
-
-a.back span {
-    background-image: url('../img/dark/left.png');
-}
-
-a.top span {
-    background-image: url('../img/dark/top.png');
-}
-
-a.fav span,
-a.fav-off span:hover {
-    background-image: url('../img/dark/star-on.png');
-}
-
-a.fav span:hover,
-a.fav-off span {
-    background-image: url('../img/dark/star-off.png');
-}
-
-a.archive span,
-a.archive-off span:hover {
-    background-image: url('../img/dark/checkmark-on.png');
-}
-
-a.archive span:hover,
-a.archive-off span {
-    background-image: url('../img/dark/checkmark-off.png');
-}
-
-a.twitter span {
-    background-image: url('../img/dark/twitter.png');
-}
-
-a.shaarli span {
-    background-image: url('../img/dark/shaarli.png');
-}
-
-a.flattr span {
-    background-image: url('../img/dark/flattr.png');
-}
-
-a.email span {
-    background-image: url('../img/dark/envelop.png');
-}
-
-a.delete span {
-    background-image: url('../img/dark/remove.png');
-}
-
-a.link span {
-    background-image: url('../img/dark/link.png');
-}
-
-a.bad-display span {
-    background-image: url('../img/dark/bad-display.png');
-}
-
-.pagination a {
-    color: #aaa;
-}
-
-#article_toolbar {
-    background: #262627;
-}
\ No newline at end of file
diff --git a/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/backtotop.png b/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/backtotop.png
deleted file mode 100644
index c885086d..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/backtotop.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/bad-display.png b/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/bad-display.png
deleted file mode 100644
index 66ea2e16..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/bad-display.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/checkmark-off.png b/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/checkmark-off.png
deleted file mode 100644
index 661ea997..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/checkmark-off.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/checkmark-on.png b/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/checkmark-on.png
deleted file mode 100644
index 5ee8c8d3..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/checkmark-on.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/down.png b/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/down.png
deleted file mode 100644
index 4150e17c..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/down.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/envelop.png b/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/envelop.png
deleted file mode 100644
index 73d9b0b9..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/envelop.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/flattr.png b/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/flattr.png
deleted file mode 100644
index b457d080..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/flattr.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/left.png b/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/left.png
deleted file mode 100644
index c2f7a20e..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/left.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/link.png b/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/link.png
deleted file mode 100644
index a5b8d8d2..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/link.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/remove.png b/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/remove.png
deleted file mode 100644
index 0c3dcfdf..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/remove.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/rss.png b/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/rss.png
deleted file mode 100644
index 21bad1a1..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/rss.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/shaarli.png b/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/shaarli.png
deleted file mode 100644
index e68ac8b5..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/shaarli.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/star-off.png b/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/star-off.png
deleted file mode 100644
index 8194bc2d..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/star-off.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/star-on.png b/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/star-on.png
deleted file mode 100644
index 109c3aec..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/star-on.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/top.png b/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/top.png
deleted file mode 100644
index d137bd24..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/top.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/twitter.png b/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/twitter.png
deleted file mode 100644
index 6ce8a4d9..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/twitter.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/dark/public/public b/src/Wallabag/CoreBundle/Resources/views/dark/public/public
deleted file mode 120000
index fd316b37..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/dark/public/public
+++ /dev/null
@@ -1 +0,0 @@
-../../themes/default/public
\ No newline at end of file
diff --git a/src/Wallabag/CoreBundle/Resources/views/dark/screenshot.jpg b/src/Wallabag/CoreBundle/Resources/views/dark/screenshot.jpg
deleted file mode 100644
index daaad6c9..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/dark/screenshot.jpg
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/dark/theme.ini b/src/Wallabag/CoreBundle/Resources/views/dark/theme.ini
deleted file mode 100644
index 4b020d36..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/dark/theme.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-name = Dark
-requirements[] = default
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/_bookmarklet.twig b/src/Wallabag/CoreBundle/Resources/views/default/_bookmarklet.twig
deleted file mode 100644
index c7e2f66e..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/default/_bookmarklet.twig
+++ /dev/null
@@ -1,3 +0,0 @@
-        <script type="text/javascript">
-          top["bookmarklet-url@wallabag.org"]=""+"<!DOCTYPE html>"+"<html>"+"<head>"+"<title>bag it!</title>"+'<link rel="icon" href="{{poche_url}}tpl/img/favicon.ico" />'+"</head>"+"<body>"+"<script>"+"window.onload=function(){"+"window.setTimeout(function(){"+"history.back();"+"},250);"+"};"+"</scr"+"ipt>"+"</body>"+"</html>"
-        </script>
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/_footer.twig b/src/Wallabag/CoreBundle/Resources/views/default/_footer.twig
deleted file mode 100644
index 25539f6b..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/default/_footer.twig
+++ /dev/null
@@ -1,4 +0,0 @@
-        <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('WALLABAG')}}. {% trans "storage:" %} {{constant('STORAGE')}}</strong></p>{% endif %}
-        </footer>
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/_head.twig b/src/Wallabag/CoreBundle/Resources/views/default/_head.twig
deleted file mode 100755
index 277e3833..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/default/_head.twig
+++ /dev/null
@@ -1,36 +0,0 @@
-        <link rel="apple-touch-icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-152.png" sizes="152x152">
-        <link rel="icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-152.png" sizes="152x152">
-
-        <link rel="apple-touch-icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-144.png" sizes="144x144">
-        <link rel="icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-144.png" sizes="144x144">
-
-        <link rel="apple-touch-icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-120.png" sizes="120x120">
-        <link rel="icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-120.png" sizes="120x120">
-
-        <link rel="apple-touch-icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-114.png" sizes="114x114">
-        <link rel="icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-114.png" sizes="114x114">
-
-        <link rel="apple-touch-icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-76.png" sizes="76x76">
-        <link rel="icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-76.png" sizes="76x76">
-
-        <link rel="apple-touch-icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-72.png" sizes="72x72">
-        <link rel="icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-72.png" sizes="72x72">
-
-        <link rel="apple-touch-icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-57.png" sizes="57x57">
-        <link rel="icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-57.png" sizes="57x57">
-
-        <link rel="apple-touch-icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon.png">
-        <link rel="icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon.png">
-
-        <link rel="shortcut icon" type="image/x-icon" href="{{ poche_url }}themes/_global/img/appicon/favicon.ico">
-
-        <link rel="stylesheet" href="{{ poche_url }}themes/default/css/knacss.css" media="all">
-        <link rel="stylesheet" href="{{ poche_url }}themes/default/css/style.css" media="all">
-        <link rel="stylesheet" href="{{ poche_url }}themes/{{ theme }}/css/style-{{ theme }}.css" media="all" title="{{ theme }} theme">
-        <link rel="stylesheet" href="{{ poche_url }}themes/default/css/messages.css" media="all">
-        <link rel="stylesheet" href="{{ poche_url }}themes/default/css/print.css" media="print">
-        <script src="{{ poche_url }}themes/_global/js/jquery-2.0.3.min.js"></script>
-        <script src="{{ poche_url }}themes/_global/js/autoClose.js"></script>
-        <script src="{{ poche_url }}themes/default/js/closeMessage.js"></script>
-        <script src="{{ poche_url }}themes/_global/js/saveLink.js"></script>
-        <script src="{{ poche_url }}themes/_global/js/popupForm.js"></script>
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/_highlight.twig b/src/Wallabag/CoreBundle/Resources/views/default/_highlight.twig
deleted file mode 100755
index cdb7c6bf..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/default/_highlight.twig
+++ /dev/null
@@ -1,4 +0,0 @@
- {# include excelent highlight.js library for code highligting, see http://highlightjs.org/ #}
-<link rel="stylesheet" href="{{ poche_url }}themes/default/highlightjs/styles/github.css">
-<script src="{{ poche_url }}themes/default/highlightjs/highlight.pack.js"></script>
-<script>hljs.initHighlightingOnLoad();</script>
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/_import.twig b/src/Wallabag/CoreBundle/Resources/views/default/_import.twig
deleted file mode 100755
index 63a2d3e2..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/default/_import.twig
+++ /dev/null
@@ -1,15 +0,0 @@
-<script type="text/javascript">
-<!--
-  $(document).ready(function() {
-        $("body").css("cursor", "wait");
-
-    setTimeout(function(){
-      window.location = './?import';
-    }, {{ import.delay }} );
-  });
-//-->
-</script>
-<div class="messages warning">
-  <p>{% trans "Download required for " %} {{ import.recordsDownloadRequired }} {% trans "records" %}.</p>
-  <p>{% trans "Downloading next " %} {{ import.recordsUnderDownload }} {% trans "articles, please wait" %}...</p>
-</div>
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/_menu.twig b/src/Wallabag/CoreBundle/Resources/views/default/_menu.twig
deleted file mode 100644
index 83fa3717..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/default/_menu.twig
+++ /dev/null
@@ -1,13 +0,0 @@
-            <ul id="links">
-                <li><a href="./" {% if view == 'home' %}class="current"{% endif %}>{% trans "unread" %}</a></li>
-                <li><a href="./?view=fav" {% if view == 'fav' %}class="current"{% endif %}>{% trans "favorites" %}</a></li>
-                <li><a href="./?view=archive" {% if view == 'archive' %}class="current"{% endif %}>{% trans "archive" %}</a></li>
-                <li><a href="./?view=tags" {% if view == 'tags' %}class="current"{% endif %}>{% trans "tags" %}</a></li>
-                <li><a href="javascript: void(null);" id="bagit">{% trans "save a link" %}</a><span id="bagit-arrow"></span></li>
-                <li><a href="javascript: void(null);" id="search">{% trans "search" %}</a><span id="search-arrow"></span></li>
-                <li><a href="./?view=config" {% if view == 'config' %}class="current"{% endif %}>{% trans "config" %}</a></li>
-                <li><a href="./?view=about" {% if view == 'about' %}class="current"{% endif %}>{% trans "about" %}</a></li>
-                <li><a href="./?logout" title="{% trans "logout" %}">{% trans "logout" %}</a></li>
-            </ul>
-            {% include '_pocheit-form.twig' %}
-            {% include '_search-form.twig' %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/_messages.twig b/src/Wallabag/CoreBundle/Resources/views/default/_messages.twig
deleted file mode 100644
index b8481494..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/default/_messages.twig
+++ /dev/null
@@ -1 +0,0 @@
-                {{ messages | raw }}
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/_pocheit-form.twig b/src/Wallabag/CoreBundle/Resources/views/default/_pocheit-form.twig
deleted file mode 100755
index 8c982db0..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/default/_pocheit-form.twig
+++ /dev/null
@@ -1,8 +0,0 @@
-<div id="bagit-form" class="messages info">
-    <a href="javascript: void(null);" id="bagit-form-close">&nbsp;</a>
-    <form method="get" action="index.php" id="bagit-form-form">
-      <input required placeholder="example.com/article" class="addurl" id="plainurl" name="plainurl" type="url" />
-      <input type="submit" value="{% trans "save link!" %}" />
-      <div id="add-link-result"></div>
-    </form>
-</div>
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/_search-form.twig b/src/Wallabag/CoreBundle/Resources/views/default/_search-form.twig
deleted file mode 100755
index 70f97356..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/default/_search-form.twig
+++ /dev/null
@@ -1,9 +0,0 @@
-<div id="search-form" class="messages info">
-<form method="get" action="index.php">
-    <p>
-                <input type="hidden" name="view" value="search"></input>
-        <label>{% trans "Search" %}</label> : <input type="text" required placeholder="{% trans "Enter your search here" %}" name="search" id="searchfield" />
-                <input type="submit" value="{% trans "Search" %} !"></input>
-    </p>
-</form>
-</div>
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/_sorting.twig b/src/Wallabag/CoreBundle/Resources/views/default/_sorting.twig
deleted file mode 100755
index 3ce9b949..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/default/_sorting.twig
+++ /dev/null
@@ -1,6 +0,0 @@
-{% if entries|length > 1 %}
-  <ul id="sort">
-      <li><a href="./?sort=ia&amp;view={{ view }}{% if searchterm is defined %}&amp;search={{ searchterm }}{% endif %}&amp;id={{ id }}"><img src="{{ poche_url }}themes/{{ theme }}/img/{{ theme }}/top.png" alt="{% trans "by date asc" %}" title="{% trans "by date asc" %}" /></a> {% trans "by date" %} <a href="./?sort=id&amp;view={{ view }}{% if searchterm is defined %}&amp;search={{ searchterm }}{% endif %}&amp;id={{ id }}"><img src="{{ poche_url }}themes/{{ theme }}/img/{{ theme }}/down.png" alt="{% trans "by date desc" %}" title="{% trans "by date desc" %}" /></a></li>
-      <li><a href="./?sort=ta&amp;view={{ view }}{% if searchterm is defined %}&amp;search={{ searchterm }}{% endif %}&amp;id={{ id }}"><img src="{{ poche_url }}themes/{{ theme }}/img/{{ theme }}/top.png" alt="{% trans "by title asc" %}" title="{% trans "by title asc" %}" /></a> {% trans "by title" %} <a href="./?sort=td&amp;view={{ view }}{% if searchterm is defined %}&amp;search={{ searchterm }}{% endif %}&amp;id={{ id }}"><img src="{{ poche_url }}themes/{{ theme }}/img/{{ theme }}/down.png" alt="{% trans "by title desc" %}" title="{% trans "by title desc" %}" /></a></li>
-  </ul>
-{% endif %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/_top.twig b/src/Wallabag/CoreBundle/Resources/views/default/_top.twig
deleted file mode 100755
index 45806f01..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/default/_top.twig
+++ /dev/null
@@ -1,7 +0,0 @@
-        <header class="w600p center mbm">
-            <h1>
-                {% if view == 'home' %}{% block logo %}<img width="100" height="100" src="{{ poche_url }}themes/baggy/img/logo-other_themes.png" alt="wallabag logo" />{% endblock %}
-                {% else %}<a href="./" title="{% trans "return home" %}" >{{ block('logo') }}</a>
-                {% endif %}
-            </h1>
-        </header>
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/about.twig b/src/Wallabag/CoreBundle/Resources/views/default/about.twig
deleted file mode 100755
index 7ddb19d6..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/default/about.twig
+++ /dev/null
@@ -1,74 +0,0 @@
-{% extends "layout.twig" %}
-
-{% block title %}{% trans "About wallabag" %}{% endblock %}
-{% block menu %}
-{% include '_menu.twig' %}
-{% endblock %}
-{% block content %}
-    <h2>{% trans "About wallabag" %}</h2>
-
-    <dl>
-        <dt>{% trans "Project website" %}</dt>
-        <dd><a href="http://www.wallabag.org">http://www.wallabag.org</a></dd>
-
-        <dt>{% trans "Main developer" %}</dt>
-        <dd><a href="mailto:nicolas@loeuillet.org">Nicolas Lœuillet</a> — <a href="http://cdetc.fr">{% trans "website" %}</a></dd>
-
-        <dt>{% trans "Contributors:" %}</dt>
-        <dd><a href="https://github.com/wallabag/wallabag/graphs/contributors">{% trans "on Github" %}</a></dd>
-
-        <dt>{% trans "Bug reports" %}</dt>
-        <dd><a href="http://support.wallabag.org">{% trans "On our support website" %}</a> {% trans "or" %} <a href="https://github.com/wallabag/wallabag/issues">{% trans "on Github" %}</a></dd>
-
-        <dt>{% trans "License" %}</dt>
-        <dd><a href="http://en.wikipedia.org/wiki/MIT_License">MIT</a></dd>
-
-        <dt>{% trans "Version" %}</dt>
-        <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>
-
-    <h2>{% trans "Helping wallabag" %}</h2>
-
-    <p>{% trans "wallabag is free and opensource. You can help us:" %}</p>
-
-    <dl>
-        <dt><a href="http://www.wallabag.org">{% trans "via Paypal" %}</a></dt>
-
-        <dt><a href="http://www.wallabag.org">{% trans "via Flattr" %}</a></dt>
-    </dl>
-
-    <h2>{% trans "Credits" %}</h2>
-    <dl>
-        <dt>PHP Readability</dt>
-        <dd><a href="https://bitbucket.org/fivefilters/php-readability">https://bitbucket.org/fivefilters/php-readability</a></dd>
-
-        <dt>Full Text RSS</dt>
-        <dd><a href="http://code.fivefilters.org/full-text-rss/src">http://code.fivefilters.org/full-text-rss/src</a></dd>
-
-        <dt>logo by Maylis Agniel</dt>
-        <dd><a href="https://github.com/wallabag/logo">https://github.com/wallabag/logo</a></dd>
-
-        <dt>icons</dt>
-        <dd><a href="http://icomoon.io">http://icomoon.io</a></dd>
-
-        <dt>PHP Simple HTML DOM Parser</dt>
-        <dd><a href="http://simplehtmldom.sourceforge.net/">http://simplehtmldom.sourceforge.net/</a></dd>
-
-        <dt>Session</dt>
-        <dd><a href="https://github.com/tontof/kriss_feed/blob/master/src/class/Session.php">https://github.com/tontof/kriss_feed/blob/master/src/class/Session.php</a></dd>
-
-        <dt>Twig</dt>
-        <dd><a href="http://twig.sensiolabs.org">http://twig.sensiolabs.org</a></dd>
-
-        <dt>Flash messages</dt>
-        <dd><a href="https://github.com/plasticbrain/PHP-Flash-Messages">https://github.com/plasticbrain/PHP-Flash-Messages</a></dd>
-
-        <dt>Pagination</dt>
-        <dd><a href="https://github.com/daveismyname/pagination">https://github.com/daveismyname/pagination</a></dd>
-
-        <dt>PHPePub</dt>
-        <dd><a href="https://github.com/Grandt/PHPePub/">https://github.com/Grandt/PHPePub/</a></dd>
-    </dl>
-{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/config.twig b/src/Wallabag/CoreBundle/Resources/views/default/config.twig
deleted file mode 100755
index 6769da74..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/default/config.twig
+++ /dev/null
@@ -1,188 +0,0 @@
-{% extends "layout.twig" %}
-
-{% block title %}{% trans "config" %}{% endblock %}
-{% block menu %}
-{% include '_menu.twig' %}
-{% endblock %}
-{% block content %}
-            <h2>{% trans "Saving articles" %}</h2>
-            <p>{% trans "There are several ways to save an article:" %} {% trans "(<a href=\"http://doc.wallabag.org/en/User_documentation/Save_your_first_article\" target=\"_blank\" title=\"Documentation\">?</a>)" %}</p>
-            <p>
-                <form method="get" action="index.php">
-                    <label class="addurl" for="config_plainurl">{% trans "By filling this field" %}:</label><br>
-                    <input required placeholder="example.com/article" class="addurl" id="config_plainurl" name="plainurl" type="url" />
-                    <input type="submit" value="{% trans "bag it!" %}" />
-                </form>
-            </p>
-            <h3>Browser Plugins</h3>
-            <ul>
-                <li><a href="https://addons.mozilla.org/firefox/addon/wallabag/" target="_blank">{% trans "Firefox Add-On" %}</a></li>
-                <li><a href="https://chrome.google.com/webstore/detail/wallabag/bepdcjnnkglfjehplaogpoonpffbdcdj" target="_blank">{% trans "Chrome Extension" %}</a></li>
-            </ul>
-            <h3>Mobile Apps</h3>
-            <ul>
-                <li>Android: <a href="https://f-droid.org/app/fr.gaulupeau.apps.InThePoche" target="_blank">{% trans "via F-Droid" %}</a> {% trans " or " %} <a href="https://play.google.com/store/apps/details?id=fr.gaulupeau.apps.InThePoche" target="_blank">{% trans "via Google Play" %}</a></li>
-                <li>iOS: <a href="https://itunes.apple.com/app/wallabag/id828331015?mt=8" target="_blank">{% trans "download the application" %}</a></li>
-                <li>Windows Phone: <a href="http://www.windowsphone.com/en-us/store/app/wallabag/ff890514-348c-4d0b-9b43-153fff3f7450" target="_blank">{% trans "download the application" %}</a></li>
-            </ul>
-                <h3>{% trans "Bookmarklet" %}</h3>
-                <p>
-                {% trans "Drag &amp; drop this link to your bookmarks bar:" %} <a id="bookmarklet" ondragend="this.click();" href="javascript:if(top['bookmarklet-url@wallabag.org']){top['bookmarklet-url@wallabag.org'];}else{(function(){var%20url%20=%20location.href%20||%20url;window.open('{{ poche_url }}?action=add&url='%20+%20btoa(url),'_self');})();void(0);}">{% trans "bag it!" %}</a>
-                </p>
-
-            <h2>{% trans "Feeds" %}</h2>
-            {% if token == '' %}
-                <p>{% trans "Your feed token is currently empty and must first be generated to enable feeds. Click <a href='?feed&amp;action=generate'>here to generate it</a>." %}</p>
-            {% else %}
-            <ul>
-                <li><a href="?feed&amp;type=home&amp;user_id={{ user_id }}&amp;token={{ token }}" target="_blank">{% trans "Unread feed" %}</a></li>
-                <li><a href="?feed&amp;type=fav&amp;user_id={{ user_id }}&amp;token={{ token }}" target="_blank">{% trans "Favorites feed" %}</a></li>
-                <li><a href="?feed&amp;type=archive&amp;user_id={{ user_id }}&amp;token={{ token }}" target="_blank">{% trans "Archive feed" %}</a></li>
-            </ul>
-            <p class="more-info">
-              {% trans "Your token:" %} <strong>{{token}}</strong><br>
-              {% trans "Your user id:" %} <strong>{{user_id}}</strong><br>
-              {% trans "You can regenerate your token: <a href='?feed&amp;action=generate'>generate!</a>." %}
-            </p>
-            {% endif %}
-
-            <h2>{% trans "Change your theme" %}</h2>
-            <form method="post" action="?updatetheme" name="changethemeform">
-                <fieldset class="w500p inline">
-                    <div class="row">
-                        <label class="col w150p" for="theme">{% trans "Theme:" %}</label>
-                        <select class="col" id="theme" name="theme">
-                            {% for key, theme in themes %}
-                            <option value="{{ key }}" {{ theme.current ? 'selected' : '' }}>{{ theme.name }}</option>
-                            {% endfor %}
-                        </select>
-                    </div>
-                    <div class="row mts txtcenter">
-                        <button class="bouton" type="submit" tabindex="4">{% trans "Update" %}</button>
-                    </div>
-                </fieldset>
-                <input type="hidden" name="returnurl" value="{{ referer }}">
-                <input type="hidden" name="token" value="{{ token }}">
-            </form>
-
-            <h2>{% trans "Change your language" %}</h2>
-            <form method="post" action="?updatelanguage" name="changelanguageform">
-                <fieldset class="w500p inline">
-                    <div class="row">
-                        <label class="col w150p" for="language">{% trans "Language:" %}</label>
-                        <select class="col" id="language" name="language">
-                            {% for language in languages %}
-                            <option value="{{ language.value }}" {{ language.current ? 'selected' : '' }}>{{ language.name }}</option>
-                            {% endfor %}
-                        </select>
-                    </div>
-                    <div class="row mts txtcenter">
-                        <button class="bouton" type="submit" tabindex="4">{% trans "Update" %}</button>
-                    </div>
-                </fieldset>
-                <input type="hidden" name="returnurl" value="{{ referer }}">
-                <input type="hidden" name="token" value="{{ token }}">
-            </form>
-
-            <h2><a name="import"></a>{% trans "Import" %}</h2>
-            <p>{% trans "You can import your Pocket, Readability, Instapaper, Wallabag or any data in appropriate json or html format." %}</p>
-            <p>{% trans "Please select export file on your computer and press \"Import\" button below. Wallabag will parse your file, insert all URLs and start fetching of articles if required." %}</p>
-            <form method="post" action="?import" name="uploadfile" enctype="multipart/form-data">
-                <fieldset class="w500p">
-                    <div class="row">
-                        <label class="col w150p" for="file">{% trans "File:" %}</label>
-                        <input class="col" type="file" id="file" name="file" tabindex="4" required="required">
-                    </div>
-                    <div class="row mts txtcenter">
-                        <button class="bouton" type="submit" tabindex="4">{% trans "Import" %}</button>
-                    </div>
-                </fieldset>
-            </form>
-            <p><a href="?import">{% trans "You can click here to fetch content for articles with no content." %}</a></p>
-            <p class="more-info">{% trans "Fetching process is controlled by two constants in your config file: IMPORT_LIMIT (how many articles are fetched at once) and IMPORT_DELAY (delay between fetch of next batch of articles)." %}</p>
-
-            <h2>{% trans "Export your wallabag data" %}</h2>
-            <p><a href="?export" target="_blank">{% trans "Export JSON" %}</a><br>
-            <span class="more-info">Data will be exported in a single JSON file.</span></p>
-
-            <h2>{% trans "Fancy an E-Book ?" %}</h2>
-            <p>{% trans "Click to get all your articles in one ebook :" %}
-            <ul>
-            <li><a href="./?epub&amp;method=all" title="Generate ePub file">ePub 3</a></li>
-            <li><a href="./?mobi&amp;method=all" title="Generate Mobi file">Mobi</a></li>
-            <li><a href="./?pdf&amp;method=all" title="Generate PDF file">PDF</a></li>
-            </ul>
-            </p>
-
-            <span class="more-info">{% trans "This can <b>take a while</b> and can <b>even fail</b> if you have too many articles, depending on your server configuration." %}</span></p>
-
-            <h2><a name="cache"></a>{% trans "Cache" %}</h2>
-            <p><a href="?empty-cache">{% trans "Delete Cache" %}</a><br>
-            <span class="more-info">Deleting the cache may help with display or other problems.</span></p>
-
-            {% if http_auth == 0 %}
-            <h2>{% trans "Change your password" %}</h2>
-            <form method="post" action="?config" name="loginform">
-                <fieldset class="w500p">
-                    <div class="row">
-                        <label class="col w150p" for="password">{% trans "New password:" %}</label>
-                        <input class="col" type="password" id="password" name="password" placeholder="{% trans "Password" %}" tabindex="2">
-                    </div>
-                    <div class="row">
-                        <label class="col w150p" for="password_repeat">{% trans "Repeat your new password:" %}</label>
-                        <input class="col" type="password" id="password_repeat" name="password_repeat" placeholder="{% trans "Password" %}" tabindex="3">
-                    </div>
-                    <div class="row mts txtcenter">
-                        <button class="bouton" type="submit" tabindex="4">{% trans "Update" %}</button>
-                    </div>
-                </fieldset>
-                <input type="hidden" name="returnurl" value="{{ referer }}">
-                <input type="hidden" name="token" value="{{ token }}">
-            </form>
-            {% endif %}
-
-            <h2>{% trans 'Add user' %}</h2>
-            <form method="post" action="?newuser">
-                <fieldset class="w500p">
-                <div class="row">
-                    <label class="col w150p" for="newusername">{% trans 'Login for new user' %}</label>
-                    <input class="col" type="text" id="newusername" name="newusername" placeholder="{% trans 'Login' %}" required>
-                </div>
-                <div class="row">
-                    <label class="col w150p" for="password4newuser">{% trans "Password for new user" %}</label>
-                    <input class="col" type="password" id="password4newuser" name="password4newuser" placeholder="{% trans 'Password' %}" required>
-                </div>
-                <div class="row">
-                    <label class="col w150p" for="newuseremail">{% trans 'Email for new user (not required)' %}</label>
-                    <input class="col" type="email" id="newuseremail" name="newuseremail" placeholder="{% trans 'Email' %}">
-                </div>
-                <div class="row mts txtcenter">
-                    <button type="submit">{% trans "Add user" %}</button>
-                </div>
-                </fieldset>
-            </form>
-
-            <h2>{% trans "Delete account" %}</h2>
-            {% if not only_user %}<form method="post" action="?deluser">
-            <p>{% trans "You can delete your account by entering your password and validating." %}<br /><b>{% trans "Be careful, data will be erased forever (that is a very long time)." %}</b></p>
-            <fieldset class="w500p">
-                <div class="row">
-                    <label class="col w150p" for="password4deletinguser">{% trans "Type here your password" %}</label>
-                    <input class="col" type="password" id="password4deletinguser" name="password4deletinguser" placeholder="{% trans "Password" %}">
-                </div>
-            <div class="row mts txtcenter">
-                <button type="submit">{% trans "Delete account" %}</button>
-            </div>
-            </form>
-            {% else %}<p>{% trans "You are the only user, you cannot delete your own account." %}</p>
-            <p>{% trans "To completely remove wallabag, delete the wallabag folder on your web server (and eventual databases)." %}</p>{% endif %}
-
-            <h2>{% trans "Upgrading wallabag" %}</h2>
-            <ul>
-                <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>
-            <p class="more-info">{% trans "You can clear cache to check the latest release." %}</p>
-
-{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/edit-tags.twig b/src/Wallabag/CoreBundle/Resources/views/default/edit-tags.twig
deleted file mode 100755
index c29427e0..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/default/edit-tags.twig
+++ /dev/null
@@ -1,35 +0,0 @@
-{% extends "layout.twig" %}
-{% block title %}edit tags{% endblock %}
-{% block menu %}
-{% include '_menu.twig' %}
-{% endblock %}
-{% block content %}
-
-<script src="{{ poche_url }}themes/_global/js/jquery-ui-1.10.4.custom.min.js"></script>
-<script src="{{ poche_url }}themes/_global/js/autoCompleteTags.js"></script>
-<link rel="stylesheet" href="{{ poche_url }}themes/_global/css/jquery-ui-1.10.4.custom.min.css" media="all">
-
-<div id="article">
-  <header class="mbm">
-      <h1>{{ entry.title|raw }}</h1>
-  </header>
-</div>
-
-{% if tags is empty %}
-{% trans "no tags" %}
-{% endif %}
-<ul>
-{% for tag in tags %}<li>{{ tag.value }} <a href="./?action=remove_tag&amp;tag_id={{ tag.id }}&amp;id={{ entry_id }}">✘</a></li>{% endfor %}
-</ul>
-<form method="post" action="./?action=add_tag" id="editTags">
-    <input type="hidden" name="entry_id" value="{{ entry_id }}" />
-    <label for="value">{% trans "Add tags:" %}</label>
-    <input type="text" placeholder="{% trans "interview" %}, {% trans "editorial" %}, {% trans "video" %}" id="value" name="value" required="required" />
-    <input type="submit" value="Tag" />
-    <p>{% trans "Start typing for auto complete." %}<br>
-    {% trans "You can enter multiple tags, separated by commas." %}</p>
-
-</form>
-<br>
-<a href="./?view=view&id={{ entry_id }}">&laquo; {% trans "return to article" %}</a>
-{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/error.twig b/src/Wallabag/CoreBundle/Resources/views/default/error.twig
deleted file mode 100644
index 528a0985..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/default/error.twig
+++ /dev/null
@@ -1,14 +0,0 @@
-{% extends "layout.twig" %}
-{% block title %}{% trans "plop" %}{% endblock %}
-{% block content %}
-    <h1>Errors</h1>
-    <ol>
-        {% for message in msg %}
-            <li>{{message}}</li>
-        {% endfor %}
-    </ol>
-    <p>Don't forget <a href="http://doc.wallabag.org/">the documentation</a>.</p>
-    <p>
-        {% trans "You can <a href='wallabag_compatibility_test.php'>check your configuration here</a>." %}
-    </p>
-{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/export.twig b/src/Wallabag/CoreBundle/Resources/views/default/export.twig
deleted file mode 100644
index 18a98a87..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/default/export.twig
+++ /dev/null
@@ -1 +0,0 @@
-{{ export }}
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/home.twig b/src/Wallabag/CoreBundle/Resources/views/default/home.twig
deleted file mode 100755
index b9000559..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/default/home.twig
+++ /dev/null
@@ -1,82 +0,0 @@
-{% extends "layout.twig" %}
-{% block title %}
-{% if view == 'fav' %}
-{% trans "favoris" %}
-{% elseif view == 'archive' %}
-{% trans "archive" %}
-{% else %}
-{% trans "unread" %}
-{% endif %}
-{% endblock %}
-{% block menu %}
-{% include '_menu.twig' %}
-{% endblock %}
-{% block precontent %}
-
-{% include '_sorting.twig' %}
-{% endblock %}
-{% block content %}
-
-                                                {% if includeImport %}
-                                                                {% include '_import.twig' %}
-                                                {% endif %}
-
-            {% if tag %}
-                <h3>{% trans "Tag" %}: <b>{{ tag.value }}</b></h3>
-            {% endif %}
-
-            {% if entries is empty %}
-            <div class="messages warning"><p>{% trans "No articles found." %}</p></div>
-            {% else %}
-                {% block pager %}
-                    {% if nb_results > 1 %}
-                <div class="results">
-                    <div class="nb-results">{{ nb_results }} {% trans "results" %}{% if searchterm is defined %}{% trans " found for « " %} {{ searchterm }} »{% endif %}</div>
-                        {{ page_links | raw }}
-                </div>
-                    {% elseif nb_results == 1 %}
-                        {% if searchterm is defined %}
-                     <div class="results">
-                        <div class="nb-results">{% trans "Only one result found for " %} « {{ searchterm }} »</div>
-                     </div>
-                        {% endif %}
-                    {% endif %}
-                {% endblock %}
-                {% for entry in entries %}
-            <div id="entry-{{ entry.id|e }}" class="entrie">
-                <h2><a href="index.php?view=view&amp;id={{ entry.id|e }}">{{ entry.title|raw }}</a></h2>
-                <ul class="tools">
-                    <li><a title="{% trans "Toggle mark as read" %}" class="tool {% if entry.is_read == 0 %}archive-off{% else %}archive{% endif %}" href="./?action=toggle_archive&amp;id={{ entry.id|e }}"><span>{% trans "Toggle mark as read" %}</span></a></li>
-                    <li><a title="{% trans "toggle favorite" %}" class="tool {% if entry.is_fav == 0 %}fav-off{% else %}fav{% endif %}" href="./?action=toggle_fav&amp;id={{ entry.id|e }}"><span>{% trans "toggle favorite" %}</span></a></li>
-                    <li><a title="{% trans "delete" %}" class="tool delete" href="./?action=delete&amp;id={{ entry.id|e }}"><span>{% trans "delete" %}</span></a></li>
-                    <li><a href="{{ entry.url|e }}" target="_blank" title="{% trans "original" %} : {{ entry.title|e }}" class="tool link"><span>{{ entry.url | e | getDomain }}</span></a></li>
-                    <li><a target="_blank" title="{% trans "estimated reading time:" %} {{ entry.content| getReadingTime }} min" class="reading-time"><span>{{ entry.content| getReadingTime }} min</span></a></li>
-                </ul>
-                <p>{{ entry.content|striptags|slice(0, 300) }}...</p>
-            </div>
-                {% endfor %}
-
-            {{ block('pager') }}
-            {% if view == 'home' %}{% if nb_results > 1 %}<p><a title="{% trans "Mark all the entries as read" %}"  href="./?action=archive_all">{% trans "Mark all the entries as read" %}</a></p>{% endif %}{% endif %}
-            {% if searchterm is defined %}<a title="{% trans "Tag these results as" %} {{ searchterm }}" href="./?action=add_tag&search={{ searchterm }}">{% trans "Tag these results as" %} {{ searchterm }}</a>{% endif %}<br />
-
-            {% if searchterm is defined %}<a title="{% trans "Delete results matching" %} {{ searchterm }}" href="./?action=delete&search={{ searchterm }}">{% trans "Delete results matching" %} {{ searchterm }}</a>{% endif %}<br />
-
-            {% if tag %}<a title="{% trans "Mark all articles from this tag as read" %}" href="./?action=toggle_archive&amp;tag_id={{ tag.id }}">{% trans "Mark all articles from this tag as read" %}</a><br />{% endif %}
-
-            {% if tag %}
-            {% if constant('EPUB') == 1 %}<a title="{% trans "Download the articles from this tag in an epub file" %}" href="./?epub&amp;method=tag&amp;value={{ tag.value }}">{% trans "Download as ePub3" %}</a>{% endif %}
-            {% if constant('MOBI') == 1 %}<a title="{% trans "Download the articles from this tag in a mobi file" %}" href="./?mobi&amp;method=tag&amp;value={{ tag.value }}">{% trans "Download as Mobi" %}</a>{% endif %}
-            {% if constant('PDF') == 1 %}<a title="{% trans "Download the articles from this tag in a pdf file" %}" href="./?pdf&amp;method=tag&amp;value={{ tag.value }}">{% trans "Download as PDF" %}</a>{% endif %}
-            {% elseif searchterm is defined %}
-            {% if constant('EPUB') == 1 %}<a title="{% trans "Download the articles from this search in an epub" %}" href="./?epub&amp;method=search&amp;value={{ searchterm }}">{% trans "Download as ePub3" %}</a>{% endif %}
-            {% if constant('MOBI') == 1 %}<a title="{% trans "Download the articles from this search in a mobi file" %}" href="./?mobi&amp;method=search&amp;value={{ searchterm }}">{% trans "Download as Mobi" %}</a>{% endif %}
-            {% if constant('PDF') == 1 %}<a title="{% trans "Download the articles from this search in a pdf file" %}" href="./?pdf&amp;method=search&amp;value={{ searchterm }}">{% trans "Download as PDF" %}</a>{% endif %}
-            {% else %}
-            {% if constant('EPUB') == 1 %}<a title="{% trans "Download the articles from this category in an epub" %}" href="./?epub&amp;method=category&amp;value={{ view }}">{% trans "Download as ePub3" %}</a>{% endif %}
-            {% if constant('MOBI') == 1 %}<a title="{% trans "Download the articles from this category in a mobi file" %}" href="./?mobi&amp;method=category&amp;value={{ view }}">{% trans "Download as Mobi" %}</a>{% endif %}
-            {% if constant('PDF') == 1 %}<a title="{% trans "Download the articles from this category in a pdf file" %}" href="./?pdf&amp;method=category&amp;value={{ view }}">{% trans "Download as PDF" %}</a>{% endif %}
-            {% endif %}
-
-            {% endif %}
-{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/install.twig b/src/Wallabag/CoreBundle/Resources/views/default/install.twig
deleted file mode 100644
index c89c7e47..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/default/install.twig
+++ /dev/null
@@ -1,28 +0,0 @@
-{% extends "layout.twig" %}
-{% block title %}{% trans "installation" %}{% endblock %}
-{% block content %}
-        <form method="post" action="?install" name="loginform">
-            <fieldset class="w500p center">
-                <h2 class="mbs txtcenter">{% trans "install your wallabag" %}</h2>
-                <p>
-                    {% trans "wallabag is still not installed. Please fill the below form to install it. Don't hesitate to <a href='http://doc.wallabag.org/'>read the documentation on wallabag website</a>." %}
-                </p>
-                <p class="row">
-                    <label class="col w150p" for="login">{% trans "Login" %}</label>
-                    <input class="col" type="text" id="login" name="login" placeholder="Login" tabindex="1" autofocus />
-                </p>
-                <p class="row">
-                    <label class="col w150p" for="password">{% trans "Password" %}</label>
-                    <input class="col" type="password" id="password" name="password" placeholder="Password" tabindex="2">
-                </p>
-                <p class="row">
-                    <label class="col w150p" for="password_repeat">{% trans "Repeat your password" %}</label>
-                    <input class="col" type="password" id="password_repeat" name="password_repeat" placeholder="Password" tabindex="3">
-                </p>
-                <p class="row mts txtcenter">
-                    <button class="bouton" type="submit" tabindex="4">{% trans "Install" %}</button>
-                </p>
-            </fieldset>
-            <input type="hidden" name="token" value="{{ token }}">
-        </form>
-{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/layout.twig b/src/Wallabag/CoreBundle/Resources/views/default/layout.twig
deleted file mode 100644
index d32395a2..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/default/layout.twig
+++ /dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE html>
-<!--[if lte IE 6]><html class="no-js ie6 ie67 ie678" lang="{{ lang }}"><![endif]-->
-<!--[if lte IE 7]><html class="no-js ie7 ie67 ie678" lang="{{ lang }}"><![endif]-->
-<!--[if IE 8]><html class="no-js ie8 ie678" lang="{{ lang }}"><![endif]-->
-<!--[if gt IE 8]><html class="no-js" lang="{{ lang }}"><![endif]-->
-<html lang="{{ lang }}">
-    <head>
-        <meta name="viewport" content="initial-scale=1.0">
-        <meta charset="utf-8">
-        <!--[if IE]>
-        <meta http-equiv="X-UA-Compatible" content="IE=10">
-        <![endif]-->
-        <title>{% block title %}{% endblock %} - wallabag</title>
-{% include '_head.twig' %}
-{% include '_bookmarklet.twig' %}
-    </head>
-    <body>
-        {% include '_top.twig' %}
-        <div id="main">
-            {% block menu %}{% endblock %}
-            {% block precontent %}{% endblock %}
-            {% block messages %}
-            {% include '_messages.twig' %}
-            {% endblock %}
-            <div id="content" class="w600p center">
-            {% block content %}{% endblock %}
-            </div>
-        </div>
-{% include '_footer.twig' %}
-    </body>
-</html>
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/login.twig b/src/Wallabag/CoreBundle/Resources/views/default/login.twig
deleted file mode 100644
index b9f8b497..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/default/login.twig
+++ /dev/null
@@ -1,34 +0,0 @@
-{% extends "layout.twig" %}
-
-{% block title %}{% trans "login to your wallabag" %}{% endblock %}
-{% block content %}
-    {% if http_auth == 0 %}
-            <form method="post" action="?login" name="loginform">
-                <fieldset class="w500p center">
-                    <h2 class="mbs txtcenter">{% trans "Login to wallabag" %}</h2>
-                    {% if constant('MODE_DEMO') == 1 %}<p>{% trans "you are in demo mode, some features may be disabled." %}</p>{% endif %}
-                                        <div class="row">
-                                                <label class="col w150p" for="login">{% trans "Username" %}</label>
-                                                <input class="col" type="text" id="login" name="login" placeholder="Login" tabindex="1" autofocus {% if constant('MODE_DEMO') == 1 %}value="poche"{% endif %} />
-                                        </div>
-
-                                        <div class="row">
-                                                <label class="col w150p" for="password">{% trans "Password" %}</label>
-                                                <input class="col" type="password" id="password" name="password" placeholder="Password" tabindex="2" {% if constant('MODE_DEMO') == 1 %}value="poche"{% endif %} />
-                                        </div>
-                                        <div class="row">
-                                                <label class="col w150p" for="longlastingsession">{% trans "Stay signed in" %}</label>
-                                                <div class="col">
-                                                        <input type="checkbox" id="longlastingsession" name="longlastingsession" tabindex="3">
-                                                        <small class="inbl">{% trans "(Do not check on public computers)" %}</small>
-                                                </div>
-                                        </div>
-                                        <div class="row mts txtcenter">
-                                                <button class="bouton" type="submit" tabindex="4">{% trans "Sign in" %}</button>
-                                        </div>
-                </fieldset>
-                <input type="hidden" name="returnurl" value="{{ referer }}">
-                <input type="hidden" name="token" value="{{ token }}">
-            </form>
-    {% endif %}
-{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/css/images/animated-overlay.gif b/src/Wallabag/CoreBundle/Resources/views/default/public/css/images/animated-overlay.gif
deleted file mode 100644
index d441f75e..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/css/images/animated-overlay.gif
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-bg_flat_0_aaaaaa_40x100.png b/src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-bg_flat_0_aaaaaa_40x100.png
deleted file mode 100644
index 9f10cb65..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-bg_flat_0_aaaaaa_40x100.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-bg_flat_75_ffffff_40x100.png b/src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-bg_flat_75_ffffff_40x100.png
deleted file mode 100644
index b89b914b..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-bg_flat_75_ffffff_40x100.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-bg_glass_55_fbf9ee_1x400.png b/src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-bg_glass_55_fbf9ee_1x400.png
deleted file mode 100644
index 780d3ffd..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-bg_glass_55_fbf9ee_1x400.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-bg_glass_65_ffffff_1x400.png b/src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-bg_glass_65_ffffff_1x400.png
deleted file mode 100644
index da53255b..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-bg_glass_65_ffffff_1x400.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-bg_glass_75_dadada_1x400.png b/src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-bg_glass_75_dadada_1x400.png
deleted file mode 100644
index f6306608..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-bg_glass_75_dadada_1x400.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-bg_glass_75_e6e6e6_1x400.png b/src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-bg_glass_75_e6e6e6_1x400.png
deleted file mode 100644
index 7d347065..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-bg_glass_75_e6e6e6_1x400.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-bg_glass_95_fef1ec_1x400.png b/src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-bg_glass_95_fef1ec_1x400.png
deleted file mode 100644
index 533c4900..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-bg_glass_95_fef1ec_1x400.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png
deleted file mode 100644
index bf3a9481..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-icons_222222_256x240.png b/src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-icons_222222_256x240.png
deleted file mode 100644
index c1cb1170..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-icons_222222_256x240.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-icons_2e83ff_256x240.png b/src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-icons_2e83ff_256x240.png
deleted file mode 100644
index 84b601bf..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-icons_2e83ff_256x240.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-icons_454545_256x240.png b/src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-icons_454545_256x240.png
deleted file mode 100644
index b6db1acd..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-icons_454545_256x240.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-icons_888888_256x240.png b/src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-icons_888888_256x240.png
deleted file mode 100644
index feea0e20..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-icons_888888_256x240.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-icons_cd0a0a_256x240.png b/src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-icons_cd0a0a_256x240.png
deleted file mode 100644
index ed5b6b09..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-icons_cd0a0a_256x240.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/css/messages.css b/src/Wallabag/CoreBundle/Resources/views/default/public/css/messages.css
deleted file mode 100644
index 46b54795..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/css/messages.css
+++ /dev/null
@@ -1,75 +0,0 @@
-.messages {
-    display: block;
-    clear: both;
-    width: 400px;
-    margin: 10px auto 10px;
-    padding: 10px 0;
-    -moz-border-radius: 4px;
-    border-radius: 4px;
-}
-
-.messages a.closeMessage {
-    display: none;
-    float: right;
-    width: 16px;
-    height: 16px;
-    margin: -14px -8px 0 0;
-    background: url(../img/messages/close.png) no-repeat;
-}
-
-/*.messages:hover a.closeMessage { visibility:visible; }*/
-
-.messages p {
-    margin: 3px 0 3px 10px !important;
-    padding: 0 10px 0 23px !important;
-    font-size: 14px;
-    line-height: 16px;
-}
-
-.messages.error {
-    border: 1px solid #c42608;
-    color: #c00 !important;
-    background: #fff0ef;
-}
-
-.messages.error p {
-    color: #c00 !important;
-    background: url(../img/messages/cross.png) no-repeat 0 50%;
-}
-
-.messages.success {
-    border: 1px solid #6dc70c;
-    background: #e0fbcc;
-}
-
-.messages.success p {
-    color: #2b6301 !important;
-    background: url(../img/messages/tick.png) no-repeat 0 50%;
-}
-
-.messages.warning {
-    border: 1px solid #ebcd41;
-    color: #000;
-    background: #fffcd3;
-}
-
-.messages.warning p {
-    color: #5f4e01;
-    background: url(../img/messages/warning.png) no-repeat 0 50%;
-}
-
-.messages.information,
-.messages.info {
-    border: 1px solid #82aee7;
-    background: #dfebfb;
-}
-
-.messages.information p,
-.messages.info p {
-    color: #064393;
-    background: url(../img/messages/help.png) no-repeat 0 50%;
-}
-
-.messages.information a {
-    text-decoration: underline;
-}
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/css/print.css b/src/Wallabag/CoreBundle/Resources/views/default/public/css/print.css
deleted file mode 100644
index 625478e1..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/css/print.css
+++ /dev/null
@@ -1,53 +0,0 @@
-/* ### Layout ### */
-
-body {
-    font-family: Serif;
-    background-color: #fff;
-}
-
-@page {
-    margin: 1cm;
-}
-
-img {
-    max-width: 100% !important;
-}
-
-/* ### Content ### */
-
-/* Hide useless blocks */
-body > header,
-#links,
-#sort,
-body > footer,
-.top_link,
-div.tools,
-header div,
-.messages,
-.entrie + .results,
-#article_toolbar {
-    display: none !important;
-}
-
-article {
-    border: none !important;
-}
-
-pre code {
-    line-height: 1.6em;
-}
-
-/* Add URL after links */
-.vieworiginal a:after {
-    content: " (" attr(href) ")";
-}
-
-/* Add explanation after abbr */
-abbr[title]:after {
-    content: " (" attr(title) ")";
-}
-
-/* Change border on current pager item */
-.pagination span.current {
-    border-style: dashed;
-}
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/css/style-default.css b/src/Wallabag/CoreBundle/Resources/views/default/public/css/style-default.css
deleted file mode 100755
index 4406d48f..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/css/style-default.css
+++ /dev/null
@@ -1,69 +0,0 @@
-a.back span {
-    background-image: url('../img/default/left.png');
-}
-
-a.top span {
-    background-image: url('../img/default/top.png');
-}
-
-a.fav span,
-a.fav-off span:hover {
-    background-image: url('../img/default/star-on.png');
-}
-
-a.fav span:hover,
-a.fav-off span {
-    background-image: url('../img/default/star-off.png');
-}
-
-a.archive span,
-a.archive-off span:hover {
-    background-image: url('../img/default/checkmark-on.png');
-}
-
-a.archive span:hover,
-a.archive-off span {
-    background-image: url('../img/default/checkmark-off.png');
-}
-
-a.twitter span {
-    background-image: url('../img/default/twitter.png');
-}
-
-a.shaarli span {
-    background-image: url('../img/default/shaarli.png');
-}
-
-a.flattr span {
-    background-image: url('../img/default/flattr.png');
-}
-
-a.carrot span {
-    background-image: url('../../_global/img/icons/carrot-icon--black.png');
-    background-size: 16px 16px;
-}
-
-a.diaspora span {
-    background-image: url('../../_global/img/icons/diaspora-icon--black.png');
-    background-size: 16px 16px;
-}
-
-a.email span {
-    background-image: url('../img/default/envelop.png');
-}
-
-a.delete span {
-    background-image: url('../img/default/remove.png');
-}
-
-a.link span {
-    background-image: url('../img/default/link.png');
-}
-
-a.bad-display span {
-    background-image: url('../img/default/bad-display.png');
-}
-
-a.print span {
-                background-image: url('../img/default/print.png');
-}
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/fonts/Roboto.woff b/src/Wallabag/CoreBundle/Resources/views/default/public/fonts/Roboto.woff
deleted file mode 100644
index 1440b1be..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/fonts/Roboto.woff
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/highlightjs/highlight.pack.js b/src/Wallabag/CoreBundle/Resources/views/default/public/highlightjs/highlight.pack.js
deleted file mode 100644
index 10a21c34..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/highlightjs/highlight.pack.js
+++ /dev/null
@@ -1 +0,0 @@
-var hljs=new function(){function j(v){return v.replace(/&/gm,"&amp;").replace(/</gm,"&lt;").replace(/>/gm,"&gt;")}function t(v){return v.nodeName.toLowerCase()}function h(w,x){var v=w&&w.exec(x);return v&&v.index==0}function r(w){var v=(w.className+" "+(w.parentNode?w.parentNode.className:"")).split(/\s+/);v=v.map(function(x){return x.replace(/^lang(uage)?-/,"")});return v.filter(function(x){return i(x)||x=="no-highlight"})[0]}function o(x,y){var v={};for(var w in x){v[w]=x[w]}if(y){for(var w in y){v[w]=y[w]}}return v}function u(x){var v=[];(function w(y,z){for(var A=y.firstChild;A;A=A.nextSibling){if(A.nodeType==3){z+=A.nodeValue.length}else{if(t(A)=="br"){z+=1}else{if(A.nodeType==1){v.push({event:"start",offset:z,node:A});z=w(A,z);v.push({event:"stop",offset:z,node:A})}}}}return z})(x,0);return v}function q(w,y,C){var x=0;var F="";var z=[];function B(){if(!w.length||!y.length){return w.length?w:y}if(w[0].offset!=y[0].offset){return(w[0].offset<y[0].offset)?w:y}return y[0].event=="start"?w:y}function A(H){function G(I){return" "+I.nodeName+'="'+j(I.value)+'"'}F+="<"+t(H)+Array.prototype.map.call(H.attributes,G).join("")+">"}function E(G){F+="</"+t(G)+">"}function v(G){(G.event=="start"?A:E)(G.node)}while(w.length||y.length){var D=B();F+=j(C.substr(x,D[0].offset-x));x=D[0].offset;if(D==w){z.reverse().forEach(E);do{v(D.splice(0,1)[0]);D=B()}while(D==w&&D.length&&D[0].offset==x);z.reverse().forEach(A)}else{if(D[0].event=="start"){z.push(D[0].node)}else{z.pop()}v(D.splice(0,1)[0])}}return F+j(C.substr(x))}function m(y){function v(z){return(z&&z.source)||z}function w(A,z){return RegExp(v(A),"m"+(y.cI?"i":"")+(z?"g":""))}function x(D,C){if(D.compiled){return}D.compiled=true;D.k=D.k||D.bK;if(D.k){var z={};var E=function(G,F){if(y.cI){F=F.toLowerCase()}F.split(" ").forEach(function(H){var I=H.split("|");z[I[0]]=[G,I[1]?Number(I[1]):1]})};if(typeof D.k=="string"){E("keyword",D.k)}else{Object.keys(D.k).forEach(function(F){E(F,D.k[F])})}D.k=z}D.lR=w(D.l||/\b[A-Za-z0-9_]+\b/,true);if(C){if(D.bK){D.b="\\b("+D.bK.split(" ").join("|")+")\\b"}if(!D.b){D.b=/\B|\b/}D.bR=w(D.b);if(!D.e&&!D.eW){D.e=/\B|\b/}if(D.e){D.eR=w(D.e)}D.tE=v(D.e)||"";if(D.eW&&C.tE){D.tE+=(D.e?"|":"")+C.tE}}if(D.i){D.iR=w(D.i)}if(D.r===undefined){D.r=1}if(!D.c){D.c=[]}var B=[];D.c.forEach(function(F){if(F.v){F.v.forEach(function(G){B.push(o(F,G))})}else{B.push(F=="self"?D:F)}});D.c=B;D.c.forEach(function(F){x(F,D)});if(D.starts){x(D.starts,C)}var A=D.c.map(function(F){return F.bK?"\\.?("+F.b+")\\.?":F.b}).concat([D.tE,D.i]).map(v).filter(Boolean);D.t=A.length?w(A.join("|"),true):{exec:function(F){return null}};D.continuation={}}x(y)}function c(S,L,J,R){function v(U,V){for(var T=0;T<V.c.length;T++){if(h(V.c[T].bR,U)){return V.c[T]}}}function z(U,T){if(h(U.eR,T)){return U}if(U.eW){return z(U.parent,T)}}function A(T,U){return !J&&h(U.iR,T)}function E(V,T){var U=M.cI?T[0].toLowerCase():T[0];return V.k.hasOwnProperty(U)&&V.k[U]}function w(Z,X,W,V){var T=V?"":b.classPrefix,U='<span class="'+T,Y=W?"":"</span>";U+=Z+'">';return U+X+Y}function N(){if(!I.k){return j(C)}var T="";var W=0;I.lR.lastIndex=0;var U=I.lR.exec(C);while(U){T+=j(C.substr(W,U.index-W));var V=E(I,U);if(V){H+=V[1];T+=w(V[0],j(U[0]))}else{T+=j(U[0])}W=I.lR.lastIndex;U=I.lR.exec(C)}return T+j(C.substr(W))}function F(){if(I.sL&&!f[I.sL]){return j(C)}var T=I.sL?c(I.sL,C,true,I.continuation.top):e(C);if(I.r>0){H+=T.r}if(I.subLanguageMode=="continuous"){I.continuation.top=T.top}return w(T.language,T.value,false,true)}function Q(){return I.sL!==undefined?F():N()}function P(V,U){var T=V.cN?w(V.cN,"",true):"";if(V.rB){D+=T;C=""}else{if(V.eB){D+=j(U)+T;C=""}else{D+=T;C=U}}I=Object.create(V,{parent:{value:I}})}function G(T,X){C+=T;if(X===undefined){D+=Q();return 0}var V=v(X,I);if(V){D+=Q();P(V,X);return V.rB?0:X.length}var W=z(I,X);if(W){var U=I;if(!(U.rE||U.eE)){C+=X}D+=Q();do{if(I.cN){D+="</span>"}H+=I.r;I=I.parent}while(I!=W.parent);if(U.eE){D+=j(X)}C="";if(W.starts){P(W.starts,"")}return U.rE?0:X.length}if(A(X,I)){throw new Error('Illegal lexeme "'+X+'" for mode "'+(I.cN||"<unnamed>")+'"')}C+=X;return X.length||1}var M=i(S);if(!M){throw new Error('Unknown language: "'+S+'"')}m(M);var I=R||M;var D="";for(var K=I;K!=M;K=K.parent){if(K.cN){D+=w(K.cN,D,true)}}var C="";var H=0;try{var B,y,x=0;while(true){I.t.lastIndex=x;B=I.t.exec(L);if(!B){break}y=G(L.substr(x,B.index-x),B[0]);x=B.index+y}G(L.substr(x));for(var K=I;K.parent;K=K.parent){if(K.cN){D+="</span>"}}return{r:H,value:D,language:S,top:I}}catch(O){if(O.message.indexOf("Illegal")!=-1){return{r:0,value:j(L)}}else{throw O}}}function e(y,x){x=x||b.languages||Object.keys(f);var v={r:0,value:j(y)};var w=v;x.forEach(function(z){if(!i(z)){return}var A=c(z,y,false);A.language=z;if(A.r>w.r){w=A}if(A.r>v.r){w=v;v=A}});if(w.language){v.second_best=w}return v}function g(v){if(b.tabReplace){v=v.replace(/^((<[^>]+>|\t)+)/gm,function(w,z,y,x){return z.replace(/\t/g,b.tabReplace)})}if(b.useBR){v=v.replace(/\n/g,"<br>")}return v}function p(z){var y=b.useBR?z.innerHTML.replace(/\n/g,"").replace(/<br>|<br [^>]*>/g,"\n").replace(/<[^>]*>/g,""):z.textContent;var A=r(z);if(A=="no-highlight"){return}var v=A?c(A,y,true):e(y);var w=u(z);if(w.length){var x=document.createElementNS("http://www.w3.org/1999/xhtml","pre");x.innerHTML=v.value;v.value=q(w,u(x),y)}v.value=g(v.value);z.innerHTML=v.value;z.className+=" hljs "+(!A&&v.language||"");z.result={language:v.language,re:v.r};if(v.second_best){z.second_best={language:v.second_best.language,re:v.second_best.r}}}var b={classPrefix:"hljs-",tabReplace:null,useBR:false,languages:undefined};function s(v){b=o(b,v)}function l(){if(l.called){return}l.called=true;var v=document.querySelectorAll("pre code");Array.prototype.forEach.call(v,p)}function a(){addEventListener("DOMContentLoaded",l,false);addEventListener("load",l,false)}var f={};var n={};function d(v,x){var w=f[v]=x(this);if(w.aliases){w.aliases.forEach(function(y){n[y]=v})}}function k(){return Object.keys(f)}function i(v){return f[v]||f[n[v]]}this.highlight=c;this.highlightAuto=e;this.fixMarkup=g;this.highlightBlock=p;this.configure=s;this.initHighlighting=l;this.initHighlightingOnLoad=a;this.registerLanguage=d;this.listLanguages=k;this.getLanguage=i;this.inherit=o;this.IR="[a-zA-Z][a-zA-Z0-9_]*";this.UIR="[a-zA-Z_][a-zA-Z0-9_]*";this.NR="\\b\\d+(\\.\\d+)?";this.CNR="(\\b0[xX][a-fA-F0-9]+|(\\b\\d+(\\.\\d*)?|\\.\\d+)([eE][-+]?\\d+)?)";this.BNR="\\b(0b[01]+)";this.RSR="!|!=|!==|%|%=|&|&&|&=|\\*|\\*=|\\+|\\+=|,|-|-=|/=|/|:|;|<<|<<=|<=|<|===|==|=|>>>=|>>=|>=|>>>|>>|>|\\?|\\[|\\{|\\(|\\^|\\^=|\\||\\|=|\\|\\||~";this.BE={b:"\\\\[\\s\\S]",r:0};this.ASM={cN:"string",b:"'",e:"'",i:"\\n",c:[this.BE]};this.QSM={cN:"string",b:'"',e:'"',i:"\\n",c:[this.BE]};this.PWM={b:/\b(a|an|the|are|I|I'm|isn't|don't|doesn't|won't|but|just|should|pretty|simply|enough|gonna|going|wtf|so|such)\b/};this.CLCM={cN:"comment",b:"//",e:"$",c:[this.PWM]};this.CBCM={cN:"comment",b:"/\\*",e:"\\*/",c:[this.PWM]};this.HCM={cN:"comment",b:"#",e:"$",c:[this.PWM]};this.NM={cN:"number",b:this.NR,r:0};this.CNM={cN:"number",b:this.CNR,r:0};this.BNM={cN:"number",b:this.BNR,r:0};this.CSSNM={cN:"number",b:this.NR+"(%|em|ex|ch|rem|vw|vh|vmin|vmax|cm|mm|in|pt|pc|px|deg|grad|rad|turn|s|ms|Hz|kHz|dpi|dpcm|dppx)?",r:0};this.RM={cN:"regexp",b:/\//,e:/\/[gim]*/,i:/\n/,c:[this.BE,{b:/\[/,e:/\]/,r:0,c:[this.BE]}]};this.TM={cN:"title",b:this.IR,r:0};this.UTM={cN:"title",b:this.UIR,r:0}}();hljs.registerLanguage("bash",function(b){var a={cN:"variable",v:[{b:/\$[\w\d#@][\w\d_]*/},{b:/\$\{(.*?)\}/}]};var d={cN:"string",b:/"/,e:/"/,c:[b.BE,a,{cN:"variable",b:/\$\(/,e:/\)/,c:[b.BE]}]};var c={cN:"string",b:/'/,e:/'/};return{aliases:["sh","zsh"],l:/-?[a-z\.]+/,k:{keyword:"if then else elif fi for break continue while in do done exit return set declare case esac export exec",literal:"true false",built_in:"printf echo read cd pwd pushd popd dirs let eval unset typeset readonly getopts source shopt caller type hash bind help sudo",operator:"-ne -eq -lt -gt -f -d -e -s -l -a"},c:[{cN:"shebang",b:/^#![^\n]+sh\s*$/,r:10},{cN:"function",b:/\w[\w\d_]*\s*\(\s*\)\s*\{/,rB:true,c:[b.inherit(b.TM,{b:/\w[\w\d_]*/})],r:0},b.HCM,b.NM,d,c,a]}});hljs.registerLanguage("cs",function(b){var a="abstract as base bool break byte case catch char checked const continue decimal default delegate do double else enum event explicit extern false finally fixed float for foreach goto if implicit in int interface internal is lock long new null object operator out override params private protected public readonly ref return sbyte sealed short sizeof stackalloc static string struct switch this throw true try typeof uint ulong unchecked unsafe ushort using virtual volatile void while async await ascending descending from get group into join let orderby partial select set value var where yield";return{aliases:["csharp"],k:a,i:/::/,c:[{cN:"comment",b:"///",e:"$",rB:true,c:[{cN:"xmlDocTag",v:[{b:"///",r:0},{b:"<!--|-->"},{b:"</?",e:">"}]}]},b.CLCM,b.CBCM,{cN:"preprocessor",b:"#",e:"$",k:"if else elif endif define undef warning error line region endregion pragma checksum"},{cN:"string",b:'@"',e:'"',c:[{b:'""'}]},b.ASM,b.QSM,b.CNM,{bK:"protected public private internal",e:/[{;=]/,k:a,c:[{bK:"class namespace interface",starts:{c:[b.TM]}},{b:b.IR+"\\s*\\(",rB:true,c:[b.TM]}]}]}});hljs.registerLanguage("ruby",function(f){var j="[a-zA-Z_]\\w*[!?=]?|[-+~]\\@|<<|>>|=~|===?|<=>|[<>]=?|\\*\\*|[-/+%^&*~`|]|\\[\\]=?";var i="and false then defined module in return redo if BEGIN retry end for true self when next until do begin unless END rescue nil else break undef not super class case require yield alias while ensure elsif or include attr_reader attr_writer attr_accessor";var b={cN:"yardoctag",b:"@[A-Za-z]+"};var c={cN:"value",b:"#<",e:">"};var k={cN:"comment",v:[{b:"#",e:"$",c:[b]},{b:"^\\=begin",e:"^\\=end",c:[b],r:10},{b:"^__END__",e:"\\n$"}]};var d={cN:"subst",b:"#\\{",e:"}",k:i};var e={cN:"string",c:[f.BE,d],v:[{b:/'/,e:/'/},{b:/"/,e:/"/},{b:"%[qw]?\\(",e:"\\)"},{b:"%[qw]?\\[",e:"\\]"},{b:"%[qw]?{",e:"}"},{b:"%[qw]?<",e:">"},{b:"%[qw]?/",e:"/"},{b:"%[qw]?%",e:"%"},{b:"%[qw]?-",e:"-"},{b:"%[qw]?\\|",e:"\\|"},{b:/\B\?(\\\d{1,3}|\\x[A-Fa-f0-9]{1,2}|\\u[A-Fa-f0-9]{4}|\\?\S)\b/}]};var a={cN:"params",b:"\\(",e:"\\)",k:i};var h=[e,c,k,{cN:"class",bK:"class module",e:"$|;",i:/=/,c:[f.inherit(f.TM,{b:"[A-Za-z_]\\w*(::\\w+)*(\\?|\\!)?"}),{cN:"inheritance",b:"<\\s*",c:[{cN:"parent",b:"("+f.IR+"::)?"+f.IR}]},k]},{cN:"function",bK:"def",e:" |$|;",r:0,c:[f.inherit(f.TM,{b:j}),a,k]},{cN:"constant",b:"(::)?(\\b[A-Z]\\w*(::)?)+",r:0},{cN:"symbol",b:":",c:[e,{b:j}],r:0},{cN:"symbol",b:f.UIR+"(\\!|\\?)?:",r:0},{cN:"number",b:"(\\b0[0-7_]+)|(\\b0x[0-9a-fA-F_]+)|(\\b[1-9][0-9_]*(\\.[0-9_]+)?)|[0_]\\b",r:0},{cN:"variable",b:"(\\$\\W)|((\\$|\\@\\@?)(\\w+))"},{b:"("+f.RSR+")\\s*",c:[c,k,{cN:"regexp",c:[f.BE,d],i:/\n/,v:[{b:"/",e:"/[a-z]*"},{b:"%r{",e:"}[a-z]*"},{b:"%r\\(",e:"\\)[a-z]*"},{b:"%r!",e:"![a-z]*"},{b:"%r\\[",e:"\\][a-z]*"}]}],r:0}];d.c=h;a.c=h;var g=[{r:1,cN:"output",b:"^\\s*=> ",e:"$",rB:true,c:[{cN:"status",b:"^\\s*=>"},{b:" ",e:"$",c:h}]},{r:1,cN:"input",b:"^[^ ][^=>]*>+ ",e:"$",rB:true,c:[{cN:"prompt",b:"^[^ ][^=>]*>+"},{b:" ",e:"$",c:h}]}];return{aliases:["rb","gemspec","podspec","thor","irb"],k:i,c:g.concat(h)}});hljs.registerLanguage("diff",function(a){return{aliases:["patch"],c:[{cN:"chunk",r:10,v:[{b:/^\@\@ +\-\d+,\d+ +\+\d+,\d+ +\@\@$/},{b:/^\*\*\* +\d+,\d+ +\*\*\*\*$/},{b:/^\-\-\- +\d+,\d+ +\-\-\-\-$/}]},{cN:"header",v:[{b:/Index: /,e:/$/},{b:/=====/,e:/=====$/},{b:/^\-\-\-/,e:/$/},{b:/^\*{3} /,e:/$/},{b:/^\+\+\+/,e:/$/},{b:/\*{5}/,e:/\*{5}$/}]},{cN:"addition",b:"^\\+",e:"$"},{cN:"deletion",b:"^\\-",e:"$"},{cN:"change",b:"^\\!",e:"$"}]}});hljs.registerLanguage("javascript",function(a){return{aliases:["js"],k:{keyword:"in if for while finally var new function do return void else break catch instanceof with throw case default try this switch continue typeof delete let yield const class",literal:"true false null undefined NaN Infinity",built_in:"eval isFinite isNaN parseFloat parseInt decodeURI decodeURIComponent encodeURI encodeURIComponent escape unescape Object Function Boolean Error EvalError InternalError RangeError ReferenceError StopIteration SyntaxError TypeError URIError Number Math Date String RegExp Array Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray ArrayBuffer DataView JSON Intl arguments require module console window document"},c:[{cN:"pi",b:/^\s*('|")use strict('|")/,r:10},a.ASM,a.QSM,a.CLCM,a.CBCM,a.CNM,{b:"("+a.RSR+"|\\b(case|return|throw)\\b)\\s*",k:"return throw case",c:[a.CLCM,a.CBCM,a.RM,{b:/</,e:/>;/,r:0,sL:"xml"}],r:0},{cN:"function",bK:"function",e:/\{/,eE:true,c:[a.inherit(a.TM,{b:/[A-Za-z$_][0-9A-Za-z$_]*/}),{cN:"params",b:/\(/,e:/\)/,c:[a.CLCM,a.CBCM],i:/["'\(]/}],i:/\[|%/},{b:/\$[(.]/},{b:"\\."+a.IR,r:0}]}});hljs.registerLanguage("xml",function(a){var c="[A-Za-z0-9\\._:-]+";var d={b:/<\?(php)?(?!\w)/,e:/\?>/,sL:"php",subLanguageMode:"continuous"};var b={eW:true,i:/</,r:0,c:[d,{cN:"attribute",b:c,r:0},{b:"=",r:0,c:[{cN:"value",v:[{b:/"/,e:/"/},{b:/'/,e:/'/},{b:/[^\s\/>]+/}]}]}]};return{aliases:["html","xhtml","rss","atom","xsl","plist"],cI:true,c:[{cN:"doctype",b:"<!DOCTYPE",e:">",r:10,c:[{b:"\\[",e:"\\]"}]},{cN:"comment",b:"<!--",e:"-->",r:10},{cN:"cdata",b:"<\\!\\[CDATA\\[",e:"\\]\\]>",r:10},{cN:"tag",b:"<style(?=\\s|>|$)",e:">",k:{title:"style"},c:[b],starts:{e:"</style>",rE:true,sL:"css"}},{cN:"tag",b:"<script(?=\\s|>|$)",e:">",k:{title:"script"},c:[b],starts:{e:"<\/script>",rE:true,sL:"javascript"}},{b:"<%",e:"%>",sL:"vbscript"},d,{cN:"pi",b:/<\?\w+/,e:/\?>/,r:10},{cN:"tag",b:"</?",e:"/?>",c:[{cN:"title",b:"[^ /><]+",r:0},b]}]}});hljs.registerLanguage("markdown",function(a){return{aliases:["md","mkdown","mkd"],c:[{cN:"header",v:[{b:"^#{1,6}",e:"$"},{b:"^.+?\\n[=-]{2,}$"}]},{b:"<",e:">",sL:"xml",r:0},{cN:"bullet",b:"^([*+-]|(\\d+\\.))\\s+"},{cN:"strong",b:"[*_]{2}.+?[*_]{2}"},{cN:"emphasis",v:[{b:"\\*.+?\\*"},{b:"_.+?_",r:0}]},{cN:"blockquote",b:"^>\\s+",e:"$"},{cN:"code",v:[{b:"`.+?`"},{b:"^( {4}|\t)",e:"$",r:0}]},{cN:"horizontal_rule",b:"^[-\\*]{3,}",e:"$"},{b:"\\[.+?\\][\\(\\[].+?[\\)\\]]",rB:true,c:[{cN:"link_label",b:"\\[",e:"\\]",eB:true,rE:true,r:0},{cN:"link_url",b:"\\]\\(",e:"\\)",eB:true,eE:true},{cN:"link_reference",b:"\\]\\[",e:"\\]",eB:true,eE:true}],r:10},{b:"^\\[.+\\]:",e:"$",rB:true,c:[{cN:"link_reference",b:"\\[",e:"\\]",eB:true,eE:true},{cN:"link_url",b:"\\s",e:"$"}]}]}});hljs.registerLanguage("css",function(a){var b="[a-zA-Z-][a-zA-Z0-9_-]*";var c={cN:"function",b:b+"\\(",rB:true,eE:true,e:"\\("};return{cI:true,i:"[=/|']",c:[a.CBCM,{cN:"id",b:"\\#[A-Za-z0-9_-]+"},{cN:"class",b:"\\.[A-Za-z0-9_-]+",r:0},{cN:"attr_selector",b:"\\[",e:"\\]",i:"$"},{cN:"pseudo",b:":(:)?[a-zA-Z0-9\\_\\-\\+\\(\\)\\\"\\']+"},{cN:"at_rule",b:"@(font-face|page)",l:"[a-z-]+",k:"font-face page"},{cN:"at_rule",b:"@",e:"[{;]",c:[{cN:"keyword",b:/\S+/},{b:/\s/,eW:true,eE:true,r:0,c:[c,a.ASM,a.QSM,a.CSSNM]}]},{cN:"tag",b:b,r:0},{cN:"rules",b:"{",e:"}",i:"[^\\s]",r:0,c:[a.CBCM,{cN:"rule",b:"[^\\s]",rB:true,e:";",eW:true,c:[{cN:"attribute",b:"[A-Z\\_\\.\\-]+",e:":",eE:true,i:"[^\\s]",starts:{cN:"value",eW:true,eE:true,c:[c,a.CSSNM,a.QSM,a.ASM,a.CBCM,{cN:"hexcolor",b:"#[0-9A-Fa-f]+"},{cN:"important",b:"!important"}]}}]}]}]}});hljs.registerLanguage("http",function(a){return{i:"\\S",c:[{cN:"status",b:"^HTTP/[0-9\\.]+",e:"$",c:[{cN:"number",b:"\\b\\d{3}\\b"}]},{cN:"request",b:"^[A-Z]+ (.*?) HTTP/[0-9\\.]+$",rB:true,e:"$",c:[{cN:"string",b:" ",e:" ",eB:true,eE:true}]},{cN:"attribute",b:"^\\w",e:": ",eE:true,i:"\\n|\\s|=",starts:{cN:"string",e:"$"}},{b:"\\n\\n",starts:{sL:"",eW:true}}]}});hljs.registerLanguage("java",function(b){var a="false synchronized int abstract float private char boolean static null if const for true while long throw strictfp finally protected import native final return void enum else break transient new catch instanceof byte super volatile case assert short package default double public try this switch continue throws";return{aliases:["jsp"],k:a,i:/<\//,c:[{cN:"javadoc",b:"/\\*\\*",e:"\\*/",c:[{cN:"javadoctag",b:"(^|\\s)@[A-Za-z]+"}],r:10},b.CLCM,b.CBCM,b.ASM,b.QSM,{bK:"protected public private",e:/[{;=]/,k:a,c:[{cN:"class",bK:"class interface",eW:true,eE:true,i:/[:"\[\]]/,c:[{bK:"extends implements",r:10},b.UTM]},{b:b.UIR+"\\s*\\(",rB:true,c:[b.UTM]}]},b.CNM,{cN:"annotation",b:"@[A-Za-z]+"}]}});hljs.registerLanguage("php",function(b){var e={cN:"variable",b:"(\\$|->)+[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*"};var a={cN:"preprocessor",b:/<\?(php)?|\?>/};var c={cN:"string",c:[b.BE,a],v:[{b:'b"',e:'"'},{b:"b'",e:"'"},b.inherit(b.ASM,{i:null}),b.inherit(b.QSM,{i:null})]};var d={v:[b.BNM,b.CNM]};return{aliases:["php3","php4","php5","php6"],cI:true,k:"and include_once list abstract global private echo interface as static endswitch array null if endwhile or const for endforeach self var while isset public protected exit foreach throw elseif include __FILE__ empty require_once do xor return parent clone use __CLASS__ __LINE__ else break print eval new catch __METHOD__ case exception default die require __FUNCTION__ enddeclare final try switch continue endfor endif declare unset true false trait goto instanceof insteadof __DIR__ __NAMESPACE__ yield finally",c:[b.CLCM,b.HCM,{cN:"comment",b:"/\\*",e:"\\*/",c:[{cN:"phpdoc",b:"\\s@[A-Za-z]+"},a]},{cN:"comment",b:"__halt_compiler.+?;",eW:true,k:"__halt_compiler",l:b.UIR},{cN:"string",b:"<<<['\"]?\\w+['\"]?$",e:"^\\w+;",c:[b.BE]},a,e,{cN:"function",bK:"function",e:/[;{]/,eE:true,i:"\\$|\\[|%",c:[b.UTM,{cN:"params",b:"\\(",e:"\\)",c:["self",e,b.CBCM,c,d]}]},{cN:"class",bK:"class interface",e:"{",eE:true,i:/[:\(\$"]/,c:[{bK:"extends implements",r:10},b.UTM]},{bK:"namespace",e:";",i:/[\.']/,c:[b.UTM]},{bK:"use",e:";",c:[b.UTM]},{b:"=>"},c,d]}});hljs.registerLanguage("python",function(a){var f={cN:"prompt",b:/^(>>>|\.\.\.) /};var b={cN:"string",c:[a.BE],v:[{b:/(u|b)?r?'''/,e:/'''/,c:[f],r:10},{b:/(u|b)?r?"""/,e:/"""/,c:[f],r:10},{b:/(u|r|ur)'/,e:/'/,r:10},{b:/(u|r|ur)"/,e:/"/,r:10},{b:/(b|br)'/,e:/'/},{b:/(b|br)"/,e:/"/},a.ASM,a.QSM]};var d={cN:"number",r:0,v:[{b:a.BNR+"[lLjJ]?"},{b:"\\b(0o[0-7]+)[lLjJ]?"},{b:a.CNR+"[lLjJ]?"}]};var e={cN:"params",b:/\(/,e:/\)/,c:["self",f,d,b]};var c={e:/:/,i:/[${=;\n]/,c:[a.UTM,e]};return{aliases:["py","gyp"],k:{keyword:"and elif is global as in if from raise for except finally print import pass return exec else break not with class assert yield try while continue del or def lambda nonlocal|10 None True False",built_in:"Ellipsis NotImplemented"},i:/(<\/|->|\?)/,c:[f,d,b,a.HCM,a.inherit(c,{cN:"function",bK:"def",r:10}),a.inherit(c,{cN:"class",bK:"class"}),{cN:"decorator",b:/@/,e:/$/},{b:/\b(print|exec)\(/}]}});hljs.registerLanguage("sql",function(a){var b={cN:"comment",b:"--",e:"$"};return{cI:true,i:/[<>]/,c:[{cN:"operator",bK:"begin end start commit rollback savepoint lock alter create drop rename call delete do handler insert load replace select truncate update set show pragma grant merge describe use explain help declare prepare execute deallocate savepoint release unlock purge reset change stop analyze cache flush optimize repair kill install uninstall checksum restore check backup",e:/;/,eW:true,k:{keyword:"abs absolute acos action add adddate addtime aes_decrypt aes_encrypt after aggregate all allocate alter analyze and any are as asc ascii asin assertion at atan atan2 atn2 authorization authors avg backup before begin benchmark between bin binlog bit_and bit_count bit_length bit_or bit_xor both by cache call cascade cascaded case cast catalog ceil ceiling chain change changed char_length character_length charindex charset check checksum checksum_agg choose close coalesce coercibility collate collation collationproperty column columns columns_updated commit compress concat concat_ws concurrent connect connection connection_id consistent constraint constraints continue contributors conv convert convert_tz corresponding cos cot count count_big crc32 create cross cume_dist curdate current current_date current_time current_timestamp current_user cursor curtime data database databases datalength date_add date_format date_sub dateadd datediff datefromparts datename datepart datetime2fromparts datetimeoffsetfromparts day dayname dayofmonth dayofweek dayofyear deallocate declare decode default deferrable deferred degrees delayed delete des_decrypt des_encrypt des_key_file desc describe descriptor diagnostics difference disconnect distinct distinctrow div do domain double drop dumpfile each else elt enclosed encode encrypt end end-exec engine engines eomonth errors escape escaped event eventdata events except exception exec execute exists exp explain export_set extended external extract fast fetch field fields find_in_set first first_value floor flush for force foreign format found found_rows from from_base64 from_days from_unixtime full function get get_format get_lock getdate getutcdate global go goto grant grants greatest group group_concat grouping grouping_id gtid_subset gtid_subtract handler having help hex high_priority hosts hour ident_current ident_incr ident_seed identified identity if ifnull ignore iif ilike immediate in index indicator inet6_aton inet6_ntoa inet_aton inet_ntoa infile initially inner innodb input insert install instr intersect into is is_free_lock is_ipv4 is_ipv4_compat is_ipv4_mapped is_not is_not_null is_used_lock isdate isnull isolation join key kill language last last_day last_insert_id last_value lcase lead leading least leaves left len lenght level like limit lines ln load load_file local localtime localtimestamp locate lock log log10 log2 logfile logs low_priority lower lpad ltrim make_set makedate maketime master master_pos_wait match matched max md5 medium merge microsecond mid min minute mod mode module month monthname mutex name_const names national natural nchar next no no_write_to_binlog not now nullif nvarchar oct octet_length of old_password on only open optimize option optionally or ord order outer outfile output pad parse partial partition password patindex percent_rank percentile_cont percentile_disc period_add period_diff pi plugin position pow power pragma precision prepare preserve primary prior privileges procedure procedure_analyze processlist profile profiles public publishingservername purge quarter query quick quote quotename radians rand read references regexp relative relaylog release release_lock rename repair repeat replace replicate reset restore restrict return returns reverse revoke right rlike rollback rollup round row row_count rows rpad rtrim savepoint schema scroll sec_to_time second section select serializable server session session_user set sha sha1 sha2 share show sign sin size slave sleep smalldatetimefromparts snapshot some soname soundex sounds_like space sql sql_big_result sql_buffer_result sql_cache sql_calc_found_rows sql_no_cache sql_small_result sql_variant_property sqlstate sqrt square start starting status std stddev stddev_pop stddev_samp stdev stdevp stop str str_to_date straight_join strcmp string stuff subdate substr substring subtime subtring_index sum switchoffset sysdate sysdatetime sysdatetimeoffset system_user sysutcdatetime table tables tablespace tan temporary terminated tertiary_weights then time time_format time_to_sec timediff timefromparts timestamp timestampadd timestampdiff timezone_hour timezone_minute to to_base64 to_days to_seconds todatetimeoffset trailing transaction translation trigger trigger_nestlevel triggers trim truncate try_cast try_convert try_parse ucase uncompress uncompressed_length unhex unicode uninstall union unique unix_timestamp unknown unlock update upgrade upped upper usage use user user_resources using utc_date utc_time utc_timestamp uuid uuid_short validate_password_strength value values var var_pop var_samp variables variance varp version view warnings week weekday weekofyear weight_string when whenever where with work write xml xor year yearweek zon",literal:"true false null",built_in:"array bigint binary bit blob boolean char character date dec decimal float int integer interval number numeric real serial smallint varchar varying int8 serial8 text"},c:[{cN:"string",b:"'",e:"'",c:[a.BE,{b:"''"}]},{cN:"string",b:'"',e:'"',c:[a.BE,{b:'""'}]},{cN:"string",b:"`",e:"`",c:[a.BE]},a.CNM,a.CBCM,b]},a.CBCM,b]}});hljs.registerLanguage("ini",function(a){return{cI:true,i:/\S/,c:[{cN:"comment",b:";",e:"$"},{cN:"title",b:"^\\[",e:"\\]"},{cN:"setting",b:"^[a-z0-9\\[\\]_-]+[ \\t]*=[ \\t]*",e:"$",c:[{cN:"value",eW:true,k:"on off true false yes no",c:[a.QSM,a.NM],r:0}]}]}});hljs.registerLanguage("perl",function(c){var d="getpwent getservent quotemeta msgrcv scalar kill dbmclose undef lc ma syswrite tr send umask sysopen shmwrite vec qx utime local oct semctl localtime readpipe do return format read sprintf dbmopen pop getpgrp not getpwnam rewinddir qqfileno qw endprotoent wait sethostent bless s|0 opendir continue each sleep endgrent shutdown dump chomp connect getsockname die socketpair close flock exists index shmgetsub for endpwent redo lstat msgctl setpgrp abs exit select print ref gethostbyaddr unshift fcntl syscall goto getnetbyaddr join gmtime symlink semget splice x|0 getpeername recv log setsockopt cos last reverse gethostbyname getgrnam study formline endhostent times chop length gethostent getnetent pack getprotoent getservbyname rand mkdir pos chmod y|0 substr endnetent printf next open msgsnd readdir use unlink getsockopt getpriority rindex wantarray hex system getservbyport endservent int chr untie rmdir prototype tell listen fork shmread ucfirst setprotoent else sysseek link getgrgid shmctl waitpid unpack getnetbyname reset chdir grep split require caller lcfirst until warn while values shift telldir getpwuid my getprotobynumber delete and sort uc defined srand accept package seekdir getprotobyname semop our rename seek if q|0 chroot sysread setpwent no crypt getc chown sqrt write setnetent setpriority foreach tie sin msgget map stat getlogin unless elsif truncate exec keys glob tied closedirioctl socket readlink eval xor readline binmode setservent eof ord bind alarm pipe atan2 getgrent exp time push setgrent gt lt or ne m|0 break given say state when";var f={cN:"subst",b:"[$@]\\{",e:"\\}",k:d};var g={b:"->{",e:"}"};var a={cN:"variable",v:[{b:/\$\d/},{b:/[\$\%\@](\^\w\b|#\w+(\:\:\w+)*|{\w+}|\w+(\:\:\w*)*)/},{b:/[\$\%\@][^\s\w{]/,r:0}]};var e={cN:"comment",b:"^(__END__|__DATA__)",e:"\\n$",r:5};var h=[c.BE,f,a];var b=[a,c.HCM,e,{cN:"comment",b:"^\\=\\w",e:"\\=cut",eW:true},g,{cN:"string",c:h,v:[{b:"q[qwxr]?\\s*\\(",e:"\\)",r:5},{b:"q[qwxr]?\\s*\\[",e:"\\]",r:5},{b:"q[qwxr]?\\s*\\{",e:"\\}",r:5},{b:"q[qwxr]?\\s*\\|",e:"\\|",r:5},{b:"q[qwxr]?\\s*\\<",e:"\\>",r:5},{b:"qw\\s+q",e:"q",r:5},{b:"'",e:"'",c:[c.BE]},{b:'"',e:'"'},{b:"`",e:"`",c:[c.BE]},{b:"{\\w+}",c:[],r:0},{b:"-?\\w+\\s*\\=\\>",c:[],r:0}]},{cN:"number",b:"(\\b0[0-7_]+)|(\\b0x[0-9a-fA-F_]+)|(\\b[1-9][0-9_]*(\\.[0-9_]+)?)|[0_]\\b",r:0},{b:"(\\/\\/|"+c.RSR+"|\\b(split|return|print|reverse|grep)\\b)\\s*",k:"split return print reverse grep",r:0,c:[c.HCM,e,{cN:"regexp",b:"(s|tr|y)/(\\\\.|[^/])*/(\\\\.|[^/])*/[a-z]*",r:10},{cN:"regexp",b:"(m|qr)?/",e:"/[a-z]*",c:[c.BE],r:0}]},{cN:"sub",bK:"sub",e:"(\\s*\\(.*?\\))?[;{]",r:5},{cN:"operator",b:"-\\w\\b",r:0}];f.c=b;g.c=b;return{aliases:["pl"],k:d,c:b}});hljs.registerLanguage("objectivec",function(a){var d={keyword:"int float while char export sizeof typedef const struct for union unsigned long volatile static bool mutable if do return goto void enum else break extern asm case short default double register explicit signed typename this switch continue wchar_t inline readonly assign readwrite self @synchronized id typeof nonatomic super unichar IBOutlet IBAction strong weak copy in out inout bycopy byref oneway __strong __weak __block __autoreleasing @private @protected @public @try @property @end @throw @catch @finally @autoreleasepool @synthesize @dynamic @selector @optional @required",literal:"false true FALSE TRUE nil YES NO NULL",built_in:"NSString NSDictionary CGRect CGPoint UIButton UILabel UITextView UIWebView MKMapView NSView NSViewController NSWindow NSWindowController NSSet NSUUID NSIndexSet UISegmentedControl NSObject UITableViewDelegate UITableViewDataSource NSThread UIActivityIndicator UITabbar UIToolBar UIBarButtonItem UIImageView NSAutoreleasePool UITableView BOOL NSInteger CGFloat NSException NSLog NSMutableString NSMutableArray NSMutableDictionary NSURL NSIndexPath CGSize UITableViewCell UIView UIViewController UINavigationBar UINavigationController UITabBarController UIPopoverController UIPopoverControllerDelegate UIImage NSNumber UISearchBar NSFetchedResultsController NSFetchedResultsChangeType UIScrollView UIScrollViewDelegate UIEdgeInsets UIColor UIFont UIApplication NSNotFound NSNotificationCenter NSNotification UILocalNotification NSBundle NSFileManager NSTimeInterval NSDate NSCalendar NSUserDefaults UIWindow NSRange NSArray NSError NSURLRequest NSURLConnection UIInterfaceOrientation MPMoviePlayerController dispatch_once_t dispatch_queue_t dispatch_sync dispatch_async dispatch_once"};var c=/[a-zA-Z@][a-zA-Z0-9_]*/;var b="@interface @class @protocol @implementation";return{aliases:["m","mm","objc","obj-c"],k:d,l:c,i:"</",c:[a.CLCM,a.CBCM,a.CNM,a.QSM,{cN:"string",v:[{b:'@"',e:'"',i:"\\n",c:[a.BE]},{b:"'",e:"[^\\\\]'",i:"[^\\\\][^']"}]},{cN:"preprocessor",b:"#",e:"$",c:[{cN:"title",v:[{b:'"',e:'"'},{b:"<",e:">"}]}]},{cN:"class",b:"("+b.split(" ").join("|")+")\\b",e:"({|$)",eE:true,k:b,l:c,c:[a.UTM]},{cN:"variable",b:"\\."+a.UIR,r:0}]}});hljs.registerLanguage("coffeescript",function(c){var b={keyword:"in if for while finally new do return else break catch instanceof throw try this switch continue typeof delete debugger super then unless until loop of by when and or is isnt not",literal:"true false null undefined yes no on off",reserved:"case default function var void with const let enum export import native __hasProp __extends __slice __bind __indexOf",built_in:"npm require console print module global window document"};var a="[A-Za-z$_][0-9A-Za-z$_]*";var f=c.inherit(c.TM,{b:a});var e={cN:"subst",b:/#\{/,e:/}/,k:b};var d=[c.BNM,c.inherit(c.CNM,{starts:{e:"(\\s*/)?",r:0}}),{cN:"string",v:[{b:/'''/,e:/'''/,c:[c.BE]},{b:/'/,e:/'/,c:[c.BE]},{b:/"""/,e:/"""/,c:[c.BE,e]},{b:/"/,e:/"/,c:[c.BE,e]}]},{cN:"regexp",v:[{b:"///",e:"///",c:[e,c.HCM]},{b:"//[gim]*",r:0},{b:"/\\S(\\\\.|[^\\n])*?/[gim]*(?=\\s|\\W|$)"}]},{cN:"property",b:"@"+a},{b:"`",e:"`",eB:true,eE:true,sL:"javascript"}];e.c=d;return{aliases:["coffee","cson","iced"],k:b,c:d.concat([{cN:"comment",b:"###",e:"###"},c.HCM,{cN:"function",b:"("+a+"\\s*=\\s*)?(\\(.*\\))?\\s*\\B[-=]>",e:"[-=]>",rB:true,c:[f,{cN:"params",b:"\\(",rB:true,c:[{b:/\(/,e:/\)/,k:b,c:["self"].concat(d)}]}]},{cN:"class",bK:"class",e:"$",i:/[:="\[\]]/,c:[{bK:"extends",eW:true,i:/[:="\[\]]/,c:[f]},f]},{cN:"attribute",b:a+":",e:":",rB:true,eE:true,r:0}])}});hljs.registerLanguage("nginx",function(c){var b={cN:"variable",v:[{b:/\$\d+/},{b:/\$\{/,e:/}/},{b:"[\\$\\@]"+c.UIR}]};var a={eW:true,l:"[a-z/_]+",k:{built_in:"on off yes no true false none blocked debug info notice warn error crit select break last permanent redirect kqueue rtsig epoll poll /dev/poll"},r:0,i:"=>",c:[c.HCM,{cN:"string",c:[c.BE,b],v:[{b:/"/,e:/"/},{b:/'/,e:/'/}]},{cN:"url",b:"([a-z]+):/",e:"\\s",eW:true,eE:true},{cN:"regexp",c:[c.BE,b],v:[{b:"\\s\\^",e:"\\s|{|;",rE:true},{b:"~\\*?\\s+",e:"\\s|{|;",rE:true},{b:"\\*(\\.[a-z\\-]+)+"},{b:"([a-z\\-]+\\.)+\\*"}]},{cN:"number",b:"\\b\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}(:\\d{1,5})?\\b"},{cN:"number",b:"\\b\\d+[kKmMgGdshdwy]*\\b",r:0},b]};return{aliases:["nginxconf"],c:[c.HCM,{b:c.UIR+"\\s",e:";|{",rB:true,c:[{cN:"title",b:c.UIR,starts:a}],r:0}],i:"[^\\s\\}]"}});hljs.registerLanguage("json",function(a){var e={literal:"true false null"};var d=[a.QSM,a.CNM];var c={cN:"value",e:",",eW:true,eE:true,c:d,k:e};var b={b:"{",e:"}",c:[{cN:"attribute",b:'\\s*"',e:'"\\s*:\\s*',eB:true,eE:true,c:[a.BE],i:"\\n",starts:c}],i:"\\S"};var f={b:"\\[",e:"\\]",c:[a.inherit(c,{cN:null})],i:"\\S"};d.splice(d.length,0,b,f);return{c:d,k:e,i:"\\S"}});hljs.registerLanguage("apache",function(a){var b={cN:"number",b:"[\\$%]\\d+"};return{aliases:["apacheconf"],cI:true,c:[a.HCM,{cN:"tag",b:"</?",e:">"},{cN:"keyword",b:/\w+/,r:0,k:{common:"order deny allow setenv rewriterule rewriteengine rewritecond documentroot sethandler errordocument loadmodule options header listen serverroot servername"},starts:{e:/$/,r:0,k:{literal:"on off all"},c:[{cN:"sqbracket",b:"\\s\\[",e:"\\]$"},{cN:"cbracket",b:"[\\$%]\\{",e:"\\}",c:["self",b]},b,a.QSM]}}],i:/\S/}});hljs.registerLanguage("cpp",function(a){var b={keyword:"false int float while private char catch export virtual operator sizeof dynamic_cast|10 typedef const_cast|10 const struct for static_cast|10 union namespace unsigned long throw volatile static protected bool template mutable if public friend do return goto auto void enum else break new extern using true class asm case typeid short reinterpret_cast|10 default double register explicit signed typename try this switch continue wchar_t inline delete alignof char16_t char32_t constexpr decltype noexcept nullptr static_assert thread_local restrict _Bool complex _Complex _Imaginary",built_in:"std string cin cout cerr clog stringstream istringstream ostringstream auto_ptr deque list queue stack vector map set bitset multiset multimap unordered_set unordered_map unordered_multiset unordered_multimap array shared_ptr abort abs acos asin atan2 atan calloc ceil cosh cos exit exp fabs floor fmod fprintf fputs free frexp fscanf isalnum isalpha iscntrl isdigit isgraph islower isprint ispunct isspace isupper isxdigit tolower toupper labs ldexp log10 log malloc memchr memcmp memcpy memset modf pow printf putchar puts scanf sinh sin snprintf sprintf sqrt sscanf strcat strchr strcmp strcpy strcspn strlen strncat strncmp strncpy strpbrk strrchr strspn strstr tanh tan vfprintf vprintf vsprintf"};return{aliases:["c","h","c++","h++"],k:b,i:"</",c:[a.CLCM,a.CBCM,a.QSM,{cN:"string",b:"'\\\\?.",e:"'",i:"."},{cN:"number",b:"\\b(\\d+(\\.\\d*)?|\\.\\d+)(u|U|l|L|ul|UL|f|F)"},a.CNM,{cN:"preprocessor",b:"#",e:"$",k:"if else elif endif define undef warning error line pragma",c:[{b:'include\\s*[<"]',e:'[>"]',k:"include",i:"\\n"},a.CLCM]},{cN:"stl_container",b:"\\b(deque|list|queue|stack|vector|map|set|bitset|multiset|multimap|unordered_map|unordered_set|unordered_multiset|unordered_multimap|array)\\s*<",e:">",k:b,c:["self"]},{b:a.IR+"::"}]}});hljs.registerLanguage("makefile",function(a){var b={cN:"variable",b:/\$\(/,e:/\)/,c:[a.BE]};return{aliases:["mk","mak"],c:[a.HCM,{b:/^\w+\s*\W*=/,rB:true,r:0,starts:{cN:"constant",e:/\s*\W*=/,eE:true,starts:{e:/$/,r:0,c:[b]}}},{cN:"title",b:/^[\w]+:\s*$/},{cN:"phony",b:/^\.PHONY:/,e:/$/,k:".PHONY",l:/[\.\w]+/},{b:/^\t+/,e:/$/,c:[a.QSM,b]}]}});
\ No newline at end of file
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/highlightjs/styles/default.css b/src/Wallabag/CoreBundle/Resources/views/default/public/highlightjs/styles/default.css
deleted file mode 100644
index e5bd2801..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/highlightjs/styles/default.css
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
-
-Original style from softwaremaniacs.org (c) Ivan Sagalaev <Maniac@SoftwareManiacs.Org>
-
-*/
-
-.hljs {
-  display: block;
-  overflow-x: auto;
-  padding: 0.5em;
-  background: #f0f0f0;
-}
-
-.hljs,
-.hljs-subst,
-.hljs-tag .hljs-title,
-.lisp .hljs-title,
-.clojure .hljs-built_in,
-.nginx .hljs-title {
-  color: black;
-}
-
-.hljs-string,
-.hljs-title,
-.hljs-constant,
-.hljs-parent,
-.hljs-tag .hljs-value,
-.hljs-rules .hljs-value,
-.hljs-preprocessor,
-.hljs-pragma,
-.haml .hljs-symbol,
-.ruby .hljs-symbol,
-.ruby .hljs-symbol .hljs-string,
-.hljs-template_tag,
-.django .hljs-variable,
-.smalltalk .hljs-class,
-.hljs-addition,
-.hljs-flow,
-.hljs-stream,
-.bash .hljs-variable,
-.apache .hljs-tag,
-.apache .hljs-cbracket,
-.tex .hljs-command,
-.tex .hljs-special,
-.erlang_repl .hljs-function_or_atom,
-.asciidoc .hljs-header,
-.markdown .hljs-header,
-.coffeescript .hljs-attribute {
-  color: #800;
-}
-
-.smartquote,
-.hljs-comment,
-.hljs-annotation,
-.hljs-template_comment,
-.diff .hljs-header,
-.hljs-chunk,
-.asciidoc .hljs-blockquote,
-.markdown .hljs-blockquote {
-  color: #888;
-}
-
-.hljs-number,
-.hljs-date,
-.hljs-regexp,
-.hljs-literal,
-.hljs-hexcolor,
-.smalltalk .hljs-symbol,
-.smalltalk .hljs-char,
-.go .hljs-constant,
-.hljs-change,
-.lasso .hljs-variable,
-.makefile .hljs-variable,
-.asciidoc .hljs-bullet,
-.markdown .hljs-bullet,
-.asciidoc .hljs-link_url,
-.markdown .hljs-link_url {
-  color: #080;
-}
-
-.hljs-label,
-.hljs-javadoc,
-.ruby .hljs-string,
-.hljs-decorator,
-.hljs-filter .hljs-argument,
-.hljs-localvars,
-.hljs-array,
-.hljs-attr_selector,
-.hljs-important,
-.hljs-pseudo,
-.hljs-pi,
-.haml .hljs-bullet,
-.hljs-doctype,
-.hljs-deletion,
-.hljs-envvar,
-.hljs-shebang,
-.apache .hljs-sqbracket,
-.nginx .hljs-built_in,
-.tex .hljs-formula,
-.erlang_repl .hljs-reserved,
-.hljs-prompt,
-.asciidoc .hljs-link_label,
-.markdown .hljs-link_label,
-.vhdl .hljs-attribute,
-.clojure .hljs-attribute,
-.asciidoc .hljs-attribute,
-.lasso .hljs-attribute,
-.coffeescript .hljs-property,
-.hljs-phony {
-  color: #88f;
-}
-
-.hljs-keyword,
-.hljs-id,
-.hljs-title,
-.hljs-built_in,
-.css .hljs-tag,
-.hljs-javadoctag,
-.hljs-phpdoc,
-.hljs-yardoctag,
-.smalltalk .hljs-class,
-.hljs-winutils,
-.bash .hljs-variable,
-.apache .hljs-tag,
-.go .hljs-typename,
-.tex .hljs-command,
-.asciidoc .hljs-strong,
-.markdown .hljs-strong,
-.hljs-request,
-.hljs-status {
-  font-weight: bold;
-}
-
-.asciidoc .hljs-emphasis,
-.markdown .hljs-emphasis {
-  font-style: italic;
-}
-
-.nginx .hljs-built_in {
-  font-weight: normal;
-}
-
-.coffeescript .javascript,
-.javascript .xml,
-.lasso .markup,
-.tex .hljs-formula,
-.xml .javascript,
-.xml .vbscript,
-.xml .css,
-.xml .hljs-cdata {
-  opacity: 0.5;
-}
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/highlightjs/styles/github.css b/src/Wallabag/CoreBundle/Resources/views/default/public/highlightjs/styles/github.css
deleted file mode 100644
index 47fc2651..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/highlightjs/styles/github.css
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
-
-github.com style (c) Vasily Polovnyov <vast@whiteants.net>
-
-*/
-
-.hljs {
-  display: block;
-  overflow-x: auto;
-  padding: 0.5em;
-  color: #333;
-  background: #f8f8f8;
-}
-
-.hljs-comment,
-.hljs-template_comment,
-.diff .hljs-header,
-.hljs-javadoc {
-  color: #998;
-  font-style: italic;
-}
-
-.hljs-keyword,
-.css .rule .hljs-keyword,
-.hljs-winutils,
-.javascript .hljs-title,
-.nginx .hljs-title,
-.hljs-subst,
-.hljs-request,
-.hljs-status {
-  color: #333;
-  font-weight: bold;
-}
-
-.hljs-number,
-.hljs-hexcolor,
-.ruby .hljs-constant {
-  color: #099;
-}
-
-.hljs-string,
-.hljs-tag .hljs-value,
-.hljs-phpdoc,
-.tex .hljs-formula {
-  color: #d14;
-}
-
-.hljs-title,
-.hljs-id,
-.coffeescript .hljs-params,
-.scss .hljs-preprocessor {
-  color: #900;
-  font-weight: bold;
-}
-
-.javascript .hljs-title,
-.lisp .hljs-title,
-.clojure .hljs-title,
-.hljs-subst {
-  font-weight: normal;
-}
-
-.hljs-class .hljs-title,
-.haskell .hljs-type,
-.vhdl .hljs-literal,
-.tex .hljs-command {
-  color: #458;
-  font-weight: bold;
-}
-
-.hljs-tag,
-.hljs-tag .hljs-title,
-.hljs-rules .hljs-property,
-.django .hljs-tag .hljs-keyword {
-  color: #000080;
-  font-weight: normal;
-}
-
-.hljs-attribute,
-.hljs-variable,
-.lisp .hljs-body {
-  color: #008080;
-}
-
-.hljs-regexp {
-  color: #009926;
-}
-
-.hljs-symbol,
-.ruby .hljs-symbol .hljs-string,
-.lisp .hljs-keyword,
-.tex .hljs-special,
-.hljs-prompt {
-  color: #990073;
-}
-
-.hljs-built_in,
-.lisp .hljs-title,
-.clojure .hljs-built_in {
-  color: #0086b3;
-}
-
-.hljs-preprocessor,
-.hljs-pragma,
-.hljs-pi,
-.hljs-doctype,
-.hljs-shebang,
-.hljs-cdata {
-  color: #999;
-  font-weight: bold;
-}
-
-.hljs-deletion {
-  background: #fdd;
-}
-
-.hljs-addition {
-  background: #dfd;
-}
-
-.diff .hljs-change {
-  background: #0086b3;
-}
-
-.hljs-chunk {
-  color: #aaa;
-}
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/highlightjs/styles/googlecode.css b/src/Wallabag/CoreBundle/Resources/views/default/public/highlightjs/styles/googlecode.css
deleted file mode 100644
index fd237367..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/highlightjs/styles/googlecode.css
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
-
-Google Code style (c) Aahan Krish <geekpanth3r@gmail.com>
-
-*/
-
-.hljs {
-  display: block;
-  overflow-x: auto;
-  padding: 0.5em;
-  background: white;
-  color: black;
-}
-
-.hljs-comment,
-.hljs-template_comment,
-.hljs-javadoc {
-  color: #800;
-}
-
-.hljs-keyword,
-.method,
-.hljs-list .hljs-title,
-.clojure .hljs-built_in,
-.nginx .hljs-title,
-.hljs-tag .hljs-title,
-.setting .hljs-value,
-.hljs-winutils,
-.tex .hljs-command,
-.http .hljs-title,
-.hljs-request,
-.hljs-status {
-  color: #008;
-}
-
-.hljs-envvar,
-.tex .hljs-special {
-  color: #660;
-}
-
-.hljs-string,
-.hljs-tag .hljs-value,
-.hljs-cdata,
-.hljs-filter .hljs-argument,
-.hljs-attr_selector,
-.apache .hljs-cbracket,
-.hljs-date,
-.hljs-regexp,
-.coffeescript .hljs-attribute {
-  color: #080;
-}
-
-.hljs-sub .hljs-identifier,
-.hljs-pi,
-.hljs-tag,
-.hljs-tag .hljs-keyword,
-.hljs-decorator,
-.ini .hljs-title,
-.hljs-shebang,
-.hljs-prompt,
-.hljs-hexcolor,
-.hljs-rules .hljs-value,
-.hljs-literal,
-.hljs-symbol,
-.ruby .hljs-symbol .hljs-string,
-.hljs-number,
-.css .hljs-function,
-.clojure .hljs-attribute {
-  color: #066;
-}
-
-.hljs-class .hljs-title,
-.haskell .hljs-type,
-.smalltalk .hljs-class,
-.hljs-javadoctag,
-.hljs-yardoctag,
-.hljs-phpdoc,
-.hljs-typename,
-.hljs-tag .hljs-attribute,
-.hljs-doctype,
-.hljs-class .hljs-id,
-.hljs-built_in,
-.setting,
-.hljs-params,
-.hljs-variable,
-.clojure .hljs-title {
-  color: #606;
-}
-
-.css .hljs-tag,
-.hljs-rules .hljs-property,
-.hljs-pseudo,
-.hljs-subst {
-  color: #000;
-}
-
-.css .hljs-class,
-.css .hljs-id {
-  color: #9b703f;
-}
-
-.hljs-value .hljs-important {
-  color: #ff7700;
-  font-weight: bold;
-}
-
-.hljs-rules .hljs-keyword {
-  color: #c5af75;
-}
-
-.hljs-annotation,
-.apache .hljs-sqbracket,
-.nginx .hljs-built_in {
-  color: #9b859d;
-}
-
-.hljs-preprocessor,
-.hljs-preprocessor *,
-.hljs-pragma {
-  color: #444;
-}
-
-.tex .hljs-formula {
-  background-color: #eee;
-  font-style: italic;
-}
-
-.diff .hljs-header,
-.hljs-chunk {
-  color: #808080;
-  font-weight: bold;
-}
-
-.diff .hljs-change {
-  background-color: #bccff9;
-}
-
-.hljs-addition {
-  background-color: #baeeba;
-}
-
-.hljs-deletion {
-  background-color: #ffc8bd;
-}
-
-.hljs-comment .hljs-yardoctag {
-  font-weight: bold;
-}
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/backtotop.png b/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/backtotop.png
deleted file mode 100644
index 051238ef..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/backtotop.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/bad-display.png b/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/bad-display.png
deleted file mode 100755
index 6866799f..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/bad-display.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/checkmark-off.png b/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/checkmark-off.png
deleted file mode 100644
index 3db5a06d..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/checkmark-off.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/checkmark-on.png b/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/checkmark-on.png
deleted file mode 100644
index cd3abb2c..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/checkmark-on.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/down.png b/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/down.png
deleted file mode 100644
index b9d536a7..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/down.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/envelop.png b/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/envelop.png
deleted file mode 100644
index 6be1c886..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/envelop.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/flattr.png b/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/flattr.png
deleted file mode 100755
index 0404aaea..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/flattr.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/left.png b/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/left.png
deleted file mode 100644
index a0a53631..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/left.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/link.png b/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/link.png
deleted file mode 100755
index db62819d..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/link.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/print.png b/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/print.png
deleted file mode 100755
index 83d6445b..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/print.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/remove.png b/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/remove.png
deleted file mode 100644
index f8ad56a3..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/remove.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/rss.png b/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/rss.png
deleted file mode 100644
index 21bad1a1..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/rss.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/shaarli.png b/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/shaarli.png
deleted file mode 100644
index 1eb30f60..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/shaarli.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/star-off.png b/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/star-off.png
deleted file mode 100644
index 6a0133a7..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/star-off.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/star-on.png b/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/star-on.png
deleted file mode 100644
index a9f96eaa..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/star-on.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/top.png b/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/top.png
deleted file mode 100644
index 954a8c0a..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/top.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/twitter.png b/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/twitter.png
deleted file mode 100644
index cfcfe419..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/twitter.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/img/logo.svg b/src/Wallabag/CoreBundle/Resources/views/default/public/img/logo.svg
deleted file mode 100644
index 865da440..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/img/logo.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="64" height="64">
-    <circle cx="32" cy="32" r="29.5" style="fill:#000" />
-    <path d="m 16,18 33,0 0,26 -16.5,6 -16.5,-6 z" fill="#fff" />
-    <rect width="9" height="2.5" x="17.5" y="24.5" fill="#000" />
-    <rect width="9" height="2.5" x="28" y="24.5" fill="#000" />
-    <rect width="9" height="2.5" x="38.5" y="24.5" fill="#000" />
-</svg>
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/img/messages/close.png b/src/Wallabag/CoreBundle/Resources/views/default/public/img/messages/close.png
deleted file mode 100644
index 731aa018..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/img/messages/close.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/img/messages/cross.png b/src/Wallabag/CoreBundle/Resources/views/default/public/img/messages/cross.png
deleted file mode 100644
index 1514d51a..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/img/messages/cross.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/img/messages/help.png b/src/Wallabag/CoreBundle/Resources/views/default/public/img/messages/help.png
deleted file mode 100644
index 5c870176..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/img/messages/help.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/img/messages/tick.png b/src/Wallabag/CoreBundle/Resources/views/default/public/img/messages/tick.png
deleted file mode 100644
index a9925a06..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/img/messages/tick.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/img/messages/warning.png b/src/Wallabag/CoreBundle/Resources/views/default/public/img/messages/warning.png
deleted file mode 100644
index 628cf2da..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/img/messages/warning.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/js/closeMessage.js b/src/Wallabag/CoreBundle/Resources/views/default/public/js/closeMessage.js
deleted file mode 100644
index b57fe4a8..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/js/closeMessage.js
+++ /dev/null
@@ -1,17 +0,0 @@
-$(function(){
-     //---------------------------------------------------------------------------
-     // Show the close icon when the user hover over a message 
-     //---------------------------------------------------------------------------
-     $('.messages').on('mouseenter', function(){
-          $(this).find('a.closeMessage').stop(true, true).show();
-     }).on('mouseleave', function(){
-          $(this).find('a.closeMessage').stop(true, true).hide();
-     });
-     //---------------------------------------------------------------------------
-     // Close the message box when the user clicks the close icon
-     //---------------------------------------------------------------------------
-     $('a.closeMessage').on('click', function(){
-          $(this).parents('div.messages').slideUp(300, function(){ $(this).remove(); });
-          return false;
-     });
-});
\ No newline at end of file
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/tags.twig b/src/Wallabag/CoreBundle/Resources/views/default/tags.twig
deleted file mode 100755
index 47359ed1..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/default/tags.twig
+++ /dev/null
@@ -1,18 +0,0 @@
-{% extends "layout.twig" %}
-{% block title %}tags{% endblock %}
-{% block menu %}
-{% include '_menu.twig' %}
-{% endblock %}
-{% block content %}
-  <div class="two-column">
-    {% for tag in tags %}
-      <a href="./?view=tag&amp;id={{ tag.id }}">{{ tag.value }}</a>  ({{ tag.entriescount }}) {% if token != '' %}<a href="?feed&amp;type=tag&amp;user_id={{ user_id }}&amp;tag_id={{ tag.id }}&amp;token={{ token }}" target="_blank"><img src="{{ poche_url }}themes/{{ theme }}/img/{{ theme }}/rss.png" /></a>{% endif %}
-      <br>
-
-      {% if loop.index  == '%d'|format(loop.length/2 + 0.5)  %}
-        </div><div class="two-column">
-      {% endif %}
-
-    {% endfor %}
-  </div>
-{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/theme.ini b/src/Wallabag/CoreBundle/Resources/views/default/theme.ini
deleted file mode 100644
index 9f3cfb6a..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/default/theme.ini
+++ /dev/null
@@ -1 +0,0 @@
-name = Default
\ No newline at end of file
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/view.twig b/src/Wallabag/CoreBundle/Resources/views/default/view.twig
deleted file mode 100755
index 154de1e4..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/default/view.twig
+++ /dev/null
@@ -1,124 +0,0 @@
-{% extends "layout.twig" %}
-{% block title %}{{ entry.title|raw }} ({{ entry.url | e | getDomain }}){% endblock %}
-{% block content %}
-                                {% include '_highlight.twig' %}
-        {% include '_pocheit-form.twig' %}
-        <div id="article_toolbar">
-            <ul>
-                <li><a href="./" title="{% trans "Return home" %}" class="tool back"><span>{% trans "Return home" %}</span></a></li>
-                <li><a href="#top" title="{% trans "Back to top" %}" class="tool top"><span>{% trans "Back to top" %}</span></a></li>
-                <li><a href="{{ entry.url|e }}" target="_blank" title="{% trans "original" %} : {{ entry.title|e }}" class="tool link"><span>{{ entry.url | e | getDomain }}</span></a></li>
-                <li><a title="{% trans "Mark as read" %}" class="tool {% if entry.is_read == 0 %}archive-off{% else %}archive{% endif %}" href="javascript: void(null);" id="markAsRead"><span>{% trans "Toggle mark as read" %}</span></a></li>
-                <li><a title="{% trans "Favorite" %}" class="tool {% if entry.is_fav == 0 %}fav-off{% else %}fav{% endif %}" href="javascript: void(null);" id="setFav"><span>{% trans "Toggle favorite" %}</span></a></li>
-                <li><a title="{% trans "Delete" %}" class="tool delete" href="./?action=delete&amp;id={{ entry.id|e }}"><span>{% trans "Delete" %}</span></a></li>
-                {% if constant('SHARE_TWITTER') == 1 %}<li><a href="https://twitter.com/home?status={{entry.title|url_encode}}%20{{ entry.url|url_encode }}%20via%20@wallabagapp" target="_blank" class="tool twitter" title="{% trans "Tweet" %}"><span>{% trans "Tweet" %}</span></a></li>{% endif %}
-                {% if constant('SHARE_MAIL') == 1 %}<li><a href="mailto:?subject={{ entry.title|url_encode }}&amp;body={{ entry.url|url_encode }}%20via%20@wallabagapp" class="tool email" title="{% trans "Email" %}"><span>{% trans "Email" %}</span></a></li>{% endif %}
-                {% if constant('SHARE_SHAARLI') == 1 %}<li><a href="{{ constant('SHAARLI_URL') }}/index.php?post={{ entry.url|url_encode }}&amp;title={{ entry.title|url_encode }}" target="_blank" class="tool shaarli" title="{% trans "shaarli" %}"><span>{% trans "shaarli" %}</span></a></li>{% endif %}
-                {% if constant('SHARE_DIASPORA') == 1 %}<li><a href="{{ constant('DIASPORA_URL') }}/bookmarklet?url={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}&notes=&v=1&noui=1&jump=doclose" target="_blank" class="tool diaspora" title="{% trans "diaspora" %}"><span>{% trans "diaspora" %}</span></a></li>{% endif %}
-                {% if constant('FLATTR') == 1 %}{% if flattr.status == constant('FLATTRABLE') %}<li><a href="http://flattr.com/submit/auto?url={{ entry.url }}" class="tool flattr" target="_blank" title="{% trans "flattr" %}"><span>{% trans "flattr" %}</span></a></li>{% elseif flattr.status == constant('FLATTRED') %}<li><a href="{{ flattr.flattrItemURL }}" class="tool flattr" target="_blank" title="{% trans "flattr" %}"><span>{% trans "flattr" %}</span>{{ flattr.numFlattrs }}</a></li>{% endif %}{% endif %}
-                {% if constant('CARROT') == 1 %}<li><a href="https://secure.carrot.org/GiveAndGetBack.do?url={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}" class="tool carrot icon" target="_blank" title="{% trans "carrot" %}"><span>{% trans "carrot" %}</span></a></li>{% endif %}
-                {% if constant('SHOW_PRINTLINK') == 1 %}<li><a title="{% trans "Print" %}" class="tool print" href="javascript: window.print();"><span>{% trans "Print" %}</span></a></li>{% endif %}
-                {% if constant('EPUB') == 1 %}<li><a href="./?epub&amp;method=id&amp;value={{ entry.id|e }}" title="Generate ePub file">EPUB</a></li>{% endif %}
-                {% if constant('MOBI') == 1 %}<li><a href="./?mobi&amp;method=id&amp;value={{ entry.id|e }}" title="Generate Mobi file">MOBI</a></li>{% endif %}
-                {% if constant('PDF') == 1 %}<li><a href="./?pdf&amp;method=id&amp;value={{ entry.id|e }}" title="Generate PDF file">PDF</a></li>{% endif %}
-                <li><a href="mailto:hello@wallabag.org?subject=Wrong%20display%20in%20wallabag&amp;body={{ entry.url|url_encode }}" title="{% trans "Does this article appear wrong?" %}" class="tool bad-display"><span>{% trans "Does this article appear wrong?" %}</span></a></li>
-                {% if constant('SHOW_READPERCENT') == 1 %}<li><div id="readLeftPercent">0%</div></li>{% endif %}
-            </ul>
-        </div>
-        <div id="article">
-            <header class="mbm">
-                <h1>{{ entry.title|raw }}</h1>
-            </header>
-            {% block tags %}
-              <aside class="tags">
-                  {% trans "tags:" %} {% for tag in tags %}<a href="./?view=tag&amp;id={{ tag.id }}">{{ tag.value }}</a> {% endfor %}<a href="./?view=edit-tags&amp;id={{ entry.id|e }}" title="{% trans "Edit tags" %}">✎</a>
-              </aside>
-            {% endblock %}
-            <article>
-                {{ content | raw }}
-            </article>
-            {{ block('tags') }}
-        </div>
-        <script src="{{ poche_url }}themes/_global/js/restoreScroll.js"></script>
-        <script type="text/javascript">
-        $(document).ready(function() {
-
-                        // toggle read property of current article
-                        $('#markAsRead').click(function(){
-                                $("body").css("cursor", "wait");
-                                            $.ajax( { url: './?action=toggle_archive&id={{ entry.id|e }}' }).done(
-                                            function( data ) {
-                                        if ( data == '1' ) {
-                                                if ( $('#markAsRead').hasClass("archive-off") ) {
-                                                        $('#markAsRead').removeClass("archive-off");
-                                                        $('#markAsRead').addClass("archive");
-                                                }
-                                                else {
-                                                        $('#markAsRead').removeClass("archive");
-                                                        $('#markAsRead').addClass("archive-off");
-                                                }
-                                        }
-                                        else {
-                                          alert('Error! Pls check if you are logged in.');
-                                        }
-                                      });
-                                            $("body").css("cursor", "auto");
-                                          });
-
-                                          // toggle favorite property of current article
-                        $('#setFav').click(function(){
-                                $("body").css("cursor", "wait");
-                                            $.ajax( { url: './?action=toggle_fav&id={{ entry.id|e }}' }).done(
-                                            function( data ) {
-                                        if ( data == '1' ) {
-                                                if ( $('#setFav').hasClass("fav-off") ) {
-                                                        $('#setFav').removeClass("fav-off");
-                                                        $('#setFav').addClass("fav");
-                                                }
-                                                else {
-                                                        $('#setFav').removeClass("fav");
-                                                        $('#setFav').addClass("fav-off");
-                                                }
-                                        }
-                                        else {
-                                          alert('Error! Pls check if you are logged in.');
-                                        }
-                                      });
-                                            $("body").css("cursor", "auto");
-                                          });
-
-                                                // set percent of read on startup
-                        if ( $(document).height() <= $(window).innerHeight() ) {
-                          pp = 100;
-                        }
-                        else {
-                                pp = 0;
-                        }
-                        $('#readLeftPercent').text( pp + '%' );
-
-
-            $(window).scroll(function(e){
-                var scrollTop = $(window).scrollTop();
-                var docHeight = $(document).height();
-                var scrollPercent = (scrollTop) / (docHeight);
-                var scrollPercentRounded = Math.round(scrollPercent*100)/100;
-                savePercent({{ entry.id|e }}, scrollPercentRounded);
-
-                // change percent of read on scroll
-                pp = Math.round(scrollTop * 100 / ( docHeight - $(window).innerHeight() ));
-                $('#readLeftPercent').text( pp + '%' );
-            });
-
-            retrievePercent({{ entry.id|e }});
-
-            $(window).resize(function(){
-                retrievePercent({{ entry.id|e }});
-            });
-
-            // Hide useless "back to top" link when there is no scrollbar
-            if ($("body").height() <= $(window).height()) {
-                $('#article_toolbar .tool.top').parent().hide();
-            }
-        });
-        </script>
-{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/dmagenta/README.md b/src/Wallabag/CoreBundle/Resources/views/dmagenta/README.md
deleted file mode 100644
index 6abc37e3..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/dmagenta/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# dmagenta (dark magenta) theme
-
-theme created by Nicolas Lœuillet aka nico_somb
\ No newline at end of file
diff --git a/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/css/style-dmagenta.css b/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/css/style-dmagenta.css
deleted file mode 100644
index 4dc592d2..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/css/style-dmagenta.css
+++ /dev/null
@@ -1,78 +0,0 @@
-body {
-    color: #d4d4d4;
-    background-color: #372d37;
-}
-
-a,
-a:hover,
-a:visited {
-    color: #8d748d;
-}
-
-a.back span {
-    background-image: url('../img/dmagenta/left.png');
-}
-
-a.top span {
-    background-image: url('../img/dmagenta/top.png');
-}
-
-a.fav span,
-a.fav-off span:hover {
-    background-image: url('../img/dmagenta/star-on.png');
-}
-
-a.fav span:hover,
-a.fav-off span {
-    background-image: url('../img/dmagenta/star-off.png');
-}
-
-a.archive span,
-a.archive-off span:hover {
-    background-image: url('../img/dmagenta/checkmark-on.png');
-}
-
-a.archive span:hover,
-a.archive-off span {
-    background-image: url('../img/dmagenta/checkmark-off.png');
-}
-
-a.twitter span {
-    background-image: url('../img/dmagenta/twitter.png');
-}
-
-a.flattr span {
-    background-image: url('../img/dmagenta/flattr.png');
-}
-
-a.shaarli span {
-    background-image: url('../img/dmagenta/shaarli.png');
-}
-
-a.email span {
-    background-image: url('../img/dmagenta/envelop.png');
-}
-
-a.delete span {
-    background-image: url('../img/dmagenta/remove.png');
-}
-
-a.link span {
-    background-image: url('../img/dmagenta/link.png');
-}
-
-a.bad-display span {
-    background-image: url('../img/dmagenta/bad-display.png');
-}
-
-.pagination a {
-    color: #aaa;
-}
-
-#main #links li .current {
-    background-color: #2d372d;
-}
-
-#article_toolbar {
-    background: #372d37;
-}
\ No newline at end of file
diff --git a/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/backtotop.png b/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/backtotop.png
deleted file mode 100755
index 051238ef..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/backtotop.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/bad-display.png b/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/bad-display.png
deleted file mode 100755
index 6866799f..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/bad-display.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/checkmark-off.png b/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/checkmark-off.png
deleted file mode 100644
index 3db5a06d..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/checkmark-off.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/checkmark-on.png b/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/checkmark-on.png
deleted file mode 100644
index cd3abb2c..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/checkmark-on.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/down.png b/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/down.png
deleted file mode 100644
index b9d536a7..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/down.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/envelop.png b/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/envelop.png
deleted file mode 100644
index 6be1c886..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/envelop.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/flattr.png b/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/flattr.png
deleted file mode 100755
index 0404aaea..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/flattr.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/left.png b/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/left.png
deleted file mode 100644
index a0a53631..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/left.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/link.png b/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/link.png
deleted file mode 100755
index db62819d..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/link.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/remove.png b/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/remove.png
deleted file mode 100644
index f8ad56a3..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/remove.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/rss.png b/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/rss.png
deleted file mode 100644
index 21bad1a1..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/rss.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/shaarli.png b/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/shaarli.png
deleted file mode 100644
index 1eb30f60..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/shaarli.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/star-off.png b/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/star-off.png
deleted file mode 100644
index 6a0133a7..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/star-off.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/star-on.png b/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/star-on.png
deleted file mode 100644
index a9f96eaa..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/star-on.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/top.png b/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/top.png
deleted file mode 100644
index 954a8c0a..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/top.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/twitter.png b/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/twitter.png
deleted file mode 100644
index cfcfe419..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/twitter.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/dmagenta/screenshot.jpg b/src/Wallabag/CoreBundle/Resources/views/dmagenta/screenshot.jpg
deleted file mode 100644
index ab8f1ec2..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/dmagenta/screenshot.jpg
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/dmagenta/theme.ini b/src/Wallabag/CoreBundle/Resources/views/dmagenta/theme.ini
deleted file mode 100644
index 78fa3a9c..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/dmagenta/theme.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-name = Dmagenta
-requirements[] = default
diff --git a/src/Wallabag/CoreBundle/Resources/views/layout-login.html.twig b/src/Wallabag/CoreBundle/Resources/views/layout-login.html.twig
deleted file mode 100644
index d1aacc47..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/layout-login.html.twig
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE html>
-<!--[if lte IE 6]><html class="no-js ie6 ie67 ie678" lang="en"><![endif]-->
-<!--[if lte IE 7]><html class="no-js ie7 ie67 ie678" lang="en"><![endif]-->
-<!--[if IE 8]><html class="no-js ie8 ie678" lang="en"><![endif]-->
-<!--[if gt IE 8]><html class="no-js" lang="en"><![endif]-->
-<html lang="en">
-    <head>
-        <meta name="viewport" content="initial-scale=1.0">
-        <meta charset="utf-8">
-        <!--[if IE]>
-        <meta http-equiv="X-UA-Compatible" content="IE=10">
-        <![endif]-->
-        <title>{% block title %}{% endblock %} - wallabag</title>
-        {% include "WallabagCoreBundle::_head.html.twig" %}
-    </head>
-    <body class="login">
-        {% include "WallabagCoreBundle::_top.html.twig" %}
-        <div id="main">
-            {% block menu %}{% endblock %}
-            <div id="content" class="w600p center">
-            {% block content %}{% endblock %}
-            </div>
-        </div>
-        {% include "WallabagCoreBundle::_footer.html.twig" %}
-    </body>
-</html>
diff --git a/src/Wallabag/CoreBundle/Resources/views/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/layout.html.twig
deleted file mode 100644
index e9ccc58c..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/layout.html.twig
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE html>
-<!--[if lte IE 6]><html class="no-js ie6 ie67 ie678" lang="en"><![endif]-->
-<!--[if lte IE 7]><html class="no-js ie7 ie67 ie678" lang="en"><![endif]-->
-<!--[if IE 8]><html class="no-js ie8 ie678" lang="en"><![endif]-->
-<!--[if gt IE 8]><html class="no-js" lang="en"><![endif]-->
-<html lang="en">
-    <head>
-        <meta name="viewport" content="initial-scale=1.0">
-        <meta charset="utf-8">
-        <!--[if IE]>
-        <meta http-equiv="X-UA-Compatible" content="IE=10">
-        <![endif]-->
-        <title>{% block title %}{% endblock %} - wallabag</title>
-        {% include "WallabagCoreBundle::_head.html.twig" %}
-    </head>
-    <body>
-    {% include "WallabagCoreBundle::_top.html.twig" %}
-    <div id="main">
-        {% block menu %}{% endblock %}
-        {% block precontent %}{% endblock %}
-        {% for flashMessage in app.session.flashbag.get('notice') %}
-            <div class="flash-notice">
-                {{ flashMessage }}
-            </div>
-        {% endfor %}
-        <div id="content" class="w600p center">
-            {% block content %}{% endblock %}
-        </div>
-    </div>
-    {% include "WallabagCoreBundle::_footer.html.twig" %}
-    </body>
-</html>
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/README.md b/src/Wallabag/CoreBundle/Resources/views/solarized-dark/README.md
deleted file mode 100644
index 81be1f8c..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/README.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# solarized-dark (Solarized Dark) theme
-
-
-Theme created by NumEricR
-
-http://github.com/NumEricR/poche-themes
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/Solarized-LICENSE.txt b/src/Wallabag/CoreBundle/Resources/views/solarized-dark/Solarized-LICENSE.txt
deleted file mode 100644
index a842f663..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/Solarized-LICENSE.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2011 Ethan Schoonover
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/css/style-solarized-dark.css b/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/css/style-solarized-dark.css
deleted file mode 100644
index 77a97d38..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/css/style-solarized-dark.css
+++ /dev/null
@@ -1,232 +0,0 @@
-/*
- * Solarized Dark - by NumEricR
- * http://github.com/NumEricR/poche-themes
- * ==================================================
- *
- * Based on Solarized's palette - (c) 2011 Ethan Schoonover
- * See http://ethanschoonover.com/solarized#usage-development
- * See http://ethanschoonover.com/solarized#the-values
- *
- * Background:              #002b36     base 03
- * Highlight:               #073642     base 02
- * Primary content:         #839496     base 0
- * Intermediate:            #657b83     base 00
- * Emphasized content:      #93a1a1     base 1
- * Secondary content:       #586e75     base 01
- * Green:                   #859900
- * Orange:                  #cb4b16
- * Red:                     #dc322f
- * Blue:                    #268bd2
- *
- * ================================================== */
-
-/* Background */
-
-body,
-#article_toolbar {
-    background-color: #002b36;
-}
-
-/* Highlight */
-/* 2 different selectors for selection pseudo-elmt */
-/* See https://developer.mozilla.org/en-US/docs/Web/CSS/::selection */
-::-moz-selection {
-    background-color: #073642;
-}
-::selection {
-    background-color: #073642;
-}
-
-/* Primary content */
-
-body,
-a,
-a:hover,
-a:visited,
-td {
-    color: #839496;
-}
-
-/* Secondary content */
-
-.tools p,
-.vieworiginal a,
-.vieworiginal a:hover,
-.vieworiginal a:visited {
-    color: #586e75;
-}
-
-#main #content .entrie,
-#article header,
-#article article {
-    border-bottom-color: #586e75;
-}
-
-/* Emphasized content */
-
-.entrie h2 a:hover,
-footer,
-footer a {
-    color: #93a1a1;
-}
-
-/* Colored content */
-
-#main .messages.success,
-#main .messages.warning,
-#main .messages.error,
-#main .messages.information,
-#main .messages.info {
-    background-color: #073642;
-}
-
-#main .messages.success {
-    border-color: #859900;
-}
-
-#main .messages.success p {
-    color: #859900 !important; /* Overwrites !important used on messages.css */
-}
-
-#main .messages.warning {
-    border-color: #cb4b16;
-}
-
-#main .messages.warning p {
-    color: #cb4b16;
-}
-
-#main .messages.error {
-    border-color: #dc322f;
-}
-
-#main .messages.error p {
-    color: #dc322f !important; /* Overwrites !important used on messages.css */
-}
-
-#main .messages.information,
-#main .messages.info {
-    border-color: #268bd2;
-}
-
-#main .messages.information p,
-#main .messages.info p {
-    color: #268bd2;
-}
-
-/* Miscellaneous */
-
-.bouton,
-.bouton:hover,
-#main #links li a.current,
-#links a:hover,
-.pagination span.current,
-.pagination a:hover,
-.pagination a:active {
-    color: #002b36;
-    background-color: #586e75;
-}
-
-.bouton:hover {
-    background-color: #657b83;
-}
-
-#login,
-#password,
-#password_repeat,
-#bookmarklet,
-.top_link {
-    background-color: #073642;
-}
-
-#login,
-#password,
-#password_repeat,
-#bookmarklet {
-    padding: 5px;
-    border: 1px solid #586e75;
-    color: #839496;
-}
-
-#bookmarklet {
-    border-style: dashed;
-}
-
-.pagination a {
-    border-color: #586e75;
-    color: #586e75;
-}
-
-.pagination span.current {
-    border-color: #073642;
-}
-
-/* Images */
-
-a.back span {
-    background-image: url('../img/solarized-dark/left.png');
-}
-
-a.top span {
-    background-image: url('../img/solarized-dark/top.png');
-}
-
-a.fav span,
-a.fav-off span:hover {
-    background-image: url('../img/solarized-dark/star-on.png');
-}
-
-a.fav span:hover,
-a.fav-off span {
-    background-image: url('../img/solarized-dark/star-off.png');
-}
-
-a.archive span,
-a.archive-off span:hover {
-    background-image: url('../img/solarized-dark/checkmark-on.png');
-}
-
-a.archive span:hover,
-a.archive-off span {
-    background-image: url('../img/solarized-dark/checkmark-off.png');
-}
-
-a.twitter span {
-    background-image: url('../img/solarized-dark/twitter.png');
-}
-
-a.flattr span {
-    background-image: url('../img/solarized-dark/flattr.png');
-}
-
-a.shaarli span {
-    background-image: url('../img/solarized-dark/shaarli.png');
-}
-
-a.email span {
-    background-image: url('../img/solarized-dark/envelop.png');
-}
-
-a.delete span {
-    background-image: url('../img/solarized-dark/remove.png');
-}
-
-a.link span {
-    background-image: url('../img/solarized-dark/link.png');
-}
-
-a.bad-display span {
-    background-image: url('../img/solarized-dark/bad-display.png');
-}
-
-.arrow-down {
-    width: 0px;
-    height: 0px;
-    border-style: solid;
-    border-width: 10px 10px 0 10px;
-    border-color: #586E75 transparent transparent transparent;
-
-    position: absolute;
-    margin-top: 1.5em;
-    margin-left: -30px;
-}
\ No newline at end of file
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/backtotop.png b/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/backtotop.png
deleted file mode 100644
index 1501c2a5..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/backtotop.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/bad-display.png b/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/bad-display.png
deleted file mode 100644
index b2c3ca17..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/bad-display.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/checkmark-off.png b/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/checkmark-off.png
deleted file mode 100644
index fd7d92fa..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/checkmark-off.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/checkmark-on.png b/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/checkmark-on.png
deleted file mode 100644
index 592965dd..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/checkmark-on.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/down.png b/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/down.png
deleted file mode 100644
index 5de30315..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/down.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/envelop.png b/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/envelop.png
deleted file mode 100644
index d3468885..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/envelop.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/flattr.png b/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/flattr.png
deleted file mode 100644
index 73e3f421..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/flattr.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/left.png b/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/left.png
deleted file mode 100644
index a953d831..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/left.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/link.png b/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/link.png
deleted file mode 100644
index 5e859a0e..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/link.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/remove.png b/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/remove.png
deleted file mode 100644
index 66a5c1ab..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/remove.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/rss.png b/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/rss.png
deleted file mode 100644
index 21bad1a1..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/rss.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/shaarli.png b/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/shaarli.png
deleted file mode 100644
index 1eb30f60..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/shaarli.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/star-off.png b/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/star-off.png
deleted file mode 100644
index 1c603ecc..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/star-off.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/star-on.png b/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/star-on.png
deleted file mode 100644
index bc37772a..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/star-on.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/top.png b/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/top.png
deleted file mode 100644
index b3f44f31..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/top.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/twitter.png b/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/twitter.png
deleted file mode 100644
index c4a25334..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/twitter.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/screenshot.jpg b/src/Wallabag/CoreBundle/Resources/views/solarized-dark/screenshot.jpg
deleted file mode 100644
index 2ad87943..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/screenshot.jpg
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/theme.ini b/src/Wallabag/CoreBundle/Resources/views/solarized-dark/theme.ini
deleted file mode 100644
index c9948146..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/theme.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-name = Solarized Dark
-requirements[] = default
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized/README.md b/src/Wallabag/CoreBundle/Resources/views/solarized/README.md
deleted file mode 100644
index 255e3cdd..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/solarized/README.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# solarized (Solarized) theme
-
-
-Theme created by NumEricR
-
-http://github.com/NumEricR/poche-themes
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized/Solarized-LICENSE.txt b/src/Wallabag/CoreBundle/Resources/views/solarized/Solarized-LICENSE.txt
deleted file mode 100644
index a842f663..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/solarized/Solarized-LICENSE.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2011 Ethan Schoonover
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized/public/css/style-solarized.css b/src/Wallabag/CoreBundle/Resources/views/solarized/public/css/style-solarized.css
deleted file mode 100644
index cf16338f..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/solarized/public/css/style-solarized.css
+++ /dev/null
@@ -1,232 +0,0 @@
-/*
- * Solarized - by NumEricR
- * http://github.com/NumEricR/poche-themes
- * ==================================================
- *
- * Based on Solarized's palette - (c) 2011 Ethan Schoonover
- * See http://ethanschoonover.com/solarized#usage-development
- * See http://ethanschoonover.com/solarized#the-values
- *
- * Background:              #fdf6e3     base 3
- * Highlight:               #eee8d5     base 2
- * Primary content:         #657b83     base 00
- * Intermediate:            #839496     base 0
- * Emphasized content:      #586e75     base 01
- * Secondary content:       #93a1a1     base 1
- * Green:                   #859900
- * Orange:                  #cb4b16
- * Red:                     #dc322f
- * Blue:                    #268bd2
- *
- * ================================================== */
-
-/* Background */
-
-body,
-#article_toolbar {
-    background-color: #fdf6e3;
-}
-
-/* Highlight */
-/* 2 different selectors for selection pseudo-elmt */
-/* See https://developer.mozilla.org/en-US/docs/Web/CSS/::selection */
-::-moz-selection {
-    background-color: #eee8d5;
-}
-::selection {
-    background-color: #eee8d5;
-}
-
-/* Primary content */
-
-body,
-a,
-a:hover,
-a:visited,
-td {
-    color: #657b83;
-}
-
-/* Secondary content */
-
-.tools p,
-.vieworiginal a,
-.vieworiginal a:hover,
-.vieworiginal a:visited {
-    color: #93a1a1;
-}
-
-#main #content .entrie,
-#article header,
-#article article {
-    border-bottom-color: #93a1a1;
-}
-
-/* Emphasized content */
-
-.entrie h2 a:hover,
-footer,
-footer a {
-    color: #586e75;
-}
-
-/* Colored content */
-
-#main .messages.success,
-#main .messages.warning,
-#main .messages.error,
-#main .messages.information,
-#main .messages.info {
-    background-color: #eee8d5;
-}
-
-#main .messages.success {
-    border-color: #859900;
-}
-
-#main .messages.success p {
-    color: #859900 !important; /* Overwrites !important used on messages.css */
-}
-
-#main .messages.warning {
-    border-color: #cb4b16;
-}
-
-#main .messages.warning p {
-    color: #cb4b16;
-}
-
-#main .messages.error {
-    border-color: #dc322f;
-}
-
-#main .messages.error p {
-    color: #dc322f !important; /* Overwrites !important used on messages.css */
-}
-
-#main .messages.information,
-#main .messages.info {
-    border-color: #268bd2;
-}
-
-#main .messages.information p,
-#main .messages.info p {
-    color: #268bd2;
-}
-
-/* Miscellaneous */
-
-.bouton,
-.bouton:hover,
-#main #links li a.current,
-#links a:hover,
-.pagination span.current,
-.pagination a:hover,
-.pagination a:active {
-    color: #fdf6e3;
-    background-color: #93a1a1;
-}
-
-.bouton:hover {
-    background-color: #657b83;
-}
-
-#login,
-#password,
-#password_repeat,
-#bookmarklet,
-.top_link {
-    background-color: #eee8d5;
-}
-
-#login,
-#password,
-#password_repeat,
-#bookmarklet {
-    padding: 5px;
-    border: 1px solid #93a1a1;
-    color: #657b83;
-}
-
-#bookmarklet {
-    border-style: dashed;
-}
-
-.pagination a {
-    border-color: #93a1a1;
-    color: #93a1a1;
-}
-
-.pagination span.current {
-    border-color: #eee8d5;
-}
-
-/* Images */
-
-a.back span {
-    background-image: url('../img/solarized/left.png');
-}
-
-a.top span {
-    background-image: url('../img/solarized/top.png');
-}
-
-a.fav span,
-a.fav-off span:hover {
-    background-image: url('../img/solarized/star-on.png');
-}
-
-a.fav span:hover,
-a.fav-off span {
-    background-image: url('../img/solarized/star-off.png');
-}
-
-a.archive span,
-a.archive-off span:hover {
-    background-image: url('../img/solarized/checkmark-on.png');
-}
-
-a.archive span:hover,
-a.archive-off span {
-    background-image: url('../img/solarized/checkmark-off.png');
-}
-
-a.twitter span {
-    background-image: url('../img/solarized/twitter.png');
-}
-
-a.shaarli span {
-    background-image: url('../img/solarized/shaarli.png');
-}
-
-a.flattr span {
-    background-image: url('../img/solarized/flattr.png');
-}
-
-a.email span {
-    background-image: url('../img/solarized/envelop.png');
-}
-
-a.delete span {
-    background-image: url('../img/solarized/remove.png');
-}
-
-a.link span {
-    background-image: url('../img/solarized/link.png');
-}
-
-a.bad-display span {
-    background-image: url('../img/solarized/bad-display.png');
-}
-
-.arrow-down {
-    width: 0px;
-    height: 0px;
-    border-style: solid;
-    border-width: 10px 10px 0 10px;
-    border-color: #93A1A1 transparent transparent transparent;
-
-    position: absolute;
-    margin-top: 1.5em;
-    margin-left: -30px;
-}
\ No newline at end of file
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/backtotop.png b/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/backtotop.png
deleted file mode 100644
index a3e52318..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/backtotop.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/bad-display.png b/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/bad-display.png
deleted file mode 100644
index ae99ab37..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/bad-display.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/checkmark-off.png b/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/checkmark-off.png
deleted file mode 100644
index 20cd26b3..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/checkmark-off.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/checkmark-on.png b/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/checkmark-on.png
deleted file mode 100644
index 87a2b799..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/checkmark-on.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/down.png b/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/down.png
deleted file mode 100644
index 622ff87b..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/down.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/envelop.png b/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/envelop.png
deleted file mode 100644
index 1caf7d43..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/envelop.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/flattr.png b/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/flattr.png
deleted file mode 100644
index 18e00f86..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/flattr.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/left.png b/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/left.png
deleted file mode 100644
index 9780faee..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/left.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/link.png b/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/link.png
deleted file mode 100644
index d0e12862..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/link.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/remove.png b/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/remove.png
deleted file mode 100644
index d5113d17..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/remove.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/rss.png b/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/rss.png
deleted file mode 100644
index 21bad1a1..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/rss.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/shaarli.png b/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/shaarli.png
deleted file mode 100644
index 1eb30f60..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/shaarli.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/star-off.png b/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/star-off.png
deleted file mode 100644
index afd7d80c..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/star-off.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/star-on.png b/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/star-on.png
deleted file mode 100644
index 3a772512..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/star-on.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/top.png b/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/top.png
deleted file mode 100644
index d20001a4..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/top.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/twitter.png b/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/twitter.png
deleted file mode 100644
index 109d7151..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/twitter.png
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized/screenshot.jpg b/src/Wallabag/CoreBundle/Resources/views/solarized/screenshot.jpg
deleted file mode 100644
index 07d402e3..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/solarized/screenshot.jpg
+++ /dev/null
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized/theme.ini b/src/Wallabag/CoreBundle/Resources/views/solarized/theme.ini
deleted file mode 100644
index 703997b9..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/solarized/theme.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-name = Solarized
-requirements[] = default
diff --git a/src/Wallabag/CoreBundle/Resources/views/_global/public/css/jquery-ui-1.10.4.custom.css b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/css/jquery-ui-1.10.4.custom.css
index 5690172f..5690172f 100644
--- a/src/Wallabag/CoreBundle/Resources/views/_global/public/css/jquery-ui-1.10.4.custom.css
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/css/jquery-ui-1.10.4.custom.css
diff --git a/src/Wallabag/CoreBundle/Resources/views/_global/public/css/jquery-ui-1.10.4.custom.min.css b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/css/jquery-ui-1.10.4.custom.min.css
index 4dba92a8..4dba92a8 100644
--- a/src/Wallabag/CoreBundle/Resources/views/_global/public/css/jquery-ui-1.10.4.custom.min.css
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/css/jquery-ui-1.10.4.custom.min.css
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/css/knacss.css b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/css/knacss.css
index ca0696b7..9e68300a 100644
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/css/knacss.css
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/css/knacss.css
@@ -1 +1 @@
-html{font-size:62.5%}body{font-family:"Century Gothic",helvetica,arial,sans-serif;font-size:1.4em;line-height:1.5;color:#000;background-color:#FFF}p,ul,ol,dl,blockquote,pre,td,th,label,textarea,caption,details,figure,hgroup{margin:.75em 0 0;font-size:1em;line-height:1.5}h1,.h1-like{margin:.8077em 0 0 0;font-size:1.8571em;font-weight:normal;line-height:1.6154em}h2,.h2-like{margin:.875em 0 0 0;font-size:1.7143em;font-weight:normal;line-height:1.75em}h3,.h3-like{margin:.9545em 0 0 0;font-size:1.5714em;font-weight:normal;line-height:1.909em}h4,.h4-like{margin:1.05em 0 0 0;font-size:1.4286em;font-weight:normal;line-height:1.05em}h5,.h5-like{margin:1.1667em 0 0 0;font-size:1.2857em;font-weight:normal;line-height:1.1667em}h6,.h6-like{margin:1.3125em 0 0 0;font-size:1.1429em;font-weight:normal;line-height:1.3125em}.smaller{font-size:.7143em}.small{font-size:.8571em}.big{font-size:1.1429em}.bigger{font-size:1.2857em}.biggest{font-size:1.4286em}html,body,textarea,figure,label{margin:0;padding:0}ul,ol{padding-left:2em}code,pre,samp,kbd{font-family:consolas,'DejaVu Sans Mono',courier,monospace;line-height:1em;white-space:pre-wrap}code,kbd,mark{border-radius:2px}em{font-style:italic}strong{font-weight:bold}kbd{padding:0 2px;border:1px solid #999}code{padding:2px 4px;color:#B11;background:rgba(0,0,0,.04)}mark{padding:2px 4px;background:#FF0}table{margin-bottom:1.5em}p:first-child,ul:first-child,ol:first-child,dl:first-child,blockquote:first-child,pre:first-child,h1:first-child,h2:first-child,h3:first-child,h4:first-child,h5:first-child,h6:first-child{margin-top:0}li p,li ul,li ol{margin-top:0;margin-bottom:0}img,table,td,blockquote,code,pre,textarea,input,video{max-width:100%}div,textarea,table,td,th,code,pre,samp{word-wrap:break-word;-webkit-hyphens:auto;-moz-hyphens:auto;-ms-hyphens:auto;-o-hyphens:auto;hyphens:auto}img{height:auto;vertical-align:middle}#map_canvas img,.gmnoprint img{max-width:none}a img{border:0}body > script{display:none !important}.skip-links{position:absolute}.skip-links a{position:absolute;left:-7000px;padding:.5em;text-decoration:none;color:#FFF;background:#000}.skip-links a:focus{position:static}*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.mod,.item{overflow:hidden}.row{display:table;width:100%;table-layout:fixed}.row > *,.col{display:table-cell;vertical-align:top}.clear,.line,.row{clear:both}.clearfix:after,.line:after,.mod:after{content:"";display:table;clear:both}.left{float:left}img.left{margin-right:1em}.right{float:right}img.right{margin-left:1em}img.left,img.right{margin-bottom:5px}.center{margin-right:auto;margin-left:auto}.txtleft{text-align:left}.txtright{text-align:right}.txtcenter{text-align:center}.inbl{display:inline-block;margin-right:-.25em;vertical-align:top}.w10{width:10%}.w20{width:20%}.w25{width:25%}.w30{width:30%}.w33{width:33.333%}.w40{width:40%}.w50{width:50%}.w60{width:60%}.w66{width:66.666%}.w70{width:70%}.w75{width:75%}.w80{width:80%}.w90{width:90%}.w100{width:100%}.w50p{width:50px}.w100p{width:100px}.w150p{width:150px}.w200p{width:200px}.w300p{width:300px}.w400p{width:400px}.w500p{width:500px}.w600p{width:600px}.w700p{width:700px}.w800p{width:800px}.w960p{width:960px}.mw960p{max-width:960px}.m-reset,.ma0{margin:0 !important}.p-reset,.pa0{padding:0 !important}.ma1,.mas{margin:10px !important}.ma2,.mam{margin:20px !important}.ma3,.mal{margin:30px !important}.pa1,.pas{padding:10px}.pa2,.pam{padding:20px}.pa3,.pal{padding:30px}.mt0,.mtn{margin-top:0 !important}.mt1,.mts{margin-top:10px !important}.mt2,.mtm{margin-top:20px !important}.mt3,.mtl{margin-top:30px !important}.mr0,.mrn{margin-right:0}.mr1,.mrs{margin-right:10px}.mr2,.mrm{margin-right:20px}.mr3,.mrl{margin-right:30px}.mb0,.mbn{margin-bottom:0 !important}.mb1,.mbs{margin-bottom:10px !important}.mb2,.mbm{margin-bottom:20px !important}.mb3,.mbl{margin-bottom:30px !important}.ml0,.mln{margin-left:0}.ml1,.mls{margin-left:10px}.ml2,.mlm{margin-left:20px}.ml3,.mll{margin-left:30px}.pt0,.ptn{padding-top:0}.pt1,.pts{padding-top:10px}.pt2,.ptm{padding-top:20px}.pt3,.ptl{padding-top:30px}.pr0,.prn{padding-right:0}.pr1,.prs{padding-right:10px}.pr2,.prm{padding-right:20px}.pr3,.prl{padding-right:30px}.pb0,.pbn{padding-bottom:0}.pb1,.pbs{padding-bottom:10px}.pb2,.pbm{padding-bottom:20px}.pb3,.pbl{padding-bottom:30px}.pl0,.pln{padding-left:0}.pl1,.pls{padding-left:10px}.pl2,.plm{padding-left:20px}.pl3,.pll{padding-left:30px}.visually-hidden{position:absolute;left:-7000px;overflow:hidden}[dir=rtl] .visually-hidden{right:-7000px;left:auto}.desktop-hidden{display:none}form,fieldset{border:none}input,button,select,label,.btn{font-family:inherit;vertical-align:middle}textarea{font-family:inherit;resize:vertical}.ie67 .clearfix,.ie67 .line,.ie67 .mod,.ie67 .row,.ie67 .col{zoom:1}.ie67 .btn,.ie67 .col,.ie67 .inbl{display:inline;zoom:1}.ie8 img{width:auto}@media print{p,blockquote{orphans:2;widows:2}blockquote,ul,ol{page-break-inside:avoid}h1,h2,h3,caption{page-break-after:avoid}}@media(orientation:landscape)and(max-device-width:768px){html,body{-webkit-text-size-adjust:100%}}[class*=grid] > *{float:left}[class*=grid] > * + *{margin-left:2%}.grid2 > *{width:49%}.grid3 > *{width:32%}.grid4 > *{width:23.5%}.grid5 > *{width:18.4%}.grid6 > *{width:15%}.grid2-1 > *:first-child,.grid1-2 > * + *{width:66%}.grid1-2 > *:first-child,.grid2-1 > * + *{width:32%}.grid1-3 > *:first-child,.grid3-1 > * + *{width:23.5%}.grid3-1 > *:first-child,.grid1-3 > * + *{width:74.5%}table,.table{max-width:100%;border-collapse:collapse;table-layout:fixed;vertical-align:top}table{width:100%}.table{display:table}caption{padding:10px;font-style:italic;color:#555}table{border:1px solid #CCC}tr > * + *{border-left:1px solid #CCC}th,td{padding:.3em .8em;border-bottom:1px solid #CCC;text-align:left}td{color:#333}.alternate{border:0}.alternate tbody{border:1px solid #CCC}.alternate thead tr > * + *{border-left:0}.alternate tbody tr > * + *{border-left:1px solid #CCC}.alternate-vert{border:0;border-right:1px solid #CCC}.alternate-vert tr >:first-child{border-bottom:0}.alternate-vert tr > * + *{border-top:1px solid #CCC}.striped tbody tr:nth-child(odd){background:#EEE;background:rgba(0,0,0,.05)}.striped-vert tr >:first-child{background:#EEE;background:rgba(0,0,0,.05)}.btn{display:inline-block}label{display:inline-block;vertical-align:middle;cursor:pointer}legend{border:0;white-space:normal}button,input,select{margin:0;font-family:"Century Gothic",helvetica,arial,sans-serif;font-size:100%;vertical-align:middle}textarea{min-height:5em;overflow:auto;font-size:1.75em;vertical-align:top;resize:vertical}}ol.styled{counter-reset:styled}ol.styled > li{counter-increment:styled;margin-bottom:.3em;list-style-type:none}ol.styled > li:before{content:counter(styled);display:inline-block;width:1em;height:1em;margin-right:.4em;padding:2px;border-radius:50%;text-align:center;text-indent:-.1em;font-size:.9em;line-height:1;vertical-align:middle;color:#FFF;background:rgba(0,0,0,.5)}@media(min-width:1280px){.large-hidden,.tablet-hidden{display:none !important}.large-visible{display:block !important}.large-no-float{float:none}.large-inbl{display:inline-block;float:none;vertical-align:top}.large-row{display:table;width:100% !important;table-layout:fixed}.large-col{display:table-cell;vertical-align:top}.large-w25{width:25% !important}.large-w33{width:33.3333% !important}.large-w50{width:50% !important}.large-w66{width:66.6666% !important}.large-w75{width:75% !important}.large-w100{display:block !important;float:none !important;clear:none !important;width:auto !important;margin-right:0 !important;margin-left:0 !important;border:0}.large-ma0,.large-man{margin:0 !important}}@media(max-width:768px){.w60,.w66,.w70,.w75,.w80,.w90,.w100,.w600p,.w700p,.w800p,.w960p,.mw960p,.medium-wauto{width:auto}.medium-hidden,.tablet-hidden{display:none !important}.medium-visible{display:block !important}.medium-no-float{float:none}.medium-inbl{display:inline-block;float:none;vertical-align:top}.medium-row{display:table;width:100% !important;table-layout:fixed}.medium-col{display:table-cell;vertical-align:top}.medium-w25{width:25% !important}.medium-w33{width:33.3333% !important}.medium-w50{width:50% !important}.medium-w66{width:66.6666% !important}.medium-w75{width:75% !important}.medium-w100{display:block !important;float:none !important;clear:none !important;width:auto !important;margin-right:0 !important;margin-left:0 !important;border:0}.medium-ma0,.medium-man{margin:0 !important}.grid4 > *{width:49% !important}.grid4 >:first-child + * + *{margin-left:0 !important}.grid6 > *{width:32% !important}.grid6 >:first-child + * + * + *{margin-left:0 !important}}@media(max-width:640px){.mod,.item,.col,fieldset{display:block !important;float:none !important;clear:none !important;width:auto !important;margin-right:0 !important;margin-left:0 !important;border:0}.w30,.w33,.w40,.w50,.w300p,.w400p,.w500p{width:auto}.row{display:block !important;width:100% !important}.tiny-hidden,.phone-hidden{display:none !important}.tiny-visible{display:block !important}.tiny-no-float{float:none}.tiny-inbl{display:inline-block;float:none;vertical-align:top}.tiny-row{display:table;width:100% !important;table-layout:fixed}.tiny-col{display:table-cell;vertical-align:top}th,td{display:block !important;width:auto !important;text-align:left !important}thead{display:none}.tiny-w25{width:25% !important}.tiny-w33{width:33.3333% !important}.tiny-w50{width:50% !important}.tiny-w66{width:66.6666% !important}.tiny-w75{width:75% !important}.tiny-w100{display:block !important;float:none !important;clear:none !important;width:auto !important;margin-right:0 !important;margin-left:0 !important;border:0}.tiny-ma0,.tiny-man{margin:0 !important}}
\ No newline at end of file
+html{font-size:62.5%}body{font-family:"Century Gothic",helvetica,arial,sans-serif;font-size:1.4em;line-height:1.5;color:#000;background-color:#FFF}p,ul,ol,dl,blockquote,pre,td,th,label,textarea,caption,details,figure,hgroup{margin:.75em 0 0;font-size:1em;line-height:1.5}h1,.h1-like{margin:.8077em 0 0 0;font-size:1.8571em;font-weight:normal;line-height:1.6154em}h2,.h2-like{margin:.875em 0 0 0;font-size:1.7143em;font-weight:normal;line-height:1.75em}h3,.h3-like{margin:.9545em 0 0 0;font-size:1.5714em;font-weight:normal;line-height:1.909em}h4,.h4-like{margin:1.05em 0 0 0;font-size:1.4286em;font-weight:normal;line-height:1.05em}h5,.h5-like{margin:1.1667em 0 0 0;font-size:1.2857em;font-weight:normal;line-height:1.1667em}h6,.h6-like{margin:1.3125em 0 0 0;font-size:1.1429em;font-weight:normal;line-height:1.3125em}.smaller{font-size:.7143em}.small{font-size:.8571em}.big{font-size:1.1429em}.bigger{font-size:1.2857em}.biggest{font-size:1.4286em}html,body,textarea,figure,label{margin:0;padding:0}ul,ol{padding-left:2em}code,pre,samp,kbd{font-family:consolas,'DejaVu Sans Mono',courier,monospace;line-height:1em;white-space:pre-wrap}code,kbd,mark{border-radius:2px}em{font-style:italic}strong{font-weight:bold}kbd{padding:0 2px;border:1px solid #999}code{padding:2px 4px;color:#B11;background:rgba(0,0,0,.04)}mark{padding:2px 4px;background:#FF0}table{margin-bottom:1.5em}p:first-child,ul:first-child,ol:first-child,dl:first-child,blockquote:first-child,pre:first-child,h1:first-child,h2:first-child,h3:first-child,h4:first-child,h5:first-child,h6:first-child{margin-top:0}li p,li ul,li ol{margin-top:0;margin-bottom:0}img,table,td,blockquote,code,pre,textarea,input,video{max-width:100%}div,textarea,table,td,th,code,pre,samp{word-wrap:break-word;-webkit-hyphens:auto;-moz-hyphens:auto;-ms-hyphens:auto;-o-hyphens:auto;hyphens:auto}img{height:auto;vertical-align:middle}#map_canvas img,.gmnoprint img{max-width:none}a img{border:0}body > script{display:none !important}.skip-links{position:absolute}.skip-links a{position:absolute;left:-7000px;padding:.5em;text-decoration:none;color:#FFF;background:#000}.skip-links a:focus{position:static}*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.mod,.item{overflow:hidden}.row{display:table;width:100%;table-layout:fixed}.row > *,.col{display:table-cell;vertical-align:top}.clear,.line,.row{clear:both}.clearfix:after,.line:after,.mod:after{content:"";display:table;clear:both}.left{float:left}img.left{margin-right:1em}.right{float:right}img.right{margin-left:1em}img.left,img.right{margin-bottom:5px}.center{margin-right:auto;margin-left:auto}.txtleft{text-align:left}.txtright{text-align:right}.txtcenter{text-align:center}.inbl{display:inline-block;margin-right:-.25em;vertical-align:top}.w10{width:10%}.w20{width:20%}.w25{width:25%}.w30{width:30%}.w33{width:33.333%}.w40{width:40%}.w50{width:50%}.w60{width:60%}.w66{width:66.666%}.w70{width:70%}.w75{width:75%}.w80{width:80%}.w90{width:90%}.w100{width:100%}.w50p{width:50px}.w100p{width:100px}.w150p{width:150px}.w200p{width:200px}.w300p{width:300px}.w400p{width:400px}.w500p{width:500px}.w600p{width:600px}.w700p{width:700px}.w800p{width:800px}.w960p{width:960px}.mw960p{max-width:960px}.m-reset,.ma0{margin:0 !important}.p-reset,.pa0{padding:0 !important}.ma1,.mas{margin:10px !important}.ma2,.mam{margin:20px !important}.ma3,.mal{margin:30px !important}.pa1,.pas{padding:10px}.pa2,.pam{padding:20px}.pa3,.pal{padding:30px}.mt0,.mtn{margin-top:0 !important}.mt1,.mts{margin-top:10px !important}.mt2,.mtm{margin-top:20px !important}.mt3,.mtl{margin-top:30px !important}.mr0,.mrn{margin-right:0}.mr1,.mrs{margin-right:10px}.mr2,.mrm{margin-right:20px}.mr3,.mrl{margin-right:30px}.mb0,.mbn{margin-bottom:0 !important}.mb1,.mbs{margin-bottom:10px !important}.mb2,.mbm{margin-bottom:20px !important}.mb3,.mbl{margin-bottom:30px !important}.ml0,.mln{margin-left:0}.ml1,.mls{margin-left:10px}.ml2,.mlm{margin-left:20px}.ml3,.mll{margin-left:30px}.pt0,.ptn{padding-top:0}.pt1,.pts{padding-top:10px}.pt2,.ptm{padding-top:20px}.pt3,.ptl{padding-top:30px}.pr0,.prn{padding-right:0}.pr1,.prs{padding-right:10px}.pr2,.prm{padding-right:20px}.pr3,.prl{padding-right:30px}.pb0,.pbn{padding-bottom:0}.pb1,.pbs{padding-bottom:10px}.pb2,.pbm{padding-bottom:20px}.pb3,.pbl{padding-bottom:30px}.pl0,.pln{padding-left:0}.pl1,.pls{padding-left:10px}.pl2,.plm{padding-left:20px}.pl3,.pll{padding-left:30px}.visually-hidden{position:absolute;left:-7000px;overflow:hidden}[dir=rtl] .visually-hidden{right:-7000px;left:auto}.desktop-hidden{display:none}form,fieldset{border:none}input,button,select,label,.btn{font-family:inherit;vertical-align:middle}textarea{font-family:inherit;resize:vertical}.ie67 .clearfix,.ie67 .line,.ie67 .mod,.ie67 .row,.ie67 .col{zoom:1}.ie67 .btn,.ie67 .col,.ie67 .inbl{display:inline;zoom:1}.ie8 img{width:auto}@media print{p,blockquote{orphans:2;widows:2}blockquote,ul,ol{page-break-inside:avoid}h1,h2,h3,caption{page-break-after:avoid}}@media(orientation:landscape)and(max-device-width:768px){html,body{-webkit-text-size-adjust:100%}}[class*=grid] > *{float:left}[class*=grid] > * + *{margin-left:2%}.grid2 > *{width:49%}.grid3 > *{width:32%}.grid4 > *{width:23.5%}.grid5 > *{width:18.4%}.grid6 > *{width:15%}.grid2-1 > *:first-child,.grid1-2 > * + *{width:66%}.grid1-2 > *:first-child,.grid2-1 > * + *{width:32%}.grid1-3 > *:first-child,.grid3-1 > * + *{width:23.5%}.grid3-1 > *:first-child,.grid1-3 > * + *{width:74.5%}table,.table{max-width:100%;border-collapse:collapse;table-layout:fixed;vertical-align:top}table{width:100%}.table{display:table}caption{padding:10px;font-style:italic;color:#555}table{border:1px solid #CCC}tr > * + *{border-left:1px solid #CCC}th,td{padding:.3em .8em;border-bottom:1px solid #CCC;text-align:left}td{color:#333}.alternate{border:0}.alternate tbody{border:1px solid #CCC}.alternate thead tr > * + *{border-left:0}.alternate tbody tr > * + *{border-left:1px solid #CCC}.alternate-vert{border:0;border-right:1px solid #CCC}.alternate-vert tr >:first-child{border-bottom:0}.alternate-vert tr > * + *{border-top:1px solid #CCC}.striped tbody tr:nth-child(odd){background:#EEE;background:rgba(0,0,0,.05)}.striped-vert tr >:first-child{background:#EEE;background:rgba(0,0,0,.05)}.btn{display:inline-block}label{display:inline-block;vertical-align:middle;cursor:pointer}legend{border:0;white-space:normal}button,input,select{margin:0;font-family:"Century Gothic",helvetica,arial,sans-serif;font-size:100%;vertical-align:middle}textarea{min-height:5em;overflow:auto;font-size:1.75em;vertical-align:top;resize:vertical}}ol.styled{counter-reset:styled}ol.styled > li{counter-increment:styled;margin-bottom:.3em;list-style-type:none}ol.styled > li:before{content:counter(styled);display:inline-block;width:1em;height:1em;margin-right:.4em;padding:2px;border-radius:50%;text-align:center;text-indent:-.1em;font-size:.9em;line-height:1;vertical-align:middle;color:#FFF;background:rgba(0,0,0,.5)}@media(min-width:1280px){.large-hidden,.tablet-hidden{display:none !important}.large-visible{display:block !important}.large-no-float{float:none}.large-inbl{display:inline-block;float:none;vertical-align:top}.large-row{display:table;width:100% !important;table-layout:fixed}.large-col{display:table-cell;vertical-align:top}.large-w25{width:25% !important}.large-w33{width:33.3333% !important}.large-w50{width:50% !important}.large-w66{width:66.6666% !important}.large-w75{width:75% !important}.large-w100{display:block !important;float:none !important;clear:none !important;width:auto !important;margin-right:0 !important;margin-left:0 !important;border:0}.large-ma0,.large-man{margin:0 !important}}@media(max-width:768px){.w60,.w66,.w70,.w75,.w80,.w90,.w100,.w600p,.w700p,.w800p,.w960p,.mw960p,.medium-wauto{width:auto}.medium-hidden,.tablet-hidden{display:none !important}.medium-visible{display:block !important}.medium-no-float{float:none}.medium-inbl{display:inline-block;float:none;vertical-align:top}.medium-row{display:table;width:100% !important;table-layout:fixed}.medium-col{display:table-cell;vertical-align:top}.medium-w25{width:25% !important}.medium-w33{width:33.3333% !important}.medium-w50{width:50% !important}.medium-w66{width:66.6666% !important}.medium-w75{width:75% !important}.medium-w100{display:block !important;float:none !important;clear:none !important;width:auto !important;margin-right:0 !important;margin-left:0 !important;border:0}.medium-ma0,.medium-man{margin:0 !important}.grid4 > *{width:49% !important}.grid4 >:first-child + * + *{margin-left:0 !important}.grid6 > *{width:32% !important}.grid6 >:first-child + * + * + *{margin-left:0 !important}}@media(max-width:640px){.mod,.item,.col,fieldset{display:block !important;float:none !important;clear:none !important;width:auto !important;margin-right:0 !important;margin-left:0 !important;border:0}.w30,.w33,.w40,.w50,.w300p,.w400p,.w500p{width:auto}.row{display:block !important;width:100% !important}.tiny-hidden,.phone-hidden{display:none !important}.tiny-visible{display:block !important}.tiny-no-float{float:none}.tiny-inbl{display:inline-block;float:none;vertical-align:top}.tiny-row{display:table;width:100% !important;table-layout:fixed}.tiny-col{display:table-cell;vertical-align:top}th,td{display:block !important;width:auto !important;text-align:left !important}thead{display:none}.tiny-w25{width:25% !important}.tiny-w33{width:33.3333% !important}.tiny-w50{width:50% !important}.tiny-w66{width:66.6666% !important}.tiny-w75{width:75% !important}.tiny-w100{display:block !important;float:none !important;clear:none !important;width:auto !important;margin-right:0 !important;margin-left:0 !important;border:0}.tiny-ma0,.tiny-man{margin:0 !important}}
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/css/style.css b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/css/style.css
index b25373d6..e3069b86 100755..100644
--- a/src/Wallabag/CoreBundle/Resources/views/default/public/css/style.css
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/css/style.css
@@ -358,8 +358,8 @@ a.print span {
 
 
 /* ==========================================================================
-        "save a link" popup div related styles
-        ========================================================================== */
+    "save a link" popup div related styles
+    ========================================================================== */
 
 #bagit-form {
   display: none;
@@ -384,8 +384,8 @@ a#bagit-form-close {
   background-color: #000;
   color: #fff;
   padding: 0 4px 1px 3px;
-  font-weight: bold; 
-  font-size: 0.7em; 
+  font-weight: bold;
+  font-size: 0.7em;
   border-radius: 4px;
 }
 .add-to-wallabag-link-after:hover, .add-to-wallabag-link-after:active {
@@ -418,8 +418,8 @@ a.add-to-wallabag-link-after:after {
 }
 
 /* ==========================================================================
-        "Search" popup div related styles
-        ========================================================================== */
+    "Search" popup div related styles
+    ========================================================================== */
 
 /* Search form message needs a little more width, depending on translations */
 #search-form {
@@ -431,17 +431,17 @@ a.add-to-wallabag-link-after:after {
 }
 
 #readLeftPercent {
-                display: inline-block;
+        display: inline-block;
     /* Show textual content */
     overflow: visible;
     text-align: left;
     text-indent: 0;
-                color: black;
-                width: 50px;
+        color: black;
+        width: 50px;
 }
 
 pre code {
-                font-family: "Courier New", Courier, monospace;
-                border: 1px solid #ddd;
-                font-size: 0.96em;
+        font-family: "Courier New", Courier, monospace;
+        border: 1px solid #ddd;
+        font-size: 0.96em;
 }
diff --git a/src/Wallabag/CoreBundle/Resources/views/_global/public/img/appicon/apple-touch-icon-114.png b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/img/appicon/apple-touch-icon-114.png
index 0e96edd5..0e96edd5 100755
--- a/src/Wallabag/CoreBundle/Resources/views/_global/public/img/appicon/apple-touch-icon-114.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/img/appicon/apple-touch-icon-114.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/_global/public/img/appicon/apple-touch-icon-120.png b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/img/appicon/apple-touch-icon-120.png
index dc5aab1c..dc5aab1c 100755
--- a/src/Wallabag/CoreBundle/Resources/views/_global/public/img/appicon/apple-touch-icon-120.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/img/appicon/apple-touch-icon-120.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/_global/public/img/appicon/apple-touch-icon-144.png b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/img/appicon/apple-touch-icon-144.png
index 1d005db6..1d005db6 100755
--- a/src/Wallabag/CoreBundle/Resources/views/_global/public/img/appicon/apple-touch-icon-144.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/img/appicon/apple-touch-icon-144.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/_global/public/img/appicon/apple-touch-icon-152.png b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/img/appicon/apple-touch-icon-152.png
index f915231f..f915231f 100755
--- a/src/Wallabag/CoreBundle/Resources/views/_global/public/img/appicon/apple-touch-icon-152.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/img/appicon/apple-touch-icon-152.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/_global/public/img/appicon/apple-touch-icon-57.png b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/img/appicon/apple-touch-icon-57.png
index 5aa19ed9..5aa19ed9 100755
--- a/src/Wallabag/CoreBundle/Resources/views/_global/public/img/appicon/apple-touch-icon-57.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/img/appicon/apple-touch-icon-57.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/_global/public/img/appicon/apple-touch-icon-72.png b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/img/appicon/apple-touch-icon-72.png
index b8b48e1b..b8b48e1b 100755
--- a/src/Wallabag/CoreBundle/Resources/views/_global/public/img/appicon/apple-touch-icon-72.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/img/appicon/apple-touch-icon-72.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/_global/public/img/appicon/apple-touch-icon-76.png b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/img/appicon/apple-touch-icon-76.png
index 9f9dba27..9f9dba27 100755
--- a/src/Wallabag/CoreBundle/Resources/views/_global/public/img/appicon/apple-touch-icon-76.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/img/appicon/apple-touch-icon-76.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/_global/public/img/appicon/apple-touch-icon.png b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/img/appicon/apple-touch-icon.png
index 9cf29e2b..9cf29e2b 100755
--- a/src/Wallabag/CoreBundle/Resources/views/_global/public/img/appicon/apple-touch-icon.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/img/appicon/apple-touch-icon.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/_global/public/img/appicon/favicon.ico b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/img/appicon/favicon.ico
index 0346558b..0346558b 100755
--- a/src/Wallabag/CoreBundle/Resources/views/_global/public/img/appicon/favicon.ico
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/img/appicon/favicon.ico
diff --git a/src/Wallabag/CoreBundle/Resources/views/_global/public/img/icons/carrot-icon--black.png b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/img/icons/carrot-icon--black.png
index 6da7925b..6da7925b 100644
--- a/src/Wallabag/CoreBundle/Resources/views/_global/public/img/icons/carrot-icon--black.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/img/icons/carrot-icon--black.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/_global/public/img/icons/carrot-icon--white.png b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/img/icons/carrot-icon--white.png
index a70044b6..a70044b6 100644
--- a/src/Wallabag/CoreBundle/Resources/views/_global/public/img/icons/carrot-icon--white.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/img/icons/carrot-icon--white.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/_global/public/img/icons/diaspora-icon--black.png b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/img/icons/diaspora-icon--black.png
index 32bca194..32bca194 100644
--- a/src/Wallabag/CoreBundle/Resources/views/_global/public/img/icons/diaspora-icon--black.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/img/icons/diaspora-icon--black.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/_global/public/img/icons/diaspora-icon--white.png b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/img/icons/diaspora-icon--white.png
index fc48d47c..fc48d47c 100644
--- a/src/Wallabag/CoreBundle/Resources/views/_global/public/img/icons/diaspora-icon--white.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/img/icons/diaspora-icon--white.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/_global/public/js/autoClose.js b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/js/autoClose.js
index e9145b7e..e9145b7e 100644
--- a/src/Wallabag/CoreBundle/Resources/views/_global/public/js/autoClose.js
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/js/autoClose.js
diff --git a/src/Wallabag/CoreBundle/Resources/views/_global/public/js/autoCompleteTags.js b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/js/autoCompleteTags.js
index 90bc982c..90bc982c 100755
--- a/src/Wallabag/CoreBundle/Resources/views/_global/public/js/autoCompleteTags.js
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/js/autoCompleteTags.js
diff --git a/src/Wallabag/CoreBundle/Resources/public/js/bookmarklet.js b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/js/bookmarklet.js
index 2afdfc3c..2afdfc3c 100644
--- a/src/Wallabag/CoreBundle/Resources/public/js/bookmarklet.js
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/js/bookmarklet.js
diff --git a/src/Wallabag/CoreBundle/Resources/views/baggy/public/js/closeMessage.js b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/js/closeMessage.js
index 527719d5..527719d5 100644
--- a/src/Wallabag/CoreBundle/Resources/views/baggy/public/js/closeMessage.js
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/js/closeMessage.js
diff --git a/src/Wallabag/CoreBundle/Resources/views/_global/public/js/jquery-2.0.3.min.js b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/js/jquery-2.0.3.min.js
index a4dd0a2f..a4dd0a2f 100644
--- a/src/Wallabag/CoreBundle/Resources/views/_global/public/js/jquery-2.0.3.min.js
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/js/jquery-2.0.3.min.js
diff --git a/src/Wallabag/CoreBundle/Resources/views/_global/public/js/jquery-ui-1.10.4.custom.js b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/js/jquery-ui-1.10.4.custom.js
index 6f599fca..6f599fca 100644
--- a/src/Wallabag/CoreBundle/Resources/views/_global/public/js/jquery-ui-1.10.4.custom.js
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/js/jquery-ui-1.10.4.custom.js
diff --git a/src/Wallabag/CoreBundle/Resources/views/_global/public/js/jquery-ui-1.10.4.custom.min.js b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/js/jquery-ui-1.10.4.custom.min.js
index 31635026..31635026 100644
--- a/src/Wallabag/CoreBundle/Resources/views/_global/public/js/jquery-ui-1.10.4.custom.min.js
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/js/jquery-ui-1.10.4.custom.min.js
diff --git a/src/Wallabag/CoreBundle/Resources/views/baggy/public/js/jquery.cookie.js b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/js/jquery.cookie.js
index 92719000..92719000 100755
--- a/src/Wallabag/CoreBundle/Resources/views/baggy/public/js/jquery.cookie.js
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/js/jquery.cookie.js
diff --git a/src/Wallabag/CoreBundle/Resources/views/_global/public/js/popupForm.js b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/js/popupForm.js
index d233e600..d233e600 100644
--- a/src/Wallabag/CoreBundle/Resources/views/_global/public/js/popupForm.js
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/js/popupForm.js
diff --git a/src/Wallabag/CoreBundle/Resources/views/_global/public/js/restoreScroll.js b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/js/restoreScroll.js
index 331c9e19..331c9e19 100644
--- a/src/Wallabag/CoreBundle/Resources/views/_global/public/js/restoreScroll.js
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/js/restoreScroll.js
diff --git a/src/Wallabag/CoreBundle/Resources/views/_global/public/js/saveLink.js b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/js/saveLink.js
index a7acd84c..a7acd84c 100755
--- a/src/Wallabag/CoreBundle/Resources/views/_global/public/js/saveLink.js
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/js/saveLink.js
diff --git a/src/Wallabag/CoreBundle/Resources/views/baggy/README.md b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/README.md
index 1f0054a4..1f0054a4 100755
--- a/src/Wallabag/CoreBundle/Resources/views/baggy/README.md
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/README.md
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig
new file mode 100644
index 00000000..dffea036
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig
@@ -0,0 +1,17 @@
+{% extends "WallabagCoreBundle::base.html.twig" %}
+
+{% block css %}
+    {{ parent() }}
+
+    <link rel="stylesheet" href="{{ asset('themes/baggy/css/ratatouille.css') }}" media="all">
+    <link rel="stylesheet" href="{{ asset('themes/baggy/css/font.css') }}" media="all">
+    <link rel="stylesheet" href="{{ asset('themes/baggy/css/main.css') }}" media="all">
+    <link rel="stylesheet" href="{{ asset('themes/baggy/css/messages.css') }}" media="all">
+    <link rel="stylesheet" href="{{ asset('themes/baggy/css/print.css') }}" media="print">
+{% endblock %}
+
+{% block scripts %}
+    {{ parent() }}
+
+    <script src="{{ asset('themes/baggy/js/init.js') }}"></script>
+{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/baggy/public/css/font.css b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/css/font.css
index 7c02a16f..7c02a16f 100755
--- a/src/Wallabag/CoreBundle/Resources/views/baggy/public/css/font.css
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/css/font.css
diff --git a/src/Wallabag/CoreBundle/Resources/views/baggy/public/css/main.css b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/css/main.css
index 1df82910..1df82910 100755
--- a/src/Wallabag/CoreBundle/Resources/views/baggy/public/css/main.css
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/css/main.css
diff --git a/src/Wallabag/CoreBundle/Resources/views/baggy/public/css/messages.css b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/css/messages.css
index 42da70b3..42da70b3 100755
--- a/src/Wallabag/CoreBundle/Resources/views/baggy/public/css/messages.css
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/css/messages.css
diff --git a/src/Wallabag/CoreBundle/Resources/views/baggy/public/css/print.css b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/css/print.css
index 9dd6d295..9dd6d295 100755
--- a/src/Wallabag/CoreBundle/Resources/views/baggy/public/css/print.css
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/css/print.css
diff --git a/src/Wallabag/CoreBundle/Resources/views/baggy/public/css/ratatouille.css b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/css/ratatouille.css
index b203cbb8..b203cbb8 100644
--- a/src/Wallabag/CoreBundle/Resources/views/baggy/public/css/ratatouille.css
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/css/ratatouille.css
diff --git a/src/Wallabag/CoreBundle/Resources/views/baggy/public/fonts/icomoon.eot b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/fonts/icomoon.eot
index 56323516..56323516 100644
--- a/src/Wallabag/CoreBundle/Resources/views/baggy/public/fonts/icomoon.eot
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/fonts/icomoon.eot
diff --git a/src/Wallabag/CoreBundle/Resources/views/baggy/public/fonts/icomoon.svg b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/fonts/icomoon.svg
index b4586136..b4586136 100644
--- a/src/Wallabag/CoreBundle/Resources/views/baggy/public/fonts/icomoon.svg
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/fonts/icomoon.svg
diff --git a/src/Wallabag/CoreBundle/Resources/views/baggy/public/fonts/icomoon.ttf b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/fonts/icomoon.ttf
index bb1f21f8..bb1f21f8 100644
--- a/src/Wallabag/CoreBundle/Resources/views/baggy/public/fonts/icomoon.ttf
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/fonts/icomoon.ttf
diff --git a/src/Wallabag/CoreBundle/Resources/views/baggy/public/fonts/icomoon.woff b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/fonts/icomoon.woff
index bab13779..bab13779 100644
--- a/src/Wallabag/CoreBundle/Resources/views/baggy/public/fonts/icomoon.woff
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/fonts/icomoon.woff
diff --git a/src/Wallabag/CoreBundle/Resources/views/baggy/public/fonts/ptsans.woff b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/fonts/ptsans.woff
index cf7c62e1..cf7c62e1 100644
--- a/src/Wallabag/CoreBundle/Resources/views/baggy/public/fonts/ptsans.woff
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/fonts/ptsans.woff
diff --git a/src/Wallabag/CoreBundle/Resources/views/baggy/public/img/baggy/blank.png b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/img/baggy/blank.png
index 63e09844..63e09844 100755
--- a/src/Wallabag/CoreBundle/Resources/views/baggy/public/img/baggy/blank.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/img/baggy/blank.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/baggy/public/img/baggy/down.png b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/img/baggy/down.png
index b9d536a7..b9d536a7 100644
--- a/src/Wallabag/CoreBundle/Resources/views/baggy/public/img/baggy/down.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/img/baggy/down.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/baggy/public/img/baggy/list.png b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/img/baggy/list.png
index bd5aff5a..bd5aff5a 100755
--- a/src/Wallabag/CoreBundle/Resources/views/baggy/public/img/baggy/list.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/img/baggy/list.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/baggy/public/img/baggy/table.png b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/img/baggy/table.png
index 859c4cd8..859c4cd8 100755
--- a/src/Wallabag/CoreBundle/Resources/views/baggy/public/img/baggy/table.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/img/baggy/table.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/baggy/public/img/baggy/top.png b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/img/baggy/top.png
index 954a8c0a..954a8c0a 100644
--- a/src/Wallabag/CoreBundle/Resources/views/baggy/public/img/baggy/top.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/img/baggy/top.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/baggy/public/img/bg-select.png b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/img/bg-select.png
index 95120441..95120441 100644
--- a/src/Wallabag/CoreBundle/Resources/views/baggy/public/img/bg-select.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/img/bg-select.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/baggy/public/img/logo-other_themes.png b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/img/logo-other_themes.png
index 32543a44..32543a44 100755
--- a/src/Wallabag/CoreBundle/Resources/views/baggy/public/img/logo-other_themes.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/img/logo-other_themes.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/baggy/public/img/logo-w.png b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/img/logo-w.png
index 65dc607b..65dc607b 100755
--- a/src/Wallabag/CoreBundle/Resources/views/baggy/public/img/logo-w.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/img/logo-w.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/baggy/public/img/logo-wallabag.svg b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/img/logo-wallabag.svg
index 40193e1c..40193e1c 100644
--- a/src/Wallabag/CoreBundle/Resources/views/baggy/public/img/logo-wallabag.svg
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/img/logo-wallabag.svg
diff --git a/src/Wallabag/CoreBundle/Resources/views/baggy/public/img/logo.png b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/img/logo.png
index 5305c77d..5305c77d 100755
--- a/src/Wallabag/CoreBundle/Resources/views/baggy/public/img/logo.png
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/img/logo.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/baggy/public/img/logo.svg b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/img/logo.svg
index 865da440..865da440 100644
--- a/src/Wallabag/CoreBundle/Resources/views/baggy/public/img/logo.svg
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/img/logo.svg
diff --git a/src/Wallabag/CoreBundle/Resources/views/baggy/public/js/init.js b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/js/init.js
index 74cbae68..74cbae68 100755
--- a/src/Wallabag/CoreBundle/Resources/views/baggy/public/js/init.js
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/js/init.js
diff --git a/src/Wallabag/CoreBundle/Resources/views/baggy/public/js/restoreScroll.js b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/js/restoreScroll.js
index 331c9e19..331c9e19 100644
--- a/src/Wallabag/CoreBundle/Resources/views/baggy/public/js/restoreScroll.js
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/js/restoreScroll.js
diff --git a/src/Wallabag/CoreBundle/Resources/views/baggy/screenshot.jpg b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/screenshot.jpg
index 19cd24bb..19cd24bb 100755
--- a/src/Wallabag/CoreBundle/Resources/views/baggy/screenshot.jpg
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/screenshot.jpg
diff --git a/src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php b/src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php
index 9b1a0986..d7d341aa 100644
--- a/src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php
+++ b/src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php
@@ -53,7 +53,7 @@ class ConfigControllerTest extends WallabagTestCase
 
         $crawler = $client->followRedirect();
 
-        $this->assertGreaterThan(1, $alert = $crawler->filter('div.flash-notice')->extract(array('_text')));
+        $this->assertGreaterThan(1, $alert = $crawler->filter('div.messages.success')->extract(array('_text')));
         $this->assertContains('Config saved', $alert[0]);
     }
 
@@ -178,7 +178,7 @@ class ConfigControllerTest extends WallabagTestCase
 
         $crawler = $client->followRedirect();
 
-        $this->assertGreaterThan(1, $alert = $crawler->filter('div.flash-notice')->extract(array('_text')));
+        $this->assertGreaterThan(1, $alert = $crawler->filter('div.messages.success')->extract(array('_text')));
         $this->assertContains('Password updated', $alert[0]);
     }
 
@@ -257,7 +257,7 @@ class ConfigControllerTest extends WallabagTestCase
 
         $crawler = $client->followRedirect();
 
-        $this->assertGreaterThan(1, $alert = $crawler->filter('div.flash-notice')->extract(array('_text')));
+        $this->assertGreaterThan(1, $alert = $crawler->filter('div.messages.success')->extract(array('_text')));
         $this->assertContains('Information updated', $alert[0]);
     }
 
@@ -344,7 +344,7 @@ class ConfigControllerTest extends WallabagTestCase
 
         $crawler = $client->followRedirect();
 
-        $this->assertGreaterThan(1, $alert = $crawler->filter('div.flash-notice')->extract(array('_text')));
+        $this->assertGreaterThan(1, $alert = $crawler->filter('div.messages.success')->extract(array('_text')));
         $this->assertContains('User "wallace" added', $alert[0]);
     }
 }