Index: branches/azimutz/Chazi/i386/libsaio/bootstruct.h
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/bootstruct.h	(revision 817)
+++ branches/azimutz/Chazi/i386/libsaio/bootstruct.h	(revision 818)
@@ -28,15 +28,11 @@
 //Azi: this is acting now as a mini libsaio.h :P
 //#include "libsaio.h"
 //#include "bios.h"
-//#include "libsa.h"
-//#include "saio_types.h"
-//#include "saio_internal.h"
-//#include "device_tree.h"
-
-#include "bootargs.h"
+#include "libsa.h"
 #include "saio_types.h"
-#include "bios.h"
+#include "saio_internal.h"
 #include "device_tree.h"
+#include "bootargs.h"
 
 /*!
     Kernel boot args global also used by booter for its own data.
Index: branches/azimutz/Chazi/i386/boot2/Makefile
===================================================================
--- branches/azimutz/Chazi/i386/boot2/Makefile	(revision 817)
+++ branches/azimutz/Chazi/i386/boot2/Makefile	(revision 818)
@@ -74,37 +74,32 @@
 embedtheme: art.h all
 
 boot: machOconv embedded.h $(OBJS) $(LIBDEP)
-	@echo "\t[LD] boot.sys"
-	@$(LD) -static -Wl,-preload -Wl,-segaddr,__INIT,$(BOOT2ADDR) \
+	$(LD) -static -Wl,-preload -Wl,-segaddr,__INIT,$(BOOT2ADDR) \
 	        -nostdlib -arch i386 -Wl,-segalign,20 \
 		-o $(SYMROOT)/boot.sys $(filter %.o,$^) $(LIBS) -lcc_kext
 
-	@cp  $(SYMROOT)/boot.sys  $(SYMROOT)/boot2.sys
+	cp  $(SYMROOT)/boot.sys  $(SYMROOT)/boot2.sys
 
-	@# Generate the Symbols.dylib file
-	@echo "\t[dyldsymboltool] Symbols.dylib"
-	@$(SYMROOT)/dyldsymboltool $(SYMROOT)/boot.sys $(SYMROOT)/${SYMBOLS_MODULE}
+	# Generate the Symbols.dylib file
+	$(SYMROOT)/dyldsymboltool $(SYMROOT)/boot.sys $(SYMROOT)/${SYMBOLS_MODULE}
 
-	@echo "\t[LD] boot.sys"
-	@$(LD) -static -Wl,-preload -Wl,-segaddr,__INIT,$(BOOT2ADDR) \
+	$(LD) -static -Wl,-preload -Wl,-segaddr,__INIT,$(BOOT2ADDR) \
 	        -nostdlib -arch i386 -Wl,-segalign,20 \
 		-Wl,-sectcreate,__DATA,__Symbols,$(SYMROOT)/Symbols.dylib \
 		-o $(SYMROOT)/boot.sys $(filter %.o,$^) $(LIBS)  -lcc_kext
 
-	@# Second pass, fixup global var locations
-	@${RM} $(SYMROOT)/${SYMBOLS_MODULE}
+	# Second pass, fixup global var locations
+	${RM} $(SYMROOT)/${SYMBOLS_MODULE}
 
-	@# Generate the Symbols.dylib file
-	@echo "\t[dyldsymboltool] Symbols.dylib"
-	@$(SYMROOT)/dyldsymboltool $(SYMROOT)/boot.sys $(SYMROOT)/${SYMBOLS_MODULE}
+	# Generate the Symbols.dylib file
+	$(SYMROOT)/dyldsymboltool $(SYMROOT)/boot.sys $(SYMROOT)/${SYMBOLS_MODULE}
 
-	@${RM} $(SYMROOT)/boot.sys
-	@echo "\t[LD] boot.sys"
-	@$(LD) -static -Wl,-preload -Wl,-segaddr,__INIT,$(BOOT2ADDR) \
+	${RM} $(SYMROOT)/boot.sys
+	$(LD) -static -Wl,-preload -Wl,-segaddr,__INIT,$(BOOT2ADDR) \
 	        -nostdlib -arch i386 -Wl,-segalign,20 \
 		-Wl,-sectcreate,__DATA,__Symbols,$(SYMROOT)/Symbols.dylib \
 		-o $(SYMROOT)/boot.sys $(filter %.o,$^) $(LIBS)  -lcc_kext
-
+#Azi: @ ??
 	@ld -arch i386 \
 	-undefined dynamic_lookup \
 	-dylib -read_only_relocs suppress \
@@ -112,17 +107,16 @@
 	-no_uuid \
 	-final_output Symbols \
 	$(filter %.o,$^) $(LIBS) \
+	-macosx_version_min 10.6 \
 	-o $(OBJROOT)/Symbols_LINKER_ONLY.dylib
-
-
-
-	@make embed_symbols		# this is done in a sub process after boot.sys exists so the strings are populated correctly
-
-	@${RM} $(SYMROOT)/boot2.sys
-
-
-	@##size $(SYMROOT)/boot.sys
-	@ls -l $(SYMROOT)/boot
+#Azi: -macosx_version_min warning
+# @ ??
+	# this is done in a sub process after boot.sys exists so the strings are populated correctly
+	@make embed_symbols
+#Azi: @ ??
+	${RM} $(SYMROOT)/boot2.sys
+#Azi: @ ??
+	ls -l $(SYMROOT)/boot
 	@( size=`ls -l $(SYMROOT)/boot | awk '{ print $$5}'` ; \
 	  if expr "$$size" ">" "$(MAXBOOTSIZE)" > /dev/null ;\
 	  then \
@@ -131,8 +125,9 @@
 	    exit 1;\
 	  fi)
 
-	
+
 embed_symbols: machOconv
+#Azi: @ ??
 	@echo ================= Embedding Symbols.dylib =================
 	@echo "\t[MACHOCONV] boot"
 	@$(SYMROOT)/machOconv $(SYMROOT)/boot2.sys $(SYMROOT)/boot &> /dev/null
@@ -142,7 +137,6 @@
 	@echo "\t[MACHOCONV] boot"
 	@$(SYMROOT)/machOconv $(SYMROOT)/boot.sys $(SYMROOT)/boot
 
-	
 
 prompt.o: vers.h
 vers.h:
Index: branches/azimutz/Chazi/i386/boot2/boot.h
===================================================================
--- branches/azimutz/Chazi/i386/boot2/boot.h	(revision 817)
+++ branches/azimutz/Chazi/i386/boot2/boot.h	(revision 818)
@@ -109,7 +109,11 @@
 #define kWakeKey			 "Wake"				 // boot.c				getBoolFK
 #define kForceWakeKey		 "ForceWake"		 // boot.c				getBoolFK
 #define kWakeKeyImageKey	 "WakeImage"		 // boot.c				getValFK				- location???
-#define kUseAtiROMKey		 "UseAtiROM"		 // ati.c				getBoolFK
+
+#define kUseAtiROMKey		 "UseAtiROM"		 // ati.c				getBoolFK ?? modules
+#define kAtiConfigKey		 "AtiConfig"		 // ati.c				getStringFK
+#define kATYbinimageKey		 "ATYbinimage"		 // ati.c				getBoolFK
+
 #define kUseNvidiaROMKey	 "UseNvidiaROM"		 // nvidia.c			getBoolFK
 #define kVBIOSKey			 "VBIOS"			 // nvidia.c			getBoolFK
 #define kGraphicsModeKey	 "Graphics Mode"	 // graphics.c			getNumberArraiFP		- kFlag
Index: branches/azimutz/Chazi/i386/boot2/modules.c
===================================================================
--- branches/azimutz/Chazi/i386/boot2/modules.c	(revision 817)
+++ branches/azimutz/Chazi/i386/boot2/modules.c	(revision 818)
@@ -2,20 +2,18 @@
  * Copyright 2010 Evan Lojewski. All rights reserved.
  *
  */
