diff --git a/.vscode/settings.json b/.vscode/settings.json
index b3d7f118..cd17a697 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,6 +1,80 @@
 {
     "cmake.configureOnOpen": false,
     "gitlens.advanced.blame.customArguments": [
-	"--ignore-revs-file", ".git-blame-ignore-revs"
-    ]
-}
+        "--ignore-revs-file",
+        ".git-blame-ignore-revs"
+    ],
+    "files.associations": {
+        "array": "cpp",
+        "atomic": "cpp",
+        "bit": "cpp",
+        "bitset": "cpp",
+        "cctype": "cpp",
+        "charconv": "cpp",
+        "chrono": "cpp",
+        "clocale": "cpp",
+        "cmath": "cpp",
+        "codecvt": "cpp",
+        "compare": "cpp",
+        "concepts": "cpp",
+        "condition_variable": "cpp",
+        "cstdarg": "cpp",
+        "cstddef": "cpp",
+        "cstdint": "cpp",
+        "cstdio": "cpp",
+        "cstdlib": "cpp",
+        "cstring": "cpp",
+        "ctime": "cpp",
+        "cwchar": "cpp",
+        "cwctype": "cpp",
+        "deque": "cpp",
+        "list": "cpp",
+        "map": "cpp",
+        "set": "cpp",
+        "string": "cpp",
+        "unordered_map": "cpp",
+        "unordered_set": "cpp",
+        "vector": "cpp",
+        "exception": "cpp",
+        "algorithm": "cpp",
+        "functional": "cpp",
+        "iterator": "cpp",
+        "memory": "cpp",
+        "memory_resource": "cpp",
+        "numeric": "cpp",
+        "optional": "cpp",
+        "random": "cpp",
+        "ratio": "cpp",
+        "regex": "cpp",
+        "string_view": "cpp",
+        "system_error": "cpp",
+        "tuple": "cpp",
+        "type_traits": "cpp",
+        "utility": "cpp",
+        "format": "cpp",
+        "fstream": "cpp",
+        "initializer_list": "cpp",
+        "iomanip": "cpp",
+        "iosfwd": "cpp",
+        "iostream": "cpp",
+        "istream": "cpp",
+        "limits": "cpp",
+        "mutex": "cpp",
+        "new": "cpp",
+        "numbers": "cpp",
+        "ostream": "cpp",
+        "semaphore": "cpp",
+        "span": "cpp",
+        "sstream": "cpp",
+        "stdexcept": "cpp",
+        "stop_token": "cpp",
+        "streambuf": "cpp",
+        "text_encoding": "cpp",
+        "thread": "cpp",
+        "cinttypes": "cpp",
+        "typeinfo": "cpp",
+        "variant": "cpp",
+        "csignal": "cpp",
+        "future": "cpp"
+    }
+}
\ No newline at end of file
diff --git a/html/locales/de.json b/html/locales/de.json
index 2b748b35..f7cc9f73 100644
--- a/html/locales/de.json
+++ b/html/locales/de.json
@@ -185,9 +185,12 @@
 					"2": "Einzelner Titel (Endlosschleife)",
 					"12": "Einzelner Titel eines Verzeichnis (zufällig). Danach schlafen.",
 					"3": "Hörbuch",
+					"16": "Hörbuch mit Unterverzeichnissen (rekursiv)",
 					"4": "Hörbuch (Endlosschleife)",
 					"5": "Alle Titel eines Verzeichnis (sortiert)",
+					"15": "Alle Titel eines Verzeichnis + Unterverzeichnisse (rekursiv, sortiert)",
 					"6": "Alle Titel eines Verzeichnis (zufällig)",
+					"17": "Alle Titel eines Verzeichnis + Unterverzeichnisse (rekursiv, zufällig)",
 					"7": "Alle Titel eines Verzeichnis (sortiert, Endlosschleife)",
 					"9": "Alle Titel eines Verzeichnis (zufällig, Endlosschleife)",
 					"13": "Alle Titel aus einem zufälligen Unterverzeichnis (sortiert)",
@@ -234,6 +237,8 @@
 					"181": "Springe rückwärts (n Sekunden)",
 					"182": "Stop",
 					"183": "Neustart",
+					"184": "Springe zum nächsten Ordner",
+					"185": "Springe zum vorherigen Ordner",
 					"199": "Taskauslastung anzeigen (Konsole)",
 					"241": "Spiele virtuelle RFID-Karte 01",
 					"242": "Spiele virtuelle RFID-Karte 02",
@@ -374,7 +379,8 @@
 			"sortMode": "Sortierungsmodus für Wiedergabeliste und Dateibrowser",
 			"strcmp": "Standardsortierung",
 			"strnatcmp": "Natürlich: Groß- und Kleinschreibung beachten",
