HCSVLAB-292: updated color scheme
HCSVLAB-292: Many minor fixes to consistancy and color