Incorporating styles/tmpl from the design branch