DEV: shift atlas and match geometry of template (issue #221)