I still think it's worth looking into a solution before this release. How much of this template is strictly duplicated? (Likewise for the others?) I suspect nearly everything.