Fix bad merge, re-add new DS Armor modules