Index: java/installer2/locales/net/oni2/aeinstaller/localization/MainWin_de.properties
===================================================================
--- java/installer2/locales/net/oni2/aeinstaller/localization/MainWin_de.properties	(revision 765)
+++ java/installer2/locales/net/oni2/aeinstaller/localization/MainWin_de.properties	(revision 766)
@@ -15,6 +15,6 @@
 menu.runOniWin=Oni starten (&Fenster)
 menu.runOniWinTooltip=Starte Oni im Fenstermodus
-menu.openEditionFolder=Edition-Ordner öffnen
-menu.openEditionFolderTooltip=Öffne den Ordner der Edition im Dateiexplorer
+menu.openEditionFolder=AE-Ordner öffnen
+menu.openEditionFolderTooltip=Öffne den Ordner der AE im Dateiexplorer
 menu.loadConfig=Mod-Auswahl &laden...
 menu.loadConfigTooltip=Lade eine Auswahl von Mods aus einer Datei
Index: java/installer2/src/net/oni2/aeinstaller/AEInstaller2.java
===================================================================
--- java/installer2/src/net/oni2/aeinstaller/AEInstaller2.java	(revision 765)
+++ java/installer2/src/net/oni2/aeinstaller/AEInstaller2.java	(revision 766)
@@ -259,5 +259,5 @@
 						new File(Paths.getPrefsPath(), "bin"));
 				if (x > 0) {
-					// Update available
+					// Update available or missing files
 					int res = JOptionPane.showConfirmDialog(null,
 							globalBundle.getString("aeiUpdateAvailable.text"),
Index: java/installer2/src/net/oni2/aeinstaller/backend/oni/OniLauncher.java
===================================================================
--- java/installer2/src/net/oni2/aeinstaller/backend/oni/OniLauncher.java	(revision 765)
+++ java/installer2/src/net/oni2/aeinstaller/backend/oni/OniLauncher.java	(revision 766)
@@ -23,6 +23,8 @@
 				break;
 			case MACOS:
-				exe = new File(Paths.getEditionBasePath(),
-						"Oni.app/Contents/MacOS/Oni");
+				exe = new File("./Oni.app/Contents/MacOS/Oni");
+				if (new File(Paths.getEditionBasePath(),
+						"Oni.app/Contents/MacOS/Oni").exists())
+					return exe;
 				break;
 			case LINUX:
@@ -44,5 +46,5 @@
 		}
 	}
-	
+
 	/**
 	 * @param windowed
@@ -62,6 +64,6 @@
 		if (windowed)
 			params.add("-noswitch");
-		ApplicationInvoker.execute(getOniExeType(), Paths.getEditionBasePath(), exe,
-				params);
+		ApplicationInvoker.execute(getOniExeType(), Paths.getEditionBasePath(),
+				exe, params);
 	}
 
Index: java/installer2/src/net/oni2/aeinstaller/localization/MainWin.properties
===================================================================
--- java/installer2/src/net/oni2/aeinstaller/localization/MainWin.properties	(revision 765)
+++ java/installer2/src/net/oni2/aeinstaller/localization/MainWin.properties	(revision 766)
@@ -15,6 +15,6 @@
 menu.runOniWin=Run Oni (&windowed)
 menu.runOniWinTooltip=Run Oni in windowed mode
-menu.openEditionFolder=Open Edition folder
-menu.openEditionFolderTooltip=Open the Edition folder in the file explorer
+menu.openEditionFolder=Open AE folder
+menu.openEditionFolderTooltip=Open the AE folder in the file explorer
 menu.loadConfig=&Load mod selection...
 menu.loadConfigTooltip=Load mod selection from a file