Merge pull request #787 from sylus/master

Small updates to Theme