merge
fix colorthem