diff --git a/exgui/About.pas b/exgui/About.pas
index 75367e5..e198cce 100644
--- a/exgui/About.pas
+++ b/exgui/About.pas
@@ -7,7 +7,7 @@ uses
   Dialogs;
 
 type
-  TForm2 = class(TForm)
+  TfmAbout = class(TForm)
   private
     { Private declarations }
   public
@@ -15,7 +15,7 @@ type
   end;
 
 var
-  Form2: TForm2;
+  fmAbout: TfmAbout;
 
 implementation
 
diff --git a/exgui/ExportFavorites.pas b/exgui/ExportFavorites.pas
index 8fa0ec7..38fba0d 100644
--- a/exgui/ExportFavorites.pas
+++ b/exgui/ExportFavorites.pas
@@ -4,10 +4,10 @@ interface
 
 uses
   Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
-  Dialogs;
+  Dialogs, StdCtrls;
 
 type
-  TForm3 = class(TForm)
+  TfmExportFavorites = class(TForm)
   private
     { Private declarations }
   public
@@ -15,7 +15,7 @@ type
   end;
 
 var
-  Form3: TForm3;
+  fmExportFavorites: TfmExportFavorites;
 
 implementation
 
diff --git a/exgui/ImportFavorites.pas b/exgui/ImportFavorites.pas
index 8a3c306..f217c32 100644
--- a/exgui/ImportFavorites.pas
+++ b/exgui/ImportFavorites.pas
@@ -4,10 +4,10 @@ interface
 
 uses
   Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
-  Dialogs;
+  Dialogs, StdCtrls;
 
 type
-  TForm4 = class(TForm)
+  TfmImportFavorites = class(TForm)
   private
     { Private declarations }
   public
@@ -15,7 +15,7 @@ type
   end;
 
 var
-  Form4: TForm4;
+  fmImportFavorites: TfmImportFavorites;
 
 implementation
 
diff --git a/exgui/Main.pas b/exgui/Main.pas
index b3c38f0..12caf7a 100644
--- a/exgui/Main.pas
+++ b/exgui/Main.pas
@@ -4,10 +4,11 @@ interface
 
 uses
   Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
-  Dialogs;
+  Dialogs, ExtCtrls, XPMan, ImgList, Menus, ComCtrls, StdCtrls, TeEngine,
+  Series, TeeProcs, Chart, Tabs, ToolWin;
 
 type
-  TForm1 = class(TForm)
+  TfmMain = class(TForm)
   private
     { Private declarations }
   public
@@ -15,7 +16,7 @@ type
   end;
 
 var
-  Form1: TForm1;
+  fmMain: TfmMain;
 
 implementation
 
diff --git a/exgui/MasterUpdate.pas b/exgui/MasterUpdate.pas
index ddce1b1..81bf870 100644
--- a/exgui/MasterUpdate.pas
+++ b/exgui/MasterUpdate.pas
@@ -4,10 +4,10 @@ interface
 
 uses
   Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
-  Dialogs;
+  Dialogs, StdCtrls;
 
 type
-  TForm5 = class(TForm)
+  TfmMasterUpdate = class(TForm)
   private
     { Private declarations }
   public
@@ -15,7 +15,7 @@ type
   end;
 
 var
-  Form5: TForm5;
+  fmMasterUpdate: TfmMasterUpdate;
 
 implementation
 
diff --git a/exgui/RconConfig.pas b/exgui/RconConfig.pas
index 694f6cf..6437acb 100644
--- a/exgui/RconConfig.pas
+++ b/exgui/RconConfig.pas
@@ -4,10 +4,10 @@ interface
 
 uses
   Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
-  Dialogs;
+  Dialogs, StdCtrls;
 
 type
-  TForm6 = class(TForm)
+  TfmRconConfig = class(TForm)
   private
     { Private declarations }
   public
@@ -15,7 +15,7 @@ type
   end;
 
 var
-  Form6: TForm6;
+  fmRconConfig: TfmRconConfig;
 
 implementation
 
diff --git a/exgui/ServerProperties.pas b/exgui/ServerProperties.pas
index 6aab901..22b2110 100644
--- a/exgui/ServerProperties.pas
+++ b/exgui/ServerProperties.pas
@@ -4,10 +4,10 @@ interface
 
 uses
   Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
-  Dialogs;
+  Dialogs, Menus, StdCtrls;
 
 type
-  TForm7 = class(TForm)
+  TfmServerProperties = class(TForm)
   private
     { Private declarations }
   public
