* Work on joinserver menu

2 files changed, 229 insertions, 953 deletions

diff --git a/ui/joinserver.menu b/ui/joinserver.menu
index 70a2cf6b..1daeb6e1 100644
--- a/ui/joinserver.menu
+++ b/ui/joinserver.menu
@@ -13,15 +13,16 @@
     focusColor 1 .75 0 1
     outOfBoundsClick  
     style 0
-    onOpen { setitemcolor fadebox backcolor 0 0 0 1 ; 
-    fadeout fadebox ; 
-    uiScript UpdateFilter ;
-    hide lightning ; 
-    hide accept_alt ; 
-    show accept ;
-    hide back_alt ;
-    show back ;
-    hide grpmessage }
+    onOpen
+    {
+      uiScript UpdateFilter;
+      hide accept_alt; 
+      show accept;
+      hide back_alt;
+      show back;
+      hide grpmessage
+    }
+    
     onEsc { uiScript closeJoin }
 
     itemDef
@@ -34,24 +35,6 @@
       decoration
     }
 
-    //  top bar //
-
-/*    itemDef
-    {
-      name sourcebar
-      style 2
-      rect 0 20 640 40 
-      style 2
-      border 4
-      bordercolor 0.5 0.5 0.5 0.5
-      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 
-    }*/
-
     // DATE AND MESSAGE OF THE DAY  //
 
     itemDef
@@ -102,159 +85,163 @@
     }
 
 
-    // map selection
+    //  VIEW OPTIONS  //
 
