merge
merge
moved java-specific highlight colors to java. Use default lang keys for java.

into type alias name