Index: branches/autoResolution/i386/libsaio/ati_resolution.c
===================================================================
--- branches/autoResolution/i386/libsaio/ati_resolution.c	(revision 136)
+++ branches/autoResolution/i386/libsaio/ati_resolution.c	(revision 137)
@@ -24,11 +24,11 @@
 	ATOM_STANDARD_VESA_TIMING * std_vesa = (ATOM_STANDARD_VESA_TIMING *) (map->bios_ptr + std_vesa_offset);
 	
 	map->mode_table = (char *) &std_vesa->aModeTimings;
-	verbose("Standard VESA Table at offset * 0x%x\n", std_vesa_offset);
+	PRINT("Standard VESA Table at offset * 0x%x\n", std_vesa_offset);
 	if (map->mode_table == 0) {
-		verbose("Unable to locate the mode table.\n");
-		verbose("Please run the program 'dump_bios' as root and\n");
-		verbose("email the file 'vbios.dmp' to gaeloulacuisse@yahoo.fr.\n");
+		PRINT("Unable to locate the mode table.\n");
+		PRINT("Please run the program 'dump_bios' as root and\n");
+		PRINT("email the file 'vbios.dmp' to gaeloulacuisse@yahoo.fr.\n");
 		
 		close_vbios(map);
 		return 0;
@@ -44,10 +44,10 @@
 	if (!detect_ati_bios_type(map)) map->bios = BT_ATI_2;
 	if (map->bios == BT_ATI_2) {
 		map->modeline_num = map->mode_table_size / sizeof(ATOM_DTD_FORMAT);
-		verbose("Using DTD Format modelines\n");
+		PRINT("Using DTD Format modelines\n");
 	} else {
 		map->modeline_num = map->mode_table_size / sizeof(ATOM_MODE_TIMING);
-		verbose("Using Atom Mode Timing modelines\n");
+		PRINT("Using Atom Mode Timing modelines\n");
 	}
 	return map;
 }
