Stripped optional stuff, restructure of main stylesheet