Little changes to theme parsing

(cherry picked from commit f20f0bed4e545355f37f008cf311833c7907506a)

Conflicts:
	src/lib/VSDXTheme.h

Change-Id: Ie5e7b86799fda82611edf299952a8508efd7dc5f