+
 #ifndef DEBUG_MODULES
-#define DEBUG_MODULES 0
+#define DEBUG_MODULES 1
 #endif
 
 //#include "boot.h"
 //#include "libsa.h"
 //#include "saio_internal.h"
-//#include "bootstruct.h"
 //#include "multiboot.h"
-//#include "modules.h"
-
-#include "boot.h"
 #include "bootstruct.h"
 #include "modules.h"
+#include "memory.h"
 
 
 #if DEBUG_MODULES
Index: branches/azimutz/Chazi/i386/modules/HPET/Makefile
===================================================================
--- branches/azimutz/Chazi/i386/modules/HPET/Makefile	(revision 817)
+++ branches/azimutz/Chazi/i386/modules/HPET/Makefile	(revision 818)
@@ -7,20 +7,8 @@
 
 DIR = HPET
 
-include ../../MakePaths.dir
+MODULE_OBJS = HPET.o
 
-OBJROOT=../../../obj/i386/modules/$(DIR)
-SYMROOT=../../../sym/i386/modules/
-DSTROOT=../../../dst/i386/modules/
-
-
-UTILDIR = ../../util
-LIBSADIR = ../../libsa
-LIBSAIODIR = ../../libsaio
-BOOT2DIR = ../../boot2
-
-INSTALLDIR = $(DSTROOT)/System/Library/Frameworks/System.framework/Versions/B/PrivateHeaders/standalone
-
 OPTIM = -Os -Oz
 DEBUG = -DNOTHING
 #DEBUG = -DDEBUG_HELLO_WORLD=1
