Prototype merging

mostly done with initial theme, check back to master for seed