-			"strnatcasecmp": "Natürlich: Groß- und Kleinschreibung ignorieren"
+			"strnatcasecmp": "Natürlich: Groß- und Kleinschreibung ignorieren",
+			"recDepth": "Maximale Rekursionstiefe beim Generieren der Rekursiv-Playlists"
 		}
 	},
 	"tools": {
diff --git a/html/locales/en.json b/html/locales/en.json
index 9cd05541..e336a67a 100644
--- a/html/locales/en.json
+++ b/html/locales/en.json
@@ -185,9 +185,12 @@
 					"2": "Single track (loop)",
 					"12": "Single track of a directory (random). Followed by sleep.",
 					"3": "Audiobook",
+					"16": "Audiobook with subdirectories (rekursive)",
 					"4": "Audiobook (loop)",
 					"5": "All tracks of a directory (sorted)",
+					"15": "All tracks of a directory + subdirectories (sorted, recursive)",
 					"6": "All tracks of a directory (random)",
+					"17": "All tracks of a directory + subdirectories (random, recursive)",
 					"7": "All tracks of a directory (sorted, loop)",
 					"9": "All tracks of a directory (random, loop)",
 					"13": "All tracks of a random subdirectory (sorted)",
@@ -234,6 +237,8 @@
 					"181": "Seek backwards (n seconds)",
 					"182": "Stop",
 					"183": "Restart",
+					"184": "Jump to next folder",
+					"185": "Jump to previous folder",
 					"199": "Display task load (console)",
 					"241": "Play virtual RFID-card 01",
 					"242": "Play virtual RFID-card 02",
@@ -374,7 +379,8 @@
 			"sortMode": "Sorting mode for playlist and file browser",
 			"strcmp": "Standard sorting",
 			"strnatcmp": "Natural: case-sensitive",
-			"strnatcasecmp": "Natural: case-insensitive"
+			"strnatcasecmp": "Natural: case-insensitive",
+			"recDepth": "Maximum recursion depth at generation of recursive playlists"
 		}
 	},
 	"tools": {
diff --git a/html/locales/fr.json b/html/locales/fr.json
index a5d8366a..df3261be 100644
--- a/html/locales/fr.json
+++ b/html/locales/fr.json
@@ -185,9 +185,12 @@
 					"2": "Piste unique (boucle)",
 					"12": "Piste unique d'un répertoire (aléatoire). Suivi par un mode veille.",
 					"3": "Livre audio",
+					"16": "Livre audio avec sous-répertoires (récursif)",
 					"4": "Livre audio (boucle)",
 					"5": "Toutes les pistes d'un répertoire (triées)",
+					"15": "Tous les titres d'un répertoire + sous-répertoires (triées, récursif)",
 					"6": "Toutes les pistes d'un répertoire (aléatoire)",
+					"17": "Tous les titres d'un répertoire + sous-répertoires (aléatoire, récursif)",
 					"7": "Toutes les pistes d'un répertoire (triées, boucle)",
 					"9": "Toutes les pistes d'un répertoire (aléatoire, boucle)",
 					"13": "Toutes les pistes d'un sous-répertoire aléatoire (triées)",
@@ -234,6 +237,8 @@
 					"181": "Reculer de n secondes",
 					"182": "Stop",
 					"183": "Redémarrer",
+					"184": "Passer au dossier suivant",
+					"185": "Passer au dossier précédent",
 					"199": "Affichage de la charge de travail (console)",
 					"241": "Jouez à la carte RFID virtuelle 01",
 					"242": "Jouez à la carte RFID virtuelle 02",
@@ -374,7 +379,8 @@
 			"sortMode": "Mode de tri pour la liste de lecture et le navigateur de fichiers",
 			"strcmp": "Tri standard",
 			"strnatcmp": "Naturel: sensible à la casse",
-			"strnatcasecmp": "Naturel: insensible à la casse"
+			"strnatcasecmp": "Naturel: insensible à la casse",
+			"recDepth": "Profondeur de récursion maximale lors de la génération de playlists récursives"
 		}
 	},
 	"tools": {
diff --git a/html/management.html b/html/management.html
index 576ec885..a4efa75d 100644
--- a/html/management.html
+++ b/html/management.html
@@ -697,12 +697,20 @@ <h5 class="modal-title" data-i18n="tools.nvs.erase.title"></h5>
 											data-i18n="files.rfid.playmode.mode.12"></option>
 										<option class="option-file-and-folder" value="3"
 											data-i18n="files.rfid.playmode.mode.3"></option>
+										<option class="option-file-and-folder" value="16"
+											data-i18n="files.rfid.playmode.mode.16"></option>
 										<option class="option-file-and-folder" value="4"
 											data-i18n="files.rfid.playmode.mode.4"></option>
 										<option class="option-folder" value="5" data-i18n="files.rfid.playmode.mode.5">
 										</option>
+										<option class="option-folder" value="15"
+											data-i18n="files.rfid.playmode.mode.15">
+										</option>
 										<option class="option-folder" value="6" data-i18n="files.rfid.playmode.mode.6">
 										</option>
+										<option class="option-folder" value="17"
+											data-i18n="files.rfid.playmode.mode.17">
+										</option>
 										<option class="option-folder" value="7" data-i18n="files.rfid.playmode.mode.7">
 										</option>
 										<option class="option-folder" value="9" data-i18n="files.rfid.playmode.mode.9">
@@ -1117,6 +1125,15 @@ <h5 class="modal-title" data-i18n="tools.nvs.erase.title"></h5>
 								<option value="1" data-i18n="general.playlist.strcmp"></option>
 							</select>
 						</fieldset>
+						<fieldset>
+							<label for="playlistRecDepth" data-i18n="[prepend]general.playlist.recDepth">:</label>
+							<select id="playlistRecDepth" name="playlistRecDepth" class="form-control form-select">
+								<option value="4">4</option>
+								<option value="3">3</option>
+								<option value="2">2</option>
+								<option value="1">1</option>
+							</select>
+						</fieldset>
 					</div>
 					<p data-i18n="settingsex.title"></p>
 					<button class="btn btn-primary" type="button" data-bs-toggle="collapse"
@@ -2287,6 +2304,7 @@ <h5 class="modal-title" data-i18n="tools.nvs.erase.title"></h5>
 			let playlistSettings = settings.playlist;
 			if (playlistSettings) {
 				$("#playlistSortMode").val(playlistSettings.sortMode).change();
+				$("#playlistRecDepth").val(playlistSettings.recDepth).change();
 			}
 			// rotary encoder
 			let rotarySettings = settings.rotary;
@@ -2626,7 +2644,8 @@ <h5 class="modal-title" data-i18n="tools.nvs.erase.title"></h5>
 					voltageCheckInterval: Number($('#voltageCheckInterval').val())
 				},
 				"playlist": {
-					sortMode: Number($('#playlistSortMode').val())
+					sortMode: Number($('#playlistSortMode').val()),
+					recDepth: Number($('#playlistRecDepth').val()),
 				},
 				"buttons": {
 					short0: Number(document.getElementById("cmdselect_short_0").value),
@@ -3162,7 +3181,7 @@ <h5 class="modal-title" data-i18n="tools.nvs.erase.title"></h5>
 			const cmdElem = document.createElement('select');
 			const cmdNothing = addOption(cmdElem, 0);
 			cmdNothing.setAttribute('data-i18n', "settingsex.buttons.noaction");
-			const cmds = [170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 199, 150, 151, 152, 120, 100, 101, 102, 103, 104, 105, 106, 107, 110, 111, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250];
+			const cmds = [170, 171, 172, 173, 174, 184, 185, 175, 176, 177, 178, 179, 180, 181, 182, 183, 199, 150, 151, 152, 120, 100, 101, 102, 103, 104, 105, 106, 107, 110, 111, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250];
 			for (const cmd of cmds) {
 				addOption(cmdElem, cmd);
 			}
@@ -3172,7 +3191,7 @@ <h5 class="modal-title" data-i18n="tools.nvs.erase.title"></h5>
 
 			/* The <select /> that houses all commands for the modification selectors */
 			const modElem = document.createElement('select');
-			const mods = [100, 179, 101, 102, 103, 104, 105, 106, 110, 111, 120, 130, 140, 141, 142, 150, 151, 152, 0, 170, 171, 172, 173, 174, 180, 181, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250];
+			const mods = [100, 179, 101, 102, 103, 104, 105, 106, 110, 111, 120, 130, 140, 141, 142, 150, 151, 152, 0, 170, 171, 172, 173, 174, 184, 185, 180, 181, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250];
 			for (const mod of mods) {
 				addOption(modElem, mod);
 			}
diff --git a/src/AudioPlayer.cpp b/src/AudioPlayer.cpp
index ef4c22ea..b8952440 100644
--- a/src/AudioPlayer.cpp
+++ b/src/AudioPlayer.cpp
@@ -89,7 +89,7 @@ static bool AudioPlayer_ArrSortHelper_strnatcmp(const char *a, const char *b);
 static bool AudioPlayer_ArrSortHelper_strnatcasecmp(const char *a, const char *b);
 static void AudioPlayer_SortPlaylist(Playlist *playlist);
 static void AudioPlayer_RandomizePlaylist(Playlist *playlist);
-static size_t AudioPlayer_NvsRfidWriteWrapper(const char *_rfidCardId, const char *_track, const uint32_t _playPosition, const uint8_t _playMode, const uint16_t _trackLastPlayed, const uint16_t _numberOfTracks);
+static size_t AudioPlayer_NvsRfidWriteWrapper(const char *_rfidCardId, const uint32_t _playPosition, const uint8_t _playMode, const uint16_t _trackLastPlayed);
 static void AudioPlayer_ClearCover(void);
 
 void Audio_TaskPause(void) {
@@ -220,7 +220,7 @@ void AudioPlayer_Exit(void) {
 	playTimeSecTotal += playTimeSecSinceStart;
 	gPrefsSettings.putULong("playTimeTotal", playTimeSecTotal);
 	// Make sure last playposition for audiobook is saved when playback is active while shutdown was initiated
-	if (gPrefsSettings.getBool("savePosShutdown", false) && !gPlayProperties.pausePlay && (gPlayProperties.playMode == AUDIOBOOK || gPlayProperties.playMode == AUDIOBOOK_LOOP)) {
+	if (gPrefsSettings.getBool("savePosShutdown", false) && !gPlayProperties.pausePlay && (gPlayProperties.playMode == AUDIOBOOK || gPlayProperties.playMode == AUDIOBOOK_LOOP || gPlayProperties.playMode == AUDIOBOOK_RECURSIVE)) {
 		AudioPlayer_SetTrackControl(PAUSEPLAY);
 		// Call the loop explicitely to make sure that PAUSE is set (because this saves the current playpos)
 		AudioPlayer_Loop();
@@ -448,7 +448,7 @@ void AudioPlayer_Loop() {
 			newPlayListAvailable = false;
 			audio->stopSong();
 
-			// destroy the old playlist and assign the new
+			// destroy the old playlist and assign the new one
 			freePlaylist(gPlayProperties.playlist);
 			gPlayProperties.playlist = newPlayList;
 			Log_Printf(LOGLEVEL_NOTICE, newPlaylistReceived, gPlayProperties.playlist->size());
@@ -477,7 +477,7 @@ void AudioPlayer_Loop() {
 			if (gPlayProperties.saveLastPlayPosition) { // Don't save for AUDIOBOOK_LOOP because not necessary
 				if (gPlayProperties.currentTrackNumber + 1 < gPlayProperties.playlist->size()) {
 					// Only save if there's another track, otherwise it will be saved at end of playlist anyway
-					AudioPlayer_NvsRfidWriteWrapper(gPlayProperties.playRfidTag, gPlayProperties.playlist->at(gPlayProperties.currentTrackNumber), 0, gPlayProperties.playMode, gPlayProperties.currentTrackNumber + 1, gPlayProperties.playlist->size());
+					AudioPlayer_NvsRfidWriteWrapper(gPlayProperties.playRfidTag, 0, gPlayProperties.playMode, gPlayProperties.currentTrackNumber + 1);
 				}
 			}
 			if (gPlayProperties.sleepAfterCurrentTrack) { // Go to sleep if "sleep after track" was requested
@@ -526,7 +526,7 @@ void AudioPlayer_Loop() {
 				}
 				if (gPlayProperties.saveLastPlayPosition && !gPlayProperties.pausePlay) {
 					Log_Printf(LOGLEVEL_INFO, trackPausedAtPos, audio->getAudioCurrentTime(), audio->getAudioFileDuration());
-					AudioPlayer_NvsRfidWriteWrapper(gPlayProperties.playRfidTag, gPlayProperties.playlist->at(gPlayProperties.currentTrackNumber), audio->getAudioCurrentTime(), gPlayProperties.playMode, gPlayProperties.currentTrackNumber, gPlayProperties.playlist->size());
+					AudioPlayer_NvsRfidWriteWrapper(gPlayProperties.playRfidTag, audio->getAudioCurrentTime(), gPlayProperties.playMode, gPlayProperties.currentTrackNumber);
 				}
 				gPlayProperties.pausePlay = !gPlayProperties.pausePlay;
 				Web_SendWebsocketData(0, WebsocketCodeType::TrackInfo);
@@ -553,7 +553,7 @@ void AudioPlayer_Loop() {
 						gPlayProperties.currentTrackNumber++;
 					}
 					if (gPlayProperties.saveLastPlayPosition) {
-						AudioPlayer_NvsRfidWriteWrapper(gPlayProperties.playRfidTag, gPlayProperties.playlist->at(gPlayProperties.currentTrackNumber), 0, gPlayProperties.playMode, gPlayProperties.currentTrackNumber, gPlayProperties.playlist->size());
+						AudioPlayer_NvsRfidWriteWrapper(gPlayProperties.playRfidTag, 0, gPlayProperties.playMode, gPlayProperties.currentTrackNumber);
 						Log_Println(trackStartAudiobook, LOGLEVEL_INFO);
 					}
 					Log_Println(cmndNextTrack, LOGLEVEL_INFO);
@@ -602,7 +602,7 @@ void AudioPlayer_Loop() {
 						}
 
 						if (gPlayProperties.saveLastPlayPosition) {
-							AudioPlayer_NvsRfidWriteWrapper(gPlayProperties.playRfidTag, gPlayProperties.playlist->at(gPlayProperties.currentTrackNumber), 0, gPlayProperties.playMode, gPlayProperties.currentTrackNumber, gPlayProperties.playlist->size());
+							AudioPlayer_NvsRfidWriteWrapper(gPlayProperties.playRfidTag, 0, gPlayProperties.playMode, gPlayProperties.currentTrackNumber);
 							Log_Println(trackStartAudiobook, LOGLEVEL_INFO);
 						}
 
@@ -612,7 +612,7 @@ void AudioPlayer_Loop() {
 						}
 					} else {
 						if (gPlayProperties.saveLastPlayPosition) {
-							AudioPlayer_NvsRfidWriteWrapper(gPlayProperties.playRfidTag, gPlayProperties.playlist->at(gPlayProperties.currentTrackNumber), 0, gPlayProperties.playMode, gPlayProperties.currentTrackNumber, gPlayProperties.playlist->size());
+							AudioPlayer_NvsRfidWriteWrapper(gPlayProperties.playRfidTag, 0, gPlayProperties.playMode, gPlayProperties.currentTrackNumber);
 						}
 						audio->stopSong();
 						Led_Indicate(LedIndicatorType::Rewind);
@@ -636,7 +636,7 @@ void AudioPlayer_Loop() {
 				}
 				gPlayProperties.currentTrackNumber = 0;
 				if (gPlayProperties.saveLastPlayPosition) {
-					AudioPlayer_NvsRfidWriteWrapper(gPlayProperties.playRfidTag, gPlayProperties.playlist->at(gPlayProperties.currentTrackNumber), 0, gPlayProperties.playMode, gPlayProperties.currentTrackNumber, gPlayProperties.playlist->size());
+					AudioPlayer_NvsRfidWriteWrapper(gPlayProperties.playRfidTag, 0, gPlayProperties.playMode, gPlayProperties.currentTrackNumber);
 					Log_Println(trackStartAudiobook, LOGLEVEL_INFO);
 				}
 				Log_Println(cmndFirstTrack, LOGLEVEL_INFO);
@@ -654,7 +654,7 @@ void AudioPlayer_Loop() {
 				if (gPlayProperties.currentTrackNumber + 1 < gPlayProperties.playlist->size()) {
 					gPlayProperties.currentTrackNumber = gPlayProperties.playlist->size() - 1;
 					if (gPlayProperties.saveLastPlayPosition) {
-						AudioPlayer_NvsRfidWriteWrapper(gPlayProperties.playRfidTag, gPlayProperties.playlist->at(gPlayProperties.currentTrackNumber), 0, gPlayProperties.playMode, gPlayProperties.currentTrackNumber, gPlayProperties.playlist->size());
+						AudioPlayer_NvsRfidWriteWrapper(gPlayProperties.playRfidTag, 0, gPlayProperties.playMode, gPlayProperties.currentTrackNumber);
 						Log_Println(trackStartAudiobook, LOGLEVEL_INFO);
 					}
 					Log_Println(cmndLastTrack, LOGLEVEL_INFO);
@@ -668,6 +668,46 @@ void AudioPlayer_Loop() {
 				}
 				break;
 
+			case NEXTFOLDER: // Used for recursive playmodes
+				trackCommand = NO_ACTION;
+				if (gPlayProperties.pausePlay) {
+					audio->pauseResume();
+					gPlayProperties.pausePlay = false;
+				}
+				gPlayProperties.jumpToFolderTrack = SdCard_findNextOrPrevDirectoryTrack(*gPlayProperties.playlist, gPlayProperties.currentTrackNumber, SearchDirection::Forward);
+				if (gPlayProperties.jumpToFolderTrack != -1) {
+					gPlayProperties.currentTrackNumber = gPlayProperties.jumpToFolderTrack;
+					gPlayProperties.jumpToFolderTrack = -1;
+					if (gPlayProperties.saveLastPlayPosition) {
+						AudioPlayer_NvsRfidWriteWrapper(gPlayProperties.playRfidTag, 0, gPlayProperties.playMode, gPlayProperties.currentTrackNumber);
+					}
+				} else {
+					Log_Println(lastFolderAlreadyActive, LOGLEVEL_NOTICE);
+					System_IndicateError();
+					return;
+				}
+				break;
+
+			case PREVIOUSFOLDER: // Used for recursive playmodes
+				trackCommand = NO_ACTION;
+				if (gPlayProperties.pausePlay) {
+					audio->pauseResume();
+					gPlayProperties.pausePlay = false;
+				}
+
+				gPlayProperties.jumpToFolderTrack = SdCard_findNextOrPrevDirectoryTrack(*gPlayProperties.playlist, gPlayProperties.currentTrackNumber, SearchDirection::Backward);
+				if (gPlayProperties.jumpToFolderTrack != -1) {
+					gPlayProperties.currentTrackNumber = gPlayProperties.jumpToFolderTrack;
+					gPlayProperties.jumpToFolderTrack = -1;
+					if (gPlayProperties.saveLastPlayPosition) {
+						AudioPlayer_NvsRfidWriteWrapper(gPlayProperties.playRfidTag, 0, gPlayProperties.playMode, gPlayProperties.currentTrackNumber);
+					}
+				} else {
+					System_IndicateError();
+					return;
+				}
+				break;
+
 			case 0:
 				break;
 
@@ -680,7 +720,7 @@ void AudioPlayer_Loop() {
 
 		if (gPlayProperties.playUntilTrackNumber == gPlayProperties.currentTrackNumber && gPlayProperties.playUntilTrackNumber > 0) {
 			if (gPlayProperties.saveLastPlayPosition) {
-				AudioPlayer_NvsRfidWriteWrapper(gPlayProperties.playRfidTag, gPlayProperties.playlist->at(gPlayProperties.currentTrackNumber), 0, gPlayProperties.playMode, 0, gPlayProperties.playlist->size());
+				AudioPlayer_NvsRfidWriteWrapper(gPlayProperties.playRfidTag, 0, gPlayProperties.playMode, 0);
 			}
 			gPlayProperties.playlistFinished = true;
 			gPlayProperties.playMode = NO_PLAYLIST;
@@ -693,7 +733,7 @@ void AudioPlayer_Loop() {
 			if (!gPlayProperties.repeatPlaylist) {
 				if (gPlayProperties.saveLastPlayPosition) {
 					// Set back to first track
-					AudioPlayer_NvsRfidWriteWrapper(gPlayProperties.playRfidTag, gPlayProperties.playlist->at(0), 0, gPlayProperties.playMode, 0, gPlayProperties.playlist->size());
+					AudioPlayer_NvsRfidWriteWrapper(gPlayProperties.playRfidTag, 0, gPlayProperties.playMode, 0);
 				}
 				gPlayProperties.playlistFinished = true;
 				gPlayProperties.playMode = NO_PLAYLIST;
@@ -717,7 +757,7 @@ void AudioPlayer_Loop() {
 				Log_Println(repeatPlaylistDueToPlaymode, LOGLEVEL_NOTICE);
 				gPlayProperties.currentTrackNumber = 0;
 				if (gPlayProperties.saveLastPlayPosition) {
-					AudioPlayer_NvsRfidWriteWrapper(gPlayProperties.playRfidTag, gPlayProperties.playlist->at(0), 0, gPlayProperties.playMode, gPlayProperties.currentTrackNumber, gPlayProperties.playlist->size());
+					AudioPlayer_NvsRfidWriteWrapper(gPlayProperties.playRfidTag, 0, gPlayProperties.playMode, gPlayProperties.currentTrackNumber);
 				}
 			}
 		}
@@ -981,7 +1021,7 @@ void AudioPlayer_PauseOnMinVolume(const uint8_t oldVolume, const uint8_t newVolu
 // playmode to the track-queue.
 void AudioPlayer_SetPlaylist(const char *_itemToPlay, const uint32_t _lastPlayPos, const uint32_t _playMode, const uint16_t _trackLastPlayed) {
 	// Make sure last playposition for audiobook is saved when new RFID-tag is applied
-	if (gPlayProperties.SavePlayPosRfidChange && !gPlayProperties.pausePlay && (gPlayProperties.playMode == AUDIOBOOK || gPlayProperties.playMode == AUDIOBOOK_LOOP)) {
+	if (gPlayProperties.SavePlayPosRfidChange && !gPlayProperties.pausePlay && (gPlayProperties.playMode == AUDIOBOOK || gPlayProperties.playMode == AUDIOBOOK_LOOP || gPlayProperties.playMode == AUDIOBOOK_RECURSIVE)) {
 		AudioPlayer_SetTrackControl(PAUSEPLAY);
 		while (!gPlayProperties.pausePlay) { // Make sure to wait until playback is paused in order to be sure that playposition saved in NVS
 			vTaskDelay(portTICK_PERIOD_MS * 100u);
@@ -1000,10 +1040,15 @@ void AudioPlayer_SetPlaylist(const char *_itemToPlay, const uint32_t _lastPlayPo
 				// If error occured while extracting random subdirectory
 				musicFiles = std::nullopt;
 			} else {
-				musicFiles = SdCard_ReturnPlaylist(folderPath.c_str(), _playMode); // Provide random subdirectory in order to enter regular playlist-generation
+				musicFiles = SdCard_ReturnPlaylist(folderPath.c_str(), _playMode, 0, false); // Provide random subdirectory in order to enter regular playlist-generation
 			}
 		} else {
-			musicFiles = SdCard_ReturnPlaylist(_itemToPlay, _playMode);
+			// Need to define recursion depth for recursive playmodes. Other playmodes get static recursion depth of 0
+			if (_playMode == ALL_TRACKS_OF_DIR_SORTED_RECURSIVE || _playMode == AUDIOBOOK_RECURSIVE || _playMode == ALL_TRACKS_OF_DIR_RANDOM_RECURSIVE) {
+				musicFiles = SdCard_ReturnPlaylist(_itemToPlay, _playMode, SdCard_GetMaxRecursionDepth(), false);
+			} else {
+				musicFiles = SdCard_ReturnPlaylist(_itemToPlay, _playMode, 0, false);
+			}
 		}
 	} else {
 		musicFiles = AudioPlayer_ReturnPlaylistFromWebstream(_itemToPlay);
@@ -1092,6 +1137,19 @@ void AudioPlayer_SetPlaylist(const char *_itemToPlay, const uint32_t _lastPlayPo
 			break;
 		}
 
+		case AUDIOBOOK_RECURSIVE: { // Tracks need to be sorted!
+			gPlayProperties.saveLastPlayPosition = true;
+			Log_Println(modeAudiobookRecursive, LOGLEVEL_NOTICE);
+			AudioPlayer_SortPlaylist(list);
+			break;
+		}
+
+		case ALL_TRACKS_OF_DIR_SORTED_RECURSIVE: {
+			Log_Printf(LOGLEVEL_NOTICE, modeAllTrackAlphSortedRecursive, folderPath.c_str());
+			AudioPlayer_SortPlaylist(list);
+			break;
+		}
+
 		case ALL_TRACKS_OF_DIR_SORTED:
 		case RANDOM_SUBDIRECTORY_OF_DIRECTORY: {
 			Log_Printf(LOGLEVEL_NOTICE, modeAllTrackAlphSorted, folderPath.c_str());
@@ -1099,6 +1157,12 @@ void AudioPlayer_SetPlaylist(const char *_itemToPlay, const uint32_t _lastPlayPo
 			break;
 		}
 
+		case ALL_TRACKS_OF_DIR_RANDOM_RECURSIVE: {
+			Log_Printf(LOGLEVEL_NOTICE, modeAllTrackRandomRecursive, folderPath.c_str());
+			AudioPlayer_RandomizePlaylist(list);
+			break;
+		}
+
 		case ALL_TRACKS_OF_DIR_RANDOM:
 		case RANDOM_SUBDIRECTORY_OF_DIRECTORY_ALL_TRACKS_OF_DIR_RANDOM: {
 			Log_Printf(LOGLEVEL_NOTICE, modeAllTrackRandom, folderPath.c_str());
@@ -1154,31 +1218,27 @@ void AudioPlayer_SetPlaylist(const char *_itemToPlay, const uint32_t _lastPlayPo
 
 /* Wraps putString for writing settings into NVS for RFID-cards.
    Returns number of characters written. */
-size_t AudioPlayer_NvsRfidWriteWrapper(const char *_rfidCardId, const char *_track, const uint32_t _playPosition, const uint8_t _playMode, const uint16_t _trackLastPlayed, const uint16_t _numberOfTracks) {
+size_t AudioPlayer_NvsRfidWriteWrapper(const char *_rfidCardId, const uint32_t _playPosition, const uint8_t _playMode, const uint16_t _trackLastPlayed) {
 	if (_playMode == NO_PLAYLIST) {
 		// writing back to NVS with NO_PLAYLIST seems to be a bug - Todo: Find the cause here
 		Log_Printf(LOGLEVEL_ERROR, modeInvalid, _playMode);
 		return 0;
 	}
 	Led_SetPause(true); // Workaround to prevent exceptions due to Neopixel-signalisation while NVS-write
+	char firstPart[275] = {0};
 	char prefBuf[275];
-	char trackBuf[255];
-	snprintf(trackBuf, sizeof(trackBuf) / sizeof(trackBuf[0]), _track);
-
-	// If it's a directory we just want to play/save basename(path)
-	if (_numberOfTracks > 1) {
-		const char s = '/';
-		const char *last = strrchr(_track, s);
-		const char *first = strchr(_track, s);
-		unsigned long substr = last - first + 1;
-		if (substr <= sizeof(trackBuf) / sizeof(trackBuf[0])) {
-			snprintf(trackBuf, substr, _track); // save substring basename(_track)
-		} else {
-			return 0; // Filename too long!
-		}
+
+	gPrefsRfid.getString(_rfidCardId, firstPart, sizeof(firstPart)); // read back previous value from NVS
+
+	// Remove everything after the first part (after the first stringDelimiter)
+	char *pos = strchr(firstPart + strlen(stringDelimiter), stringDelimiter[0]);
+	if (pos != NULL) {
+		*pos = '\0'; // Terminate the string at this position
 	}
 
-	snprintf(prefBuf, sizeof(prefBuf) / sizeof(prefBuf[0]), "%s%s%s%" PRIu32 "%s%d%s%" PRIu16, stringDelimiter, trackBuf, stringDelimiter, _playPosition, stringDelimiter, _playMode, stringDelimiter, _trackLastPlayed);
+	// Build the new string with the preserved first part (which already contains the track)
+	snprintf(prefBuf, sizeof(prefBuf), "%s%s%" PRIu32 "%s%d%s%" PRIu16, firstPart, stringDelimiter, _playPosition, stringDelimiter, _playMode, stringDelimiter, _trackLastPlayed);
+
 	Log_Printf(LOGLEVEL_INFO, wroteLastTrackToNvs, prefBuf, _rfidCardId, _playMode, _trackLastPlayed);
 	Log_Println(prefBuf, LOGLEVEL_INFO);
 	Led_SetPause(false);
@@ -1264,8 +1324,11 @@ void AudioPlayer_SortPlaylist(Playlist *playlist) {
 			break;
 	}
 
-	Log_Printf(LOGLEVEL_INFO, "Sorting files using %s", mode);
+	Log_Printf(LOGLEVEL_INFO, "Sorting files using %s", mode, "\n");
 	std::sort(playlist->begin(), playlist->end(), cmpFunc);
+	/*for (const char *str : *playlist) {
+		Serial.println(str);
+	}*/
 }
 
 // Clear cover send notification
diff --git a/src/AudioPlayer.h b/src/AudioPlayer.h
index 0758e53a..e9cd8a3e 100644
--- a/src/AudioPlayer.h
+++ b/src/AudioPlayer.h
@@ -15,7 +15,7 @@ enum class playlistSortMode : uint8_t {
 };
 
 typedef struct { // Bit field
-	uint8_t playMode : 4; // playMode
+	uint8_t playMode; // playMode
 	Playlist *playlist; // playlist
 	char title[255]; // current title
 	bool repeatCurrentTrack		: 1; // If current track should be looped
@@ -43,6 +43,7 @@ typedef struct { // Bit field
 	bool pauseOnMinVolume		 : 1; // When playback is active and volume is changed to zero, playback is paused automatically.
 	bool pauseIfRfidRemoved		 : 1; // When playback is active and RFID is removed, playback is paused automatically.
 	bool dontAcceptRfidTwice	 : 1; // RFID-reader doesn't accept the same RFID-tag twice in a row (unless it's a modification-card or RFID-tag is unknown in NVS). Flag will be ignored silently if PAUSE_WHEN_RFID_REMOVED is active. (https://forum.espuino.de/t/neues-feature-dont-accept-same-rfid-twice/1247)
+	int16_t jumpToFolderTrack = -1; // track to jump to
 	int8_t gainLowPass = 0; // Low Pass for EQ Control
 	int8_t gainBandPass = 0; // Band Pass for EQ Control
 	int8_t gainHighPass = 0; // High Pass for EQ Control
diff --git a/src/Cmd.cpp b/src/Cmd.cpp
index ea3e3df4..dbc35ea4 100644
--- a/src/Cmd.cpp
+++ b/src/Cmd.cpp
@@ -311,6 +311,16 @@ void Cmd_Action(const uint16_t mod) {
 			break;
 		}
 
+		case CMD_NEXTFOLDER: {
+			AudioPlayer_SetTrackControl(NEXTFOLDER);
+			break;
+		}
+
+		case CMD_PREVFOLDER: {
+			AudioPlayer_SetTrackControl(PREVIOUSFOLDER);
+			break;
+		}
+
 		case CMD_VOLUMEINIT: {
 			AudioPlayer_SetVolume(AudioPlayer_GetInitVolume(), true);
 			break;
diff --git a/src/Led.cpp b/src/Led.cpp
index 35526092..8b402a3e 100644
--- a/src/Led.cpp
+++ b/src/Led.cpp
@@ -152,7 +152,7 @@ void Led_Init(void) {
 	xTaskCreatePinnedToCore(
 		Led_Task, /* Function to implement the task */
 		"Led_Task", /* Name of the task */
-		2048, /* Stack size in words */
+		3072, /* Stack size in words */ // 20251015: increased to 3072 because saving of "allgemeine Einstellungen" let to restarts because of stack overflows
 		NULL, /* Task input parameter */
 		1, /* Priority of the task */
 		&Led_TaskHandle, /* Task handle. */
diff --git a/src/LogMessages_DE.cpp b/src/LogMessages_DE.cpp
index fbeace9e..a270a604 100644
--- a/src/LogMessages_DE.cpp
+++ b/src/LogMessages_DE.cpp
@@ -35,7 +35,8 @@ const char cmndPrevTrack[] = "Kommando: Vorheriger Titel";
 const char cmndFirstTrack[] = "Kommando: Erster Titel von Playlist";
 const char cmndLastTrack[] = "Kommando: Letzter Titel von Playlist";
 const char cmndDoesNotExist[] = "Dieses Kommando existiert nicht.";
-const char lastTrackAlreadyActive[] = "Es wird bereits der letzte Track gespielt.";
+const char lastTrackAlreadyActive[] = "Es wird bereits der letzte Titel gespielt.";
+const char lastFolderAlreadyActive[] = "Es wird bereits der letzte Ordner gespielt.";
 const char trackStartAudiobook[] = "Titel wird im Hörspielmodus von vorne gespielt.";
 const char trackStart[] = "Titel wird von vorne gespielt.";
 const char trackChangeWebstream[] = "Im Webradio-Modus kann nicht an den Anfang gesprungen werden.";
@@ -63,7 +64,10 @@ const char modeSingleAudiobookLoop[] = "Modus: Hoerspiel in Endlosschleife";
 const char modeAllTrackAlphSorted[] = "Modus: Spiele alle Tracks (sortiert) des Ordners '%s'";
 const char modeAllTrackRandom[] = "Modus: Spiele alle Tracks (zufällig sortiert) des Ordners '%s'";
 const char modeAllTrackAlphSortedLoop[] = "Modus: Alle Tracks eines Ordners sortiert in Endlosschleife";
+const char modeAllTrackAlphSortedRecursive[] = "Modus: Spiele alle Tracks (sortiert und rekursiv) des übergeordneten Ordners '%s'";
 const char modeAllTrackRandomLoop[] = "Modus: Alle Tracks eines Ordners zufällig in Endlosschleife";
+const char modeAudiobookRecursive[] = "Modus: Hörbuch rekursiv";
+const char modeAllTrackRandomRecursive[] = "Modus: Spiele alle Tracks (zufällig sortiert und rekursiv) des übergeordneten Ordners '%s'";
 const char modeWebstream[] = "Modus: Webstream";
 const char modeWebstreamM3u[] = "Modus: Webstream (lokale .m3u-Datei)";
 const char webstreamNotAvailable[] = "Aktuell kein Webstream möglich, da keine WLAN-Verbindung vorhanden!";
@@ -181,6 +185,7 @@ const char portExpanderFound[] = "Port-expander gefunden";
 const char portExpanderNotFound[] = "Port-expander nicht gefunden";
 const char portExpanderInterruptEnabled[] = "Interrupt für Port-Expander aktiviert";
 const char playlistGen[] = "Playlist-Generierung";
+const char playlistRecDepth[] = "Playlist-Generierung mit Rekursionstiefe: %u";
 const char bootLoopDetected[] = "Bootschleife erkannt! Letzte RFID wird nicht aufgerufen.";
 const char noBootLoopDetected[] = "Keine Bootschleife erkannt. Wunderbar :-)";
 const char importCountNokNvs[] = "Anzahl der ungültigen Import-Einträge: %u";
@@ -212,6 +217,8 @@ const char wrongWakeUpGpio[] = "Der gewählte GPIO ist nicht vom Typ RTC und unt
 const char currentlyPlaying[] = "'%s' wird abgespielt (%d von %d)";
 const char secondsJumpForward[] = "%d Sekunden nach vorne gesprungen";
 const char secondsJumpBackward[] = "%d Sekunden zurück gesprungen";
+const char jumpForwardsToFolder[] = "Springe vorwärts ordnerweise: %s/";
+const char jumpBackwardsToFolder[] = "Springe rückwärts ordnerweise: %s/";
 const char JumpToPosition[] = "Sprung zu Position %u/%u";
 const char wroteLastTrackToNvs[] = "Schreibe '%s' in NVS für RFID-Card-ID %s mit Abspielmodus %d und letzter Track %u";
 const char wifiConnectionInProgress[] = "Versuche mit WLAN '%s' zu verbinden...";
diff --git a/src/LogMessages_EN.cpp b/src/LogMessages_EN.cpp
index c9eb348f..2d18f386 100644
--- a/src/LogMessages_EN.cpp
+++ b/src/LogMessages_EN.cpp
@@ -36,6 +36,7 @@ const char cmndFirstTrack[] = "Command: first track of playlist";
 const char cmndLastTrack[] = "Command: last track of playlist";
 const char cmndDoesNotExist[] = "Command requested does not exist.";
 const char lastTrackAlreadyActive[] = "Already playing last track.";
+const char lastFolderAlreadyActive[] = "Already playing last track.";
 const char trackStartAudiobook[] = "Starting track in playmode from the very beginning.";
 const char trackStart[] = "Starting track from the very beginning.";
 const char trackChangeWebstream[] = "Playing from the very beginning is not possible while webradio-mode is active.";
@@ -63,7 +64,10 @@ const char modeSingleAudiobookLoop[] = "Mode: audiobook as infinite loop";
 const char modeAllTrackAlphSorted[] = "Mode: all tracks (in order) of directory '%s'";
 const char modeAllTrackRandom[] = "Mode: all tracks (in random. order) of directory '%s";
 const char modeAllTrackAlphSortedLoop[] = "Mode: all tracks (in order) of directory as infinite loop";
+const char modeAllTrackAlphSortedRecursive[] = "Mode: all tracks (in order and recursive) of parent directory '%s'";
 const char modeAllTrackRandomLoop[] = "Mode: all tracks (in random order) of directory as infinite loop";
+const char modeAudiobookRecursive[] = "Mode: Audiobook recursive";
+const char modeAllTrackRandomRecursive[] = "Mode: all tracks (in random. order and recursive) of parent directory '%s";
 const char modeWebstream[] = "Mode: webstream";
 const char modeWebstreamM3u[] = "Mode: Webstream (local .m3u-file)";
 const char webstreamNotAvailable[] = "Unable to access webstream as no wifi-connection is available!";
@@ -182,6 +186,7 @@ const char portExpanderFound[] = "Port-expander found";
 const char portExpanderNotFound[] = "Unable to detect port-expander";
 const char portExpanderInterruptEnabled[] = "Enabled interrupt-handling for port-expander";
 const char playlistGen[] = "Playlist-generation";
+const char playlistRecDepth[] = "Playlist-generation with recursion depth";
 const char bootLoopDetected[] = "Bootloop detected! Last RFID won't be restored.";
 const char noBootLoopDetected[] = "No bootloop detected. Great :-)";
 const char importCountNokNvs[] = "Number of invalid import-entries: %u";
@@ -212,7 +217,9 @@ const char pickedRandomDir[] = "Randomly picked subdirectory: %s";
 const char wrongWakeUpGpio[] = "GPIO choosen as wakeup-pin isn't of type RTC and that reason for can't wake up ESP32! (GPIO: %u)";
 const char currentlyPlaying[] = "'%s' is being played (%d of %d)";
 const char secondsJumpForward[] = "Jumped %d seconds forwards";
-const char secondsJumpBackward[] = "Jumped %d seconds backward";
+const char secondsJumpBackward[] = "Jumped %d seconds backwards";
+const char jumpForwardsToFolder[] = "Jump forwards folderwise: %s/";
+const char jumpBackwardsToFolder[] = "Jump backwards folderwise: %s/";
 const char JumpToPosition[] = "Jumped to position %u/%u";
 const char wroteLastTrackToNvs[] = "Write '%s' to NVS for RFID-Card-ID %s with playmode %d and last track %u";
 const char wifiConnectionInProgress[] = "Try to connect to WiFi with SSID '%s'...";
diff --git a/src/LogMessages_FR.cpp b/src/LogMessages_FR.cpp
index 028f8dfd..886310c2 100644
--- a/src/LogMessages_FR.cpp
+++ b/src/LogMessages_FR.cpp
@@ -35,6 +35,7 @@ const char cmndFirstTrack[] = "Commande : première piste de la liste de lecture
 const char cmndLastTrack[] = "Commande : dernière piste de la liste de lecture";
 const char cmndDoesNotExist[] = "La commande demandée n'existe pas.";
 const char lastTrackAlreadyActive[] = "La dernière piste est déjà en cours de lecture.";
+const char lastFolderAlreadyActive[] = "La dernière dossier est déjà en cours de lecture.";
 const char trackStartAudiobook[] = "Démarrage de la piste en mode de lecture depuis le début.";
 const char trackStart[] = "Démarrage de la piste depuis le début.";
 const char trackChangeWebstream[] = "Le démarrage depuis le début n'est pas possible en mode webradio.";
@@ -61,8 +62,11 @@ const char modeSingleAudiobook[] = "Mode : livre audio";
 const char modeSingleAudiobookLoop[] = "Mode : livre audio en boucle infinie";
 const char modeAllTrackAlphSorted[] = "Mode : toutes les pistes (par ordre) du répertoire '%s'";
 const char modeAllTrackRandom[] = "Mode : toutes les pistes (par ordre aléatoire) du répertoire '%s'";
+const char modeAllTrackRandomRecursive[] = "Mode : toutes les pistes (par ordre aléatoire et récursif) du répertoire parent '%s'";
 const char modeAllTrackAlphSortedLoop[] = "Mode : toutes les pistes (par ordre) du répertoire en boucle infinie";
+const char modeAllTrackAlphSortedRecursive[] = "Mode : toutes les pistes (par ordre et récursif) du répertoire parent '%s'";
 const char modeAllTrackRandomLoop[] = "Mode : toutes les pistes (par ordre aléatoire) du répertoire en boucle infinie";
+const char modeAudiobookRecursive[] = "Modus: Livre audio récursive";
 const char modeWebstream[] = "Mode : diffusion Web";
 const char modeWebstreamM3u[] = "Mode : diffusion Web (fichier .m3u local)";
 const char webstreamNotAvailable[] = "Impossible d'accéder à la diffusion Web car aucune connexion Wi-Fi n'est disponible !";
@@ -180,6 +184,7 @@ const char portExpanderFound[] = "Extenseur de port trouvé";
 const char portExpanderNotFound[] = "Impossible de détecter l'extenseur de port";
 const char portExpanderInterruptEnabled[] = "Activation de la gestion des interruptions pour l'extenseur de port";
 const char playlistGen[] = "Génération de la liste de lecture";
+const char playlistRecDepth[] = "Génération de la liste de lecture avec profondeur de récursion";
 const char bootLoopDetected[] = "Boucle de démarrage détectée ! Le dernier RFID ne sera pas restauré.";
 const char noBootLoopDetected[] = "Aucune boucle de démarrage détectée. Super :-)";
 const char importCountNokNvs[] = "Nombre d'entrées d'importation non valides : %u";
@@ -211,6 +216,8 @@ const char wrongWakeUpGpio[] = "Le GPIO choisi comme broche de réveil n'est pas
 const char currentlyPlaying[] = "'%s' est en cours de lecture (%d sur %d)";
 const char secondsJumpForward[] = "Avancé de %d secondes";
 const char secondsJumpBackward[] = "Reculé de %d secondes";
+const char jumpForwardsToFolder[] = "Avancer par dossiers: %s/";
+const char jumpBackwardsToFolder[] = "Reculer par dossiers: %s/";
 const char JumpToPosition[] = "Aller à la position %u/%u";
 const char wroteLastTrackToNvs[] = "Écriture de '%s' dans NVS pour l'ID de carte RFID %s avec le mode de lecture %d et la dernière piste %u";
 const char wifiConnectionInProgress[] = "Tentative de connexion au WiFi avec le SSID '%s'...";
diff --git a/src/SdCard.cpp b/src/SdCard.cpp
index 3bb9e938..34e0ef90 100644
--- a/src/SdCard.cpp
+++ b/src/SdCard.cpp
@@ -18,6 +18,8 @@ SPIClass spiSD(HSPI);
 fs::FS gFSystem = (fs::FS) SD;
 #endif
 
+uint8_t maxRecursionDepth;
+
 void SdCard_Init(void) {
 #ifdef NO_SDCARD
 	// Initialize without any SD card, e.g. for webplayer only
@@ -53,6 +55,13 @@ void SdCard_Init(void) {
 		}
 #endif
 	}
+
+	// Used when building recursive playlists
+	maxRecursionDepth = gPrefsSettings.getUInt("nvsRecDepth", 255);
+	if (maxRecursionDepth == 255) {
+		gPrefsSettings.putUInt("nvsRecDepth", 2);
+		maxRecursionDepth = 2;
+	}
 }
 
 void SdCard_Exit(void) {
@@ -95,6 +104,16 @@ uint64_t SdCard_GetFreeSize() {
 #endif
 }
 
+uint8_t SdCard_GetMaxRecursionDepth(void) {
+	return maxRecursionDepth;
+}
+
+// Returns recursion depth that's used then playlists are generated for recursive playmodes
+size_t SdCard_SetMaxRecursionDepth(uint8_t _maxRecursionDepth) {
+	maxRecursionDepth = _maxRecursionDepth;
+	return gPrefsSettings.putUInt("nvsRecDepth", SdCard_GetMaxRecursionDepth());
+}
+
 void SdCard_PrintInfo() {
 	// show SD card type
 	sdcard_type_t cardType = SdCard_GetType();
@@ -294,7 +313,7 @@ static std::optional<Playlist *> SdCard_ParseM3UPlaylist(File file) {
 
 /* Puts SD-file(s) or directory into a playlist
 	First element of array always contains the number of payload-items. */
-std::optional<Playlist *> SdCard_ReturnPlaylist(const char *fileName, const uint32_t _playMode) {
+std::optional<Playlist *> SdCard_ReturnPlaylist(const char *fileName, const uint32_t _playMode, const uint8_t _maxRecursionDepth, bool _recursionMode) {
 	// Look if file/folder requested really exists. If not => break.
 	File fileOrDirectory = gFSystem.open(fileName);
 	if (!fileOrDirectory) {
@@ -302,8 +321,6 @@ std::optional<Playlist *> SdCard_ReturnPlaylist(const char *fileName, const uint
 		return std::nullopt;
 	}
 
-	Log_Printf(LOGLEVEL_DEBUG, freeMemory, ESP.getFreeHeap());
-
 	// Parse m3u-playlist and create linear-playlist out of it
 	if (_playMode == LOCAL_M3U) {
 		if (!fileOrDirectory.isDirectory() && fileOrDirectory.size() > 0) {
@@ -312,9 +329,16 @@ std::optional<Playlist *> SdCard_ReturnPlaylist(const char *fileName, const uint
 		}
 	}
 
-	// if we reach here, this was not a m3u
-	Log_Println(playlistGen, LOGLEVEL_NOTICE);
-	Playlist *playlist = new Playlist;
+	// if we reach this code, it was not a m3u
+
+	static Playlist *playlist = nullptr; // static because of possible recursion
+	if (_recursionMode == false) {
+		Log_Printf(LOGLEVEL_DEBUG, freeMemory, ESP.getFreeHeap());
+		playlist = new Playlist();
+		Log_Printf(LOGLEVEL_NOTICE, playlistRecDepth, _maxRecursionDepth);
+	}
+
+	static uint8_t currentRecDepth = 0;
 
 	// File-mode
 	if (!fileOrDirectory.isDirectory()) {
@@ -335,7 +359,15 @@ std::optional<Playlist *> SdCard_ReturnPlaylist(const char *fileName, const uint
 			break;
 		}
 		if (isDir) {
-			continue;
+			//  Jump into directory if recursion is allowed
+			if (currentRecDepth < _maxRecursionDepth) {
+				currentRecDepth++;
+				// Log_Printf(LOGLEVEL_DEBUG, "Added folder: %s, depth of recursion: %d\n", name.c_str(), currentRecDepth);
+				SdCard_ReturnPlaylist(name.c_str(), _playMode, _maxRecursionDepth, true);
+				currentRecDepth--;
+			} else {
+				continue;
+			}
 		}
 		// Don't support filenames that start with "." and only allow .mp3 and other supported audio file formats
 		if (fileValid(name.c_str())) {
@@ -350,7 +382,81 @@ std::optional<Playlist *> SdCard_ReturnPlaylist(const char *fileName, const uint
 	}
 	playlist->shrink_to_fit();
 
-	Log_Printf(LOGLEVEL_NOTICE, numberOfValidFiles, playlist->size());
-	Log_Printf(LOGLEVEL_DEBUG, "Hidden files: %u", hiddenFiles);
+	// Only show sum up at last run (when no recursion is active)
+	if (!_recursionMode) {
+		Log_Printf(LOGLEVEL_NOTICE, numberOfValidFiles, playlist->size());
+		Log_Printf(LOGLEVEL_DEBUG, "Hidden files: %u", hiddenFiles);
+	}
+
 	return playlist;
 }
+
+// Extracts basepath out of a given filepath
+std::string_view SdCard_Basepath(const char *filepath) {
+	if (!filepath) {
+		return std::string_view();
+	}
+	std::string_view str(filepath);
+	auto pos = str.find_last_of('/');
+	if (pos == std::string::npos) {
+		return std::string_view();
+	}
+	return str.substr(0, pos + 1);
+}
+
+// Used for recursive playmodes. Allows to jump forwards and backwards between folders using
+// CMD_PREVFOLDER (backwards) and CMD_NEXTFOLDER (forwards) to previous / next folder in playlist.
+// Returns -1 if no prev or next folder was found or no playlist is available
+// Returns >=0 if folderjump is possible. Number represents the index of the current playlist's track to jump to.
+int16_t SdCard_findNextOrPrevDirectoryTrack(const Playlist &_playlist, size_t currentTrackIndexInPlaylist, SearchDirection direction) {
+	// Look if index requested is out of bounds
+	if (currentTrackIndexInPlaylist >= _playlist.size()) {
+		return -1;
+	}
+
+	std::string_view basepathOfCurrentTrack = SdCard_Basepath(_playlist[currentTrackIndexInPlaylist]); // Get basepath of current track
+
+	// Look forwards
+	if (direction == SearchDirection::Forward) {
+		if (_playlist[currentTrackIndexInPlaylist] != nullptr) {
+			for (uint16_t i = (currentTrackIndexInPlaylist + 1); i < _playlist.size(); ++i) { // Iterate through playlist and start with current track +1
+				std::string_view basepathOfTrackToLookUp = SdCard_Basepath(_playlist[i]);
+				if (basepathOfTrackToLookUp != basepathOfCurrentTrack) {
+					Log_Printf(LOGLEVEL_DEBUG, jumpForwardsToFolder, basepathOfTrackToLookUp.data(), "\n");
+					return i; // Return first track after basepath change
+				}
+			}
+		} else {
+			return -1;
+		}
+
+		// Look backwards
+	} else if (direction == SearchDirection::Backward) {
+		//  Go back as long as we don't hit 0
+		if (!currentTrackIndexInPlaylist) {
+			return currentTrackIndexInPlaylist;
+		}
+
+		if (_playlist[currentTrackIndexInPlaylist] != nullptr) {
+			for (uint16_t i = (currentTrackIndexInPlaylist - 1); i > 0; i--) {
+				std::string_view basepathOfTrackToLookUp = SdCard_Basepath(_playlist[i]);
+				if (basepathOfTrackToLookUp != basepathOfCurrentTrack) { // Look for the 1st basepath change...
+					for (uint16_t j = i - 1; j > 0; j--) {
+						std::string_view basepathOfTrackToLookUpInner = SdCard_Basepath(_playlist[j]);
+						if (basepathOfTrackToLookUpInner != basepathOfTrackToLookUp) { // ...but keep on looking for the 2nd change...
+							Log_Printf(LOGLEVEL_DEBUG, jumpBackwardsToFolder, basepathOfTrackToLookUpInner.data(), "\n");
+							return j + 1; // ...just to add +1 to get the previous element before the 2nd change
+						}
+					}
+				}
+			}
+		} else {
+			return -1;
+		}
+		// If index 0 (first track) was hit meanwhile -> return it!
+		return 0;
+	}
+
+	// If no jump possible, return -1
+	return -1;
+}
diff --git a/src/SdCard.h b/src/SdCard.h
index 25874c5b..7cc37b06 100644
--- a/src/SdCard.h
+++ b/src/SdCard.h
@@ -12,11 +12,20 @@ extern fs::FS gFSystem;
 
 #include <optional>
 
+enum class SearchDirection {
+	Forward,
+	Backward
+};
+
 void SdCard_Init(void);
 void SdCard_Exit(void);
 sdcard_type_t SdCard_GetType(void);
 uint64_t SdCard_GetSize();
 uint64_t SdCard_GetFreeSize();
 void SdCard_PrintInfo();
-std::optional<Playlist *> SdCard_ReturnPlaylist(const char *fileName, const uint32_t _playMode);
+std::optional<Playlist *> SdCard_ReturnPlaylist(const char *fileName, const uint32_t _playMode, const uint8_t _maxRecursionDepth, bool _recursionMode);
 const String SdCard_pickRandomSubdirectory(const char *_directory);
+uint8_t SdCard_GetMaxRecursionDepth(void);
+size_t SdCard_SetMaxRecursionDepth(uint8_t _maxRecursionDepth);
+int16_t SdCard_findNextOrPrevDirectoryTrack(const Playlist &_playlist, size_t currentTrackIndexInPlaylist, SearchDirection direction);
+std::string_view SdCard_Basepath(const char *filepath);
diff --git a/src/Web.cpp b/src/Web.cpp
index 3288033c..e6684e82 100644
--- a/src/Web.cpp
+++ b/src/Web.cpp
@@ -787,6 +787,10 @@ bool JSONToSettings(JsonObject doc) {
 			Log_Printf(LOGLEVEL_ERROR, webSaveSettingsError, "playlist");
 			return false;
 		}
+		if (!SdCard_SetMaxRecursionDepth(doc["playlist"]["recDepth"].as<uint8_t>())) {
+			Log_Printf(LOGLEVEL_ERROR, webSaveSettingsError, "playlist");
+			return false;
+		}
 	}
 	if (doc["ftp"].is<JsonObject>()) {
 		const char *_ftpUser = doc["ftp"]["username"];
@@ -1035,6 +1039,7 @@ static void settingsToJSON(JsonObject obj, const String section) {
 	if ((section == "") || (section == "playlist")) {
 		JsonObject playlistObj = obj["playlist"].to<JsonObject>();
 		playlistObj["sortMode"] = EnumUtils::underlying_value(AudioPlayer_GetPlaylistSortMode());
+		playlistObj["recDepth"] = SdCard_GetMaxRecursionDepth();
 	}
 #ifdef BATTERY_MEASURE_ENABLE
 	if ((section == "") || (section == "battery")) {
diff --git a/src/logmessages.h b/src/logmessages.h
index 44ffe0b5..c06f0439 100644
--- a/src/logmessages.h
+++ b/src/logmessages.h
@@ -32,6 +32,7 @@ extern const char cmndFirstTrack[];
 extern const char cmndLastTrack[];
 extern const char cmndDoesNotExist[];
 extern const char lastTrackAlreadyActive[];
+extern const char lastFolderAlreadyActive[];
 extern const char trackStartAudiobook[];
 extern const char trackStart[];
 extern const char trackChangeWebstream[];
@@ -57,10 +58,13 @@ extern const char modeSingleTrackRandom[];
 extern const char modeSingleAudiobook[];
 extern const char modeSingleAudiobookLoop[];
 extern const char modeAllTrackAlphSorted[];
+extern const char modeAllTrackAlphSortedRecursive[];
 extern const char modeAllTrackRandom[];
+extern const char modeAllTrackRandomRecursive[];
 extern const char modeAllTrackAlphSortedLoop[];
 extern const char modeAllTrackRandomLoop[];
 extern const char modeWebstream[];
+extern const char modeAudiobookRecursive[];
 extern const char modeWebstreamM3u[];
 extern const char webstreamNotAvailable[];
 extern const char modeInvalid[];
@@ -179,6 +183,7 @@ extern const char portExpanderNotFound[];
 extern const char portExpanderInterruptEnabled[];
 extern const char warningRefactoring[];
 extern const char playlistGen[];
+extern const char playlistRecDepth[];
 extern const char bootLoopDetected[];
 extern const char noBootLoopDetected[];
 extern const char importCountNokNvs[];
@@ -229,3 +234,5 @@ extern const char wifiSetLastSSID[];
 extern const char mDNSStarted[];
 extern const char mDNSFailed[];
 extern const char restartAfterOperationModeChange[];
+extern const char jumpForwardsToFolder[];
+extern const char jumpBackwardsToFolder[];
diff --git a/src/settings.h b/src/settings.h
index 53e87b49..6b6d98f8 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -39,7 +39,7 @@
 	#define FTP_ENABLE                      // Enables FTP-server; DON'T FORGET TO ACTIVATE AFTER BOOT BY PRESSING PAUSE + NEXT-BUTTONS (IN PARALLEL)!
 	#define NEOPIXEL_ENABLE                 // Don't forget configuration of NUM_LEDS if enabled
 	//#define NEOPIXEL_REVERSE_ROTATION     // Some Neopixels are adressed/soldered counter-clockwise. This can be configured here.
-	#define LANGUAGE DE                     // DE = deutsch; EN = english
+	#define LANGUAGE DE                     // DE = deutsch; EN = english: FR = french
 	//#define STATIC_IP_ENABLE              // DEPRECATED: Enables static IP-configuration (change static ip-section accordingly)
 	#define HEADPHONE_ADJUST_ENABLE         // Used to adjust (lower) volume for optional headphone-pcb (refer maxVolumeSpeaker / maxVolumeHeadphone) and to enable stereo (if PLAY_MONO_SPEAKER is set)
 	//#define PLAY_MONO_SPEAKER             // If only one speaker is used enabling mono should make sense. Please note: headphones is always stereo (if HEADPHONE_ADJUST_ENABLE is active)
diff --git a/src/values.h b/src/values.h
index b4b29827..27b79a87 100644
--- a/src/values.h
+++ b/src/values.h
@@ -6,26 +6,31 @@
 #define OPMODE_BLUETOOTH_SOURCE 2 // Bluetooth sourcemode. Player sennds audio to bluetooth speaker/headset. WiFi is deactivated. Music from SD and webstreams can't be played.
 
 // Track-Control
-#define NO_ACTION	  0 // Dummy to unset track-control-command
-#define STOP		  1 // Stop play
-#define PLAY		  2 // Start play (currently not used)
-#define PAUSEPLAY	  3 // Pause/play
-#define NEXTTRACK	  4 // Next track of playlist
-#define PREVIOUSTRACK 5 // Previous track of playlist
-#define FIRSTTRACK	  6 // First track of playlist
-#define LASTTRACK	  7 // Last track of playlist
+#define NO_ACTION	   0 // Dummy to unset track-control-command
+#define STOP		   1 // Stop play
+#define PLAY		   2 // Start play (currently not used)
+#define PAUSEPLAY	   3 // Pause/play
+#define NEXTTRACK	   4 // Next track of playlist
+#define PREVIOUSTRACK  5 // Previous track of playlist
+#define FIRSTTRACK	   6 // First track of playlist
+#define LASTTRACK	   7 // Last track of playlist
+#define NEXTFOLDER	   8 // Next folder (recursive mode only)
+#define PREVIOUSFOLDER 9 // Next folder (recursive mode only)
 
 // Playmodes
 #define NO_PLAYLIST												  0 // If no playlist is active
 #define SINGLE_TRACK											  1 // Play a single track
 #define SINGLE_TRACK_LOOP										  2 // Play a single track in infinite-loop
 #define SINGLE_TRACK_OF_DIR_RANDOM								  12 // Play a single track of a directory and fall asleep subsequently
-#define AUDIOBOOK												  3 // Single track, can save last play-position
-#define AUDIOBOOK_LOOP											  4 // Single track as infinite-loop, can save last play-position
+#define AUDIOBOOK												  3 // Single track or tracks of single folder, can save last play-position
+#define AUDIOBOOK_LOOP											  4 // Single track or tracks of single folder as infinite-loop, can save last play-position
+#define AUDIOBOOK_RECURSIVE										  16 // Single track or track of single folder or folder recursive, can save last play-position
 #define ALL_TRACKS_OF_DIR_SORTED								  5 // Play all files of a directory (sorted)
 #define ALL_TRACKS_OF_DIR_RANDOM								  6 // Play all files of a directory (randomized)
+#define ALL_TRACKS_OF_DIR_RANDOM_RECURSIVE						  17 // Play all files of a directory and subdirectories (randomized)
 #define ALL_TRACKS_OF_DIR_SORTED_LOOP							  7 // Play all files of a directory (sorted) in infinite-loop
 #define ALL_TRACKS_OF_DIR_RANDOM_LOOP							  9 // Play all files of a directory (randomized) in infinite-loop
+#define ALL_TRACKS_OF_DIR_SORTED_RECURSIVE						  15 // Like AUDIOBOOK_RECURSIVE, but without saving last play-position
 #define RANDOM_SUBDIRECTORY_OF_DIRECTORY						  13 // Picks a random subdirectory from a given directory and do ALL_TRACKS_OF_DIR_SORTED
 #define RANDOM_SUBDIRECTORY_OF_DIRECTORY_ALL_TRACKS_OF_DIR_RANDOM 14 // Picks a random subdirectory from a given directory and do ALL_TRACKS_OF_DIR_RANDOM
 #define WEBSTREAM												  8 // Play webradio-stream
@@ -67,6 +72,8 @@
 #define CMD_SEEK_BACKWARDS 181 // Command: jump backwards (time period to jump (in seconds) is configured via settings.h: jumpOffset)
 #define CMD_STOP		   182 // Command: stops playback
 #define CMD_RESTARTSYSTEM  183 // Command: restart System
+#define CMD_NEXTFOLDER	   184 // Command: jump forwards to next folder (only applicable for recursive playmodes)
+#define CMD_PREVFOLDER	   185 // Command: jump forwards to previous folder (only applicable for recursive playmodes)
 
 #define CMD_VIRTUAL_RFID_CARD_01 241 // Command: Virtual RFID-Card 900000000001
 #define CMD_VIRTUAL_RFID_CARD_02 242 // Command: Virtual RFID-Card 900000000002