Fix some more theme issues