Bit more theme refactoring