diff --git a/src/d_main.c b/src/d_main.c
index 6455c328..1d78c10c 100644
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -125,10 +125,12 @@ INT32 postimgparam3;
 postimg_t postimgtype4 = postimg_none;
 INT32 postimgparam4;
 #ifdef _XBOX
-boolean nomidimusic = true, nosound = true;
+boolean nomidimusic = false;
+boolean nosound = true;
 boolean nodigimusic = true;
 #else
-boolean nomidimusic = false, nosound = false;
+boolean nomidimusic = false;
+boolean nosound = false;
 boolean nodigimusic = false; // No fmod-based music
 #endif
 
@@ -1326,7 +1328,7 @@ void D_SRB2Main(void)
 	if (dedicated)
 	{
 		nosound = true;
-		nomidimusic = nodigimusic = true;
+		/*nomidimusic = */nodigimusic = true;
 	}
 	else
 	{
@@ -1335,17 +1337,17 @@ void D_SRB2Main(void)
 	if (M_CheckParm("-nosound"))
 		nosound = true;
 	if (M_CheckParm("-nomusic")) // combines -nomidimusic and -nodigmusic
-		nomidimusic = nodigimusic = true;
+		/*nomidimusic = */nodigimusic = true;
 	else
 	{
-		if (M_CheckParm("-nomidimusic"))
-			nomidimusic = true; ; // WARNING: DOS version initmusic in I_StartupSound
+		/*if (M_CheckParm("-nomidimusic"))
+			nomidimusic = true; ; // WARNING: DOS version initmusic in I_StartupSound*/
 		if (M_CheckParm("-nodigmusic"))
 			nodigimusic = true; // WARNING: DOS version initmusic in I_StartupSound
 	}
 	I_StartupSound();
 	I_InitMusic();
-	S_Init(cv_soundvolume.value, cv_digmusicvolume.value, cv_midimusicvolume.value);
+	S_Init(cv_soundvolume.value, cv_digmusicvolume.value);//, cv_midimusicvolume.value);
 
 	CONS_Printf("ST_Init(): Init status bar.\n");
 	ST_Init();
diff --git a/src/d_netcmd.c b/src/d_netcmd.c
index 2229c11e..05639bad 100644
--- a/src/d_netcmd.c
+++ b/src/d_netcmd.c
@@ -866,7 +866,7 @@ void D_RegisterClientCommands(void)
 	// s_sound.c
 	CV_RegisterVar(&cv_soundvolume);
 	CV_RegisterVar(&cv_digmusicvolume);
-	CV_RegisterVar(&cv_midimusicvolume);
+	//CV_RegisterVar(&cv_midimusicvolume);
 	CV_RegisterVar(&cv_numChannels);
 
 	// i_cdmus.c
@@ -4731,7 +4731,7 @@ static void Command_RestartAudio_f(void)
 
 	I_SetSfxVolume(cv_soundvolume.value);
 	I_SetDigMusicVolume(cv_digmusicvolume.value);
-	I_SetMIDIMusicVolume(cv_midimusicvolume.value);
+	//I_SetMIDIMusicVolume(cv_midimusicvolume.value);
 	if (Playing()) // Gotta make sure the player is in a level
 		P_RestoreMusic(&players[consoleplayer]);
 
diff --git a/src/hu_stuff.h b/src/hu_stuff.h
index 451cc8d8..1f4bc519 100644
--- a/src/hu_stuff.h
+++ b/src/hu_stuff.h
@@ -21,7 +21,7 @@
 //------------------------------------
 //           heads up font
 //------------------------------------
-#define HU_FONTSTART '\x1E' // the first font character
+#define HU_FONTSTART '\x19' // the first font character
 #define HU_FONTEND '~'
 
 #define HU_FONTSIZE (HU_FONTEND - HU_FONTSTART + 1)
diff --git a/src/k_kart.c b/src/k_kart.c
index 5348dc13..0c827370 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -2014,20 +2014,24 @@ void K_DriftDustHandling(mobj_t *spawner)
 
 	if (spawner->player)
 	{
-		angle_t playerangle;
-
-		if (spawner->player->speed < 5<<FRACBITS)
-			return;
-
-		if (spawner->player->cmd.forwardmove < 0)
+		if (spawner->player->pflags & PF_SKIDDOWN)
 		{
-			playerangle = spawner->angle+ANGLE_180;
+			anglediff = abs(spawner->angle - spawner->player->frameangle);
+			if (leveltime % 6 == 0)
+				S_StartSound(spawner, sfx_screec); // repeated here because it doesn't always happen to be within the range when this is the case
 		}
 		else
 		{
-			playerangle = spawner->angle;
+			angle_t playerangle = spawner->angle;
+
+			if (spawner->player->speed < 5<<FRACBITS)
+				return;
+
+			if (spawner->player->cmd.forwardmove < 0)
+				playerangle += ANGLE_180;
+
+			anglediff = abs(playerangle - R_PointToAngle2(0, 0, spawner->player->rmomx, spawner->player->rmomy));
 		}
-		anglediff = abs(playerangle - R_PointToAngle2(0, 0, spawner->player->rmomx, spawner->player->rmomy));
 	}
 	else
 	{
@@ -3746,7 +3750,9 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
 		else if (player->kartstuff[k_boostcharge] > 50)
 		{
 			player->powers[pw_nocontrol] = 40;
-			S_StartSound(player->mo, sfx_slip);
+			//S_StartSound(player->mo, sfx_kc34);
+			S_StartSound(player->mo, sfx_s3k83);
+			player->pflags |= PF_SKIDDOWN; // cheeky pflag reuse
 		}
 
 		player->kartstuff[k_boostcharge] = 0;
@@ -4891,6 +4897,7 @@ static void K_drawKartMinimap(void)
 	INT32 i = 0;
 	INT32 x, y;
 	INT32 minimaptrans, splitflags = (splitscreen ? 0 : V_SNAPTORIGHT);
+	boolean dop1later = false;
 
 	// Draw the HUD only when playing in a level.
 	// hu_stuff needs this, unlike st_stuff.
@@ -4942,37 +4949,39 @@ static void K_drawKartMinimap(void)
 		x -= SHORT(AutomapPic->leftoffset);
 	y -= SHORT(AutomapPic->topoffset);
 
-	// Player's tiny icons on the Automap.
-	for (i = 0; i < MAXPLAYERS; i++)
+	// Player's tiny icons on the Automap. (drawn opposite direction so player 1 is drawn last in splitscreen)
+	for (i = MAXPLAYERS-1; i >= 0; i--)
 	{
-		if (i == displayplayer && !splitscreen)
-			continue; // Do displayplayer later
-		if (players[i].mo && !players[i].spectator)
+		if (!playeringame[i])
+			continue;
+		if (!players[i].mo || players[i].spectator)
+			continue;
+
+		if (!splitscreen && i == displayplayer)
 		{
-			if (G_BattleGametype() && players[i].kartstuff[k_balloon] <= 0)
-				continue;
-
-			if (players[i].kartstuff[k_hyudorotimer] > 0)
-			{
-				if ((players[i].kartstuff[k_hyudorotimer] < 1*TICRATE/2
-					|| players[i].kartstuff[k_hyudorotimer] > hyudorotime-(1*TICRATE/2))
-					&& !(leveltime & 1))
-					;
-				else
-					continue;
-			}
-
-			K_drawKartMinimapHead(&players[i], x, y, splitflags, AutomapPic);
+			dop1later = true; // Do displayplayer later
+			continue;
 		}
+
+		if (G_BattleGametype() && players[i].kartstuff[k_balloon] <= 0)
+			continue;
+		if (players[i].kartstuff[k_hyudorotimer] > 0)
+		{
+			if (!((players[i].kartstuff[k_hyudorotimer] < 1*TICRATE/2
+				|| players[i].kartstuff[k_hyudorotimer] > hyudorotime-(1*TICRATE/2))
+				&& !(leveltime & 1)))
+				continue;
+		}
+
+		K_drawKartMinimapHead(&players[i], x, y, splitflags, AutomapPic);
 	}
 
-	if (splitscreen)
-		return; // Don't need this for splits
+	if (!dop1later)
+		return; // Don't need this
 
 	splitflags &= ~V_HUDTRANSHALF;
 	splitflags |= V_HUDTRANS;
-	if (stplyr->mo && !stplyr->spectator)
-		K_drawKartMinimapHead(stplyr, x, y, splitflags, AutomapPic);
+	K_drawKartMinimapHead(stplyr, x, y, splitflags, AutomapPic);
 }
 
 static void K_drawBattleFullscreen(void)
diff --git a/src/m_menu.c b/src/m_menu.c
index 3b16c678..7aeadb26 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -259,13 +259,8 @@ static menu_t SP_TimeAttackDef, SP_ReplayDef, SP_GuestReplayDef, SP_GhostDef;
 #ifndef NONET
 static void M_StartServerMenu(INT32 choice);
 static void M_ConnectMenu(INT32 choice);
-static void M_ConnectIPMenu(INT32 choice);
 #endif
 static void M_StartSplitServerMenu(INT32 choice);
-#ifndef NOFOURPLAYER
-static void M_Start3PServerMenu(INT32 choice);
-static void M_Start4PServerMenu(INT32 choice);
-#endif
 static void M_StartServer(INT32 choice);
 #ifndef NONET
 static void M_Refresh(INT32 choice);
@@ -284,11 +279,9 @@ static void M_SetupMultiPlayer4(INT32 choice);
 // Controls
 menu_t OP_ControlsDef, /*OP_ControlListDef,*/ OP_MoveControlsDef;
 menu_t /*OP_MPControlsDef, OP_CameraControlsDef, OP_MiscControlsDef,*/ OP_CustomControlsDef, OP_SpectateControlsDef;
-menu_t OP_P1ControlsDef, OP_P2ControlsDef;
 menu_t OP_MouseOptionsDef, OP_Mouse2OptionsDef;
 menu_t OP_Joystick1Def, OP_Joystick2Def;
 #ifndef NOFOURPLAYER
-menu_t OP_P3ControlsDef, OP_P4ControlsDef;
 menu_t OP_Joystick3Def, OP_Joystick4Def;
 #endif
 static void M_VideoModeMenu(INT32 choice);
@@ -313,9 +306,9 @@ menu_t OP_VideoOptionsDef, OP_VideoModeDef;
 menu_t OP_OpenGLOptionsDef, OP_OpenGLFogDef, OP_OpenGLColorDef;
 #endif
 menu_t OP_SoundOptionsDef;
-static void M_ToggleSFX(void);
-static void M_ToggleDigital(void);
-static void M_ToggleMIDI(void);
+static void M_ToggleSFX(INT32 choice);
+static void M_ToggleDigital(INT32 choice);
+//static void M_ToggleMIDI(INT32 choice);
 static void M_RestartAudio(void);
 
 //Misc
@@ -335,7 +328,7 @@ static void M_DrawChecklist(void);
 static void M_DrawEmblemHints(void);
 static void M_DrawPauseMenu(void);
 static void M_DrawServerMenu(void);
-static void M_DrawLevelSelectMenu(void);
+static void M_DrawSplitServerMenu(void);
 static void M_DrawImageDef(void);
 static void M_DrawLoad(void);
 static void M_DrawLevelStats(void);
@@ -344,6 +337,7 @@ static void M_DrawTimeAttackMenu(void);
 //static void M_DrawNightsAttackMenu(void);
 static void M_DrawSetupChoosePlayerMenu(void);
 static void M_DrawControl(void);
+static void M_DrawVideoMenu(void);
 static void M_DrawVideoMode(void);
 //static void M_DrawMonitorToggles(void);
 #ifdef HWRENDER
@@ -352,7 +346,7 @@ static void M_OGL_DrawColorMenu(void);
 #endif
 #ifndef NONET
 static void M_DrawConnectMenu(void);
-static void M_DrawConnectIPMenu(void);
+static void M_DrawMPMainMenu(void);
 static void M_DrawRoomMenu(void);
 #endif
 static void M_DrawJoystick(void);
@@ -447,6 +441,12 @@ consvar_t cv_ghost_staff     = {"ghost_staff",     "Show", CV_SAVE, ghost2_cons_
 //Console variables used solely in the menu system.
 //todo: add a way to use non-console variables in the menu
 //      or make these consvars legitimate like color or skin.
+#ifndef NOFOURPLAYER
+static void Dummysplitplayers_OnChange(void);
+static CV_PossibleValue_t dummysplitplayers_cons_t[] = {{2, "Two"}, {3, "Three"}, {4, "Four"}, {0, NULL}};
+static consvar_t cv_dummysplitplayers = {"dummysplitplayers", "Two", CV_HIDEN|CV_CALL, dummysplitplayers_cons_t, Dummysplitplayers_OnChange, 0, NULL, NULL, 0, 0, NULL};
+#endif
+
 static CV_PossibleValue_t dummyteam_cons_t[] = {{0, "Spectator"}, {1, "Red"}, {2, "Blue"}, {0, NULL}};
 static CV_PossibleValue_t dummyscramble_cons_t[] = {{0, "Random"}, {1, "Points"}, {0, NULL}};
 static CV_PossibleValue_t ringlimit_cons_t[] = {{0, "MIN"}, {9999, "MAX"}, {0, NULL}};
@@ -608,9 +608,9 @@ static menuitem_t MISC_ChangeTeamMenu[] =
 
 static menuitem_t MISC_ChangeLevelMenu[] =
 {
-	{IT_STRING|IT_CVAR,              NULL, "Game Type",             &cv_newgametype,    30},
-	{IT_STRING|IT_CVAR,              NULL, "Level",                 &cv_nextmap,        60},
-	{IT_WHITESTRING|IT_CALL,         NULL, "Change Level",          M_ChangeLevel,     120},
+	{IT_STRING|IT_CVAR,              NULL, "Game Type",             &cv_newgametype,    68},
+	{IT_STRING|IT_CVAR,              NULL, "Level",                 &cv_nextmap,        78},
+	{IT_WHITESTRING|IT_CALL,         NULL, "Change Level",          M_ChangeLevel,     130},
 };
 
 static menuitem_t MISC_HelpMenu[] =
@@ -684,9 +684,8 @@ static menuitem_t SR_MainMenu[] =
 
 static menuitem_t SR_LevelSelectMenu[] =
 {
-	{IT_STRING|IT_CVAR,              NULL, "Level",                 &cv_nextmap,        60},
-
-	{IT_WHITESTRING|IT_CALL,         NULL, "Start",                 M_LevelSelectWarp,     120},
+	{IT_STRING|IT_CVAR,              NULL, "Level",                 &cv_nextmap,            78},
+	{IT_WHITESTRING|IT_CALL,         NULL, "Start",                 M_LevelSelectWarp,     130},
 };
 
 static menuitem_t SR_UnlockChecklistMenu[] =
@@ -731,9 +730,8 @@ static menuitem_t SP_LoadGameMenu[] =
 // Single Player Level Select
 static menuitem_t SP_LevelSelectMenu[] =
 {
-	{IT_STRING|IT_CVAR,              NULL, "Level",                 &cv_nextmap,        60},
-
-	{IT_WHITESTRING|IT_CALL,         NULL, "Start",                 M_LevelSelectWarp,     120},
+	{IT_STRING|IT_CVAR,              NULL, "Level",                 &cv_nextmap,            78},
+	{IT_WHITESTRING|IT_CALL,         NULL, "Start",                 M_LevelSelectWarp,     130},
 };
 
 // Single Player Time Attack
@@ -908,52 +906,91 @@ menuitem_t PlayerMenu[32] =
 // Multiplayer and all of its submenus
 // -----------------------------------
 // Prefix: MP_
+
+#ifdef NONET
+#define IT_NETCALL IT_DISABLED
+#define IT_NETHANDLER IT_DISABLED
+#define M_StartServerMenu NULL
+#define M_ConnectMenu NULL
+#define M_HandleConnectIP NULL
+#else
+#define IT_NETCALL (IT_STRING|IT_CALL)
+#define IT_NETHANDLER (IT_STRING|IT_KEYHANDLER)
+#endif
+
 static menuitem_t MP_MainMenu[] =
 {
-#ifndef NONET
-	{IT_CALL | IT_STRING, NULL, "HOST GAME",				M_StartServerMenu,		10},
-	{IT_CALL | IT_STRING, NULL, "JOIN GAME (Search)",		M_ConnectMenu,			30},
-	{IT_CALL | IT_STRING, NULL, "JOIN GAME (Specify IP)",	M_ConnectIPMenu,		40},
-#endif
-
-	{IT_CALL | IT_STRING, NULL, "TWO PLAYER GAME",			M_StartSplitServerMenu,	60},
-
-#ifdef NOFOURPLAYER
-	{IT_CALL | IT_STRING, NULL, "SETUP PLAYER 1",			M_SetupMultiPlayer,     80},
-	{IT_CALL | IT_STRING, NULL, "SETUP PLAYER 2",			M_SetupMultiPlayer2,    90},
-#else
-	{IT_CALL | IT_STRING, NULL, "THREE PLAYER GAME",		M_Start3PServerMenu,	70},
-	{IT_CALL | IT_STRING, NULL, "FOUR PLAYER GAME",		M_Start4PServerMenu,	80},
-
-	{IT_CALL | IT_STRING, NULL, "SETUP PLAYER 1",			M_SetupMultiPlayer,     100},
-	{IT_CALL | IT_STRING, NULL, "SETUP PLAYER 2",			M_SetupMultiPlayer2,    110},
-	{IT_CALL | IT_STRING, NULL, "SETUP PLAYER 3",			M_SetupMultiPlayer3,	120},
-	{IT_CALL | IT_STRING, NULL, "SETUP PLAYER 4",			M_SetupMultiPlayer4,	130},
-#endif
+	{IT_HEADER, NULL, "Host a game", NULL, 0},
+	{IT_NETCALL,              NULL, "Internet/LAN...",       M_StartServerMenu,      10},
+	{IT_STRING|IT_CALL,       NULL, "Splitscreen...",        M_StartSplitServerMenu, 18},
+	{IT_HEADER, NULL, "Join a game", NULL, 32},
+	{IT_NETCALL,              NULL, "Server browser...",     M_ConnectMenu,          42},
+	{IT_NETHANDLER,           NULL, "Specify IPv4 address:", M_HandleConnectIP,      50},
+	{IT_HEADER, NULL, "Player setup", NULL, 80},
+	{IT_STRING|IT_CALL,       NULL, "Player 1...",           M_SetupMultiPlayer,     90},
 };
 
+#undef IT_NETCALL
+#undef IT_NETHANDLER
+#ifdef NONET
+#undef M_StartServerMenu
+#undef M_ConnectMenu
+#undef M_HandleConnectIP
+#endif
+
 static menuitem_t MP_ServerMenu[] =
 {
-	{IT_STRING|IT_CVAR,              NULL, "Game Type",             &cv_newgametype,    10},
+	{IT_STRING|IT_CVAR,              NULL, "Game Type",             &cv_newgametype,     10},
 #ifndef NONET
-	{IT_STRING|IT_CALL,              NULL, "Room...",               M_RoomMenu,         20},
-	{IT_STRING|IT_CVAR|IT_CV_STRING, NULL, "Server Name",           &cv_servername,     30},
+	{IT_STRING|IT_CALL,              NULL, "Room...",               M_RoomMenu,          20},
+	{IT_STRING|IT_CVAR|IT_CV_STRING, NULL, "Server Name",           &cv_servername,      30},
 #endif
 
-	{IT_STRING|IT_CVAR,              NULL, "Level",                 &cv_nextmap,        80},
+	{IT_STRING|IT_CVAR,              NULL, "Level",                 &cv_nextmap,         78},
 
-	{IT_WHITESTRING|IT_CALL,         NULL, "Start",                 M_StartServer,     130},
+	{IT_WHITESTRING|IT_CALL,         NULL, "Start",                 M_StartServer,      130},
 };
 
-enum
+// Separated splitscreen and normal servers.
+static menuitem_t MP_SplitServerMenu[] =
 {
-	mp_server_gametype = 0,
-#ifndef NONET
-	mp_server_room,
-	mp_server_name,
+	{IT_STRING|IT_CVAR,      NULL, "Game Type",             &cv_newgametype,       10},
+#ifndef NOFOURPLAYER
+	{IT_STRING|IT_CVAR,      NULL, "Number of players",     &cv_dummysplitplayers, 20},
 #endif
-	mp_server_level,
-	mp_server_start
+	{IT_STRING|IT_CVAR,      NULL, "Level",                 &cv_nextmap,           78},
+#ifdef NOFOURPLAYER
+	{IT_STRING|IT_CALL,      NULL, "Player 1 Setup...",     M_SetupMultiPlayer,    110},
+	{IT_STRING|IT_CALL,      NULL, "Player 2 Setup... ",    M_SetupMultiPlayer2,   120},
+#else
+	{IT_STRING|IT_CALL,      NULL, "Player 1 Setup...",     M_SetupMultiPlayer,     90},
+	{IT_STRING|IT_CALL,      NULL, "Player 2 Setup... ",    M_SetupMultiPlayer2,   100},
+	{IT_GRAYEDOUT,           NULL, "Player 3 Setup...",     M_SetupMultiPlayer3,   110},
+	{IT_GRAYEDOUT,           NULL, "Player 4 Setup... ",    M_SetupMultiPlayer4,   120},
+#endif
+	{IT_WHITESTRING|IT_CALL, NULL, "Start",                 M_StartServer,        130},
+};
+
+#ifndef NOFOURPLAYER
+static void Dummysplitplayers_OnChange(void)
+{
+	UINT8 i = 2; // player 2 is the last unchanging setup
+
+	while (i++ < 4)
+	{
+		if (i <= cv_dummysplitplayers.value)
+			MP_SplitServerMenu[3+i-1].status = IT_STRING|IT_CALL;
+		else
+			MP_SplitServerMenu[3+i-1].status = IT_GRAYEDOUT;
+	}
+}
+#endif
+
+static menuitem_t MP_PlayerSetupMenu[] =
+{
+	{IT_KEYHANDLER | IT_STRING,   NULL, "Name",      M_HandleSetupMultiPlayer,   0},
+	{IT_KEYHANDLER | IT_STRING,   NULL, "Character", M_HandleSetupMultiPlayer,  16}, // Tails 01-18-2001
+	{IT_KEYHANDLER | IT_STRING,   NULL, "Color",     M_HandleSetupMultiPlayer, 152},
 };
 
 #ifndef NONET
@@ -1007,28 +1044,8 @@ static menuitem_t MP_RoomMenu[] =
 	{IT_DISABLED,         NULL, "",               M_ChooseRoom, 153},
 	{IT_DISABLED,         NULL, "",               M_ChooseRoom, 162},
 };
-
-static menuitem_t MP_ConnectIPMenu[] =
-{
-	{IT_KEYHANDLER | IT_STRING, NULL, "  IP Address:", M_HandleConnectIP, 0},
-};
 #endif
 
-// Separated splitscreen and normal servers.
-static menuitem_t MP_SplitServerMenu[] =
-{
-	{IT_STRING|IT_CVAR,              NULL, "Game Type",             &cv_newgametype,    10},
-	{IT_STRING|IT_CVAR,              NULL, "Level",                 &cv_nextmap,        80},
-	{IT_WHITESTRING|IT_CALL,         NULL, "Start",                 M_StartServer,     130},
-};
-
-static menuitem_t MP_PlayerSetupMenu[] =
-{
-	{IT_KEYHANDLER | IT_STRING,   NULL, "Name",      M_HandleSetupMultiPlayer,   0},
-	{IT_KEYHANDLER | IT_STRING,   NULL, "Character", M_HandleSetupMultiPlayer,  16}, // Tails 01-18-2001
-	{IT_KEYHANDLER | IT_STRING,   NULL, "Color",     M_HandleSetupMultiPlayer, 152},
-};
-
 // ------------------------------------
 // Options and most (?) of its submenus
 // ------------------------------------
@@ -1052,113 +1069,61 @@ static menuitem_t OP_MainMenu[] =
 
 static menuitem_t OP_ControlsMenu[] =
 {
-	{IT_SUBMENU | IT_STRING, NULL, "Player 1 Controls...", &OP_P1ControlsDef,  10},
-	{IT_SUBMENU | IT_STRING, NULL, "Player 2 Controls...", &OP_P2ControlsDef,  20},
+	{IT_CALL | IT_STRING, NULL, "Player 1 Controls...", M_Setup1PControlsMenu,  10},
+	{IT_CALL | IT_STRING, NULL, "Player 2 Controls...", M_Setup2PControlsMenu,  20},
 
 #ifdef NOFOURPLAYER
 	{IT_STRING  | IT_CVAR, NULL, "Controls per key", &cv_controlperkey, 40},
 #else
-	{IT_SUBMENU | IT_STRING, NULL, "Player 3 Controls...", &OP_P3ControlsDef,  30},
-	{IT_SUBMENU | IT_STRING, NULL, "Player 4 Controls...", &OP_P4ControlsDef,  40},
+	{IT_CALL | IT_STRING, NULL, "Player 3 Controls...", &M_Setup3PControlsMenu,  30},
+	{IT_CALL | IT_STRING, NULL, "Player 4 Controls...", &M_Setup4PControlsMenu,  40},
 
 	{IT_STRING  | IT_CVAR, NULL, "Controls per key", &cv_controlperkey, 60},
 #endif
 };
 
-static menuitem_t OP_P1ControlsMenu[] =
-{
-	{IT_CALL    | IT_STRING, NULL, "Control Configuration...", M_Setup1PControlsMenu,   10},
-	//{IT_SUBMENU | IT_STRING, NULL, "Mouse Options...", &OP_MouseOptionsDef, 20},
-	{IT_SUBMENU | IT_STRING, NULL, "Joystick Options...", &OP_Joystick1Def  ,  20},
-
-	{IT_STRING  | IT_CVAR, NULL, "Camera"  , &cv_chasecam  ,  40},
-	{IT_STRING  | IT_CVAR, NULL, "Crosshair", &cv_crosshair , 50},
-
-	//{IT_STRING  | IT_CVAR, NULL, "Analog Control", &cv_useranalog,  80},
-};
-
-static menuitem_t OP_P2ControlsMenu[] =
-{
-	{IT_CALL    | IT_STRING, NULL, "Control Configuration...", M_Setup2PControlsMenu,   10},
-	//{IT_SUBMENU | IT_STRING, NULL, "Second Mouse Options...", &OP_Mouse2OptionsDef, 20},
-	{IT_SUBMENU | IT_STRING, NULL, "Second Joystick Options...", &OP_Joystick2Def  ,  20},
-
-	{IT_STRING  | IT_CVAR, NULL, "Camera"  , &cv_chasecam2 , 40},
-	{IT_STRING  | IT_CVAR, NULL, "Crosshair", &cv_crosshair2, 50},
-
-	//{IT_STRING  | IT_CVAR, NULL, "Analog Control", &cv_useranalog2,  70},
-};
-
-#ifndef NOFOURPLAYER
-static menuitem_t OP_P3ControlsMenu[] = 
-{
-	{IT_CALL    | IT_STRING, NULL, "Control Configuration...", M_Setup3PControlsMenu,   10},
-	{IT_SUBMENU | IT_STRING, NULL, "Third Joystick Options...", &OP_Joystick3Def  ,  20},
-
-	{IT_STRING  | IT_CVAR, NULL, "Camera"  , &cv_chasecam3 , 40},
-	{IT_STRING  | IT_CVAR, NULL, "Crosshair", &cv_crosshair3, 50},
-
-	//{IT_STRING  | IT_CVAR, NULL, "Analog Control", &cv_useranalog3,  60},
-};
-
-static menuitem_t OP_P4ControlsMenu[] =
-{
-	{IT_CALL    | IT_STRING, NULL, "Control Configuration...", M_Setup4PControlsMenu,   10},
-	{IT_SUBMENU | IT_STRING, NULL, "Fourth Joystick Options...", &OP_Joystick4Def  ,  20},
-
-	{IT_STRING  | IT_CVAR, NULL, "Camera"  , &cv_chasecam4 , 40},
-	{IT_STRING  | IT_CVAR, NULL, "Crosshair", &cv_crosshair4, 50},
-
-	//{IT_STRING  | IT_CVAR, NULL, "Analog Control", &cv_useranalog4,  60},
-};
-#endif
-
-/*static menuitem_t OP_ControlListMenu[] =
-{
-	{IT_SUBMENU | IT_STRING, NULL, "Kart Controls...",          &OP_MoveControlsDef,   10},
-//	{IT_SUBMENU | IT_STRING, NULL, "Multiplayer Controls...",   &OP_MPControlsDef,     20},
-//	{IT_SUBMENU | IT_STRING, NULL, "Camera Controls...",        &OP_CameraControlsDef, 20},
-//	{IT_SUBMENU | IT_STRING, NULL, "Miscellaneous Controls...", &OP_MiscControlsDef,   20},
-};*/
-
 static menuitem_t OP_MoveControlsMenu[] =
 {
-	{IT_CALL | IT_STRING2, NULL, "Aim Forward",      M_ChangeControl, gc_aimforward },
-	{IT_CALL | IT_STRING2, NULL, "Aim Backward",     M_ChangeControl, gc_aimbackward},
-	{IT_CALL | IT_STRING2, NULL, "Turn Left",        M_ChangeControl, gc_turnleft   },
-	{IT_CALL | IT_STRING2, NULL, "Turn Right",       M_ChangeControl, gc_turnright  },
-	{IT_CALL | IT_STRING2, NULL, "Accelerate",       M_ChangeControl, gc_accelerate },
-	{IT_CALL | IT_STRING2, NULL, "Drift",            M_ChangeControl, gc_drift      },
-	{IT_CALL | IT_STRING2, NULL, "Brake",            M_ChangeControl, gc_brake      },
-	{IT_CALL | IT_STRING2, NULL, "Use/Throw Item",   M_ChangeControl, gc_fire       },
-	{IT_CALL | IT_STRING2, NULL, "Look Backward",    M_ChangeControl, gc_lookback   },
+	{IT_CONTROL, NULL, "Accelerate",       M_ChangeControl, gc_accelerate },
+	{IT_CONTROL, NULL, "Turn Left",        M_ChangeControl, gc_turnleft   },
+	{IT_CONTROL, NULL, "Turn Right",       M_ChangeControl, gc_turnright  },
+	{IT_CONTROL, NULL, "Drift",            M_ChangeControl, gc_drift      },
+	{IT_CONTROL, NULL, "Brake",            M_ChangeControl, gc_brake      },
+	{IT_CONTROL, NULL, "Use/Throw Item",   M_ChangeControl, gc_fire       },
+	{IT_CONTROL, NULL, "Aim Forward",      M_ChangeControl, gc_aimforward },
+	{IT_CONTROL, NULL, "Aim Backward",     M_ChangeControl, gc_aimbackward},
+	{IT_CONTROL, NULL, "Look Backward",    M_ChangeControl, gc_lookback   },
 
-	{IT_CALL | IT_STRING2, NULL, "Talk key",         M_ChangeControl, gc_talkkey    },
-	{IT_CALL | IT_STRING2, NULL, "Team-Talk key",    M_ChangeControl, gc_teamkey    },
-	{IT_CALL | IT_STRING2, NULL, "Rankings/Scores",  M_ChangeControl, gc_scores     },
+	{IT_SPACE, NULL, "", NULL, 76},
+	{IT_CONTROL, NULL, "Talk key",         M_ChangeControl, gc_talkkey    },
+	//{IT_CONTROL, NULL, "Team-Talk key",    M_ChangeControl, gc_teamkey    },
+	{IT_CONTROL, NULL, "Rankings/Scores",  M_ChangeControl, gc_scores     },
+	{IT_CONTROL, NULL, "Pause",            M_ChangeControl, gc_pause      },
+	{IT_CONTROL, NULL, "Console",          M_ChangeControl, gc_console    },
 
-	{IT_CALL | IT_STRING2, NULL, "Pause",            M_ChangeControl, gc_pause      },
-	{IT_CALL | IT_STRING2, NULL, "Console",          M_ChangeControl, gc_console    },
-
-	{IT_SUBMENU | IT_STRING, NULL, "Spectator Controls...", &OP_SpectateControlsDef, 112},
-	{IT_SUBMENU | IT_STRING, NULL, "Custom Lua Actions...", &OP_CustomControlsDef,   120},
+	{IT_SUBMENU | IT_STRING, NULL, "Gamepad Options...",    &OP_Joystick1Def,        112},
+	{IT_SUBMENU | IT_STRING, NULL, "Spectator Controls...", &OP_SpectateControlsDef, 120},
+	{IT_SUBMENU | IT_STRING, NULL, "Custom Lua Actions...", &OP_CustomControlsDef,   128},
 };
 
 static menuitem_t OP_SpectateControlsMenu[] =
 {
-	{IT_CALL | IT_STRING2, NULL, "Spectate",         M_ChangeControl, gc_spectate  },
-	{IT_CALL | IT_STRING2, NULL, "Look Up",          M_ChangeControl, gc_lookup    },
-	{IT_CALL | IT_STRING2, NULL, "Look Down",        M_ChangeControl, gc_lookdown  },
-	{IT_CALL | IT_STRING2, NULL, "Center View",      M_ChangeControl, gc_centerview},
-	{IT_CALL | IT_STRING2, NULL, "Reset Camera",     M_ChangeControl, gc_camreset  },
-	{IT_CALL | IT_STRING2, NULL, "Toggle Chasecam",  M_ChangeControl, gc_camtoggle },
+	{IT_CONTROL, NULL, "Become Spectator", M_ChangeControl, gc_spectate  },
+	{IT_CONTROL, NULL, "Look Up",          M_ChangeControl, gc_lookup    },
+	{IT_CONTROL, NULL, "Look Down",        M_ChangeControl, gc_lookdown  },
+	{IT_CONTROL, NULL, "Center View",      M_ChangeControl, gc_centerview},
+	{IT_CONTROL, NULL, "Reset Camera",     M_ChangeControl, gc_camreset  },
+	{IT_CONTROL, NULL, "Toggle Chasecam",  M_ChangeControl, gc_camtoggle },
+
+	{IT_STRING | IT_CVAR, NULL, "Chasecam" , &cv_chasecam , 52},
+	{IT_STRING | IT_CVAR, NULL, "Crosshair", &cv_crosshair, 60},
 };
 
 static menuitem_t OP_CustomControlsMenu[] = 
 {
-	{IT_CALL | IT_STRING2, NULL, "Custom Action 1", M_ChangeControl, gc_custom1},
-	{IT_CALL | IT_STRING2, NULL, "Custom Action 2", M_ChangeControl, gc_custom2},
-	{IT_CALL | IT_STRING2, NULL, "Custom Action 3", M_ChangeControl, gc_custom3},
+	{IT_CONTROL, NULL, "Custom Action 1", M_ChangeControl, gc_custom1},
+	{IT_CONTROL, NULL, "Custom Action 2", M_ChangeControl, gc_custom2},
+	{IT_CONTROL, NULL, "Custom Action 3", M_ChangeControl, gc_custom3},
 };
 
 // Obsolete thanks to Kart
@@ -1200,7 +1165,7 @@ static menuitem_t OP_MiscControlsMenu[] =
 
 static menuitem_t OP_Joystick1Menu[] =
 {
-	{IT_STRING | IT_CALL,  NULL, "Select Joystick..." , M_Setup1PJoystickMenu, 10},
+	{IT_STRING | IT_CALL,  NULL, "Select Gamepad..."  , M_Setup1PJoystickMenu, 10},
 	{IT_STRING | IT_CVAR,  NULL, "Aim Forward/Back"   , &cv_aimaxis          , 30},
 	{IT_STRING | IT_CVAR,  NULL, "Turn Left/Right"    , &cv_turnaxis         , 40},
 	{IT_STRING | IT_CVAR,  NULL, "Accelerate"         , &cv_moveaxis         , 50},
@@ -1212,7 +1177,7 @@ static menuitem_t OP_Joystick1Menu[] =
 
 static menuitem_t OP_Joystick2Menu[] =
 {
-	{IT_STRING | IT_CALL,  NULL, "Select Joystick..." , M_Setup2PJoystickMenu, 10},
+	{IT_STRING | IT_CALL,  NULL, "Select Gamepad..."  , M_Setup2PJoystickMenu, 10},
 	{IT_STRING | IT_CVAR,  NULL, "Aim Forward/Back"   , &cv_aimaxis2         , 30},
 	{IT_STRING | IT_CVAR,  NULL, "Turn Left/Right"    , &cv_turnaxis2        , 40},
 	{IT_STRING | IT_CVAR,  NULL, "Accelerate"         , &cv_moveaxis2        , 50},
@@ -1225,7 +1190,7 @@ static menuitem_t OP_Joystick2Menu[] =
 #ifndef NOFOURPLAYER
 static menuitem_t OP_Joystick3Menu[] =
 {
-	{IT_STRING | IT_CALL,  NULL, "Select Joystick..." , M_Setup3PJoystickMenu, 10},
+	{IT_STRING | IT_CALL,  NULL, "Select Gamepad..."  , M_Setup3PJoystickMenu, 10},
 	{IT_STRING | IT_CVAR,  NULL, "Aim Forward/Back"   , &cv_aimaxis3         , 30},
 	{IT_STRING | IT_CVAR,  NULL, "Turn Left/Right"    , &cv_turnaxis3        , 40},
 	{IT_STRING | IT_CVAR,  NULL, "Accelerate"         , &cv_moveaxis3        , 50},
@@ -1237,7 +1202,7 @@ static menuitem_t OP_Joystick3Menu[] =
 
 static menuitem_t OP_Joystick4Menu[] =
 {
-	{IT_STRING | IT_CALL,  NULL, "Select Joystick..." , M_Setup4PJoystickMenu, 10},
+	{IT_STRING | IT_CALL,  NULL, "Select Gamepad..."  , M_Setup4PJoystickMenu, 10},
 	{IT_STRING | IT_CVAR,  NULL, "Aim Forward/Back"   , &cv_aimaxis4         , 30},
 	{IT_STRING | IT_CVAR,  NULL, "Turn Left/Right"    , &cv_turnaxis4        , 40},
 	{IT_STRING | IT_CVAR,  NULL, "Accelerate"         , &cv_moveaxis4        , 50},
@@ -1259,7 +1224,7 @@ static menuitem_t OP_JoystickSetMenu[] =
 	{IT_CALL | IT_NOTHING, "", NULL, M_AssignJoystick, '6'},
 };
 
-static menuitem_t OP_MouseOptionsMenu[] =
+/*static menuitem_t OP_MouseOptionsMenu[] =
 {
 	{IT_STRING | IT_CVAR, NULL, "Use Mouse",        &cv_usemouse,         10},
 
@@ -1285,11 +1250,11 @@ static menuitem_t OP_Mouse2OptionsMenu[] =
 	                      NULL, "Mouse X Speed",    &cv_mousesens2,       60},
 	{IT_STRING | IT_CVAR | IT_CV_SLIDER,
 	                      NULL, "Mouse Y Speed",    &cv_mouseysens2,      70},
-};
+};*/
 
 static menuitem_t OP_VideoOptionsMenu[] =
 {
-	{IT_STRING | IT_CALL,	NULL,	"Resolution Modes...",	M_VideoModeMenu,		 10},
+	{IT_STRING | IT_CALL,	NULL,	"Set Resolution...",	M_VideoModeMenu,		 10},
 #ifdef HWRENDER
 	{IT_SUBMENU|IT_STRING,	NULL,	"OpenGL Options...",	&OP_OpenGLOptionsDef,	 20},
 #endif
@@ -1300,13 +1265,13 @@ static menuitem_t OP_VideoOptionsMenu[] =
 							NULL,	"Gamma",				&cv_usegamma,			 50},
 
 	{IT_STRING | IT_CVAR,	NULL,	"Draw Distance",		&cv_drawdist,			 70},
-	{IT_STRING | IT_CVAR,	NULL,	"NiGHTS Draw Dist",		&cv_drawdist_nights,	 80},
-	{IT_STRING | IT_CVAR,	NULL,	"Precip Draw Dist",		&cv_drawdist_precip,	 90},
-	{IT_STRING | IT_CVAR,	NULL,	"Precip Density",		&cv_precipdensity,		100},
-	{IT_STRING | IT_CVAR,	NULL,	"Skyboxes",				&cv_skybox,				110},
+	//{IT_STRING | IT_CVAR,	NULL,	"NiGHTS Draw Dist",		&cv_drawdist_nights,	 80},
+	{IT_STRING | IT_CVAR,	NULL,	"Weather Draw Dist.",	&cv_drawdist_precip,	 80},
+	{IT_STRING | IT_CVAR,	NULL,	"Weather Density",		&cv_precipdensity,		 90},
+	{IT_STRING | IT_CVAR,	NULL,	"Skyboxes",				&cv_skybox,				100},
 
-	{IT_STRING | IT_CVAR,	NULL,	"Show FPS",				&cv_ticrate,			130},
-	{IT_STRING | IT_CVAR,	NULL,	"Vertical Sync",		&cv_vidwait,			140},
+	{IT_STRING | IT_CVAR,	NULL,	"Show FPS",				&cv_ticrate,			120},
+	{IT_STRING | IT_CVAR,	NULL,	"Vertical Sync",		&cv_vidwait,			130},
 };
 
 static menuitem_t OP_VideoModeMenu[] =
@@ -1359,25 +1324,31 @@ static menuitem_t OP_OpenGLColorMenu[] =
 
 static menuitem_t OP_SoundOptionsMenu[] =
 {
+	{IT_KEYHANDLER|IT_STRING,	NULL, "SFX",					M_ToggleSFX,			 10},
 	{IT_STRING|IT_CVAR|IT_CV_SLIDER,
-								NULL, "SFX Volume",			&cv_soundvolume,		 10},
+								NULL, "SFX Volume",				&cv_soundvolume,		 18},
+
+	{IT_KEYHANDLER|IT_STRING,	NULL, "Music",					M_ToggleDigital,		 30},
 	{IT_STRING|IT_CVAR|IT_CV_SLIDER,
-								NULL, "Music Volume",			&cv_digmusicvolume,		 20},
+								NULL, "Music Volume",			&cv_digmusicvolume,		 38},
+
+/* -- :nonnathisshit:
+	{IT_KEYHANDLER|IT_STRING,	NULL, "MIDI",					M_ToggleMIDI,			 50},
 	{IT_STRING|IT_CVAR|IT_CV_SLIDER,
-								NULL, "MIDI Volume",			&cv_midimusicvolume,	 30},
+								NULL, "MIDI Volume",			&cv_midimusicvolume,	 58},
 #ifdef PC_DOS
 	{IT_STRING|IT_CVAR|IT_CV_SLIDER,
 								NULL, "CD Volume",				&cd_volume,				 40},
-#endif
-	{IT_STRING|IT_CALL,			NULL, "Toggle SFX",			M_ToggleSFX,			 50},
-	{IT_STRING|IT_CALL,			NULL, "Toggle Music",			M_ToggleDigital,		 60},
-	{IT_STRING|IT_CALL,			NULL, "Toggle MIDI",			M_ToggleMIDI,			 70},
-	{IT_STRING|IT_CALL,			NULL, "Restart Audio System",	M_RestartAudio,			 80},
+#endif*/
 
-	{IT_STRING|IT_CVAR,			NULL, "Reverse L/R Channels",	&stereoreverse,			100},
-	{IT_STRING|IT_CVAR,			NULL, "Surround Sound",		&surround,				110},
+	{IT_STRING|IT_CALL,			NULL, "Restart Audio System",	M_RestartAudio,			 50},
 
-	{IT_KEYHANDLER|IT_STRING,	NULL, "Sound Test",			M_HandleSoundTest,		130},
+	{IT_STRING|IT_CVAR,			NULL, "Reverse L/R Channels",	&stereoreverse,			 70},
+	{IT_STRING|IT_CVAR,			NULL, "Surround Sound",			&surround,				 80},
+
+	{IT_STRING|IT_CVAR,			NULL, "Powerup warning",		&cv_kartinvinsfx,		100},
+
+	{IT_KEYHANDLER|IT_STRING,	NULL, "Sound Test",				M_HandleSoundTest,		120},
 };
 
 /*static menuitem_t OP_DataOptionsMenu[] =
@@ -1430,7 +1401,7 @@ static menuitem_t OP_EraseDataMenu[] =
 
 static menuitem_t OP_HUDOptionsMenu[] =
 {
-	{IT_STRING | IT_CVAR, NULL, "Show HUD",				&cv_showhud,			 10},
+	{IT_STRING | IT_CVAR, NULL, "Show HUD",					&cv_showhud,			 10},
 	{IT_STRING | IT_CVAR | IT_CV_SLIDER,
 	                      NULL, "HUD Visibility",			&cv_translucenthud,		 20},
 
@@ -1438,10 +1409,9 @@ static menuitem_t OP_HUDOptionsMenu[] =
 						  NULL, "Minimap Visibility",		&cv_kartminimap,		 40},
 	{IT_STRING | IT_CVAR, NULL, "Speedometer Display",		&cv_kartspeedometer,	 50},
 	{IT_STRING | IT_CVAR, NULL, "Show \"CHECK\"",			&cv_kartcheck,			 60},
-	{IT_STRING | IT_CVAR, NULL, "Invinciblity SFX",		&cv_kartinvinsfx,		 70},
 
-	{IT_STRING | IT_CVAR, NULL, "Console Color",			&cons_backcolor,		 90},
-	{IT_STRING | IT_CVAR, NULL, "Console Text Size",		&cv_constextsize,		100},
+	{IT_STRING | IT_CVAR, NULL, "Console Color",			&cons_backcolor,		 80},
+	{IT_STRING | IT_CVAR, NULL, "Console Text Size",		&cv_constextsize,		 90},
 };
 
 static menuitem_t OP_GameOptionsMenu[] =
@@ -1581,17 +1551,9 @@ menu_t SR_MainDef =
 	0,
 	NULL
 };
-menu_t SR_LevelSelectDef =
-{
-	0,
-	sizeof (SR_LevelSelectMenu)/sizeof (menuitem_t),
-	&SR_MainDef,
-	SR_LevelSelectMenu,
-	M_DrawLevelSelectMenu,
-	40, 40,
-	0,
-	NULL
-};
+
+menu_t SR_LevelSelectDef = MAPICONMENUSTYLE(NULL, SR_LevelSelectMenu, &SR_MainDef);
+
 menu_t SR_UnlockChecklistDef =
 {
 	NULL,
@@ -1757,8 +1719,30 @@ menu_t SP_PlayerDef =
 };
 
 // Multiplayer
-menu_t MP_MainDef = DEFAULTMENUSTYLE("M_MULTI", MP_MainMenu, &MainDef, 60, 40);
+menu_t MP_MainDef =
+{
+	"M_MULTI",
+	sizeof (MP_MainMenu)/sizeof (menuitem_t),
+	&MainDef,
+	MP_MainMenu,
+	M_DrawMPMainMenu,
+	42, 40,
+	0,
+	M_CancelConnect
+};
 menu_t MP_ServerDef = MAPICONMENUSTYLE("M_MULTI", MP_ServerMenu, &MP_MainDef);
+//menu_t MP_SplitServerDef = MAPICONMENUSTYLE("M_MULTI", MP_SplitServerMenu, &MP_MainDef);
+menu_t MP_SplitServerDef =
+{
+	"M_MULTI",
+	sizeof (MP_SplitServerMenu)/sizeof (menuitem_t),
+	&MP_MainDef,
+	MP_SplitServerMenu,
+	M_DrawSplitServerMenu,
+	42,40,
+	0,
+	NULL
+};
 #ifndef NONET
 menu_t MP_ConnectDef =
 {
@@ -1771,17 +1755,6 @@ menu_t MP_ConnectDef =
 	0,
 	M_CancelConnect
 };
-menu_t MP_ConnectIPDef =
-{
-	"M_MULTI",
-	sizeof (MP_ConnectIPMenu)/sizeof (menuitem_t),
-	&MP_MainDef,
-	MP_ConnectIPMenu,
-	M_DrawConnectIPMenu,
-	27,40,
-	0,
-	M_CancelConnect
-};
 menu_t MP_RoomDef =
 {
 	"M_MULTI",
@@ -1794,9 +1767,6 @@ menu_t MP_RoomDef =
 	NULL
 };
 #endif
-menu_t MP_SplitServerDef = MAPICONMENUSTYLE("M_MULTI", MP_SplitServerMenu, &MP_MainDef);
-menu_t MP_3PServerDef = MAPICONMENUSTYLE("M_MULTI", MP_SplitServerMenu, &MP_MainDef);
-menu_t MP_4PServerDef = MAPICONMENUSTYLE("M_MULTI", MP_SplitServerMenu, &MP_MainDef);
 menu_t MP_PlayerSetupDef =
 {
 	NULL, //"M_SPLAYR"
@@ -1830,6 +1800,7 @@ menu_t OP_MoveControlsDef = CONTROLMENUSTYLE(OP_MoveControlsMenu, &OP_ControlsDe
 //menu_t OP_MiscControlsDef = CONTROLMENUSTYLE(OP_MiscControlsMenu, &OP_ControlListDef);
 menu_t OP_CustomControlsDef = CONTROLMENUSTYLE(OP_CustomControlsMenu, &OP_MoveControlsDef);
 menu_t OP_SpectateControlsDef = CONTROLMENUSTYLE(OP_SpectateControlsMenu, &OP_MoveControlsDef);
+/*
 menu_t OP_P1ControlsDef = DEFAULTMENUSTYLE("M_CONTRO", OP_P1ControlsMenu, &OP_ControlsDef, 60, 30);
 menu_t OP_P2ControlsDef = DEFAULTMENUSTYLE("M_CONTRO", OP_P2ControlsMenu, &OP_ControlsDef, 60, 30);
 #ifndef NOFOURPLAYER
@@ -1838,11 +1809,12 @@ menu_t OP_P4ControlsDef = DEFAULTMENUSTYLE("M_CONTRO", OP_P4ControlsMenu, &OP_Co
 #endif
 menu_t OP_MouseOptionsDef = DEFAULTMENUSTYLE("M_CONTRO", OP_MouseOptionsMenu, &OP_P1ControlsDef, 60, 30);
 menu_t OP_Mouse2OptionsDef = DEFAULTMENUSTYLE("M_CONTRO", OP_Mouse2OptionsMenu, &OP_P2ControlsDef, 60, 30);
-menu_t OP_Joystick1Def = DEFAULTMENUSTYLE("M_CONTRO", OP_Joystick1Menu, &OP_P1ControlsDef, 60, 30);
-menu_t OP_Joystick2Def = DEFAULTMENUSTYLE("M_CONTRO", OP_Joystick2Menu, &OP_P2ControlsDef, 60, 30);
+*/
+menu_t OP_Joystick1Def = DEFAULTMENUSTYLE("M_CONTRO", OP_Joystick1Menu, &OP_MoveControlsDef, 60, 30);
+menu_t OP_Joystick2Def = DEFAULTMENUSTYLE("M_CONTRO", OP_Joystick2Menu, &OP_MoveControlsDef, 60, 30);
 #ifndef NOFOURPLAYER
-menu_t OP_Joystick3Def = DEFAULTMENUSTYLE("M_CONTRO", OP_Joystick3Menu, &OP_P3ControlsDef, 60, 30);
-menu_t OP_Joystick4Def = DEFAULTMENUSTYLE("M_CONTRO", OP_Joystick4Menu, &OP_P4ControlsDef, 60, 30);
+menu_t OP_Joystick3Def = DEFAULTMENUSTYLE("M_CONTRO", OP_Joystick3Menu, &OP_MoveControlsDef, 60, 30);
+menu_t OP_Joystick4Def = DEFAULTMENUSTYLE("M_CONTRO", OP_Joystick4Menu, &OP_MoveControlsDef, 60, 30);
 #endif
 menu_t OP_JoystickSetDef =
 {
@@ -1856,7 +1828,18 @@ menu_t OP_JoystickSetDef =
 	NULL
 };
 
-menu_t OP_VideoOptionsDef = DEFAULTMENUSTYLE("M_VIDEO", OP_VideoOptionsMenu, &OP_MainDef, 60, 30);
+menu_t OP_VideoOptionsDef =
+{
+	"M_VIDEO",
+	sizeof(OP_VideoOptionsMenu)/sizeof(menuitem_t),
+	&OP_MainDef,
+	OP_VideoOptionsMenu,
+	M_DrawVideoMenu,
+	60, 30,
+	0,
+	NULL
+};
+
 menu_t OP_VideoModeDef =
 {
 	"M_VIDEO",
@@ -2155,8 +2138,8 @@ static void Newgametype_OnChange(void)
 			}
 
 			CV_SetValue(&cv_nextmap, M_FindFirstMap(value));
-			CV_AddValue(&cv_nextmap, -1);
-			CV_AddValue(&cv_nextmap, 1);
+			//CV_AddValue(&cv_nextmap, -1);
+			//CV_AddValue(&cv_nextmap, 1);
 		}
 	}
 }