-    itemDef {
+    itemDef
+    {
       name gametypefield
-      style 0 
+      style WINDOW_STYLE_EMPTY
       ownerdraw UI_NETSOURCE
-      rect 10 20 134 40 
-      textstyle 6
+      rect 10 20 128 26
       textalign ITEM_ALIGN_LEFT   
-      textalignx 2     
-      textaligny 30    
-      textscale .32     
+      textalignx 10    
+      textaligny 22    
+      textscale .4
       forecolor 1 1 1 1
+      backcolor .5 .5 .5 .5
       visible 1 
       action { play "sound/misc/kcaction.wav" }
-      mouseEnter { show message_source }
-      mouseExit { hide message_source }
     }
 
     itemDef
     {
-      name gametypefield
-      style 0 
-      textstyle 6
-      ownerdraw UI_NETFILTER
-      rect 149 20 181 40 
-      textalign ITEM_ALIGN_LEFT   
-      textalignx 2     
-      textaligny 30    
-      textscale .32     
+      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 { play "sound/misc/kcaction.wav" }
-      mouseEnter { show message_gamefilter }
-      mouseExit { hide message_gamefilter }
+      action
+      {
+        close joinserver;
+        open createserver
+      }        
     }
 
+    //  BUTTONS   //
+
     itemDef
     {
-      name gametypefield
-      style 0 
-      textstyle 6
-      text "Type:"
-      ownerdraw UI_JOINGAMETYPE
-      rect 330 20 160 40 
-      textalign ITEM_ALIGN_LEFT   
-      textalignx 2     
-      textaligny 30    
-      textscale .32     
+      name refreshSource
+      text "Get New List"
+      type ITEM_TYPE_BUTTON
+      textscale .4
+      style WINDOW_STYLE_EMPTY
+      rect 10 60 128 26
+      textalign ITEM_ALIGN_LEFT
+      textalignx 10
+      textaligny 22
+      backcolor .5 .5 .5 .5
       forecolor 1 1 1 1
-      border 0
-      bordercolor 0 0 0 0
       visible 1 
-      action { play "sound/misc/kcaction.wav" }
-      mouseEnter { show message_typefilter }
-      mouseExit { hide message_typefilter }
+      action
+      {
+        play "sound/misc/nomenu.wav";
+        uiScript RefreshServers
+      }       
     }
 
     itemDef
     {
-      name mappreview
-      style 0 
-      ownerdraw UI_NETMAPCINEMATIC
-      rect 505 5 128 96
-      border 1
-      bordercolor 0 .5 0 .5
+      name refreshFilter
+      text "Refresh List"
+      textscale .4
+      style WINDOW_STYLE_EMPTY
+      type ITEM_TYPE_BUTTON
+      rect 164 60 128 26
+      textalign ITEM_ALIGN_LEFT
+      textalignx 10
+      textaligny 22
+      backcolor .5 .5 .5 .5
+      forecolor 1 1 1 1
       visible 1 
+      action
+      {
+        play "sound/misc/nomenu.wav";
+        uiScript RefreshFilter
+      }        
     }
 
     itemDef
     {
-      name mappreview
-      style WINDOW_STYLE_FILLED 
-      rect 505 5 128 96 
-      border 1
-      bordercolor .5 .5 .5 .5
+      name viewEmpty
+      style WINDOW_STYLE_EMPTY
+      type ITEM_TYPE_YESNO
+      text "View Empty:"
+      cvar "ui_browserShowEmpty"
+      textscale .4
+      rect 328 20 128 26
+      textalign ITEM_ALIGN_LEFT
+      textalignx 10    
+      textaligny 22
+      forecolor 1 1 1 1
+      backcolor .5 .5 .5 .5
       visible 1 
-    }
-
-    itemDef
-    {
-      name horizontoalseparators
-      rect 10 132 604 20
-      style WINDOW_STYLE_FILLED
-      border 0
-      backcolor 0 0 .5 .25
-      visible 1
-      decoration
-    }
-
-    itemDef
-    {
-      name horizontoalseparators
-      rect 10 172 604 20
-      style WINDOW_STYLE_FILLED
-      border 0
-      backcolor 0 0 .5 .25
-      visible 1
-      decoration
-    }
-    
-    itemDef
-    {
-      name horizontoalseparators
-      rect 10 212 604 20
-      style WINDOW_STYLE_FILLED
-      border 0
-      backcolor 0 0 .5 .25
-      visible 1
-      decoration
+      action
+      {
+        play "sound/misc/nomenu.wav";
+        uiScript RefreshFilter
+      }
     }
     
     itemDef
     {
-      name horizontoalseparators
-      rect 10 252 604 20
-      style WINDOW_STYLE_FILLED
-      border 0
-      backcolor 0 0 .5 .25
-      visible 1
-      decoration
+      name viewFull
+      style WINDOW_STYLE_EMPTY
+      type ITEM_TYPE_YESNO
+      text "View Full:"
+      cvar "ui_browserShowFull"
+      textscale .4
+      rect 328 60 128 26
+      textalign ITEM_ALIGN_LEFT
+      textalignx 10    
+      textaligny 22
+      forecolor 1 1 1 1
+      backcolor .5 .5 .5 .5
+      visible 1 
+      action
+      {
+        uiScript RefreshFilter;
+        play "sound/misc/nomenu.wav"
+      }
     }
-    
+
+    // map selection
+
     itemDef
     {
-      name horizontoalseparators
-      rect 10 292 604 20
-      style WINDOW_STYLE_FILLED
-      border 0
-      backcolor 0 0 .5 .25
-      visible 1
-      decoration
+      name mappreview
+      style 0 
+      ownerdraw UI_NETMAPCINEMATIC
+      rect 502 5 128 96
+      border 1
+      bordercolor 0 .5 0 .5
+      visible 1 
     }
-    
+
     itemDef
     {
-      name horizontoalseparators
-      rect 10 332 604 20
-      style WINDOW_STYLE_FILLED
-      border 0
-      backcolor 0 0 .5 .25
-      visible 1
-      decoration
+      name mappreview
+      style WINDOW_STYLE_FILLED 
+      rect 502 5 128 96 
+      border 1
+      bordercolor .5 .5 .5 .5
+      visible 1 
     }
 
-
     //  COLUMNS //
 
     itemDef
     {
       name serverColumn
       group grpColumn
-      rect 10 128 265 235
+      rect 10 130 365 232
       style WINDOW_STYLE_FILLED
       border 1
       backcolor 0 0 0 0
@@ -268,7 +255,7 @@
     {
       name mapColumn
       group grpColumn
-      rect 275 128 125 235
+      rect 375 130 125 232
       style WINDOW_STYLE_FILLED
       border 1
       backcolor 0 0 0 0
@@ -282,7 +269,7 @@
     {
       name playerColumn
       group grpColumn
-      rect 400 128 60 235
+      rect 500 130 60 232
       style WINDOW_STYLE_FILLED
       border 1
       backcolor 0 0 0 0
@@ -292,25 +279,11 @@
       decoration
     }
     
-/*    itemDef
-    {
-      name typeColumn
-      group grpColumn
-      rect 460 128 100 235
-      style WINDOW_STYLE_FILLED
-      border 1
-      backcolor 0 0 0 0
-      bordersize 1
-      bordercolor .5 .5 .5 1
-      visible 1
-      decoration
-    }*/
-    
     itemDef
     {
       name pingColumn
       group grpColumn
-      rect 560 128 52 235
+      rect 560 130 52 232
       style WINDOW_STYLE_FILLED
       border 1
       backcolor 0 0 0 0
@@ -323,29 +296,26 @@
     itemDef
     {
       name serverlist
-      rect 10 128 620 235
+      rect 10 130 620 232
       type ITEM_TYPE_LISTBOX
-      style WINDOW_STYLE_FILLED
+      style WINDOW_STYLE_EMPTY
       elementwidth 120
       elementheight 20
       textscale .25
       elementtype LISTBOX_TEXT
       feeder FEEDER_SERVERS
       border 1
-      bordercolor .5 .5 .5 1
-      forecolor 1 1 1 1
-      backcolor 0 0 .7 .25
-      outlinecolor 0 1 0 .25
+      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 5
+      columns 4
         2   40  40  ITEM_ALIGN_LEFT
-        275 40  20  ITEM_ALIGN_LEFT
-        400 5   10  ITEM_ALIGN_LEFT
-        460 20  10  ITEM_ALIGN_LEFT
+        375 40  20  ITEM_ALIGN_LEFT
+        500 5   10  ITEM_ALIGN_LEFT
         560 20  20  ITEM_ALIGN_LEFT
 
-/*      mouseenter { setitemcolor serverlist bordercolor .7 0 0 1 }
-      mouseexit { setitemcolor serverlist bordercolor .5 .5 .5 .5 }*/
       doubleClick { uiScript JoinServer }
     }
 
@@ -359,14 +329,16 @@
       text "Server Name"
       type ITEM_TYPE_BUTTON
       textscale .25
-      style WINDOW_STYLE_FILLED
-      background "ui/assets/sorttab.tga"
-      rect 10 103 110 26 
-      textalign 1
-      textalignx 59   // center
-      textaligny 21
-      forecolor 1 1 1 1
-      backcolor .1 .1 .37 1
+      style WINDOW_STYLE_EMPTY
+      rect 10 103 365 26 
+      textalign ITEM_ALIGN_LEFT
+      textalignx 10
+      textaligny 18
+      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 
       action { play "sound/misc/nomenu.wav" ; 
       uiScript ServerSort 0 ; 
@@ -374,8 +346,6 @@
       setitemcolor server backcolor .1 .37 .1 1 ; 
       setitemcolor grpColumn backcolor 0 0 0 0 ; 
       setitemcolor serverColumn backcolor 0 1 0 .25 }
-/*      mouseEnter { show message_sort ; setitemcolor serverColumn bordercolor 1 0 0 1 }
-      mouseExit { hide message_sort ; setitemcolor serverColumn bordercolor .5 .5 .5 1 }  */
     }
 
     itemDef
@@ -385,14 +355,16 @@
       type ITEM_TYPE_BUTTON
       text "Map Name"
       textscale .25
-      style WINDOW_STYLE_FILLED
-      background "ui/assets/sorttab.tga"
-      rect 275 103 100 26
-      textalign 1
-      textalignx 50   // center
-      textaligny 21
-      backcolor .1 .1 .37 1
-      forecolor 1 1 1 1
+      style WINDOW_STYLE_EMPTY
+      rect 375 103 125 26
+      textalign ITEM_ALIGN_LEFT
+      textalignx 10
+      textaligny 18
+      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 
       action { play "sound/misc/nomenu.wav" ; 
       uiScript ServerSort 1 ; 
@@ -400,8 +372,6 @@
       setitemcolor map backcolor .1 .37 .1 1 ; 
       setitemcolor grpColumn backcolor 0 0 0 0 ; 
       setitemcolor mapColumn backcolor 0 1 0 .25 }
-/*      mouseEnter { show message_sort ; setitemcolor mapColumn bordercolor 1 0 0 1 }
-      mouseExit { hide message_sort ; setitemcolor mapColumn bordercolor .5 .5 .5 1 }       */
     }
 
     itemDef
@@ -411,14 +381,16 @@
       text "#Plyrs"
       type ITEM_TYPE_BUTTON
       textscale .25
-      style WINDOW_STYLE_FILLED
-      background "ui/assets/sorttab.tga"
-      rect 400 103 50 26
-      textalign 1
-      textalignx 25   // center
-      textaligny 21
-      forecolor 1 1 1 1
-      backcolor .1 .1 .37 1
+      style WINDOW_STYLE_EMPTY
+      rect 500 103 60 26
+      textalign ITEM_ALIGN_LEFT
+      textalignx 10
+      textaligny 18
+      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 
       action { play "sound/misc/nomenu.wav" ; 
       uiScript ServerSort 2 ;
@@ -426,38 +398,8 @@
       setitemcolor Players backcolor .1 .37 .1 1 ;  
       setitemcolor grpColumn backcolor 0 0 0 0 ; 
       setitemcolor playerColumn backcolor 0 1 0 .25 }
-/*      mouseEnter { show message_sort ; setitemcolor playerColumn bordercolor 1 0 0 1 }
-      mouseExit { hide message_sort ; setitemcolor playerColumn bordercolor .5 .5 .5 1 }      */
     }
 
-
-    itemDef
-    {
-      name Type
-      group grpTabs
-      text "Type"
-      textscale .25
-      type ITEM_TYPE_BUTTON
-      style WINDOW_STYLE_FILLED
-      background "ui/assets/sorttab.tga"
-      rect 460 103 60 26
-      textalign 1
-      textalignx 30   // center
-      textaligny 21
-      backcolor .1 .1 .37 1
-      forecolor 1 1 1 1
-      visible 1 
-      action { play "sound/misc/nomenu.wav" ; 
-      uiScript ServerSort 3 ;
-      setitemcolor grpTabs backcolor .1 .1 .37 1 ; 
-      setitemcolor Type backcolor .1 .37 .1 1 ;  
-      setitemcolor grpColumn backcolor 0 0 0 0 ; 
-      setitemcolor typeColumn backcolor 0 1 0 .25 }
-/*      mouseEnter { show message_sort ; setitemcolor typeColumn bordercolor 1 0 0 1 }
-      mouseExit { hide message_sort ; setitemcolor typeColumn bordercolor .5 .5 .5 1 }        */
-    }
-
-
     itemDef
     {
       name Ping
@@ -465,14 +407,16 @@
       text "Ping"
       type ITEM_TYPE_BUTTON
       textscale .25
-      style WINDOW_STYLE_FILLED
-      background "ui/assets/sorttab.tga"
-      rect 560 103 52 26
-      textalign 1
-      textalignx 26   // center
-      textaligny 21
-      backcolor .1 .1 .37 1
-      forecolor 1 1 1 1
+      style WINDOW_STYLE_EMPTY
+      rect 560 103 70 26
+      textalign ITEM_ALIGN_LEFT
+      textalignx 10
+      textaligny 18
+      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 
       action { play "sound/misc/nomenu.wav" ; 
       uiScript ServerSort 4 ;
@@ -480,222 +424,45 @@
       setitemcolor Ping backcolor .1 .37 .1 1 ;  
       setitemcolor grpColumn backcolor 0 0 0 0 ;
       setitemcolor pingColumn backcolor 0 1 0 .25 }
-/*      mouseEnter { show message_sort ; setitemcolor pingColumn bordercolor 1 0 0 1 }
-      mouseExit { hide message_sort ; setitemcolor pingColumn bordercolor .5 .5 .5 1 }    */
-    }
-
-
-    //  BUTTONS   //
-
-    itemDef
-    {
-      name refreshSource
-      text "Get New List"
-      type ITEM_TYPE_BUTTON
-      textscale .3
-      style WINDOW_STYLE_FILLED
-      //background "ui/assets/button_red.tga"
-      background "ui/assets/button_back.tga"
-      rect 16 67 105 26
-      textalign 1
-      textalignx 52   // center
-      textaligny 20
-      backcolor .37 .1 .1 1
-      forecolor 1 1 1 1
-      visible 1 
-/*      mouseEnter { show message_refreshSOurce ; setitemcolor refreshSource backcolor .1 .37 .1 1 }
-      mouseExit { hide message_refreshSource ; setitemcolor refreshSource backcolor .37 .1 .1 1 }*/
-      action { play "sound/misc/nomenu.wav" ; 
-      uiScript RefreshServers }       
-    }
-
-/*    itemDef
-    {
-      name refreshSource
-      style WINDOW_STYLE_SHADER
-      background "ui/assets/framebutton.tga"
-      rect 16 67 105 26
-      visible 1 
-      decoration      
-    }
-
-    itemDef
-    {
-      name refreshSource
-      style WINDOW_STYLE_SHADER
-      background "ui/assets/leftbutton.tga"
-      rect 4 67 13 26
-      visible 1 
-      decoration      
-    }
-    
-    itemDef
-    {
-      name refreshSource
-      style WINDOW_STYLE_SHADER
-      background "ui/assets/rightbutton.tga"
-      rect 120 67 13 26
-      visible 1 
-      decoration      
-    }*/
-
-    itemDef
-    {
-      name refreshFilter
-      text "Refresh List"
-      textscale .3
-      style WINDOW_STYLE_FILLED
-      type ITEM_TYPE_BUTTON
-      background "ui/assets/button_back.tga"
-      rect 149 67 94 26
-      textalign 1
-      textalignx 46   // center
-      textaligny 20
-      backcolor .37 .1 .1 1 
-      forecolor 1 1 1 1
-      visible 1 
-/*      mouseEnter { show message_refreshFilter ; setitemcolor refreshFilter backcolor .1 .37 .1 1 }
-      mouseExit { hide message_refreshFilter ; setitemcolor refreshFilter backcolor .37 .1 .1 1 }       */
-      action { play "sound/misc/nomenu.wav" ; 
-      uiScript RefreshFilter }        
-    }
-
-
-/*    itemDef
-    {
-      name refreshFilter
-      style WINDOW_STYLE_SHADER
-      background "ui/assets/framebutton.tga"
-      rect 149 67 94 26
-      visible 1 
-      decoration      
     }
 
 
     itemDef
     {
-      name refreshFilter
-      style WINDOW_STYLE_SHADER
-      background "ui/assets/leftbutton.tga"
-      rect 137 67 13 26
-      visible 1 
-      decoration      
-    }
-
-    itemDef
-    {
-      name refreshFilter
-      style WINDOW_STYLE_SHADER
-      background "ui/assets/rightbutton.tga"
-      rect 242 67 13 26
-      visible 1 
-      decoration      
-    }*/
-
-
-    itemDef
-    {
       name password
       text "Password"
       type ITEM_TYPE_BUTTON
-      textscale .3
+      textscale .4
       style WINDOW_STYLE_FILLED
-      background "ui/assets/button_back.tga"
       rect 20 395 92 26
       textalign 1
       textalignx 46   // center
-      textaligny 20
-      backcolor .37 .1 .1 1
+      textaligny 22
+      backcolor 0 0 0 1
       forecolor 1 1 1 1
       visible 1 
       action { play "sound/misc/kcaction.wav" ; 
       open password_popmenu }
-/*      mouseEnter { show message_password ; setitemcolor password backcolor .1 .37 .1 1 }
-      mouseExit { hide message_password ; setitemcolor password backcolor .37 .1 .1 1 }       */
-    }
-
-/*    itemDef
-    {
-      name password
-      style WINDOW_STYLE_SHADER
-      background "ui/assets/framebutton.tga"
-      rect 20 395 92 26
-      visible 1 
-      decoration      
-    }
-
-    itemDef
-    {
-      name password
-      style WINDOW_STYLE_SHADER
-      background "ui/assets/leftbutton.tga"
-      rect 14 395 7 26
-      visible 1 
-      decoration      
     }
 
     itemDef
     {
-      name password
-      style WINDOW_STYLE_SHADER
-      background "ui/assets/rightbutton.tga"
-      rect 111 395 7 26
-      visible 1 
-      decoration      
-    }*/
-
-
-    itemDef
-    {
       name createFavorite
       text "New Favorite"
       type ITEM_TYPE_BUTTON
-      textscale .3
+      textscale .4
       style WINDOW_STYLE_FILLED
-      background "ui/assets/button_back.tga"
       rect 148 395 92 26
       textalign 1
       textalignx 46   // center
-      textaligny 20
-      backcolor .37 .1 .1 1
+      textaligny 22
+      backcolor 0 0 0 1
       forecolor 1 1 1 1
       visible 1 
       action { play "sound/misc/kcaction.wav" ; 
       open createfavorite_popmenu }
-/*      mouseEnter { show message_createFavorite ; setitemcolor createFavorite backcolor .1 .37 .1 1 }
-      mouseExit { hide message_createFavorite ; setitemcolor createFavorite backcolor .37 .1 .1 1 }             */
     }
     
-/*    itemDef
-    {
-      name createFavorite
-      style WINDOW_STYLE_SHADER
-      background "ui/assets/framebutton.tga"
-      rect 148 395 92 26
-      visible 1 
-      decoration      
-    }
-
-    itemDef
-    {
-      name createFavorite
-      style WINDOW_STYLE_SHADER
-      background "ui/assets/leftbutton.tga"
-      rect 142 395 7 26
-      visible 1 
-      decoration      
-    }
-
-    itemDef
-    {
-      name createFavorite
-      style WINDOW_STYLE_SHADER
-      background "ui/assets/rightbutton.tga"
-      rect 239 395 7 26
-      visible 1 
-      decoration      
-    }*/
-
     itemDef
     {
       name addFavorite
@@ -713,272 +480,67 @@
       visible 1 
       action { play "sound/misc/nomenu.wav" ; 
       uiScript addFavorite }
-/*      mouseEnter { show message_addFavorite ; setitemcolor addFavorite backcolor .1 .37 .1 1 }
-      mouseExit { hide message_addFavorite ; setitemcolor addFavorite backcolor .37 .1 .1 1 }       */
-    }
-
-/*    itemDef
-    {
-      name addFavorite
-      style WINDOW_STYLE_SHADER
-      background "ui/assets/framebutton.tga"
-      rect 276 395 92 26
-      visible 1 
-      decoration      
-    }
-
-    itemDef
-    {
-      name addFavorite
-      style WINDOW_STYLE_SHADER
-      background "ui/assets/leftbutton.tga"
-      rect 270 395 7 26
-      visible 1 
-      decoration      
     }
 
     itemDef
     {
-      name addFavorite
-      style WINDOW_STYLE_SHADER
-      background "ui/assets/rightbutton.tga"
-      rect 367 395 7 26
-      visible 1 
-      decoration      
-    }*/
-
-    itemDef
-    {
       name delfavorite
       text "Del. Favorite"
       type ITEM_TYPE_BUTTON
-      textscale .3
+      textscale .4
       style WINDOW_STYLE_FILLED
       ownerdrawFlag UI_SHOW_FAVORITESERVERS
-      background "ui/assets/button_back.tga"
       rect 276 395 92 26
       textalign 1
       textalignx 46   // center
-      textaligny 20
-      backcolor .37 .1 .1 1
+      textaligny 22
+      backcolor 0 0 0 1
       forecolor 1 1 1 1
       visible 1 
       action { play "sound/misc/nomenu.wav" ; 
       uiScript DeleteFavorite ; uiScript UpdateFilter }
-/*      mouseEnter { show message_delFavorite ; setitemcolor delfavorite backcolor .1 .37 .1 1 }
-      mouseExit { hide message_delFavorite ; setitemcolor delfavorite backcolor .37 .1 .1 1 }       */
     }
     
-/*    itemDef
-    {
-      name delfavorite
-      style WINDOW_STYLE_SHADER
-      ownerdrawFlag UI_SHOW_FAVORITESERVERS
-      background "ui/assets/framebutton.tga"
-      rect 276 395 92 26
-      visible 1 
-      decoration      
-    }
-
-    itemDef
-    {
-      name delfavorite
-      style WINDOW_STYLE_SHADER
-      ownerdrawFlag UI_SHOW_FAVORITESERVERS
-      background "ui/assets/leftbutton.tga"
-      rect 270 395 7 26
-      visible 1 
-      decoration      
-    }
-
-    itemDef
-    {
-      name delfavorite
-      style WINDOW_STYLE_SHADER
-      ownerdrawFlag UI_SHOW_FAVORITESERVERS
-      background "ui/assets/rightbutton.tga"
-      rect 367 395 7 26
-      visible 1 
-      decoration      
-    }*/
-
-
-
-
-
     itemDef
     {
       name serverinfo
       text "Server Info"
       type ITEM_TYPE_BUTTON
-      textscale .3
+      textscale .4
       style WINDOW_STYLE_FILLED
-      background "ui/assets/button_back.tga"
       rect 404 395 92 26
       textalign 1
       textalignx 46   // center
-      textaligny 20
-      backcolor .37 .1 .1 1
+      textaligny 22
+      backcolor 0 0 0 1
       forecolor 1 1 1 1
       visible 1 
       action { play "sound/misc/kcaction.wav" ; 
       open serverinfo_popmenu }
-/*      mouseEnter { show message_serverinfo ; setitemcolor serverinfo backcolor .1 .37 .1 1 }
-      mouseExit { hide message_serverinfo ; setitemcolor serverinfo backcolor .37 .1 .1 1 }       */
     }
     
-/*    itemDef
-    {
-      name serverinfo
-      style WINDOW_STYLE_SHADER
-      background "ui/assets/framebutton.tga"
-      rect 404 395 92 26
-      visible 1 
-      decoration      
-    }
-
-    itemDef
-    {
-      name serverinfo
-      style WINDOW_STYLE_SHADER
-      background "ui/assets/leftbutton.tga"
-      rect 398 395 7 26
-      visible 1 
-      decoration      
-    }
-
-    itemDef
-    {
-      name serverinfo
-      style WINDOW_STYLE_SHADER
-      background "ui/assets/rightbutton.tga"
-      rect 495 395 7 26
-      visible 1 
-      decoration      
-    }*/
-
     itemDef
     {
       name findplayer
       text "Find Friend"
       type ITEM_TYPE_BUTTON
-      textscale .3
+      textscale .4
       style WINDOW_STYLE_FILLED
-      background "ui/assets/button_back.tga"
       rect 532 395 92 26
       textalign 1
       textalignx 46   // center
-      textaligny 20
-      backcolor .37 .1 .1 1
+      textaligny 22
+      backcolor 0 0 0 1
       forecolor 1 1 1 1
       visible 1 
       action { play "sound/misc/kcaction.wav" ; 
       open findplayer_popmenu }
-/*      mouseEnter { show message_findplayer ; setitemcolor findplayer backcolor .1 .37 .1 1 }
-      mouseExit { hide message_findplayer ; setitemcolor findplayer backcolor .37 .1 .1 1 }       */
     }
     
-/*    itemDef
-    {
-      name serverinfo
-      style WINDOW_STYLE_SHADER
-      background "ui/assets/framebutton.tga"
-      rect 532 395 92 26
-      visible 1 
-      decoration      
-    }
-
-    itemDef
-    {
-      name serverinfo
-      style WINDOW_STYLE_SHADER
-      background "ui/assets/leftbutton.tga"
-      rect 526 395 7 26
-      visible 1 
-      decoration      
-    }
-
-    itemDef
-    {
-      name serverinfo
-      style WINDOW_STYLE_SHADER
-      background "ui/assets/rightbutton.tga"
-      rect 623 395 7 26
-      visible 1 
-      decoration      
-    }*/
-
-
-    //  VIEW OPTIONS  //
-
-    itemDef
-    {
-      name viewEmpty
-      type ITEM_TYPE_YESNO
-      text "View Empty:"
-
-      cvar "ui_browserShowEmpty"
-      textscale .25
-      rect 262 71 125 20
-      textalign 0
-      textalignx 0    
-      textaligny 17
-      forecolor 1 1 1 1
-      visible 1 
-      action { play "sound/misc/nomenu.wav" ;
-      uiScript RefreshFilter }
-      mouseEnter { show message_viewEmpty }
-      mouseExit { hide message_viewEmpty }        
-    }
-    
-    itemDef
-    {
-      name viewEmpty
-      type 11
-      text "View Full:"
-      cvar "ui_browserShowFull"
-      textscale .25
-      rect 387 71 125 20
-      textalign 0
-      textalignx 0    
-      textaligny 17
-      forecolor 1 1 1 1
-      visible 1 
-      action { uiScript RefreshFilter ; 
-      play "sound/misc/nomenu.wav" }
-      mouseEnter { show message_viewFull }
-      mouseExit { hide message_viewFull }       
-    }
-
-
-
 
 
     // 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.5
-      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
@@ -986,8 +548,17 @@
       background "ui/assets/backarrow.tga"
       rect 16 424 50 50 
       visible 1 
-      action { close joinserver ; open main }
-      mouseEnter { hide back ; show back_alt ; show message_back }
+      action
+      {
+        close joinserver;
+        open main
+      }
+      
+      mouseEnter
+      {
+        hide back;
+        show back_alt
+      }
     }
 
     itemDef
