Unify SOF track macros
Unify SOTBE track macros