theme improvements