Adds support for theming lib and vendor folders.
resolve merge conflicts, add test
Merge branch 'FokkeZB-TC-5133'