Do some themeing fixes.  Hurrah for pretty.