@@ -1000,8 +571,17 @@
       forecolor 1 1 1 1
       visible 0
       type ITEM_TYPE_BUTTON
-      mouseExit { hide back_alt ; show back ; hide message_back }   
-      action { close joinserver ; open main }   
+      mouseExit
+      {
+        hide back_alt;
+        show back
+      }
+      
+      action
+      {
+        close joinserver;
+        open main
+      }   
     }
 
 
@@ -1016,11 +596,17 @@
       backcolor 0 0 0 0
       forecolor 1 1 1 1
       visible 1 
-      mouseEnter { hide accept ; show accept_alt ; show message_accept }
+      mouseEnter
+      {
+        hide accept;
+        show accept_alt
+      }
+      
       action { uiScript JoinServer }
     }
 
-    itemDef {
+    itemDef
+    {
       name accept_alt
       style WINDOW_STYLE_SHADER
       rect 574 424 50 50
@@ -1030,301 +616,13 @@
       forecolor 1 1 1 1
       visible 0  
       type ITEM_TYPE_BUTTON 
-      mouseExit { hide accept_alt ; show accept ; hide message_accept }  
+      mouseExit
+      {
+        hide accept_alt;
+        show accept
+      }
+      
       action { uiScript JoinServer }
     }
-
-/*    itemDef
-    {
-      name lightning
-      style 3
-      background lightningkc
-      rect 46 385 246 128     
-      visible 0 
-      decoration 
-    }
-    
-    itemDef
-    {
-      name lightning
-      style 3
-      background lightningkc
-      rect 345 385 246 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 "Join Arena"
-      forecolor 1 1 1 1
-      decoration 
-      visible 0
-    }
-    
-    itemDef
-    {
-      name message_source
-      group grpmessage
-      style 0 
-      rect 320 430 128 30
-      textalign 1
-      textstyle 1
-      textalignx 0
-      textaligny 25
-      textscale .416
-      text "Set Source"
-      forecolor 1 1 1 1
-      decoration 
-      visible 0
-    }
-
-    itemDef
-    {
-      name message_gamefilter
-      group grpmessage
-      style 0 
-      rect 320 430 128 30
-      textalign 1
-      textstyle 1
-      textalignx 0
-      textaligny 25
-      textscale .416
-      text "Set to Filter for Specific Game Mods"
-      forecolor 1 1 1 1
-      decoration 
-      visible 0
-    }
-    
-    itemDef
-    {
-      name message_typefilter
-      group grpmessage
-      style 0 
-      rect 320 430 128 30
-      textalign 1
-      textstyle 1
-      textalignx 0
-      textaligny 25
-      textscale .416
-      text "Set to Filter for Specific Game Types"
-      forecolor 1 1 1 1
-      decoration 
-      visible 0
-    }
-
-    itemDef
-    {
-      name message_sort
-      group grpmessage
-      style 0 
-      rect 320 430 128 30
-      textalign 1
-      textstyle 1
-      textalignx 0
-      textaligny 25
-      textscale .416
-      text "Sort Column"
-      forecolor 1 1 1 1
-      decoration 
-      visible 0
-    }
-    
-    itemDef
-    {
-      name message_refreshSource
-      group grpmessage
-      style 0 
-      rect 320 430 128 30
-      textalign 1
-      textstyle 1
-      textalignx 0
-      textaligny 25
-      textscale .416
-      text "Get Updated Server List from Current Source"
-      forecolor 1 1 1 1
-      decoration 
-      visible 0
-    }
-    
-    itemDef
-    {
-      name message_refreshFilter
-      group grpmessage
-      style 0 
-      rect 320 430 128 30
-      textalign 1
-      textstyle 1
-      textalignx 0
-      textaligny 25
-      textscale .416
-      text "Refresh All Currently Filtered Servers"
-      forecolor 1 1 1 1
-      decoration 
-      visible 0
-    }
-    
-    itemDef
-    {
-      name message_addFavorite
-      group grpmessage
-      style 0 
-      rect 320 430 128 30
-      textalign 1
-      textstyle 1
-      textalignx 0
-      textaligny 25
-      textscale .416
-      text "Add Selected Server to Favorites"
-      forecolor 1 1 1 1
-      decoration 
-      visible 0
-    }
-    
-    itemDef
-    {
-      name message_delFavorite
-      group grpmessage
-      style 0 
-      rect 320 430 128 30
-      textalign 1
-      textstyle 1
-      textalignx 0
-      textaligny 25
-      textscale .416
-      text "Delete Selected Server from Favorites"
-      forecolor 1 1 1 1
-      decoration 
-      visible 0
-    }
-    
-    itemDef
-    {
-      name message_createFavorite
-      group grpmessage
-      style 0 
-      rect 320 430 128 30
-      textalign 1
-      textstyle 1
-      textalignx 0
-      textaligny 25
-      textscale .416
-      text "Enter IP Address of Favorite Server"
-      forecolor 1 1 1 1
-      decoration 
-      visible 0
-    }
-    
-    itemDef
-    {
-      name message_addfilter
-      group grpmessage
-      style 0 
-      rect 320 430 128 30
-      textalign 1
-      textstyle 1
-      textalignx 0
-      textaligny 25
-      textscale .416
-      text "Enter Four Letter Filter and Description"
-      forecolor 1 1 1 1
-      decoration 
-      visible 0
-    }
-    
-    itemDef
-    {
-      name message_password
-      group grpmessage
-      style 0 
-      rect 320 430 128 30
-      textalign 1
-      textstyle 1
-      textalignx 0
-      textaligny 25
-      textscale .416
-      text "Enter Password for Protected Servers"
-      forecolor 1 1 1 1
-      decoration 
-      visible 0
-    }
-    
-    itemDef
-    {
-      name message_serverinfo
-      group grpmessage
-      style 0 
-      rect 320 430 128 30
-      textalign 1
-      textstyle 1
-      textalignx 0
-      textaligny 25
-      textscale .416
-      text "Display Server Information"
-      forecolor 1 1 1 1
-      decoration 
-      visible 0
-    }
-    
-    itemDef
-    {
-      name message_findplayer
-      group grpmessage
-      style 0 
-      rect 320 430 128 30
-      textalign 1
-      textstyle 1
-      textalignx 0
-      textaligny 25
-      textscale .416
-      text "Search Current Server List for Friends"
-      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
-    }
   }
 }
-
-
diff --git a/ui/main.menu b/ui/main.menu
index e73d790f..c09449dc 100644
--- a/ui/main.menu
+++ b/ui/main.menu
@@ -23,14 +23,14 @@
 
   menuDef
   {
-    name "main"
+    name main
     fullScreen MENU_TRUE        
     rect 0 0 640 480        // Size and position of the menu
     visible MENU_TRUE       // Visible on open
     focusColor 1 .75 0 1        // Menu focus color for text and items
 
     onOpen { uiScript stopRefresh ; playlooped "sounds/ui/heartbeat.wav" }	
-    onESC{open quit_popmenu}
+    onESC { open quit_popmenu }
   
     itemDef
     {
@@ -59,7 +59,7 @@
     itemDef
     {
       name mainmenu
-      text "Join Server"
+      text "Play!"
       type ITEM_TYPE_BUTTON
       style WINDOW_STYLE_EMPTY
       textstyle ITEM_TEXTSTYLE_NORMAL 
@@ -81,34 +81,12 @@
     itemDef
     {
       name mainmenu
-      text "Start Server"
-      type ITEM_TYPE_BUTTON
-      style WINDOW_STYLE_EMPTY 
-      textstyle ITEM_TEXTSTYLE_NORMAL
-      rect 472 40 128 20 
-      textalign ITEM_ALIGN_RIGHT   
-      textalignx 128 
-      textaligny 20 
-      textscale .416
-      forecolor 1 1 1 1  
-      visible 1 
-      action
-      {
-        play "sound/misc/kcaction.wav"; 
-        close main; 
-        open createserver
-      }
-    }
-
-    itemDef
-    {
-      name mainmenu
       text "Credits"
       type ITEM_TYPE_BUTTON
       textstyle ITEM_TEXTSTYLE_NORMAL
       textscale .416
       style WINDOW_STYLE_EMPTY 
-      rect 472 80 128 20
+      rect 472 40 128 20
       textalignx 128 
       textaligny 20 
       textalign ITEM_ALIGN_RIGHT   
@@ -131,7 +109,7 @@
       style WINDOW_STYLE_EMPTY 
       textstyle ITEM_TEXTSTYLE_NORMAL
       textscale .416
-      rect 472 100 128 20 
+      rect 472 60 128 20 
       textalignx 128 
       textaligny 20 
       textalign ITEM_ALIGN_RIGHT   
@@ -151,7 +129,7 @@
       type ITEM_TYPE_BUTTON
       style WINDOW_STYLE_EMPTY
       textstyle ITEM_TEXTSTYLE_NORMAL
-      rect 472 140 128 20
+      rect 472 80 128 20
       textalignx 128 
       textaligny 20 
       textscale .416