Removed branding in functions and make them dynamic by using static vars [Finishes #80108596]

Improved class with several fixes to brand the support framework.
Why is this function public at all?