Updates.
Moved color stuff to theme attributes rather than hardcoded Java.