Layout refactorisé
Merge branch 'theming-branch'