diff --git a/Projects/Simba/Makefile.win b/Projects/Simba/Makefile.win
index 94389ba..7ba8429 100644
--- a/Projects/Simba/Makefile.win
+++ b/Projects/Simba/Makefile.win
@@ -1,4 +1,4 @@
-#$ fpc  -MObjFPC -Scgi -O2 -OoREGVAR -gl -vewnhi -l -Fu../../Units/MMLCore/ -Fu../../Units/MMLAddon/ -Fu../../Units/PascalScript/ -Fu../../Units/Misc/ -Fu../../../lazarus/components/synedit/units/x86_64-linux/ -Fu../../../lazarus/ideintf/units/x86_64-linux/ -Fu../../../lazarus/lcl/units/x86_64-linux/ -Fu../../../lazarus/lcl/units/x86_64-linux/gtk2/ -Fu../../../lazarus/packager/units/x86_64-linux/ -Fu. -oSAMufasaGUI -dUseCThreads -dM_MEMORY_DEBUG -dLCL -dLCLgtk2 project1.lpr
+#$ fpc  -MObjFPC -Scgi -O2 -OoREGVAR -gl -vewnhi -l -Fu../../Units/MMLCore/ -Fu../../Units/MMLAddon/ -Fu../../Units/PascalScript/ -Fu../../Units/Misc/ -Fu../../../lazarus/components/synedit/units/x86_64-linux/ -Fu../../../lazarus/ideintf/units/x86_64-linux/ -Fu../../../lazarus/lcl/units/x86_64-linux/ -Fu../../../lazarus/lcl/units/x86_64-linux/gtk2/ -Fu../../../lazarus/packager/units/x86_64-linux/ -Fu. -oSAMufasaGUI -dUseCThreads -dM_MEMORY_DEBUG -dLCL -dLCLgtk2 Simba.lpr
 
 .PHONY: default clean
 
@@ -27,4 +27,4 @@ clean:
 	del $(binary) 
 
 $(binary):
-	$(CC) $(flags) $(units) $(lazarusunits) -o$(binary) $(defines) project1.lpr 
+	$(CC) $(flags) $(units) $(lazarusunits) -o$(binary) $(defines) Simba.lpr 
diff --git a/Projects/Simba/project1.ico b/Projects/Simba/Simba.ico
similarity index 100%
rename from Projects/Simba/project1.ico
rename to Projects/Simba/Simba.ico
diff --git a/Projects/Simba/project1.lpi b/Projects/Simba/Simba.lpi
similarity index 98%
rename from Projects/Simba/project1.lpi
rename to Projects/Simba/Simba.lpi
index d704128..ec8134f 100644
--- a/Projects/Simba/project1.lpi
+++ b/Projects/Simba/Simba.lpi
@@ -42,17 +42,17 @@
     </RequiredPackages>
     <Units Count="47">
       <Unit0>
-        <Filename Value="project1.lpr"/>
+        <Filename Value="Simba.lpr"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="project1"/>
+        <UnitName Value="Simba"/>
       </Unit0>
       <Unit1>
-        <Filename Value="simba.pas"/>
+        <Filename Value="simbaunit.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="SimbaForm"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="simba"/>
+        <UnitName Value="SimbaUnit"/>
       </Unit1>
       <Unit2>
         <Filename Value="../../Units/MMLCore/client.pas"/>
@@ -205,7 +205,7 @@
         <IsPartOfProject Value="True"/>
         <ComponentName Value="SettingsForm"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="simbasettings"/>
+        <UnitName Value="SimbaSettings"/>
       </Unit29>
       <Unit30>
         <Filename Value="../../Units/MMLAddon/PSInc/Wrappers/tpa.inc"/>
