diff --git a/exgui/ExportFavorites.pas b/exgui/ExportFavorites.pas
index 38fba0d..bd17d78 100644
--- a/exgui/ExportFavorites.pas
+++ b/exgui/ExportFavorites.pas
@@ -8,6 +8,8 @@ uses
 
 type
   TfmExportFavorites = class(TForm)
+    cbIncludeSavedPasswords: TCheckBox;
+    bnOk: TButton;
   private
     { Private declarations }
   public
diff --git a/exgui/ImportFavorites.pas b/exgui/ImportFavorites.pas
index f217c32..294fe4d 100644
--- a/exgui/ImportFavorites.pas
+++ b/exgui/ImportFavorites.pas
@@ -8,6 +8,9 @@ uses
 
 type
   TfmImportFavorites = class(TForm)
+    rbAddToCurrent: TRadioButton;
+    rbReplaceCurrent: TRadioButton;
+    bnOk: TButton;
   private
     { Private declarations }
   public
diff --git a/exgui/Main.pas b/exgui/Main.pas
index bc92f92..4b7b6a8 100644
--- a/exgui/Main.pas
+++ b/exgui/Main.pas
@@ -9,6 +9,113 @@ uses
 
 type
   TfmMain = class(TForm)
+    sbMain: TStatusBar;
+    mmMain: TMainMenu;
+    miFile: TMenuItem;
+    miExportFavoritesList: TMenuItem;
+    N1: TMenuItem;
+    miExit: TMenuItem;
+    miServers: TMenuItem;
+    miAddServer: TMenuItem;
+    miHelp: TMenuItem;
+    miAbout: TMenuItem;
+    tbMain: TToolBar;
+    pmServers: TPopupMenu;
+    tsServerLists: TTabSet;
+    miTools: TMenuItem;
+    ilMain: TImageList;
+    tbSettings: TToolButton;
+    tbCopyServerInfo: TToolButton;
+    tbMasterServerUpdate: TToolButton;
+    tbAbout: TToolButton;
+    tbHelp: TToolButton;
+    tbConnect: TToolButton;
+    tbRefreshServer: TToolButton;
+    tbAddServer: TToolButton;
+    tbDeleteServer: TToolButton;
+    tbServerProperties: TToolButton;
+    XPManifest: TXPManifest;
+    pnBreakable: TPanel;
+    gbFilter: TGroupBox;
+    edFilterMode: TLabeledEdit;
+    edFilterMap: TLabeledEdit;
+    cbFilterEmpty: TCheckBox;
+    cbFilterPassworded: TCheckBox;
+    cbFilterFull: TCheckBox;
+    gbInfo: TGroupBox;
+    tbSpacer1: TToolButton;
+    tbSpacer2: TToolButton;
+    tbSpacer4: TToolButton;
+    tbSpacer5: TToolButton;
+    tbSpacer3: TToolButton;
+    miConnect: TMenuItem;
+    N2: TMenuItem;
+    miDeleteServer: TMenuItem;
+    miRefreshServer: TMenuItem;
+    N3: TMenuItem;
+    miMasterServerUpdate: TMenuItem;
+    N4: TMenuItem;
+    miCopyServerInfo: TMenuItem;
+    miServerProperties: TMenuItem;
+    miSettings: TMenuItem;
+    miHelpTopics: TMenuItem;
+    N6: TMenuItem;
+    miImportFavoritesList: TMenuItem;
+    piConnect: TMenuItem;
+    N7: TMenuItem;
+    piDeleteServer: TMenuItem;
+    piRefreshServer: TMenuItem;
+    N9: TMenuItem;
+    piCopyServerInfo: TMenuItem;
+    piServerProperties: TMenuItem;
+    pnLine: TPanel;
+    lbSIAddressLab: TLabel;
+    lbSIModeLab: TLabel;
+    lbSIMapLab: TLabel;
+    lbSIPlayersLab: TLabel;
+    lbSIPingLab: TLabel;
+    lbSIPing: TLabel;
+    lbSIPlayers: TLabel;
+    lbSIMap: TLabel;
+    lbSIMode: TLabel;
+    edSIAddress: TEdit;
+    pnSIDivider: TPanel;
+    chSIPingChart: TChart;
+    chSIPingLineChart: TFastLineSeries;
+    tmSIPingUpdate: TTimer;
+    miView: TMenuItem;
+    miFilterServerInfo: TMenuItem;
+    N10: TMenuItem;
+    miStatusBar: TMenuItem;
+    pmCopy: TPopupMenu;
+    piCopy: TMenuItem;
+    pnRight: TPanel;
+    pnPlayers: TPanel;
+    lbPlayers: TListBox;
+    hcPlayers: THeaderControl;
+    pnRules: TPanel;
+    lbRules: TListBox;
+    hcRules: THeaderControl;
+    pnMain: TPanel;
+    hcServers: THeaderControl;
+    lbServers: TListBox;
+    spRight: TSplitter;
+    Splitter1: TSplitter;
+    lblPlayerName: TLabel;
+    N11: TMenuItem;
+    miSamp: TMenuItem;
+    tmrQueryQueueProcess: TTimer;
+    edName: TEdit;
+    label_url: TLabel;
+    AddtoFavorites1: TMenuItem;
+    imLogo: TImage;
+    imPadlock: TImage;
+    imPadlocked: TImage;
+    imDownArrow: TImage;
+    imUpArrow: TImage;
+    tmrServerListUpdate: TTimer;
+    ToolButton1: TToolButton;
+
     procedure FormCreate(Sender: TObject);
     procedure lbServersDrawItem(Control: TWinControl; Index: Integer;
       Rect: TRect; State: TOwnerDrawState);
