update themes and theme generator
Theme generator update
delete some return null
theme generator update
Merge pull request #3 from solispauwels/master

Update themes and theme generator