diff --git a/lazproj/coedit.lpi b/lazproj/coedit.lpi
index 845abff7..3cbd5685 100644
--- a/lazproj/coedit.lpi
+++ b/lazproj/coedit.lpi
@@ -525,7 +525,7 @@
         <PackageName Value="LCL"/>
       </Item8>
     </RequiredPackages>
-    <Units Count="61">
+    <Units Count="60">
       <Unit0>
         <Filename Value="coedit.lpr"/>
         <IsPartOfProject Value="True"/>
@@ -664,187 +664,183 @@
         <ResourceBaseClass Value="Frame"/>
       </Unit25>
       <Unit26>
-        <Filename Value="..\src\ce_staticmacro.pas"/>
-        <IsPartOfProject Value="True"/>
-      </Unit26>
-      <Unit27>
         <Filename Value="..\src\ce_symlist.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="CESymbolListWidget"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
+      </Unit26>
+      <Unit27>
+        <Filename Value="..\src\ce_symstring.pas"/>
+        <IsPartOfProject Value="True"/>
       </Unit27>
       <Unit28>
-        <Filename Value="..\src\ce_symstring.pas"/>
+        <Filename Value="..\src\ce_synmemo.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit28>
       <Unit29>
-        <Filename Value="..\src\ce_synmemo.pas"/>
-        <IsPartOfProject Value="True"/>
-      </Unit29>
-      <Unit30>
         <Filename Value="..\src\ce_todolist.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="CETodoListWidget"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-      </Unit30>
-      <Unit31>
+      </Unit29>
+      <Unit30>
         <Filename Value="..\src\ce_tools.pas"/>
         <IsPartOfProject Value="True"/>
-      </Unit31>
-      <Unit32>
+      </Unit30>
+      <Unit31>
         <Filename Value="..\src\ce_toolseditor.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="CEToolsEditorWidget"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-      </Unit32>
-      <Unit33>
+      </Unit31>
+      <Unit32>
         <Filename Value="..\src\ce_txtsyn.pas"/>
         <IsPartOfProject Value="True"/>
-      </Unit33>
-      <Unit34>
+      </Unit32>
+      <Unit33>
         <Filename Value="..\src\ce_writablecomponent.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="ce_writableComponent"/>
-      </Unit34>
-      <Unit35>
+      </Unit33>
+      <Unit34>
         <Filename Value="..\src\ce_sharedres.pas"/>
         <IsPartOfProject Value="True"/>
-      </Unit35>
-      <Unit36>
+      </Unit34>
+      <Unit35>
         <Filename Value="..\src\ce_widget.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="CEWidget"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-      </Unit36>
-      <Unit37>
+      </Unit35>
+      <Unit36>
         <Filename Value="..\src\ce_processes.pas"/>
         <IsPartOfProject Value="True"/>
-      </Unit37>
-      <Unit38>
+      </Unit36>
+      <Unit37>
         <Filename Value="..\src\ce_infos.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="CEInfoWidget"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
+      </Unit37>
+      <Unit38>
+        <Filename Value="..\src\ce_dubproject.pas"/>
+        <IsPartOfProject Value="True"/>
       </Unit38>
       <Unit39>
-        <Filename Value="..\src\ce_dubproject.pas"/>
+        <Filename Value="..\src\ce_dialogs.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit39>
       <Unit40>
-        <Filename Value="..\src\ce_dialogs.pas"/>
-        <IsPartOfProject Value="True"/>
-      </Unit40>
-      <Unit41>
         <Filename Value="..\src\ce_dubprojeditor.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="CEDubProjectEditorWidget"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-      </Unit41>
-      <Unit42>
+      </Unit40>
+      <Unit41>
         <Filename Value="..\src\ce_gdb.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="CEGdbWidget"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-      </Unit42>
-      <Unit43>
+      </Unit41>
+      <Unit42>
         <Filename Value="..\src\ce_controls.pas"/>
         <IsPartOfProject Value="True"/>
-      </Unit43>
-      <Unit44>
+      </Unit42>
+      <Unit43>
         <Filename Value="..\src\ce_dfmt.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="CEDfmtWidget"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