diff --git a/Projects/Simba/project1.lpr b/Projects/Simba/Simba.lpr
similarity index 90%
rename from Projects/Simba/project1.lpr
rename to Projects/Simba/Simba.lpr
index bc2ee9c..e772d32 100644
--- a/Projects/Simba/project1.lpr
+++ b/Projects/Simba/Simba.lpr
@@ -21,24 +21,24 @@
     SAMufasaGUI for the Mufasa Macro Library
 }                 
 
-program project1;
+program Simba;
 
 {$mode objfpc}{$H+}
 
-{$DEFINE SIMBA}
+{$DEFINE Simba}
 
 uses
   {$IFDEF UNIX}{$IFDEF UseCThreads}
   cthreads, cmem,
   {$ENDIF}{$ENDIF}
-  Interfaces, Forms, simba, colourhistory, About, internets, debugimage,
-  framefunctionlist, simpleanalyzer, updater, updateform, simbasettings,
+  Interfaces, Forms, SimbaUnit, colourhistory, About, internets, debugimage,
+  framefunctionlist, simpleanalyzer, updater, updateform, Simbasettings,
   libloader, mufasabase, v_ideCodeInsight, PSDump, v_ideCodeParser,
   v_AutoCompleteForm, CastaliaPasLex, CastaliaPasLexTypes, CastaliaSimplePasPar,
   CastaliaSimplePasParTypes, dcpbase64, mPasLex, v_Constants, v_MiscFunctions,
   extensionmanagergui, mmisc, bitmapconv;
 
-{$R project1.res}
+{$R Simba.res}
 
 begin
   Application.Title:='Simba';
diff --git a/Projects/Simba/project1.res b/Projects/Simba/Simba.res
similarity index 100%
rename from Projects/Simba/project1.res
rename to Projects/Simba/Simba.res
diff --git a/Projects/Simba/about.pas b/Projects/Simba/about.pas
index f50c54b..e47ada0 100644
--- a/Projects/Simba/about.pas
+++ b/Projects/Simba/about.pas
@@ -54,15 +54,15 @@ var
 
 implementation
 uses
-  simba;
+  SimbaUnit;
 { TAboutForm }
 
 procedure TAboutForm.FormCreate(Sender: TObject);
 begin
-  Self.Caption := format('About Simba r%d', [simba.SimbaVersion]);
-  Self.LabelRevision.Caption := format('Revision %d', [simba.SimbaVersion]);
+  Self.Caption := format('About Simba r%d', [SimbaUnit.SimbaVersion]);
+  Self.LabelRevision.Caption := format('Revision %d', [SimbaUnit.SimbaVersion]);
   AboutMemo.Lines.Add('Simba is released under the GPL license.');
-  AboutMemo.Lines.Add(format('You are currently using version: %d',[simba.SimbaVersion]));
+  AboutMemo.Lines.Add(format('You are currently using version: %d',[SimbaUnit.SimbaVersion]));
   AboutMemo.Lines.Add('');
   AboutMemo.Lines.Add('Please report bugs at: http://mufasa.villavu.com/mantis/');
 end;
diff --git a/Projects/Simba/colourhistory.pas b/Projects/Simba/colourhistory.pas
index 4522ce5..50f5361 100644
--- a/Projects/Simba/colourhistory.pas
+++ b/Projects/Simba/colourhistory.pas
@@ -104,7 +104,7 @@ var
 
 implementation
 uses
-  colour_conv, simba, lclintf, lcltype;
+  colour_conv, SimbaUnit, lclintf, lcltype;
 
 constructor TColourPickerObject.Create(C: Integer; P: TPoint; N: String);
 begin
diff --git a/Projects/Simba/debugimage.pas b/Projects/Simba/debugimage.pas
index bd21574..53b8dca 100644
--- a/Projects/Simba/debugimage.pas
+++ b/Projects/Simba/debugimage.pas
@@ -59,7 +59,7 @@ var
 implementation
 
 uses
