theme standalone build
moved files for standalone theme build
removed theme naming from theme index
resolved master merge conflicts