Push up a couple additions from Martijn to the compser file and overwriting existing CSS classes