@@ -2224,26 +2207,38 @@ static void M_ChangeCvar(INT32 choice)
 static boolean M_ChangeStringCvar(INT32 choice)
 {
 	consvar_t *cv = (consvar_t *)currentMenu->menuitems[itemOn].itemaction;
-	char buf[255];
+	char buf[MAXSTRINGLENGTH];
 	size_t len;
 
+	if (shiftdown && choice >= 32 && choice <= 127)
+		choice = shiftxform[choice];
+
 	switch (choice)
 	{
 		case KEY_BACKSPACE:
 			len = strlen(cv->string);
 			if (len > 0)
 			{
+				S_StartSound(NULL,sfx_menu1); // Tails
 				M_Memcpy(buf, cv->string, len);
 				buf[len-1] = 0;
 				CV_Set(cv, buf);
 			}
 			return true;
+		case KEY_DEL:
+			if (cv->string[0])
+			{
+				S_StartSound(NULL,sfx_menu1); // Tails
+				CV_Set(cv, "");
+			}
+			return true;
 		default:
 			if (choice >= 32 && choice <= 127)
 			{
 				len = strlen(cv->string);
 				if (len < MAXSTRINGLENGTH - 1)
 				{
+					S_StartSound(NULL,sfx_menu1); // Tails
 					M_Memcpy(buf, cv->string, len);
 					buf[len++] = (char)choice;
 					buf[len] = 0;
@@ -2959,6 +2954,9 @@ void M_Init(void)
 		return;
 
 	// Menu hacks
+#ifndef NOFOURPLAYER
+	CV_RegisterVar(&cv_dummysplitplayers);
+#endif
 	CV_RegisterVar(&cv_dummyteam);
 	CV_RegisterVar(&cv_dummyscramble);
 	CV_RegisterVar(&cv_dummyrings);
@@ -2971,7 +2969,7 @@ void M_Init(void)
 	quitmsg[QUITMSG1] = M_GetText("What would Tails say if\nhe saw you quitting the game?\n\n(Press 'Y' to quit)");
 	quitmsg[QUITMSG2] = M_GetText("Hey!\nWhere do ya think you're goin'?\n\n(Press 'Y' to quit)");
 	quitmsg[QUITMSG3] = M_GetText("Forget your studies!\nPlay some more!\n\n(Press 'Y' to quit)");
-	quitmsg[QUITMSG4] = M_GetText("You're trying to say you\nlike Team Sonic Racing better than\nthis, aren't you?\n\n(Press 'Y' to quit)");
+	quitmsg[QUITMSG4] = M_GetText("You're trying to say you\nlike Sonic R better than\nthis, aren't you?\n\n(Press 'Y' to quit)");
 	quitmsg[QUITMSG5] = M_GetText("Don't leave yet -- there's a\nsuper emerald around that corner!\n\n(Press 'Y' to quit)");
 	quitmsg[QUITMSG6] = M_GetText("You'd rather work than play?\n\n(Press 'Y' to quit)");
 	quitmsg[QUITMSG7] = M_GetText("Go ahead and leave. See if I care...\n*sniffle*\n\n(Press 'Y' to quit)");
@@ -3062,7 +3060,7 @@ static void M_DrawThermo(INT32 x, INT32 y, consvar_t *cv)
 }
 
 //  A smaller 'Thermo', with range given as percents (0-100)
-static void M_DrawSlider(INT32 x, INT32 y, const consvar_t *cv)
+static void M_DrawSlider(INT32 x, INT32 y, const consvar_t *cv, boolean ontop)
 {
 	INT32 i;
 	INT32 range;
@@ -3070,16 +3068,31 @@ static void M_DrawSlider(INT32 x, INT32 y, const consvar_t *cv)
 
 	for (i = 0; cv->PossibleValue[i+1].strvalue; i++);
 
-	range = ((cv->value - cv->PossibleValue[0].value) * 100 /
-	 (cv->PossibleValue[i].value - cv->PossibleValue[0].value));
-
-	if (range < 0)
-		range = 0;
-	if (range > 100)
-		range = 100;
-
 	x = BASEVIDWIDTH - x - SLIDER_WIDTH;
 
+	if (ontop)
+	{
+		V_DrawCharacter(x - 15 - (skullAnimCounter/5), y,
+			'\x1C' | V_YELLOWMAP, false); // left arrow
+		V_DrawCharacter(x+(SLIDER_RANGE*8) + 8 + (skullAnimCounter/5), y,
+			'\x1D' | V_YELLOWMAP, false); // right arrow
+	}
+
+	if ((range = atoi(cv->defaultvalue)) != cv->value)
+	{
+		range = ((range - cv->PossibleValue[0].value) * 100 /
+		(cv->PossibleValue[1].value - cv->PossibleValue[0].value));
+
+		if (range < 0)
+			range = 0;
+		if (range > 100)
+			range = 100;
+
+		// draw the default
+		p = W_CachePatchName("M_SLIDEC", PU_CACHE);
+		V_DrawScaledPatch(x - 4 + (((SLIDER_RANGE)*8 + 4)*range)/100, y, 0, p);
+	}
+
 	V_DrawScaledPatch(x - 8, y, 0, W_CachePatchName("M_SLIDEL", PU_CACHE));
 
 	p =  W_CachePatchName("M_SLIDEM", PU_CACHE);
@@ -3089,9 +3102,17 @@ static void M_DrawSlider(INT32 x, INT32 y, const consvar_t *cv)
 	p = W_CachePatchName("M_SLIDER", PU_CACHE);
 	V_DrawScaledPatch(x+SLIDER_RANGE*8, y, 0, p);
 
+	range = ((cv->value - cv->PossibleValue[0].value) * 100 /
+	 (cv->PossibleValue[1].value - cv->PossibleValue[0].value));
+
+	if (range < 0)
+		range = 0;
+	if (range > 100)
+		range = 100;
+
 	// draw the slider cursor
 	p = W_CachePatchName("M_SLIDEC", PU_CACHE);
-	V_DrawMappedPatch(x + ((SLIDER_RANGE-1)*8*range)/100, y, 0, p, yellowmap);
+	V_DrawScaledPatch(x - 4 + (((SLIDER_RANGE)*8 + 4)*range)/100, y, 0, p);
 }
 
 //
@@ -3284,7 +3305,7 @@ static void M_DrawGenericMenu(void)
 				/* FALLTHRU */
 			case IT_NOTHING:
 			case IT_DYBIGSPACE:
-				y += LINEHEIGHT;
+				y = currentMenu->y+currentMenu->menuitems[i].alphaKey;//+= LINEHEIGHT;
 				break;
 			case IT_BIGSLIDER:
 				M_DrawThermo(x, y, (consvar_t *)currentMenu->menuitems[i].itemaction);
@@ -3310,7 +3331,7 @@ static void M_DrawGenericMenu(void)
 						switch (currentMenu->menuitems[i].status & IT_CVARTYPE)
 						{
 							case IT_CV_SLIDER:
-								M_DrawSlider(x, y, cv);
+								M_DrawSlider(x, y, cv, (i == itemOn));
 							case IT_CV_NOPRINT: // color use this
 							case IT_CV_INVISSLIDER: // monitor toggles use this
 								break;
@@ -3325,6 +3346,13 @@ static void M_DrawGenericMenu(void)
 							default:
 								V_DrawString(BASEVIDWIDTH - x - V_StringWidth(cv->string, 0), y,
 									((cv->flags & CV_CHEAT) && !CV_IsSetToDefault(cv) ? V_REDMAP : V_YELLOWMAP), cv->string);
+								if (i == itemOn)
+								{
+									V_DrawCharacter(BASEVIDWIDTH - x - 10 - V_StringWidth(cv->string, 0) - (skullAnimCounter/5), y,
+											'\x1C' | V_YELLOWMAP, false); // left arrow
+									V_DrawCharacter(BASEVIDWIDTH - x + 2 + (skullAnimCounter/5), y,
+											'\x1D' | V_YELLOWMAP, false); // right arrow
+								}
 								break;
 						}
 						break;
@@ -3598,7 +3626,7 @@ static void M_DrawCenteredMenu(void)
 						switch(currentMenu->menuitems[i].status & IT_CVARTYPE)
 						{
 							case IT_CV_SLIDER:
-								M_DrawSlider(x, y, cv);
+								M_DrawSlider(x, y, cv, (i == itemOn));
 							case IT_CV_NOPRINT: // color use this
 								break;
 							case IT_CV_STRING:
@@ -4439,47 +4467,65 @@ static void M_DrawEmblemHints(void)
 	M_DrawGenericMenu();
 }
 
-static void M_DrawLevelSelectMenu(void)
-{
-	M_DrawGenericMenu();
-
-	if (cv_nextmap.value)
-	{
-		lumpnum_t lumpnum;
-		patch_t *PictureOfLevel;
-
-		//  A 160x100 image of the level as entry MAPxxP
-		lumpnum = W_CheckNumForName(va("%sP", G_BuildMapName(cv_nextmap.value)));
-
-		if (lumpnum != LUMPERROR)
-			PictureOfLevel = W_CachePatchName(va("%sP", G_BuildMapName(cv_nextmap.value)), PU_CACHE);
-		else
-			PictureOfLevel = W_CachePatchName("BLANKLVL", PU_CACHE);
-
-		V_DrawSmallScaledPatch(200, 110, 0, PictureOfLevel);
-	}
-}
-
 static void M_DrawSkyRoom(void)
 {
 	INT32 i, y = 0;
+	INT32 lengthstring = 0;
 
 	M_DrawGenericMenu();
 
+	if (currentMenu == &OP_SoundOptionsDef)
+	{
+		V_DrawRightAlignedString(BASEVIDWIDTH - currentMenu->x,
+			currentMenu->y+currentMenu->menuitems[0].alphaKey,
+			(nosound ? V_REDMAP : V_YELLOWMAP),
+			((nosound || sound_disabled) ? "OFF" : "ON"));
+
+		V_DrawRightAlignedString(BASEVIDWIDTH - currentMenu->x,
+			currentMenu->y+currentMenu->menuitems[2].alphaKey,
+			(nodigimusic ? V_REDMAP : V_YELLOWMAP),
+			((nodigimusic || digital_disabled) ? "OFF" : "ON"));
+
+		/*V_DrawRightAlignedString(BASEVIDWIDTH - currentMenu->x,
+			currentMenu->y+currentMenu->menuitems[5].alphaKey,
+			(nomidimusic ? V_REDMAP : V_YELLOWMAP),
+			((nomidimusic || music_disabled) ? "OFF" : "ON"));*/
+
+		if (itemOn == 0)
+			lengthstring = 8*((nosound || sound_disabled) ? 3 : 2);
+		else if (itemOn == 2)
+			lengthstring = 8*((nodigimusic || digital_disabled) ? 3 : 2);
+		/*else if (itemOn == 5)
+			lengthstring = 8*((nomidimusic || music_disabled) ? 3 : 2);*/
+	}
+
 	for (i = 0; i < currentMenu->numitems; ++i)
 	{
-		if (currentMenu->menuitems[i].status == (IT_STRING|IT_KEYHANDLER))
+		if (currentMenu->menuitems[i].itemaction == M_HandleSoundTest)
 		{
 			y = currentMenu->menuitems[i].alphaKey;
 			break;
 		}
 	}
-	if (!y)
-		return;
+	if (y)
+	{
+		y += currentMenu->y;
 
-	V_DrawRightAlignedString(BASEVIDWIDTH - currentMenu->x, currentMenu->y + y, V_YELLOWMAP, cv_soundtest.string);
-	if (cv_soundtest.value)
-		V_DrawRightAlignedString(BASEVIDWIDTH - currentMenu->x, currentMenu->y + y + 8, V_YELLOWMAP, S_sfx[cv_soundtest.value].name);
+		V_DrawRightAlignedString(BASEVIDWIDTH - currentMenu->x, y, V_YELLOWMAP, cv_soundtest.string);
+		if (cv_soundtest.value)
+			V_DrawRightAlignedString(BASEVIDWIDTH - currentMenu->x, y + 8, V_YELLOWMAP, S_sfx[cv_soundtest.value].name);
+
+		if (i == itemOn)
+			lengthstring = V_StringWidth(cv_soundtest.string, 0);
+	}
+
+	if (lengthstring)
+	{
+		V_DrawCharacter(BASEVIDWIDTH - currentMenu->x - 10 - lengthstring - (skullAnimCounter/5), currentMenu->y+currentMenu->menuitems[itemOn].alphaKey,
+			'\x1C' | V_YELLOWMAP, false);
+		V_DrawCharacter(BASEVIDWIDTH - currentMenu->x + 2 + (skullAnimCounter/5), currentMenu->y+currentMenu->menuitems[itemOn].alphaKey,
+			'\x1D' | V_YELLOWMAP, false);
+	}
 }
 
 static void M_HandleSoundTest(INT32 choice)
@@ -6558,13 +6604,16 @@ static void M_ChooseRoom(INT32 choice)
 //
 // FindFirstMap
 //
-// Finds the first map of a particular gametype
+// Finds the first map of a particular gametype (or returns the current map)
 // Defaults to 1 if nothing found.
 //
 static INT32 M_FindFirstMap(INT32 gtype)
 {
 	INT32 i;
 
+	if (mapheaderinfo[gamemap] && (mapheaderinfo[gamemap]->typeoflevel & gtype))
+		return gamemap;
+
 	for (i = 0; i < NUMMAPS; i++)
 	{
 		if (mapheaderinfo[i] && (mapheaderinfo[i]->typeoflevel & gtype))
@@ -6578,15 +6627,16 @@ static void M_StartServer(INT32 choice)
 {
 	UINT8 ssplayers = 0;
 
-	if (currentMenu == &MP_SplitServerDef)
-		ssplayers = 1;
-	else if (currentMenu == &MP_3PServerDef)
-		ssplayers = 2;
-	else if (currentMenu == &MP_4PServerDef)
-		ssplayers = 3;
-
 	(void)choice;
-	if (ssplayers < 2)
+
+	if (currentMenu == &MP_SplitServerDef)
+		ssplayers =
+#ifdef NOFOURPLAYER
+			1;
+#else
+			cv_dummysplitplayers.value-1;
+#endif
+	else
 		netgame = true;
 
 	multiplayer = true;
@@ -6625,6 +6675,7 @@ static void M_DrawServerMenu(void)
 {
 	lumpnum_t lumpnum;
 	patch_t *PictureOfLevel;
+	INT32 x, y;
 
 	M_DrawGenericMenu();
 
@@ -6632,23 +6683,17 @@ static void M_DrawServerMenu(void)
 	// Room name
 	if (currentMenu == &MP_ServerDef)
 	{
+#define mp_server_room 1
 		if (ms_RoomId < 0)
 			V_DrawRightAlignedString(BASEVIDWIDTH - currentMenu->x, currentMenu->y + MP_ServerMenu[mp_server_room].alphaKey,
 			                         V_YELLOWMAP, (itemOn == mp_server_room) ? "<Select to change>" : "<Offline Mode>");
 		else
 			V_DrawRightAlignedString(BASEVIDWIDTH - currentMenu->x, currentMenu->y + MP_ServerMenu[mp_server_room].alphaKey,
 			                         V_YELLOWMAP, room_list[menuRoomIndex].name);
+#undef mp_server_room
 	}
 #endif
 
-	// SRB2kart
-	// A 70x70 image of the level's gametype
-	/*
-	if (mapheaderinfo[cv_nextmap.value-1].typeoflevel & TOL_KART)
-		V_DrawSmallScaledPatch(BASEVIDWIDTH/2,130,0,W_CachePatchName("KART", PU_STATIC));
-	else
-		V_DrawSmallScaledPatch(BASEVIDWIDTH/2,130,0,W_CachePatchName("SONR", PU_STATIC));
-	*/
 
 	//  A 160x100 image of the level as entry MAPxxP
 	lumpnum = W_CheckNumForName(va("%sP", G_BuildMapName(cv_nextmap.value)));
@@ -6658,7 +6703,78 @@ static void M_DrawServerMenu(void)
 	else
 		PictureOfLevel = W_CachePatchName("BLANKLVL", PU_CACHE);
 
-	V_DrawSmallScaledPatch((BASEVIDWIDTH*3/4)-(SHORT(PictureOfLevel->width)/4), ((BASEVIDHEIGHT*3/4)-(SHORT(PictureOfLevel->height)/4)+10), 0, PictureOfLevel);
+	x = BASEVIDWIDTH - currentMenu->x - (SHORT(PictureOfLevel->width)/2);
+	y = currentMenu->y + 130 + 8 - (SHORT(PictureOfLevel->height)/2);
+
+	V_DrawSmallScaledPatch(x, y, 0, PictureOfLevel);
+	// SRB2kart
+	V_DrawDiag(x, y, 12, V_SNAPTORIGHT|31);
+	V_DrawDiag(x, y, 10, V_SNAPTORIGHT|G_GetGametypeColor(cv_newgametype.value));
+}
+
+static void M_DrawSplitServerMenu(void)
+{
+	M_DrawServerMenu();
+
+	// character bar, ripped off the color bar :V
+#define iconwidth 32
+#define spacingwidth 32
+#define incrwidth (iconwidth + spacingwidth)
+	{
+		UINT8 i = 0, pskin, pcol;
+		// player arrangement width, but there's also a chance i'm a furry, shhhhhh
+		const INT32 paw = iconwidth +
+#ifndef NOFOURPLAYER
+			3*
+#endif
+			incrwidth;
+		INT32 x = BASEVIDWIDTH/2 - paw/2, y = currentMenu->y + 32, trans = 0;
+		patch_t *face;
+
+		while (++i <=
+#ifdef NOFOURPLAYER
+			2
+#else
+			4
+#endif
+			)
+		{
+			switch (i)
+			{
+				default:
+					pskin = R_SkinAvailable(cv_skin.string);
+					pcol = cv_playercolor.value;
+					break;
+				case 2:
+					pskin = R_SkinAvailable(cv_skin2.string);
+					pcol = cv_playercolor2.value;
+					break;
+				case 3:
+					pskin = R_SkinAvailable(cv_skin3.string);
+					pcol = cv_playercolor3.value;
+					break;
+				case 4:
+					pskin = R_SkinAvailable(cv_skin4.string);
+					pcol = cv_playercolor4.value;
+					break;
+			}
+
+			if (pskin >= MAXSKINS)
+				pskin = 0;
+
+#ifndef NOFOURPLAYER
+			if (!trans && i > cv_dummysplitplayers.value)
+				trans = V_TRANSLUCENT;
+#endif
+
+			face = W_CachePatchName(skins[pskin].face, PU_CACHE);
+			V_DrawFixedPatch(x<<FRACBITS, y<<FRACBITS, FRACUNIT, trans, face, R_GetTranslationColormap(pskin, pcol, 0));
+			x += incrwidth;
+		}
+	}
+#undef incrwidth
+#undef spacingwidth
+#undef iconwidth
 }
 
 static void M_MapChange(INT32 choice)
@@ -6682,24 +6798,6 @@ static void M_StartSplitServerMenu(INT32 choice)
 	M_SetupNextMenu(&MP_SplitServerDef);
 }
 
-#ifndef NOFOURPLAYER
-static void M_Start3PServerMenu(INT32 choice)
-{
-	(void)choice;
-	levellistmode = LLM_CREATESERVER;
-	M_PrepareLevelSelect();
-	M_SetupNextMenu(&MP_3PServerDef);
-}
-
-static void M_Start4PServerMenu(INT32 choice)
-{
-	(void)choice;
-	levellistmode = LLM_CREATESERVER;
-	M_PrepareLevelSelect();
-	M_SetupNextMenu(&MP_4PServerDef);
-}
-#endif
-
 #ifndef NONET
 static void M_StartServerMenu(INT32 choice)
 {
@@ -6716,33 +6814,52 @@ static void M_StartServerMenu(INT32 choice)
 // ==============
 
 static char setupm_ip[16];
-
-// Connect using IP address Tails 11-19-2002
-static void M_ConnectIPMenu(INT32 choice)
-{
-	(void)choice;
-	// modified game check: no longer handled
-	// we don't request a restart unless the filelist differs
-
-	M_SetupNextMenu(&MP_ConnectIPDef);
-}
+#endif
 
 // Draw the funky Connect IP menu. Tails 11-19-2002
 // So much work for such a little thing!
-static void M_DrawConnectIPMenu(void)
+static void M_DrawMPMainMenu(void)
 {
+	INT32 x = currentMenu->x;
+	INT32 y = currentMenu->y;
+
 	// use generic drawer for cursor, items and title
 	M_DrawGenericMenu();
 
+#ifndef NONET
+#if MAXPLAYERS == 16
+	V_DrawRightAlignedString(BASEVIDWIDTH-x, y+MP_MainMenu[1].alphaKey,
+		((itemOn == 1) ? V_YELLOWMAP : 0), "(2-16 players)");
+#else
+Update the maxplayers label...
+#endif
+#endif
+
+	V_DrawRightAlignedString(BASEVIDWIDTH-x, y+MP_MainMenu[2].alphaKey,
+		((itemOn == 2) ? V_YELLOWMAP : 0),
+#ifdef NOFOURPLAYER
+		"(2 players)"
+#else
+		"(2-4 players)"
+#endif
+		);
+
+#ifndef NONET
+	y += MP_MainMenu[5].alphaKey;
+
+	V_DrawFill(x+5, y+4+5, /*16*8 + 6,*/ BASEVIDWIDTH - 2*(x+5), 8+6, 239);
+
 	// draw name string
-	V_DrawString(128,40, V_MONOSPACE, setupm_ip);
+	V_DrawString(x+8,y+12, V_MONOSPACE, setupm_ip);
 
 	// draw text cursor for name
-	if (itemOn == 0 &&
-	    skullAnimCounter < 4)   //blink cursor
-		V_DrawCharacter(128+V_StringWidth(setupm_ip, V_MONOSPACE),40,'_',false);
+	if (itemOn == 5 //0
+	    && skullAnimCounter < 4)   //blink cursor
+		V_DrawCharacter(x+8+V_StringWidth(setupm_ip, V_MONOSPACE),y+12,'_',false);
+#endif
 }
 
+#ifndef NONET
 // Tails 11-19-2002
 static void M_ConnectIP(INT32 choice)
 {
@@ -6768,11 +6885,21 @@ static void M_ConnectIP(INT32 choice)
 // Tails 11-19-2002
 static void M_HandleConnectIP(INT32 choice)
 {
-	size_t   l;
-	boolean  exitmenu = false;  // exit to previous menu and send name change
+	size_t l;
+	boolean exitmenu = false;  // exit to previous menu and send name change
 
 	switch (choice)
 	{
+		case KEY_DOWNARROW:
+			M_NextOpt();
+			S_StartSound(NULL,sfx_menu1); // Tails
+			break;
+
+		case KEY_UPARROW:
+			M_PrevOpt();
+			S_StartSound(NULL,sfx_menu1); // Tails
+			break;
+
 		case KEY_ENTER:
 			S_StartSound(NULL,sfx_menu1); // Tails
 			M_ClearMenus(true);
@@ -6784,29 +6911,41 @@ static void M_HandleConnectIP(INT32 choice)
 			break;
 
 		case KEY_BACKSPACE:
-			if ((l = strlen(setupm_ip))!=0 && itemOn == 0)
+			if ((l = strlen(setupm_ip)) != 0)
 			{
 				S_StartSound(NULL,sfx_menu1); // Tails
-				setupm_ip[l-1] =0;
+				setupm_ip[l-1] = 0;
+			}
+			break;
+
+		case KEY_DEL:
+			if (setupm_ip[0])
+			{
+				S_StartSound(NULL,sfx_menu1); // Tails
+				setupm_ip[0] = 0;
 			}
 			break;
 
 		default:
 			l = strlen(setupm_ip);
-			if (l < 16-1 && (choice == 46 || (choice >= 48 && choice <= 57))) // Rudimentary number and period enforcing
+			if (l >= 16-1)
+				break;
+
+			if (choice == 46 || (choice >= 48 && choice <= 57)) // Rudimentary number and period enforcing
 			{
 				S_StartSound(NULL,sfx_menu1); // Tails
-				setupm_ip[l] =(char)choice;
-				setupm_ip[l+1] =0;
+				setupm_ip[l] = (char)choice;
+				setupm_ip[l+1] = 0;
 			}
-			else if (l < 16-1 && choice >= 199 && choice <= 211 && choice != 202 && choice != 206) //numpad too!
+			else if (choice >= 199 && choice <= 211 && choice != 202 && choice != 206) //numpad too!
 			{
-				XBOXSTATIC char keypad_translation[] = {'7','8','9','-','4','5','6','+','1','2','3','0','.'};
+				char keypad_translation[] = {'7','8','9','-','4','5','6','+','1','2','3','0','.'};
 				choice = keypad_translation[choice - 199];
 				S_StartSound(NULL,sfx_menu1); // Tails
-				setupm_ip[l] =(char)choice;
-				setupm_ip[l+1] =0;
+				setupm_ip[l] = (char)choice;
+				setupm_ip[l+1] = 0;
 			}
+
 			break;
 	}
 
@@ -7084,6 +7223,14 @@ static void M_HandleSetupMultiPlayer(INT32 choice)
 			}
 			break;
 
+		case KEY_DEL:
+			if (itemOn == 0 && (l = strlen(setupm_name))!=0)
+			{
+				S_StartSound(NULL,sfx_menu1); // Tails
+				setupm_name[0] = 0;
+			}
+			break;
+
 		default:
 			if (choice < 32 || choice > 127 || itemOn != 0)
 				break;
@@ -7419,13 +7566,17 @@ static void M_Setup1PControlsMenu(INT32 choice)
 	currentMenu->lastOn = itemOn;
 
 	// Unhide P1-only controls
-	OP_MoveControlsMenu[9].status = IT_CALL|IT_STRING2; // Talk
-	OP_MoveControlsMenu[10].status = IT_CALL|IT_STRING2; // Team talk
-	OP_MoveControlsMenu[11].status = IT_CALL|IT_STRING2; // Rankings
-	OP_MoveControlsMenu[12].status = IT_CALL|IT_STRING2; // Pause
-	OP_MoveControlsMenu[13].status = IT_CALL|IT_STRING2; // Console
+	OP_MoveControlsMenu[10].status = IT_CONTROL; // Talk
+	//OP_MoveControlsMenu[11].status = IT_CONTROL; // Team-talk
+	OP_MoveControlsMenu[11].status = IT_CONTROL; // Rankings
+	OP_MoveControlsMenu[12].status = IT_CONTROL; // Pause
+	OP_MoveControlsMenu[13].status = IT_CONTROL; // Console
+	OP_MoveControlsMenu[14].itemaction = &OP_Joystick1Def; // Gamepad
+
+	// Set cvars
+	OP_SpectateControlsMenu[6].itemaction = &cv_chasecam; // Chasecam
+	OP_SpectateControlsMenu[7].itemaction = &cv_crosshair; // Crosshair
 
-	OP_MoveControlsDef.prevMenu = &OP_P1ControlsDef;
 	M_SetupNextMenu(&OP_MoveControlsDef);
 }
 
@@ -7433,19 +7584,22 @@ static void M_Setup2PControlsMenu(INT32 choice)
 {
 	(void)choice;
 	setupcontrols_secondaryplayer = true;
-	setupcontrols_thirdplayer = false;
-	setupcontrols_fourthplayer = false;
+	setupcontrols_thirdplayer = setupcontrols_fourthplayer = false;
 	setupcontrols = gamecontrolbis;
 	currentMenu->lastOn = itemOn;
 
 	// Hide P1-only controls
-	OP_MoveControlsMenu[9].status = IT_GRAYEDOUT2; // Talk
-	OP_MoveControlsMenu[10].status = IT_GRAYEDOUT2; // Team talk
+	OP_MoveControlsMenu[10].status = IT_GRAYEDOUT2; // Talk
+	//OP_MoveControlsMenu[11].status = IT_GRAYEDOUT2; // Team-talk
 	OP_MoveControlsMenu[11].status = IT_GRAYEDOUT2; // Rankings
 	OP_MoveControlsMenu[12].status = IT_GRAYEDOUT2; // Pause
 	OP_MoveControlsMenu[13].status = IT_GRAYEDOUT2; // Console
+	OP_MoveControlsMenu[14].itemaction = &OP_Joystick2Def; // Gamepad
+
+	// Set cvars
+	OP_SpectateControlsMenu[6].itemaction = &cv_chasecam2; // Chasecam
+	OP_SpectateControlsMenu[7].itemaction = &cv_crosshair2; // Crosshair
 
-	OP_MoveControlsDef.prevMenu = &OP_P2ControlsDef;
 	M_SetupNextMenu(&OP_MoveControlsDef);
 }
 
@@ -7454,19 +7608,22 @@ static void M_Setup3PControlsMenu(INT32 choice)
 {
 	(void)choice;
 	setupcontrols_thirdplayer = true;
-	setupcontrols_secondaryplayer = false;
-	setupcontrols_fourthplayer = false;
+	setupcontrols_secondaryplayer = setupcontrols_fourthplayer = false;
 	setupcontrols = gamecontrol3;
 	currentMenu->lastOn = itemOn;
 
 	// Hide P1-only controls
-	OP_MoveControlsMenu[9].status = IT_GRAYEDOUT2; // Talk
-	OP_MoveControlsMenu[10].status = IT_GRAYEDOUT2; // Team talk
+	OP_MoveControlsMenu[10].status = IT_GRAYEDOUT2; // Talk
+	//OP_MoveControlsMenu[11].status = IT_GRAYEDOUT2; // Team-talk
 	OP_MoveControlsMenu[11].status = IT_GRAYEDOUT2; // Rankings
 	OP_MoveControlsMenu[12].status = IT_GRAYEDOUT2; // Pause
 	OP_MoveControlsMenu[13].status = IT_GRAYEDOUT2; // Console
+	OP_MoveControlsMenu[14].itemaction = &OP_Joystick3Def; // Gamepad
+
+	// Set cvars
+	OP_SpectateControlsMenu[6].itemaction = &cv_chasecam3; // Chasecam
+	OP_SpectateControlsMenu[7].itemaction = &cv_crosshair3; // Crosshair
 
-	OP_MoveControlsDef.prevMenu = &OP_P3ControlsDef;
 	M_SetupNextMenu(&OP_MoveControlsDef);
 }
 
@@ -7474,19 +7631,22 @@ static void M_Setup4PControlsMenu(INT32 choice)
 {
 	(void)choice;
 	setupcontrols_fourthplayer = true;
-	setupcontrols_secondaryplayer = false;
-	setupcontrols_thirdplayer = false;
+	setupcontrols_secondaryplayer = setupcontrols_thirdplayer = false;
 	setupcontrols = gamecontrol4;
 	currentMenu->lastOn = itemOn;
 
 	// Hide P1-only controls
-	OP_MoveControlsMenu[9].status = IT_GRAYEDOUT2; // Talk
-	OP_MoveControlsMenu[10].status = IT_GRAYEDOUT2; // Team talk
+	OP_MoveControlsMenu[10].status = IT_GRAYEDOUT2; // Talk
+	//OP_MoveControlsMenu[11].status = IT_GRAYEDOUT2; // Team-talk
 	OP_MoveControlsMenu[11].status = IT_GRAYEDOUT2; // Rankings
 	OP_MoveControlsMenu[12].status = IT_GRAYEDOUT2; // Pause
 	OP_MoveControlsMenu[13].status = IT_GRAYEDOUT2; // Console
+	OP_MoveControlsMenu[14].itemaction = &OP_Joystick4Def; // Gamepad
+
+	// Set cvars
+	OP_SpectateControlsMenu[6].itemaction = &cv_chasecam4; // Chasecam
+	OP_SpectateControlsMenu[7].itemaction = &cv_crosshair4; // Crosshair
 
-	OP_MoveControlsDef.prevMenu = &OP_P4ControlsDef;
 	M_SetupNextMenu(&OP_MoveControlsDef);
 }
 #endif
@@ -7495,7 +7655,7 @@ static void M_Setup4PControlsMenu(INT32 choice)
 static void M_DrawControl(void)
 {
 	char     tmp[50];
-	INT32    i;
+	INT32    i, y;
 	INT32    keys[2];
 	const char *ctrl;
 
@@ -7503,18 +7663,25 @@ static void M_DrawControl(void)
 	M_DrawGenericMenu();
 
 	if (setupcontrols_secondaryplayer)
-		ctrl = "SET CONTROLS FOR SECONDARY PLAYER";
+		ctrl = "\x86""SET ""\x82""CONTROLS""\x86"" FOR ""\x82""SECONDARY PLAYER";
 	else if (setupcontrols_thirdplayer)
-		ctrl = "SET CONTROLS FOR THIRD PLAYER";
+		ctrl = "\x86""SET ""\x82""CONTROLS""\x86"" FOR ""\x82""THIRD PLAYER";
 	else if (setupcontrols_fourthplayer)
-		ctrl = "SET CONTROLS FOR FOURTH PLAYER";
+		ctrl = "\x86""SET ""\x82""CONTROLS""\x86"" FOR ""\x82""FOURTH PLAYER";
 	else
-		ctrl = "PRESS ENTER TO CHANGE, BACKSPACE TO CLEAR";
+		ctrl = "\x86""PRESS ""\x82""ENTER""\x86"" TO CHANGE, ""\x82""BACKSPACE""\x86"" TO CLEAR";
 
-	M_CentreText(30, ctrl);
+	M_CentreText(28, ctrl);
 
-	for (i = 0;i < currentMenu->numitems;i++)
+	y = currentMenu->y;
+
+	for (i = 0; i < currentMenu->numitems;i++)
 	{
+		if (currentMenu->menuitems[i].status != IT_CONTROL)
+		{
+			y = currentMenu->y+currentMenu->menuitems[i].alphaKey;
+			continue;
+		}
 		if (currentMenu->menuitems[i].status != IT_CONTROL)
 			continue;
 
@@ -7539,7 +7706,8 @@ static void M_DrawControl(void)
 
 
 		}
-		V_DrawRightAlignedString(BASEVIDWIDTH-currentMenu->x, currentMenu->y + i*8, V_YELLOWMAP, tmp);
+		V_DrawRightAlignedString(BASEVIDWIDTH-currentMenu->x, y, V_YELLOWMAP, tmp);
+		y += SMALLLINEHEIGHT;
 	}
 }
 
@@ -7639,86 +7807,170 @@ static void M_ChangeControl(INT32 choice)
 // =====
 
 // Toggles sound systems in-game.
-static void M_ToggleSFX(void)
+static void M_ToggleSFX(INT32 choice)
 {
+	switch (choice)
+	{
+		case KEY_DOWNARROW:
+			S_StartSound(NULL, sfx_menu1);
+			itemOn++;
+			return;
+
+		case KEY_UPARROW:
+			S_StartSound(NULL, sfx_menu1);
+			itemOn = currentMenu->numitems-1;
+			return;
+
+		case KEY_ESCAPE:
+			currentMenu->lastOn = itemOn;
+			if (currentMenu->prevMenu)
+				M_SetupNextMenu(currentMenu->prevMenu);
+			else
+				M_ClearMenus(true);
+			return;
+		default:
+			break;
+	}
+
 	if (nosound)
 	{
 		nosound = false;
 		I_StartupSound();
 		if (nosound) return;
-		S_Init(cv_soundvolume.value, cv_digmusicvolume.value, cv_midimusicvolume.value);
-		M_StartMessage(M_GetText("SFX Enabled\n"), NULL, MM_NOTHING);
+		S_Init(cv_soundvolume.value, cv_digmusicvolume.value);//, cv_midimusicvolume.value);
+		S_StartSound(NULL, sfx_strpst);
+		//M_StartMessage(M_GetText("SFX Enabled\n"), NULL, MM_NOTHING);
 	}
 	else
 	{
 		if (sound_disabled)
 		{
 			sound_disabled = false;
-			M_StartMessage(M_GetText("SFX Enabled\n"), NULL, MM_NOTHING);
+			S_StartSound(NULL, sfx_strpst);
+			//M_StartMessage(M_GetText("SFX Enabled\n"), NULL, MM_NOTHING);
 		}
 		else
 		{
 			sound_disabled = true;
 			S_StopSounds();
-			M_StartMessage(M_GetText("SFX Disabled\n"), NULL, MM_NOTHING);
+			//M_StartMessage(M_GetText("SFX Disabled\n"), NULL, MM_NOTHING);
 		}
 	}
 }
 
-static void M_ToggleDigital(void)
+static void M_ToggleDigital(INT32 choice)
 {
+	switch (choice)
+	{
+		case KEY_DOWNARROW:
+			S_StartSound(NULL, sfx_menu1);
+			itemOn++;
+			return;
+
+		case KEY_UPARROW:
+			S_StartSound(NULL, sfx_menu1);
+			itemOn--;
+			return;
+
+		case KEY_ESCAPE:
+			currentMenu->lastOn = itemOn;
+			if (currentMenu->prevMenu)
+				M_SetupNextMenu(currentMenu->prevMenu);
+			else
+				M_ClearMenus(true);
+			return;
+		default:
+			break;
+	}
+
 	if (nodigimusic)
 	{
 		nodigimusic = false;
 		I_InitDigMusic();
 		if (nodigimusic) return;
-		S_Init(cv_soundvolume.value, cv_digmusicvolume.value, cv_midimusicvolume.value);
+		S_Init(cv_soundvolume.value, cv_digmusicvolume.value);//, cv_midimusicvolume.value);
 		S_StopMusic();
-		S_ChangeMusicInternal("lclear", false);
-		M_StartMessage(M_GetText("Digital Music Enabled\n"), NULL, MM_NOTHING);
+		if (Playing())
+			P_RestoreMusic(&players[consoleplayer]);
+		else
+			S_ChangeMusicInternal("titles", looptitle);
+		//M_StartMessage(M_GetText("Digital Music Enabled\n"), NULL, MM_NOTHING);
 	}
 	else
 	{
 		if (digital_disabled)
 		{
 			digital_disabled = false;
-			M_StartMessage(M_GetText("Digital Music Enabled\n"), NULL, MM_NOTHING);
+			if (Playing())
+				P_RestoreMusic(&players[consoleplayer]);
+			else
+				S_ChangeMusicInternal("titles", looptitle);
+			//M_StartMessage(M_GetText("Digital Music Enabled\n"), NULL, MM_NOTHING);
 		}
 		else
 		{
 			digital_disabled = true;
 			S_StopMusic();
-			M_StartMessage(M_GetText("Digital Music Disabled\n"), NULL, MM_NOTHING);
+			//M_StartMessage(M_GetText("Digital Music Disabled\n"), NULL, MM_NOTHING);
 		}
 	}
 }
 
-static void M_ToggleMIDI(void)
+/*static void M_ToggleMIDI(INT32 choice)
 {
+	switch (choice)
+	{
+		case KEY_DOWNARROW:
+			S_StartSound(NULL, sfx_menu1);
+			itemOn++;
+			return;
+
+		case KEY_UPARROW:
+			S_StartSound(NULL, sfx_menu1);
+			itemOn--;
+			return;
+
+		case KEY_ESCAPE:
+			if (currentMenu->prevMenu)
+				M_SetupNextMenu(currentMenu->prevMenu);
+			else
+				M_ClearMenus(true);
+			return;
+		default:
+			break;
+	}
+
 	if (nomidimusic)
 	{
 		nomidimusic = false;
 		I_InitMIDIMusic();
 		if (nomidimusic) return;
 		S_Init(cv_soundvolume.value, cv_digmusicvolume.value, cv_midimusicvolume.value);
-		S_ChangeMusicInternal("lclear", false);
-		M_StartMessage(M_GetText("MIDI Music Enabled\n"), NULL, MM_NOTHING);
+		if (Playing())
+			P_RestoreMusic(&players[consoleplayer]);
+		else
+			S_ChangeMusicInternal("_clear", false);
+		//M_StartMessage(M_GetText("MIDI Music Enabled\n"), NULL, MM_NOTHING);
 	}
 	else
 	{
 		if (music_disabled)
 		{
 			music_disabled = false;
-			M_StartMessage(M_GetText("MIDI Music Enabled\n"), NULL, MM_NOTHING);
+			if (Playing())
+				P_RestoreMusic(&players[consoleplayer]);
+			else
+				S_ChangeMusicInternal("_clear", false);
+			//M_StartMessage(M_GetText("MIDI Music Enabled\n"), NULL, MM_NOTHING);
 		}
 		else
 		{
 			music_disabled = true;
 			S_StopMusic();
-			M_StartMessage(M_GetText("MIDI Music Disabled\n"), NULL, MM_NOTHING);
+			//M_StartMessage(M_GetText("MIDI Music Disabled\n"), NULL, MM_NOTHING);
 		}
 	}
-}
+}*/
 
 static void M_RestartAudio(void)
 {
@@ -7730,9 +7982,14 @@ static void M_RestartAudio(void)
 
 	I_SetSfxVolume(cv_soundvolume.value);
 	I_SetDigMusicVolume(cv_digmusicvolume.value);
-	I_SetMIDIMusicVolume(cv_midimusicvolume.value);
+	//I_SetMIDIMusicVolume(cv_midimusicvolume.value);
+
+	S_StartSound(NULL, sfx_strpst);
+
 	if (Playing()) // Gotta make sure the player is in a level
 		P_RestoreMusic(&players[consoleplayer]);
+	else
+		S_ChangeMusicInternal("titles", looptitle);
 }
 
 // ===============
@@ -7825,6 +8082,15 @@ static void M_VideoModeMenu(INT32 choice)
 	M_SetupNextMenu(&OP_VideoModeDef);
 }
 
+static void M_DrawVideoMenu(void)
+{
+
+	M_DrawGenericMenu();
+	V_DrawRightAlignedString(BASEVIDWIDTH - currentMenu->x, currentMenu->y + OP_VideoOptionsMenu[0].alphaKey,
+		(SCR_IsAspectCorrect(vid.width, vid.height) ? V_GREENMAP : V_YELLOWMAP),
+			va("%dx%d", vid.width, vid.height));
+}
+
 // Draw the video modes list, a-la-Quake
 static void M_DrawVideoMode(void)
 {
@@ -7883,10 +8149,10 @@ static void M_DrawVideoMode(void)
 
 		V_DrawCenteredString(BASEVIDWIDTH/2, OP_VideoModeDef.y + 138,
 			V_GREENMAP, "Green modes are recommended.");
-		V_DrawCenteredString(BASEVIDWIDTH/2, OP_VideoModeDef.y + 150,
+		V_DrawCenteredString(BASEVIDWIDTH/2, OP_VideoModeDef.y + 146,
 			V_YELLOWMAP, "Other modes may have visual errors.");
 		V_DrawCenteredString(BASEVIDWIDTH/2, OP_VideoModeDef.y + 158,
-			V_YELLOWMAP, "Use at own risk.");
+			V_YELLOWMAP, "Larger modes may have performance issues.");
 	}
 
 	// Draw the cursor for the VidMode menu
@@ -7997,7 +8263,7 @@ static void M_HandleVideoMode(INT32 ch)
 		cv = (consvar_t *)currentMenu->menuitems[i].itemaction;
 		y = currentMenu->y + currentMenu->menuitems[i].alphaKey;
 
-		M_DrawSlider(currentMenu->x + 20, y, cv);
+		M_DrawSlider(currentMenu->x + 20, y, cv, (i == itemOn));
 
 		if (!cv->value)
 			V_DrawRightAlignedString(312, y, V_OLDSPACING|((i == itemOn) ? V_YELLOWMAP : 0), "None");
diff --git a/src/m_menu.h b/src/m_menu.h
index 4d6e2fac..51559489 100644
--- a/src/m_menu.h
+++ b/src/m_menu.h
@@ -267,7 +267,7 @@ void Screenshot_option_Onchange(void);
 	prev,\
 	source,\
 	M_DrawServerMenu,\
-	27,40,\
+	24,40,\
 	0,\
 	NULL\
 }
@@ -279,7 +279,7 @@ void Screenshot_option_Onchange(void);
 	prev,\
 	source,\
 	M_DrawControl,\
-	24, 40,\
+	26, 40,\
 	0,\
 	NULL\
 }
diff --git a/src/p_setup.c b/src/p_setup.c
index a3939a38..a67e8a3c 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -3146,7 +3146,7 @@ boolean P_AddWadFile(const char *wadfilename, char **firstmapname)
 			}
 			else if (name[1] == '_')
 			{
-				CONS_Debug(DBG_SETUP, "Music %.8s replaced\n", name);
+				CONS_Debug(DBG_SETUP, "Music %.8s ignored\n", name);
 				mreplaces++;
 			}
 		}
