Fix ZX up systematic template
Some more style updates
Some more changes
Merge VBFAdditions