Dark color
Merge branch 'hotfix/flag_color'