some more theme fixes