Revamp Styles

See #71