Sort themes
Sort properly