@@ -3167,7 +3167,7 @@ boolean P_AddWadFile(const char *wadfilename, char **firstmapname)
 	if (!devparm && sreplaces)
 		CONS_Printf(M_GetText("%s sounds replaced\n"), sizeu1(sreplaces));
 	if (!devparm && mreplaces)
-		CONS_Printf(M_GetText("%s midi musics replaced\n"), sizeu1(mreplaces));
+		CONS_Printf(M_GetText("%s midi musics ignored\n"), sizeu1(mreplaces));
 	if (!devparm && digmreplaces)
 		CONS_Printf(M_GetText("%s digital musics replaced\n"), sizeu1(digmreplaces));
 
diff --git a/src/p_spec.c b/src/p_spec.c
index 7cfc0a63..ecf31480 100644
--- a/src/p_spec.c
+++ b/src/p_spec.c
@@ -7756,7 +7756,6 @@ void T_Pusher(pusher_t *p)
 					thing->player->pflags |= PF_JUMPED;
 
 				thing->player->pflags |= PF_SLIDING;
-				P_SetPlayerMobjState (thing, thing->info->painstate); // Whee!
 				thing->angle = R_PointToAngle2 (0, 0, xspeed<<(FRACBITS-PUSH_FACTOR), yspeed<<(FRACBITS-PUSH_FACTOR));
 
 				if (!demoplayback || P_AnalogMove(thing->player))
