Refactor Stylesheets

some refactoring and improvements