diff --git a/reaction/uifiles/ingame_matchmode_captain.menu b/reaction/uifiles/ingame_matchmode_captain.menu
index 94c82380..57f6bbe6 100644
--- a/reaction/uifiles/ingame_matchmode_captain.menu
+++ b/reaction/uifiles/ingame_matchmode_captain.menu
@@ -38,12 +38,13 @@
 		style WINDOW_STYLE_EMPTY
 		popup
 		
-		onOOBClick { close _self ; open "ingame_matchmode" }
+		onOOBClick { close _self ; }
 		onOpen {
 			play "sound/ui/whoosh3.wav" ;
 			uiScript readMMcaptainSettings ;
 			setitemcolor hints forecolor HINT_COLOR 1 ; hide "hints" ;
 		}
+		onClose { open _prev ; }
 		onESC { close _self }
 		
 		onOpenSpecial {
@@ -320,7 +321,7 @@ Group # 2 - Settings
 			textaligny 16
 			forecolor 0 0 0 1
 			visible 1
-			action { play "sound/ui/whoosh3.wav" ; open "ingame_matchmode_settings" }
+			action { play "sound/ui/whoosh3.wav" ; openSpecial "ingame_matchmode_settings" }
 			ASSIGN_HINT("hint_settings")
 		}
 		
diff --git a/reaction/uifiles/ingame_matchmode_referee.menu b/reaction/uifiles/ingame_matchmode_referee.menu
index 74a03cc8..6ce65253 100644
--- a/reaction/uifiles/ingame_matchmode_referee.menu
+++ b/reaction/uifiles/ingame_matchmode_referee.menu
@@ -38,13 +38,14 @@
 		style WINDOW_STYLE_EMPTY
 		popup
 		
-		onOOBClick { close _self ; open "ingame_matchmode" }
+		onOOBClick { close _self }
 		onOpen {
 			play "sound/ui/whoosh3.wav" ;
 			uiScript loadVoteArenas ;
 			setitemcolor hints forecolor HINT_COLOR 1 ; hide "hints" ;
 		}
 		onESC { close _self }
+		onClose { open _prev }
 		
 		onOpenSpecial {
 			//normal items
@@ -491,8 +492,8 @@ Group # 4 - Match
 		itemDef {
 			name "allgroups,group4,gr4_ctrl6,fade_alpha"
 			subgroup "fade_fore_alpha"
-			text "> ^_M^_atch Settings..."
-			shortcutKey "M"
+			text "> Match ^_S^_ettings..."
+			shortcutKey "S"
 			type ITEM_TYPE_BUTTON
 			textscale .225
 			style WINDOW_STYLE_EMPTY
@@ -502,7 +503,7 @@ Group # 4 - Match
 			textaligny 16
 			forecolor 0 0 0 1
 			visible 1
-			action { play "sound/ui/whoosh3.wav" ; open "ingame_matchmode_settings" }
+			action { play "sound/ui/whoosh3.wav" ; openSpecial "ingame_matchmode_settings" }
 			ASSIGN_HINT("hint_settings")
 		}
 
diff --git a/reaction/uifiles/ingame_matchmode_settings.menu b/reaction/uifiles/ingame_matchmode_settings.menu
index 0198c91b..5f058996 100644
--- a/reaction/uifiles/ingame_matchmode_settings.menu
+++ b/reaction/uifiles/ingame_matchmode_settings.menu
@@ -7,6 +7,7 @@
 #define MM_OPTION(ITEM_NAME, ITEM_TEXT, ITEM_CVAR, ITEM_TYPE)\
 	itemdef {	\
 	name ITEM_NAME	\
+	group "fade_fore_alpha"\
 	type ITEM_TYPE	\
 	text ITEM_TEXT":"	\
 	cvar ITEM_CVAR
@@ -35,25 +36,24 @@
 		style WINDOW_STYLE_EMPTY
 		popup
 		
-		onOOBClick { close _self ; open _prev }
+		onOOBClick { close _self }
 		onOpen { play "sound/ui/whoosh3.wav" ; uiScript "readMMsettings" }
-		onESC { close _self ; open _prev }
+		onClose { open _prev }
+		onESC { close _self }
 		
 		onOpenSpecial {
 			//normal items
-			setItemColor "fade_fore_alpha" forecolor 5 5 5 0 ;
-			timeFade "fade_fore_alpha" forecolor 5 5 5 1 0 FADEIN_TIME ;
+			ALPHA_FADE_FORE(fade_fore_alpha, 1) ;
 			//icon - special alpha
-			setItemColor "icon" forecolor 5 5 5 0 ;
-			timeFade "icon" forecolor 5 5 5 ICON_ALPHA 0 FADEIN_TIME ;
+			ALPHA_FADE_FORE(icon, ICON_ALPHA) ;
 			//line - special alpha; using backcolor
-			setItemColor "line" backcolor 5 5 5 0 ;
-			timeFade "line" backcolor 5 5 5 LINE_ALPHA 0 FADEIN_TIME ;
+			ALPHA_FADE_BACK(line, LINE_ALPHA) ;
 		}
 		
 		itemDef {
 			renderpoint
 			name "paper"
+			group "fade_fore_alpha"
 			menuAnchor
 			style WINDOW_STYLE_SHADER
 			background UI_ASSETS"/paper_1"
@@ -68,8 +68,9 @@
 		
 		itemdef {
 			renderpoint
-			name "title,fade_alpha"
+			name "title"
 			text "Match Settings:"
+			group "fade_fore_alpha"
 			forecolor .6 .0 .0 1
 			style WINDOW_STYLE_EMPTY
 			textalign ITEM_ALIGN_LEFT
@@ -141,6 +142,7 @@
 		
 		itemDef	{
 			name "submit"
+			group "fade_fore_alpha"
 			alignrect "paper" ITEM_ALIGN_LEFT 224 224 36 14
 			text "> ^_O^_K <"
 			shortcutKey "O"
@@ -155,7 +157,6 @@
 				play "sound/ui/whoosh3.wav" ;
 				uiScript "sendMMsettings" ;
 				close _self ;
-				open _prev
 			}
 		}
 	}