Removing two clones of the themes that didn't belong there, started converting Yotsubatwo to new theme system