Made changes to colors and the whole shebang