More cleanup in prep for theming.
Added initial theme support.