New Armory settings almost complete