[Clique] Grid updates
Merge branch 'master' of github.com:stagebloc/themes