colors n stuff
next commit
merge