Theme fix
Merge branch '006-theme-create' into develop