Finish Style cleanup. Also start using resource bundles.