ADD new light theme, MERGE upstream changes