Issue #623: Colorthemes cleanup
Done.