shuffling theme.info files around
merging JC's changes and updating some files