diff --git a/clientgui/BOINCGUI.vcproj b/clientgui/BOINCGUI.vcproj
index 3e90c91c08..bae5a0d02c 100644
--- a/clientgui/BOINCGUI.vcproj
+++ b/clientgui/BOINCGUI.vcproj
@@ -136,7 +136,16 @@
 				RelativePath=".\BOINCGUIApp.cpp">
 			</File>
 			<File
-				RelativePath=".\DlgHelpAbout.cpp">
+				RelativePath=".\DlgAbout.cpp">
+			</File>
+			<File
+				RelativePath=".\DlgAttachProject.cpp">
+			</File>
+			<File
+				RelativePath=".\DlgConnection.cpp">
+			</File>
+			<File
+				RelativePath=".\DlgOptions.cpp">
 			</File>
 			<File
 				RelativePath=".\MainDocument.cpp">
@@ -192,7 +201,16 @@
 				RelativePath=".\BOINCGUIApp.h">
 			</File>
 			<File
-				RelativePath=".\DlgHelpAbout.h">
+				RelativePath=".\DlgAbout.h">
+			</File>
+			<File
+				RelativePath=".\DlgAttachProject.h">
+			</File>
+			<File
+				RelativePath=".\DlgConnection.h">
+			</File>
+			<File
+				RelativePath=".\DlgOptions.h">
 			</File>
 			<File
 				RelativePath=".\Events.h">
diff --git a/clientgui/DlgAbout.cpp b/clientgui/DlgAbout.cpp
index 360defd696..172dce190f 100644
--- a/clientgui/DlgAbout.cpp
+++ b/clientgui/DlgAbout.cpp
@@ -21,66 +21,29 @@
 #pragma implementation "DlgAbout.h"
 #endif
 
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-////@begin includes
-////@end includes
-
+#include "stdwx.h"
 #include "DlgAbout.h"
+#include "res/boincsm.xpm"
 
-////@begin XPM images
-#include "boincsm.xpm"
-////@end XPM images
 
-/*!
- * CDlgHelpAbout type definition
- */
-
-IMPLEMENT_CLASS( CDlgHelpAbout, wxDialog )
-
-/*!
- * CDlgHelpAbout event table definition
- */
-
-BEGIN_EVENT_TABLE( CDlgHelpAbout, wxDialog )
-
-////@begin CDlgHelpAbout event table entries
-////@end CDlgHelpAbout event table entries
+IMPLEMENT_CLASS( CDlgAbout, wxDialog )
 
+BEGIN_EVENT_TABLE( CDlgAbout, wxDialog )
 END_EVENT_TABLE()
 
-/*!
- * CDlgHelpAbout constructors
- */
 
-CDlgHelpAbout::CDlgHelpAbout( )
+CDlgAbout::CDlgAbout( )
 {
 }
 
-CDlgHelpAbout::CDlgHelpAbout( wxWindow* parent, wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style )
+CDlgAbout::CDlgAbout( wxWindow* parent, wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style )
 {
     Create(parent, id, caption, pos, size, style);
 }
 
-/*!
- * CDlgHelpAbout creator
- */
 
