GUI update
Merge remote-tracking branch 'upstream/master'
gui update + js error  fix in theme generator
Merge remote-tracking branch 'upstream/master'
Merge pull request #273 from solispauwels/master

gui update + js error fix in theme generator