More syntax highlighting, java side mostly done.