deck.xml simplication, vgdeck type tweak