Finishing up some theme-check things.