Update theme info
Merge branch 'master' into distilled