Vinos theme fix features
Merge branch '0010-vinos-theme' into develop