Changing markup for new push-pull classes
Added compatibility with F4 source ordering classes