@@ -58,7 +58,7 @@
 	
 	if ((*x != 0) && (*y != 0) && ( mode_timing[idx].usCRTC_H_Disp >= 640 )) {
 		
-		verbose("Mode %dx%d -> %dx%d\n",mode_timing[idx].usCRTC_H_Disp,mode_timing[idx].usCRTC_V_Disp,
+		PRINT("Mode %dx%d -> %dx%d\n",mode_timing[idx].usCRTC_H_Disp,mode_timing[idx].usCRTC_V_Disp,
 			   *x, *y);
 		
 		mode_timing[idx].usCRTC_H_Disp = *x;
@@ -77,7 +77,7 @@
 	
 	if ((*x != 0) && (*y != 0) && ( mode_timing[idx].usHActive >= 640 )) {
 		
-		verbose("Mode %dx%d -> %dx%d\n", mode_timing[idx].usHActive, mode_timing[idx].usHActive,
+		PRINT("Mode %dx%d -> %dx%d\n", mode_timing[idx].usHActive, mode_timing[idx].usHActive,
 			   *x, *y);
 		
 		mode_timing[idx].usHActive = *x;
Index: branches/autoResolution/i386/libsaio/hfs.c
===================================================================
--- branches/autoResolution/i386/libsaio/hfs.c	(revision 136)
+++ branches/autoResolution/i386/libsaio/hfs.c	(revision 137)
@@ -887,7 +887,8 @@
         readOffset = ((blockNumber - countedBlocks) * gBlockSize) +
                      (offset % gBlockSize);
     
-        readSize = GetExtentSize(currentExtent, 0) * gBlockSize - readOffset;
+		// MacWen: fix overflow in multiplication by forcing 64bit multiplication
+        readSize = (long long)GetExtentSize(currentExtent, 0) * gBlockSize - readOffset;
         if (readSize > (size - sizeRead)) readSize = size - sizeRead;
 
         readOffset += (long long)GetExtentStart(currentExtent, 0) * gBlockSize;
Index: branches/autoResolution/i386/libsaio/Makefile
===================================================================
--- branches/autoResolution/i386/libsaio/Makefile	(revision 136)
+++ branches/autoResolution/i386/libsaio/Makefile	(revision 137)
@@ -67,7 +67,8 @@
 
 #SIG = $(SYMROOT)/sig
 
-all embedtheme: $(DIRS_NEEDED) libsaio.h $(LIBS)
+all embedtheme autores_dbg: $(DIRS_NEEDED) libsaio.h $(LIBS)
+autores_dbg: CFLAGS += -DAUTORES_DEBUG
 
 #libsaio_static.a: $(SAIO_OBJS)
 #	rm -f $(SYMROOT)/$@
Index: branches/autoResolution/i386/libsaio/autoresolution.c
===================================================================
--- branches/autoResolution/i386/libsaio/autoresolution.c	(revision 136)
+++ branches/autoResolution/i386/libsaio/autoresolution.c	(revision 137)
@@ -178,7 +178,7 @@
 		aspect->width  = 4;
 		aspect->height = 3;
 	}
-	verbose("Aspect Ratio is %d/%d\n", aspect->width, aspect->height);
+	PRINT("Aspect Ratio is %d/%d\n", aspect->width, aspect->height);
 }
 
 void cvt_timings(UInt32 x, UInt32 y, UInt32 freq,
@@ -246,7 +246,7 @@
 	if (forced_chipset == CT_UNKWN) {
 		map->chipset_id = get_chipset_id();
 		map->chipset = get_chipset(map->chipset_id);
-		verbose("Chipset is %s (pci id 0x%x)\n",chipset_type_names[map->chipset], map->chipset_id);
+		PRINT("Chipset is %s (pci id 0x%x)\n",chipset_type_names[map->chipset], map->chipset_id);
 	}
 	else if (forced_chipset != CT_UNKWN) {
 		map->chipset = forced_chipset;
@@ -270,7 +270,7 @@
 	ati_tables.AtomRomHeader = (ATOM_ROM_HEADER *) (map->bios_ptr + *(unsigned short *) (map->bios_ptr + OFFSET_TO_POINTER_TO_ATOM_ROM_HEADER)); 
 	if (strcmp ((char *) ati_tables.AtomRomHeader->uaFirmWareSignature, "ATOM") == 0) {
 		map->bios = BT_ATI_1;
-		verbose("We have an AtomBios Card\n");
+		PRINT("We have an AtomBios Card\n");
 		return open_ati_vbios(map, ati_tables);
 	}
 
@@ -287,7 +287,7 @@
 				&& (map->bios_ptr[i+3] == 'D')) 
 			{
 				map->bios = BT_NVDA;
-				verbose("We have an NVIDIA Card\n");
+				PRINT("We have an NVIDIA Card\n");
 				return open_nvidia_vbios(map);
 				break;
 			}
@@ -309,7 +309,7 @@
 				&& (map->bios_ptr[i+4] == 'l')) 
 			{
 				map->bios = BT_1;
-				verbose("We have an Intel Card\n");
+				PRINT("We have an Intel Card\n");
 				return open_intel_vbios(map);
 				break;
 			}
@@ -323,11 +323,11 @@
 	
 	if ( (map->chipset == CT_UNKWN) || ((map->bios != BT_ATI_1) && (map->bios != BT_NVDA) && (map->bios != BT_1)) )
 			{
-					printf("Unknown chipset type and unrecognized bios.\n");
+		PRINT("Unknown chipset type and unrecognized bios.\n");
 					
-					printf("autoresolution only works with Intel 800/900 series graphic chipsets.\n");
+		PRINT("autoresolution only works with Intel 800/900 series graphic chipsets.\n");
 					
-					printf("Chipset Id: %x\n", map->chipset_id);
+		PRINT("Chipset Id: %x\n", map->chipset_id);
 		close_vbios(map);
 		return 0;
 	}
@@ -394,7 +394,7 @@
 	#if DEBUG
 	{
 		UInt32 t = inl(0xcfc);
-		printf("unlock PAM: (0x%08x)\n", t);
+		PRINT("unlock PAM: (0x%08x)\n", t);
 	}
 #endif
 }
@@ -444,7 +444,7 @@
 	#if DEBUG
 	{
         UInt32 t = inl(0xcfc);
-		printf("relock PAM: (0x%08x)\n", t);
+		PRINT("relock PAM: (0x%08x)\n", t);
 	}
 	#endif
 }
