fix
rm old color-theme
merge