Default style values have been tweaked.
Conflicts have been resolved.