@@ -464,6 +464,7 @@
 
 void patch_vbios(vbios_map * map, UInt32 x, UInt32 y, UInt32 bp, UInt32 htotal, UInt32 vtotal) {
 	UInt32 i = 0;
+	
 	/*
 	 * Get the aspect ratio for the requested mode
 	 */
@@ -472,33 +473,62 @@
 	i = x = y = 0;
 	
 	if (map->bios != BT_NVDA) {
-		verbose("%d modes to pacth\n", map->modeline_num);
+		PRINT("%d modes to patch\n", map->modeline_num);
+		switch (map->bios) {
+			case BT_1:
 		while (i < map->modeline_num) {
 			if (x == 1400) x = 1440;
 			if (x == 1600) x = 1680;
 			
 			y = x * map->aspect_ratio.height / map->aspect_ratio.width;
-			switch (map->bios) {
-				case BT_1:
 					intel_set_mode_1(map, i, &x, &y);
+					i++;
+				}
 					break;
 				case BT_2:
+				while (i < map->modeline_num) {
+					if (x == 1400) x = 1440;
+					if (x == 1600) x = 1680;
+					
+					y = x * map->aspect_ratio.height / map->aspect_ratio.width;
 					intel_set_mode_2(map, i, &x, &y);
+					i++;
+				}
 					break;
 				case BT_3:
+				while (i < map->modeline_num) {
+					if (x == 1400) x = 1440;
+					if (x == 1600) x = 1680;
+					
+					y = x * map->aspect_ratio.height / map->aspect_ratio.width;
 					intel_set_mode_3(map, i, &x, &y);
+					i++;
+				}
 					break;
 				case BT_ATI_1:
+				while (i < map->modeline_num) {
+					if (x == 1400) x = 1440;
+					if (x == 1600) x = 1680;
+					
+					y = x * map->aspect_ratio.height / map->aspect_ratio.width;
 					ati_set_mode_1(map, i, &x, &y);
+					i++;
+				}
 					break;
 				case BT_ATI_2:
+				while (i < map->modeline_num) {
+					if (x == 1400) x = 1440;
+					if (x == 1600) x = 1680;
+					
+					y = x * map->aspect_ratio.height / map->aspect_ratio.width;
 					ati_set_mode_2(map, i, &x, &y);
+					i++;
+				}
 					break;
 				default:
 					break;
 			}
-			i++;
-		}
+		return;
 	}
 	
 	if (map->bios == BT_NVDA) {
@@ -523,5 +553,6 @@
 						nvidia_set_mode(map, i, &x, &y, SECOND_VESA_TABLE);
 						i++;
 					}
+		return;
 	}
 } 
\ No newline at end of file
Index: branches/autoResolution/i386/libsaio/autoresolution.h
===================================================================
--- branches/autoResolution/i386/libsaio/autoresolution.h	(revision 136)
+++ branches/autoResolution/i386/libsaio/autoresolution.h	(revision 137)
@@ -21,6 +21,12 @@
 #define NEW(a) ((a *)(malloc(sizeof(a))))
 #define FREE(a) (free(a))
 
