Merged in IntelliJ 10 colors