Initial mod update pass

Not perfect, will need a second swing.
Pass #2

Herp de derp learn to resolve conflicts, Velo
XML re-established for Experimental builds

The stable XML isn't really necessary here so it's been removed.