Prep for merge.
merge conflicts
Fixed merge conflict.
Completed formatting of colors.