Move partials around
Switch from xyzzyBootstrap functions to overridable partials
New template