-  MufasaTypes, math, graphtype, IntfGraphics,simba,lclintf,colour_conv,InterfaceBase;
+  MufasaTypes, math, graphtype, IntfGraphics,SimbaUnit,lclintf,colour_conv,InterfaceBase;
 { TDebugImgForm }
 
 procedure TDebugImgForm.FormCreate(Sender: TObject);
diff --git a/Projects/Simba/extensionmanager.pas b/Projects/Simba/extensionmanager.pas
index 4840ae1..8727080 100644
--- a/Projects/Simba/extensionmanager.pas
+++ b/Projects/Simba/extensionmanager.pas
@@ -38,7 +38,7 @@ var
 
 implementation
 uses
-  simba, settingssandbox,simbasettings;
+  SimbaUnit, settingssandbox,Simbasettings;
 
 procedure TExtensionManager.SetOnchange(const AValue: TNotifyEvent);
 var
diff --git a/Projects/Simba/framefunctionlist.pas b/Projects/Simba/framefunctionlist.pas
index 2e36f15..a83f6d2 100644
--- a/Projects/Simba/framefunctionlist.pas
+++ b/Projects/Simba/framefunctionlist.pas
@@ -72,7 +72,7 @@ type
 implementation
 
 uses
-  simba, Graphics, stringutil, simpleanalyzer,v_ideCodeParser,lclintf;
+  SimbaUnit, Graphics, stringutil, simpleanalyzer,v_ideCodeParser,lclintf;
 
 { TFunctionListFrame }
 
diff --git a/Projects/Simba/framescript.lfm b/Projects/Simba/framescript.lfm
index 5754b6d..888199e 100644
--- a/Projects/Simba/framescript.lfm
+++ b/Projects/Simba/framescript.lfm
@@ -5,6 +5,7 @@ object ScriptFrame: TScriptFrame
   Width = 397
   ClientHeight = 328
   ClientWidth = 397
+  LCLVersion = '0.9.29'
   TabOrder = 0
   DesignLeft = 159
   DesignTop = 420
diff --git a/Projects/Simba/framescript.pas b/Projects/Simba/framescript.pas
index ff2b26e..357c75e 100644
--- a/Projects/Simba/framescript.pas
+++ b/Projects/Simba/framescript.pas
@@ -93,7 +93,7 @@ type
 
 implementation
 uses
-  simba, SynEditTypes, LCLIntF, StrUtils,framefunctionlist;
+  SimbaUnit, SynEditTypes, LCLIntF, StrUtils,framefunctionlist;
 
 function WordAtCaret(e: TSynEdit; var sp, ep: Integer; Start: Integer = -1): string;
 var
diff --git a/Projects/Simba/psextension.pas b/Projects/Simba/psextension.pas
index d851f63..f6418ec 100644
--- a/Projects/Simba/psextension.pas
+++ b/Projects/Simba/psextension.pas
@@ -49,7 +49,7 @@ uses
   uPSC_extctrls,uPSC_menus, //Compile libs
   uPSR_std, uPSR_controls,uPSR_classes,uPSR_graphics,uPSR_stdctrls,uPSR_forms,
   uPSR_extctrls,uPSR_menus, //Runtime-libs
-  simba,updateform,settingssandbox,bitmaps,files,Dialogs, mmisc//Writeln
+  SimbaUnit,updateform,settingssandbox,bitmaps,files,Dialogs, mmisc//Writeln
   ;
 
 function TSimbaPSExtension.HookExists(const HookName: String): Boolean;
@@ -146,7 +146,7 @@ end;
 
 procedure TSimbaPSExtension.OnPSExecute(Sender: TPSScript);
 begin
-  Sender.SetVarToInstance('simba',SimbaForm);
+  Sender.SetVarToInstance('Simba',SimbaForm);
   Sender.SetVarToInstance('Simba_MainMenu',SimbaForm.MainMenu);
   Sender.SetPointerToData('Settings',@Self.Settings,Sender.FindNamedType('TMMLSettingsSandbox'));
 end;
