Merge default styling with master