Upgraded color scheme and Janitor