Upgraded to latest janitor and color scheme