diff --git a/export.sh b/export.sh
index 330f17e1..441ca54e 100644
--- a/export.sh
+++ b/export.sh
@@ -131,23 +131,48 @@ if [ "$size" -gt 4096 ]; then
 	fi
 
 	if [ -d "$emulationPath/bios" ]; then
-		text="$(printf "Do you want to export all your roms?")"
+		text="$(printf "Do you want to export all your bios?")"
 		zenity --question \
 			--title="EmuDeck Export tool" \
 			--width=450 \
 			--cancel-label="No" \
-			--ok-label="Export my roms" \
+			--ok-label="Export my bios" \
 			--text="${text}" 2>/dev/null
 		ans=$?
 		if [ $ans -eq 0 ]; then
 
-			checkSpace "$emulationPath/roms/" "$destination"
+			checkSpace "$emulationPath/bios/" "$destination"
 
-			mkdir -p "$destination/EmuDeck/roms"
+			mkdir -p "$destination/EmuDeck/bios"
 
-			for entry in "$emulationPath/roms/"*
+			for entry in "$emulationPath/bios/"*
 			do
-				rsync -ravL --ignore-existing --progress "$entry" "$destination/EmuDeck/roms/" | awk -f $HOME/.config/EmuDeck/backend/rsync.awk | zenity --progress --text="Exporting $entry to $destination/EmuDeck/roms/" --title="Exporting $entry..." --width=400 --percentage=0 --auto-close
+				rsync -ravL --ignore-existing --progress "$entry" "$destination/EmuDeck/bios/" | awk -f $HOME/.config/EmuDeck/backend/rsync.awk | zenity --progress --text="Exporting $entry to $destination/EmuDeck/bios/" --title="Exporting $entry..." --width=400 --percentage=0 --auto-close
+			done
+
+		else
+			echo "no bios"
+		fi
+	fi
+
+	if [ -d "$ESDEscrapData" ]; then
+		text="$(printf "Do you want to export all your EmulationStation media?")"
+		zenity --question \
+			--title="EmuDeck Export tool" \
+			--width=450 \
+			--cancel-label="No" \
+			--ok-label="Export my ESDE Media" \
+			--text="${text}" 2>/dev/null
+		ans=$?
+		if [ $ans -eq 0 ]; then
+
+			checkSpace "$ESDEscrapData" "$destination"
+
+			mkdir -p "$destination/EmuDeck/tools/downloaded_media"
+
+			for entry in "$ESDEscrapData/"*
+			do
+				rsync -ravL --ignore-existing --progress "$entry" "$destination/EmuDeck/roms/" | awk -f $HOME/.config/EmuDeck/backend/rsync.awk | zenity --progress --text="Exporting $entry to $destination/EmuDeck/tools/downloaded_media/" --title="Exporting $entry..." --width=400 --percentage=0 --auto-close
 			done
 
 		else
diff --git a/import.sh b/import.sh
index 01e416bd..593c3b5f 100644
--- a/import.sh
+++ b/import.sh
@@ -151,6 +151,32 @@ if [ "$size" -gt 4096 ]; then
 	fi
 
 
+	if [ -d "$origin/EmuDeck/tools/downloaded_media" ]; then
+		text="$(printf "<b>ESDE Media folder found in your drive!</b>\nLet's import that one too")"
+		zenity --question \
+			--title="EmuDeck Import tool" \
+			--width=450 \
+			--cancel-label="No" \
+			--ok-label="Import my ESDE media" \
+			--text="${text}" 2>/dev/null
+		ans=$?
+		if [ $ans -eq 0 ]; then
+
+			checkSpace "$origin/EmuDeck/tools/downloaded_media/" "$toolsPath"
+
+			for entry in "$origin/EmuDeck/tools/downloaded_media/"*
+			do
+				rsync -ravL --ignore-existing --progress "$entry" "$emulationPath/bios/" | awk -f $HOME/.config/EmuDeck/backend/rsync.awk | zenity --progress --text="Importing $entry to $emulationPath/tools/downloaded_media/" --title="Importing $entry..." --width=400 --percentage=0 --auto-close
+			done
+
+		else
+			echo "User selected no import: ESDE media"
+		fi
+
+	fi
+
+
+
 	if [ -d "$origin/EmuDeck/roms" ]; then
 		text="$(printf "<b>Roms folder found in your drive!</b>\nLet's import that one too")"
 		zenity --question \