Updated to fit color scheme