Commit 7: Re-build and re-style.