Updates to styles
Update tile colors
Merge