diff --git a/lazproj/coedit.lpi b/lazproj/coedit.lpi
index 8e0f9ef7..681fbab0 100644
--- a/lazproj/coedit.lpi
+++ b/lazproj/coedit.lpi
@@ -162,180 +162,180 @@
         <UnitName Value="ce_common"/>
       </Unit2>
       <Unit3>
-        <Filename Value="..\src\ce_customtools.pas"/>
-        <IsPartOfProject Value="True"/>
-        <UnitName Value="ce_customtools"/>
-      </Unit3>
-      <Unit4>
         <Filename Value="..\src\ce_d2syn.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="ce_d2syn"/>
-      </Unit4>
-      <Unit5>
+      </Unit3>
+      <Unit4>
         <Filename Value="..\src\ce_dcd.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="ce_dcd"/>
-      </Unit5>
-      <Unit6>
+      </Unit4>
+      <Unit5>
         <Filename Value="..\src\ce_dlang.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="ce_dlang"/>
-      </Unit6>
-      <Unit7>
+      </Unit5>
+      <Unit6>
         <Filename Value="..\src\ce_dlangutils.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="ce_dlangutils"/>
-      </Unit7>
-      <Unit8>
+      </Unit6>
+      <Unit7>
         <Filename Value="..\src\ce_dmdwrap.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="ce_dmdwrap"/>
-      </Unit8>
-      <Unit9>
+      </Unit7>
+      <Unit8>
         <Filename Value="..\src\ce_editor.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="CEEditorWidget"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="ce_editor"/>
-      </Unit9>
-      <Unit10>
+      </Unit8>
+      <Unit9>
         <Filename Value="..\src\ce_interfaces.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="ce_interfaces"/>
-      </Unit10>
-      <Unit11>
+      </Unit9>
+      <Unit10>
         <Filename Value="..\src\ce_libman.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="ce_libman"/>
-      </Unit11>
-      <Unit12>
+      </Unit10>
+      <Unit11>
         <Filename Value="..\src\ce_libmaneditor.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="CELibManEditorWidget"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="ce_libmaneditor"/>
-      </Unit12>
-      <Unit13>
+      </Unit11>
+      <Unit12>
         <Filename Value="..\src\ce_main.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="CEMainForm"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="ce_main"/>
-      </Unit13>
-      <Unit14>
+      </Unit12>
+      <Unit13>
         <Filename Value="..\src\ce_messages.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="CEMessagesWidget"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="ce_messages"/>
-      </Unit14>
-      <Unit15>
+      </Unit13>
+      <Unit14>
         <Filename Value="..\src\ce_miniexplorer.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="CEMiniExplorerWidget"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="ce_miniexplorer"/>
-      </Unit15>
-      <Unit16>
+      </Unit14>
+      <Unit15>
         <Filename Value="..\src\ce_observer.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="ce_observer"/>
-      </Unit16>
-      <Unit17>
+      </Unit15>
+      <Unit16>
         <Filename Value="..\src\ce_options.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="ce_options"/>
-      </Unit17>
-      <Unit18>
+      </Unit16>
+      <Unit17>
         <Filename Value="..\src\ce_plugin.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="ce_plugin"/>
-      </Unit18>
-      <Unit19>
+      </Unit17>
+      <Unit18>
         <Filename Value="..\src\ce_procinput.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="CEProcInputWidget"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="ce_procinput"/>
-      </Unit19>
-      <Unit20>
+      </Unit18>
+      <Unit19>
         <Filename Value="..\src\ce_projconf.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="CEProjectConfigurationWidget"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="ce_projconf"/>
-      </Unit20>
-      <Unit21>
+      </Unit19>
+      <Unit20>
         <Filename Value="..\src\ce_project.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="ce_project"/>
-      </Unit21>
-      <Unit22>
+      </Unit20>
+      <Unit21>
         <Filename Value="..\src\ce_projinspect.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="CEProjectInspectWidget"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="ce_projinspect"/>
-      </Unit22>
-      <Unit23>
+      </Unit21>
+      <Unit22>
         <Filename Value="..\src\ce_search.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="CESearchWidget"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="ce_search"/>
-      </Unit23>
-      <Unit24>
+      </Unit22>
+      <Unit23>
         <Filename Value="..\src\ce_staticexplorer.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="CEStaticExplorerWidget"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="ce_staticexplorer"/>
+      </Unit23>
+	  <Unit24>
+        <Filename Value="..\src\ce_symstring.pas"/>
+        <IsPartOfProject Value="True"/>
+        <UnitName Value="ce_symstring"/>
       </Unit24>
       <Unit25>
         <Filename Value="..\src\ce_synmemo.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="ce_synmemo"/>
       </Unit25>
-      <Unit26>
+	  <Unit26>
+        <Filename Value="..\src\ce_tools.pas"/>
+        <IsPartOfProject Value="True"/>
+        <UnitName Value="ce_tools"/>
+      </Unit26>
+      <Unit27>
         <Filename Value="..\src\ce_toolseditor.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="CEToolsEditorWidget"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="ce_toolseditor"/>
-      </Unit26>
-      <Unit27>
+      </Unit27>
+      <Unit28>
         <Filename Value="..\src\ce_txtsyn.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="ce_txtsyn"/>
-      </Unit27>
-      <Unit28>
+      </Unit28>
+      <Unit29>
         <Filename Value="..\src\ce_widget.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="CEWidget"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="ce_widget"/>
-      </Unit28>
-      <Unit29>
+      </Unit29>
+      <Unit30>
         <Filename Value="..\src\ce_writablecomponent.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="ce_writableComponent"/>
-      </Unit29>
-      <Unit30>
-        <Filename Value="..\src\ce_symstring.pas"/>
-        <IsPartOfProject Value="True"/>
-        <UnitName Value="ce_symstring"/>
       </Unit30>
     </Units>
   </ProjectOptions>
diff --git a/lazproj/coedit.lpr b/lazproj/coedit.lpr
index ee7b6e66..aa5eadf4 100644
--- a/lazproj/coedit.lpr
+++ b/lazproj/coedit.lpr
@@ -6,7 +6,7 @@ uses
   {$IFDEF UNIX}{$IFDEF UseCThreads}
   cthreads,
   {$ENDIF}{$ENDIF}
-  Interfaces, Forms, lazcontrols, runtimetypeinfocontrols, ce_libman, ce_customtools,
+  Interfaces, Forms, lazcontrols, runtimetypeinfocontrols, ce_libman, ce_tools,
   ce_dcd, ce_observer, ce_main, ce_writableComponent, ce_options, ce_symstring;
 
 {$R *.res}
diff --git a/src/ce_customtools.pas b/src/ce_tools.pas
similarity index 99%
rename from src/ce_customtools.pas
rename to src/ce_tools.pas
index 6de7b1d2..63db1c27 100644
--- a/src/ce_customtools.pas
+++ b/src/ce_tools.pas
@@ -1,4 +1,4 @@
-unit ce_customtools;
+unit ce_tools;
 
 {$I ce_defines.inc}
 
diff --git a/src/ce_toolseditor.pas b/src/ce_toolseditor.pas
index a735af62..8c8add88 100644
--- a/src/ce_toolseditor.pas
+++ b/src/ce_toolseditor.pas
@@ -6,7 +6,7 @@ interface
 
 uses
   Classes, SysUtils, FileUtil, RTTIGrids, Forms, Controls, Graphics, Dialogs,
-  ExtCtrls, Menus, Buttons, StdCtrls, ce_widget, ce_customtools;
+  ExtCtrls, Menus, Buttons, StdCtrls, ce_widget, ce_tools;
 
 type