Modern look changes
Merge pull request #43 from CE4DC/shawn

Modern look changes