START : two folders, two themes, the OLD, the less OLD. Gotta merge them now