Some other ideas about handling the theming

(cherry picked from commit 3e4d354f8fa163548d710fb87b5d8e18b531229c)

Conflicts:
	src/lib/VSDContentCollector.cpp
	src/lib/VSDStyles.cpp

Change-Id: Iec8c5f49827ee2b18ddf97d37077b2f0798a0685