Refactor styles for Stylus, simplify CS