Master Commit

This is what is on the live site right now.
All colors and everything is in