diff --git a/Projects/Simba/simbasettings.pas b/Projects/Simba/simbasettings.pas
index bc5cb89..870e672 100644
--- a/Projects/Simba/simbasettings.pas
+++ b/Projects/Simba/simbasettings.pas
@@ -1,4 +1,4 @@
-unit simbasettings;
+unit Simbasettings;
 
 {$mode objfpc}{$H+}
 
diff --git a/Projects/Simba/simba.lfm b/Projects/Simba/simbaunit.lfm
similarity index 99%
rename from Projects/Simba/simba.lfm
rename to Projects/Simba/simbaunit.lfm
index a95f6b4..eda28b7 100644
--- a/Projects/Simba/simba.lfm
+++ b/Projects/Simba/simbaunit.lfm
@@ -4,7 +4,7 @@ object SimbaForm: TSimbaForm
   Top = 69
   Width = 660
   AllowDropFiles = True
-  Caption = 'THA FUKING SIMBA'
+  Caption = 'THA FUKING Simba'
   ClientHeight = 603
   ClientWidth = 660
   KeyPreview = True
diff --git a/Projects/Simba/simba.pas b/Projects/Simba/simbaunit.pas
similarity index 99%
rename from Projects/Simba/simba.pas
rename to Projects/Simba/simbaunit.pas
index 42eab89..5e5c0f3 100644
--- a/Projects/Simba/simba.pas
+++ b/Projects/Simba/simbaunit.pas
@@ -18,10 +18,10 @@
 	See the file COPYING, included in this distribution,
 	for details about the copyright.
 
-    simba/GUI for the Mufasa Macro Library
+    Simba/GUI for the Mufasa Macro Library
 }
 
-unit simba;
+unit SimbaUnit;
 
 {$undef EditButtons}
 {$Undef ProcessMessages} //Define this for processmessages in ThreadSafeCall
@@ -41,7 +41,7 @@ uses
   SynExportHTML, SynEditKeyCmds, SynEditHighlighter,
   SynEditMarkupHighAll, LMessages, Buttons,mmisc,
   stringutil,mufasatypesutil,mufasabase,  v_ideCodeParser,
-  about, framefunctionlist, ocr, updateform, simbasettings, psextension, virtualextension,
+  about, framefunctionlist, ocr, updateform, Simbasettings, psextension, virtualextension,
   extensionmanager, settingssandbox, v_ideCodeInsight, CastaliaPasLexTypes,
   CastaliaSimplePasPar, v_AutoCompleteForm, PSDump;
 
@@ -1130,7 +1130,7 @@ begin
   CreateSetting('Settings/Fonts/VersionLink', FontURL + 'Version');
   CreateSetting('Settings/Fonts/UpdateLink', FontURL + 'Fonts.tar.bz2');
 
-  CreateSetting('Settings/News/URL', 'http://simba.villavu.com/bin/news');
+  CreateSetting('Settings/News/URL', 'http://Simba.villavu.com/bin/news');
 
   {Creates the paths and returns the path}
   PluginsPath := CreateSetting('Settings/Plugins/Path', ExpandFileName(MainDir+ DS+ 'Plugins' + DS));
@@ -1895,7 +1895,7 @@ end;
 
 procedure TSimbaForm.MenuItemHandbookClick(Sender: TObject);
 begin
-  OpenURL('http://wizzup.org/static/simba/doc/ps_handbook/');
+  OpenURL('http://wizzup.org/static/Simba/doc/ps_handbook/');
 end;
 
 procedure TSimbaForm.MenuItemColourHistoryClick(Sender: TObject);
@@ -2374,7 +2374,7 @@ function TSimbaForm.GetSimbaNews: String;
 var
   t: TDownloadThread;
 begin
