Index: java/installer2/src/net/oni2/aeinstaller/backend/oni/Installer.java
===================================================================
--- java/installer2/src/net/oni2/aeinstaller/backend/oni/Installer.java	(revision 741)
+++ java/installer2/src/net/oni2/aeinstaller/backend/oni/Installer.java	(revision 744)
@@ -314,5 +314,6 @@
 		}
 
-		TreeMap<String, Vector<File>> levels = new TreeMap<String, Vector<File>>(new NaturalOrderComparator());
+		TreeMap<String, Vector<File>> levels = new TreeMap<String, Vector<File>>(
+				new NaturalOrderComparator());
 		for (File path : foldersOni) {
 			for (File levelF : path.listFiles()) {
@@ -479,5 +480,6 @@
 		tmpFolder.mkdir();
 
-		TreeMap<String, Vector<File>> patches = new TreeMap<String, Vector<File>>(new NaturalOrderComparator());
+		TreeMap<String, Vector<File>> patches = new TreeMap<String, Vector<File>>(
+				new NaturalOrderComparator());
 		for (File patchFolder : patchFolders) {
 			for (File levelFolder : patchFolder.listFiles(dirFileFilter)) {
@@ -563,5 +565,13 @@
 			logAppOutput(res, log);
 
-			// Apply patches in levelFolderXML
+			// Create masterpatch file (containing calls to all individual
+			// patches)
+			File masterpatch = new File(levelFolderXML, "masterpatch.oni-patch");
+			PrintWriter masterpatchWriter = null;
+			try {
+				masterpatchWriter = new PrintWriter(masterpatch);
+			} catch (FileNotFoundException e) {
+				e.printStackTrace();
+			}
 			for (File patch : patches.get(level)) {
 				String patternWildcard = patch.getName();
@@ -570,9 +580,11 @@
 				patternWildcard = patternWildcard + ".xml";
 				patternWildcard = patternWildcard.replace('-', '*');
-
-				res = XMLTools.patch(patch, new File(levelFolderXML,
-						patternWildcard));
-				logAppOutput(res, log);
-			}
+				File xmlFilePath = new File(levelFolderXML, patternWildcard);
+				masterpatchWriter.println(String.format("@COMMAND patchfile -filename:\"%s\" -forceinfiles:\"%s\"", patch.getPath(), xmlFilePath.getPath()));
+			}
+			masterpatchWriter.close();
+			// Apply patches through masterpatch in levelFolderXML
+			res = XMLTools.patch(masterpatch, null);
+			logAppOutput(res, log);
 
 			// Create .oni files from XML
@@ -749,5 +761,6 @@
 
 			log.println("Reimporting levels");
-			TreeSet<File> initFolders = new TreeSet<File>(new NaturalOrderComparator());
+			TreeSet<File> initFolders = new TreeSet<File>(
+					new NaturalOrderComparator());
 			for (File f : init.listFiles()) {
 				initFolders.add(f);
Index: java/installer2/src/net/oni2/aeinstaller/backend/oni/XMLTools.java
===================================================================
--- java/installer2/src/net/oni2/aeinstaller/backend/oni/XMLTools.java	(revision 741)
+++ java/installer2/src/net/oni2/aeinstaller/backend/oni/XMLTools.java	(revision 744)
@@ -32,5 +32,6 @@
 		params.add("patchfile");
 		params.add("-filename:" + patch.getPath());
-		params.add("-forceinfiles:" + source.getPath());
+		if (source != null)
+			params.add("-forceinfiles:" + source.getPath());
 		ApplicationInvocationResult res = null;
 		try {
Index: java/installer2/src/net/oni2/aeinstaller/gui/MainWin.yml
===================================================================
--- java/installer2/src/net/oni2/aeinstaller/gui/MainWin.yml	(revision 741)
+++ java/installer2/src/net/oni2/aeinstaller/gui/MainWin.yml	(revision 744)
@@ -3,5 +3,5 @@
   title: appname
   size: 950x600
-  minimumSize: 400x300
+  minimumSize: 850x300
   locationRelativeTo: null
   defaultCloseOperation: doNothingOnClose
@@ -28,7 +28,4 @@
             - JMenuItem(action=exitAction)
         - JMenu(name=fileMenu, text=menu.file):
-            - JMenuItem(action=runOniFull)
-            - JMenuItem(action=runOniWin)
-            - JSeparator()
             - JMenuItem(action=update)
             - JSeparator()
@@ -88,4 +85,5 @@
                          >btnRunOniWin=1    [min]
                 - MigLayout: |
+                     [[gap 0px 0px, novisualpadding, insets 0]]
                      [min]           [grow]            [min]
                      panBottomLeft   panBottomCenter   panBottomRight    [min]