diff --git a/exgui/MasterUpdate.pas b/exgui/MasterUpdate.pas
index 81bf870..0805ebd 100644
--- a/exgui/MasterUpdate.pas
+++ b/exgui/MasterUpdate.pas
@@ -8,6 +8,8 @@ uses
 
 type
   TfmMasterUpdate = class(TForm)
+    lblPleaseWait: TLabel;
+    lblUpdating: TLabel;
   private
     { Private declarations }
   public
diff --git a/exgui/Rcon.pas b/exgui/Rcon.pas
index acefeca..c596ead 100644
--- a/exgui/Rcon.pas
+++ b/exgui/Rcon.pas
@@ -8,6 +8,8 @@ uses
 
 type
   TfmRcon = class(TForm)
+    edInput: TEdit;
+    moOutput: TMemo;
     procedure edInputKeyPress(Sender: TObject; var Key: Char);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormShow(Sender: TObject);
diff --git a/exgui/RconConfig.pas b/exgui/RconConfig.pas
index 590fcbb..78c2f50 100644
--- a/exgui/RconConfig.pas
+++ b/exgui/RconConfig.pas
@@ -8,6 +8,12 @@ uses
 
 type
   TfmRconConfig = class(TForm)
+    edHost: TEdit;
+    lbHost: TLabel;
+    lbPassword: TLabel;
+    edPassword: TEdit;
+    bnConnect: TButton;
+    bnCancel: TButton;
     procedure edHostKeyPress(Sender: TObject; var Key: Char);
     procedure bnCancelClick(Sender: TObject);
     procedure bnConnectClick(Sender: TObject);
diff --git a/exgui/ServerProperties.pas b/exgui/ServerProperties.pas
index 17957d1..b052e07 100644
--- a/exgui/ServerProperties.pas
+++ b/exgui/ServerProperties.pas
@@ -8,6 +8,26 @@ uses
 
 type
   TfmServerProperties = class(TForm)
+    lbAddressLab: TLabel;
+    lbPlayersLab: TLabel;
+    lbPingLab: TLabel;
+    lbModeLab: TLabel;
+    lbMapLab: TLabel;
+    lbMap: TLabel;
+    lbMode: TLabel;
+    lbPing: TLabel;
+    lbPlayers: TLabel;
+    edAddress: TEdit;
+    lbHostName: TLabel;
+    lbServerPassword: TLabel;
+    lbRconPassword: TLabel;
+    edServerPassword: TEdit;
+    edRconPassword: TEdit;
+    bnSave: TButton;
+    bnCancel: TButton;
+    bnConnect: TButton;
+    pmCopy: TPopupMenu;
+    piCopy: TMenuItem;
     procedure bnSaveClick(Sender: TObject);
     procedure bnCancelClick(Sender: TObject);
     procedure bnConnectClick(Sender: TObject);
diff --git a/exgui/Settings.pas b/exgui/Settings.pas
index a6b05ee..c50bffe 100644
--- a/exgui/Settings.pas
+++ b/exgui/Settings.pas
@@ -8,6 +8,14 @@ uses
 
 type
   TfmSettings = class(TForm)
+    bnSave: TButton;
+    bnCancel: TButton;
+    gbPasswords: TGroupBox;
+    cbSaveServerPasswords: TCheckBox;
+    cbSaveRconPasswords: TCheckBox;
+    edInstallLoc: TEdit;
+    Label1: TLabel;
+    sbBrowse: TSpeedButton;
     procedure bnSaveClick(Sender: TObject);
     procedure bnCancelClick(Sender: TObject);
     procedure FormCreate(Sender: TObject);