Improve base styles, Fixes #105