Merge pull request #1203 from voltan/develop

Improve theme