Some colour improvements, cleanup stuff