Index: branches/meklort/i386/modules/NetbookInstaller/NBI.c
===================================================================
--- branches/meklort/i386/modules/NetbookInstaller/NBI.c	(revision 572)
+++ branches/meklort/i386/modules/NetbookInstaller/NBI.c	(revision 573)
@@ -21,9 +21,9 @@
 
 long NBI_LoadDrivers( char * dirSpec );
 void NBI_md0Ramdisk();
+void NBI_PreBoot_hook(void* arg1, void* arg2, void* arg3, void* arg4);
+void NBI_loadBootGraphics(void);
 
-
-
 #ifndef OPTION_ROM
 extern long (*LoadExtraDrivers_p)(FileLoadDrivers_t FileLoadDrivers_p);
 
@@ -105,7 +105,14 @@
 	
 	//else printf("Unable to locate Extra/SystemVersion.LastPatched.plist\n");
 	
-	char dummyVal = 0;
+	register_hook_callback("PreBoot", &NBI_PreBoot_hook);		
+	
+}
+
+void NBI_PreBoot_hook(void* arg1, void* arg2, void* arg3, void* arg4)
+{
+	extern bool usePngImage;
+	bool dummyVal = 0;
 	if (getBoolForKey("recovery", &dummyVal, &bootInfo->bootConfig) && dummyVal)
 	{
 		if(dummyVal) runNetbookInstaller = 2;
@@ -114,12 +121,13 @@
 	if(runNetbookInstaller)
 	{
 		replace_function("_LoadDrivers", &NBI_LoadDrivers);
-		replace_function("_md0Ramdisk", &NBI_md0Ramdisk);
+		replace_function("_md0Ramdisk", &NBI_md0Ramdisk);		
+		replace_function("_loadBootGraphics", &NBI_loadBootGraphics);		
+		usePngImage = true;
 	}
-	
-	
 }
 
+
 void NBI_md0Ramdisk()
 {
 	RAMDiskParam ramdiskPtr;
@@ -248,3 +256,34 @@
 }
 
 
+extern int loadPngImage(const char *filename, uint16_t *width, uint16_t *height, uint8_t **imageData);
+
+//==========================================================================
+// loadBootGraphics
+void NBI_loadBootGraphics(void)
+{
+	extern uint8_t *bootImageData;
+	extern uint16_t bootImageWidth; 
+	extern uint16_t bootImageHeight; 
+
+	extern const char* theme_name;
+	extern bool usePngImage;
+	
+	if (bootImageData != NULL) {
+		return;
+	}
+	
+	char dirspec[256];
+	
+	if ((strlen(theme_name) + 24) > sizeof(dirspec)) {
+		usePngImage = false; 
+		return;
+	}
+	sprintf(dirspec, "/Extra/Themes/%s/NBI.png", theme_name);
+	if (loadPngImage(dirspec, &bootImageWidth, &bootImageHeight, &bootImageData) != 0) {
+#ifdef EMBED_THEME
+		if ((loadEmbeddedPngImage(__boot_png, __boot_png_len, &bootImageWidth, &bootImageHeight, &bootImageData)) != 0)
+#endif
+			usePngImage = false; 
+	}
+}