Merge in standalone branch

The legacy version (child theme) has been forked to another repo for easy testing of this one, so we can merge the standalone branch into master