Updated themes
Merge branch 'master' of git://github.com/shower/shower

Conflicts:
	themes/ribbon