@@ -15,7 +15,7 @@ type
   end;
 
 var
-  Form7: TForm7;
+  fmServerProperties: TfmServerProperties;
 
 implementation
 
diff --git a/exgui/Settings.pas b/exgui/Settings.pas
index d2eba45..fad16ef 100644
--- a/exgui/Settings.pas
+++ b/exgui/Settings.pas
@@ -4,10 +4,10 @@ interface
 
 uses
   Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
-  Dialogs;
+  Dialogs, StdCtrls, Buttons;
 
 type
-  TForm8 = class(TForm)
+  TfmSettings = class(TForm)
   private
     { Private declarations }
   public
@@ -15,7 +15,7 @@ type
   end;
 
 var
-  Form8: TForm8;
+  fmSettings: TfmSettings;
 
 implementation
 
diff --git a/exgui/samp.dpr b/exgui/samp.dpr
index ac207ee..647f578 100644
--- a/exgui/samp.dpr
+++ b/exgui/samp.dpr
@@ -2,29 +2,30 @@ program samp;
 
 uses
   Forms,
-  Main in 'Main.pas' {Form1},
-  About in 'About.pas' {Form2},
-  ExportFavorites in 'ExportFavorites.pas' {Form3},
-  ImportFavorites in 'ImportFavorites.pas' {Form4},
-  MasterUpdate in 'MasterUpdate.pas' {Form5},
-  RconConfig in 'RconConfig.pas' {Form6},
-  ServerProperties in 'ServerProperties.pas' {Form7},
-  Settings in 'Settings.pas' {Form8},
-  wnd_webrunform in 'wnd_webrunform.pas' {Form9},
-  Rcon in 'Rcon.pas' {Form10};
+  Main in 'Main.pas' {fmMain},
+  About in 'About.pas' {fmAbout},
+  ExportFavorites in 'ExportFavorites.pas' {fmExportFavorites},
+  ImportFavorites in 'ImportFavorites.pas' {fmImportFavorites},
+  MasterUpdate in 'MasterUpdate.pas' {fmMasterUpdate},
+  RconConfig in 'RconConfig.pas' {fmRconConfig},
+  ServerProperties in 'ServerProperties.pas' {fmServerProperties},
+  Settings in 'Settings.pas' {fmSettings},
+  wnd_webrunform in 'wnd_webrunform.pas' {wnd_webrunform},
+  Rcon in 'Rcon.pas' {fmRcon};
 
 {$R *.res}
 
 begin
   Application.Initialize;
-  Application.CreateForm(TForm1, Form1);
-  Application.CreateForm(TForm2, Form2);
-  Application.CreateForm(TForm3, Form3);
-  Application.CreateForm(TForm4, Form4);
-  Application.CreateForm(TForm5, Form5);
-  Application.CreateForm(TForm6, Form6);
-  Application.CreateForm(TForm7, Form7);
-  Application.CreateForm(TForm8, Form8);
-  Application.CreateForm(TForm9, Form9);
+  Application.CreateForm(TfmMain, fmMain);
+  Application.CreateForm(TfmAbout, fmAbout);
+  Application.CreateForm(TfmExportFavorites, fmExportFavorites);
+  Application.CreateForm(TfmImportFavorites, fmImportFavorites);
+  Application.CreateForm(TfmMasterUpdate, fmMasterUpdate);
+  Application.CreateForm(TfmRconConfig, fmRconConfig);
+  Application.CreateForm(TfmServerProperties, fmServerProperties);
+  Application.CreateForm(TfmSettings, fmSettings);
+  Application.CreateForm(TfmRcon, fmRcon);
+  Application.CreateForm(Twnd_webrunform, wnd_webrunform);
   Application.Run;
 end.
diff --git a/exgui/wnd_webrunform.pas b/exgui/wnd_webrunform.pas
index 6263103..20987ae 100644
--- a/exgui/wnd_webrunform.pas
+++ b/exgui/wnd_webrunform.pas
@@ -4,10 +4,10 @@ interface
 
 uses
   Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
-  Dialogs;
+  Dialogs, StdCtrls, Buttons;
 
 type
-  TForm9 = class(TForm)
+  Twnd_webrunform = class(TForm)
   private
     { Private declarations }
   public
@@ -15,7 +15,7 @@ type
   end;
 
 var
-  Form9: TForm9;
+  wnd_webrunform: Twnd_webrunform;
 
 implementation