Merge in revamped assets rig from app-template.