further theme improvements