diff --git a/HBC/META.XML b/HBC/META.XML
index e4144098..97058e7c 100644
--- a/HBC/META.XML
+++ b/HBC/META.XML
@@ -2,8 +2,8 @@
 	<app version="1">
 		<name> USB Loader GX</name>
 		<coder>USB Loader GX Team</coder>
-		<version>1.0 r958</version>
-		<release_date>201009191649</release_date>
+		<version>1.0 r960</version>
+		<release_date>201009211724</release_date>
 		<short_description>Loads games from USB-devices</short_description>
 		<long_description>USB Loader GX is a libwiigui based USB iso loader with a wii-like GUI. You can install games to your HDDs and boot them with shorter loading times.
 The interactive GUI is completely controllable with WiiMote, Classic Controller or GC Controller.
diff --git a/Makefile b/Makefile
index 3a574042..a390b215 100644
--- a/Makefile
+++ b/Makefile
@@ -129,26 +129,26 @@ export OUTPUT	:=	$(CURDIR)/$(TARGET)
 $(BUILD):
 	@[ -d $@ ] || mkdir -p $@
 	@/bin/bash ./buildtype.sh
-	@make --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile
+	@$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile
 #	@echo debug...
 #	start geckoreader.exe
 
 channel:
 	@[ -d build ] || mkdir -p build
 	@/bin/bash ./buildtype.sh FULLCHANNEL
-	@make --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile
+	@$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile
 
 #---------------------------------------------------------------------------------
 lang:
 	@[ -d build ] || mkdir -p build
-	@make --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile language
+	@$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile language
 
 #---------------------------------------------------------------------------------
 all:
 	@[ -d build ] || mkdir -p build
 	@./buildtype.sh
-	@make --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile
-	@make --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile language
+	@$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile
+	@$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile language
 
 #---------------------------------------------------------------------------------
 clean:
@@ -156,7 +156,7 @@ clean:
 	@rm -fr $(BUILD) $(OUTPUT).elf $(OUTPUT).dol
 #---------------------------------------------------------------------------------
 run:
-	make
+	$(MAKE)
 	@echo Done building ...
 	@echo Now Run That Shit ...
 	
@@ -168,7 +168,7 @@ reload:
 
 #---------------------------------------------------------------------------------	
 release: 
-	make
+	$(MAKE)
 	cp boot.dol ./hbc/boot.dol
 
 
@@ -190,7 +190,7 @@ language: $(wildcard $(PROJECTDIR)/Languages/*.lang)
 
 %.elf.o : %.elf
 	@echo $(notdir $<)
-	$(bin2o)
+	@bin2s -a 32 $< | $(AS) -o $(@)
 
 %.dol.o : %.dol
 	@echo $(notdir $<)
@@ -198,39 +198,44 @@ language: $(wildcard $(PROJECTDIR)/Languages/*.lang)
 
 %.ttf.o : %.ttf
 	@echo $(notdir $<)
-	$(bin2o)
+	@bin2s -a 32 $< | $(AS) -o $(@)
 
 %.png.o : %.png
 	@echo $(notdir $<)
-	$(bin2o)
+	@bin2s -a 32 $< | $(AS) -o $(@)
 	
 %.ogg.o : %.ogg
 	@echo $(notdir $<)
-	$(bin2o)
+	@bin2s -a 32 $< | $(AS) -o $(@)
 	
 %.pcm.o : %.pcm
 	@echo $(notdir $<)
-	$(bin2o)
+	@bin2s -a 32 $< | $(AS) -o $(@)
 
 %.mp3.o : %.mp3
 	@echo $(notdir $<)
-	$(bin2o)
+	@bin2s -a 32 $< | $(AS) -o $(@)
 	
 %.certs.o	:	%.certs
 	@echo $(notdir $<)
-	$(bin2o)
+	@bin2s -a 32 $< | $(AS) -o $(@)
+
 %.dat.o	:	%.dat
 	@echo $(notdir $<)
-	$(bin2o)
+	@bin2s -a 32 $< | $(AS) -o $(@)
+
 %.bin.o	:	%.bin
 	@echo $(notdir $<)
-	$(bin2o)
+	@bin2s -a 32 $< | $(AS) -o $(@)
+
 %.tik.o	:	%.tik
 	@echo $(notdir $<)
-	$(bin2o)
+	@bin2s -a 32 $< | $(AS) -o $(@)
+
 %.tmd.o	:	%.tmd
 	@echo $(notdir $<)
-	$(bin2o)
+	@bin2s -a 32 $< | $(AS) -o $(@)
+
 
 
 export PATH		:=	$(PROJECTDIR)/gettext-bin:$(PATH)
diff --git a/source/filelist.h b/source/filelist.h
index 2640d7f1..672c5808 100644
--- a/source/filelist.h
+++ b/source/filelist.h
@@ -546,4 +546,16 @@ extern const u32    lock_png_size;
 extern const u8     unlock_png[];
 extern const u32    unlock_png_size;
 
+extern const u8     stub_bin[];
+extern const u32    stub_bin_size;
+
+extern const u8     fatffs_module_bin[];
+extern const u32    fatffs_module_bin_size;
+
+extern const u8     ehcmodule_frag_v4_bin[];
+extern const u32    ehcmodule_frag_v4_bin_size;
+
+extern const u8     ehcmodule_frag_v5_bin[];
+extern const u32    ehcmodule_frag_v5_bin_size;
+
 #endif
diff --git a/source/lstub.cpp b/source/lstub.cpp
index b1adc4b0..37fa3d78 100644
--- a/source/lstub.cpp
+++ b/source/lstub.cpp
@@ -7,7 +7,7 @@
 
 
 #include "lstub.h"
-#include "stub_bin.h"
+#include "filelist.h"
 #include "gecko.h"
 
 #include "wad/nandtitle.h"
diff --git a/source/mload/mload_modules.c b/source/mload/mload_modules.c
index d0352fe9..69bfa677 100644
--- a/source/mload/mload_modules.c
+++ b/source/mload/mload_modules.c
@@ -1,6 +1,5 @@
 #include "mload_modules.h"
-#include "ehcmodule_frag_v4_bin.h"
-#include "ehcmodule_frag_v5_bin.h"
+#include "filelist.h"
 #include "gecko.h"
 
 #define ALIGNED(x) __attribute__((aligned(x)))
diff --git a/source/mload/mload_modules.h b/source/mload/mload_modules.h
index 5bd55884..be986acb 100644
--- a/source/mload/mload_modules.h
+++ b/source/mload/mload_modules.h
@@ -3,7 +3,7 @@
 
 #include "dip_plugin.h"
 #include "mload.h"
-#include "fatffs_module_bin.h"
+#include "filelist.h"
 
 #ifdef __cplusplus
 extern "C"