Still some more theme fixes