merge complete, cleanup + flat-theme sass change