-bool CDlgHelpAbout::Create( wxWindow* parent, wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style )
+bool CDlgAbout::Create( wxWindow* parent, wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style )
 {
-////@begin CDlgHelpAbout member initialisation
-////@end CDlgHelpAbout member initialisation
-
-////@begin CDlgHelpAbout creation
     SetExtraStyle(wxWS_EX_BLOCK_EVENTS);
     wxDialog::Create( parent, id, caption, pos, size, style );
 
@@ -88,26 +51,22 @@ bool CDlgHelpAbout::Create( wxWindow* parent, wxWindowID id, const wxString& cap
     GetSizer()->Fit(this);
     GetSizer()->SetSizeHints(this);
     Centre();
-////@end CDlgHelpAbout creation
+
     return TRUE;
 }
 
-/*!
- * Control creation for CDlgHelpAbout
- */
 
-void CDlgHelpAbout::CreateControls()
+void CDlgAbout::CreateControls()
 {    
-////@begin CDlgHelpAbout content construction
 
-    CDlgHelpAbout* item1 = this;
+    CDlgAbout* item1 = this;
 
     wxBoxSizer* item2 = new wxBoxSizer(wxVERTICAL);
     item1->SetSizer(item2);
     item1->SetAutoLayout(TRUE);
 
     wxStaticText* item3 = new wxStaticText;
-    item3->Create( item1, wxID_STATIC, _("BOINC Core Client"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE );
+    item3->Create( item1, wxID_STATIC, _T("BOINC Core Client"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE );
     item3->SetFont(wxFont(24, wxDEFAULT, wxNORMAL, wxBOLD, FALSE, _T("")));
     item2->Add(item3, 0, wxALIGN_CENTER_HORIZONTAL|wxALL|wxADJUST_MINSIZE, 5);
 
@@ -126,39 +85,39 @@ void CDlgHelpAbout::CreateControls()
     item4->Add(item7, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
 
     wxStaticText* item8 = new wxStaticText;
-    item8->Create( item1, wxID_STATIC, _("Version:"), wxDefaultPosition, wxDefaultSize, 0 );
+    item8->Create( item1, wxID_STATIC, _T("Version:"), wxDefaultPosition, wxDefaultSize, 0 );
     item7->Add(item8, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxADJUST_MINSIZE, 5);
 
     wxStaticText* item9 = new wxStaticText;
-    item9->Create( item1, wxID_STATIC, _("2.28"), wxDefaultPosition, wxDefaultSize, 0 );
+    item9->Create( item1, wxID_STATIC, _T("2.28"), wxDefaultPosition, wxDefaultSize, 0 );
     item7->Add(item9, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxADJUST_MINSIZE, 5);
 
     wxStaticText* item10 = new wxStaticText;
-    item10->Create( item1, wxID_STATIC, _("Licence type:"), wxDefaultPosition, wxDefaultSize, 0 );
+    item10->Create( item1, wxID_STATIC, _T("Licence type:"), wxDefaultPosition, wxDefaultSize, 0 );
     item7->Add(item10, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxADJUST_MINSIZE, 5);
 
     wxStaticText* item11 = new wxStaticText;
-    item11->Create( item1, wxID_STATIC, _("BOINC Public License"), wxDefaultPosition, wxDefaultSize, 0 );
+    item11->Create( item1, wxID_STATIC, _T("BOINC Public License"), wxDefaultPosition, wxDefaultSize, 0 );
     item7->Add(item11, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxADJUST_MINSIZE, 5);
 
     wxStaticText* item12 = new wxStaticText;
-    item12->Create( item1, wxID_STATIC, _("Copyright:"), wxDefaultPosition, wxDefaultSize, 0 );
+    item12->Create( item1, wxID_STATIC, _T("Copyright:"), wxDefaultPosition, wxDefaultSize, 0 );
     item7->Add(item12, 0, wxALIGN_RIGHT|wxALIGN_TOP|wxLEFT|wxRIGHT|wxADJUST_MINSIZE, 5);
 
     wxStaticText* item13 = new wxStaticText;
-    item13->Create( item1, wxID_STATIC, _("(C) 2004 University of California at Berkeley.\nAll Rights Reserved."), wxDefaultPosition, wxDefaultSize, 0 );
+    item13->Create( item1, wxID_STATIC, _T("(C) 2004 University of California at Berkeley.\nAll Rights Reserved."), wxDefaultPosition, wxDefaultSize, 0 );
     item7->Add(item13, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxADJUST_MINSIZE, 5);
 
     wxStaticText* item14 = new wxStaticText;
-    item14->Create( item1, wxID_STATIC, _("Berkeley Open Infrastructure for Network Computing"), wxDefaultPosition, wxDefaultSize, 0 );
+    item14->Create( item1, wxID_STATIC, _T("Berkeley Open Infrastructure for Network Computing"), wxDefaultPosition, wxDefaultSize, 0 );
     item2->Add(item14, 0, wxALIGN_CENTER_HORIZONTAL|wxALL|wxADJUST_MINSIZE, 5);
 
     wxStaticText* item15 = new wxStaticText;
-    item15->Create( item1, wxID_STATIC, _("A software platform for distributed computing using volunteered computer resources"), wxDefaultPosition, wxDefaultSize, 0 );
+    item15->Create( item1, wxID_STATIC, _T("A software platform for distributed computing using volunteered computer resources"), wxDefaultPosition, wxDefaultSize, 0 );
     item2->Add(item15, 0, wxALIGN_CENTER_HORIZONTAL|wxALL|wxADJUST_MINSIZE, 5);
 
     wxStaticText* item16 = new wxStaticText;
-    item16->Create( item1, wxID_STATIC, _("http://boinc.berkeley.edu/"), wxDefaultPosition, wxDefaultSize, 0 );
+    item16->Create( item1, wxID_STATIC, _T("http://boinc.berkeley.edu/"), wxDefaultPosition, wxDefaultSize, 0 );
     item2->Add(item16, 0, wxALIGN_CENTER_HORIZONTAL|wxALL|wxADJUST_MINSIZE, 5);
 
     wxStaticLine* item17 = new wxStaticLine;
@@ -170,14 +129,10 @@ void CDlgHelpAbout::CreateControls()
     item18->SetDefault();
     item2->Add(item18, 0, wxALIGN_RIGHT|wxALL, 5);
 
-////@end CDlgHelpAbout content construction
 }
 
-/*!
- * Should we show tooltips?
- */
 
-bool CDlgHelpAbout::ShowToolTips()
+bool CDlgAbout::ShowToolTips()
 {
     return TRUE;
 }
diff --git a/clientgui/DlgAbout.h b/clientgui/DlgAbout.h
index e292c6ac92..ac74c88862 100644
--- a/clientgui/DlgAbout.h
+++ b/clientgui/DlgAbout.h
@@ -24,55 +24,28 @@
 #pragma interface "DlgAbout.cpp"
 #endif
 
-/*!
- * Includes
- */
 
-////@begin includes
-#include "wx/statline.h"
-////@end includes
-
-/*!
- * Forward declarations
- */
-
-////@begin forward declarations
-////@end forward declarations
-
-/*!
- * Control identifiers
- */
-
-////@begin control identifiers
 #define ID_DIALOG 10000
 #define SYMBOL_CDLGHELPABOUT_STYLE wxCAPTION|wxRESIZE_BORDER|wxSYSTEM_MENU|wxCLOSE_BOX
 #define SYMBOL_CDLGHELPABOUT_TITLE _("About BOINC")
 #define SYMBOL_CDLGHELPABOUT_IDNAME ID_DIALOG
 #define SYMBOL_CDLGHELPABOUT_SIZE wxSize(400, 300)
 #define SYMBOL_CDLGHELPABOUT_POSITION wxDefaultPosition
-////@end control identifiers
-
-/*!
- * Compatibility
- */
 
 #ifndef wxCLOSE_BOX
 #define wxCLOSE_BOX 0x1000
 #endif
 
-/*!
- * CDlgHelpAbout class declaration
- */
 
-class CDlgHelpAbout: public wxDialog
+class CDlgAbout: public wxDialog
 {    
-    DECLARE_CLASS( CDlgHelpAbout )
+    DECLARE_CLASS( CDlgAbout )
     DECLARE_EVENT_TABLE()
 
 public:
     /// Constructors
-    CDlgHelpAbout( );
-    CDlgHelpAbout( wxWindow* parent, wxWindowID id = SYMBOL_CDLGHELPABOUT_IDNAME, const wxString& caption = SYMBOL_CDLGHELPABOUT_TITLE, const wxPoint& pos = SYMBOL_CDLGHELPABOUT_POSITION, const wxSize& size = SYMBOL_CDLGHELPABOUT_SIZE, long style = SYMBOL_CDLGHELPABOUT_STYLE );
+    CDlgAbout( );
+    CDlgAbout( wxWindow* parent, wxWindowID id = SYMBOL_CDLGHELPABOUT_IDNAME, const wxString& caption = SYMBOL_CDLGHELPABOUT_TITLE, const wxPoint& pos = SYMBOL_CDLGHELPABOUT_POSITION, const wxSize& size = SYMBOL_CDLGHELPABOUT_SIZE, long style = SYMBOL_CDLGHELPABOUT_STYLE );
 
     /// Creation
     bool Create( wxWindow* parent, wxWindowID id = SYMBOL_CDLGHELPABOUT_IDNAME, const wxString& caption = SYMBOL_CDLGHELPABOUT_TITLE, const wxPoint& pos = SYMBOL_CDLGHELPABOUT_POSITION, const wxSize& size = SYMBOL_CDLGHELPABOUT_SIZE, long style = SYMBOL_CDLGHELPABOUT_STYLE );
@@ -80,19 +53,8 @@ public:
     /// Creates the controls and sizers
     void CreateControls();
 
-////@begin CDlgHelpAbout event handler declarations
-
-////@end CDlgHelpAbout event handler declarations
-
-////@begin CDlgHelpAbout member function declarations
-
-////@end CDlgHelpAbout member function declarations
-
     /// Should we show tooltips?
     static bool ShowToolTips();
-
-////@begin CDlgHelpAbout member variables
-////@end CDlgHelpAbout member variables
 };
 
 #endif
diff --git a/clientgui/DlgAttachProject.cpp b/clientgui/DlgAttachProject.cpp
index efc7ca94f1..370f23f499 100644
--- a/clientgui/DlgAttachProject.cpp
+++ b/clientgui/DlgAttachProject.cpp
@@ -21,67 +21,33 @@
 #pragma implementation "DlgAttachProject.h"
 #endif
 
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-////@begin includes
-////@end includes
-
+#include "stdwx.h"
 #include "DlgAttachProject.h"
 
-////@begin XPM images
-////@end XPM images
-
-/*!
- * CDlgAttachProject type definition
- */
 
 IMPLEMENT_CLASS( CDlgAttachProject, wxDialog )
 
-/*!
- * CDlgAttachProject event table definition
- */
-
 BEGIN_EVENT_TABLE( CDlgAttachProject, wxDialog )
 
-////@begin CDlgAttachProject event table entries
-////@end CDlgAttachProject event table entries
-
 END_EVENT_TABLE()
 
-/*!
- * CDlgAttachProject constructors
- */
 
 CDlgAttachProject::CDlgAttachProject( )
 {
 }
 
+
 CDlgAttachProject::CDlgAttachProject( wxWindow* parent, wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style )
 {
     Create(parent, id, caption, pos, size, style);
 }
 
-/*!
- * CDlgAttachProject creator
- */
 
 bool CDlgAttachProject::Create( wxWindow* parent, wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style )
 {
-////@begin CDlgAttachProject member initialisation
     m_ProjectAddressCtrl = NULL;
     m_ProjectAccountKeyCtrl = NULL;
-////@end CDlgAttachProject member initialisation
 
-////@begin CDlgAttachProject creation
     SetExtraStyle(wxWS_EX_BLOCK_EVENTS);
     wxDialog::Create( parent, id, caption, pos, size, style );
 
@@ -89,17 +55,13 @@ bool CDlgAttachProject::Create( wxWindow* parent, wxWindowID id, const wxString&
     GetSizer()->Fit(this);
     GetSizer()->SetSizeHints(this);
     Centre();
-////@end CDlgAttachProject creation
+
     return TRUE;
 }
 
-/*!
- * Control creation for CDlgAttachProject
- */
 
 void CDlgAttachProject::CreateControls()
 {    
-////@begin CDlgAttachProject content construction
 
     CDlgAttachProject* item1 = this;
 
@@ -143,13 +105,8 @@ void CDlgAttachProject::CreateControls()
     item11->Create( item1, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
     item9->Add(item11, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5);
 
-////@end CDlgAttachProject content construction
 }
 
-/*!
- * Should we show tooltips?
- */
-
 bool CDlgAttachProject::ShowToolTips()
 {
     return TRUE;
diff --git a/clientgui/DlgAttachProject.h b/clientgui/DlgAttachProject.h
index 60f8cc9b16..c926ff2aa7 100644
--- a/clientgui/DlgAttachProject.h
+++ b/clientgui/DlgAttachProject.h
@@ -24,25 +24,7 @@
 #pragma interface "DlgAttachProject.cpp"
 #endif
 
-/*!
- * Includes
- */
 
-////@begin includes
-////@end includes
-
-/*!
- * Forward declarations
- */
-
-////@begin forward declarations
-////@end forward declarations
-
-/*!
- * Control identifiers
- */
-
-////@begin control identifiers
 #define ID_DIALOG 10000
 #define SYMBOL_CDLGATTACHPROJECT_STYLE wxCAPTION|wxRESIZE_BORDER|wxSYSTEM_MENU|wxCLOSE_BOX
 #define SYMBOL_CDLGATTACHPROJECT_TITLE _("Attach to Project")
@@ -51,19 +33,11 @@
 #define SYMBOL_CDLGATTACHPROJECT_POSITION wxDefaultPosition
 #define ID_PROJECTADDRESS 10001
 #define ID_PROJECTACCOUNTKEY 10002
-////@end control identifiers
-
-/*!
- * Compatibility
- */
 
 #ifndef wxCLOSE_BOX
 #define wxCLOSE_BOX 0x1000
 #endif
 
-/*!
- * CDlgAttachProject class declaration
- */
 
 class CDlgAttachProject: public wxDialog
 {    
@@ -81,21 +55,11 @@ public:
     /// Creates the controls and sizers
     void CreateControls();
 
-////@begin CDlgAttachProject event handler declarations
-
-////@end CDlgAttachProject event handler declarations
-
-////@begin CDlgAttachProject member function declarations
-
-////@end CDlgAttachProject member function declarations
-
     /// Should we show tooltips?
     static bool ShowToolTips();
 
-////@begin CDlgAttachProject member variables
     wxTextCtrl* m_ProjectAddressCtrl;
     wxTextCtrl* m_ProjectAccountKeyCtrl;
-////@end CDlgAttachProject member variables
 };
 
 #endif
diff --git a/clientgui/DlgConnection.cpp b/clientgui/DlgConnection.cpp
index f2be8ea531..8a2829d7d3 100644
--- a/clientgui/DlgConnection.cpp
+++ b/clientgui/DlgConnection.cpp
@@ -21,65 +21,31 @@
 #pragma implementation "DlgConnection.h"
 #endif
 
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-////@begin includes
-////@end includes
-
+#include "stdwx.h"
 #include "DlgConnection.h"
 
-////@begin XPM images
-////@end XPM images
-
-/*!
- * CDlgConnection type definition
- */
 
 IMPLEMENT_CLASS( CDlgConnection, wxDialog )
 
-/*!
- * CDlgConnection event table definition
- */
-
 BEGIN_EVENT_TABLE( CDlgConnection, wxDialog )
 
-////@begin CDlgConnection event table entries
-////@end CDlgConnection event table entries
-
 END_EVENT_TABLE()
 
-/*!
- * CDlgConnection constructors
- */
 
 CDlgConnection::CDlgConnection( )
 {
 }
 
+
 CDlgConnection::CDlgConnection( wxWindow* parent, wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style )
 {
     Create(parent, id, caption, pos, size, style);
 }
 
-/*!
- * CDlgConnection creator
- */
 
 bool CDlgConnection::Create( wxWindow* parent, wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style )
 {
-////@begin CDlgConnection member initialisation
-////@end CDlgConnection member initialisation
 
-////@begin CDlgConnection creation
     SetExtraStyle(wxWS_EX_BLOCK_EVENTS);
     wxDialog::Create( parent, id, caption, pos, size, style );
 
@@ -87,18 +53,13 @@ bool CDlgConnection::Create( wxWindow* parent, wxWindowID id, const wxString& ca
     GetSizer()->Fit(this);
     GetSizer()->SetSizeHints(this);
     Centre();
-////@end CDlgConnection creation
+
     return TRUE;
 }
 
-/*!
- * Control creation for CDlgConnection
- */
 
 void CDlgConnection::CreateControls()
 {    
-////@begin CDlgConnection content construction
-
     CDlgConnection* item1 = this;
 
     wxBoxSizer* item2 = new wxBoxSizer(wxVERTICAL);
@@ -126,13 +87,8 @@ void CDlgConnection::CreateControls()
     wxButton* item8 = new wxButton;
     item8->Create( item1, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
     item6->Add(item8, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5);
-
-////@end CDlgConnection content construction
 }
 
-/*!
- * Should we show tooltips?
- */
 
 bool CDlgConnection::ShowToolTips()
 {
diff --git a/clientgui/DlgConnection.h b/clientgui/DlgConnection.h
index c1b9571bfd..404b7bb90d 100644
--- a/clientgui/DlgConnection.h
+++ b/clientgui/DlgConnection.h
@@ -24,44 +24,18 @@
 #pragma interface "DlgConnection.cpp"
 #endif
 
-/*!
- * Includes
- */
 
-////@begin includes
-////@end includes
-
-/*!
- * Forward declarations
- */
-
-////@begin forward declarations
-////@end forward declarations
-
-/*!
- * Control identifiers
- */
-
-////@begin control identifiers
 #define ID_DIALOG 10000
 #define SYMBOL_CDLGCONNECTION_STYLE wxCAPTION|wxRESIZE_BORDER|wxSYSTEM_MENU|wxCLOSE_BOX
 #define SYMBOL_CDLGCONNECTION_TITLE _("Connection")
 #define SYMBOL_CDLGCONNECTION_IDNAME ID_DIALOG
 #define SYMBOL_CDLGCONNECTION_SIZE wxSize(400, 300)
 #define SYMBOL_CDLGCONNECTION_POSITION wxDefaultPosition
-////@end control identifiers
-
-/*!
- * Compatibility
- */
 
 #ifndef wxCLOSE_BOX
 #define wxCLOSE_BOX 0x1000
 #endif
 
-/*!
- * CDlgConnection class declaration
- */
 
 class CDlgConnection: public wxDialog
 {    
@@ -79,19 +53,8 @@ public:
     /// Creates the controls and sizers
     void CreateControls();
 
-////@begin CDlgConnection event handler declarations
-
-////@end CDlgConnection event handler declarations
-
-////@begin CDlgConnection member function declarations
-
-////@end CDlgConnection member function declarations
-
     /// Should we show tooltips?
     static bool ShowToolTips();
-
-////@begin CDlgConnection member variables
-////@end CDlgConnection member variables
 };
 
 #endif
diff --git a/clientgui/DlgOptions.cpp b/clientgui/DlgOptions.cpp
index 701fb80d57..8ce81887b4 100644
--- a/clientgui/DlgOptions.cpp
+++ b/clientgui/DlgOptions.cpp
@@ -18,74 +18,42 @@
 //
 
 #if defined(__GNUG__) && !defined(__APPLE__)
-#pragma implementation "DlgToolsOptions.h"
+#pragma implementation "DlgOptions.h"
 #endif
 
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
+#include "stdwx.h"
+#include "DlgOptions.h"
 
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
 
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
+IMPLEMENT_CLASS( CDlgOptions, wxDialog )
 
-////@begin includes
-////@end includes
+BEGIN_EVENT_TABLE( CDlgOptions, wxDialog )
 
-#include "DlgToolsOptions.h"
+    EVT_NOTEBOOK_PAGE_CHANGED( ID_NOTEBOOK, CDlgOptions::OnNotebookPageChanged )
+    EVT_UPDATE_UI( ID_NOTEBOOK, CDlgOptions::OnNotebookUpdate )
 
-////@begin XPM images
-////@end XPM images
+    EVT_CHECKBOX( ID_ENABLEHTTPPROXYCTRL, CDlgOptions::OnEnablehttpproxyctrlClick )
+    EVT_UPDATE_UI( ID_ENABLEHTTPPROXYCTRL, CDlgOptions::OnEnablehttpproxyctrlUpdate )
 
-/*!
- * CDlgToolsOptions type definition
- */
-
-IMPLEMENT_CLASS( CDlgToolsOptions, wxDialog )
-
-/*!
- * CDlgToolsOptions event table definition
- */
-
-BEGIN_EVENT_TABLE( CDlgToolsOptions, wxDialog )
-
-////@begin CDlgToolsOptions event table entries
-    EVT_NOTEBOOK_PAGE_CHANGED( ID_NOTEBOOK, CDlgToolsOptions::OnNotebookPageChanged )
-    EVT_UPDATE_UI( ID_NOTEBOOK, CDlgToolsOptions::OnNotebookUpdate )
-
-    EVT_CHECKBOX( ID_ENABLEHTTPPROXYCTRL, CDlgToolsOptions::OnEnablehttpproxyctrlClick )
-    EVT_UPDATE_UI( ID_ENABLEHTTPPROXYCTRL, CDlgToolsOptions::OnEnablehttpproxyctrlUpdate )
-
-    EVT_CHECKBOX( ID_ENABLESOCKSPROXYCTRL, CDlgToolsOptions::OnEnablesocksproxyctrlClick )
-    EVT_UPDATE_UI( ID_ENABLESOCKSPROXYCTRL, CDlgToolsOptions::OnEnablesocksproxyctrlUpdate )
-
-////@end CDlgToolsOptions event table entries
+    EVT_CHECKBOX( ID_ENABLESOCKSPROXYCTRL, CDlgOptions::OnEnablesocksproxyctrlClick )
+    EVT_UPDATE_UI( ID_ENABLESOCKSPROXYCTRL, CDlgOptions::OnEnablesocksproxyctrlUpdate )
 
 END_EVENT_TABLE()
 
-/*!
- * CDlgToolsOptions constructors
- */
 
-CDlgToolsOptions::CDlgToolsOptions( )
+CDlgOptions::CDlgOptions( )
 {
 }
 
-CDlgToolsOptions::CDlgToolsOptions( wxWindow* parent, wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style )
+
+CDlgOptions::CDlgOptions( wxWindow* parent, wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style )
 {
     Create(parent, id, caption, pos, size, style);
 }
 
-/*!
- * CDlgToolsOptions creator
- */
 
-bool CDlgToolsOptions::Create( wxWindow* parent, wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style )
+bool CDlgOptions::Create( wxWindow* parent, wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style )
 {
-////@begin CDlgToolsOptions member initialisation
     m_EnableHTTPProxyCtrl = NULL;
     m_HTTPAddressCtrl = NULL;
     m_HTTPPortCtrl = NULL;
@@ -96,9 +64,7 @@ bool CDlgToolsOptions::Create( wxWindow* parent, wxWindowID id, const wxString&
     m_SOCKSPortCtrl = NULL;
     m_SOCKSUsernameCtrl = NULL;
     m_SOCKPasswordCtrl = NULL;
-////@end CDlgToolsOptions member initialisation
 
-////@begin CDlgToolsOptions creation
     SetExtraStyle(wxWS_EX_BLOCK_EVENTS);
     wxDialog::Create( parent, id, caption, pos, size, style );
 
@@ -106,19 +72,14 @@ bool CDlgToolsOptions::Create( wxWindow* parent, wxWindowID id, const wxString&
     GetSizer()->Fit(this);
     GetSizer()->SetSizeHints(this);
     Centre();
-////@end CDlgToolsOptions creation
+
     return TRUE;
 }
 
-/*!
- * Control creation for CDlgToolsOptions
- */
 
-void CDlgToolsOptions::CreateControls()
+void CDlgOptions::CreateControls()
 {    
-////@begin CDlgToolsOptions content construction
-
-    CDlgToolsOptions* item1 = this;
+    CDlgOptions* item1 = this;
 
     wxBoxSizer* item2 = new wxBoxSizer(wxVERTICAL);
     item1->SetSizer(item2);
@@ -244,75 +205,52 @@ void CDlgToolsOptions::CreateControls()
     wxButton* item39 = new wxButton;
     item39->Create( item1, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
     item37->Add(item39, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
-
-////@end CDlgToolsOptions content construction
 }
 
-/*!
- * wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED event handler for ID_NOTEBOOK
- */
 
-void CDlgToolsOptions::OnNotebookPageChanged( wxNotebookEvent& event )
+void CDlgOptions::OnNotebookPageChanged( wxNotebookEvent& event )
 {
     // Insert custom code here
     event.Skip();
 }
 
-/*!
- * wxEVT_UPDATE_UI event handler for ID_NOTEBOOK
- */
 
-void CDlgToolsOptions::OnNotebookUpdate( wxUpdateUIEvent& event )
+void CDlgOptions::OnNotebookUpdate( wxUpdateUIEvent& event )
 {
     // Insert custom code here
     event.Skip();
 }
 
-/*!
- * wxEVT_COMMAND_CHECKBOX_CLICKED event handler for ID_ENABLEHTTPPROXYCTRL
- */
 
-void CDlgToolsOptions::OnEnablehttpproxyctrlClick( wxCommandEvent& event )
+void CDlgOptions::OnEnablehttpproxyctrlClick( wxCommandEvent& event )
 {
     // Insert custom code here
     event.Skip();
 }
 
-/*!
- * wxEVT_UPDATE_UI event handler for ID_ENABLEHTTPPROXYCTRL
- */
 
-void CDlgToolsOptions::OnEnablehttpproxyctrlUpdate( wxUpdateUIEvent& event )
+void CDlgOptions::OnEnablehttpproxyctrlUpdate( wxUpdateUIEvent& event )
 {
     // Insert custom code here
     event.Skip();
 }
 
-/*!
- * wxEVT_COMMAND_CHECKBOX_CLICKED event handler for ID_ENABLESOCKSPROXYCTRL
- */
 
-void CDlgToolsOptions::OnEnablesocksproxyctrlClick( wxCommandEvent& event )
+void CDlgOptions::OnEnablesocksproxyctrlClick( wxCommandEvent& event )
 {
     // Insert custom code here
     event.Skip();
 }
 
-/*!
- * wxEVT_UPDATE_UI event handler for ID_ENABLESOCKSPROXYCTRL
- */
 
-void CDlgToolsOptions::OnEnablesocksproxyctrlUpdate( wxUpdateUIEvent& event )
+void CDlgOptions::OnEnablesocksproxyctrlUpdate( wxUpdateUIEvent& event )
 {
     // Insert custom code here
     event.Skip();
 }
 
-/*!
- * Should we show tooltips?
- */
 
-bool CDlgToolsOptions::ShowToolTips()
+bool CDlgOptions::ShowToolTips()
 {
     return TRUE;
 }
diff --git a/clientgui/DlgOptions.h b/clientgui/DlgOptions.h
index ae39d318d9..9e29d58ecd 100644
--- a/clientgui/DlgOptions.h
+++ b/clientgui/DlgOptions.h
@@ -24,26 +24,7 @@
 #pragma interface "DlgOptions.cpp"
 #endif
 
-/*!
- * Includes
- */
 
-////@begin includes
-#include "wx/notebook.h"
-////@end includes
-
-/*!
- * Forward declarations
- */
-
-////@begin forward declarations
-////@end forward declarations
-
-/*!
- * Control identifiers
- */
-
-////@begin control identifiers
 #define ID_TOOLSOPTIONSDIALOG 10000
 #define SYMBOL_CDLGTOOLSOPTIONS_STYLE wxCAPTION|wxRESIZE_BORDER|wxSYSTEM_MENU|wxCLOSE_BOX
 #define SYMBOL_CDLGTOOLSOPTIONS_TITLE _("Options")
@@ -64,29 +45,21 @@
 #define ID_SOCKSPORTCTRL 10014
 #define ID_SOCKSUSERNAMECTRL 10015
 #define ID_SOCKSPASSWORDCTRL 10016
-////@end control identifiers
-
-/*!
- * Compatibility
- */
 
 #ifndef wxCLOSE_BOX
 #define wxCLOSE_BOX 0x1000
 #endif
 
-/*!
- * CDlgToolsOptions class declaration
- */
 
-class CDlgToolsOptions: public wxDialog
+class CDlgOptions: public wxDialog
 {    
-    DECLARE_CLASS( CDlgToolsOptions )
+    DECLARE_CLASS( CDlgOptions )
     DECLARE_EVENT_TABLE()
 
 public:
     /// Constructors
-    CDlgToolsOptions( );
-    CDlgToolsOptions( wxWindow* parent, wxWindowID id = SYMBOL_CDLGTOOLSOPTIONS_IDNAME, const wxString& caption = SYMBOL_CDLGTOOLSOPTIONS_TITLE, const wxPoint& pos = SYMBOL_CDLGTOOLSOPTIONS_POSITION, const wxSize& size = SYMBOL_CDLGTOOLSOPTIONS_SIZE, long style = SYMBOL_CDLGTOOLSOPTIONS_STYLE );
+    CDlgOptions( );
+    CDlgOptions( wxWindow* parent, wxWindowID id = SYMBOL_CDLGTOOLSOPTIONS_IDNAME, const wxString& caption = SYMBOL_CDLGTOOLSOPTIONS_TITLE, const wxPoint& pos = SYMBOL_CDLGTOOLSOPTIONS_POSITION, const wxSize& size = SYMBOL_CDLGTOOLSOPTIONS_SIZE, long style = SYMBOL_CDLGTOOLSOPTIONS_STYLE );
 
     /// Creation
     bool Create( wxWindow* parent, wxWindowID id = SYMBOL_CDLGTOOLSOPTIONS_IDNAME, const wxString& caption = SYMBOL_CDLGTOOLSOPTIONS_TITLE, const wxPoint& pos = SYMBOL_CDLGTOOLSOPTIONS_POSITION, const wxSize& size = SYMBOL_CDLGTOOLSOPTIONS_SIZE, long style = SYMBOL_CDLGTOOLSOPTIONS_STYLE );
@@ -94,8 +67,6 @@ public:
     /// Creates the controls and sizers
     void CreateControls();
 
-////@begin CDlgToolsOptions event handler declarations
-
     /// wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED event handler for ID_NOTEBOOK
     void OnNotebookPageChanged( wxNotebookEvent& event );
 
@@ -114,16 +85,9 @@ public:
     /// wxEVT_UPDATE_UI event handler for ID_ENABLESOCKSPROXYCTRL
     void OnEnablesocksproxyctrlUpdate( wxUpdateUIEvent& event );
 
-////@end CDlgToolsOptions event handler declarations
-
-////@begin CDlgToolsOptions member function declarations
-
-////@end CDlgToolsOptions member function declarations
-
     /// Should we show tooltips?
     static bool ShowToolTips();
 
-////@begin CDlgToolsOptions member variables
     wxCheckBox* m_EnableHTTPProxyCtrl;
     wxTextCtrl* m_HTTPAddressCtrl;
     wxTextCtrl* m_HTTPPortCtrl;
@@ -134,7 +98,6 @@ public:
     wxTextCtrl* m_SOCKSPortCtrl;
     wxTextCtrl* m_SOCKSUsernameCtrl;
     wxTextCtrl* m_SOCKPasswordCtrl;
-////@end CDlgToolsOptions member variables
 };
 
 #endif
diff --git a/clientgui/MainFrame.cpp b/clientgui/MainFrame.cpp
index d984601eb4..d0b82594e1 100644
--- a/clientgui/MainFrame.cpp
+++ b/clientgui/MainFrame.cpp
@@ -18,16 +18,17 @@
 //
 
 #include "stdwx.h"
-#include "boincguiapp.h"
-#include "mainframe.h"
-#include "baselistctrlview.h"
-#include "basewindowview.h"
-#include "messagesview.h"
-#include "projectsview.h"
-#include "resourceutilizationview.h"
-#include "transfersview.h"
-#include "workview.h"
-#include "events.h"
+#include "BOINCGUIApp.h"
+#include "MainFrame.h"
+#include "BaseListCtrlView.h"
+#include "BaseWindowView.h"
+#include "MessagesView.h"
+#include "ProjectsView.h"
+#include "ResourceUtilizationView.h"
+#include "TransfersView.h"
+#include "WorkView.h"
+#include "Events.h"
+#include "DlgAbout.h"
 
 
 IMPLEMENT_DYNAMIC_CLASS(CMainFrame, wxFrame)
@@ -205,6 +206,12 @@ bool CMainFrame::DeleteStatusbar() {
 
 
 void CMainFrame::OnAbout(wxCommandEvent &WXUNUSED(event)) {
+    CDlgAbout* pDlg = new CDlgAbout(this);
+
+    pDlg->ShowModal();
+
+    if (pDlg)
+        delete pDlg;
 }
 
 
diff --git a/clientgui/boincsm-preview.png b/clientgui/boincsm-preview.png
deleted file mode 100644
index 2fad59f4fa..0000000000
Binary files a/clientgui/boincsm-preview.png and /dev/null differ
diff --git a/clientgui/boincsm.xpm b/clientgui/res/boincsm.xpm
similarity index 100%
rename from clientgui/boincsm.xpm
rename to clientgui/res/boincsm.xpm