Re-write stylesheet according to SMURF principles 

Base of re-writing
Adding new classes