New template workspace (minor updates)