Sort statuses so they appear in the right order
Merge branch 'master' into theming
More theme updates
Smarkets theme
More tweaks