+      </Unit43>
+      <Unit44>
+        <Filename Value="..\src\ce_lcldragdrop.pas"/>
+        <IsPartOfProject Value="True"/>
       </Unit44>
       <Unit45>
-        <Filename Value="..\src\ce_lcldragdrop.pas"/>
+        <Filename Value="..\src\ce_stringrange.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit45>
       <Unit46>
-        <Filename Value="..\src\ce_stringrange.pas"/>
+        <Filename Value="..\src\ce_dlangmaps.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit46>
       <Unit47>
-        <Filename Value="..\src\ce_dlangmaps.pas"/>
-        <IsPartOfProject Value="True"/>
-      </Unit47>
-      <Unit48>
         <Filename Value="..\src\ce_projgroup.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="CEProjectGroupWidget"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
+      </Unit47>
+      <Unit48>
+        <Filename Value="..\src\ce_projutils.pas"/>
+        <IsPartOfProject Value="True"/>
       </Unit48>
       <Unit49>
-        <Filename Value="..\src\ce_projutils.pas"/>
+        <Filename Value="..\src\ce_d2synpresets.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit49>
       <Unit50>
-        <Filename Value="..\src\ce_d2synpresets.pas"/>
+        <Filename Value="..\src\ce_dastworx.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit50>
       <Unit51>
-        <Filename Value="..\src\ce_dastworx.pas"/>
+        <Filename Value="..\src\ce_dbgitf.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit51>
       <Unit52>
-        <Filename Value="..\src\ce_dbgitf.pas"/>
+        <Filename Value="..\src\ce_ddemangle.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit52>
       <Unit53>
-        <Filename Value="..\src\ce_ddemangle.pas"/>
-        <IsPartOfProject Value="True"/>
-      </Unit53>
-      <Unit54>
         <Filename Value="..\src\ce_compilers.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="CompilersPathsEditor"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-      </Unit54>
-      <Unit55>
+      </Unit53>
+      <Unit54>
         <Filename Value="..\src\ce_halstead.pas"/>
         <IsPartOfProject Value="True"/>
-      </Unit55>
-      <Unit56>
+      </Unit54>
+      <Unit55>
         <Filename Value="..\src\ce_diff.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="CEDiffViewer"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-      </Unit56>
-      <Unit57>
+      </Unit55>
+      <Unit56>
         <Filename Value="..\src\ce_profileviewer.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="CEProfileViewerWidget"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-      </Unit57>
-      <Unit58>
+      </Unit56>
+      <Unit57>
         <Filename Value="..\src\ce_semver.pas"/>
         <IsPartOfProject Value="True"/>
-      </Unit58>
-      <Unit59>
+      </Unit57>
+      <Unit58>
         <Filename Value="..\src\ce_term.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="CETermWidget"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-      </Unit59>
-      <Unit60>
+      </Unit58>
+      <Unit59>
         <Filename Value="..\src\ce_newdubproj.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="CeNewDubProject"/>
         <ResourceBaseClass Value="Form"/>
-      </Unit60>
+      </Unit59>
     </Units>
   </ProjectOptions>
   <CompilerOptions>
diff --git a/lazproj/coedit.lpr b/lazproj/coedit.lpr
index 2e37598e..60031098 100644
--- a/lazproj/coedit.lpr
+++ b/lazproj/coedit.lpr
@@ -8,7 +8,7 @@ uses
   {$ENDIF}{$ENDIF}
   Interfaces, Forms, lazcontrols, runtimetypeinfocontrols, anchordockpkg,
   tachartlazaruspkg, ce_sharedres, ce_observer, ce_libman, ce_symstring,
-  ce_tools, ce_dcd, ce_main, ce_writableComponent, ce_staticmacro,
+  ce_tools, ce_dcd, ce_main, ce_writableComponent,
   ce_inspectors, ce_editoroptions, ce_dockoptions, ce_shortcutseditor, ce_mru,
   ce_processes, ce_dialogs, ce_dubprojeditor, ce_controls, ce_dfmt,
   ce_lcldragdrop, ce_stringrange, ce_dlangmaps, ce_projgroup, ce_projutils,