diff --git a/src/Wallabag/CoreBundle/Resources/views/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/Config/index.html.twig
rename to src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig
diff --git a/src/Wallabag/CoreBundle/Resources/views/Entry/edit.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/edit.html.twig
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/Entry/edit.html.twig
rename to src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/edit.html.twig
diff --git a/src/Wallabag/CoreBundle/Resources/views/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/Entry/entries.html.twig
rename to src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig
diff --git a/src/Wallabag/CoreBundle/Resources/views/Entry/entries.xml.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.xml.twig
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/Entry/entries.xml.twig
rename to src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.xml.twig
diff --git a/src/Wallabag/CoreBundle/Resources/views/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/Entry/entry.html.twig
rename to src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig
diff --git a/src/Wallabag/CoreBundle/Resources/views/Entry/new.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/new.html.twig
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/Entry/new.html.twig
rename to src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/new.html.twig
diff --git a/src/Wallabag/CoreBundle/Resources/views/Entry/new_form.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/new_form.html.twig
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/Entry/new_form.html.twig
rename to src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/new_form.html.twig
diff --git a/src/Wallabag/CoreBundle/Resources/views/Mail/forgotPassword.txt.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Mail/forgotPassword.txt.twig
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/Mail/forgotPassword.txt.twig
rename to src/Wallabag/CoreBundle/Resources/views/themes/baggy/Mail/forgotPassword.txt.twig
diff --git a/src/Wallabag/CoreBundle/Resources/views/Security/checkEmail.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/checkEmail.html.twig
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/Security/checkEmail.html.twig
rename to src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/checkEmail.html.twig
diff --git a/src/Wallabag/CoreBundle/Resources/views/Security/forgotPassword.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/forgotPassword.html.twig
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/Security/forgotPassword.html.twig
rename to src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/forgotPassword.html.twig
diff --git a/src/Wallabag/CoreBundle/Resources/views/Security/login.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/login.html.twig
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/Security/login.html.twig
rename to src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/login.html.twig
diff --git a/src/Wallabag/CoreBundle/Resources/views/Security/reset.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/reset.html.twig
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/Security/reset.html.twig
rename to src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/reset.html.twig
diff --git a/src/Wallabag/CoreBundle/Resources/views/Static/about.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/about.html.twig
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/Static/about.html.twig
rename to src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/about.html.twig
diff --git a/src/Wallabag/CoreBundle/Resources/views/Static/howto.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/howto.html.twig
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/Static/howto.html.twig
rename to src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/howto.html.twig
diff --git a/src/Wallabag/CoreBundle/Resources/views/Tag/new_form.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Tag/new_form.html.twig
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/Tag/new_form.html.twig
rename to src/Wallabag/CoreBundle/Resources/views/themes/baggy/Tag/new_form.html.twig
diff --git a/src/Wallabag/CoreBundle/Resources/views/Tag/tags.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Tag/tags.html.twig
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/Tag/tags.html.twig
rename to src/Wallabag/CoreBundle/Resources/views/themes/baggy/Tag/tags.html.twig