Feature/stylesheet restructure