Merging changes from Anchor Themes repo into mine

Had merge conflict, using GitHub to pull changes in.