Code cleanup, Color support