+#ifdef AUTORES_DEBUG
+#define PRINT(a, b...) printf(a, ##b);
+#else 
+#define PRINT(a, b...) verbose(a, ##b);
+#endif
+
 #define VBIOS_START         0xc0000
 #define VBIOS_SIZE          0x10000
 
@@ -70,11 +76,13 @@
 	
 	char * mode_table;
 	char * nv_mode_table_2;
+	
+	UInt32 mode_table_size;
 	UInt32 nv_mode_table_2_size;
 	
-	UInt32 mode_table_size;
 	UInt32 modeline_num;
 	UInt32 nv_modeline_num_2;
+	
 	UInt8 b1, b2;
 	
 	s_aspect aspect_ratio;
Index: branches/autoResolution/i386/libsaio/nvidia_resolution.c
===================================================================
--- branches/autoResolution/i386/libsaio/nvidia_resolution.c	(revision 136)
+++ branches/autoResolution/i386/libsaio/nvidia_resolution.c	(revision 137)
@@ -49,56 +49,56 @@
 	nv_data_table = (unsigned short *) (map->bios_ptr + (nv_data_table_offset + OFFSET_TO_VESA_TABLE_INDEX));
 	std_vesa = (NV_VESA_TABLE *) (map->bios_ptr + *nv_data_table);
 	map->mode_table = (char *) std_vesa->sModelines;
-	verbose("First Standard VESA Table at offset 0x%x\n", *nv_data_table);
+	PRINT("First Standard VESA Table at offset 0x%x\n", *nv_data_table);
 	
 	if (nv_modeline_2_offset == (VBIOS_SIZE-1) || nv_modeline_2_offset == 0) {
 		map->nv_mode_table_2 = NULL;
-		verbose("There is no Second Standard VESA Table to patch\n");
+		PRINT("There is no Second Standard VESA Table to patch\n");
 	} else {
 		map->nv_mode_table_2 = (char*) map->bios_ptr + nv_modeline_2_offset;
-		verbose("Second Standard VESA Table at offset 0x%x\n", nv_modeline_2_offset);
+		PRINT("Second Standard VESA Table at offset 0x%x\n", nv_modeline_2_offset);
 	}
 	
 	if (map->mode_table == NULL) {
-		verbose("Unable to locate the mode table.\n");
-		verbose("Please run the program 'dump_bios' as root and\n");
-		verbose("email the file 'vbios.dmp' to gaeloulacuisse@yahoo.fr.\n");
+		PRINT("Unable to locate the mode table.\n");
+		PRINT("Please run the program 'dump_bios' as root and\n");
+		PRINT("email the file 'vbios.dmp' to gaeloulacuisse@yahoo.fr.\n");
 		
 		close_vbios(map);
 		return 0;
 	}
 	
-	//This won't be used as there is no garanty this is right
-	map->mode_table_size = std_vesa->sHeader.usTable_Size;
 		/*
-		 	 * Determine how many modes and tables sizes
+	 * Having trouble determining the number of table
+	 * so it's hardcode to 16 and 31 for the First VESA table
+	 * and the Second Vesa Table respectively
 		 	 */
 		