diff --git a/src/p_user.c b/src/p_user.c
index 409ba09f..09e407c3 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -6614,14 +6614,24 @@ static void P_MovePlayer(player_t *player)
 		if (player->mo->state != &states[S_KART_SQUISH])
 			P_SetPlayerMobjState(player->mo, S_KART_SQUISH);
 	}
-	else if (player->kartstuff[k_spinouttimer] > 0)
+	else if (player->kartstuff[k_spinouttimer] > 0 || player->pflags & PF_SLIDING)
 	{
 		if (player->mo->state != &states[S_KART_SPIN])
 			P_SetPlayerMobjState(player->mo, S_KART_SPIN);
 
 		player->frameangle -= ANGLE_22h;
 	}
-	else if (player->kartstuff[k_spinouttimer] == 0 && player->kartstuff[k_squishedtimer] == 0)
+	else if (player->powers[pw_nocontrol] && player->pflags & PF_SKIDDOWN)
+	{
+		if (player->mo->state != &states[S_KART_SPIN])
+			P_SetPlayerMobjState(player->mo, S_KART_SPIN);
+
+		if (((player->powers[pw_nocontrol] + 5) % 20) < 10)
+			player->frameangle += ANGLE_11hh;
+		else
+			player->frameangle -= ANGLE_11hh;
+	}
+	else
 	{
 		K_KartMoveAnimation(player);
 
@@ -9518,7 +9528,10 @@ void P_PlayerThink(player_t *player)
 		player->powers[pw_nights_helper]--;
 
 	if (player->powers[pw_nocontrol] & ((1<<15)-1) && player->powers[pw_nocontrol] < UINT16_MAX)
-		player->powers[pw_nocontrol]--;
+	{
+		if (!(--player->powers[pw_nocontrol]))
+			player->pflags &= ~PF_SKIDDOWN;
+	}
 	else
 		player->powers[pw_nocontrol] = 0;
 
diff --git a/src/r_main.c b/src/r_main.c
index 5ce8c020..62dd76e1 100644
--- a/src/r_main.c
+++ b/src/r_main.c
@@ -1346,15 +1346,32 @@ void R_RenderPlayerView(player_t *player)
 	else
 		viewnumber = 0;
 
-	if (cv_homremoval.value && player == &players[displayplayer]) // if this is display player 1
+	// if this is display player 1
+	if (cv_homremoval.value && player == &players[displayplayer])
 	{
 		if (cv_homremoval.value == 1)
 			V_DrawFill(0, 0, vid.width, vid.height, 31); // No HOM effect!
 		else //'development' HOM removal -- makes it blindingly obvious if HOM is spotted.
 			V_DrawFill(0, 0, vid.width, vid.height, 128+(timeinmap&15));
 	}
+	// Draw over the fourth screen so you don't have to stare at a HOM :V
 	else if (splitscreen == 2 && player == &players[thirddisplayplayer])
-		V_DrawFill(viewwidth, viewheight, viewwidth, viewheight, 31|V_NOSCALESTART); // Draw over the fourth screen so you don't have to stare at a HOM :V
+#if 1
+	{
+		// V_DrawPatchFill, but for the fourth screen only
+		patch_t *pat = W_CachePatchName("SRB2BACK", PU_CACHE);
+		INT32 dupz = (vid.dupx < vid.dupy ? vid.dupx : vid.dupy);
+		INT32 x, y, pw = SHORT(pat->width) * dupz, ph = SHORT(pat->height) * dupz;
+
+		for (x = vid.width>>1; x < vid.width; x += pw)
+		{
+			for (y = vid.height>>1; y < vid.height; y += ph)
+				V_DrawScaledPatch(x, y, V_NOSCALESTART, pat);
+		}
+	}
+#else
+	V_DrawFill(viewwidth, viewheight, viewwidth, viewheight, 31|V_NOSCALESTART);
+#endif
 
 	// load previous saved value of skyVisible for the player
 	if (splitscreen > 2 && player == &players[fourthdisplayplayer])
diff --git a/src/s_sound.c b/src/s_sound.c
index 5dc53b65..44e7e7ae 100644
--- a/src/s_sound.c
+++ b/src/s_sound.c
@@ -80,7 +80,7 @@ static consvar_t precachesound = {"precachesound", "Off", CV_SAVE, CV_OnOff, NUL
 // actual general (maximum) sound & music volume, saved into the config
 consvar_t cv_soundvolume = {"soundvolume", "31", CV_SAVE, soundvolume_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
 consvar_t cv_digmusicvolume = {"digmusicvolume", "18", CV_SAVE, soundvolume_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_midimusicvolume = {"midimusicvolume", "18", CV_SAVE, soundvolume_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+//consvar_t cv_midimusicvolume = {"midimusicvolume", "18", CV_SAVE, soundvolume_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
 // number of channels available
 #if defined (_WIN32_WCE) || defined (DC) || defined (PSP) || defined(GP2X)
 consvar_t cv_numChannels = {"snd_channels", "8", CV_SAVE|CV_CALL, CV_Unsigned, SetChannelsNum, 0, NULL, NULL, 0, 0, NULL};
@@ -846,7 +846,7 @@ void S_StopSound(void *origin)
 //
 static INT32 actualsfxvolume; // check for change through console
 static INT32 actualdigmusicvolume;
-static INT32 actualmidimusicvolume;
+//static INT32 actualmidimusicvolume;
 
 void S_UpdateSounds(void)
 {
@@ -873,8 +873,8 @@ void S_UpdateSounds(void)
 		S_SetSfxVolume (cv_soundvolume.value);
 	if (actualdigmusicvolume != cv_digmusicvolume.value)
 		S_SetDigMusicVolume (cv_digmusicvolume.value);
-	if (actualmidimusicvolume != cv_midimusicvolume.value)
-		S_SetMIDIMusicVolume (cv_midimusicvolume.value);
+	//if (actualmidimusicvolume != cv_midimusicvolume.value)
+		//S_SetMIDIMusicVolume (cv_midimusicvolume.value);
 
 	// We're done now, if we're not in a level.
 	if (gamestate != GS_LEVEL)
@@ -1470,16 +1470,22 @@ static boolean mus_paused     = 0;  // whether songs are mus_paused
 
 static boolean S_MIDIMusic(const char *mname, boolean looping)
 {
-	lumpnum_t mlumpnum;
+	/*lumpnum_t mlumpnum;
 	void *mdata;
-	INT32 mhandle;
+	INT32 mhandle;*/
 
-	if (nomidimusic || music_disabled)
+	(void)looping;
+
+	if (/*nomidimusic || */music_disabled)
 		return false; // didn't search.
 
 	if (W_CheckNumForName(va("d_%s", mname)) == LUMPERROR)
 		return false;
-	mlumpnum = W_GetNumForName(va("d_%s", mname));
+
+	CONS_Alert(CONS_ERROR, "A MIDI Music lump %.6s was found,\nbut SRB2Kart does not support MIDI output.\nWe apologise for the inconvenience.\n", mname);
+	return false;
+
+	/*mlumpnum = W_GetNumForName(va("d_%s", mname));
 
 	// load & register it
 	mdata = W_CacheLumpNum(mlumpnum, PU_MUSIC);
@@ -1506,7 +1512,7 @@ static boolean S_MIDIMusic(const char *mname, boolean looping)
 	music_lumpnum = mlumpnum;
 	music_data = mdata;
 	music_handle = mhandle;
-	return true;
+	return true;*/
 }
 
 static boolean S_DigMusic(const char *mname, boolean looping)
@@ -1595,7 +1601,7 @@ void S_SetDigMusicVolume(INT32 volume)
 	I_SetDigMusicVolume(volume&31);
 }
 
-void S_SetMIDIMusicVolume(INT32 volume)
+/*void S_SetMIDIMusicVolume(INT32 volume)
 {
 	if (volume < 0 || volume > 31)
 		CONS_Alert(CONS_WARNING, "musicvolume should be between 0-31\n");
@@ -1607,7 +1613,7 @@ void S_SetMIDIMusicVolume(INT32 volume)
 	I_SetMIDIMusicVolume(31); // Trick for buggy dos drivers. Win32 doesn't need this.
 #endif
 	I_SetMIDIMusicVolume(volume&0x1f);
-}
+}*/
 
 /// ------------------------
 /// Init & Others
@@ -1618,7 +1624,7 @@ void S_SetMIDIMusicVolume(INT32 volume)
 // Sets channels, SFX and music volume,
 //  allocates channel buffer, sets S_sfx lookup.
 //
-void S_Init(INT32 sfxVolume, INT32 digMusicVolume, INT32 midiMusicVolume)
+void S_Init(INT32 sfxVolume, INT32 digMusicVolume)
 {
 	INT32 i;
 
@@ -1627,7 +1633,7 @@ void S_Init(INT32 sfxVolume, INT32 digMusicVolume, INT32 midiMusicVolume)
 
 	S_SetSfxVolume(sfxVolume);
 	S_SetDigMusicVolume(digMusicVolume);
-	S_SetMIDIMusicVolume(midiMusicVolume);
+	//S_SetMIDIMusicVolume(midiMusicVolume);
 
 	SetChannelsNum();
 
diff --git a/src/s_sound.h b/src/s_sound.h
index 3daebf38..3561de80 100644
--- a/src/s_sound.h
+++ b/src/s_sound.h
@@ -23,7 +23,7 @@
 #define PICKUP_SOUND 0x8000
 
 extern consvar_t stereoreverse;
-extern consvar_t cv_soundvolume, cv_digmusicvolume, cv_midimusicvolume;
+extern consvar_t cv_soundvolume, cv_digmusicvolume;//, cv_midimusicvolume;
 extern consvar_t cv_numChannels;
 extern consvar_t surround;
 
@@ -72,7 +72,7 @@ void S_RegisterSoundStuff(void);
 // Initializes sound stuff, including volume
 // Sets channels, SFX and music volume, allocates channel buffer, sets S_sfx lookup.
 //
-void S_Init(INT32 sfxVolume, INT32 digMusicVolume, INT32 midiMusicVolume);
+void S_Init(INT32 sfxVolume, INT32 digMusicVolume);
 
 //
 // Per level startup code.
@@ -123,7 +123,7 @@ void S_UpdateSounds(void);
 FUNCMATH fixed_t S_CalculateSoundDistance(fixed_t px1, fixed_t py1, fixed_t pz1, fixed_t px2, fixed_t py2, fixed_t pz2);
 
 void S_SetDigMusicVolume(INT32 volume);
-void S_SetMIDIMusicVolume(INT32 volume);
+//void S_SetMIDIMusicVolume(INT32 volume);
 void S_SetSfxVolume(INT32 volume);
 
 INT32 S_OriginPlaying(void *origin);
diff --git a/src/sounds.c b/src/sounds.c
index 32532612..6d793f1e 100644
--- a/src/sounds.c
+++ b/src/sounds.c
@@ -147,7 +147,7 @@ sfxinfo_t S_sfx[NUMSFX] =
   {"drown",  false, 192,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
   {"fizzle", false, 127,  8, -1, NULL, 0,        -1,  -1, LUMPERROR},
   {"gbeep",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Grenade beep
-  {"gclose", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
+  {"yeeeah", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
   {"ghit" ,  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
   {"gloop",  false,  60,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
   {"gspray", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
diff --git a/src/sounds.h b/src/sounds.h
index 778037d4..39345407 100644
--- a/src/sounds.h
+++ b/src/sounds.h
@@ -219,7 +219,7 @@ typedef enum
 	sfx_drown,
 	sfx_fizzle,
 	sfx_gbeep,
-	sfx_gclose,
+	sfx_yeeeah,
 	sfx_ghit,
 	sfx_gloop,
 	sfx_gspray,
diff --git a/src/st_stuff.c b/src/st_stuff.c
index 87d29556..dc473844 100644
--- a/src/st_stuff.c
+++ b/src/st_stuff.c
@@ -760,8 +760,9 @@ static void ST_drawLevelTitle(void)
 	INT32 dupcalc = (vid.width/vid.dupx);
 	UINT8 gtc = G_GetGametypeColor(gametype);
 	INT32 sub = 0;
-	INT32 lvlttly = 145;
-	INT32 zoney = 169;
+	INT32 bary = (splitscreen)
+		? BASEVIDHEIGHT/2
+		: 163;
 	INT32 lvlw;
 
 	if (timeinmap > 113)
@@ -797,30 +798,29 @@ static void ST_drawLevelTitle(void)
 
 	{
 		dupcalc = (dupcalc - BASEVIDWIDTH)>>1;
-		INT32 h = lvlttly + V_LevelNameHeight(lvlttl) + 2;
-		V_DrawFill(sub - dupcalc, h+9, ttlnumxpos+dupcalc + 1, 2, 31);
-		V_DrawDiag(sub + ttlnumxpos + 1, h, 11, 31);
-		V_DrawFill(sub - dupcalc, h, ttlnumxpos+dupcalc, 10, gtc);
-		V_DrawDiag(sub + ttlnumxpos, h, 10, gtc);
+		V_DrawFill(sub - dupcalc, bary+9, ttlnumxpos+dupcalc + 1, 2, 31);
+		V_DrawDiag(sub + ttlnumxpos + 1, bary, 11, 31);
+		V_DrawFill(sub - dupcalc, bary, ttlnumxpos+dupcalc, 10, gtc);
+		V_DrawDiag(sub + ttlnumxpos, bary, 10, gtc);
 		if (subttl[0])
-			V_DrawRightAlignedString(sub + zonexpos - 8, h+1, V_ALLOWLOWERCASE, va("%s - %s", gametype_cons_t[gametype].strvalue, subttl));
+			V_DrawRightAlignedString(sub + zonexpos - 8, bary+1, V_ALLOWLOWERCASE, subttl);
 		else
-			V_DrawRightAlignedString(sub + zonexpos - 8, h+1, V_ALLOWLOWERCASE, gametype_cons_t[gametype].strvalue);
+			V_DrawRightAlignedString(sub + zonexpos - 8, bary+1, V_ALLOWLOWERCASE, va("%s Mode", gametype_cons_t[gametype].strvalue));
 	}
 
 	ttlnumxpos += sub;
 	lvlttlxpos += sub;
 	zonexpos += sub;
 
-	if (strlen(actnum) > 0)
-		V_DrawLevelTitle(ttlnumxpos+12, zoney, 0, actnum);
-
-	V_DrawLevelTitle(lvlttlxpos, lvlttly, 0, lvlttl);
+	V_DrawLevelTitle(lvlttlxpos, bary-18, 0, lvlttl);
 
 	if (strlen(zonttl) > 0)
-		V_DrawLevelTitle(zonexpos, zoney, 0, zonttl);
+		V_DrawLevelTitle(zonexpos, bary+6, 0, zonttl);
 	else if (!(mapheaderinfo[gamemap-1]->levelflags & LF_NOZONE))
-		V_DrawLevelTitle(zonexpos, zoney, 0, M_GetText("ZONE"));
+		V_DrawLevelTitle(zonexpos, bary+6, 0, M_GetText("ZONE"));
+
+	if (strlen(actnum) > 0)
+		V_DrawLevelTitle(ttlnumxpos+12, bary+6, 0, actnum);
 }
 
 /*
diff --git a/src/y_inter.c b/src/y_inter.c
index b9973cb0..f6708209 100644
--- a/src/y_inter.c
+++ b/src/y_inter.c
@@ -2442,6 +2442,8 @@ void Y_VoteTicker(void)
 				{
 					voteendtic = votetic + (3*TICRATE);
 					S_StartSound(NULL, sfx_kc48);
+					if (P_IsLocalPlayer(&players[pickedvote]))
+						S_StartSound(NULL, sfx_yeeeah);
 				}
 			}
 		}
@@ -2674,6 +2676,7 @@ void Y_SetupVoteFinish(SINT8 pick, SINT8 level)
 	if (pick == -1) // No other votes? We gotta get out of here, then!
 	{
 		timer = 0;
+		deferredgametype = gametype;
 		Y_UnloadVoteData();
 		Y_FollowIntermission();
 		return;
@@ -2714,8 +2717,10 @@ void Y_SetupVoteFinish(SINT8 pick, SINT8 level)
 		else if (endtype == 1) // Only one unique vote, so just end it immediately.
 		{
 			voteendtic = votetic + (5*TICRATE);
-			S_StartSound(NULL, sfx_kc48);
 			S_ChangeMusicInternal("voteeb", false);
+			S_StartSound(NULL, sfx_kc48);
+			if (P_IsLocalPlayer(&players[pick]))
+				S_StartSound(NULL, sfx_yeeeah);
 		}
 		else
 			S_ChangeMusicInternal("voteea", true);