by mistermarco: #96 - handle multiple theming functions, code refactoring
Merge pull request #101 from mistermarco/7.x-2.x

by mistermarco: #96 - handle multiple theming functions, code refactorin...