Updated the color scheme - still a bit uggly