Styleguide templete refactoring