2.5 - Bugfixes, default config values and Code quality improvement

What's Changed

• Improve organization for more additions. by @n-tdi in #6
• Added default values (used if something is not configured)
• Fixed that in some conditions the config was ignored.

Full Changelog: 2.4...2.5