task #0002-Base_theme
Merge branch '0002-Base_theme' into develop