[22] some armory style changes