Fix up merge (project template and plugin IDs were wrong)