201402 upgrade first round

Some templates, oncompletes still need revision.  Lightbox
implementation unfinished