Stylesheets - tidy

the stylesheets had some conflict code in them, hopefully this will tidy
them up and stop the constant update?