-  t := TDownloadThread.Create(LoadSettingDef('Settings/News/URL', 'http://simba.villavu.com/bin/news'),
+  t := TDownloadThread.Create(LoadSettingDef('Settings/News/URL', 'http://Simba.villavu.com/bin/news'),
                               @Result);
   t.Resume;
   while not t.done do
@@ -2804,7 +2804,7 @@ begin
       Exit;
   with TOpenDialog.Create(nil) do
   try
-    Filter:= 'Simba Files|*.simba;*.simb;*.cogat;*.mufa;*.txt;*.' +LoadSettingDef('Settings/Extensions/FileExtension','sex')+
+    Filter:= 'Simba Files|*.Simba;*.simb;*.cogat;*.mufa;*.txt;*.' +LoadSettingDef('Settings/Extensions/FileExtension','sex')+
              '|Any files|*.*';
     if Execute then
       if FileExists(filename) then
@@ -2886,14 +2886,14 @@ begin
   Result := false;
   with TSaveDialog.Create(nil) do
   try
-    filter := 'Simba Files|*.simba;*.simb;*.cogat;*.mufa;*.txt;*.' +
+    filter := 'Simba Files|*.Simba;*.simb;*.cogat;*.mufa;*.txt;*.' +
               LoadSettingDef('Settings/Extensions/FileExtension','sex')+
               '|Any files|*.*';
     if Execute then
     begin;
       if ExtractFileExt(FileName) = '' then
       begin;
-        ScriptFile := FileName + '.simba';
+        ScriptFile := FileName + '.Simba';
       end else
         ScriptFile := FileName;
       CurrScript.SynEdit.Lines.SaveToFile(ScriptFile);
diff --git a/Projects/Simba/updateform.pas b/Projects/Simba/updateform.pas
index ebb0d9d..c1dbc13 100644
--- a/Projects/Simba/updateform.pas
+++ b/Projects/Simba/updateform.pas
@@ -63,32 +63,32 @@ const
   DownloadSpeedTextEnded = 'Downloaded at %d kB/s';
   SimbaURL =     {$IFDEF WINDOWS}
                   {$IFDEF CPUI386}
-                  'http://simba.villavu.com/bin/Windows/x86/Stable/'
+                  'http://Simba.villavu.com/bin/Windows/x86/Stable/'
                   {$ELSE}
-                  'http://simba.villavu.com/bin/Windows/x86_64/Stable/'
+                  'http://Simba.villavu.com/bin/Windows/x86_64/Stable/'
                   {$ENDIF}
                 {$ELSE}
                   {$IFDEF CPUI386}
-                  'http://simba.villavu.com/bin/Linux/x86/Stable/'
+                  'http://Simba.villavu.com/bin/Linux/x86/Stable/'
                   {$ELSE}
-                  'http://simba.villavu.com/bin/Linux/x86_64/Stable/'
+                  'http://Simba.villavu.com/bin/Linux/x86_64/Stable/'
                   {$ENDIF}
                 {$ENDIF};
-  FontURL = 'http://simba.villavu.com/bin/Fonts/';
+  FontURL = 'http://Simba.villavu.com/bin/Fonts/';
 
 var
   SimbaUpdateForm: TSimbaUpdateForm;
 
 implementation
 uses
-  internets,  simba, simbasettings,lclintf;
+  internets,  SimbaUnit, Simbasettings,lclintf;
 
 function TSimbaUpdateForm.CanUpdate: Boolean;
 begin
   GetLatestSimbaVersion;
-  mDebugLn(format('Current Simba version: %d',[simba.SimbaVersion]));
+  mDebugLn(format('Current Simba version: %d',[SimbaUnit.SimbaVersion]));
   mDebugLn('Latest Simba Version: ' + IntToStr(FSimbaVersion));
-  Exit(simba.SimbaVersion < FSimbaVersion);
+  Exit(SimbaUnit.SimbaVersion < FSimbaVersion);
 end;
 
 function TSimbaUpdateForm.GetLatestFontVersion: integer;