more theme fixes