-		NV_MODELINE *	mode_ptr =		(NV_MODELINE *)		map->mode_table;
-		NV_MODELINE_2 *	mode_2_ptr =	(NV_MODELINE_2 *)	map->nv_mode_table_2;
+	map->modeline_num = 16;
+	map->nv_modeline_num_2 = 31;
+	
+	/*NV_MODELINE_2 *	mode_2_ptr =	(NV_MODELINE_2 *)	map->nv_mode_table_2;
 		map->modeline_num = map->nv_modeline_num_2 = 0;
 		
 		//First Table
-		while ((mode_ptr[map->modeline_num].reserved3 & 0xff) == 0xff)
-				map->modeline_num++;
+	map->modeline_num = std_vesa->sHeader.usTableSize;
 		
-		verbose("First VESA Table has %d modes\n",map->modeline_num);
+	PRINT("First VESA Table has %d modes\n",map->modeline_num);
 		if (map->modeline_num == 0) {
-				verbose("%d is incorrect, make it a 16\n",map->modeline_num);
+		PRINT("%d is incorrect, make it a 16\n",map->modeline_num);
 				map->modeline_num = 16;
 			}
 		map->mode_table_size = map->modeline_num * sizeof(NV_MODELINE);
 		
 		//Second Table
-		while (mode_2_ptr[map->nv_modeline_num_2].h_disp <= 0x800)
-				map->nv_modeline_num_2++;
+	map->nv_modeline_num_2 = *((UInt8 *)(mode_2_ptr - 2)) - 32;
 		
-		printf("Second VESA Table has %d modes\n",map->nv_modeline_num_2);
+	PRINT("Second VESA Table has %d modes\n",map->nv_modeline_num_2);
 		if (map->nv_modeline_num_2 == 0) {
-				verbose("%d is incorrect, make it a 32\n",map->nv_modeline_num_2);
+		PRINT("%d is incorrect, make it a 32\n",map->nv_modeline_num_2);
 				map->nv_modeline_num_2 = 32;
 			}
-		map->nv_mode_table_2_size = map->nv_modeline_num_2 * sizeof(NV_MODELINE_2);
+	map->nv_mode_table_2_size = map->nv_modeline_num_2 * sizeof(NV_MODELINE_2);*/
 	
 	return map;
 }
@@ -108,11 +108,9 @@
 	if (Type == MAIN_VESA_TABLE) {
 		NV_MODELINE * mode_timing = (NV_MODELINE *) map->mode_table;
 		
-		if ((mode_timing[idx].reserved3 & 0xff) != 0xff) return FALSE;
-		
 		if ((*x != 0) && (*y != 0) && ( mode_timing[idx].usH_Active >= 640 )) {
 			
-			verbose("Mode %dx%d -> %dx%d ", mode_timing[idx].usH_Active, mode_timing[idx].usV_Active,
+			PRINT("Mode %dx%d -> %dx%d ", mode_timing[idx].usH_Active, mode_timing[idx].usV_Active,
 					*x, *y);
 			
 			generic_modeline modeline;
@@ -152,7 +150,7 @@
 		
 		if ((*x != 0) && (*y != 0) && ( mode_timing[idx].h_disp >= 640 )) {
 			
-			verbose("Mode %dx%d -> %dx%d ", mode_timing[idx].h_disp, mode_timing[idx].v_disp,
+			PRINT("Mode %dx%d -> %dx%d ", mode_timing[idx].h_disp, mode_timing[idx].v_disp,
 					*x, *y);
 			
 			generic_modeline modeline;
Index: branches/autoResolution/i386/libsaio/gma_resolution.c
===================================================================
--- branches/autoResolution/i386/libsaio/gma_resolution.c	(revision 136)
+++ branches/autoResolution/i386/libsaio/gma_resolution.c	(revision 137)
@@ -46,7 +46,7 @@
 			}
 		}
 		
-		/*printf("r1 = %d  r2 = %d\n", r1, r2);*/
+		/*PRINT("r1 = %d  r2 = %d\n", r1, r2);*/
 	}
 	
 	return (r2-r1-6) % entry_size == 0;
@@ -73,14 +73,16 @@
 	}
 	
 	if (map->mode_table == 0) {
-		verbose("Unable to locate the mode table.\n");
-		verbose("Please run the program 'dump_bios' as root and\n");
-		verbose("email the file 'vbios.dmp' to gaeloulacuisse@yahoo.fr.\n");
+		PRINT("Unable to locate the mode table.\n");
+		PRINT("Please run the program 'dump_bios' as root and\n");
+		PRINT("email the file 'vbios.dmp' to gaeloulacuisse@yahoo.fr.\n");
 		
 		close_vbios(map);
 		return 0;
 	}
 	
+	PRINT("Mode Table at offset : 0x%x\n", ((unsigned char *)map->mode_table) - map->bios_ptr);
+	
 	/*
 	 * Determine size of mode table
 	 */
@@ -93,6 +95,7 @@
 	}
 	
 	map->modeline_num = map->mode_table_size;
