Improve dependency injection throughout

Problem/Motivation

These kind of reports have been identified by kind souls on here.

...calls should be avoided in classes, use dependency injection instead...

Sadly the patches created errors. Due to limited time on my part, it would be super helpful if someone can help by providing a patch.

Please test saving the settings forms.