Index: branches/slice/trunkM/i386/libsaio/acpi_patcher.c
===================================================================
--- branches/slice/trunkM/i386/libsaio/acpi_patcher.c	(revision 1174)
+++ branches/slice/trunkM/i386/libsaio/acpi_patcher.c	(revision 1175)
@@ -159,7 +159,7 @@
 		{
 			if (read (fd, tableAddr, file_size (fd))!=file_size (fd))
 			{
-				verbose("Couldn't read table %s\n",dirspec);
+				//verbose("Couldn't read table %s\n",dirspec);
 				free (tableAddr);
 				close (fd);
 				return NULL;
Index: branches/slice/trunkM/i386/Cconfig
===================================================================
--- branches/slice/trunkM/i386/Cconfig	(revision 1174)
+++ branches/slice/trunkM/i386/Cconfig	(revision 1175)
@@ -4,7 +4,7 @@
 
 config OPTIMIZATION_LEVEL
 	string "Optimization Level"
-	default "-Oz"
+	default "-Os"
 	---help---
 	  Specify the level to compile chameleon with.
 
Index: branches/slice/trunkM/i386/modules/NVRAM/NVRAM.c
===================================================================
--- branches/slice/trunkM/i386/modules/NVRAM/NVRAM.c	(revision 1174)
+++ branches/slice/trunkM/i386/modules/NVRAM/NVRAM.c	(revision 1175)
@@ -10,7 +10,7 @@
 #include "bootstruct.h"
 #include "pci.h"
 #include "efi.h"
-#include "smbios_patcher.h"
+#include "smbios_getters.h"
 #include "xml.h"
 
 #ifndef DEBUG_NVRAM
@@ -43,7 +43,7 @@
 #define kBL_APPLE_VENDOR_NVRAM_GUID "4D1EDE05-38C7-4A6A-9CC6-4BCCA8B38C14"
 #define UUID_LEN	16
 
-extern EFI_GUID* getSystemID();
+//extern EFI_GUID* getSystemID();
 void NVRAM_hook(void* arg1, void* arg2, void* arg3, void* arg4);
 void NVRAM_start(void);
 
@@ -80,7 +80,7 @@
 	char*		ffmName;
 	char*		boName;
 	char*		bnName;
-	EFI_GUID*	ret = 0;
+//	EFI_GUID*	ret = 0;
 	uint16_t	bootOptionNumber = 0;
 	int i, j;
 	
@@ -96,7 +96,7 @@
 //	TagPtr	dictionary;
 	int cnt;
 	var = malloc(sizeof(variables)+1);
-	ClearNVRAM = getValueForKey(kClearNVRAM, &buff, &cnt, &bootInfo->bootConfig);
+	ClearNVRAM = getValueForKey("-c", &buff, &cnt, &bootInfo->bootConfig);
 	if (!ClearNVRAM) {		
 		readNVRAM(var);
 	}
@@ -118,8 +118,8 @@
 	Node* optionsNode = DT__FindNode("/options", true);  //"/fakenvram"
 	ffName = malloc(sizeof(PLATFORM_UUID)+1);
 	strcpy(ffName, PLATFORM_UUID);
-	ret = getSystemID();
-	DT__AddProperty(optionsNode, ffName, UUID_LEN, (EFI_UINT32*) ret);		
+//	ret = getSystemID();
+//	DT__AddProperty(optionsNode, ffName, UUID_LEN, (EFI_UINT32*) ret);		
 		
 		// this information can be obtained from DMI Type 0
 		SMBByte* p = (SMBByte*)FindFirstDmiTableOfType(0, 0x18);
@@ -157,7 +157,7 @@
 		
 		//can we add here boot-properties?
 		//	optionsNode = DT__FindNode("chosen", true);
-#if 1 //NOTYET
+#if NOTYET
 		int lbC = 0;
 		while(((char*)&bootInfo->bootConfig)[lbC++]);
 		if (lbC > sizeof(bootInfo->bootConfig)) lbC = sizeof(bootInfo->bootConfig);
Index: branches/slice/trunkM/i386/modules/Networking/Networking.c
===================================================================
--- branches/slice/trunkM/i386/modules/Networking/Networking.c	(revision 1174)
+++ branches/slice/trunkM/i386/modules/Networking/Networking.c	(revision 1175)
@@ -77,7 +77,7 @@
 			return 0;
 		}
 		
-		devices_number++;
+//		devices_number++;
 		return 1;
 	}
 	else
