Even better shuffle behaviour, previous/next now work, also clicking a song manually during shuffle swaps it in the playlist to the current position! Closes #1