update colors, remove bundle from repo
merge changes