diff --git a/extra/convert.sh b/extra/convert.sh
index 91de678..bda0819 100755
--- a/extra/convert.sh
+++ b/extra/convert.sh
@@ -7,11 +7,11 @@ do
 filename="${file%.*}"
 echo "MIDI $filename"
 
-timidity $file -o $filename.ogg -Ov
-rm $file
+timidity "$file" -o "$filename.ogg" -Ov
+rm "$file"
 
-ffmpeg -i $filename.ogg -c:a libvorbis -qscale:a 0 CONV/$filename.ogg
-rm $filename.ogg
+ffmpeg -i "$filename.ogg" -c:a libvorbis -qscale:a 0 "CONV/$filename.ogg"
+rm "$filename.ogg"
 
 done
 
@@ -21,10 +21,10 @@ for file in Audio/**/*.ogg
 do
 
 filename="${file%.*}"
-echo $filename
+echo "$filename"
 
-ffmpeg -i $file -c:a libvorbis -qscale:a 0 CONV/$filename.ogg
-rm $file
+ffmpeg -i "$file" -c:a libvorbis -qscale:a 0 "CONV/$filename.ogg"
+rm "$file"
 
 done
 
@@ -33,10 +33,10 @@ for file in Audio/**/*.wav
 do
 
 filename="${file%.*}"
-echo $filename
+echo "$filename"
 
-ffmpeg -i $file -c:a libvorbis -qscale:a 0 CONV/$filename.ogg
-rm $file
+ffmpeg -i "$file" -c:a libvorbis -qscale:a 0 "CONV/$filename.ogg"
+rm "$file"
 
 done
 
diff --git a/extra/make_mapping.sh b/extra/make_mapping.sh
index 089d4a9..9f56990 100755
--- a/extra/make_mapping.sh
+++ b/extra/make_mapping.sh
@@ -7,7 +7,7 @@ do
 
 filename="${file%.*}"
 fl="$(echo "$filename" | tr '[:upper:]' '[:lower:]')"
-md5=`md5sum ${file} | awk '{ print $1 }'`
+md5=`md5sum "${file}" | awk '{ print $1 }'`
 
 echo "\"$fl\": \"${file}?h=${md5}\"," >> mapping.js