Index: AE/installer2/src/net/oni2/aeinstaller/backend/Paths.java
===================================================================
--- AE/installer2/src/net/oni2/aeinstaller/backend/Paths.java	(revision 624)
+++ AE/installer2/src/net/oni2/aeinstaller/backend/Paths.java	(revision 625)
@@ -16,15 +16,18 @@
 	 */
 	public static File getInstallerPath() {
-//		String jarPath = Settings.class.getProtectionDomain().getCodeSource()
-//				.getLocation().getPath();
-//		String decodedPath = null;
-//		try {
-//			decodedPath = URLDecoder.decode(jarPath, "UTF-8");
-//		} catch (UnsupportedEncodingException e) {
-//			e.printStackTrace();
-//		}
-//		return new File(decodedPath).getParentFile();
-		String wd = System.getProperty("user.dir");
-		return new File(wd);
+		if (Settings.isDebug()) {
+			String wd = System.getProperty("user.dir");
+			return new File(wd);
+		} else {
+			String jarPath = Settings.class.getProtectionDomain()
+					.getCodeSource().getLocation().getPath();
+			String decodedPath = null;
+			try {
+				decodedPath = URLDecoder.decode(jarPath, "UTF-8");
+			} catch (UnsupportedEncodingException e) {
+				e.printStackTrace();
+			}
+			return new File(decodedPath).getParentFile();
+		}
 	}
 
Index: AE/installer2/src/net/oni2/aeinstaller/backend/Settings.java
===================================================================
--- AE/installer2/src/net/oni2/aeinstaller/backend/Settings.java	(revision 624)
+++ AE/installer2/src/net/oni2/aeinstaller/backend/Settings.java	(revision 625)
@@ -112,5 +112,5 @@
 	 * @return Is debug run
 	 */
-	public static boolean getDebug() {
+	public static boolean isDebug() {
 		return debugRun;
 	}
Index: AE/installer2/src/net/oni2/aeinstaller/backend/oni/Installer.java
===================================================================
--- AE/installer2/src/net/oni2/aeinstaller/backend/oni/Installer.java	(revision 624)
+++ AE/installer2/src/net/oni2/aeinstaller/backend/oni/Installer.java	(revision 625)
@@ -244,4 +244,25 @@
 		combineBSLFolders(mods, listener);
 
+		if (Settings.getInstance().get("copyintro", false)) {
+			File src = new File(Paths.getVanillaGDF(), "intro.bik");
+			if (src.exists()) {
+				try {
+					FileUtils.copyFileToDirectory(src, Paths.getEditionGDF());
+				} catch (IOException e) {
+					e.printStackTrace();
+				}
+			}
+		}
+		if (Settings.getInstance().get("copyoutro", true)) {
+			File src = new File(Paths.getVanillaGDF(), "outro.bik");
+			if (src.exists()) {
+				try {
+					FileUtils.copyFileToDirectory(src, Paths.getEditionGDF());
+				} catch (IOException e) {
+					e.printStackTrace();
+				}
+			}
+		}
+
 		if (unlockLevels.size() > 0) {
 			File dat = new File(Paths.getEditionBasePath(), "persist.dat");