Added more adherence to the color scheme in Main