Add more sort-types, sound for push, bugfixes etc.