Tweaks to simple register to make the styling plainer.
Merge branch 'upstream/develop'