Update template and styles to utilize set-op-group