REALLY fixed macros this time, adjusted colors and some other things