lots of color change and misc stuff, forgot all my commits :)