Merge branch '1659_darker_color_style'