Solutions for the 2000 file limit?

Merging single songs together is indeed a possible solution and something I partly practice myself. Another workaround would be to use the player in «Folder» mode, where the 2000 file limit is invalid. The downside of this solution is that shuffle play is only possible within the selected folder. Therefore all my music files are in the «Music» folder – which makes reactions to commands quite slow.