diff --git a/common/gl_vidnt.c b/common/gl_vidnt.c
index 152e784..24c60f8 100644
--- a/common/gl_vidnt.c
+++ b/common/gl_vidnt.c
@@ -101,7 +101,7 @@ static qboolean fullsbardraw = false;
 
 static float vid_gamma = 1.0;
 
-int 	options_items = 14;
+int 	VID_options_items = 1;
 
 HGLRC	baseRC;
 HDC		maindc;
@@ -1954,9 +1954,8 @@ void VID_ExtraOptionDraw(void)
 
 void VID_ExtraOptionCmd(int option_cursor)
 {
-	switch(option_cursor)
-	{
-	case 12:	// _windowed_mouse
+	switch(option_cursor) {
+	case 1:	// _windowed_mouse
 		Cvar_SetValue ("_windowed_mouse", !_windowed_mouse.value);
 		break;
 
diff --git a/common/vid_dos.c b/common/vid_dos.c
index 5c50e78..51fea3d 100644
--- a/common/vid_dos.c
+++ b/common/vid_dos.c
@@ -58,7 +58,7 @@ cvar_t		block_switch = {"block_switch","0", true};
 cvar_t		vid_window_x = {"vid_window_x", "0", true};
 cvar_t		vid_window_y = {"vid_window_y", "0", true};
 
-int     options_items = 13;
+int	VID_options_items = 0;
 
 int	d_con_indirect = 0;
 
@@ -791,9 +791,8 @@ void VID_ExtraOptionCmd(int option_cursor)
 /*
 	switch(option_cursor)
 	{
-	case 12:  // Always start with 12
+	case 1:  // Always start with 1
 	break;
 	}
 */
 }
-
diff --git a/common/vid_ggi.c b/common/vid_ggi.c
index 74c7d17..c19f3d7 100644
--- a/common/vid_ggi.c
+++ b/common/vid_ggi.c
@@ -69,7 +69,7 @@ static long GGI_highhunkmark, GGI_buffersize;
 static int	vid_surfcachesize;
 static void	*vid_surfcache;
 
-int     options_items = 14;
+int	VID_options_items = 1;
 
 static void
 do_scale8(int xsize, int ysize, uint8 *dest, uint8 *src)
@@ -936,12 +936,10 @@ void VID_ExtraOptionDraw(void)
 
 void VID_ExtraOptionCmd(int option_cursor)
 {
-	switch(option_cursor)
-	{
-	case 12:	// _windowed_mouse
+	switch(option_cursor) {
+	case 1:	// _windowed_mouse
 		Cvar_SetValue ("_windowed_mouse", !_windowed_mouse.value);
 		break;
 
 	}
 }
-
diff --git a/common/vid_null.c b/common/vid_null.c
index e1244ab..ba595ba 100644
--- a/common/vid_null.c
+++ b/common/vid_null.c
@@ -29,8 +29,8 @@ viddef_t	vid;				// global video state
 #define	BASEWIDTH	320
 #define	BASEHEIGHT	200
 
-// Number of items in the options menu: none extra is 13
-int     options_items = 13;
+// Number of items in the options menu: none extra is 0
+int	VID_options_items = 0;
 
 byte	vid_buffer[BASEWIDTH*BASEHEIGHT];
 short	zbuffer[BASEWIDTH*BASEHEIGHT];
@@ -99,7 +99,7 @@ void VID_ExtraOptionCmd(int option_cursor)
 /*
 	switch(option_cursor)
 	{
-	case 12:  // Always start with 12
+	case 1:  // Always start with 1
 	break;
 	}
 */
diff --git a/common/vid_sdl.c b/common/vid_sdl.c
index 58f1c6c..2ed82cc 100644
--- a/common/vid_sdl.c
+++ b/common/vid_sdl.c
@@ -40,7 +40,7 @@ unsigned short  d_8to16table[256];
 int    VGA_width, VGA_height, VGA_rowbytes, VGA_bufferrowbytes = 0;
 byte    *VGA_pagebase;
 
-int	options_items = 14;
+int	VID_options_items = 0;
 
 static SDL_Surface *screen = NULL;
 
@@ -424,12 +424,10 @@ void VID_ExtraOptionDraw(void)
 
 void VID_ExtraOptionCmd(int option_cursor)
 {
-	switch(option_cursor)
-	{
-	case 12:	// _windowed_mouse
+	switch(option_cursor) {
+	case 1:	// _windowed_mouse
 		Cvar_SetValue ("_windowed_mouse", !_windowed_mouse.value);
 		break;
 
 	}
 }
-
diff --git a/common/vid_sunx.c b/common/vid_sunx.c
index c7b5765..676abeb 100644
--- a/common/vid_sunx.c
+++ b/common/vid_sunx.c
@@ -55,7 +55,7 @@ int p_mouse_x;
 int p_mouse_y;
 qboolean	mouse_grabbed = false; // we grab it when console is up
 
-int     options_items = 14;
+int     VID_options_items = 1;
 
 // The following X property format is defined in Motif 1.1's
 // Xm/MwmUtils.h, but QUAKE should not depend on that header
@@ -1247,15 +1247,14 @@ void IN_Move (usercmd_t *cmd)
 void VID_ExtraOptionDraw(void)
 {
 	// Windowed Mouse
-        M_Print (16, 128, "             Use Mouse");
-        M_DrawCheckbox (220, 128, _windowed_mouse.value);
+	M_Print (16, 128, "             Use Mouse");
+	M_DrawCheckbox (220, 128, _windowed_mouse.value);
 }
 
 void VID_ExtraOptionCmd(int option_cursor)
 {
-	switch(option_cursor)
-	{
-	case 12:	// _windowed_mouse
+	switch(option_cursor) {
+	case 1:	// _windowed_mouse
 		Cvar_SetValue ("_windowed_mouse", !_windowed_mouse.value);
 		break;
 
diff --git a/common/vid_sunxil.c b/common/vid_sunxil.c
index c439ded..fd86501 100644
--- a/common/vid_sunxil.c
+++ b/common/vid_sunxil.c
@@ -132,7 +132,7 @@ Window				x_win, x_root_win;
 qboolean			x_focus = true;
 int				global_dx, global_dy;
 
-int     options_items = 14;
+int     VID_options_items = 1;
 
 static Colormap			x_cmap;
 static GC			x_gc;
@@ -1268,15 +1268,14 @@ void IN_Move (usercmd_t *cmd)
 void VID_ExtraOptionDraw(void)
 {
 	// Windowed Mouse
-        M_Print (16, 128, "             Use Mouse");
-        M_DrawCheckbox (220, 128, _windowed_mouse.value);
+	M_Print (16, 128, "             Use Mouse");
+	M_DrawCheckbox (220, 128, _windowed_mouse.value);
 }
 
 void VID_ExtraOptionCmd(int option_cursor)
 {
-	switch(option_cursor)
-	{
-	case 12:	// _windowed_mouse
+	switch(option_cursor) {
+	case 1:	// _windowed_mouse
 		Cvar_SetValue ("_windowed_mouse", !_windowed_mouse.value);
 		break;
 
diff --git a/common/vid_svgalib.c b/common/vid_svgalib.c
index ea9affb..ef57cc1 100644
--- a/common/vid_svgalib.c
+++ b/common/vid_svgalib.c
@@ -63,6 +63,8 @@ static byte     backingbuf[48*24];
 int	VGA_width, VGA_height, VGA_rowbytes, VGA_bufferrowbytes, VGA_planar;
 byte	*VGA_pagebase;
 
+int	VID_options_items = 0;
+
 
 void
 D_BeginDirectRect (int x, int y, byte *pbitmap, int width, int height)
@@ -654,12 +656,11 @@ VID_ExtraOptionDraw(void)
 void
 VID_ExtraOptionCmd(int option_cursor)
 {
-/*
-        switch(option_cursor)
-        {
-        case 12:  // Always start with 12
-        break;
+#if 0
+        switch(option_cursor) {
+        case 1:  // Always start with 1
+		break;
         }
-*/
+#endif
 }
 
diff --git a/common/vid_win.c b/common/vid_win.c
index 633016e..252e6b7 100644
--- a/common/vid_win.c
+++ b/common/vid_win.c
@@ -36,7 +36,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #define MAX_MODE_LIST	30
 #define VID_ROW_SIZE	3
-#define OPTIONS_ITEMS	3
 
 qboolean	dibonly;
 
@@ -145,7 +144,7 @@ int		aPage;					// Current active display page
 int		vPage;					// Current visible display page
 int		waitVRT = true;			// True to wait for retrace on flip
 
-int     options_items = 14;
+int     VID_options_items = 1;
 
 static vmode_t	badmode;
 
@@ -3395,8 +3394,7 @@ void VID_MenuKey (int key)
 
 void VID_ExtraOptionDraw(void)
 {
-	if(modestate == MS_WINDOWED)
-	{
+	if (modestate == MS_WINDOWED) {
 		// Windowed Mouse
         	M_Print (16, 128, "             Use Mouse");
         	M_DrawCheckbox (220, 128, _windowed_mouse.value);
@@ -3405,9 +3403,8 @@ void VID_ExtraOptionDraw(void)
 
 void VID_ExtraOptionCmd(int option_cursor)
 {
-	switch(option_cursor)
-	{
-	case 12:	// _windowed_mouse
+	switch(option_cursor) {
+	case 1:	// _windowed_mouse
 		Cvar_SetValue ("_windowed_mouse", !_windowed_mouse.value);
 		break;
 
diff --git a/common/vid_x.c b/common/vid_x.c
index c8cc25e..d8a4282 100644
--- a/common/vid_x.c
+++ b/common/vid_x.c
@@ -93,7 +93,7 @@ static XShmSegmentInfo	x_shminfo[2];
 
 static int verbose=0;
 
-int     options_items = 14;
+int     VID_options_items = 1;
 
 static byte current_palette[768];
 
@@ -1092,14 +1092,14 @@ void VID_ExtraOptionDraw(void)
 {
 	// Windowed Mouse
         M_Print (16, 128, "             Use Mouse");
-        M_DrawCheckbox (220, 128, _windowed_mouse.value);
+        M_DrawCheckbox(220, 128, _windowed_mouse.value);
 }
 
 void VID_ExtraOptionCmd(int option_cursor)
 {
 	switch(option_cursor)
 	{
-	case 12:	// _windowed_mouse
+	case 1:	// _windowed_mouse
 		Cvar_SetValue ("_windowed_mouse", !_windowed_mouse.value);
 		break;