Add some weapons package and fix color-id management