[#609] Further Stylesheet and Template refactor