Index: branches/slice/trunkM/i386/modules/Cconfig
===================================================================
--- branches/slice/trunkM/i386/modules/Cconfig	(revision 1174)
+++ branches/slice/trunkM/i386/modules/Cconfig	(revision 1175)
@@ -6,5 +6,12 @@
 source "i386/modules/Resolution/Cconfig"
 source "i386/modules/klibc/Cconfig"
 source "i386/modules/uClibcxx/Cconfig"
-source "i386/modules/HelloWorld/Cconfig"
+source "i386/modules/NVRAM/Cconfig"
+source "i386/modules/KernelPatcher/Cconfig"
+source "i386/modules/KextPatcher/Cconfig"
+source "i386/modules/NetbookInstaller/Cconfig"
+source "i386/modules/HPET/Cconfig"
+source "i386/modules/Memory/Cconfig"
+source "i386/modules/Networking/Cconfig"
+source "i386/modules/USBFix/Cconfig"
 endmenu
\ No newline at end of file
Index: branches/slice/trunkM/i386/modules/Makefile
===================================================================
--- branches/slice/trunkM/i386/modules/Makefile	(revision 1174)
+++ branches/slice/trunkM/i386/modules/Makefile	(revision 1175)
@@ -11,8 +11,8 @@
 include ${SRCROOT}/Make.rules
 
 # The order of building is important.
-SUBDIRS = klibc uClibcxx Resolution USBFix
-#HelloWorld 
+SUBDIRS = klibc uClibcxx Resolution NVRAM HPET USBFix
+#HelloWorld Memory NetbookInstaller KernelPatcher KextPatcher Networking 
 
 
 CFLAGS= -Os $(MORECPP) -arch i386 -g -static
Index: branches/slice/trunkM/artwork/themes/default/logo.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: branches/slice/trunkM/revision
===================================================================
--- branches/slice/trunkM/revision	(revision 1174)
+++ branches/slice/trunkM/revision	(revision 1175)
@@ -1 +1 @@
-749
\ No newline at end of file
+1171
\ No newline at end of file
Index: branches/slice/trunkM/Makefile
===================================================================
--- branches/slice/trunkM/Makefile	(revision 1174)
+++ branches/slice/trunkM/Makefile	(revision 1175)
@@ -89,16 +89,18 @@
 	    fi;								  \
 	done
 
-image: all
+image:
 	@if [ -e "$(SYMROOT)" ]; then					  \
 	    rm -r -f ${IMGROOT};				  	  \
 	    mkdir -p ${IMGROOT}/usr/standalone/i386;		  	  \
 	    mkdir -p ${IMGROOT}/Extra/modules;				\
+	    mkdir -p ${IMGROOT}/Extra/Themes/Default;				\
 	    if [ -e "$(IMGSKELROOT)" ]; then				  \
 		cp -R -f "${IMGSKELROOT}"/* "${IMGROOT}";		  \
 	    fi;								  \
 	    cp -f ${SYMROOT}/i386/cdboot ${CDBOOT};		  	  \
 	    cp -f ${SYMROOT}/i386/modules/* ${IMGROOT}/Extra/modules;	\
+	    cp -f ${SRCROOT}/artwork/themes/default/* ${IMGROOT}/Extra/Themes/Default;	\
 	    cp -f ${SYMROOT}/i386/boot ${IMGROOT}/usr/standalone/i386; 	  \
 	    cp -f ${SYMROOT}/i386/boot0 ${IMGROOT}/usr/standalone/i386;	  \
 	    cp -f ${SYMROOT}/i386/boot1h ${IMGROOT}/usr/standalone/i386;  \