@@ -34,19 +22,10 @@
 DEFINES=
 CONFIG = hd
 INC = -I. -I.. -I$(SYMROOT) -I$(UTILDIR) -I$(LIBSADIR) -I$(LIBSAIODIR) -I$(BOOT2DIR)
-ifneq "" "$(wildcard /bin/mkdirs)"
-  MKDIRS = /bin/mkdirs
-else
-  MKDIRS = /bin/mkdir -p
-endif
-AS = as
-LD = ld
-# LIBS= -lc_static
 LIBS=
 
 VPATH = $(OBJROOT):$(SYMROOT)
 
-HPET_OBJS = HPET.o
 
 
 SFILES =
@@ -59,28 +38,7 @@
 	$(HFILES) $(OTHERFILES)
 DIRS_NEEDED = $(OBJROOT) $(SYMROOT)
 
-all embedtheme optionrom: ${HPET_OBJS} dylib
+all embedtheme: dylib
 
 
-dylib: ${HPET_OBJS}
-	ld -arch i386 \
-	-undefined dynamic_lookup \
-	-alias $(MODULE_START) start \
-	-dylib -read_only_relocs suppress \
-	-S -x -Z -dead_strip_dylibs \
-	-no_uuid \
-	-current_version $(MODULE_VERSION) -compatibility_version $(MODULE_COMPAT_VERSION) \
-	-final_output $(MODULE_NAME) \
-	$(OBJROOT)/*.o \
-	-weak_library $(SYMROOT)/*.dylib \
-	-o $(SYMROOT)/$(MODULE_NAME).dylib
-
-
-
-HPET.o: 	
-	$(CC) $(CPPFLAGS) $(CFLAGS) $(DEFINES) -c "HPET.c" $(INC) -o "$(OBJROOT)/HPET.o"
-
-include ../../MakeInc.dir
-
-# dependencies
--include $(OBJROOT)/Makedep
+include ../MakeInc.dir
\ No newline at end of file
Index: branches/azimutz/Chazi/i386/modules/Resolution/Makefile
===================================================================
--- branches/azimutz/Chazi/i386/modules/Resolution/Makefile	(revision 817)
+++ branches/azimutz/Chazi/i386/modules/Resolution/Makefile	(revision 818)
@@ -44,6 +44,6 @@
 	$(HFILES) $(OTHERFILES)
 DIRS_NEEDED = $(OBJROOT) $(SYMROOT)
 
-all embedtheme optionrom: dylib
+all embedtheme: dylib
 
 include ../MakeInc.dir
\ No newline at end of file
Index: branches/azimutz/Chazi/i386/modules/MakeInc.dir
===================================================================
--- branches/azimutz/Chazi/i386/modules/MakeInc.dir	(revision 817)
+++ branches/azimutz/Chazi/i386/modules/MakeInc.dir	(revision 818)
@@ -14,8 +14,9 @@
 
 dylib: ${OBJROOT} ${MODULE_OBJS} dylib_final
 
-dylib_final: 
-	@rm -rf $(SYMROOT)/$(MODULE_NAME).dylib	#ensure module doesn't link with old version of self
+dylib_final:
+	#ensure module doesn't link with old version of self
+	@rm -rf $(SYMROOT)/$(MODULE_NAME).dylib
 	@echo "\t[LD] $(MODULE_NAME).dylib"
 	
 	@ld -arch i386 \
@@ -37,12 +38,16 @@
 	@cp -rf include/* ../module_includes/ &> /dev/null || true
 	
 %.o: %.c
-	@echo "\t[CC] $<"
-	@$(CC) $(CPPFLAGS) $(CFLAGS) -I../include/ -Iinclude/ -I../module_includes/ -D__KLIBC__ $(DEFINES) -c "$<" $(INC) -o "$(OBJROOT)/$@"
+	#@echo "\t[CC] $<"
+	#@
+	$(CC) $(CPPFLAGS) $(CFLAGS) -I../include/ -Iinclude/ \
+	-I../module_includes/ -D__KLIBC__ $(DEFINES) -c "$<" $(INC) -o "$(OBJROOT)/$@"
 
 %.o: %.cpp
-	@echo "\t[CPP] $<"
-	@$(CPP) $(CPPFLAGS) $(CFLAGS) -I../include/ -Iinclude/ -I../module_includes/ -D__KLIBC__ $(DEFINES) -c "$<" $(INC) -o "$(OBJROOT)/$@"
+	#@echo "\t[CPP] $<"
+	#@
+	$(CPP) $(CPPFLAGS) $(CFLAGS) -I../include/ -Iinclude/ \
+	-I../module_includes/ -D__KLIBC__ $(DEFINES) -c "$<" $(INC) -o "$(OBJROOT)/$@"
 
 clean:
 	@echo "\t[RM] $(OBJROOT)"
Index: branches/azimutz/Chazi/i386/modules/klibc/Makefile
===================================================================
--- branches/azimutz/Chazi/i386/modules/klibc/Makefile	(revision 817)
+++ branches/azimutz/Chazi/i386/modules/klibc/Makefile	(revision 818)
@@ -46,9 +46,9 @@
 
 VPATH = $(OBJROOT):$(SYMROOT)
 
-		
 
 
+
 SFILES =
 CFILES = 
 HFILES = 
@@ -59,6 +59,6 @@
 	$(HFILES) $(OTHERFILES)
 DIRS_NEEDED = $(OBJROOT) $(SYMROOT)
 
-all embedtheme optionrom: dylib
+all embedtheme: dylib
 
 include ../MakeInc.dir
\ No newline at end of file
Index: branches/azimutz/Chazi/i386/modules/KernelPatcher/Makefile
===================================================================
--- branches/azimutz/Chazi/i386/modules/KernelPatcher/Makefile	(revision 817)
+++ branches/azimutz/Chazi/i386/modules/KernelPatcher/Makefile	(revision 818)
@@ -1,4 +1,3 @@
-
 MODULE_NAME = KernelPatcher
 MODULE_VERSION = "1.0.0"
 MODULE_COMPAT_VERSION = "1.0.0"
@@ -7,20 +6,8 @@
 
 DIR = KernelPatcher
 
-include ../../MakePaths.dir
+MODULE_OBJS = kernel_patcher.o
 
-OBJROOT=../../../obj/i386/modules/$(DIR)
-SYMROOT=../../../sym/i386/modules/
-DSTROOT=../../../dst/i386/modules/
-
-
-UTILDIR = ../../util
-LIBSADIR = ../../libsa
-LIBSAIODIR = ../../libsaio
-BOOT2DIR = ../../boot2
-
-INSTALLDIR = $(DSTROOT)/System/Library/Frameworks/System.framework/Versions/B/PrivateHeaders/standalone
-
 OPTIM = -O3
 DEBUG = -DNOTHING
 #DEBUG = -DDEBUG_HELLO_WORLD=1
@@ -34,19 +21,10 @@
 DEFINES=
 CONFIG = hd
 INC = -I. -I.. -I$(SYMROOT) -I$(UTILDIR) -I$(LIBSADIR) -I$(LIBSAIODIR) -I$(BOOT2DIR)
-ifneq "" "$(wildcard /bin/mkdirs)"
-  MKDIRS = /bin/mkdirs
-else
-  MKDIRS = /bin/mkdir -p
-endif
-AS = as
-LD = ld
-# LIBS= -lc_static
 LIBS=
 
 VPATH = $(OBJROOT):$(SYMROOT)
 
-OBJS = kernel_patcher.o
 
 
 SFILES =
@@ -59,29 +37,6 @@
 	$(HFILES) $(OTHERFILES)
 DIRS_NEEDED = $(OBJROOT) $(SYMROOT)
 
-all embedtheme: ${OBJS} dylib
+all embedtheme: dylib
 
-
-dylib: ${OBJS}
-	ld -arch i386 \
-	-undefined dynamic_lookup \
-	-alias $(MODULE_START) start \
-	-dylib -read_only_relocs suppress \
-	-S -x  -dead_strip_dylibs \
-	-no_uuid \
-	-bind_at_load \
-	-current_version $(MODULE_VERSION) -compatibility_version $(MODULE_COMPAT_VERSION) \
-	-final_output $(MODULE_NAME) \
-	-weak_library $(SYMROOT)/Symbols.dylib \
-	$(OBJROOT)/*.o \
-	-weak_library $(SYMROOT)/*.dylib \
-	-o $(SYMROOT)/$(MODULE_NAME).dylib
-
-
-kernel_patcher.o: 	
-	$(CC) $(CPPFLAGS) $(CFLAGS) $(DEFINES) -c "kernel_patcher.c" $(INC) -o "$(OBJROOT)/kernel_patcher.o"
-
-include ../../MakeInc.dir
-
-# dependencies
--include $(OBJROOT)/Makedep
+include ../MakeInc.dir
\ No newline at end of file
Index: branches/azimutz/Chazi/i386/modules/uClibc++/Makefile
===================================================================
--- branches/azimutz/Chazi/i386/modules/uClibc++/Makefile	(revision 817)
+++ branches/azimutz/Chazi/i386/modules/uClibc++/Makefile	(revision 818)
@@ -53,6 +53,6 @@
 	$(HFILES) $(OTHERFILES)
 DIRS_NEEDED = $(OBJROOT) $(SYMROOT)
 
-all embedtheme optionrom: dylib
+all embedtheme: dylib
 
 include ../MakeInc.dir
\ No newline at end of file
Index: branches/azimutz/Chazi/i386/modules/Memory/Makefile
===================================================================
--- branches/azimutz/Chazi/i386/modules/Memory/Makefile	(revision 817)
+++ branches/azimutz/Chazi/i386/modules/Memory/Makefile	(revision 818)
@@ -1,26 +1,14 @@
-
 MODULE_NAME = Memory
 MODULE_VERSION = "1.0.0"
 MODULE_COMPAT_VERSION = "1.0.0"
 MODULE_START = _$(MODULE_NAME)_start
-MODULE_DEPENDENCIES = 
+MODULE_DEPENDENCIES = klibc
 
 DIR = Memory
 
-include ../../MakePaths.dir
+MODULE_OBJS = dram_controllers.o spd.o Memory.o
+# mem.o
 
-OBJROOT=../../../obj/i386/modules/$(DIR)
-SYMROOT=../../../sym/i386/modules/
-DSTROOT=../../../dst/i386/modules/
-
-
-UTILDIR = ../../util
-LIBSADIR = ../../libsa
-LIBSAIODIR = ../../libsaio
-BOOT2DIR = ../../boot2
-
-INSTALLDIR = $(DSTROOT)/System/Library/Frameworks/System.framework/Versions/B/PrivateHeaders/standalone
-
 OPTIM = -Os -Oz
 DEBUG = -DNOTHING
 #DEBUG = -DDEBUG_HELLO_WORLD=1
@@ -34,23 +22,10 @@
 DEFINES=
 CONFIG = hd
 INC = -I. -I.. -I$(SYMROOT) -I$(UTILDIR) -I$(LIBSADIR) -I$(LIBSAIODIR) -I$(BOOT2DIR)
-ifneq "" "$(wildcard /bin/mkdirs)"
-  MKDIRS = /bin/mkdirs
-else
-  MKDIRS = /bin/mkdir -p
-endif
-AS = as
-LD = ld
-# LIBS= -lc_static
 LIBS=
 
 VPATH = $(OBJROOT):$(SYMROOT)
 
-#Azi: mem.o gone on Kabyl's
-MEMORY_OBJS = dram_controllers.o spd.o Memory.o
-# mem.o
-
-
 SFILES =
 CFILES = 
 HFILES = 
@@ -61,39 +36,6 @@
 	$(HFILES) $(OTHERFILES)
 DIRS_NEEDED = $(OBJROOT) $(SYMROOT)
 
-all embedtheme: ${MEMORY_OBJS} dylib
+all embedtheme: dylib
 
-#Azi: wtf ?? graphics enabler :P
-dylib: ${GRAPHICS_ENABLER_OBJS}
-	ld -arch i386 \
-	-undefined dynamic_lookup \
-	-alias $(MODULE_START) start \
-	-dylib -read_only_relocs suppress \
-	-S -x -Z -dead_strip_dylibs \
-	-no_uuid \
-	-current_version $(MODULE_VERSION) -compatibility_version $(MODULE_COMPAT_VERSION) \
-	-final_output $(MODULE_NAME) \
-	$(OBJROOT)/*.o \
-	-weak_library $(SYMROOT)/*.dylib \
-	-o $(SYMROOT)/$(MODULE_NAME).dylib
-
-
-
-dram_controllers.o: 	
-	$(CC) $(CPPFLAGS) $(CFLAGS) $(DEFINES) -c "dram_controllers.c" $(INC) -o "$(OBJROOT)/dram_controllers.o"
-
-Memory.o: 	
-	$(CC) $(CPPFLAGS) $(CFLAGS) $(DEFINES) -c "Memory.c" $(INC) -o "$(OBJROOT)/Memory.o"
-
-spd.o: 	
-	$(CC) $(CPPFLAGS) $(CFLAGS) $(DEFINES) -c "spd.c" $(INC) -o "$(OBJROOT)/spd.o"
-
-#Azi: gone on Kabyl's
-#mem.o: 	
-#	$(CC) $(CPPFLAGS) $(CFLAGS) $(DEFINES) -c "mem.c" $(INC) -o "$(OBJROOT)/mem.o"
-
-
-include ../../MakeInc.dir
-
-# dependencies
--include $(OBJROOT)/Makedep
+include ../MakeInc.dir
\ No newline at end of file
Index: branches/azimutz/Chazi/i386/modules/GraphicsEnabler/GraphicsEnabler.c
===================================================================
--- branches/azimutz/Chazi/i386/modules/GraphicsEnabler/GraphicsEnabler.c	(revision 817)
+++ branches/azimutz/Chazi/i386/modules/GraphicsEnabler/GraphicsEnabler.c	(revision 818)
@@ -31,7 +31,7 @@
 	char *devicepath = get_pci_dev_path(current);
 
 	bool do_gfx_devprop = false;
-	getBoolForKey(kGraphicsEnabler, &do_gfx_devprop, &bootInfo->bootConfig);
+	getBoolForKey(kGraphicsEnablerKey, &do_gfx_devprop, &bootInfo->bootConfig);
 
 	if (do_gfx_devprop)
 	{
Index: branches/azimutz/Chazi/i386/modules/GraphicsEnabler/nvidia.c
===================================================================
--- branches/azimutz/Chazi/i386/modules/GraphicsEnabler/nvidia.c	(revision 817)
+++ branches/azimutz/Chazi/i386/modules/GraphicsEnabler/nvidia.c	(revision 818)
@@ -788,7 +788,7 @@
 
 	rom = malloc(NVIDIA_ROM_SIZE);
 	sprintf(nvFilename, "/Extra/%04x_%04x.rom", (uint16_t)nvda_dev->vendor_id, (uint16_t)nvda_dev->device_id);
-	if (getBoolForKey(kUseNvidiaROM, &doit, &bootInfo->bootConfig) && doit) {
+	if (getBoolForKey(kUseNvidiaROMKey, &doit, &bootInfo->bootConfig) && doit) {
 		verbose("Looking for nvidia video bios file %s\n", nvFilename);
 		nvBiosOveride = load_nvidia_bios_file(nvFilename, rom, NVIDIA_ROM_SIZE);
 		if (nvBiosOveride > 0) {
@@ -930,7 +930,7 @@
 	devprop_add_value(device, "VRAM,totalsize", (uint8_t*)&videoRam, 4);
 	devprop_add_value(device, "model", (uint8_t*)model, strlen(model) + 1);
 	devprop_add_value(device, "rom-revision", (uint8_t*)biosVersion, strlen(biosVersion) + 1);
-	if (getBoolForKey(kVBIOS, &doit, &bootInfo->bootConfig) && doit) {
+	if (getBoolForKey(kVBIOSKey, &doit, &bootInfo->bootConfig) && doit) {
 		devprop_add_value(device, "vbios", rom, (nvBiosOveride > 0) ? nvBiosOveride : (rom[2] * 512));
 	}
 
Index: branches/azimutz/Chazi/i386/modules/GraphicsEnabler/Makefile
===================================================================
--- branches/azimutz/Chazi/i386/modules/GraphicsEnabler/Makefile	(revision 817)
+++ branches/azimutz/Chazi/i386/modules/GraphicsEnabler/Makefile	(revision 818)
@@ -35,7 +35,7 @@
 	$(HFILES) $(OTHERFILES)
 DIRS_NEEDED = $(OBJROOT) $(SYMROOT)
 
-all embedtheme optionrom: dylib
+all embedtheme: dylib
 
 
 include ../MakeInc.dir
Index: branches/azimutz/Chazi/i386/modules/GraphicsEnabler/ati.c
===================================================================
--- branches/azimutz/Chazi/i386/modules/GraphicsEnabler/ati.c	(revision 817)
+++ branches/azimutz/Chazi/i386/modules/GraphicsEnabler/ati.c	(revision 818)
@@ -1141,10 +1141,10 @@
 	
 	get_vram_size();
 
-	getBoolForKey(kATYbinimage, &add_vbios, &bootInfo->bootConfig);
+	getBoolForKey(kATYbinimageKey, &add_vbios, &bootInfo->bootConfig);
 
 	if (add_vbios)
-		if (!load_vbios_file(kUseAtiROM, pci_dev->vendor_id, pci_dev->device_id, pci_dev->subsys_id.subsys_id))
+		if (!load_vbios_file(kUseAtiROMKey, pci_dev->vendor_id, pci_dev->device_id, pci_dev->subsys_id.subsys_id))
 		{
 			verbose("reading VBIOS from %s", card->posted ? "legacy space" : "PCI ROM");
 			if (card->posted)
@@ -1164,7 +1164,7 @@
 
 	atN = 0;
 
-	fb_name = getStringForKey(kAtiConfig, &bootInfo->bootConfig);
+	fb_name = getStringForKey(kAtiConfigKey, &bootInfo->bootConfig);
 	if (!fb_name)
 	{
 		fb_name = card_configs[card->info->cfg_name].name;
Index: branches/azimutz/Chazi/i386/modules/HelloWorld/Makefile
===================================================================
--- branches/azimutz/Chazi/i386/modules/HelloWorld/Makefile	(revision 817)
+++ branches/azimutz/Chazi/i386/modules/HelloWorld/Makefile	(revision 818)
@@ -38,6 +38,6 @@
 	$(HFILES) $(OTHERFILES)
 DIRS_NEEDED = $(OBJROOT) $(SYMROOT)
 
-all embedtheme optionrom: dylib
+all embedtheme: dylib
 
 include ../MakeInc.dir
\ No newline at end of file
Index: branches/azimutz/Chazi/i386/modules/Makefile
===================================================================
--- branches/azimutz/Chazi/i386/modules/Makefile	(revision 817)
+++ branches/azimutz/Chazi/i386/modules/Makefile	(revision 818)
@@ -1,8 +1,10 @@
 #	Makefile for i386 modules
 
 # The order of building is important.
-SUBDIRS = klibc uClibc++ Resolution
-#SUBDIRS = klibc uClibc++ Resolution HelloWorld
+SUBDIRS = klibc uClibc++ GraphicsEnablerLegacy KernelPatcher Memory HPET
+#SUBDIRS = HelloWorld
+#		   Resolution (only tested on Meklort's branch, never did any good for my resolution; conflicts with AutoResolution)
+#		   GraphicsEnabler (no support for ATI legacy cards, e.g. 1000 series)
 
 
 CFLAGS= -O $(MORECPP) -arch i386 -g -static
Index: branches/azimutz/Chazi/i386/modules/GraphicsEnablerLegacy/GraphicsEnablerLegacy.c
===================================================================
--- branches/azimutz/Chazi/i386/modules/GraphicsEnablerLegacy/GraphicsEnablerLegacy.c	(revision 817)
+++ branches/azimutz/Chazi/i386/modules/GraphicsEnablerLegacy/GraphicsEnablerLegacy.c	(revision 818)
@@ -33,7 +33,7 @@
 	char *devicepath = get_pci_dev_path(current);
 
 	bool do_gfx_devprop = false;
-	getBoolForKey(kGraphicsEnabler, &do_gfx_devprop, &bootInfo->bootConfig);
+	getBoolForKey(kGraphicsEnablerKey, &do_gfx_devprop, &bootInfo->bootConfig);
 
 	if (do_gfx_devprop)
 	{
Index: branches/azimutz/Chazi/i386/modules/GraphicsEnablerLegacy/nvidia.c
===================================================================
--- branches/azimutz/Chazi/i386/modules/GraphicsEnablerLegacy/nvidia.c	(revision 817)
+++ branches/azimutz/Chazi/i386/modules/GraphicsEnablerLegacy/nvidia.c	(revision 818)
@@ -788,7 +788,7 @@
 
 	rom = malloc(NVIDIA_ROM_SIZE);
 	sprintf(nvFilename, "bt(0,0)/Extra/%04x_%04x.rom", (uint16_t)nvda_dev->vendor_id, (uint16_t)nvda_dev->device_id);
-	if (getBoolForKey(kUseNvidiaROM, &doit, &bootInfo->bootConfig) && doit) {
+	if (getBoolForKey(kUseNvidiaROMKey, &doit, &bootInfo->bootConfig) && doit) {
 		verbose("Looking for nvidia video bios file %s\n", nvFilename);
 		nvBiosOveride = load_nvidia_bios_file(nvFilename, rom, NVIDIA_ROM_SIZE);
 		if (nvBiosOveride > 0) {
@@ -930,7 +930,7 @@
 	devprop_add_value(device, "VRAM,totalsize", (uint8_t*)&videoRam, 4);
 	devprop_add_value(device, "model", (uint8_t*)model, strlen(model) + 1);
 	devprop_add_value(device, "rom-revision", (uint8_t*)biosVersion, strlen(biosVersion) + 1);
-	if (getBoolForKey(kVBIOS, &doit, &bootInfo->bootConfig) && doit) {
+	if (getBoolForKey(kVBIOSKey, &doit, &bootInfo->bootConfig) && doit) {
 		devprop_add_value(device, "vbios", rom, (nvBiosOveride > 0) ? nvBiosOveride : (rom[2] * 512));
 	}
 
Index: branches/azimutz/Chazi/i386/modules/GraphicsEnablerLegacy/Makefile
===================================================================
--- branches/azimutz/Chazi/i386/modules/GraphicsEnablerLegacy/Makefile	(revision 817)
+++ branches/azimutz/Chazi/i386/modules/GraphicsEnablerLegacy/Makefile	(revision 818)
@@ -35,7 +35,7 @@
 	$(HFILES) $(OTHERFILES)
 DIRS_NEEDED = $(OBJROOT) $(SYMROOT)
 
-all embedtheme optionrom: dylib
+all embedtheme: dylib
 
 
 include ../MakeInc.dir
Index: branches/azimutz/Chazi/i386/modules/GraphicsEnablerLegacy/ati.c
===================================================================
--- branches/azimutz/Chazi/i386/modules/GraphicsEnablerLegacy/ati.c	(revision 817)
+++ branches/azimutz/Chazi/i386/modules/GraphicsEnablerLegacy/ati.c	(revision 818)
@@ -713,7 +713,7 @@
 	devprop_add_value(device, (char *) ati_name_1[0], (uint8_t *)tmp, strlen(tmp) + 1);
 
 	sprintf(tmp, "bt(0,0)/Extra/%04x_%04x.rom", (uint16_t)ati_dev->vendor_id, (uint16_t)ati_dev->device_id);
-	if (getBoolForKey(kUseAtiROM, &doit, &bootInfo->bootConfig) && doit) {
+	if (getBoolForKey(kUseAtiROMKey, &doit, &bootInfo->bootConfig) && doit) {
 		verbose("looking for ati video bios file %s\n", tmp);
 		rom = malloc(0x20000);
 		rom_size = load_ati_bios_file(tmp, rom, 0x20000);
Index: branches/azimutz/Chazi/i386/util/Makefile
===================================================================
--- branches/azimutz/Chazi/i386/util/Makefile	(revision 817)
+++ branches/azimutz/Chazi/i386/util/Makefile	(revision 818)
@@ -26,6 +26,13 @@
 
 all embedtheme: $(DIRS_NEEDED) $(PROGRAMS)
 
+dyldsymboltool: dyldsymboltool.o32 dyldsymboltool.o64
+	$(CC) $(CFLAGS) $(LDFLAGS) $(DEFINES) -arch i386 -o $(SYMROOT)/$(@F)_32 $(OBJROOT)/$(@F).o32
+	$(CC) $(CFLAGS) $(LDFLAGS) $(DEFINES) -arch x86_64 -o $(SYMROOT)/$(@F)_64 $(OBJROOT)/$(@F).o64
+	lipo -create -arch i386 $(SYMROOT)/$(@F)_32 -arch x86_64 $(SYMROOT)/$(@F)_64 -output $(SYMROOT)/$(@F)
+	$(RM) $(SYMROOT)/$(@F)_32 $(SYMROOT)/$(@F)_64
+
+
 machOconv: machOconv.o32 machOconv.o64
 	$(CC) $(CFLAGS) $(LDFLAGS) $(DEFINES) -arch i386 -o $(SYMROOT)/$(@F)_32 $(OBJROOT)/$(@F).o32
 	$(CC) $(CFLAGS) $(LDFLAGS) $(DEFINES) -arch x86_64 -o $(SYMROOT)/$(@F)_64 $(OBJROOT)/$(@F).o64
Index: branches/azimutz/Chazi/doc/BootHelp.txt
===================================================================
--- branches/azimutz/Chazi/doc/BootHelp.txt	(revision 817)
+++ branches/azimutz/Chazi/doc/BootHelp.txt	(revision 818)
@@ -17,7 +17,7 @@
 
   [flags] [Wait=y key] [any other key]
 
-WARNINGS: (feedback is welcome)
+WARNINGS (OUTDATED*****): (feedback is welcome)
 - At least Wait=y is breaking other keys/flags?, when typed after them. This
   is the main reason for the "argument" syntax above. If you have any problem
   of this nature please try the recommended syntax or play with it.