theme review feedback fixes
got the last occurrences of _s out of here.