More theme improvements