default.xml overhaul

completely overhauled the default.xml in preparation for our source code!