deck.xml overhaul