Fix colors + whitespace