Foundation colors
Fixed merge conflicts