Color scheme improvement and various redlines