Adds colors and fixes whitespace consistency