Some more theme improvements