More theme work clean up