Revert "Greatly simplified 3rd party addon support."

This reverts commit daf423736ba7b878cd02f74a9773a90d594bc1a4.
Fixed issue with saving settings.
toc