Lots of cleaning up and theme changes.