Merge in all styling changes for version 1.0.