diff --git a/CHANGELOG.md b/CHANGELOG.md
index efabda5..ba95590 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@ All notable changes to this project will be documented in this file. Older chang
 
 ## [0.7.13.1]
 - Thumb creation bugfix
+- App filepath bugfixes
 
 ## [0.7.13.0]
 - Rewrites to diskutil code
diff --git a/Tester.zip b/Tester.zip
index c52d89c..97a0d98 100644
Binary files a/Tester.zip and b/Tester.zip differ
diff --git a/Yuba.app.zip b/Yuba.app.zip
index f9188c6..4539d88 100644
Binary files a/Yuba.app.zip and b/Yuba.app.zip differ
diff --git a/Yuba.php b/Yuba.php
index f01d28f..5b0cd9b 100755
--- a/Yuba.php
+++ b/Yuba.php
@@ -38,7 +38,7 @@ $parser = new plistParser();
 // Preferences
 
 if (@$argv[1] == "Preferences...") {
-	exec($bin_php." ".__DIR__."/YubaPrefs.php 2>&1");
+	exec($bin_php." ".escapeshellarg(__DIR__."/YubaPrefs.php")." 2>&1");
 	die;
 	}
 
@@ -567,7 +567,7 @@ if ($p['thumbs']) {
 	foreach ($fx as $count => $array) {
 		$fid = $array[0];
 		$pathname = $array[1];
-		$tcmd = $bin_php." ".$helper." thumbs ".$fid." ".escapeshellarg($pathname)." ".escapeshellarg($bpath)." ".$mytime."; echo ".ProgressBar::next();
+		$tcmd = $bin_php." ".escapeshellarg($helper)." thumbs ".$fid." ".escapeshellarg($pathname)." ".escapeshellarg($bpath)." ".$mytime."; echo ".ProgressBar::next();
 		msg($tcmd);
 		$tline[] = $tcmd;
 		}
@@ -598,7 +598,7 @@ if ($p['icons']) {
 	foreach ($fx as $count => $array) {
 		$fid = $array[0];
 		$pathname = $array[1];
-		$icmd = $bin_php." ".$helper." icons ".$fid." ".escapeshellarg($pathname)." ".escapeshellarg($bpath)." ".$mytime."; echo ".ProgressBar::next();
+		$icmd = $bin_php." ".escapeshellarg($helper)." icons ".$fid." ".escapeshellarg($pathname)." ".escapeshellarg($bpath)." ".$mytime."; echo ".ProgressBar::next();
 		msg($icmd);
 		$iline[] = $icmd;
 		}
diff --git a/filetypes.php b/filetypes.php
index 102a79a..edee792 100755
--- a/filetypes.php
+++ b/filetypes.php
@@ -4,16 +4,16 @@
 //////////////////////////////////////////
 
 // Bundled tools
-$bin_gfi			= __DIR__."/bin/GetFileInfo";
-$bin_mediainfo		= __DIR__."/bin/mediainfo";
-$bin_exiftool		= __DIR__."/bin/exiftool";
-$bin_ffmpeg			= __DIR__."/bin/ffmpeg";
-$bin_qlthumb		= __DIR__."/bin/ql-thumbnail";
-$bin_qltool			= __DIR__."/bin/qltool";
-$bin_sox			= __DIR__."/bin/sox";
-$bin_pngcrush		= __DIR__."/bin/pngcrush";
-$bin_parallel		= __DIR__."/bin/parallel";
-$bin_convert		= __DIR__."/bin/convert";
+$bin_gfi			= escapeshellarg(__DIR__."/bin/GetFileInfo");
+$bin_mediainfo		= escapeshellarg(__DIR__."/bin/mediainfo");
+$bin_exiftool		= escapeshellarg(__DIR__."/bin/exiftool");
+$bin_ffmpeg			= escapeshellarg(__DIR__."/bin/ffmpeg");
+$bin_qlthumb		= escapeshellarg(__DIR__."/bin/ql-thumbnail");
+$bin_qltool			= escapeshellarg(__DIR__."/bin/qltool");
+$bin_sox			= escapeshellarg(__DIR__."/bin/sox");
+$bin_pngcrush		= escapeshellarg(__DIR__."/bin/pngcrush");
+$bin_parallel		= escapeshellarg(__DIR__."/bin/parallel");
+$bin_convert		= escapeshellarg(__DIR__."/bin/convert");
 
 // System tools
 $bin_php			= "php";