+	PRINT("Mode Table size : %d\n", map->modeline_num);
 	
 	/*
 	 * Figure out what type of bios we have
@@ -101,17 +104,20 @@
 	
 	if (detect_bios_type(map, TRUE, sizeof(vbios_modeline_type3))) {
 		map->bios = BT_3;
+		PRINT("Bios Type : BT_3\n");
 	}
 	else if (detect_bios_type(map, TRUE, sizeof(vbios_modeline_type2))) {
 		map->bios = BT_2;
+		PRINT("Bios Type : BT_2\n");
 	}
 	else if (detect_bios_type(map, FALSE, sizeof(vbios_resolution_type1))) {
 		map->bios = BT_1;
+		PRINT("Bios Type : BT_1\n");
 	}
 	else {
-		verbose("Unable to determine bios type.\n");
-		verbose("Please run the program 'dump_bios' as root and\n");
-		verbose("email the file 'vbios.dmp' to gaeloulacuisse@yahoo.fr.\n");
+		PRINT("Unable to determine bios type.\n");
+		PRINT("Please run the program 'dump_bios' as root and\n");
+		PRINT("email the file 'vbios.dmp' to gaeloulacuisse@yahoo.fr.\n");
 		
 		return 0;
 	}
@@ -131,7 +137,7 @@
 	
 	if ((*x != 0) && (*y != 0) && ( actual_x >= 640 )) {
 		
-		printf("Mode %dx%d -> %dx%d ", actual_x, actual_y, *x, *y);
+		PRINT("Mode %dx%d -> %dx%d \n", actual_x, actual_y, *x, *y);
 		
 		res->x2 = (res->x2 & 0x0f) | ((*x >> 4) & 0xf0);
 		res->x1 = (*x & 0xff);
@@ -160,7 +166,7 @@
 	
 	if ((*x != 0) && (*y != 0) && ((res->modelines[0].x1 + 1) >= 640 )) {
 		
-		printf("Mode %dx%d -> %dx%d ", res->modelines[0].x1 + 1, res->modelines[0].y1 + 1, *x, *y);
+		PRINT("Mode %dx%d -> %dx%d \n", res->modelines[0].x1 + 1, res->modelines[0].y1 + 1, *x, *y);
 		
 		res->xchars = *x / 8;
 		res->ychars = *y / 16 - 1;
@@ -202,7 +208,7 @@
 	
 	if ((*x != 0) && (*y != 0) && ((res->modelines[0].x1 + 1) >= 640 )) {
 		
-		printf("Mode %dx%d -> %dx%d ", res->modelines[0].x1 + 1, res->modelines[0].y1 + 1, *x, *y);
+		PRINT("Mode %dx%d -> %dx%d  \n", res->modelines[0].x1 + 1, res->modelines[0].y1 + 1, *x, *y);
 		
 		xprev = res->modelines[0].x1;
 		yprev = res->modelines[0].y1;
Index: branches/autoResolution/i386/boot0/Makefile
===================================================================
--- branches/autoResolution/i386/boot0/Makefile	(revision 136)
+++ branches/autoResolution/i386/boot0/Makefile	(revision 137)
@@ -6,7 +6,7 @@
 INSTALLDIR = $(DSTROOT)/usr/standalone/i386
 DIRS_NEEDED = $(SYMROOT)
 
-all embedtheme: $(DIRS_NEEDED) boot0 boot0hfs chain0
+all embedtheme autores_dbg: $(DIRS_NEEDED) boot0 boot0hfs chain0
 
 boot0: boot0.s Makefile $(NASM)
 	$(NASM) boot0.s -o $(SYMROOT)/$@
Index: branches/autoResolution/i386/boot1/Makefile
===================================================================
--- branches/autoResolution/i386/boot1/Makefile	(revision 136)
+++ branches/autoResolution/i386/boot1/Makefile	(revision 137)
@@ -17,7 +17,7 @@
   MKDIRS = /bin/mkdir -p
 endif
 
-all embedtheme: $(DIRS_NEEDED) $(VERSIONED_FILES)
+all embedtheme autores_dbg: $(DIRS_NEEDED) $(VERSIONED_FILES)
 
 boot1h: boot1.s Makefile
 	$(NASM) boot1.s -o $(SYMROOT)/boot1h
Index: branches/autoResolution/i386/boot2/boot.c
===================================================================
--- branches/autoResolution/i386/boot2/boot.c	(revision 136)
+++ branches/autoResolution/i386/boot2/boot.c	(revision 137)
@@ -361,7 +361,7 @@
 			patch_vbios(map, params[0], params[1], params[2], 0, 0);
   			
   			relock_vbios(map);
-			#if DEBUG			
+			#if AUTORES_DEBUG			
 				printf("Press Any Key...\n");
 			 	getc();
 			#endif
Index: branches/autoResolution/i386/boot2/gui.c
===================================================================
--- branches/autoResolution/i386/boot2/gui.c	(revision 136)
+++ branches/autoResolution/i386/boot2/gui.c	(revision 137)
@@ -80,40 +80,40 @@
 };
 
 image_t images[] = {
-	{.name = "background",				.image = NULL},
-	{.name = "logo",				.image = NULL},
-
-	{.name = "device_generic",			.image = NULL},
-	{.name = "device_hfsplus",			.image = NULL},
-	{.name = "device_ext3",				.image = NULL},
-	{.name = "device_fat16",			.image = NULL},
-	{.name = "device_fat32",			.image = NULL},
-	{.name = "device_ntfs",				.image = NULL},
-	{.name = "device_cdrom",			.image = NULL},
+	{.name = "background",					.image = NULL},
+	{.name = "logo",						.image = NULL},
+	
+	{.name = "device_generic",				.image = NULL},
+	{.name = "device_hfsplus",				.image = NULL},
+	{.name = "device_ext3",					.image = NULL},
+	{.name = "device_fat16",				.image = NULL},
+	{.name = "device_fat32",				.image = NULL},
+	{.name = "device_ntfs",					.image = NULL},
+	{.name = "device_cdrom",				.image = NULL},
 	{.name = "device_selection",			.image = NULL},
 	{.name = "device_scroll_prev",			.image = NULL},
 	{.name = "device_scroll_next",			.image = NULL},
 
-	{.name = "menu_boot",				.image = NULL},
-	{.name = "menu_verbose",			.image = NULL},
+	{.name = "menu_boot",					.image = NULL},
+	{.name = "menu_verbose",				.image = NULL},
 	{.name = "menu_ignore_caches",			.image = NULL},
 	{.name = "menu_single_user",			.image = NULL},
 	{.name = "menu_memory_info",			.image = NULL},
-	{.name = "menu_video_info",			.image = NULL},
-	{.name = "menu_help",				.image = NULL},
+	{.name = "menu_video_info",				.image = NULL},
+	{.name = "menu_help",					.image = NULL},
 	{.name = "menu_verbose_disabled",		.image = NULL},
-	{.name = "menu_ignore_caches_disabled",		.image = NULL},
-	{.name = "menu_single_user_disabled",		.image = NULL},
-	{.name = "menu_selection",			.image = NULL},
+	{.name = "menu_ignore_caches_disabled",	.image = NULL},
+	{.name = "menu_single_user_disabled",	.image = NULL},
+	{.name = "menu_selection",				.image = NULL},
 
-	{.name = "progress_bar",			.image = NULL},
+	{.name = "progress_bar",				.image = NULL},
 	{.name = "progress_bar_background",		.image = NULL},
 
 	{.name = "text_scroll_prev",			.image = NULL},
 	{.name = "text_scroll_next",			.image = NULL},
 
-	{.name = "font_console",			.image = NULL},
-	{.name = "font_small",				.image = NULL},
+	{.name = "font_console",				.image = NULL},
+	{.name = "font_small",					.image = NULL},
 };
 
 int imageCnt = 0;
Index: branches/autoResolution/i386/boot2/Makefile
===================================================================
--- branches/autoResolution/i386/boot2/Makefile	(revision 136)
+++ branches/autoResolution/i386/boot2/Makefile	(revision 137)
@@ -61,6 +61,9 @@
 embedtheme: CFLAGS += -DEMBED_THEME
 embedtheme: art.h all
 
+autores_dbg: CFLAGS += -DAUTORES_DEBUG
+autores_dbg: all
+
 boot: machOconv embedded.h $(OBJS) $(LIBDEP)
 	$(LD) -static -Wl,-preload -Wl,-segaddr,__INIT,$(BOOT2ADDR) \
 	        -nostdlib -arch i386 -Wl,-segalign,20 \
Index: branches/autoResolution/i386/cdboot/Makefile
===================================================================
--- branches/autoResolution/i386/cdboot/Makefile	(revision 136)
+++ branches/autoResolution/i386/cdboot/Makefile	(revision 137)
@@ -6,7 +6,7 @@
 INSTALLDIR = $(DSTROOT)/usr/standalone/i386
 DIRS_NEEDED = $(SYMROOT)
 
-all embedtheme: $(DIRS_NEEDED) cdboot
+all embedtheme autores_dbg: $(DIRS_NEEDED) cdboot
 
 cdboot: cdboot.s $(SYMROOT)/boot Makefile $(NASM)
 	$(NASM) cdboot.s -o $(SYMROOT)/cdboot
Index: branches/autoResolution/i386/libsa/Makefile
===================================================================
--- branches/autoResolution/i386/libsa/Makefile	(revision 136)
+++ branches/autoResolution/i386/libsa/Makefile	(revision 137)
@@ -42,7 +42,7 @@
 LIBS = libsa.a
 DIRS_NEEDED = $(OBJROOT) $(SYMROOT)
 
-all embedtheme: $(DIRS_NEEDED) $(LIBS)
+all embedtheme autores_dbg: $(DIRS_NEEDED) $(LIBS)
 
 libsa.a: $(SA_OBJS)
 	rm -f $(SYMROOT)/$(@F)
Index: branches/autoResolution/i386/Makefile
===================================================================
--- branches/autoResolution/i386/Makefile	(revision 136)
+++ branches/autoResolution/i386/Makefile	(revision 137)
@@ -28,7 +28,7 @@
 # The order of building is important.
 SUBDIRS = util libsa libsaio boot2 boot1 boot0 cdboot
 
-all embedtheme tags debug install installhdrs:
+all embedtheme autores_dbg tags debug install installhdrs:
 	@for i in ${SUBDIRS}; \
 	do \
 		echo ================= make $@ for $$i =================; \
Index: branches/autoResolution/i386/util/Makefile
===================================================================
--- branches/autoResolution/i386/util/Makefile	(revision 136)
+++ branches/autoResolution/i386/util/Makefile	(revision 137)
@@ -24,7 +24,7 @@
 
 DIRS_NEEDED = $(OBJROOT) $(SYMROOT) $(LANGDIR)
 
-all embedtheme: $(DIRS_NEEDED) $(PROGRAMS)
+all embedtheme autores_dbg: $(DIRS_NEEDED) $(PROGRAMS)
 
 machOconv: machOconv.o
 	$(CC) $(CFLAGS) $(LDFLAGS) $(DEFINES) -o $(SYMROOT)/$(@F) machOconv.o