Adjusted addons to new API
GearSwap: Fix
Merge pull request #521 from z16/4.1

Merge