Index: AE/installer2/src/net/oni2/aeinstaller/AEInstaller.properties
===================================================================
--- AE/installer2/src/net/oni2/aeinstaller/AEInstaller.properties	(revision 624)
+++ AE/installer2/src/net/oni2/aeinstaller/AEInstaller.properties	(revision 625)
@@ -1,4 +1,4 @@
 appname=AE Installer 2
-appversion=0.84
+appversion=0.85
 
 invalidPath.title=Wrong directory
Index: AE/installer2/src/net/oni2/aeinstaller/AEInstaller2.java
===================================================================
--- AE/installer2/src/net/oni2/aeinstaller/AEInstaller2.java	(revision 624)
+++ AE/installer2/src/net/oni2/aeinstaller/AEInstaller2.java	(revision 625)
@@ -173,5 +173,5 @@
 					basicBundle.getString("invalidPath.title"),
 					JOptionPane.ERROR_MESSAGE);
-			if (!Settings.getDebug()) {
+			if (!Settings.isDebug()) {
 				return;
 			}
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");
Index: AE/installer2/src/net/oni2/aeinstaller/gui/MainWin.java
===================================================================
--- AE/installer2/src/net/oni2/aeinstaller/gui/MainWin.java	(revision 624)
+++ AE/installer2/src/net/oni2/aeinstaller/gui/MainWin.java	(revision 625)
@@ -65,4 +65,5 @@
 import net.oni2.aeinstaller.gui.modtable.ModTableModel;
 import net.oni2.aeinstaller.gui.settings.SettingsDialog;
+import net.oni2.aeinstaller.gui.toolmanager.ToolManager;
 
 import org.javabuilders.BuildResult;
@@ -428,7 +429,5 @@
 	@SuppressWarnings("unused")
 	private void tools() {
-		// TODO: Open tools manager
-		JOptionPane.showMessageDialog(this, "tools", "todo",
-				JOptionPane.INFORMATION_MESSAGE);
+		new ToolManager().setVisible(true);
 	}
 
Index: AE/installer2/src/net/oni2/aeinstaller/gui/settings/SettingsDialog.java
===================================================================
--- AE/installer2/src/net/oni2/aeinstaller/gui/settings/SettingsDialog.java	(revision 624)
+++ AE/installer2/src/net/oni2/aeinstaller/gui/settings/SettingsDialog.java	(revision 625)
@@ -34,4 +34,6 @@
 
 	private JCheckBox chkNotifyOnStart;
+	private JCheckBox chkCopyIntro;
+	private JCheckBox chkCopyOutro;
 
 	/**
@@ -40,5 +42,4 @@
 	public SettingsDialog() {
 		setResizable(false);
-//		setMinimumSize(new Dimension(320, (int) getSize().getHeight() + 0));
 
 		AbstractAction closeAction = new AbstractAction() {
@@ -67,4 +68,6 @@
 
 		chkNotifyOnStart.setSelected(set.get("notifyupdates", true));
+		chkCopyIntro.setSelected(set.get("copyintro", false));
+		chkCopyOutro.setSelected(set.get("copyoutro", true));
 	}
 
@@ -73,5 +76,7 @@
 		Settings set = Settings.getInstance();
 
-		set.get("notifyupdates", chkNotifyOnStart.isSelected());
+		set.put("notifyupdates", chkNotifyOnStart.isSelected());
+		set.put("copyintro", chkCopyIntro.isSelected());
+		set.put("copyoutro", chkCopyOutro.isSelected());
 
 		String oldLaf = set.get("lookandfeel", UIManager.getLookAndFeel()
Index: AE/installer2/src/net/oni2/aeinstaller/gui/settings/SettingsDialog.properties
===================================================================
--- AE/installer2/src/net/oni2/aeinstaller/gui/settings/SettingsDialog.properties	(revision 624)
+++ AE/installer2/src/net/oni2/aeinstaller/gui/settings/SettingsDialog.properties	(revision 625)
@@ -8,4 +8,6 @@
 panCommon=Common settings
 lblNotifyOnStart=Notify about updates on startup:
+lblCopyIntro=Enable starting video on installation:
+lblCopyOutro=Enable ending video on installation:
 
 newLaF.text=A new GUI theme was selected.\nPlease restart the application in order to apply the changes.
Index: AE/installer2/src/net/oni2/aeinstaller/gui/settings/SettingsDialog.yml
===================================================================
--- AE/installer2/src/net/oni2/aeinstaller/gui/settings/SettingsDialog.yml	(revision 624)
+++ AE/installer2/src/net/oni2/aeinstaller/gui/settings/SettingsDialog.yml	(revision 625)
@@ -13,7 +13,13 @@
       - JLabel(name=lblNotifyOnStart, text=lblNotifyOnStart)
       - JCheckBox(name=chkNotifyOnStart)
+      - JLabel(name=lblCopyIntro, text=lblCopyIntro)
+      - JCheckBox(name=chkCopyIntro)
+      - JLabel(name=lblCopyOutro, text=lblCopyOutro)
+      - JCheckBox(name=chkCopyOutro)
       - MigLayout: |
            [min]                [grow]
            >lblNotifyOnStart    chkNotifyOnStart         [pref]
+           >lblCopyIntro        chkCopyIntro             [pref]
+           >lblCopyOutro        chkCopyOutro             [pref]
     - JPanel(name=panUI, groupTitle=panUI):
       - JLabel(name=lblLaF, text=lblLaF)
Index: AE/installer2/src/net/oni2/aeinstaller/gui/toolmanager/ToolManager.java
===================================================================
--- AE/installer2/src/net/oni2/aeinstaller/gui/toolmanager/ToolManager.java	(revision 625)
+++ AE/installer2/src/net/oni2/aeinstaller/gui/toolmanager/ToolManager.java	(revision 625)
@@ -0,0 +1,12 @@
+package net.oni2.aeinstaller.gui.toolmanager;
+
+import javax.swing.JDialog;
+
+/**
+ * @author Christian Illy
+ */
+public class ToolManager extends JDialog {
+	private static final long serialVersionUID = 343221630538866384L;
+
+	//TODO
+}