diff --git a/SierraUp.cfg b/SierraUp.cfg
index f86e1f8..1a36350 100644
--- a/SierraUp.cfg
+++ b/SierraUp.cfg
@@ -1,7 +1,7 @@
 ProductName "Tribes2"
 DisplayName "Tribes 2"
 PatchFolder .\patch
-CurrentVersion 0.22017.0.0
+CurrentVersion 0.22047.0.0
 AutoStart
 MonitorPatch
 LaunchExe "tribes2.exe"
diff --git a/base/gui/guiProfiles.cs b/base/gui/guiProfiles.cs
index 268080d..e232e1b 100644
--- a/base/gui/guiProfiles.cs
+++ b/base/gui/guiProfiles.cs
@@ -463,9 +463,9 @@ new GuiControlProfile ("ShellServerBrowserProfile")
    fontColorHL = "6 245 215";
    fontColorNA = "128 128 128";
    fontColorSEL = "25 68 56";
-   fontColors[4] = "20 227 93";     // Mod base color
-   fontColors[5] = "40 247 113";    // Mod rollover color
-   fontColors[6] = "5 80 30";       // Mod selected color
+   fontColors[4] = "20 197 93";     // Mod base color
+   fontColors[5] = "40 217 113";    // Mod rollover color
+   fontColors[6] = "5 60 30";       // Mod selected color
    fontColors[7] = "108 108 108";   // Differing build base color       
    fontColors[8] = "168 168 168";   // Differing build rollover color
    fontColors[9] = "58 58 58";      // Differing build selected color
diff --git a/base/input.log b/base/input.log
index 524a98f..629f3b1 100644
--- a/base/input.log
+++ b/base/input.log
@@ -1,4 +1,4 @@
-Input log opened at Fri Mar 30 12:01:39 2001
+Input log opened at Mon Apr  2 10:53:48 2001
 
 Operating System:
   WinNT version 5.0
diff --git a/base/scripts/ChatGui.cs b/base/scripts/ChatGui.cs
index f530c86..d635fd0 100644
--- a/base/scripts/ChatGui.cs
+++ b/base/scripts/ChatGui.cs
@@ -9,7 +9,7 @@ $VERSION_STRING = "Dynamix IRC Chat 1.2.0";
 $ESCAPE_SEQ = "_-_";
 $IRCClient::serverList = GetIRCServerList(0);
 $IRCClient::serverCount = getRecordCount($IRCClient::serverList);
-$IRCClient::retries = -1;
+$IRCClient::retries = 0;
 if ($IRCClient::serverCount > 1)
    $IRCClient::serverIndex = getRandom($IRCClient::serverCount-1)-1;
 else
@@ -1112,30 +1112,31 @@ function IRCClient::connect()
    if (strcmp($IRCClient::state,IDIRC_CONNECTING_WAITING))
 	{
 		IRCClient::disconnect();
-      if($IRCClient::retries == -1 || $IRCClient::retries > 5)
-      {
-         $IRCClient::serverIndex++;
-			if ($IRCClient::serverIndex >= $IRCClient::serverCount)
-				$IRCClient::serverIndex = 0;
-			$IRCClient::serverAttempt++;
-         if ($IRCClient::serverCount == 0 || $IRCClient::serverAttempt > $IRCClient::serverCount)
-         {
+      $IRCClient::serverIndex++;
+		if ($IRCClient::serverIndex >= $IRCClient::serverCount)
+			$IRCClient::serverIndex = 0;
+		$IRCClient::serverAttempt++;
+		if ($IRCClient::serverAttempt > $IRCClient::serverCount)
+		{
+			$IRCClient::serverAttempt = 0;
+			$IRCClient::retries++;
+
+			if ($IRCClient::retries > 5)
+			{
             IRCClient::newMessage("","Unable to connect to IRC servers."); 
             IRCClient::notify(IDIRC_ERR_TIMEOUT);
             $IRCClient::state = IDIRC_DISCONNECTED;
-				$IRCClient::retries = -1;
+				$IRCClient::retries = 0;
             if($IRCClient::serverCount > 1)
                $IRCClient::serverIndex = getRandom($IRCClient::serverCount-1)-1;
             else
                $IRCClient::serverIndex = -1;
-				$IRCClient::serverAttempt = 0;
 
             return;
          }
-			else
-				$IRCClient::retries = 0;
-         $IRCClient::server = getField(getRecord($IRCClient::serverList, $IRCClient::serverIndex), 0);
-      }
+		}
+
+		$IRCClient::server = getField(getRecord($IRCClient::serverList, $IRCClient::serverIndex), 0);
 		IRCClient::newMessage("","Connecting to " @ $IRCClient::server);
 		$IRCClient::state = IDIRC_CONNECTING_SOCKET;
 		IRCClient::notify(IDIRC_CONNECTING_SOCKET);
@@ -1185,7 +1186,6 @@ function IRCTCP::onConnectFailed(%this)
    {
       IRCClient::newMessage("","Connection failed. The server did not respond."); 
 
-      $IRCClient::retries++;
    	IRCClient::connect();
    }
 }
@@ -1246,7 +1246,6 @@ function IRCClient::reconnect()
 
 	IRCClient::newMessage("","Attempting to reconnect.");
 
-   $IRCClient::retries++;
    IRCClient::connect();
 
    return true;
@@ -1613,7 +1612,8 @@ function IRCClient::onError(%prefix,%params)
 {
    IRCClient::newMessage($IRCClient::currentChannel,%params);
    IRCClient::notify(IDIRC_ERROR);
-   IRCClient::disconnect();
+	IRCClient::disconnect();
+   IRCClient::connect();
 }
 
 //------------------------------------------------------------------------------
diff --git a/base/version.cs b/base/version.cs
index 5938353..dd87d36 100644
--- a/base/version.cs
+++ b/base/version.cs
@@ -1 +1 @@
-buildVersion.setValue( "MAR 30, 2001, 11:54 AM (dmoore)" );
+buildVersion.setValue( "APR 2, 2001, 10:46 AM (dmoore)" );