Fix formatting for theme factory.
Cleanup:
* Fix grunt
* Break testing