more theme improvements