Long overdue overhaul of the plugin template system