Location and escaping corrections

A variety of minor changes I made while reviewing the theme for localization improvements.