Index: branches/prasys/i386/boot2/options.c
===================================================================
--- branches/prasys/i386/boot2/options.c	(revision 63)
+++ branches/prasys/i386/boot2/options.c	(revision 64)
@@ -711,7 +711,7 @@
 		firstRun = NO;
     }
 
-
+#define QUICK_KEYS_ENABLED 1
 	/*
 	Patch from 18seven & modified by me to make it even more mac like and to include couple of commands
 	
@@ -724,11 +724,10 @@
 	* alt+v verbose (in mac its command +v)
 	* alt+x safe mode (aka boot args with -x , in macs its command +x)
 	* alt+l legacy mode (not sure why you need this)
-	* 6 +4 = 64-bit
-	* 3 + 2 = 32-bit
 	*/
+	#if QUICK_KEYS_ENABLED
 	{
-		bool f8 = false, altf = false, shiftf = false, alts = false, altv = false, 32 = false,  64 = false altx = false;
+		bool f8 = false, altf = false, shiftf = false, alts = false, altv = false, altl = false, altx = false;
 		int key;
 		while (readKeyboardStatus()) {
 			key = bgetc ();
@@ -738,8 +737,7 @@
 			if (key == 0x1F00) alts = true;
 			if (key == 0x2F00) altv = true;
 			if (key == 0x2D00) altx = true;
-			if (key == 0x0403) 32 = true;	
-			if (key == 0x0705) 64 = true;			
+			if (key == 0x0403) altl = true;			
 		}
 		if (f8) {
 			gBootMode &= ~kBootModeQuiet;
@@ -765,40 +763,36 @@
 			*(gBootArgsPtr++) = '-';
 			*(gBootArgsPtr++) = 'v';			
 		}
-		if ((altx) && (gBootArgsPtr + 5 < gBootArgsEnd)) {
+		if ((altx) && (gBootArgsPtr + 3 < gBootArgsEnd)) {
 			*(gBootArgsPtr++) = ' ';
 			*(gBootArgsPtr++) = '-';
 			*(gBootArgsPtr++) = 'x';
 			//*(gBootArgsPtr++) = '';
 			//*(gBootArgsPtr++) = '';			
 		}
-		if ((32) && (gBootArgsPtr + 3 < gBootArgsEnd)) {  // Boot into 32-bit Kernel 
+		if ((altl) && (gBootArgsPtr + 3 < gBootArgsEnd)) {
 			*(gBootArgsPtr++) = ' ';
 			*(gBootArgsPtr++) = '-';
 			*(gBootArgsPtr++) = 'x';
 			*(gBootArgsPtr++) = '3';
 			*(gBootArgsPtr++) = '2';
-			// gBootArgsPtr only takes increasement by one char 
 						
-		}
-		
-		if ((64) && (gBootArgsPtr + 3 < gBootArgsEnd)) {  // Boot into 64-bit Kernel (in case those who are using 32-bit and wanna try 64-bit)
-			*(gBootArgsPtr++) = ' ';
-			*(gBootArgsPtr++) = '-';
-			*(gBootArgsPtr++) = 'x';
-			*(gBootArgsPtr++) = '6';
-			*(gBootArgsPtr++) = '4';
-			// gBootArgsPtr only takes increasement by one char 
-						
-		}
-		if ((altx) && (gBootArgsPtr + 5 < gBootArgsEnd)) {
-			*(gBootArgsPtr++) = ' ';
-			*(gBootArgsPtr++) = '-';
-			*(gBootArgsPtr++) = 'x';
-			//*(gBootArgsPtr++) = '';
-			//*(gBootArgsPtr++) = '';			
 		}		
 	}
+	#else
+	{
+			bool f8 = false;
+			int key;
+			while (readKeyboardStatus()) {
+				key = bgetc ();
+				if (key == 0x4200) f8 = true;		
+			}
+			if (f8) {
+				gBootMode &= ~kBootModeQuiet;
+				timeout = 0;
+			}		
+		}
+	#endif
 
 	if( bootArgs->Video.v_display == VGA_TEXT_MODE )
 	{