Extended find and replace to ensure we are consistent on the spelling of 'themeable'