From 32da2a70ef278bd42f66eb82c3fbf1905a417b87 Mon Sep 17 00:00:00 2001
From: Jeremy <jeremy.benoist@gmail.com>
Date: Mon, 23 Feb 2015 22:55:06 +0100
Subject: [PATCH] Add LiipThemeBundle

Re-defined the config / user relation to be OneToOne bidirectionnal.
ConfigType is now a service so I can inject the list of available themes that are also used by LiipThemeBundle

Force sqlite for test
In case of people use a different driver in parameter.yml (yes I do :))
---
 .gitignore                                    |   2 +-
 app/AppKernel.php                             |   1 +
 app/config/config.yml                         |  21 +
 app/config/config_test.yml                    |   4 +-
 app/config/routing.yml                        |   6 +-
 composer.json                                 |   1 +
 composer.lock                                 |  71 ++-
 .../Controller/ConfigController.php           |   9 +-
 src/Wallabag/CoreBundle/Entity/Config.php     |   2 +-
 src/Wallabag/CoreBundle/Entity/User.php       |  27 ++
 .../CoreBundle/Form/Type/ConfigType.php       |  25 +-
 .../CoreBundle/Helper/DetectActiveTheme.php   |  47 ++
 .../CoreBundle/Resources/config/services.yml  |  16 +-
 .../Resources/views/_head.html.twig           |  26 +-
 .../Resources/views/_messages.html.twig       |   9 +
 .../CoreBundle/Resources/views/_top.html.twig |   2 +-
 .../Resources/views/baggy/layout-login.twig   |  31 --
 .../Resources/views/baggy/login.twig          |  34 --
 .../Resources/views/layout-login.html.twig    |   1 +
 .../Resources/views/layout.html.twig          |  21 +-
 .../views/themes/_global/_head_icon.html.twig |  26 +
 .../public/css/jquery-ui-1.10.4.custom.css    |   0
 .../css/jquery-ui-1.10.4.custom.min.css       |   0
 .../themes/_global/public/css/knacss.css      |   1 +
 .../views/themes/_global/public/css/style.css | 447 ++++++++++++++++++
 .../img/appicon/apple-touch-icon-114.png      | Bin
 .../img/appicon/apple-touch-icon-120.png      | Bin
 .../img/appicon/apple-touch-icon-144.png      | Bin
 .../img/appicon/apple-touch-icon-152.png      | Bin
 .../img/appicon/apple-touch-icon-57.png       | Bin
 .../img/appicon/apple-touch-icon-72.png       | Bin
 .../img/appicon/apple-touch-icon-76.png       | Bin
 .../public/img/appicon/apple-touch-icon.png   | Bin
 .../_global/public/img/appicon/favicon.ico    | Bin
 .../public/img/icons/carrot-icon--black.png   | Bin
 .../public/img/icons/carrot-icon--white.png   | Bin
 .../public/img/icons/diaspora-icon--black.png | Bin
 .../public/img/icons/diaspora-icon--white.png | Bin
 .../_global/public/js/autoClose.js            |   0
 .../_global/public/js/autoCompleteTags.js     |   0
 .../_global/public/js/jquery-2.0.3.min.js     |   0
 .../public/js/jquery-ui-1.10.4.custom.js      |   0
 .../public/js/jquery-ui-1.10.4.custom.min.js  |   0
 .../_global/public/js/popupForm.js            |   0
 .../_global/public/js/restoreScroll.js        |   0
 .../_global/public/js/saveLink.js             |   0
 .../views/{ => themes}/baggy/README.md        |   0
 .../{ => themes}/baggy/_display-mode.twig     |   0
 .../views/{ => themes}/baggy/config.twig      |   0
 .../views/{ => themes}/baggy/edit-tags.twig   |   0
 .../views/themes/baggy/layout.html.twig       |  43 ++
 .../Resources/views/themes/baggy/login.twig   |  34 ++
 .../{ => themes}/baggy/public/css/font.css    |   0
 .../{ => themes}/baggy/public/css/main.css    |   0
 .../baggy/public/css/messages.css             |   0
 .../{ => themes}/baggy/public/css/print.css   |   0
 .../baggy/public/css/ratatouille.css          |   0
 .../baggy/public/fonts/icomoon.eot            | Bin
 .../baggy/public/fonts/icomoon.svg            |   0
 .../baggy/public/fonts/icomoon.ttf            | Bin
 .../baggy/public/fonts/icomoon.woff           | Bin
 .../baggy/public/fonts/ptsans.woff            | Bin
 .../baggy/public/img/baggy/blank.png          | Bin
 .../baggy/public/img/baggy/down.png           | Bin
 .../baggy/public/img/baggy/list.png           | Bin
 .../baggy/public/img/baggy/table.png          | Bin
 .../baggy/public/img/baggy/top.png            | Bin
 .../baggy/public/img/bg-select.png            | Bin
 .../baggy/public/img/logo-other_themes.png    | Bin
 .../{ => themes}/baggy/public/img/logo-w.png  | Bin
 .../baggy/public/img/logo-wallabag.svg        |   0
 .../{ => themes}/baggy/public/img/logo.png    | Bin
 .../{ => themes}/baggy/public/img/logo.svg    |   0
 .../baggy/public/js/closeMessage.js           |   0
 .../{ => themes}/baggy/public/js/init.js      |   0
 .../baggy/public/js/jquery.cookie.js          |   0
 .../baggy/public/js/restoreScroll.js          |   0
 .../views/{ => themes}/baggy/screenshot.jpg   | Bin
 .../views/{ => themes}/baggy/tags.twig        |   0
 .../views/{ => themes}/baggy/theme.ini        |   0
 .../views/{ => themes}/dark/README.md         |   0
 .../Resources/views/{ => themes}/dark/dark    |   0
 .../views/themes/dark/layout.html.twig        |  38 ++
 .../dark/public/css/style-dark.css            |   0
 .../dark/public/img/dark/backtotop.png        | Bin
 .../dark/public/img/dark/bad-display.png      | Bin
 .../dark/public/img/dark/checkmark-off.png    | Bin
 .../dark/public/img/dark/checkmark-on.png     | Bin
 .../dark/public/img/dark/down.png             | Bin
 .../dark/public/img/dark/envelop.png          | Bin
 .../dark/public/img/dark/flattr.png           | Bin
 .../dark/public/img/dark/left.png             | Bin
 .../dark/public/img/dark/link.png             | Bin
 .../dark/public/img/dark/remove.png           | Bin
 .../{ => themes}/dark/public/img/dark/rss.png | Bin
 .../dark/public/img/dark/shaarli.png          | Bin
 .../dark/public/img/dark/star-off.png         | Bin
 .../dark/public/img/dark/star-on.png          | Bin
 .../{ => themes}/dark/public/img/dark/top.png | Bin
 .../dark/public/img/dark/twitter.png          | Bin
 .../views/{ => themes}/dark/public/public     |   0
 .../views/{ => themes}/dark/screenshot.jpg    | Bin
 .../views/{ => themes}/dark/theme.ini         |   0
 .../{ => themes}/default/_bookmarklet.twig    |   0
 .../views/{ => themes}/default/_footer.twig   |   0
 .../views/{ => themes}/default/_head.twig     |   0
 .../{ => themes}/default/_highlight.twig      |   0
 .../views/{ => themes}/default/_import.twig   |   0
 .../views/{ => themes}/default/_menu.twig     |   0
 .../views/{ => themes}/default/_messages.twig |   0
 .../{ => themes}/default/_pocheit-form.twig   |   0
 .../{ => themes}/default/_search-form.twig    |   0
 .../views/{ => themes}/default/_sorting.twig  |   0
 .../views/{ => themes}/default/_top.twig      |   0
 .../views/{ => themes}/default/about.twig     |   0
 .../views/{ => themes}/default/config.twig    |   0
 .../views/{ => themes}/default/edit-tags.twig |   0
 .../views/{ => themes}/default/error.twig     |   0
 .../views/{ => themes}/default/export.twig    |   0
 .../views/{ => themes}/default/home.twig      |   0
 .../views/{ => themes}/default/install.twig   |   0
 .../views/{ => themes}/default/layout.twig    |   0
 .../views/{ => themes}/default/login.twig     |   0
 .../public/css/images/animated-overlay.gif    | Bin
 .../css/images/ui-bg_flat_0_aaaaaa_40x100.png | Bin
 .../images/ui-bg_flat_75_ffffff_40x100.png    | Bin
 .../images/ui-bg_glass_55_fbf9ee_1x400.png    | Bin
 .../images/ui-bg_glass_65_ffffff_1x400.png    | Bin
 .../images/ui-bg_glass_75_dadada_1x400.png    | Bin
 .../images/ui-bg_glass_75_e6e6e6_1x400.png    | Bin
 .../images/ui-bg_glass_95_fef1ec_1x400.png    | Bin
 .../ui-bg_highlight-soft_75_cccccc_1x100.png  | Bin
 .../css/images/ui-icons_222222_256x240.png    | Bin
 .../css/images/ui-icons_2e83ff_256x240.png    | Bin
 .../css/images/ui-icons_454545_256x240.png    | Bin
 .../css/images/ui-icons_888888_256x240.png    | Bin
 .../css/images/ui-icons_cd0a0a_256x240.png    | Bin
 .../default/public/css/knacss.css             |   0
 .../default/public/css/messages.css           |   0
 .../{ => themes}/default/public/css/print.css |   0
 .../default/public/css/style-default.css      |   0
 .../{ => themes}/default/public/css/style.css |   0
 .../default/public/fonts/Roboto.woff          | Bin
 .../public/highlightjs/highlight.pack.js      |   0
 .../public/highlightjs/styles/default.css     |   0
 .../public/highlightjs/styles/github.css      |   0
 .../public/highlightjs/styles/googlecode.css  |   0
 .../default/public/img/default/backtotop.png  | Bin
 .../public/img/default/bad-display.png        | Bin
 .../public/img/default/checkmark-off.png      | Bin
 .../public/img/default/checkmark-on.png       | Bin
 .../default/public/img/default/down.png       | Bin
 .../default/public/img/default/envelop.png    | Bin
 .../default/public/img/default/flattr.png     | Bin
 .../default/public/img/default/left.png       | Bin
 .../default/public/img/default/link.png       | Bin
 .../default/public/img/default/print.png      | Bin
 .../default/public/img/default/remove.png     | Bin
 .../default/public/img/default/rss.png        | Bin
 .../default/public/img/default/shaarli.png    | Bin
 .../default/public/img/default/star-off.png   | Bin
 .../default/public/img/default/star-on.png    | Bin
 .../default/public/img/default/top.png        | Bin
 .../default/public/img/default/twitter.png    | Bin
 .../{ => themes}/default/public/img/logo.svg  |   0
 .../default/public/img/messages/close.png     | Bin
 .../default/public/img/messages/cross.png     | Bin
 .../default/public/img/messages/help.png      | Bin
 .../default/public/img/messages/tick.png      | Bin
 .../default/public/img/messages/warning.png   | Bin
 .../default/public/js/closeMessage.js         |   0
 .../views/{ => themes}/default/tags.twig      |   0
 .../views/{ => themes}/default/theme.ini      |   0
 .../views/{ => themes}/default/view.twig      |   0
 .../views/{ => themes}/dmagenta/README.md     |   0
 .../views/themes/dmagenta/layout.html.twig    |  38 ++
 .../dmagenta/public/css/style-dmagenta.css    |   0
 .../public/img/dmagenta/backtotop.png         | Bin
 .../public/img/dmagenta/bad-display.png       | Bin
 .../public/img/dmagenta/checkmark-off.png     | Bin
 .../public/img/dmagenta/checkmark-on.png      | Bin
 .../dmagenta/public/img/dmagenta/down.png     | Bin
 .../dmagenta/public/img/dmagenta/envelop.png  | Bin
 .../dmagenta/public/img/dmagenta/flattr.png   | Bin
 .../dmagenta/public/img/dmagenta/left.png     | Bin
 .../dmagenta/public/img/dmagenta/link.png     | Bin
 .../dmagenta/public/img/dmagenta/remove.png   | Bin
 .../dmagenta/public/img/dmagenta/rss.png      | Bin
 .../dmagenta/public/img/dmagenta/shaarli.png  | Bin
 .../dmagenta/public/img/dmagenta/star-off.png | Bin
 .../dmagenta/public/img/dmagenta/star-on.png  | Bin
 .../dmagenta/public/img/dmagenta/top.png      | Bin
 .../dmagenta/public/img/dmagenta/twitter.png  | Bin
 .../{ => themes}/dmagenta/screenshot.jpg      | Bin
 .../views/{ => themes}/dmagenta/theme.ini     |   0
 .../{ => themes}/solarized-dark/README.md     |   0
 .../solarized-dark/Solarized-LICENSE.txt      |   0
 .../themes/solarized-dark/layout.html.twig    |  38 ++
 .../public/css/style-solarized-dark.css       |   0
 .../public/img/solarized-dark/backtotop.png   | Bin
 .../public/img/solarized-dark/bad-display.png | Bin
 .../img/solarized-dark/checkmark-off.png      | Bin
 .../img/solarized-dark/checkmark-on.png       | Bin
 .../public/img/solarized-dark/down.png        | Bin
 .../public/img/solarized-dark/envelop.png     | Bin
 .../public/img/solarized-dark/flattr.png      | Bin
 .../public/img/solarized-dark/left.png        | Bin
 .../public/img/solarized-dark/link.png        | Bin
 .../public/img/solarized-dark/remove.png      | Bin
 .../public/img/solarized-dark/rss.png         | Bin
 .../public/img/solarized-dark/shaarli.png     | Bin
 .../public/img/solarized-dark/star-off.png    | Bin
 .../public/img/solarized-dark/star-on.png     | Bin
 .../public/img/solarized-dark/top.png         | Bin
 .../public/img/solarized-dark/twitter.png     | Bin
 .../solarized-dark/screenshot.jpg             | Bin
 .../{ => themes}/solarized-dark/theme.ini     |   0
 .../views/{ => themes}/solarized/README.md    |   0
 .../solarized/Solarized-LICENSE.txt           |   0
 .../views/themes/solarized/layout.html.twig   |  38 ++
 .../solarized/public/css/style-solarized.css  |   0
 .../public/img/solarized/backtotop.png        | Bin
 .../public/img/solarized/bad-display.png      | Bin
 .../public/img/solarized/checkmark-off.png    | Bin
 .../public/img/solarized/checkmark-on.png     | Bin
 .../solarized/public/img/solarized/down.png   | Bin
 .../public/img/solarized/envelop.png          | Bin
 .../solarized/public/img/solarized/flattr.png | Bin
 .../solarized/public/img/solarized/left.png   | Bin
 .../solarized/public/img/solarized/link.png   | Bin
 .../solarized/public/img/solarized/remove.png | Bin
 .../solarized/public/img/solarized/rss.png    | Bin
 .../public/img/solarized/shaarli.png          | Bin
 .../public/img/solarized/star-off.png         | Bin
 .../public/img/solarized/star-on.png          | Bin
 .../solarized/public/img/solarized/top.png    | Bin
 .../public/img/solarized/twitter.png          | Bin
 .../{ => themes}/solarized/screenshot.jpg     | Bin
 .../views/{ => themes}/solarized/theme.ini    |   0
 .../Tests/Controller/ConfigControllerTest.php |   8 +-
 web/themes/_global                            |   2 +-
 web/themes/baggy                              |   2 +-
 web/themes/dark                               |   2 +-
 web/themes/default                            |   2 +-
 web/themes/dmagenta                           |   2 +-
 web/themes/solarized                          |   2 +-
 web/themes/solarized-dark                     |   2 +-
 247 files changed, 938 insertions(+), 143 deletions(-)
 create mode 100644 src/Wallabag/CoreBundle/Helper/DetectActiveTheme.php
 delete mode 100644 src/Wallabag/CoreBundle/Resources/views/baggy/layout-login.twig
 delete mode 100644 src/Wallabag/CoreBundle/Resources/views/baggy/login.twig
 create mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/_global/_head_icon.html.twig
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/_global/public/css/jquery-ui-1.10.4.custom.css (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/_global/public/css/jquery-ui-1.10.4.custom.min.css (100%)
 create mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/_global/public/css/knacss.css
 create mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/_global/public/css/style.css
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/_global/public/img/appicon/apple-touch-icon-114.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/_global/public/img/appicon/apple-touch-icon-120.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/_global/public/img/appicon/apple-touch-icon-144.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/_global/public/img/appicon/apple-touch-icon-152.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/_global/public/img/appicon/apple-touch-icon-57.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/_global/public/img/appicon/apple-touch-icon-72.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/_global/public/img/appicon/apple-touch-icon-76.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/_global/public/img/appicon/apple-touch-icon.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/_global/public/img/appicon/favicon.ico (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/_global/public/img/icons/carrot-icon--black.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/_global/public/img/icons/carrot-icon--white.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/_global/public/img/icons/diaspora-icon--black.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/_global/public/img/icons/diaspora-icon--white.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/_global/public/js/autoClose.js (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/_global/public/js/autoCompleteTags.js (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/_global/public/js/jquery-2.0.3.min.js (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/_global/public/js/jquery-ui-1.10.4.custom.js (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/_global/public/js/jquery-ui-1.10.4.custom.min.js (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/_global/public/js/popupForm.js (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/_global/public/js/restoreScroll.js (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/_global/public/js/saveLink.js (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/baggy/README.md (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/baggy/_display-mode.twig (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/baggy/config.twig (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/baggy/edit-tags.twig (100%)
 create mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig
 create mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/baggy/login.twig
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/baggy/public/css/font.css (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/baggy/public/css/main.css (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/baggy/public/css/messages.css (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/baggy/public/css/print.css (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/baggy/public/css/ratatouille.css (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/baggy/public/fonts/icomoon.eot (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/baggy/public/fonts/icomoon.svg (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/baggy/public/fonts/icomoon.ttf (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/baggy/public/fonts/icomoon.woff (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/baggy/public/fonts/ptsans.woff (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/baggy/public/img/baggy/blank.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/baggy/public/img/baggy/down.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/baggy/public/img/baggy/list.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/baggy/public/img/baggy/table.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/baggy/public/img/baggy/top.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/baggy/public/img/bg-select.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/baggy/public/img/logo-other_themes.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/baggy/public/img/logo-w.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/baggy/public/img/logo-wallabag.svg (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/baggy/public/img/logo.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/baggy/public/img/logo.svg (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/baggy/public/js/closeMessage.js (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/baggy/public/js/init.js (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/baggy/public/js/jquery.cookie.js (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/baggy/public/js/restoreScroll.js (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/baggy/screenshot.jpg (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/baggy/tags.twig (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/baggy/theme.ini (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/dark/README.md (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/dark/dark (100%)
 create mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/dark/layout.html.twig
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/dark/public/css/style-dark.css (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/dark/public/img/dark/backtotop.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/dark/public/img/dark/bad-display.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/dark/public/img/dark/checkmark-off.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/dark/public/img/dark/checkmark-on.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/dark/public/img/dark/down.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/dark/public/img/dark/envelop.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/dark/public/img/dark/flattr.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/dark/public/img/dark/left.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/dark/public/img/dark/link.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/dark/public/img/dark/remove.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/dark/public/img/dark/rss.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/dark/public/img/dark/shaarli.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/dark/public/img/dark/star-off.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/dark/public/img/dark/star-on.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/dark/public/img/dark/top.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/dark/public/img/dark/twitter.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/dark/public/public (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/dark/screenshot.jpg (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/dark/theme.ini (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/default/_bookmarklet.twig (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/default/_footer.twig (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/default/_head.twig (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/default/_highlight.twig (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/default/_import.twig (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/default/_menu.twig (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/default/_messages.twig (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/default/_pocheit-form.twig (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/default/_search-form.twig (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/default/_sorting.twig (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/default/_top.twig (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/default/about.twig (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/default/config.twig (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/default/edit-tags.twig (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/default/error.twig (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/default/export.twig (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/default/home.twig (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/default/install.twig (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/default/layout.twig (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/default/login.twig (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/default/public/css/images/animated-overlay.gif (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/default/public/css/images/ui-bg_flat_0_aaaaaa_40x100.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/default/public/css/images/ui-bg_flat_75_ffffff_40x100.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/default/public/css/images/ui-bg_glass_55_fbf9ee_1x400.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/default/public/css/images/ui-bg_glass_65_ffffff_1x400.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/default/public/css/images/ui-bg_glass_75_dadada_1x400.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/default/public/css/images/ui-bg_glass_75_e6e6e6_1x400.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/default/public/css/images/ui-bg_glass_95_fef1ec_1x400.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/default/public/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/default/public/css/images/ui-icons_222222_256x240.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/default/public/css/images/ui-icons_2e83ff_256x240.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/default/public/css/images/ui-icons_454545_256x240.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/default/public/css/images/ui-icons_888888_256x240.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/default/public/css/images/ui-icons_cd0a0a_256x240.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/default/public/css/knacss.css (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/default/public/css/messages.css (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/default/public/css/print.css (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/default/public/css/style-default.css (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/default/public/css/style.css (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/default/public/fonts/Roboto.woff (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/default/public/highlightjs/highlight.pack.js (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/default/public/highlightjs/styles/default.css (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/default/public/highlightjs/styles/github.css (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/default/public/highlightjs/styles/googlecode.css (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/default/public/img/default/backtotop.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/default/public/img/default/bad-display.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/default/public/img/default/checkmark-off.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/default/public/img/default/checkmark-on.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/default/public/img/default/down.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/default/public/img/default/envelop.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/default/public/img/default/flattr.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/default/public/img/default/left.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/default/public/img/default/link.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/default/public/img/default/print.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/default/public/img/default/remove.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/default/public/img/default/rss.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/default/public/img/default/shaarli.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/default/public/img/default/star-off.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/default/public/img/default/star-on.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/default/public/img/default/top.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/default/public/img/default/twitter.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/default/public/img/logo.svg (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/default/public/img/messages/close.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/default/public/img/messages/cross.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/default/public/img/messages/help.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/default/public/img/messages/tick.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/default/public/img/messages/warning.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/default/public/js/closeMessage.js (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/default/tags.twig (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/default/theme.ini (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/default/view.twig (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/dmagenta/README.md (100%)
 create mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/layout.html.twig
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/dmagenta/public/css/style-dmagenta.css (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/dmagenta/public/img/dmagenta/backtotop.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/dmagenta/public/img/dmagenta/bad-display.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/dmagenta/public/img/dmagenta/checkmark-off.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/dmagenta/public/img/dmagenta/checkmark-on.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/dmagenta/public/img/dmagenta/down.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/dmagenta/public/img/dmagenta/envelop.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/dmagenta/public/img/dmagenta/flattr.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/dmagenta/public/img/dmagenta/left.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/dmagenta/public/img/dmagenta/link.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/dmagenta/public/img/dmagenta/remove.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/dmagenta/public/img/dmagenta/rss.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/dmagenta/public/img/dmagenta/shaarli.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/dmagenta/public/img/dmagenta/star-off.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/dmagenta/public/img/dmagenta/star-on.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/dmagenta/public/img/dmagenta/top.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/dmagenta/public/img/dmagenta/twitter.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/dmagenta/screenshot.jpg (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/dmagenta/theme.ini (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/solarized-dark/README.md (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/solarized-dark/Solarized-LICENSE.txt (100%)
 create mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/layout.html.twig
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/solarized-dark/public/css/style-solarized-dark.css (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/solarized-dark/public/img/solarized-dark/backtotop.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/solarized-dark/public/img/solarized-dark/bad-display.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/solarized-dark/public/img/solarized-dark/checkmark-off.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/solarized-dark/public/img/solarized-dark/checkmark-on.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/solarized-dark/public/img/solarized-dark/down.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/solarized-dark/public/img/solarized-dark/envelop.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/solarized-dark/public/img/solarized-dark/flattr.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/solarized-dark/public/img/solarized-dark/left.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/solarized-dark/public/img/solarized-dark/link.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/solarized-dark/public/img/solarized-dark/remove.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/solarized-dark/public/img/solarized-dark/rss.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/solarized-dark/public/img/solarized-dark/shaarli.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/solarized-dark/public/img/solarized-dark/star-off.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/solarized-dark/public/img/solarized-dark/star-on.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/solarized-dark/public/img/solarized-dark/top.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/solarized-dark/public/img/solarized-dark/twitter.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/solarized-dark/screenshot.jpg (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/solarized-dark/theme.ini (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/solarized/README.md (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/solarized/Solarized-LICENSE.txt (100%)
 create mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/solarized/layout.html.twig
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/solarized/public/css/style-solarized.css (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/solarized/public/img/solarized/backtotop.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/solarized/public/img/solarized/bad-display.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/solarized/public/img/solarized/checkmark-off.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/solarized/public/img/solarized/checkmark-on.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/solarized/public/img/solarized/down.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/solarized/public/img/solarized/envelop.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/solarized/public/img/solarized/flattr.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/solarized/public/img/solarized/left.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/solarized/public/img/solarized/link.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/solarized/public/img/solarized/remove.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/solarized/public/img/solarized/rss.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/solarized/public/img/solarized/shaarli.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/solarized/public/img/solarized/star-off.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/solarized/public/img/solarized/star-on.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/solarized/public/img/solarized/top.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/solarized/public/img/solarized/twitter.png (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/solarized/screenshot.jpg (100%)
 rename src/Wallabag/CoreBundle/Resources/views/{ => themes}/solarized/theme.ini (100%)

diff --git a/.gitignore b/.gitignore
index 3fbe668c9..72e5ffada 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,4 +35,4 @@
 
 # Data for wallabag
 data/assets/*
-data/db/poche*.sqlite
+data/db/wallabag*.sqlite
diff --git a/app/AppKernel.php b/app/AppKernel.php
index fe61b255d..d134de3cc 100644
--- a/app/AppKernel.php
+++ b/app/AppKernel.php
@@ -21,6 +21,7 @@ class AppKernel extends Kernel
             new JMS\SerializerBundle\JMSSerializerBundle(),
             new Nelmio\ApiDocBundle\NelmioApiDocBundle(),
             new Nelmio\CorsBundle\NelmioCorsBundle(),
+            new Liip\ThemeBundle\LiipThemeBundle(),
             new Wallabag\CoreBundle\WallabagCoreBundle()
         );
 
diff --git a/app/config/config.yml b/app/config/config.yml
index 8e7258ea7..1bd93d645 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -128,3 +128,24 @@ nelmio_cors:
             allow_methods: ['POST', 'PUT', 'GET', 'DELETE']
             max_age: 3600
             hosts: ['^api\.']
+
+liip_theme:
+    load_controllers: false
+    themes:
+        - baggy
+        - dark
+        - default
+        - dmagenta
+        - solarized
+        - solarized-dark
+    autodetect_theme: wallabag_core.helper.detect_active_theme
+
+    path_patterns:
+        app_resource:
+            - %%app_path%%/views/themes/%%current_theme%%/%%template%%
+            - %%app_path%%/views/%%template%%
+        bundle_resource:
+            - %%bundle_path%%/Resources/views/themes/%%current_theme%%/%%template%%
+        bundle_resource_dir:
+            - %%dir%%/views/themes/%%current_theme%%/%%bundle_name%%/%%template%%
+            - %%dir%%/views/%%bundle_name%%/%%override_path%%
diff --git a/app/config/config_test.yml b/app/config/config_test.yml
index 83e2922a2..a6ead1e82 100644
--- a/app/config/config_test.yml
+++ b/app/config/config_test.yml
@@ -17,4 +17,6 @@ swiftmailer:
 
 doctrine:
     dbal:
-        path: %kernel.root_dir%/../data/db/poche_test.sqlite
+        driver: pdo_sqlite
+        path: %kernel.root_dir%/../data/db/wallabag_test.sqlite
+        host: localhost
diff --git a/app/config/routing.yml b/app/config/routing.yml
index 20f6979a6..d681b39b7 100644
--- a/app/config/routing.yml
+++ b/app/config/routing.yml
@@ -19,6 +19,6 @@ logout:
     path:   /logout
 
 rest :
-  type : rest
-  resource : "routing_rest.yml"
-  prefix : /api
\ No newline at end of file
+    type : rest
+    resource : "routing_rest.yml"
+    prefix : /api
diff --git a/composer.json b/composer.json
index d49f3df36..0b162c028 100644
--- a/composer.json
+++ b/composer.json
@@ -75,6 +75,7 @@
         "tecnick.com/tcpdf": "~6.2",
         "simplepie/simplepie": "~1.3.1",
         "htmlawed/htmlawed": "dev-master",
+        "liip/theme-bundle": "1.1.3",
         "wallabag/PHP-Flash-Messages": "dev-master",
         "wallabag/kriss_php5": "dev-master",
         "wallabag/pagination": "dev-master",
diff --git a/composer.lock b/composer.lock
index 8fd4b2ab2..a6102a819 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "4cbcfeafb3c1dc4ed8c364e93969808f",
+    "hash": "fd56c671d70f498ccc1996450479fbdc",
     "packages": [
         {
             "name": "doctrine/annotations",
@@ -1282,6 +1282,61 @@
             ],
             "time": "2014-12-12 05:04:05"
         },
+        {
+            "name": "liip/theme-bundle",
+            "version": "1.1.3",
+            "target-dir": "Liip/ThemeBundle",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/liip/LiipThemeBundle.git",
+                "reference": "a594cc6deda293034b8fd7795c9950f02fc8251b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/liip/LiipThemeBundle/zipball/a594cc6deda293034b8fd7795c9950f02fc8251b",
+                "reference": "a594cc6deda293034b8fd7795c9950f02fc8251b",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "symfony/framework-bundle": "~2.0"
+            },
+            "require-dev": {
+                "symfony/console": "~2.0",
+                "symfony/expression-language": "~2.6"
+            },
+            "type": "symfony-bundle",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.1-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Liip\\ThemeBundle": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Community contributions",
+                    "homepage": "https://github.com/liip/LiipThemeBundle/contributors"
+                },
+                {
+                    "name": "Liip AG",
+                    "homepage": "http://www.liip.ch/"
+                }
+            ],
+            "description": "Provides theming support for #Symfony2 Bundles",
+            "keywords": [
+                "themes",
+                "theming"
+            ],
+            "time": "2015-02-02 15:55:54"
+        },
         {
             "name": "mgargano/simplehtmldom",
             "version": "1.5",
@@ -2590,7 +2645,7 @@
             "description": "Libraries from @fivefilters.",
             "homepage": "https://github.com/wallabag/Fivefilters_Libraries",
             "support": {
-                "source": "https://github.com/wallabag/Fivefilters_Libraries/tree/master",
+                "source": "https://github.com/wallabag/Fivefilters_Libraries/tree/1.0.0",
                 "issues": "https://github.com/wallabag/Fivefilters_Libraries/issues"
             },
             "time": "2015-01-19 20:19:28"
@@ -2635,7 +2690,7 @@
             "description": "PHP Classes for dynamically generating EPub files.",
             "homepage": "https://github.com/wallabag/PHPePub",
             "support": {
-                "source": "https://github.com/wallabag/PHPePub/tree/master"
+                "source": "https://github.com/wallabag/PHPePub/tree/2.1.0"
             },
             "time": "2015-01-19 11:44:19"
         },
@@ -2672,7 +2727,7 @@
             "description": "A simple and smart (or stupid) php5 snippets repository",
             "homepage": "https://github.com/wallabag/kriss_php5",
             "support": {
-                "source": "https://github.com/wallabag/kriss_php5/tree/master"
+                "source": "https://github.com/wallabag/kriss_php5/tree/1.0.0"
             },
             "time": "2015-01-18 21:21:43"
         },
@@ -2709,7 +2764,7 @@
             "description": "Paginate record sets, not tied in directly to a database.",
             "homepage": "https://github.com/wallabag/pagination",
             "support": {
-                "source": "https://github.com/wallabag/pagination/tree/master"
+                "source": "https://github.com/wallabag/pagination/tree/1.0.0"
             },
             "time": "2015-01-19 09:24:39"
         },
@@ -2755,7 +2810,7 @@
                 "sessions"
             ],
             "support": {
-                "source": "https://github.com/wallabag/PHP-Flash-Messages/tree/master"
+                "source": "https://github.com/wallabag/PHP-Flash-Messages/tree/1.0.0"
             },
             "time": "2015-01-18 19:51:55"
         },
@@ -2809,7 +2864,7 @@
                 "html"
             ],
             "support": {
-                "source": "https://github.com/wallabag/php-readability/tree/master",
+                "source": "https://github.com/wallabag/php-readability/tree/1.0.0",
                 "issues": "https://github.com/wallabag/php-readability/issues"
             },
             "time": "2015-01-19 12:25:38"
@@ -2847,7 +2902,7 @@
             "description": "An experimental Mobipocket file creator in PHP.",
             "homepage": "https://github.com/wallabag/phpMobi",
             "support": {
-                "source": "https://github.com/wallabag/phpMobi/tree/master"
+                "source": "https://github.com/wallabag/phpMobi/tree/1.0.0"
             },
             "time": "2015-01-19 12:43:17"
         },
diff --git a/src/Wallabag/CoreBundle/Controller/ConfigController.php b/src/Wallabag/CoreBundle/Controller/ConfigController.php
index 68e034fa7..4e8958759 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 7b4464a17..91f9bfe82 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 193dfebc2..ed5cfe535 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 a1e0ce47d..0c8706e2a 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 000000000..2a943bb7d
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Helper/DetectActiveTheme.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace Wallabag\CoreBundle\Helper;
+
+use Liip\ThemeBundle\Helper\DeviceDetectionInterface;
+use Symfony\Component\Security\Core\SecurityContextInterface;
+use Wallabag\CoreBundle\Entity\User;
+
+class DetectActiveTheme implements DeviceDetectionInterface
+{
+    protected $securityContext;
+
+    public function __construct(SecurityContextInterface $securityContext)
+    {
+        $this->securityContext = $securityContext;
+    }
+
+    public function setUserAgent($userAgent)
+    {
+    }
+
+    /**
+     * This should return the active theme for the logged in user.
+     * No active theme for:
+     *     - anonymous user
+     *     - user without a config (shouldn't happen..)
+     *
+     * @return string
+     */
+    public function getType()
+    {
+        $user = $this->securityContext->getToken()->getUser();
+
+        // anon user don't deserve a theme
+        if (!$user instanceof User) {
+            return false;
+        }
+
+        $config = $user->getConfig();
+
+        if (!$config) {
+            return false;
+        }
+
+        return $config->getTheme();
+    }
+}
diff --git a/src/Wallabag/CoreBundle/Resources/config/services.yml b/src/Wallabag/CoreBundle/Resources/config/services.yml
index b066c1a3b..5437d1cf8 100644
--- a/src/Wallabag/CoreBundle/Resources/config/services.yml
+++ b/src/Wallabag/CoreBundle/Resources/config/services.yml
@@ -1,15 +1,29 @@
 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
+
+    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/_head.html.twig b/src/Wallabag/CoreBundle/Resources/views/_head.html.twig
index 3bdbe8124..b7ec3a830 100755
--- a/src/Wallabag/CoreBundle/Resources/views/_head.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/_head.html.twig
@@ -1,28 +1,4 @@
-<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') }}">
+{% include "WallabagCoreBundle:themes:_global/_head_icon.html.twig" %}
 
 <link rel="stylesheet" href="{{ asset('themes/baggy/css/ratatouille.css') }}" media="all">
 <link rel="stylesheet" href="{{ asset('themes/baggy/css/font.css') }}" media="all">
diff --git a/src/Wallabag/CoreBundle/Resources/views/_messages.html.twig b/src/Wallabag/CoreBundle/Resources/views/_messages.html.twig
index e69de29bb..18e294c9d 100644
--- a/src/Wallabag/CoreBundle/Resources/views/_messages.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/_messages.html.twig
@@ -0,0 +1,9 @@
+
+{% if flashMessages %}
+<div class="messages success">
+    <a href="#" class="closeMessage">×</a>
+    {% for flashMessage in flashMessages %}
+        <p>{{ flashMessage }}</p>
+    {% endfor %}
+</div>
+{% endif %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/_top.html.twig b/src/Wallabag/CoreBundle/Resources/views/_top.html.twig
index 9313071dc..a4403c130 100755
--- a/src/Wallabag/CoreBundle/Resources/views/_top.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/_top.html.twig
@@ -1,5 +1,5 @@
 <header class="w600p center mbm">
-    <h1>
+    <h1 class="logo">
         {% 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/layout-login.twig b/src/Wallabag/CoreBundle/Resources/views/baggy/layout-login.twig
deleted file mode 100644
index ae3f086ce..000000000
--- 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 d4eb46d21..000000000
--- 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/layout-login.html.twig b/src/Wallabag/CoreBundle/Resources/views/layout-login.html.twig
index d1aacc47f..45deee8f4 100644
--- a/src/Wallabag/CoreBundle/Resources/views/layout-login.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/layout-login.html.twig
@@ -14,6 +14,7 @@
         {% include "WallabagCoreBundle::_head.html.twig" %}
     </head>
     <body class="login">
+        <h1>DEFAULTDEFAULTDEFAULTDEFAULTDEFAULTDEFAULTDEFAULTDEFAULT</h1>
         {% include "WallabagCoreBundle::_top.html.twig" %}
         <div id="main">
             {% block menu %}{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/layout.html.twig
index e9ccc58c5..1cf871d63 100644
--- a/src/Wallabag/CoreBundle/Resources/views/layout.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/layout.html.twig
@@ -14,19 +14,16 @@
         {% 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 }}
+        <h1>DEFAULTDEFAULTDEFAULTDEFAULTDEFAULTDEFAULTDEFAULTDEFAULT</h1>
+        {% include "WallabagCoreBundle::_top.html.twig" %}
+        <div id="main">
+            {% block menu %}{% endblock %}
+            {% block precontent %}{% endblock %}
+            {{ include("WallabagCoreBundle::_messages.html.twig", {'flashMessages': app.session.flashbag.get('notice')}) }}
+            <div id="content" class="w600p center">
+                {% block content %}{% endblock %}
             </div>
-        {% endfor %}
-        <div id="content" class="w600p center">
-            {% block content %}{% endblock %}
         </div>
-    </div>
-    {% include "WallabagCoreBundle::_footer.html.twig" %}
+        {% include "WallabagCoreBundle::_footer.html.twig" %}
     </body>
 </html>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/_global/_head_icon.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/_global/_head_icon.html.twig
new file mode 100644
index 000000000..175a4b3a2
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/_global/_head_icon.html.twig
@@ -0,0 +1,26 @@
+
+<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') }}">
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
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/_global/public/css/jquery-ui-1.10.4.custom.css
rename to 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
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/_global/public/css/jquery-ui-1.10.4.custom.min.css
rename to 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/themes/_global/public/css/knacss.css b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/css/knacss.css
new file mode 100644
index 000000000..9e68300a0
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/css/knacss.css
@@ -0,0 +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}}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/css/style.css b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/css/style.css
new file mode 100644
index 000000000..e3069b866
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/css/style.css
@@ -0,0 +1,447 @@
+@font-face {
+  font-family: 'Roboto';
+  font-style: normal;
+  font-weight: 400;
+  src: local('Roboto Regular'), local('Roboto-Regular'), url(../fonts/Roboto.woff) format('woff');
+}
+
+
+
+body {
+    margin: 10px;
+    font-family: 'Roboto',Verdana,Geneva,sans-serif;
+    font-size: 16px;
+    color: #000;
+}
+
+header {
+    text-align: center;
+}
+
+header h1 {
+    font-size: 1.3em;
+}
+
+a,
+a:hover,
+a:visited {
+    color: #000;
+}
+
+.bouton {
+    border: none;
+    border-radius: 2px;
+    color: #fff;
+    background-color: #000;
+}
+
+.bouton:hover {
+    color: #f1f1f1;
+    background-color: #222;
+    cursor: pointer;
+}
+
+#main {
+    margin: 0 auto;
+}
+
+#main #links {
+    padding: 0;
+    text-align: center;
+    font-size: 0.9em;
+    list-style-type: none;
+}
+
+#main #links li {
+    display: inline;
+}
+
+#main #links li .current {
+    -webkit-border-radius: 2px;
+    border-radius: 2px;
+    color: #fff;
+    background-color: #000;
+}
+
+#main #sort {
+    padding: 0;
+    text-align: center;
+    list-style-type: none;
+    opacity: 0.5;
+}
+
+#main #sort li {
+    display: inline;
+    font-size: 0.9em;
+}
+
+#main #sort li + li {
+    margin-left: 10px;
+}
+
+#main #sort a {
+    padding: 2px 2px 0;
+    vertical-align: middle;
+}
+
+#main #sort img {
+    vertical-align: baseline;
+}
+#main #sort img:hover {
+    cursor: pointer;
+}
+
+#links a {
+    padding: 5px 10px;
+    text-decoration: none;
+}
+
+#links a:hover {
+    -webkit-border-radius: 2px;
+    border-radius: 2px;
+    color: #f1f1f1;
+    background-color: #040707;
+}
+
+/*** ***/
+
+/*** LINKS DISPLAY ***/
+
+#main .tool {
+    text-decoration: none;
+    cursor: pointer;
+}
+
+#main #content {
+    margin-top: 20px;
+}
+
+#main #content h2 {
+    text-decoration: none;
+    font-size: 1.3em;
+}
+
+#main #content .entrie {
+    margin-top: 15px;
+    padding-bottom: 15px;
+    border-bottom: 1px dashed #222;
+    overflow: hidden;
+}
+
+/* First entry */
+#main #content .results + .entrie {
+    clear: both;
+    margin-top: 0;
+}
+
+#main .entrie .tools {
+    float: right;
+    text-align: right;
+    list-style-type: none;
+    opacity: 0.5;
+}
+
+#main .entrie .tools .tool span {
+    display: inline-block;
+    width: 16px;
+    height: 16px;
+    /* Hide textual content */
+    overflow: hidden;
+    text-align: left;
+    text-indent: -9999px;
+}
+
+/*** ***/
+
+/*** ARTICLE PAGE ***/
+
+#article {
+    margin: 0 auto;
+}
+
+#article header {
+    border-bottom: 1px solid #222;
+}
+
+#article header {
+    text-align: left;
+}
+
+#article header h1 small {
+    float: right;
+    font-size: 0.6em;
+}
+
+#article header a {
+    text-decoration: none;
+}
+
+#article .tags {
+    font-size: 0.8em;
+    color: #888;
+    padding-bottom: 5px;
+}
+
+.backhome {
+    display: inline;
+}
+
+.results {
+    padding: 15px 0;
+    overflow: hidden;
+}
+
+.nb-results {
+    float: left;
+    font-size: 0.9em;
+    line-height: 24px;
+    vertical-align: middle;
+}
+
+#article_toolbar {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    min-height: 50px;
+    padding-top: 17px;
+    text-align: center;
+    color: #fff;
+    opacity: 0.8;
+    background: #fff;
+}
+
+#article_toolbar li {
+    display: inline;
+    padding-right: 30px;
+}
+
+#article_toolbar .tool {
+    padding: 0 2px;
+}
+
+#article_toolbar .tool span {
+    display: inline-block;
+    width: 16px;
+    height: 16px;
+    /* Hide textual content */
+    overflow: hidden;
+    text-align: left;
+    text-indent: -9999px;
+}
+
+/*** ***/
+
+/*** PAGINATION ***/
+
+.pagination {
+    float: right;
+    text-align: right;
+}
+
+.pagination a {
+    height: 25px;
+    margin: 2px;
+    padding: 4px 8px;
+    border: 1px solid #d5d5d5;
+    text-decoration: none;
+    font-size: 11px;
+    font-weight: bold;
+    color: #333;
+}
+
+.pagination a:hover,
+.pagination a:active {
+    background-color: #efefef;
+}
+
+.pagination .current {
+    height: 25px;
+    margin: 2px;
+    padding: 4px 8px;
+    border: 1px solid #d5d5d5;
+    text-decoration: none;
+    font-size: 11px;
+    font-weight: bold;
+    color: #000;
+    background-color: #ccc;
+}
+
+.pagination .disabled {
+    display: none;
+}
+
+#bookmarklet {
+    padding: 5px;
+    border: 1px dashed #808080;
+    background: #fff;
+    cursor: move;
+}
+
+.top_link {
+    display: none;
+    z-index: 2000;
+    position: fixed;
+    right: 15px;
+    bottom: 15px;
+    padding: 20px;
+    -webkit-border-radius: 40px;
+    -moz-border-radius: 40px;
+    border-radius: 40px;
+    opacity: 0.9;
+    background: #ccc;
+}
+
+footer {
+    clear: both;
+}
+
+.reading-time {
+    font-size: 0.8em;
+}
+
+#inputform {
+    display: none;
+    margin-top: 5px;
+    margin-right: auto;
+    margin-left: auto;
+    padding-bottom: 5px;
+    max-width: 300px;
+    border-radius: 3px;
+    text-align: center;
+    color: #fff;
+    opacity: 0.8;
+    background-color: rgba(0,0,0,0.9);
+}
+
+a.back span,
+a.top span,
+a.fav span,
+a.fav span:hover,
+a.fav-off span,
+a.fav-off span:hover,
+a.archive span,
+a.archive span:hover,
+a.archive-off span,
+a.archive-off span:hover,
+a.twitter span,
+a.shaarli span,
+a.flattr span,
+a.email span,
+a.delete span,
+a.link span,
+a.bad-display span,
+a.reading-time span,
+a.print span {
+    background-repeat: no-repeat;
+}
+
+.arrow-down {
+    width: 0px;
+    height: 0px;
+    border-style: solid;
+    border-width: 10px 10px 0 10px;
+    border-color: #000 transparent transparent transparent;
+
+    position: absolute;
+    margin-top: 1.5em;
+    margin-left: -30px;
+}
+
+.two-column {
+  display: block;
+  width: 50%;
+  paddig-right: 20px;
+  float: left;
+  vertical-align: top;
+}
+
+
+/* ==========================================================================
+    "save a link" popup div related styles
+    ========================================================================== */
+
+#bagit-form {
+  display: none;
+  padding-left: 30px;
+  width: 450px;
+
+}
+
+a#bagit-form-close {
+  color: #FFF;
+  display: inline-block;
+  float: right;
+  background: url("../img/messages/close.png") no-repeat scroll 0 0 rgba(0, 0, 0, 0);
+  height: 16px;
+  margin: -14px -8px 0 0;
+  width: 16px;
+  text-decoration: none;
+}
+
+
+.add-to-wallabag-link-after {
+  background-color: #000;
+  color: #fff;
+  padding: 0 4px 1px 3px;
+  font-weight: bold;
+  font-size: 0.7em;
+  border-radius: 4px;
+}
+.add-to-wallabag-link-after:hover, .add-to-wallabag-link-after:active {
+  color: #fff;
+}
+.add-to-wallabag-link-after:visited {
+  color: #999;
+}
+a.add-to-wallabag-link-after {
+    visibility: hidden;
+    position: absolute;
+    opacity: 0;
+    transition-duration: 2s;
+    transition-timing-function: ease-out;
+}
+#article article a:hover + a.add-to-wallabag-link-after, a.add-to-wallabag-link-after:hover {
+    opacity: 1;
+    visibility: visible;
+    transition-duration: .3s;
+    transition-timing-function: ease-in;
+}
+a.add-to-wallabag-link-after:after {
+     content: "w";
+}
+
+
+#add-link-result {
+  display: inline;
+  padding-left: 10px;
+}
+
+/* ==========================================================================
+    "Search" popup div related styles
+    ========================================================================== */
+
+/* Search form message needs a little more width, depending on translations */
+#search-form {
+    width: 420px;
+}
+
+.opacity03 {
+  /*opacity: 0.3;*/
+}
+
+#readLeftPercent {
+        display: inline-block;
+    /* Show textual content */
+    overflow: visible;
+    text-align: left;
+    text-indent: 0;
+        color: black;
+        width: 50px;
+}
+
+pre code {
+        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
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/_global/public/img/appicon/apple-touch-icon-114.png
rename to 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
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/_global/public/img/appicon/apple-touch-icon-120.png
rename to 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
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/_global/public/img/appicon/apple-touch-icon-144.png
rename to 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
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/_global/public/img/appicon/apple-touch-icon-152.png
rename to 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
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/_global/public/img/appicon/apple-touch-icon-57.png
rename to 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
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/_global/public/img/appicon/apple-touch-icon-72.png
rename to 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
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/_global/public/img/appicon/apple-touch-icon-76.png
rename to 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
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/_global/public/img/appicon/apple-touch-icon.png
rename to 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
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/_global/public/img/appicon/favicon.ico
rename to 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
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/_global/public/img/icons/carrot-icon--black.png
rename to 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
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/_global/public/img/icons/carrot-icon--white.png
rename to 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
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/_global/public/img/icons/diaspora-icon--black.png
rename to 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
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/_global/public/img/icons/diaspora-icon--white.png
rename to 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
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/_global/public/js/autoClose.js
rename to 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
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/_global/public/js/autoCompleteTags.js
rename to src/Wallabag/CoreBundle/Resources/views/themes/_global/public/js/autoCompleteTags.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
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/_global/public/js/jquery-2.0.3.min.js
rename to 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
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/_global/public/js/jquery-ui-1.10.4.custom.js
rename to 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
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/_global/public/js/jquery-ui-1.10.4.custom.min.js
rename to 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/_global/public/js/popupForm.js b/src/Wallabag/CoreBundle/Resources/views/themes/_global/public/js/popupForm.js
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/_global/public/js/popupForm.js
rename to 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
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/_global/public/js/restoreScroll.js
rename to 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
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/_global/public/js/saveLink.js
rename to 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
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/baggy/README.md
rename to src/Wallabag/CoreBundle/Resources/views/themes/baggy/README.md
diff --git a/src/Wallabag/CoreBundle/Resources/views/baggy/_display-mode.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/_display-mode.twig
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/baggy/_display-mode.twig
rename to src/Wallabag/CoreBundle/Resources/views/themes/baggy/_display-mode.twig
diff --git a/src/Wallabag/CoreBundle/Resources/views/baggy/config.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/config.twig
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/baggy/config.twig
rename to src/Wallabag/CoreBundle/Resources/views/themes/baggy/config.twig
diff --git a/src/Wallabag/CoreBundle/Resources/views/baggy/edit-tags.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/edit-tags.twig
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/baggy/edit-tags.twig
rename to src/Wallabag/CoreBundle/Resources/views/themes/baggy/edit-tags.twig
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 000000000..16070c7fa
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig
@@ -0,0 +1,43 @@
+<!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:themes:_global/_head_icon.html.twig" %}
+
+        <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>
+    </head>
+    <body>
+    {% include "WallabagCoreBundle::_top.html.twig" %}
+    <div id="main">
+        {% block menu %}{% endblock %}
+        {% block precontent %}{% endblock %}
+        {{ include("WallabagCoreBundle::_messages.html.twig", {'flashMessages': app.session.flashbag.get('notice')}) }}
+        <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/themes/baggy/login.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/login.twig
new file mode 100644
index 000000000..4a1dc05dc
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/login.twig
@@ -0,0 +1,34 @@
+{% 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/public/css/font.css b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/css/font.css
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/baggy/public/css/font.css
rename to 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
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/baggy/public/css/main.css
rename to 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
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/baggy/public/css/messages.css
rename to 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
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/baggy/public/css/print.css
rename to 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
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/baggy/public/css/ratatouille.css
rename to 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
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/baggy/public/fonts/icomoon.eot
rename to 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
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/baggy/public/fonts/icomoon.svg
rename to 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
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/baggy/public/fonts/icomoon.ttf
rename to 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
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/baggy/public/fonts/icomoon.woff
rename to 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
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/baggy/public/fonts/ptsans.woff
rename to 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
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/baggy/public/img/baggy/blank.png
rename to 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
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/baggy/public/img/baggy/down.png
rename to 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
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/baggy/public/img/baggy/list.png
rename to 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
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/baggy/public/img/baggy/table.png
rename to 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
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/baggy/public/img/baggy/top.png
rename to 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
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/baggy/public/img/bg-select.png
rename to 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
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/baggy/public/img/logo-other_themes.png
rename to 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
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/baggy/public/img/logo-w.png
rename to 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
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/baggy/public/img/logo-wallabag.svg
rename to 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
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/baggy/public/img/logo.png
rename to 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
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/baggy/public/img/logo.svg
rename to src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/img/logo.svg
diff --git a/src/Wallabag/CoreBundle/Resources/views/baggy/public/js/closeMessage.js b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/js/closeMessage.js
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/baggy/public/js/closeMessage.js
rename to src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/js/closeMessage.js
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
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/baggy/public/js/init.js
rename to src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/js/init.js
diff --git a/src/Wallabag/CoreBundle/Resources/views/baggy/public/js/jquery.cookie.js b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/js/jquery.cookie.js
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/baggy/public/js/jquery.cookie.js
rename to src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/js/jquery.cookie.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
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/baggy/public/js/restoreScroll.js
rename to 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
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/baggy/screenshot.jpg
rename to src/Wallabag/CoreBundle/Resources/views/themes/baggy/screenshot.jpg
diff --git a/src/Wallabag/CoreBundle/Resources/views/baggy/tags.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/tags.twig
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/baggy/tags.twig
rename to src/Wallabag/CoreBundle/Resources/views/themes/baggy/tags.twig
diff --git a/src/Wallabag/CoreBundle/Resources/views/baggy/theme.ini b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/theme.ini
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/baggy/theme.ini
rename to src/Wallabag/CoreBundle/Resources/views/themes/baggy/theme.ini
diff --git a/src/Wallabag/CoreBundle/Resources/views/dark/README.md b/src/Wallabag/CoreBundle/Resources/views/themes/dark/README.md
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/dark/README.md
rename to src/Wallabag/CoreBundle/Resources/views/themes/dark/README.md
diff --git a/src/Wallabag/CoreBundle/Resources/views/dark/dark b/src/Wallabag/CoreBundle/Resources/views/themes/dark/dark
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/dark/dark
rename to src/Wallabag/CoreBundle/Resources/views/themes/dark/dark
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/dark/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/dark/layout.html.twig
new file mode 100644
index 000000000..e17c13926
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/dark/layout.html.twig
@@ -0,0 +1,38 @@
+<!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:themes:_global/_head_icon.html.twig" %}
+
+        <link rel="stylesheet" href="{{ asset('themes/_global/css/knacss.css') }}" media="all">
+        <link rel="stylesheet" href="{{ asset('themes/_global/css/style.css') }}" media="all">
+        <link rel="stylesheet" href="{{ asset('themes/dark/css/style-dark.css') }}" media="all">
+
+        <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('bundles/wallabagcore/js/bookmarklet.js') }}"></script>
+    </head>
+    <body>
+    {% include "WallabagCoreBundle::_top.html.twig" %}
+    <div id="main">
+        {% block menu %}{% endblock %}
+        {% block precontent %}{% endblock %}
+        {{ include("WallabagCoreBundle::_messages.html.twig", {'flashMessages': app.session.flashbag.get('notice')}) }}
+        <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/dark/public/css/style-dark.css b/src/Wallabag/CoreBundle/Resources/views/themes/dark/public/css/style-dark.css
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/dark/public/css/style-dark.css
rename to src/Wallabag/CoreBundle/Resources/views/themes/dark/public/css/style-dark.css
diff --git a/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/backtotop.png b/src/Wallabag/CoreBundle/Resources/views/themes/dark/public/img/dark/backtotop.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/backtotop.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/dark/public/img/dark/backtotop.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/bad-display.png b/src/Wallabag/CoreBundle/Resources/views/themes/dark/public/img/dark/bad-display.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/bad-display.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/dark/public/img/dark/bad-display.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/checkmark-off.png b/src/Wallabag/CoreBundle/Resources/views/themes/dark/public/img/dark/checkmark-off.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/checkmark-off.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/dark/public/img/dark/checkmark-off.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/checkmark-on.png b/src/Wallabag/CoreBundle/Resources/views/themes/dark/public/img/dark/checkmark-on.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/checkmark-on.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/dark/public/img/dark/checkmark-on.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/down.png b/src/Wallabag/CoreBundle/Resources/views/themes/dark/public/img/dark/down.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/down.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/dark/public/img/dark/down.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/envelop.png b/src/Wallabag/CoreBundle/Resources/views/themes/dark/public/img/dark/envelop.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/envelop.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/dark/public/img/dark/envelop.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/flattr.png b/src/Wallabag/CoreBundle/Resources/views/themes/dark/public/img/dark/flattr.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/flattr.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/dark/public/img/dark/flattr.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/left.png b/src/Wallabag/CoreBundle/Resources/views/themes/dark/public/img/dark/left.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/left.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/dark/public/img/dark/left.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/link.png b/src/Wallabag/CoreBundle/Resources/views/themes/dark/public/img/dark/link.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/link.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/dark/public/img/dark/link.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/remove.png b/src/Wallabag/CoreBundle/Resources/views/themes/dark/public/img/dark/remove.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/remove.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/dark/public/img/dark/remove.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/rss.png b/src/Wallabag/CoreBundle/Resources/views/themes/dark/public/img/dark/rss.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/rss.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/dark/public/img/dark/rss.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/shaarli.png b/src/Wallabag/CoreBundle/Resources/views/themes/dark/public/img/dark/shaarli.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/shaarli.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/dark/public/img/dark/shaarli.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/star-off.png b/src/Wallabag/CoreBundle/Resources/views/themes/dark/public/img/dark/star-off.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/star-off.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/dark/public/img/dark/star-off.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/star-on.png b/src/Wallabag/CoreBundle/Resources/views/themes/dark/public/img/dark/star-on.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/star-on.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/dark/public/img/dark/star-on.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/top.png b/src/Wallabag/CoreBundle/Resources/views/themes/dark/public/img/dark/top.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/top.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/dark/public/img/dark/top.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/twitter.png b/src/Wallabag/CoreBundle/Resources/views/themes/dark/public/img/dark/twitter.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/dark/public/img/dark/twitter.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/dark/public/img/dark/twitter.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/dark/public/public b/src/Wallabag/CoreBundle/Resources/views/themes/dark/public/public
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/dark/public/public
rename to src/Wallabag/CoreBundle/Resources/views/themes/dark/public/public
diff --git a/src/Wallabag/CoreBundle/Resources/views/dark/screenshot.jpg b/src/Wallabag/CoreBundle/Resources/views/themes/dark/screenshot.jpg
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/dark/screenshot.jpg
rename to src/Wallabag/CoreBundle/Resources/views/themes/dark/screenshot.jpg
diff --git a/src/Wallabag/CoreBundle/Resources/views/dark/theme.ini b/src/Wallabag/CoreBundle/Resources/views/themes/dark/theme.ini
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/dark/theme.ini
rename to src/Wallabag/CoreBundle/Resources/views/themes/dark/theme.ini
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/_bookmarklet.twig b/src/Wallabag/CoreBundle/Resources/views/themes/default/_bookmarklet.twig
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/default/_bookmarklet.twig
rename to src/Wallabag/CoreBundle/Resources/views/themes/default/_bookmarklet.twig
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/_footer.twig b/src/Wallabag/CoreBundle/Resources/views/themes/default/_footer.twig
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/default/_footer.twig
rename to src/Wallabag/CoreBundle/Resources/views/themes/default/_footer.twig
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/_head.twig b/src/Wallabag/CoreBundle/Resources/views/themes/default/_head.twig
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/default/_head.twig
rename to src/Wallabag/CoreBundle/Resources/views/themes/default/_head.twig
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/_highlight.twig b/src/Wallabag/CoreBundle/Resources/views/themes/default/_highlight.twig
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/default/_highlight.twig
rename to src/Wallabag/CoreBundle/Resources/views/themes/default/_highlight.twig
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/_import.twig b/src/Wallabag/CoreBundle/Resources/views/themes/default/_import.twig
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/default/_import.twig
rename to src/Wallabag/CoreBundle/Resources/views/themes/default/_import.twig
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/_menu.twig b/src/Wallabag/CoreBundle/Resources/views/themes/default/_menu.twig
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/default/_menu.twig
rename to src/Wallabag/CoreBundle/Resources/views/themes/default/_menu.twig
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/_messages.twig b/src/Wallabag/CoreBundle/Resources/views/themes/default/_messages.twig
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/default/_messages.twig
rename to src/Wallabag/CoreBundle/Resources/views/themes/default/_messages.twig
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/_pocheit-form.twig b/src/Wallabag/CoreBundle/Resources/views/themes/default/_pocheit-form.twig
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/default/_pocheit-form.twig
rename to src/Wallabag/CoreBundle/Resources/views/themes/default/_pocheit-form.twig
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/_search-form.twig b/src/Wallabag/CoreBundle/Resources/views/themes/default/_search-form.twig
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/default/_search-form.twig
rename to src/Wallabag/CoreBundle/Resources/views/themes/default/_search-form.twig
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/_sorting.twig b/src/Wallabag/CoreBundle/Resources/views/themes/default/_sorting.twig
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/default/_sorting.twig
rename to src/Wallabag/CoreBundle/Resources/views/themes/default/_sorting.twig
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/_top.twig b/src/Wallabag/CoreBundle/Resources/views/themes/default/_top.twig
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/default/_top.twig
rename to src/Wallabag/CoreBundle/Resources/views/themes/default/_top.twig
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/about.twig b/src/Wallabag/CoreBundle/Resources/views/themes/default/about.twig
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/default/about.twig
rename to src/Wallabag/CoreBundle/Resources/views/themes/default/about.twig
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/config.twig b/src/Wallabag/CoreBundle/Resources/views/themes/default/config.twig
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/default/config.twig
rename to src/Wallabag/CoreBundle/Resources/views/themes/default/config.twig
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/edit-tags.twig b/src/Wallabag/CoreBundle/Resources/views/themes/default/edit-tags.twig
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/default/edit-tags.twig
rename to src/Wallabag/CoreBundle/Resources/views/themes/default/edit-tags.twig
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/error.twig b/src/Wallabag/CoreBundle/Resources/views/themes/default/error.twig
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/default/error.twig
rename to src/Wallabag/CoreBundle/Resources/views/themes/default/error.twig
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/export.twig b/src/Wallabag/CoreBundle/Resources/views/themes/default/export.twig
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/default/export.twig
rename to src/Wallabag/CoreBundle/Resources/views/themes/default/export.twig
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/home.twig b/src/Wallabag/CoreBundle/Resources/views/themes/default/home.twig
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/default/home.twig
rename to src/Wallabag/CoreBundle/Resources/views/themes/default/home.twig
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/install.twig b/src/Wallabag/CoreBundle/Resources/views/themes/default/install.twig
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/default/install.twig
rename to src/Wallabag/CoreBundle/Resources/views/themes/default/install.twig
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/layout.twig b/src/Wallabag/CoreBundle/Resources/views/themes/default/layout.twig
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/default/layout.twig
rename to src/Wallabag/CoreBundle/Resources/views/themes/default/layout.twig
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/login.twig b/src/Wallabag/CoreBundle/Resources/views/themes/default/login.twig
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/default/login.twig
rename to src/Wallabag/CoreBundle/Resources/views/themes/default/login.twig
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/css/images/animated-overlay.gif b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/css/images/animated-overlay.gif
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/default/public/css/images/animated-overlay.gif
rename to src/Wallabag/CoreBundle/Resources/views/themes/default/public/css/images/animated-overlay.gif
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/themes/default/public/css/images/ui-bg_flat_0_aaaaaa_40x100.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-bg_flat_0_aaaaaa_40x100.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/default/public/css/images/ui-bg_flat_0_aaaaaa_40x100.png
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/themes/default/public/css/images/ui-bg_flat_75_ffffff_40x100.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-bg_flat_75_ffffff_40x100.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/default/public/css/images/ui-bg_flat_75_ffffff_40x100.png
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/themes/default/public/css/images/ui-bg_glass_55_fbf9ee_1x400.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-bg_glass_55_fbf9ee_1x400.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/default/public/css/images/ui-bg_glass_55_fbf9ee_1x400.png
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/themes/default/public/css/images/ui-bg_glass_65_ffffff_1x400.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-bg_glass_65_ffffff_1x400.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/default/public/css/images/ui-bg_glass_65_ffffff_1x400.png
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/themes/default/public/css/images/ui-bg_glass_75_dadada_1x400.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-bg_glass_75_dadada_1x400.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/default/public/css/images/ui-bg_glass_75_dadada_1x400.png
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/themes/default/public/css/images/ui-bg_glass_75_e6e6e6_1x400.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-bg_glass_75_e6e6e6_1x400.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/default/public/css/images/ui-bg_glass_75_e6e6e6_1x400.png
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/themes/default/public/css/images/ui-bg_glass_95_fef1ec_1x400.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-bg_glass_95_fef1ec_1x400.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/default/public/css/images/ui-bg_glass_95_fef1ec_1x400.png
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/themes/default/public/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/default/public/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-icons_222222_256x240.png b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/css/images/ui-icons_222222_256x240.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-icons_222222_256x240.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/default/public/css/images/ui-icons_222222_256x240.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-icons_2e83ff_256x240.png b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/css/images/ui-icons_2e83ff_256x240.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-icons_2e83ff_256x240.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/default/public/css/images/ui-icons_2e83ff_256x240.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-icons_454545_256x240.png b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/css/images/ui-icons_454545_256x240.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-icons_454545_256x240.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/default/public/css/images/ui-icons_454545_256x240.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-icons_888888_256x240.png b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/css/images/ui-icons_888888_256x240.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-icons_888888_256x240.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/default/public/css/images/ui-icons_888888_256x240.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-icons_cd0a0a_256x240.png b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/css/images/ui-icons_cd0a0a_256x240.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/default/public/css/images/ui-icons_cd0a0a_256x240.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/default/public/css/images/ui-icons_cd0a0a_256x240.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/css/knacss.css b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/css/knacss.css
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/default/public/css/knacss.css
rename to src/Wallabag/CoreBundle/Resources/views/themes/default/public/css/knacss.css
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/css/messages.css b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/css/messages.css
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/default/public/css/messages.css
rename to src/Wallabag/CoreBundle/Resources/views/themes/default/public/css/messages.css
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/css/print.css b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/css/print.css
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/default/public/css/print.css
rename to src/Wallabag/CoreBundle/Resources/views/themes/default/public/css/print.css
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/css/style-default.css b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/css/style-default.css
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/default/public/css/style-default.css
rename to src/Wallabag/CoreBundle/Resources/views/themes/default/public/css/style-default.css
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/css/style.css b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/css/style.css
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/default/public/css/style.css
rename to src/Wallabag/CoreBundle/Resources/views/themes/default/public/css/style.css
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/fonts/Roboto.woff b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/fonts/Roboto.woff
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/default/public/fonts/Roboto.woff
rename to src/Wallabag/CoreBundle/Resources/views/themes/default/public/fonts/Roboto.woff
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/highlightjs/highlight.pack.js b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/highlightjs/highlight.pack.js
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/default/public/highlightjs/highlight.pack.js
rename to src/Wallabag/CoreBundle/Resources/views/themes/default/public/highlightjs/highlight.pack.js
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/highlightjs/styles/default.css b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/highlightjs/styles/default.css
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/default/public/highlightjs/styles/default.css
rename to src/Wallabag/CoreBundle/Resources/views/themes/default/public/highlightjs/styles/default.css
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/highlightjs/styles/github.css b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/highlightjs/styles/github.css
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/default/public/highlightjs/styles/github.css
rename to src/Wallabag/CoreBundle/Resources/views/themes/default/public/highlightjs/styles/github.css
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/highlightjs/styles/googlecode.css b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/highlightjs/styles/googlecode.css
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/default/public/highlightjs/styles/googlecode.css
rename to src/Wallabag/CoreBundle/Resources/views/themes/default/public/highlightjs/styles/googlecode.css
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/backtotop.png b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/default/backtotop.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/default/public/img/default/backtotop.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/default/backtotop.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/bad-display.png b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/default/bad-display.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/default/public/img/default/bad-display.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/default/bad-display.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/checkmark-off.png b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/default/checkmark-off.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/default/public/img/default/checkmark-off.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/default/checkmark-off.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/checkmark-on.png b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/default/checkmark-on.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/default/public/img/default/checkmark-on.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/default/checkmark-on.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/down.png b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/default/down.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/default/public/img/default/down.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/default/down.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/envelop.png b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/default/envelop.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/default/public/img/default/envelop.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/default/envelop.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/flattr.png b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/default/flattr.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/default/public/img/default/flattr.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/default/flattr.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/left.png b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/default/left.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/default/public/img/default/left.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/default/left.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/link.png b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/default/link.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/default/public/img/default/link.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/default/link.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/print.png b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/default/print.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/default/public/img/default/print.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/default/print.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/remove.png b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/default/remove.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/default/public/img/default/remove.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/default/remove.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/rss.png b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/default/rss.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/default/public/img/default/rss.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/default/rss.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/shaarli.png b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/default/shaarli.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/default/public/img/default/shaarli.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/default/shaarli.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/star-off.png b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/default/star-off.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/default/public/img/default/star-off.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/default/star-off.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/star-on.png b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/default/star-on.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/default/public/img/default/star-on.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/default/star-on.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/top.png b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/default/top.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/default/public/img/default/top.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/default/top.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/img/default/twitter.png b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/default/twitter.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/default/public/img/default/twitter.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/default/twitter.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/img/logo.svg b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/logo.svg
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/default/public/img/logo.svg
rename to src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/logo.svg
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/img/messages/close.png b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/messages/close.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/default/public/img/messages/close.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/messages/close.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/img/messages/cross.png b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/messages/cross.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/default/public/img/messages/cross.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/messages/cross.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/img/messages/help.png b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/messages/help.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/default/public/img/messages/help.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/messages/help.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/img/messages/tick.png b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/messages/tick.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/default/public/img/messages/tick.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/messages/tick.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/img/messages/warning.png b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/messages/warning.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/default/public/img/messages/warning.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/default/public/img/messages/warning.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/public/js/closeMessage.js b/src/Wallabag/CoreBundle/Resources/views/themes/default/public/js/closeMessage.js
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/default/public/js/closeMessage.js
rename to src/Wallabag/CoreBundle/Resources/views/themes/default/public/js/closeMessage.js
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/tags.twig b/src/Wallabag/CoreBundle/Resources/views/themes/default/tags.twig
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/default/tags.twig
rename to src/Wallabag/CoreBundle/Resources/views/themes/default/tags.twig
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/theme.ini b/src/Wallabag/CoreBundle/Resources/views/themes/default/theme.ini
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/default/theme.ini
rename to src/Wallabag/CoreBundle/Resources/views/themes/default/theme.ini
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/view.twig b/src/Wallabag/CoreBundle/Resources/views/themes/default/view.twig
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/default/view.twig
rename to src/Wallabag/CoreBundle/Resources/views/themes/default/view.twig
diff --git a/src/Wallabag/CoreBundle/Resources/views/dmagenta/README.md b/src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/README.md
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/dmagenta/README.md
rename to src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/README.md
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/layout.html.twig
new file mode 100644
index 000000000..0816e9dcf
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/layout.html.twig
@@ -0,0 +1,38 @@
+<!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:themes:_global/_head_icon.html.twig" %}
+
+        <link rel="stylesheet" href="{{ asset('themes/_global/css/knacss.css') }}" media="all">
+        <link rel="stylesheet" href="{{ asset('themes/_global/css/style.css') }}" media="all">
+        <link rel="stylesheet" href="{{ asset('themes/dmagenta/css/style-dmagenta.css') }}" media="all">
+
+        <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('bundles/wallabagcore/js/bookmarklet.js') }}"></script>
+    </head>
+    <body>
+    {% include "WallabagCoreBundle::_top.html.twig" %}
+    <div id="main">
+        {% block menu %}{% endblock %}
+        {% block precontent %}{% endblock %}
+        {{ include("WallabagCoreBundle::_messages.html.twig", {'flashMessages': app.session.flashbag.get('notice')}) }}
+        <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/dmagenta/public/css/style-dmagenta.css b/src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/public/css/style-dmagenta.css
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/dmagenta/public/css/style-dmagenta.css
rename to src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/public/css/style-dmagenta.css
diff --git a/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/backtotop.png b/src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/public/img/dmagenta/backtotop.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/backtotop.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/public/img/dmagenta/backtotop.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/bad-display.png b/src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/public/img/dmagenta/bad-display.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/bad-display.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/public/img/dmagenta/bad-display.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/checkmark-off.png b/src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/public/img/dmagenta/checkmark-off.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/checkmark-off.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/public/img/dmagenta/checkmark-off.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/checkmark-on.png b/src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/public/img/dmagenta/checkmark-on.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/checkmark-on.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/public/img/dmagenta/checkmark-on.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/down.png b/src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/public/img/dmagenta/down.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/down.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/public/img/dmagenta/down.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/envelop.png b/src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/public/img/dmagenta/envelop.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/envelop.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/public/img/dmagenta/envelop.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/flattr.png b/src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/public/img/dmagenta/flattr.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/flattr.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/public/img/dmagenta/flattr.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/left.png b/src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/public/img/dmagenta/left.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/left.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/public/img/dmagenta/left.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/link.png b/src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/public/img/dmagenta/link.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/link.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/public/img/dmagenta/link.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/remove.png b/src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/public/img/dmagenta/remove.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/remove.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/public/img/dmagenta/remove.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/rss.png b/src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/public/img/dmagenta/rss.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/rss.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/public/img/dmagenta/rss.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/shaarli.png b/src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/public/img/dmagenta/shaarli.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/shaarli.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/public/img/dmagenta/shaarli.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/star-off.png b/src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/public/img/dmagenta/star-off.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/star-off.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/public/img/dmagenta/star-off.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/star-on.png b/src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/public/img/dmagenta/star-on.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/star-on.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/public/img/dmagenta/star-on.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/top.png b/src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/public/img/dmagenta/top.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/top.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/public/img/dmagenta/top.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/twitter.png b/src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/public/img/dmagenta/twitter.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/dmagenta/public/img/dmagenta/twitter.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/public/img/dmagenta/twitter.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/dmagenta/screenshot.jpg b/src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/screenshot.jpg
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/dmagenta/screenshot.jpg
rename to src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/screenshot.jpg
diff --git a/src/Wallabag/CoreBundle/Resources/views/dmagenta/theme.ini b/src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/theme.ini
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/dmagenta/theme.ini
rename to src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/theme.ini
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/README.md b/src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/README.md
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/solarized-dark/README.md
rename to src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/README.md
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/Solarized-LICENSE.txt b/src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/Solarized-LICENSE.txt
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/solarized-dark/Solarized-LICENSE.txt
rename to src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/Solarized-LICENSE.txt
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/layout.html.twig
new file mode 100644
index 000000000..8d62a31b0
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/layout.html.twig
@@ -0,0 +1,38 @@
+<!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:themes:_global/_head_icon.html.twig" %}
+
+        <link rel="stylesheet" href="{{ asset('themes/_global/css/knacss.css') }}" media="all">
+        <link rel="stylesheet" href="{{ asset('themes/_global/css/style.css') }}" media="all">
+        <link rel="stylesheet" href="{{ asset('themes/solarized-dark/css/style-solarized-dark.css') }}" media="all">
+
+        <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('bundles/wallabagcore/js/bookmarklet.js') }}"></script>
+    </head>
+    <body>
+    {% include "WallabagCoreBundle::_top.html.twig" %}
+    <div id="main">
+        {% block menu %}{% endblock %}
+        {% block precontent %}{% endblock %}
+        {{ include("WallabagCoreBundle::_messages.html.twig", {'flashMessages': app.session.flashbag.get('notice')}) }}
+        <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/public/css/style-solarized-dark.css b/src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/public/css/style-solarized-dark.css
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/css/style-solarized-dark.css
rename to src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/public/css/style-solarized-dark.css
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/backtotop.png b/src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/public/img/solarized-dark/backtotop.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/backtotop.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/public/img/solarized-dark/backtotop.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/bad-display.png b/src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/public/img/solarized-dark/bad-display.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/bad-display.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/public/img/solarized-dark/bad-display.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/checkmark-off.png b/src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/public/img/solarized-dark/checkmark-off.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/checkmark-off.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/public/img/solarized-dark/checkmark-off.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/checkmark-on.png b/src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/public/img/solarized-dark/checkmark-on.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/checkmark-on.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/public/img/solarized-dark/checkmark-on.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/down.png b/src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/public/img/solarized-dark/down.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/down.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/public/img/solarized-dark/down.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/envelop.png b/src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/public/img/solarized-dark/envelop.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/envelop.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/public/img/solarized-dark/envelop.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/flattr.png b/src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/public/img/solarized-dark/flattr.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/flattr.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/public/img/solarized-dark/flattr.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/left.png b/src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/public/img/solarized-dark/left.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/left.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/public/img/solarized-dark/left.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/link.png b/src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/public/img/solarized-dark/link.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/link.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/public/img/solarized-dark/link.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/remove.png b/src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/public/img/solarized-dark/remove.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/remove.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/public/img/solarized-dark/remove.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/rss.png b/src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/public/img/solarized-dark/rss.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/rss.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/public/img/solarized-dark/rss.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/shaarli.png b/src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/public/img/solarized-dark/shaarli.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/shaarli.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/public/img/solarized-dark/shaarli.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/star-off.png b/src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/public/img/solarized-dark/star-off.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/star-off.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/public/img/solarized-dark/star-off.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/star-on.png b/src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/public/img/solarized-dark/star-on.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/star-on.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/public/img/solarized-dark/star-on.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/top.png b/src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/public/img/solarized-dark/top.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/top.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/public/img/solarized-dark/top.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/twitter.png b/src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/public/img/solarized-dark/twitter.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/solarized-dark/public/img/solarized-dark/twitter.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/public/img/solarized-dark/twitter.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/screenshot.jpg b/src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/screenshot.jpg
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/solarized-dark/screenshot.jpg
rename to src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/screenshot.jpg
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized-dark/theme.ini b/src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/theme.ini
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/solarized-dark/theme.ini
rename to src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/theme.ini
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized/README.md b/src/Wallabag/CoreBundle/Resources/views/themes/solarized/README.md
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/solarized/README.md
rename to src/Wallabag/CoreBundle/Resources/views/themes/solarized/README.md
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized/Solarized-LICENSE.txt b/src/Wallabag/CoreBundle/Resources/views/themes/solarized/Solarized-LICENSE.txt
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/solarized/Solarized-LICENSE.txt
rename to src/Wallabag/CoreBundle/Resources/views/themes/solarized/Solarized-LICENSE.txt
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/solarized/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/solarized/layout.html.twig
new file mode 100644
index 000000000..bdb1a6fa2
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/solarized/layout.html.twig
@@ -0,0 +1,38 @@
+<!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:themes:_global/_head_icon.html.twig" %}
+
+        <link rel="stylesheet" href="{{ asset('themes/_global/css/knacss.css') }}" media="all">
+        <link rel="stylesheet" href="{{ asset('themes/_global/css/style.css') }}" media="all">
+        <link rel="stylesheet" href="{{ asset('themes/solarized/css/style-solarized.css') }}" media="all">
+
+        <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('bundles/wallabagcore/js/bookmarklet.js') }}"></script>
+    </head>
+    <body>
+    {% include "WallabagCoreBundle::_top.html.twig" %}
+    <div id="main">
+        {% block menu %}{% endblock %}
+        {% block precontent %}{% endblock %}
+        {{ include("WallabagCoreBundle::_messages.html.twig", {'flashMessages': app.session.flashbag.get('notice')}) }}
+        <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/public/css/style-solarized.css b/src/Wallabag/CoreBundle/Resources/views/themes/solarized/public/css/style-solarized.css
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/solarized/public/css/style-solarized.css
rename to src/Wallabag/CoreBundle/Resources/views/themes/solarized/public/css/style-solarized.css
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/backtotop.png b/src/Wallabag/CoreBundle/Resources/views/themes/solarized/public/img/solarized/backtotop.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/backtotop.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/solarized/public/img/solarized/backtotop.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/bad-display.png b/src/Wallabag/CoreBundle/Resources/views/themes/solarized/public/img/solarized/bad-display.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/bad-display.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/solarized/public/img/solarized/bad-display.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/checkmark-off.png b/src/Wallabag/CoreBundle/Resources/views/themes/solarized/public/img/solarized/checkmark-off.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/checkmark-off.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/solarized/public/img/solarized/checkmark-off.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/checkmark-on.png b/src/Wallabag/CoreBundle/Resources/views/themes/solarized/public/img/solarized/checkmark-on.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/checkmark-on.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/solarized/public/img/solarized/checkmark-on.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/down.png b/src/Wallabag/CoreBundle/Resources/views/themes/solarized/public/img/solarized/down.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/down.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/solarized/public/img/solarized/down.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/envelop.png b/src/Wallabag/CoreBundle/Resources/views/themes/solarized/public/img/solarized/envelop.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/envelop.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/solarized/public/img/solarized/envelop.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/flattr.png b/src/Wallabag/CoreBundle/Resources/views/themes/solarized/public/img/solarized/flattr.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/flattr.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/solarized/public/img/solarized/flattr.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/left.png b/src/Wallabag/CoreBundle/Resources/views/themes/solarized/public/img/solarized/left.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/left.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/solarized/public/img/solarized/left.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/link.png b/src/Wallabag/CoreBundle/Resources/views/themes/solarized/public/img/solarized/link.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/link.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/solarized/public/img/solarized/link.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/remove.png b/src/Wallabag/CoreBundle/Resources/views/themes/solarized/public/img/solarized/remove.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/remove.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/solarized/public/img/solarized/remove.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/rss.png b/src/Wallabag/CoreBundle/Resources/views/themes/solarized/public/img/solarized/rss.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/rss.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/solarized/public/img/solarized/rss.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/shaarli.png b/src/Wallabag/CoreBundle/Resources/views/themes/solarized/public/img/solarized/shaarli.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/shaarli.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/solarized/public/img/solarized/shaarli.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/star-off.png b/src/Wallabag/CoreBundle/Resources/views/themes/solarized/public/img/solarized/star-off.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/star-off.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/solarized/public/img/solarized/star-off.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/star-on.png b/src/Wallabag/CoreBundle/Resources/views/themes/solarized/public/img/solarized/star-on.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/star-on.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/solarized/public/img/solarized/star-on.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/top.png b/src/Wallabag/CoreBundle/Resources/views/themes/solarized/public/img/solarized/top.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/top.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/solarized/public/img/solarized/top.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/twitter.png b/src/Wallabag/CoreBundle/Resources/views/themes/solarized/public/img/solarized/twitter.png
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/solarized/public/img/solarized/twitter.png
rename to src/Wallabag/CoreBundle/Resources/views/themes/solarized/public/img/solarized/twitter.png
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized/screenshot.jpg b/src/Wallabag/CoreBundle/Resources/views/themes/solarized/screenshot.jpg
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/solarized/screenshot.jpg
rename to src/Wallabag/CoreBundle/Resources/views/themes/solarized/screenshot.jpg
diff --git a/src/Wallabag/CoreBundle/Resources/views/solarized/theme.ini b/src/Wallabag/CoreBundle/Resources/views/themes/solarized/theme.ini
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/solarized/theme.ini
rename to src/Wallabag/CoreBundle/Resources/views/themes/solarized/theme.ini
diff --git a/src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php b/src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php
index 9b1a0986e..d7d341aa2 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]);
     }
 }
diff --git a/web/themes/_global b/web/themes/_global
index 56b6a9554..e22d78465 120000
--- a/web/themes/_global
+++ b/web/themes/_global
@@ -1 +1 @@
-../../src/Wallabag/CoreBundle/Resources/views/_global/public
\ No newline at end of file
+../../src/Wallabag/CoreBundle/Resources/views/themes/_global/public/
\ No newline at end of file
diff --git a/web/themes/baggy b/web/themes/baggy
index c36c831a9..77cce5ed9 120000
--- a/web/themes/baggy
+++ b/web/themes/baggy
@@ -1 +1 @@
-../../src/Wallabag/CoreBundle/Resources/views/baggy/public
\ No newline at end of file
+../../src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/
\ No newline at end of file
diff --git a/web/themes/dark b/web/themes/dark
index fa4ed880b..d0f303e8c 120000
--- a/web/themes/dark
+++ b/web/themes/dark
@@ -1 +1 @@
-../../src/Wallabag/CoreBundle/Resources/views/dark/public
\ No newline at end of file
+../../src/Wallabag/CoreBundle/Resources/views/themes/dark/public
\ No newline at end of file
diff --git a/web/themes/default b/web/themes/default
index ee26b90df..7404d328b 120000
--- a/web/themes/default
+++ b/web/themes/default
@@ -1 +1 @@
-../../src/Wallabag/CoreBundle/Resources/views/default/public
\ No newline at end of file
+../../src/Wallabag/CoreBundle/Resources/views/themes/default/public
\ No newline at end of file
diff --git a/web/themes/dmagenta b/web/themes/dmagenta
index bcd8ef759..65877a0ee 120000
--- a/web/themes/dmagenta
+++ b/web/themes/dmagenta
@@ -1 +1 @@
-../../src/Wallabag/CoreBundle/Resources/views/dmagenta/public/
\ No newline at end of file
+../../src/Wallabag/CoreBundle/Resources/views/themes/dmagenta/public/
\ No newline at end of file
diff --git a/web/themes/solarized b/web/themes/solarized
index c44d5cef5..4cd35fd8b 120000
--- a/web/themes/solarized
+++ b/web/themes/solarized
@@ -1 +1 @@
-../../src/Wallabag/CoreBundle/Resources/views/solarized/public
\ No newline at end of file
+../../src/Wallabag/CoreBundle/Resources/views/themes/solarized/public
\ No newline at end of file
diff --git a/web/themes/solarized-dark b/web/themes/solarized-dark
index 0d548c411..06f67e2bb 120000
--- a/web/themes/solarized-dark
+++ b/web/themes/solarized-dark
@@ -1 +1 @@
-../../src/Wallabag/CoreBundle/Resources/views/solarized-dark/public
\ No newline at end of file
+../../src/Wallabag/CoreBundle/Resources/views/themes/solarized-dark/public
\ No newline at end of file