Fix for java-mode
Improve org keyword faces