Rework styles to make use of SASS features