Changed to fit new color scheme - 90% there