Fix styling

This is the rebased changes against the original stylus file.