update omni template
refactoring omni