Index: java/installer2/src/net/oni2/aeinstaller/backend/oni/management/Installer.java
===================================================================
--- java/installer2/src/net/oni2/aeinstaller/backend/oni/management/Installer.java	(revision 1023)
+++ java/installer2/src/net/oni2/aeinstaller/backend/oni/management/Installer.java	(revision 1032)
@@ -198,6 +198,10 @@
 		TreeMap<String, Vector<File>> levels = new TreeMap<String, Vector<File>>(
 				new NaturalOrderComparator());
+		log.println("Building sources list");
 		for (File path : foldersOni) {
+			log.println("\tFolder " + path.getPath());
 			for (File levelF : path.listFiles()) {
+				boolean isSecondaryFile = false;
+				log.println("\t\tFolder/file " + levelF.getPath());
 				String fn = levelF.getName().toLowerCase();
 				String levelN = null;
@@ -207,9 +211,14 @@
 				} else if (fn.endsWith(".dat")) {
 					levelN = fn.substring(0, fn.lastIndexOf('.')).toLowerCase();
+				} else if (fn.endsWith(".raw") || fn.endsWith(".sep")) {
+					isSecondaryFile = true;
 				}
 				if (levelN != null) {
+					log.println("\t\t\tAdded for level " + levelN);
 					if (!levels.containsKey(levelN))
 						levels.put(levelN, new Vector<File>());
 					levels.get(levelN).add(levelF);
+				} else if (!isSecondaryFile) {
+					log.println("\t\t\tNot a level file!?");
 				}
 			}
@@ -422,7 +431,12 @@
 
 			log.println("\t\tPatches for " + level);
-
+			
+			log.println("\t\t\tSource files/folders:");
+			for (File srcFolder : oniLevelFolders.get(level)) {
+				log.println("\t\t\t\t" + srcFolder.getPath());
+			}
+
+			// Get files to be patched from vanilla.dat
 			Vector<String> exportPatterns = new Vector<String>();
-			// Get files to be patched from vanilla.dat
 			for (File patch : patches.get(level)) {
 				String patternWildcard = patch.getName();
@@ -449,7 +463,7 @@
 						patternWildcard.indexOf(".oni-patch"));
 				patternWildcard = patternWildcard.replace('-', '*');
-				patternWildcard = patternWildcard + ".oni";
 				Vector<String> patterns = new Vector<String>();
 				patterns.add(patternWildcard);
+				patternWildcard = patternWildcard + ".oni";
 				final Pattern patternRegex = Pattern.compile(
 						patternWildcard.replaceAll("\\*", ".\\*"),