* Removed ingame credits

* Placeholder exit credits
* Join and Create server menus

5 files changed, 623 insertions, 1567 deletions

diff --git a/ui/createserver.menu b/ui/createserver.menu
index 47df6df6..c99cec8d 100644
--- a/ui/createserver.menu
+++ b/ui/createserver.menu
@@ -1,1316 +1,577 @@
 #include "ui/menudef.h"
 
 {
-\\ Server Creation \\
-
-  menuDef {
-    	name "createserver"
-    	visible 0
-    	fullscreen 1
-    	rect 0 0 640 480
-	background "menuback_a"
-	outOfBoundsClick	
-	focusColor 1 .75 0 1
-    	style 1
-    	border 1
-	onEsc { close createserver ; open main }
-	onOpen { setitemcolor fadebox backcolor 0 0 0 1 ; 
-	playlooped "music/fla_mp03.wav" ;
-	fadeout fadebox ; 
-	transition mappreview 7 127 190 1 7 57 190 141 20 10 ; 
-	uiScript loadArenas ;
-	hide lightning ; 
-	hide accept_alt ; 
-	show accept ;
-	hide back_alt ;
-	show back ;
-	hide grpmessage }
-	
-
-itemDef {
-	name window
-      	rect 2 50 200 370	
-	style WINDOW_STYLE_FILLED
-	border 1
-	bordercolor 1 1 1 .25
-	forecolor 1 1 1 1
-	backcolor 0 0 0 .25
-	visible 1
-	decoration
-}
-
-itemDef {
-	name window
-      	rect 204 50 227 98	
-	style WINDOW_STYLE_FILLED
-	border 1
-	bordercolor 1 1 1 .25
-	forecolor 1 1 1 1
-	backcolor 0 0 0 .25
-	visible 1
-	decoration
-}
-
-
-itemDef {
-	name window
-      	rect 204 150 227 270	
-	style WINDOW_STYLE_FILLED
-	border 1
-	bordercolor 1 1 1 .25
-	forecolor 1 1 1 1
-	backcolor 0 0 0 .25
-	visible 1
-	decoration
-}
-
-itemDef {
-	name window
-      	rect 433 50 200 183	
-	style WINDOW_STYLE_FILLED
-	border 1
-	bordercolor 1 1 1 .25
-	forecolor 1 1 1 1
-	backcolor 0 0 0 .25
-	visible 1
-	 cvarTest "ui_actualNetGameType"
-	  hideCvar { "0" ; "1" ; "2" }
-	decoration
-}
-
-itemDef {
-	name window
-      	rect 433 235 200 185	
-	style WINDOW_STYLE_FILLED
-	border 1
-	bordercolor 1 1 1 .25
-	forecolor 1 1 1 1
-	backcolor 0 0 0 .25
-	visible 1
-	 cvarTest "ui_actualNetGameType"
-	  hideCvar { "0" ; "1" ; "2" }
-	decoration
-}
-itemDef {
-	name window
-      	rect 433 50 200 370	
-	style WINDOW_STYLE_FILLED
-	border 1
-	bordercolor 1 1 1 .25
-	forecolor 1 1 1 1
-	backcolor 0 0 0 .25
-	visible 1
-	 cvarTest "ui_actualNetGameType"
-	  showCvar { "0" ; "1" ; "2" }
-	decoration
-}
-
-
-
-//	top bar	//
-  itemDef {
-      	name topbar
-      	style 2
-      	rect 0 5 640 40 
-      	style 2
-      	border 4
-      	bordercolor 0.5 0.5 0.5 0.5
-      	bordersize 2
-	backcolor 0 0 .75 .5
-      	visible 1 
-      	decoration 
-	mouseEnter { setcolor backcolor .75 0 0 .5 }
-      	mouseExit { setcolor backcolor 0 0 .75 .5 }
-    }
-
-
-// GLOBAL SETTINGS
-
-
-
-itemDef {
-      	name gametypefield
-      	style 0	
-	ownerdraw UI_NETGAMETYPE
-	text "Type:"
-	textstyle 6
-      	rect 0 10 320 31 
-      	textalign ITEM_ALIGN_LEFT		
-      	textalignx 20     
-      	textaligny 26    
-	textscale .416     
-      	forecolor 1 1 1 1
-      	visible 1
-	action { play "sound/misc/kcaction.wav" }
-	mouseEnter { fadein message_gametype } 
-	mouseExit { fadeout message_gametype } 
+  \\ Server Creation \\
+
+  menuDef
+  {
+    name "createserver"
+    visible 0
+    fullscreen 1
+    rect 0 0 640 480
+    focusColor 1 .75 0 1
+    outOfBoundsClick  
+    style 0
+    
+    onOpen
+    {
+      uiScript loadArenas;
+      hide accept_alt;
+      show accept;
+      hide back_alt;
+      show back;
+      hide grpmessage
     }
-
-itemDef {
-      	name gametypefield
-      	style 0	
-	ownerdraw UI_SKILL
-	textstyle 6
-	text "Skill:"
-      	rect 320 10 320 31 
-      	textalign ITEM_ALIGN_LEFT		
-      	textalignx 90     
-      	textaligny 26    
-	textscale .416    
-      	forecolor 1 1 1 1
-      	visible 1
-	action { play "sound/misc/kcaction.wav" }
-	mouseEnter { fadein message_skill } 
-	mouseExit { fadeout message_skill }  
+    
+    onEsc
+    {
+      close createserver;
+      open joinserver
     }
-
-
-// map selection
-
-itemDef {
-      	name mappreview
-      	style 0	
- 	ownerdraw UI_STARTMAPCINEMATIC
-      	rect 7 57 190 141
-      	border 1
-      	bordercolor .5 .5 .5 .5
-      	visible 1 
-    	}
-
-itemDef {
-      	name mappreview
-     	style WINDOW_STYLE_FILLED
-      	rect 6 56 192 143
-      	border 1
-      	bordercolor .5 .5 .5 .5
-      	visible 1
+    
+    itemDef
+    {
+      name background
+      rect 0 0 640 480
+      style WINDOW_STYLE_FILLED
+      backcolor 0 0 0 1
+      visible 1
+      decoration
     }
 
- itemDef {
-	name maplist
-      	rect 6 205 192 211
-	type ITEM_TYPE_LISTBOX
-	style WINDOW_STYLE_FILLED
-	elementwidth 120
-	elementheight 20
-	textscale .25
-	elementtype LISTBOX_TEXT
-	feeder FEEDER_ALLMAPS
-	textstyle 6
-	textalign 3
-	textaligny 14
-	border 1
-	bordercolor .5 .5 .5 .5
-	forecolor 1 1 1 1
-	backcolor 0 0 .5 .25
-	outlinecolor .1 .1 .7 .5
-	visible 1
-	columns 1
-    2 190 25 ITEM_ALIGN_LEFT
-	mouseEnter { fadein message_arena ; setitemcolor maplist bordercolor .7 0 0 1 } 
-	mouseExit { fadeout message_arena ; setitemcolor maplist bordercolor .5 .5 .5 .5 } 
-  	}
-
-//	SETTINGS	//
-
-
-
-// 	NORMAL	//	
-
-    itemDef {
-      	name normal
-	group grpsettings
-        type ITEM_TYPE_NUMERICFIELD
-	text "Capture Limit:"
-	cvar "capturelimit" 
-	ownerdrawflag UI_SHOW_NETANYTEAMGAME  
- 	rect 260 60 128 12 
-	textalign ITEM_ALIGN_RIGHT
-	textalignx 65
-	textaligny 12
-	maxchars 4
-	textscale .25        
-	forecolor 1 1 1 1
-	visible 1 
-    	}
-    itemDef {
-      	name normal
-	group grpsettings
-	type ITEM_TYPE_NUMERICFIELD
-	text "Frag Limit:"
-	cvar "fraglimit"
-	ownerdrawflag UI_SHOW_NETANYNONTEAMGAME 
-      	rect 260 60 128 12 
-      	textalign ITEM_ALIGN_RIGHT
-      	textalignx 65
-	maxchars 4
-      	textaligny 12
-	textscale .25        
-      	forecolor 1 1 1 1
-      	visible 1  
+    itemDef
+    {
+      name window
+      rect 2 2 330 418
+      style WINDOW_STYLE_FILLED
+      border 1
+      bordercolor 1 1 1 .25
+      forecolor 1 1 1 1
+      backcolor 0 0 0 .25
+      visible 1
+      decoration
     }
 
-    itemDef {
-      	name normal
-	group grpsettings
-      	type ITEM_TYPE_NUMERICFIELD
-	text "Time Limit:"
-	cvar "timelimit"
-      	rect 260 77 128 12 
-      	textalign ITEM_ALIGN_RIGHT
-      	textalignx 65
-	maxchars 4
-      	textaligny 12
-	textscale .25        
-      	forecolor 1 1 1 1
-      	visible 1  
+    itemDef
+    {
+      name window
+      rect 334 2 302 418
+      style WINDOW_STYLE_FILLED
+      border 1
+      bordercolor 1 1 1 .25
+      forecolor 1 1 1 1
+      backcolor 0 0 0 .25
+      visible 1
+      decoration
     }
 
+    // map selection
 
-    itemDef {
-      	name normal
-	group grpsettings
-      	type ITEM_TYPE_YESNO
-	text "Friendly Fire:"
-	cvar "g_friendlyfire"
-      	rect 260 94 128 12 
-      	textalign ITEM_ALIGN_RIGHT
-      	textalignx 65
-      	textaligny 12
-	textscale .25        
-      	forecolor 1 1 1 1
-      	visible 1  
+    itemDef
+    {
+      name mappreview
+      style 0 
+      ownerdraw UI_STARTMAPCINEMATIC
+      rect 7 7 320 240
+      border 1
+      bordercolor .5 .5 .5 .5
+      visible 1 
     }
 
-    itemDef {
-  	name normal
-	group grpsettings
-      	type ITEM_TYPE_YESNO
-	text "Pure Server:"
-	cvar "sv_pure"
-      	rect 260 111 128 12 
-      	textalign ITEM_ALIGN_RIGHT
-      	textalignx 65
-      	textaligny 12
-	textscale .25        
-      	forecolor 1 1 1 1
-      	visible 1  
-    	}
-
-    itemDef {
-      	name normal
-	group grpsettings
-      	type ITEM_TYPE_MULTI
-	text "Dedicated:"
-	// syntax for this is cvar name followed by a semicolan separated list of choices first choice equals 0
-	// dedicated is a special cvar in that as soon as it is set, the game goes to console only so the ui catches this one specifically
-	cvar "ui_dedicated"
-	cvarFloatList { "No" 0 "LAN" 1 "Internet" 2 }
-	rect 260 128 128 12 
-	textalign ITEM_ALIGN_RIGHT
-	textalignx 65
-	textaligny 12
-	textscale .25        
-      	forecolor 1 1 1 1
-     	visible 1 
-    	}
-
-
-// 	EXPERT	//	
-
-    itemDef {
-      	name expert
-	group grpsettings
-      	type ITEM_TYPE_EDITFIELD
-	text "Host Name:"
-	cvar "sv_hostname"
-	maxChars 32
-	maxPaintChars 10
-      	rect 260 160 128 12 
-      	textalign ITEM_ALIGN_RIGHT
-      	textalignx 65
-      	textaligny 12
-	textscale .25        
-      	forecolor 1 1 1 1
-      	visible 1  
+    itemDef
+    {
+      name mappreview
+      style WINDOW_STYLE_FILLED
+      rect 6 6 322 242
+      border 1
+      bordercolor .5 .5 .5 .5
+      visible 1
     }
 
-
-
-    itemDef {
-      	name expert
-	group grpsettings
-      	type ITEM_TYPE_YESNO
-	text "Auto Download:"
-	cvar "sv_allowdownload"
-	rect 260 175 128 12 
-	textalign ITEM_ALIGN_RIGHT
-	textalignx 65
-	textaligny 12
-	textscale .25        
-	forecolor 1 1 1 1
-	visible 1  
+    itemDef
+    {
+      name maplist
+      rect 6 252 322 164
+      type ITEM_TYPE_LISTBOX
+      style WINDOW_STYLE_EMPTY
+      elementwidth 120
+      elementheight 20
+      textscale .33
+      elementtype LISTBOX_TEXT
+      feeder FEEDER_ALLMAPS
+      textalign 3
+      textaligny 14
+      border 1
+      bordercolor   0.5 0.5 0.5 1
+      forecolor     1   1   1   1
+      backcolor     0.2 0.2 0.2 1
+      outlinecolor  0.1 0.1 0.1 0.5
+      visible 1
+      columns 1
+        2 190 25 ITEM_ALIGN_LEFT
     }
 
-    itemDef {
-      	name expert
-	group grpsettings
-      	type ITEM_TYPE_YESNO
-	text "Enable Voting:"
-	cvar "g_allowvote"
-      	rect 260 190 128 12 
-      	textalign ITEM_ALIGN_RIGHT
-      	textalignx 65
-      	textaligny 12
-	textscale .25        
-      	forecolor 1 1 1 1
-      	visible 1  
-    	}
 
+    //  SETTINGS  //
+
+    //  NORMAL  //  
+
+    itemDef
+    {
+      name expert
+      group grpsettings
+      type ITEM_TYPE_EDITFIELD
+      text "Host Name:"
+      cvar "sv_hostname"
+      maxChars 32
+      maxPaintChars 20
+      rect 420 30 128 20
+      textalign ITEM_ALIGN_RIGHT
+      textalignx 65
+      textaligny 12
+      textscale .36        
+      forecolor 1 1 1 1
+      visible 1  
+    }
     
-
-    itemDef {
-      	name expert
-	group grpsettings
-      	type ITEM_TYPE_NUMERICFIELD
-	text "Maximum Players:"
-	cvar "sv_maxclients"
-      	rect 260 205 128 12 
-      	textalign ITEM_ALIGN_RIGHT
-      	textalignx 65
-	maxchars 4
-      	textaligny 12
-	textscale .25        
-      	forecolor 1 1 1 1
-      	visible 1  
-    	}
-
-
-
-    itemDef {
-      	name expert
-	group grpsettings
-      	type ITEM_TYPE_NUMERICFIELD
-	text "Minimum Ping:"
-	cvar "sv_minping"
-      	rect 260 220 128 12 
-      	textalign ITEM_ALIGN_RIGHT
-      	textalignx 65
-	maxchars 4
-      	textaligny 12
-	textscale .25        
-      	forecolor 1 1 1 1
-      	visible 1  
+    itemDef
+    {
+      name normal
+      group grpsettings
+      type ITEM_TYPE_NUMERICFIELD
+      text "Time Limit:"
+      cvar "timelimit"
+      rect 420 50 128 20
+      textalign ITEM_ALIGN_RIGHT
+      textalignx 65
+      maxchars 4
+      textaligny 12
+      textscale .36        
+      forecolor 1 1 1 1
+      visible 1  
     }
 
-    itemDef {
-	name expert
-	group grpsettings
-      	type ITEM_TYPE_NUMERICFIELD
-	text "Maximum Ping:"
-	cvar "sv_maxping"
-      	rect 260 235 128 12 
-      	textalign ITEM_ALIGN_RIGHT
-      	textalignx 65
-      	textaligny 12
-	maxchars 4
-	textscale .25        
-      	forecolor 1 1 1 1
-      	visible 1  
+    itemDef
+    {
+      name expert
+      group grpsettings
+      type ITEM_TYPE_NUMERICFIELD
+      text "Maximum Players:"
+      cvar "sv_maxclients"
+      rect 420 70 128 20
+      textalign ITEM_ALIGN_RIGHT
+      textalignx 65
+      maxchars 4
+      textaligny 12
+      textscale .36        
+      forecolor 1 1 1 1
+      visible 1  
     }
 
-    itemDef {
-	name expert
-	group grpsettings
-      	type ITEM_TYPE_YESNO
-	text "Force Join:"
-	cvar "g_teamautojoin"
-      	rect 260 250 128 12 
-      	textalign ITEM_ALIGN_RIGHT
-      	textalignx 65
-      	textaligny 12
-	textscale .25        
-      	forecolor 1 1 1 1
-      	visible 1  
-    	}
-
-    itemDef {
-      	name expert
-	group grpsettings
-      	type ITEM_TYPE_YESNO
-	text "Even Teams:"
-	cvar "g_teamforcebalance"
-      	rect 260 265 128 12 
-      	textalign ITEM_ALIGN_RIGHT
-      	textalignx 65
-      	textaligny 12
-	textscale .25        
-      	forecolor 1 1 1 1
-      	visible 1  
-    	}
-
-    itemDef {
-      	name expert
-	group grpsettings
-      	type ITEM_TYPE_YESNO
-	text "Do Warmup:"
-	cvar "g_dowarmup"
-      	rect 260 280 128 12 
-      	textalign ITEM_ALIGN_RIGHT
-      	textalignx 65
-      	textaligny 12
-	textscale .25        
-      	forecolor 1 1 1 1
-      	visible 1  
-    	}
-
-    itemDef {
-	name expert
-	group grpsettings
-      	type ITEM_TYPE_NUMERICFIELD
-	text "Warmup time:"
-	cvar "g_warmup"
-      	rect 260 295 128 12 
-      	textalign ITEM_ALIGN_RIGHT
-      	textalignx 65
-      	textaligny 12
-	textscale .25  
-	maxchars 4
-      	forecolor 1 1 1 1
-      	visible 1  
-    	}
-
-    itemDef {
-      	name expert
-	group grpsettings
-      	type ITEM_TYPE_YESNO
-	text "Synchronous Client:"
-	cvar "g_synchronousclients"
-      	rect 260 310 128 12 
-      	textalign ITEM_ALIGN_RIGHT
-      	textalignx 65
-      	textaligny 12
-	textscale .25        
-      	forecolor 1 1 1 1
-      	visible 1  
-    	}
+    itemDef
+    {
+      name expert
+      group grpsettings
+      type ITEM_TYPE_YESNO
+      text "Require Password:"
+      cvar "g_needpassword"
+      rect 420 90 128 20
+      textalign ITEM_ALIGN_RIGHT
+      textalignx 65
+      textaligny 12
+      textscale .36        
+      forecolor 1 1 1 1
+      visible 1  
+    }
 
-    itemDef {
-      	name expert
-	group grpsettings
-      	type ITEM_TYPE_NUMERICFIELD
-	text "Max Rate:"
-	cvar "sv_maxrate"
-      	rect 260 325 128 12 
-      	textalign ITEM_ALIGN_RIGHT
-      	textalignx 65
-	maxchars 4
-      	textaligny 12
-	textscale .25        
-      	forecolor 1 1 1 1
-      	visible 1  
-    	}
+    itemDef
+    {
+      name expert
+      group grpsettings
+      type 4
+      text "Password:"
+      cvar "g_password"
+      rect 420 110 128 20
+      maxchars 10
+      maxPaintChars 10
+      textalign ITEM_ALIGN_RIGHT
+      textalignx 65
+      textaligny 12
+      textscale .36        
+      forecolor 1 1 1 1
+      visible 1  
+    }
 
-    itemDef {
-      	name expert
-	group grpsettings
-      	type ITEM_TYPE_NUMERICFIELD
-	text "Zombie Time:"
-	cvar "sv_zombietime"
-      	rect 260 340 128 12 
-	maxchars 4
-      	textalign ITEM_ALIGN_RIGHT
-      	textalignx 65
-      	textaligny 12
-	textscale .25        
-      	forecolor 1 1 1 1
-      	visible 1  
-    	}
 
-    itemDef {
-      	name expert
-	group grpsettings
-      	type ITEM_TYPE_NUMERICFIELD
-	text "Reconnect Limit:"
-	cvar "sv_reconnectlimit"
-	maxchars 4
-      	rect 260 355 128 12 
-      	textalign ITEM_ALIGN_RIGHT
-      	textalignx 65
-      	textaligny 12
-	textscale .25        
-      	forecolor 1 1 1 1
-      	visible 1  
-    	}
-    itemDef {
-      	name expert
-	group grpsettings
- 	type ITEM_TYPE_YESNO
-	text "Require Password:"
-	cvar "g_needpassword"
-      	rect 260 370 128 12 
-      	textalign ITEM_ALIGN_RIGHT
-      	textalignx 65
-      	textaligny 12
-	textscale .25        
-      	forecolor 1 1 1 1
-      	visible 1  
-    	}
 
-    itemDef {
-      	name expert
-	group grpsettings
-      	type 4
-	text "Password:"
-	cvar "g_password"
-      	rect 260 385 128 12 
-	maxchars 10
-	maxPaintChars 10
-      	textalign ITEM_ALIGN_RIGHT
-      	textalignx 65
-      	textaligny 12
-	textscale .25        
-      	forecolor 1 1 1 1
-      	visible 1  
-    	}
 
 
 
-// BOT LIST FOR TEAM GAMES
 
-itemDef {
-      name gametypefield
-      style 0	
- 	  ownerdraw UI_BLUETEAMNAME
-      rect 450 70 128 28 
-      textalign ITEM_ALIGN_LEFT		
-      textalignx 0     
-      textaligny 26    
-	 textscale .333     
-      forecolor 0 0 1 1
-      border 0
-      bordercolor 0 0 0 0
+    itemDef
+    {
+      name normal
+      group grpsettings
+      type ITEM_TYPE_YESNO
+      text "Pure Server:"
+      cvar "sv_pure"
+      rect 420 160 128 20
+      textalign ITEM_ALIGN_RIGHT
+      textalignx 65
+      textaligny 12
+      textscale .36        
+      forecolor 1 1 1 1
       visible 1  
-	  cvarTest "ui_actualNetGameType"
-	  hideCvar { "0" ; "1" ; "2" }
-	action { play "sound/misc/nomenu.wav" }
-	mouseEnter { fadein message_clan } 
-	mouseExit { fadeout message_clan } 
     }
 
-
-
-itemDef {
-      name gametypefield
-      style 0	
- 	  ownerdraw UI_BLUETEAM1
-      rect 450 100 128 20 
-	text "1."
-     textalign ITEM_ALIGN_LEFT	
-      textalignx 0     
-      textaligny 18    
-	  textscale .333
+    itemDef
+    {
+      name normal
+      group grpsettings
+      type ITEM_TYPE_MULTI
+      text "Dedicated:"
+      // dedicated is a special cvar in that as soon as it is set,
+      // the game goes to console only so the ui catches this one specifically
+      cvar "ui_dedicated"
+      cvarFloatList { "No" 0 "LAN" 1 "Internet" 2 }
+      rect 420 180 128 20 
+      textalign ITEM_ALIGN_RIGHT
+      textalignx 65
+      textaligny 12
+      textscale .36        
       forecolor 1 1 1 1
-      border 0
-      bordercolor 0 0 0 0
-       visible 1 
-	  cvarTest "ui_actualNetGameType"
-	  hideCvar { "0" ; "1" ; "2" }
-	action { play "sound/misc/nomenu.wav" }
-	mouseEnter { fadein message_slot } 
-	mouseExit { fadeout message_slot } 
+      visible 1 
     }
 
-itemDef {
-      name gametypefield
-      style 0	
- 	  ownerdraw UI_BLUETEAM2
-      rect 450 122 128 20 
-      textalign ITEM_ALIGN_LEFT		
-      textalignx 0     
-      textaligny 18 
-	text "2."   
-	  textscale .333
+    itemDef
+    {
+      name expert
+      group grpsettings
+      type ITEM_TYPE_YESNO
+      text "Auto Download:"
+      cvar "sv_allowdownload"
+      rect 420 200 128 20
+      textalign ITEM_ALIGN_RIGHT
+      textalignx 65
+      textaligny 12
+      textscale .36        
       forecolor 1 1 1 1
-      border 0
-      bordercolor 0 0 0 0
-       visible 1 
-	  cvarTest "ui_actualNetGameType"
-	  hideCvar { "0" ; "1" ; "2" }
-	action { play "sound/misc/nomenu.wav" }
-	mouseEnter { fadein message_slot } 
-	mouseExit { fadeout message_slot } 
+      visible 1  
     }
 
-itemDef {
-      name gametypefield
-      style 0	
-	text "3."
- 	  ownerdraw UI_BLUETEAM3
-      rect 450 144 128 20 
-      textalign ITEM_ALIGN_LEFT		
-      textalignx 0     
-      textaligny 18    
-	  textscale .333
+    itemDef
+    {
+      name expert
+      group grpsettings
+      type ITEM_TYPE_YESNO
+      text "Enable Voting:"
+      cvar "g_allowvote"
+      rect 420 220 128 20
+      textalign ITEM_ALIGN_RIGHT
+      textalignx 65
+      textaligny 12
+      textscale .36        
       forecolor 1 1 1 1
-      border 0
-      bordercolor 0 0 0 0
-       visible 1 
-	  cvarTest "ui_actualNetGameType"
-	  hideCvar { "0" ; "1" ; "2" }
-	action { play "sound/misc/nomenu.wav" }
-	mouseEnter { fadein message_slot } 
-	mouseExit { fadeout message_slot } 
+      visible 1  
     }
 
-itemDef {
-      name gametypefield
-      style 0	
-	text "4."
- 	  ownerdraw UI_BLUETEAM4
-      rect 450 166 128 20 
-      textalign ITEM_ALIGN_LEFT		
-      textalignx 0     
-      textaligny 18    
-	  textscale .333
-      forecolor 1 1 1 1
-      border 0
-      bordercolor 0 0 0 0
-       visible 1 
-	  cvarTest "ui_actualNetGameType"
-	  hideCvar { "0" ; "1" ; "2" }
-	action { play "sound/misc/nomenu.wav" }
-	mouseEnter { fadein message_slot } 
-	mouseExit { fadeout message_slot } 
-    }
 
-itemDef {
-      name gametypefield
-      style 0	
-	text "5."
- 	  ownerdraw UI_BLUETEAM5
-      rect 450 188 128 20 
-      textalign ITEM_ALIGN_LEFT		
-      textalignx 0     
-      textaligny 18    
-	  textscale .333
-      forecolor 1 1 1 1
-      border 0
-      bordercolor 0 0 0 0
-      visible 1 
-	  cvarTest "ui_actualNetGameType"
-	  hideCvar { "0" ; "1" ; "2" }
-	action { play "sound/misc/nomenu.wav" }
-	mouseEnter { fadein message_slot } 
-	mouseExit { fadeout message_slot } 
-    }
 
 
 
 
-itemDef {
-      name gametypefield
-      style 0	
- 	  ownerdraw UI_REDTEAMNAME
-      rect 450 250 128 28 
-      textalign ITEM_ALIGN_LEFT		
-      textalignx 0     
-      textaligny 26    
-	  textscale .333
-      forecolor 1 0 0 1
-      border 0
-      bordercolor 0 0 0 0
-       visible 1 
-	  cvarTest "ui_actualNetGameType"
-	  hideCvar { "0" ; "1" ; "2" }
-	action { play "sound/misc/nomenu.wav" }
-	mouseEnter { fadein message_clan } 
-	mouseExit { fadeout message_clan } 
+
+    itemDef
+    {
+      name expert
+      group grpsettings
+      type ITEM_TYPE_NUMERICFIELD
+      text "Minimum Ping:"
+      cvar "sv_minping"
+      rect 420 270 128 20
+      textalign ITEM_ALIGN_RIGHT
+      textalignx 65
+      maxchars 4
+      textaligny 12
+      textscale .36        
+      forecolor 1 1 1 1
+      visible 1  
     }
 
+    itemDef
+    {
+      name expert
+      group grpsettings
+      type ITEM_TYPE_NUMERICFIELD
+      text "Maximum Ping:"
+      cvar "sv_maxping"
+      rect 420 290 128 20
+      textalign ITEM_ALIGN_RIGHT
+      textalignx 65
+      textaligny 12
+      maxchars 4
+      textscale .36        
+      forecolor 1 1 1 1
+      visible 1  
+    }
 
-itemDef {
-      name gametypefield
-      style 0	
- 	  ownerdraw UI_REDTEAM1
-	text "1."
-      rect 450 280 128 20 
-      textalign ITEM_ALIGN_LEFT		
-      textalignx 0     
-      textaligny 18    
-	  textscale .333
+    itemDef
+    {
+      name expert
+      group grpsettings
+      type ITEM_TYPE_YESNO
+      text "Synchronous Client:"
+      cvar "g_synchronousclients"
+      rect 420 310 128 20
+      textalign ITEM_ALIGN_RIGHT
+      textalignx 65
+      textaligny 12
+      textscale .36        
       forecolor 1 1 1 1
-      border 0
-      bordercolor 0 0 0 0
-      visible 1 
-	  cvarTest "ui_actualNetGameType"
-	  hideCvar { "0" ; "1" ; "2" }
-	action { play "sound/misc/nomenu.wav" }
-	mouseEnter { fadein message_slot } 
-	mouseExit { fadeout message_slot } 
+      visible 1  
     }
 
-itemDef {
-      name gametypefield
-      style 0	
-	text "2."
- 	  ownerdraw UI_REDTEAM2
-      rect 450 302 128 20 
-      textalign ITEM_ALIGN_LEFT		
-      textalignx 0     
-      textaligny 18    
-	  textscale .333
+    itemDef
+    {
+      name expert
+      group grpsettings
+      type ITEM_TYPE_NUMERICFIELD
+      text "Max Rate:"
+      cvar "sv_maxrate"
+      rect 420 330 128 20 
+      textalign ITEM_ALIGN_RIGHT
+      textalignx 65
+      maxchars 4
+      textaligny 12
+      textscale .36        
       forecolor 1 1 1 1
-      border 0
-      bordercolor 0 0 0 0
-       visible 1 
-	  cvarTest "ui_actualNetGameType"
-	  hideCvar { "0" ; "1" ; "2" }
-	action { play "sound/misc/nomenu.wav" }
-	mouseEnter { fadein message_slot } 
-	mouseExit { fadeout message_slot } 
+      visible 1  
     }
 
-itemDef {
-      name gametypefield
-      style 0	
-	text "3."
- 	  ownerdraw UI_REDTEAM3
-      rect 450 324 128 20 
-      textalign ITEM_ALIGN_LEFT		
-      textalignx 0     
-      textaligny 18    
-	  textscale .333
+    itemDef
+    {
+      name expert
+      group grpsettings
+      type ITEM_TYPE_NUMERICFIELD
+      text "Zombie Time:"
+      cvar "sv_zombietime"
+      rect 420 350 128 20
+      maxchars 4
+      textalign ITEM_ALIGN_RIGHT
+      textalignx 65
+      textaligny 12
+      textscale .36        
       forecolor 1 1 1 1
-      border 0
-      bordercolor 0 0 0 0
-       visible 1 
-	  cvarTest "ui_actualNetGameType"
-	  hideCvar { "0" ; "1" ; "2" }
-	action { play "sound/misc/nomenu.wav" }
-	mouseEnter { fadein message_slot } 
-	mouseExit { fadeout message_slot } 
+      visible 1  
     }
 
-itemDef {
-      name gametypefield
-      style 0	
-	text "4."
- 	  ownerdraw UI_REDTEAM4
-      rect 450 346 128 20 
-      textalign ITEM_ALIGN_LEFT		
-      textalignx 0     
-      textaligny 18    
-	  textscale .333
+    itemDef
+    {
+      name expert
+      group grpsettings
+      type ITEM_TYPE_NUMERICFIELD
+      text "Reconnect Limit:"
+      cvar "sv_reconnectlimit"
+      maxchars 4
+      rect 420 370 128 20
+      textalign ITEM_ALIGN_RIGHT
+      textalignx 65
+      textaligny 12
+      textscale .36        
       forecolor 1 1 1 1
-      border 0
-      bordercolor 0 0 0 0
-      visible 1 
-	  cvarTest "ui_actualNetGameType"
-	  hideCvar { "0" ; "1" ; "2" }
-	action { play "sound/misc/nomenu.wav" }
-	mouseEnter { fadein message_slot } 
-	mouseExit { fadeout message_slot } 
-    	}
+      visible 1  
+    }
+    
 
-itemDef {
-      	name gametypefield
-      	style 0	
-	text "5."
-	ownerdraw UI_REDTEAM5
-      	rect 450 368 128 20 
-     	textalign ITEM_ALIGN_LEFT		
-      	textalignx 0     
-      	textaligny 18    
-	textscale .333
-      	forecolor 1 1 1 1
-      	border 0
-      	bordercolor 0 0 0 0
-      	 visible 1 
-	  cvarTest "ui_actualNetGameType"
-	  hideCvar { "0" ; "1" ; "2" }
-	action { play "sound/misc/nomenu.wav" } 
-	mouseEnter { fadein message_slot } 
-	mouseExit { fadeout message_slot } 
-    	}
 
-// BOT LIST FOR NONTEAMGAMES
 
 
-itemDef {
-      name gametypefield
-      style 0	
-	text "1."
- 	  ownerdraw UI_BLUETEAM1
-      rect 450 100 128 20 
-      textalign ITEM_ALIGN_LEFT		
-      textalignx 0     
-      textaligny 18    
-	  textscale .333
+/*  itemDef
+    {
+      name expert
+      group grpsettings
+      type ITEM_TYPE_YESNO
+      text "Force Join:"
+      cvar "g_teamautojoin"
+      rect 420 250 128 12 
+      textalign ITEM_ALIGN_RIGHT
+      textalignx 65
+      textaligny 12
+      textscale .36        
       forecolor 1 1 1 1
-      border 0
-      bordercolor 0 0 0 0
-        visible 1 
-	  cvarTest "ui_actualNetGameType"
-	  showCvar { "0" ; "1" ; "2" }
-	action { play "sound/misc/nomenu.wav" }
-	mouseEnter { fadein message_slot } 
-	mouseExit { fadeout message_slot } 
+      visible 1  
     }
 
-itemDef {
-      name gametypefield
-      style 0	
-	text "2."
- 	  ownerdraw UI_REDTEAM1
-      rect 450 125 128 20 
-      textalign ITEM_ALIGN_LEFT		
-      textalignx 0     
-      textaligny 18    
-	  textscale .333
+    itemDef
+    {
+      name expert
+      group grpsettings
+      type ITEM_TYPE_YESNO
+      text "Even Teams:"
+      cvar "g_teamforcebalance"
+      rect 420 265 128 12 
+      textalign ITEM_ALIGN_RIGHT
+      textalignx 65
+      textaligny 12
+      textscale .36        
       forecolor 1 1 1 1
-      border 0
-      bordercolor 0 0 0 0
-        visible 1 
-	  cvarTest "ui_actualNetGameType"
-	  showCvar { "0" ; "1" ; "2" }
-	action { play "sound/misc/nomenu.wav" }
-	mouseEnter { fadein message_slot } 
-	mouseExit { fadeout message_slot } 
-    }
-
-itemDef {
-      name gametypefield
-      style 0
-	text "3."	
- 	  ownerdraw UI_BLUETEAM2
-      rect 450 150 128 20 
-      textalign ITEM_ALIGN_LEFT		
-      textalignx 0     
-      textaligny 18    
-	  textscale .333
+      visible 1  
+    }*/
+
+/*  itemDef
+    {
+      name expert
+      group grpsettings
+      type ITEM_TYPE_YESNO
+      text "Do Warmup:"
+      cvar "g_dowarmup"
+      rect 420 280 128 12 
+      textalign ITEM_ALIGN_RIGHT
+      textalignx 65
+      textaligny 12
+      textscale .36        
       forecolor 1 1 1 1
-      border 0
-      bordercolor 0 0 0 0
-        visible 1 
-	  cvarTest "ui_actualNetGameType"
-	  showCvar { "0" ; "1" ; "2" }
-	action { play "sound/misc/nomenu.wav" }
-	mouseEnter { fadein message_slot } 
-	mouseExit { fadeout message_slot } 
+      visible 1  
     }
 
-itemDef {
-      name gametypefield
-      style 0
-	text "4."	
- 	  ownerdraw UI_REDTEAM2
-      rect 450 175 128 20 
-      textalign ITEM_ALIGN_LEFT		
-      textalignx 0     
-      textaligny 18    
-	  textscale .333
+    itemDef
+    {
+      name expert
+      group grpsettings
+      type ITEM_TYPE_NUMERICFIELD
+      text "Warmup time:"
+      cvar "g_warmup"
+      rect 420 295 128 12 
+      textalign ITEM_ALIGN_RIGHT
+      textalignx 65
+      textaligny 12
+      textscale .36  
+      maxchars 4
+      forecolor 1 1 1 1
+      visible 1  
+    }*/
+
+/*    itemDef
+    {
+      name normal
+      group grpsettings
+      type ITEM_TYPE_YESNO
+      text "Friendly Fire:"
+      cvar "g_friendlyfire"
+      rect 420 94 128 12 
+      textalign ITEM_ALIGN_RIGHT
+      textalignx 65
+      textaligny 12
+      textscale .36        
       forecolor 1 1 1 1
-      border 0
-      bordercolor 0 0 0 0
-       visible 1 
-	  cvarTest "ui_actualNetGameType"
-	  showCvar { "0" ; "1" ; "2" }
-	action { play "sound/misc/nomenu.wav" }
-	mouseEnter { fadein message_slot } 
-	mouseExit { fadeout message_slot } 
+      visible 1  
+    }*/
+    // BACK BAR //
+
+    itemDef
+    {
+      name back
+      style 3
+      background "ui/assets/backarrow.tga"
+      rect 16 424 50 50 
+      visible 1 
+      action
+      {
+        close createserver;
+        open joinserver
+      }
+      
+      mouseEnter
+      {
+        hide back;
+        show back_alt
+      }
     }
 
-itemDef {
-      name gametypefield
-      style 0	
-	text "5."
- 	  ownerdraw UI_BLUETEAM3
-      rect 450 200 128 20 
-      textalign ITEM_ALIGN_LEFT		
-      textalignx 0     
-      textaligny 18    
-	  textscale .333
+    itemDef
+    {
+      name back_alt
+      style WINDOW_STYLE_SHADER
+      background "ui/assets/backarrow_alt.tga"
+      rect 16 424 50 50
+      backcolor 0 0 0 0
       forecolor 1 1 1 1
-      border 0
-      bordercolor 0 0 0 0
-       visible 1 
-	  cvarTest "ui_actualNetGameType"
-	  showCvar { "0" ; "1" ; "2" }
-	action { play "sound/misc/nomenu.wav" }
-	mouseEnter { fadein message_slot } 
-	mouseExit { fadeout message_slot } 
+      visible 0
+      type ITEM_TYPE_BUTTON
+      
+      text "Back"
+      textalign ITEM_ALIGN_LEFT
+      textaligny 36
+      textalignx 60
+      textscale .6
+      
+      mouseExit
+      {
+        hide back_alt;
+        show back
+      }
+      
+      action
+      {
+        close createserver;
+        open joinserver
+      }   
     }
 
 
 
 
-
-
-
-itemDef {
-      	name gametypefield
-      	style 0	
-	text "6."
-	ownerdraw UI_REDTEAM3
-      	rect 450 225 128 20 
-      	textalign ITEM_ALIGN_LEFT		
-      	textalignx 0     
-      	textaligny 18    
-	textscale .333
-      	forecolor 1 1 1 1
-      	border 0
-      	bordercolor 0 0 0 0
-      	 visible 1 
-	  cvarTest "ui_actualNetGameType"
-	  showCvar { "0" ; "1" ; "2" }
-	action { play "sound/misc/nomenu.wav" }
-	mouseEnter { fadein message_slot } 
-	mouseExit { fadeout message_slot } 
-    }
-
-itemDef {
-      	name gametypefield
-      	style 0	
-	text "7."
- 	ownerdraw UI_BLUETEAM4
-      	rect 450 250 128 20 
-      	textalign ITEM_ALIGN_LEFT		
-      	textalignx 0     
-      	textaligny 18    
-	textscale .333
-      	forecolor 1 1 1 1
-      	border 0
-      	bordercolor 0 0 0 0
-       	 visible 1 
-	  cvarTest "ui_actualNetGameType"
-	 showCvar { "0" ; "1" ; "2" }
-	action { play "sound/misc/nomenu.wav" }
-	mouseEnter { fadein message_slot } 
-	mouseExit { fadeout message_slot } 
-    	}
-
-itemDef {
-      	name gametypefield
-      	style 0	
-	text "8."
- 	ownerdraw UI_REDTEAM4
-      	rect 450 275 128 20 
-      	textalign ITEM_ALIGN_LEFT		
-      	textalignx 0     
-      	textaligny 18    
-	textscale .333
-      	forecolor 1 1 1 1
- 	border 0
-      	bordercolor 0 0 0 0
-       	 visible 1 
-	  cvarTest "ui_actualNetGameType"
-	  showCvar { "0" ; "1" ; "2" }
-	action { play "sound/misc/nomenu.wav" }
-	mouseEnter { fadein message_slot } 
-	mouseExit { fadeout message_slot } 
-    }
-
-itemDef {
-      name gametypefield
-      style 0
-	text "9."	
- 	  ownerdraw UI_BLUETEAM5
-      rect 450 300 128 20 
-      textalign ITEM_ALIGN_LEFT		
-      textalignx 0     
-      textaligny 18    
-	  textscale .333
+    itemDef
+    {
+      name accept
+      style 3 
+      rect 574 424 50 50 
+      background "ui/assets/forwardarrow.tga"
+      backcolor 0 0 0 0
       forecolor 1 1 1 1
-      border 0
-      bordercolor 0 0 0 0
       visible 1 
-	  cvarTest "ui_actualNetGameType"
-	showCvar { "0" ; "1" ; "2" }
-	action { play "sound/misc/nomenu.wav" }
-	mouseEnter { fadein message_slot } 
-	mouseExit { fadeout message_slot } 
-    	}
-
-itemDef {
-      	name gametypefield
-      	style 0	
-	text "10."
-	ownerdraw UI_REDTEAM5
-      	rect 443 325 128 20 
-     	textalign ITEM_ALIGN_LEFT		
-      	textalignx 0     
-      	textaligny 18    
-	textscale .333
-      	forecolor 1 1 1 1
-      	border 0
-      	bordercolor 0 0 0 0
-       visible 1 
-	  cvarTest "ui_actualNetGameType"
-	  showCvar { "0" ; "1" ; "2" }
-	action { play "sound/misc/nomenu.wav" } 
-	mouseEnter { fadein message_slot } 
-	mouseExit { fadeout message_slot } 
-    	}
-
-
-
-// BACK BAR	//
-
-
-  itemDef {
-      	name gotobar
-      	style 2
-      	rect 0 430 640 30 
-      	textscale 0.4
-      	textalign 0		        // center
-      	textalignx 60        // x alignment point for text
-                            // use it to offset left/right text from the edge 
-                            // or to center the text on a different point
-      	textaligny 21        
-      	style 2
-      	border 4
-      	bordercolor 0.5 0.5 0.5 0.75
-      	bordersize 2
-      	backcolor 0 0 .75 0.5
-      	visible 1 
-      	mouseEnter { setcolor backcolor .75 0 0 .5 }
-      	mouseExit { setcolor backcolor 0 0 .75 .5 }
-      	decoration 
-    	}
-
-    itemDef {
-      	name back
-	style 3
-      	background "ui/assets/backarrow.tga"
-	rect 16 424 50 50 
-      	visible 1 
-      	action {  close createserver ; open main }
-	mouseEnter { hide back ; show back_alt ; fadein message_back }
-    	}
-
-itemDef {
-      	name back_alt
-      	style WINDOW_STYLE_SHADER
-	background "ui/assets/backarrow_alt.tga"
-	rect 14 422 54 54 
-      	backcolor 0 0 0 0
-      	forecolor 1 1 1 1
-      	visible 0
-	type ITEM_TYPE_BUTTON
-      	mouseExit { hide back_alt ; show back ; fadeout message_back }	  
-      	action { close createserver ; open main }	  
-    	}
-
-
-
-    itemDef {
-      	name accept
-      	style 3	
-     	rect 574 424 50 50 
-     	background "ui/assets/forwardarrow.tga"
-      	backcolor 0 0 0 0
-      	forecolor 1 1 1 1
-      	visible 1 
-	mouseEnter { playlooped "sound/misc/loop_electricity_05.wav" ; show lightning ; hide accept ; show accept_alt ; fadein message_accept }
-      	action { close fight ; uiScript StartServer }
-/*	
-	//	demo_only
-	cvarTest "ui_actualNetGameType"
-	hideCvar { "0" ; "1" }
-*/
-  	}
-
-	itemDef {
-      	name accept_alt
-      	style 3	
-     	rect 572 422 54 54 
-     	background "ui/assets/forwardarrow_alt.tga"
-      	backcolor 0 0 0 0
-      	forecolor 1 1 1 1
-      	visible 0   
-		type ITEM_TYPE_BUTTON
-      	action { close fight ; uiScript StartServer }
-      	mouseExit { hide lightning ; hide accept_alt ; show accept ; fadeout message_accept ; playlooped "music/fla_mp03.wav" }	
-/*	
-	//	demo_only
-	cvarTest "ui_actualNetGameType"
-	hideCvar { "0" ; "1" }
-*/
-  	}
-itemDef {
-      	name lightning
-      	style 3
-	background lightningkc
-      	rect 46 385 236 128     
-      	visible 0 
-      	decoration 
-    	}
-itemDef {
-      	name lightning
-      	style 3
-	background lightningkc
-      	rect 355 385 236 128     
-      	visible 0 
-      	decoration 
-    	}
-
-
-
-//	MESSAGES	//
-
-itemDef {
-	name message_back
-	group grpmessage
-	style 0 
-	rect 320 430 128 30
-	textalign 1
-	textstyle 1
-	textalignx 0
-	textaligny 25
-	textscale .416
-	text "Exit to Main Menu"
-	forecolor 1 1 1 1
-	decoration 
-	visible 0
-	}
-
-itemDef {
-	name message_accept
-	group grpmessage
-	style 0 
-	rect 320 430 128 30
-	textalign 1
-	textalignx 0
-	textstyle 1
-	textaligny 25
-	textscale .416
-	text "Start Server"
-	forecolor 1 1 1 1
-	decoration 
-	visible 0
-	}
-
-itemDef {
-	name message_gametype
-	group grpmessage
-	style 0 
-	rect 320 430 128 30
-	textalign 1
-	textstyle 1
-	textalignx 0
-	textaligny 25
-	textscale .416
-	text "Set GameType"
-	forecolor 1 1 1 1
-	decoration 
-	visible 0
-	}
-
-itemDef {
-	name message_skill
-	group grpmessage
-	style 0 
-	rect 320 430 128 30
-	textalign 1
-	textstyle 1
-	textalignx 0
-	textaligny 25
-	textscale .416
-	text "Set Skill Level"
-	forecolor 1 1 1 1
-	decoration 
-	visible 0
-	}
-itemDef {
-	name message_arena
-	group grpmessage
-	style 0 
-	rect 320 430 128 30
-	textalign 1
-	textstyle 1
-	textalignx 0
-	textaligny 25
-	textscale .416
-	text "Choose Your Arena"
-	forecolor 1 1 1 1
-	decoration 
-	visible 0
-	}
-itemDef {
-	name message_clan
-	group grpmessage
-	style 0 
-	rect 320 430 128 30
-	textalign 1
-	textstyle 1
-	textalignx 0
-	textaligny 25
-	textscale .416
-	text "Click to toggle through clan list"
-	forecolor 1 1 1 1
-	decoration 
-	visible 0
-	}
-itemDef {
-	name message_slot
-	group grpmessage
-	style 0 
-	rect 320 430 128 30
-	textalign 1
-	textstyle 1
-	textalignx 0
-	textaligny 25
-	textscale .416
-	text "Click to toggle botnames, human, or closed slots"
-	forecolor 1 1 1 1
-	decoration 
-	visible 0
-	}
-itemDef {
-	name message_normal
-	group grpmessage
-	style 0 
-	rect 320 430 128 30
-	textalign 1
-	textstyle 1
-	textalignx 0
-	textaligny 25
-	textscale .416
-	text "Select to Modify Normal Server Settings"
-	forecolor 1 1 1 1
-	decoration 
-	visible 0
-	}
-itemDef {
-	name message_expert
-	group grpmessage
-	style 0 
-	rect 320 430 128 30
-	textalign 1
-	textstyle 1
-	textalignx 0
-	textaligny 25
-	textscale .416
-	text "Select to Modify Expert Server Settings"
-	forecolor 1 1 1 1
-	decoration 
-	visible 0
-	}
-
-itemDef {
-      	name fadebox
-      	style WINDOW_STYLE_FILLED
- 	background "ui/assets/fadebox.tga"
-	forecolor 0 0 0 1
-	backcolor 0 0 0 1
-	rect 0 0 640 480
-      	visible 1 
-	decoration
-    	}
-
-
-}
-}
+      mouseEnter
+      {
+        hide accept;
+        show accept_alt
+      }
+      
+      action
+      {
+        close fight; //TA: no i don't know
+        uiScript StartServer
+      }
+    }
 
+    itemDef
+    {
+      name accept_alt
+      style WINDOW_STYLE_SHADER
+      rect 574 424 50 50
+      background "ui/assets/forwardarrow_alt.tga"
+      backcolor 0 0 0 0
+      type ITEM_TYPE_BUTTON
+      forecolor 1 1 1 1
+      visible 0  
+      type ITEM_TYPE_BUTTON 
+      
+      text "Create"
+      textalign ITEM_ALIGN_LEFT
+      textaligny 36
+      textalignx -70
+      textscale .6
+      
+      mouseExit
+      {
+        hide accept_alt;
+        show accept
+      }
+      
+      action
+      {
+        close fight; //TA: no i don't know
+        uiScript StartServer
+      }
+    }
+  }
 }
diff --git a/ui/findplayer.menu b/ui/findplayer.menu
index 3b179596..db6cbb48 100644
--- a/ui/findplayer.menu
+++ b/ui/findplayer.menu
@@ -90,7 +90,7 @@
       textalignx 5
       textaligny 21 
       textscale .3        
-      outlinecolor 1 .5 .5 .5
+      outlinecolor .2 .2 .2 .5
       backcolor 0 0 0 0
       forecolor 1 1 1 1
       border 0
@@ -110,7 +110,7 @@
       elementheight 16
       textscale .225
       backcolor 0 0 0 1
-      outlinecolor .1 .1 .7 .5
+      outlinecolor .2 .2 .2 .5
       border 1
       bordersize 1
       bordercolor .5 .5 .5 1
diff --git a/ui/joinserver.menu b/ui/joinserver.menu
index 1daeb6e1..2700f623 100644
--- a/ui/joinserver.menu
+++ b/ui/joinserver.menu
@@ -63,7 +63,7 @@
     {
       name refreshdate
       ownerdraw UI_SERVERREFRESHDATE
-      textscale .22
+      textscale .33
       rect 10 365 265 25
       textalign 0
       textalignx 10   
@@ -77,7 +77,7 @@
     {
       name messageoftheday
       ownerdraw UI_SERVERMOTD
-      textscale .3
+      textscale .33
       rect 280 365 345 25
       forecolor 1 1 1 1
       visible 1 
@@ -92,7 +92,7 @@
       name gametypefield
       style WINDOW_STYLE_EMPTY
       ownerdraw UI_NETSOURCE
-      rect 10 20 128 26
+      rect 46 20 128 26
       textalign ITEM_ALIGN_LEFT   
       textalignx 10    
       textaligny 22    
@@ -103,27 +103,6 @@
       action { play "sound/misc/kcaction.wav" }
     }
 
-    itemDef
-    {
-      name createServer
-      text "Create Server"
-      textscale .4
-      style WINDOW_STYLE_EMPTY
-      type ITEM_TYPE_BUTTON
-      rect 164 20 128 26
-      textalign ITEM_ALIGN_LEFT
-      textalignx 10
-      textaligny 22
-      backcolor .5 .5 .5 .5
-      forecolor 1 1 1 1
-      visible 1 
-      action
-      {
-        close joinserver;
-        open createserver
-      }        
-    }
-
     //  BUTTONS   //
 
     itemDef
@@ -133,7 +112,7 @@
       type ITEM_TYPE_BUTTON
       textscale .4
       style WINDOW_STYLE_EMPTY
-      rect 10 60 128 26
+      rect 200 20 128 26
       textalign ITEM_ALIGN_LEFT
       textalignx 10
       textaligny 22
@@ -154,7 +133,7 @@
       textscale .4
       style WINDOW_STYLE_EMPTY
       type ITEM_TYPE_BUTTON
-      rect 164 60 128 26
+      rect 364 20 128 26
       textalign ITEM_ALIGN_LEFT
       textalignx 10
       textaligny 22
@@ -176,7 +155,7 @@
       text "View Empty:"
       cvar "ui_browserShowEmpty"
       textscale .4
-      rect 328 20 128 26
+      rect 128 50 128 26
       textalign ITEM_ALIGN_LEFT
       textalignx 10    
       textaligny 22
@@ -198,7 +177,7 @@
       text "View Full:"
       cvar "ui_browserShowFull"
       textscale .4
-      rect 328 60 128 26
+      rect 256 50 128 26
       textalign ITEM_ALIGN_LEFT
       textalignx 10    
       textaligny 22
@@ -301,7 +280,7 @@
       style WINDOW_STYLE_EMPTY
       elementwidth 120
       elementheight 20
-      textscale .25
+      textscale .33
       elementtype LISTBOX_TEXT
       feeder FEEDER_SERVERS
       border 1
@@ -328,7 +307,7 @@
       group grpTabs
       text "Server Name"
       type ITEM_TYPE_BUTTON
-      textscale .25
+      textscale .33
       style WINDOW_STYLE_EMPTY
       rect 10 103 365 26 
       textalign ITEM_ALIGN_LEFT
@@ -340,12 +319,14 @@
       backcolor     0.2 0.2 0.2 1
       outlinecolor  0.1 0.1 0.1 0.5
       visible 1 
-      action { play "sound/misc/nomenu.wav" ; 
-      uiScript ServerSort 0 ; 
-      setitemcolor grpTabs backcolor .1 .1 .37 1 ; 
-      setitemcolor server backcolor .1 .37 .1 1 ; 
-      setitemcolor grpColumn backcolor 0 0 0 0 ; 
-      setitemcolor serverColumn backcolor 0 1 0 .25 }
+      action
+      {
+        play "sound/misc/nomenu.wav"; 
+        uiScript ServerSort 0; 
+      
+        setitemcolor grpColumn backcolor 0 0 0 0; 
+        setitemcolor serverColumn backcolor 0.3 1 1 0.5
+      }
     }
 
     itemDef
@@ -354,7 +335,7 @@
       group grpTabs
       type ITEM_TYPE_BUTTON
       text "Map Name"
-      textscale .25
+      textscale .33
       style WINDOW_STYLE_EMPTY
       rect 375 103 125 26
       textalign ITEM_ALIGN_LEFT
@@ -366,21 +347,23 @@
       backcolor     0.2 0.2 0.2 1
       outlinecolor  0.1 0.1 0.1 0.5
       visible 1 
-      action { play "sound/misc/nomenu.wav" ; 
-      uiScript ServerSort 1 ; 
-      setitemcolor grpTabs backcolor .1 .1 .37 1 ; 
-      setitemcolor map backcolor .1 .37 .1 1 ; 
-      setitemcolor grpColumn backcolor 0 0 0 0 ; 
-      setitemcolor mapColumn backcolor 0 1 0 .25 }
+      action
+      {
+        play "sound/misc/nomenu.wav"; 
+        uiScript ServerSort 1; 
+      
+        setitemcolor grpColumn backcolor 0 0 0 0; 
+        setitemcolor mapColumn backcolor 0.3 1 1 0.5
+      }
     }
 
     itemDef
     {
       name Players
       group grpTabs
-      text "#Plyrs"
+      text "Players"
       type ITEM_TYPE_BUTTON
-      textscale .25
+      textscale .33
       style WINDOW_STYLE_EMPTY
       rect 500 103 60 26
       textalign ITEM_ALIGN_LEFT
@@ -392,12 +375,14 @@
       backcolor     0.2 0.2 0.2 1
       outlinecolor  0.1 0.1 0.1 0.5
       visible 1 
-      action { play "sound/misc/nomenu.wav" ; 
-      uiScript ServerSort 2 ;
-      setitemcolor grpTabs backcolor .1 .1 .37 1 ; 
-      setitemcolor Players backcolor .1 .37 .1 1 ;  
-      setitemcolor grpColumn backcolor 0 0 0 0 ; 
-      setitemcolor playerColumn backcolor 0 1 0 .25 }
+      action
+      {
+        play "sound/misc/nomenu.wav"; 
+        uiScript ServerSort 2; 
+      
+        setitemcolor grpColumn backcolor 0 0 0 0; 
+        setitemcolor playerColumn backcolor 0.3 1 1 0.5
+      }
     }
 
     itemDef
@@ -406,7 +391,7 @@
       group grpTabs
       text "Ping"
       type ITEM_TYPE_BUTTON
-      textscale .25
+      textscale .33
       style WINDOW_STYLE_EMPTY
       rect 560 103 70 26
       textalign ITEM_ALIGN_LEFT
@@ -418,12 +403,14 @@
       backcolor     0.2 0.2 0.2 1
       outlinecolor  0.1 0.1 0.1 0.5
       visible 1 
-      action { play "sound/misc/nomenu.wav" ; 
-      uiScript ServerSort 4 ;
-      setitemcolor grpTabs backcolor .1 .1 .37 1 ; 
-      setitemcolor Ping backcolor .1 .37 .1 1 ;  
-      setitemcolor grpColumn backcolor 0 0 0 0 ;
-      setitemcolor pingColumn backcolor 0 1 0 .25 }
+      action
+      {
+        play "sound/misc/nomenu.wav"; 
+        uiScript ServerSort 4; 
+      
+        setitemcolor grpColumn backcolor 0 0 0 0; 
+        setitemcolor pingColumn backcolor 0.3 1 1 0.5
+      }
     }
 
 
@@ -539,6 +526,28 @@
     
 
 
+    itemDef
+    {
+      name createServer
+      text "Create Server"
+      textscale .5
+      style WINDOW_STYLE_EMPTY
+      type ITEM_TYPE_BUTTON
+      rect 254 424 128 26
+      textalign ITEM_ALIGN_LEFT
+      textalignx 10
+      textaligny 32 
+      backcolor .5 .5 .5 .5
+      forecolor 1 1 1 1
+      visible 1 
+      action
+      {
+        close joinserver;
+        open createserver
+      }        
+    }
+
+
     // BACK BAR //
 
     itemDef
@@ -571,6 +580,13 @@
       forecolor 1 1 1 1
       visible 0
       type ITEM_TYPE_BUTTON
+      
+      text "Back"
+      textalign ITEM_ALIGN_LEFT
+      textaligny 36
+      textalignx 60
+      textscale .6
+      
       mouseExit
       {
         hide back_alt;
@@ -616,6 +632,13 @@
       forecolor 1 1 1 1
       visible 0  
       type ITEM_TYPE_BUTTON 
+      
+      text "Join"
+      textalign ITEM_ALIGN_LEFT
+      textaligny 36
+      textalignx -55
+      textscale .6
+      
       mouseExit
       {
         hide accept_alt;
diff --git a/ui/main.menu b/ui/main.menu
index c09449dc..5ca61952 100644
--- a/ui/main.menu
+++ b/ui/main.menu
@@ -81,35 +81,12 @@
     itemDef
     {
       name mainmenu
-      text "Credits"
-      type ITEM_TYPE_BUTTON
-      textstyle ITEM_TEXTSTYLE_NORMAL
-      textscale .416
-      style WINDOW_STYLE_EMPTY 
-      rect 472 40 128 20
-      textalignx 128 
-      textaligny 20 
-      textalign ITEM_ALIGN_RIGHT   
-      backcolor 0 0 0 0
-      forecolor 1 1 1 1
-      visible 1
-      action
-      {
-        play "sound/misc/kcaction.wav"; 
-        close main; 
-        open credit
-      } 
-    }
-
-    itemDef
-    {
-      name mainmenu
       text "Mods"
       type ITEM_TYPE_BUTTON
       style WINDOW_STYLE_EMPTY 
       textstyle ITEM_TEXTSTYLE_NORMAL
       textscale .416
-      rect 472 60 128 20 
+      rect 472 40 128 20 
       textalignx 128 
       textaligny 20 
       textalign ITEM_ALIGN_RIGHT   
@@ -122,6 +99,7 @@
         open mod
       }
     }
+
     itemDef
     {
       name mainmenu
@@ -129,7 +107,7 @@
       type ITEM_TYPE_BUTTON
       style WINDOW_STYLE_EMPTY
       textstyle ITEM_TEXTSTYLE_NORMAL
-      rect 472 80 128 20
+      rect 472 60 128 20
       textalignx 128 
       textaligny 20 
       textscale .416
diff --git a/ui/quitcredit.menu b/ui/quitcredit.menu
index 7f83df1a..cd9cff97 100644
--- a/ui/quitcredit.menu
+++ b/ui/quitcredit.menu
@@ -1,258 +1,52 @@
 #include "ui/menudef.h"
 
 {
-\\ QUIT CREDIT \\
-
-  menuDef {
-    	name "quitCredit"
-    	visible 0
-    	fullscreen 1
-    	rect 0 0 640 480
-    	background "menuback_a"
-    	focusColor 1 .67 0 1
-    	style 1
-    	border 1
-	onEsc { uiScript "quit" }
-	onOpen { setitemcolor fadebox backcolor 0 0 0 1 ; 
-	fadeout fadebox ; 
-	show grpidcredit }
-
-
-
-
-
-itemDef {
-      	name demo_only
-      	style WINDOW_STYLE_EMPTY
-	rect 0 0 640 480
-	type 1
-      	visible 1 
-	action { play "sound/misc/nomenu.wav" ; 
-	close quitCredit ;
-	uiScript "quit"  }
-    	}
+  \\ QUIT CREDIT \\
+
+  menuDef
+  {
+    name "quitCredit"
+    visible 0
+    fullscreen 1
+    rect 0 0 640 480
+    focusColor 1 .75 0 1
+    style 1
+    border 0
+    onEsc
+    {
+      uiScript "quit"
+    }
+
+    itemDef
+    {
+      name exitclickbox
+      style WINDOW_STYLE_FILLED
+      rect 0 0 640 480
+      type ITEM_TYPE_BUTTON
+      visible 1
+      backcolor 0 0 0 1
+      action
+      {
+        play "sound/misc/nomenu.wav";
+        close quitCredit;
+        uiScript "quit"
+      }
+    }
 
     
-
-// LEVEL SELECTION BAR	//
-
-itemDef {
-      	name teamarenaart
-	group grpidcredit
-	style WINDOW_STYLE_SHADER
-	background "ui/assets/teamarenaimage2.tga"
-      	rect 64 0 512 150
-      	visible 0 
-	decoration  	  
-    	}
-
-
-
- 
-
-itemDef {
-	name programming
-	group grpidcredit
-	style 0 
-	rect 0 160 640 30
-	textalign 1
-	textalignx 320
-	textaligny 10
-	textscale .35
-	text "PROGRAMMING: John Carmack,  Robert Duffy,  Jim Dose'"
-	forecolor  1 1 1 1
-	decoration 
-	visible 0
-	}
-
-itemDef {
-	name artist
-	group grpidcredit
-	style 0 
-	rect 0 190 640 30
-	textalign 1
-	textalignx 320
-	textaligny 10
-	textscale .35
-	text "ART:   Adrian Carmack, Kevin Cloud, Kenneth Scott, Seneca Menard, Fred Nilsson  "
-	forecolor 1 1 1 1
-	decoration 
-	visible 0
-	}
-
-
-itemDef {
-	name levelDesign
-	group grpidcredit
-	style 0 
-	rect 0 220 640 30
-	textalign 1
-	textalignx 320
-	textaligny 10
-	textscale .35
-	text "LEVEL DESIGN:   Tim Willits,  Christian Antkow,  Paul Jaquays"
-	forecolor 1 1 1 1
-	decoration 
-	visible 0
-	}
-
-itemDef {
-	name gameDesign
-	group grpidcredit
-	style 0 
-	rect 0 250 640 30
-	textalign 1
-	textalignx 320
-	textaligny 10
-	textscale .35
-	text "GAME DESIGN:   Graeme Devine"
-	forecolor 1 1 1 1
-	decoration 
-	visible 0
-	}
-
-itemDef {
-	name ceo
-	group grpidcredit
-	style 0 
-	rect 0 280 640 30
-	textalign 1
-	textalignx 320
-	textaligny 10
-	textscale .35
-	text "CEO:   Todd Hollenshead"
-	forecolor 1 1 1 1
-	decoration 
-	visible 0
-	}
-
-itemDef {
-	name bizDev
-	group grpidcredit
-	style 0 
-	rect 0 310 640 30
-	textalign 1
-	textalignx 320
-	textaligny 10
-	textscale .35
-	text "BUSINESS DEVELOPMENT:   Marty Stratton"
-	forecolor 1 1 1 1
-	decoration 
-	visible 0
-	}
-
-itemDef {
-	name idMom
-	group grpidcredit
-	style 0 
-	rect 0 340 640 30
-	textalign 1
-	textalignx 320
-	textaligny 10
-	textscale .35
-	text "OFFICE MANAGER AND ID MOM:   Donna Jackson"
-	forecolor 1 1 1 1
-	decoration 
-	visible 0
-	}
-
-itemDef {
-	name devAssist
-	group grpidcredit
-	style 0 
-	rect 0 370 640 30
-	textalign 1
-	textalignx 320
-	textaligny 10
-	textscale .35
-	text "DEVELOPMENT ASSISTANCE:   Eric Webb"
-	forecolor 1 1 1 1
-	decoration 
-	visible 0
-	}
-
-
-itemDef {
-	name exitbttn
-      	group grpidcredit
-      	rect 255 420 130 26
-	type 1
-  	text "Click to Exit"
-	style WINDOW_STYLE_FILLED
-	background "ui/assets/button_back.tga"
-	textalign 1   	
-	textscale .25
-	textalignx 65
-	textaligny 20
-      	visible 0
-	decoration
-	backcolor .37 .1 .1 1
-      	forecolor 1 1 1 1
-	action { play "sound/misc/nomenu.wav" }
-	mouseEnter { setitemcolor exitbttn backcolor .1 .37 .1 1 }
-      	mouseExit { setitemcolor exitbttn backcolor .37 .1 .1 1 }	
-	}
-itemDef {
-      	name exitbttn
-	group grpidcredit
-	style WINDOW_STYLE_SHADER
-	background "ui/assets/framebutton.tga"
-	rect 255 420 130 26
-      	visible 0 
-	decoration  	  
-    	}
-
-itemDef {
-      	name exitbttn
-	group grpidcredit
-	style WINDOW_STYLE_SHADER
-	background "ui/assets/leftbutton.tga"
-      	rect 243 420 13 26
-      	visible 0 
-	decoration  	  
-    	}
-
-itemDef {
-      	name exitbttn
-	group grpidcredit
-	style WINDOW_STYLE_SHADER
-	background "ui/assets/rightbutton.tga"
-      	rect 384 420 13 26
-      	visible 0 
-	decoration  	  
-    	}
-
-itemDef {
-      	name copyright
-      	text "Quake III: Team Arena Copyright 2000 Id Software, Inc. All rights reserved"
-      	style 0
-      	textscale .25
-      	rect 0 440 640 40
-      	textalign 1	
-      	textaligny 32
-      	textalignx 320 
-      	forecolor .75 0 0 .75
-      	visible 1 
-      	decoration 
-	}
-
-
-itemDef {
-      	name fadebox
-      	style WINDOW_STYLE_FILLED
- 	background "ui/assets/fadebox.tga"
-	forecolor 0 0 0 1
-	backcolor 0 0 0 1
-	rect 0 0 640 480
-      	visible 1 
-	decoration
-    	}
-
-
-
-
-
-}
-
+    itemDef
+    {
+      name programming
+      group grpidcredit
+      rect 0 160 640 30
+      textalign 1
+      textalignx 320
+      textaligny 10
+      textscale .35
+      text "INSERT CREDITS HERE"
+      forecolor  1 1 1 1
+      decoration 
+      visible 1
+    }
+  }
 }
-}
\ No newline at end of file