Added colors, weapon class without interaction