Changed to custom color scheme
Merge