Rename themes

Rename some themes with bad names. Also review the descriptions.