made a few tests pass
Merge branch 'master' of https://github.com/HandyAndyShortStack/theme_and_variations