CSS Updates

Removed settings sass; merged content with theme sass