diff --git a/src/ce_dcd.pas b/src/ce_dcd.pas
index 88e5f86d..3f25b58f 100644
--- a/src/ce_dcd.pas
+++ b/src/ce_dcd.pas
@@ -116,9 +116,9 @@ begin
   //
   for i:= 0 to fProj.Sources.Count-1 do
     addImportFolder(extractFilePath(fProj.getAbsoluteSourceName(i)));
-  for i := 0 to fProj.currentConfiguration.pathsOptions.includes.Count-1 do
+  for i := 0 to fProj.currentConfiguration.pathsOptions.importModulePaths.Count-1 do
   begin
-    fold := fProj.currentConfiguration.pathsOptions.includes.Strings[i];
+    fold := fProj.currentConfiguration.pathsOptions.importModulePaths.Strings[i];
     if DirectoryExists(fold) then
       addImportFolder(fold);
   end;
diff --git a/src/ce_projconf.pas b/src/ce_projconf.pas
index c743264f..50af92bb 100644
--- a/src/ce_projconf.pas
+++ b/src/ce_projconf.pas
@@ -323,17 +323,30 @@ begin
   if getGridTarget = fProj then
   begin
     if aEditor.GetName = 'Name' then
-      aShow := false;
-    if aEditor.GetName = 'Tag' then
+      aShow := false
+    else if aEditor.GetName = 'Tag' then
       aShow := false;
   end;
   // deprecated field
   if getGridTarget = fProj.currentConfiguration.pathsOptions  then
+  begin
     if aEditor.GetName = 'Sources' then
+      aShow := false
+    else if aEditor.GetName = 'includes' then
+      aShow := false
+    else if aEditor.GetName = 'imports' then
       aShow := false;
+  end;
   if getGridTarget = fProj.currentConfiguration.outputOptions  then
     if aEditor.GetName = 'noBoundsCheck' then
       aShow := false;
+  if getGridTarget = fProj.currentConfiguration.debugingOptions then
+  begin
+    if aEditor.GetName = 'addCInformations' then
+      aShow := false
+    else if aEditor.GetName = 'addDInformations' then
+      aShow := false;
+  end;
 end;
 
 function TCEProjectConfigurationWidget.getGridTarget: TPersistent;
diff --git a/src/ce_project.pas b/src/ce_project.pas
index 2937f136..8c519bc0 100644
--- a/src/ce_project.pas
+++ b/src/ce_project.pas
@@ -282,7 +282,7 @@ begin
   begin
     Name := 'debug';
     debugingOptions.debug := true;
-    debugingOptions.addCInformations := true;
+    debugingOptions.codeviewCformat := true;
     outputOptions.boundsCheck := onAlways;
   end;
   with TCompilerConfiguration(fOptsColl.Add) do
diff --git a/src/ce_projinspect.lfm b/src/ce_projinspect.lfm
index 6817d166..ff05d0ae 100644
--- a/src/ce_projinspect.lfm
+++ b/src/ce_projinspect.lfm
@@ -41,10 +41,11 @@ inherited CEProjectInspectWidget: TCEProjectInspectWidget
           F9FFFFFF020005000000000000000000000000000000FFFFFFFF000000000000
           0000000C000000536F757263652066696C6573010000000100000001000000FF
           FFFFFF0000000000000000000E000000436F6E66696775726174696F6E730400
-          00000400000004000000FFFFFFFF00000000000000000007000000496D706F72
-          7473040000000400000004000000FFFFFFFF0000000000000000000800000049
-          6E636C75646573000000000000000000000000FFFFFFFF000000000000000000
-          0D000000457874726120736F7572636573
+          00000400000004000000FFFFFFFF00000000000000000013000000496D706F72
+          7420737472696E67207061746873060000000600000006000000FFFFFFFF0000
+          0000000000000013000000496D706F7274206D6F64756C652070617468730000
+          00000000000000000000FFFFFFFF0000000000000000000D0000004578747261
+          20736F7572636573
         }
       end
       object Panel1: TPanel[1]
@@ -132,7 +133,7 @@ inherited CEProjectInspectWidget: TCEProjectInspectWidget
     left = 160
     top = 48
     Bitmap = {
-      4C69060000001000000010000000B3B3B1EFB0B0ADFFAEAEACFFAEAEACFFAEAE
+      4C69070000001000000010000000B3B3B1EFB0B0ADFFAEAEACFFAEAEACFFAEAE
       ACFFAFAFACFFAFAFADFFB1B1AFD5B4B4B100B5B5B300B5B5B300B5B5B300B5B5
       B300B5B5B300B5B5B300B5B5B300AFAFADFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
       FFFFFFFFFFFFFFFFFFFFEDEDEEFFB3B3B0A4B5B5B300B5B5B300B5B5B300B5B5
@@ -260,39 +261,39 @@ inherited CEProjectInspectWidget: TCEProjectInspectWidget
       FF00FFFFFF000000000000000033000000330000000E7F7D7CFF7F7D7CFF0000
       000E000000330000003300000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
       FF00FFFFFF000000000000000000000000000000000000000033000000330000
-      00000000000000000000000000004398D2EF3D94D0FF3A92CFFF3A92CFFF3D94
-      D0FF4197D1E44398D22B4498D2324498D2334498D2334498D2334499D2334499
-      D337459AD300469AD300469AD3003D94D0FFDCFCFFFFD8F7FFFFD8F7FFFFDBFA
-      FFFF358ECDFF3991CEFF3A92CFFF3A92CFFF3A92CFFF3A92CFFF3A92CFFF3D94
-      D0FF4298D2EA469AD300469AD3003B92CFFFD5F7FFFF60D1F9FF61D0F8FFB4EB
-      FDFFD9F6FFFFDAF8FFFFDAF8FFFFDAF9FFFFDBF9FFFFDAF9FFFFDAFAFFFFDFFE
-      FFFF3D94D0FF4599D335469AD3003B92CFFFCAF6FFFF69D5F9FF6CD5F9FF6AD4
-      F9FF69D4F9FF69D5F9FF6AD6FAFF6BD8FBFF6BD9FCFF6BDAFDFF69DAFDFFDAFD
-      FFFF3C93D0FF367BAA2F469AD3003C92CFFFC0F3FFFF70D9FBFF73DAFBFF74DA
-      FBFF74DAFBFF74DBFBFF76DEFDFF4FA9DCFF368BCBFF368CCDFF358CCDFF348C
-      CDFF3890CEFF3D94D0FF4398D2AE3D92CFFFB8F3FFFF77DFFEFF7BE0FEFF7CE1
-      FEFF7CE1FFFF7DE2FFFF52ABDDFF56BAE9FFDDFAFFFFDEFBFFFFDFFAFFFFDCF9
-      FFFFD8F9FFFFDCFDFFFF3E94D0FF3E93CFFFB2F6FFFF51ACDEFF358ACAFF358A
-      CAFF358ACBFF378BCBFF5DBEECFF72DBFFFF74DCFFFF007E2CFF00A06FFF18A0
-      7FFF8DE3FFFFAEE2FBFF3A8AC2C84095D0FF90DDF8FF44A0D8FFDDFCFFFFDAFA
-      FFFFDDFBFFFFE5FEFFFF7EE2FFFF83E2FFFF88E5FFFF008135FF74E0D1FF00A4
-      71FF37AA84FF87C4F3FF3576A8704296D1FF71C4EAFF6CBCE6FFBBF2FFFF76DF
-      FEFF7EE3FFFF1EA582FF007F2FFF007F32FF008135FF007F36FF81E3D5FF57D8
-      C1FF00AA73FF128A74FF000000124397D1FF56ACDDFF8EDAF5FFA2EDFFFF84E6
-      FFFF8EECFFFF007E2FFF94ECDDFF4CE7D2FF4FE7D2FF4DE6D1FF93E8D7FF00C3
-      97FF5EDFC4FF00B17AFF008A3EA84499D2FF3F94D0FFABFBFFFF9BF3FFFF94F1
-      FFFF9EF6FFFF008133FF6DE7CDFF00C899FF00C899FF00C899FF00C797FF00C8
-      98FF00CA9AFF62E6CCFF008946FF4598D0F14398D2FF4094D0FF3E92CFFF4092
-      D1FF4794DCFF008638FF41E8C0FF00D7A0FF00D7A0FF00D59FFF00D09CFF00D0
-      9CFF00D39FFF00B981FF007E43BD0000002F29597A5F2655755C2655745C2654
-      755B27507457007E38B7008946FF008847FF008746FF008342FF00D9A1FF00D8
-      A0FF00BC80FF007C41B900000022469AD3000000000B0000000A0000000A0000
-      000A0000000900000021000000330000003300000033008847FF00E4A6FF00BE
-      80FF007C41B900000021008F4F00469AD300469AD300469AD300469AD300479A
-      D5004D9BE100008E4100008F4D00008F4F00008E4E00008A4AFF00C684FF007C
-      41BD00000021008F4F00008F4F00000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000033000000330000
-      0022000000000000000000000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+      0000000000000000000000000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+      FF00FFFFFF00EAC39DFFE6BF96FFE4BB92FFE4BB92FFD1A06CF5D09E6DF6CC96
+      5FDAC479427EB2673C09FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+      FF00FFFFFF00E5BE96FFFFFFFEFFFDF3E9FFFDF3EAFFFCF2E8FFFAEFE3FFFAF2
+      E7FFEABB88FFCF8555B3B4693D0CFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+      FF00FFFFFF00E4BB93FFFEF5EDFFFCDEC5FFFBE0C7FFF9DCC2FFF5D3B4FFFEF9
+      F3FFFAE2C4FFECC193FFC37D4893FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+      FF00FFFFFF00E4BB92FFFEF6F0FFFCE2CDFFFCE3CDFFFADFC8FFF7D9BCFFF5E9
+      DDFFFAF3EBFFFBF8F3FFCA8353FEFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+      FF00FFFFFF00E4BB92FFFEF7F1FFFCE5D2FFFCE4D1FFFBE2CCFFF9DDC4FFF6D7
+      BBFFF3D1AFFFFAEFE4FFCC8758FE34B4D9D05EC2E1FA60C3E2FA60C3E2FA60C3
+      E2FA5FC3E2FAE4BB91FFFFF7F2FFFEE7D5FFFEE7D5FFFDE5D1FFFAE0CAFFF9DE
+      C4FFF7D9BCFFFDF2E7FFCC8757FE36B3DAF8FDFEFEFFFEFFFFFFFEFEFFFFFDFE
+      FFFFFEFFFFFFE4BA91FFFFF7F0FFFFE7D5FFFDE7D6FFFDE6D4FFFCE4D0FFFBE3
+      CBFFFADCC2FFFEF3E8FFCC8656FE35AFDAF0F7FCFEFF8EE4F8FF91DEF5FF9FE0
+      F5FFACE1F6FFCA8452FFFFF7F1FFFFE9D9FFFFEADBFFFFE9D9FFFFE7D7FFFFE5
+      D2FFFFE2CBFFFFF7F1FFCB8555FE36AADAF2F1FAFDFF94DEF5FF93DCF4FF64BC
+      E9FF3594DAFF3594DAFF3594DAFF3594DAFF3594DAFF3594DAFF3594DAFF3594
+      DAFF3594DAFFFBF6EFFFCC8355FE35ABDAFAE8F6FBFF70BCE7FF55AAE2FF4DA5
+      E0FF91C9EBFFFAF3EFFFFDFEFDFFFFFDFCFFFFFDFCFFFEFDFCFFFEFCFBFFFEFE
+      FDFF3594DAFFEFF2E8FFCE8156FF37A6DAFAFEFFFFFFF8FDFFFFF6FDFFFFF5FC
+      FFFFF3FCFEFF9AE4F4FF9AE6F7FF9BE6F6FF9DE5F5FF9EE5F5FF9FE5F4FFDAF3
+      F8FF3594DAFFFDF4EEFFCA8054F936A1DAF9F6FCFEFF94E5F8FF93E5F8FF93E5
+      F8FF91E5F8FF93DBE9FF93D7E3FF93D2DCFF90CED7FF8CC8CFFF86C1C6FFC9D8
+      D6FF3594DAFFC57444E8CA7F53F1369ADAF8F2FAFDFF94E6F8FF92E5F8FF90E5
+      F8FF8BE3F8FF86E2F7FF7FE1F7FF77DEF6FF6CDCF6FF5ED9F4FF4FD5F3FFCCF2
+      FBFF3594DAFFFFFFFF00FFFFFF003594DAF7EFFAFEFF93E5F8FF8FE4F8FF89E3
+      F8FF82E1F7FF7ADFF7FF71DEF6FF67DBF5FF5BD8F4FF4DD4F3FF40D1F2FFCAF2
+      FBFF3594DAFFFFFFFF00FFFFFF00338ED9FBDCF0FAFF98E1F6FF95E0F6FF92DF
+      F6FF8EDEF5FF89DCF5FF85DAF4FF80D9F4FF7AD7F3FF74D5F3FF70D3F2FFC2EA
+      F8FF3594DAFFFFFFFF00FFFFFF002C86D8002D88D8F72D87D8F72D88D8F72D88
+      D8F72D88D8F72D88D8F72D88D8F72D88D8F72D88D8F72D88D8F72D87D8F72D88
+      D8F72C86D800FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
       FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
       FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
       FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
@@ -324,7 +325,39 @@ inherited CEProjectInspectWidget: TCEProjectInspectWidget
       0033000000330000003300000033000000330000003300000033000000330000
       00330000002F0000000000000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
       FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00
+      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+      FF00FFFFFF00C5C5C504A9A9A9199E9E9E29BFBFBFF1B1B1B1FFB1B1B1FFBEBE
+      BEF19999992AAAAAAA19C5C5C504FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+      FF00FFFFFF00B7B7B776D5D5D5FFCDCDCDFFC3C3C3FFE0E0E0FFDEDEDEFFC3C3
+      C3FFCECECEFFD6D6D6FFB4B4B476FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+      FF00FFFFFF00ACACACE4E5E5E5FFFFFFFFFFC8C8C8FFB3B3B3FFB3B3B3FFC8C8
+      C8FFFFFFFFFFE5E5E5FFA0A0A0EDFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+      FF00FFFFFF00A8A8A8FFDBDBDBFFD0D0D0FFC6C6C6FFFFFFFFFFFFFFFFFFC8C8
+      C8FFCACACAFFBFBFBFFFACACACFFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+      FF00FFFFFF00AAAAAAFFF6F6F6FFE6E6E6FFCCCCCCFFD6D6D6FFD4D4D4FFBCBC
+      BCFFBFBFBFFFC3C3C3FFAFAFAFFF34B4D9D05EC2E1FA60C3E2FA60C3E2FA60C3
+      E2FA5FC3E2FAABABABFFF6F6F6FFE8E8E8FFE1E1E1FFD7D7D7FFC0C0C0FFBFBF
+      BFFFC2C2C2FFC3C3C3FFACACACFF36B3DAF8FDFEFEFFFEFFFFFFFEFEFFFFFDFE
+      FFFFFEFFFFFFB1B2B2FFCCCCCCFFE9E9E9FFE0E0E0FFD5D5D5FFBDBDBDFFC3C3
+      C3FFC2C2C2FFB2B2B2FF9D9D9DED35AFDAF0F7FCFEFF8EE4F8FF91DEF5FF9FE0
+      F5FFACE1F6FFE7F2F4FFBEC2C2FFAEAFAFFFCDCDCDFFE1E1E1FFC6C6C6FFB9B9
+      B9FF9FA2A3FE959595A59393931E36AADAF2F1FAFDFF94DEF5FF93DCF4FF81D5
+      F2FF60C0E9FF4FAEE1FF3594DAFF3594DAFF3594DAFF3594DAFF3594DAFF3594
+      DAFF3594DAFFFFFFFF00FFFFFF0035ABDAFAE8F6FBFF7EC5EAFF5BAEE3FF51A8
+      E1FF60AFE4FFEBFAFDFFECFAFEFFE5F5FCFFE5F6FCFFE3F4FBFFE4F5FCFFFEFF
+      FFFF3594DAFFFFFFFF00FFFFFF0037A6DAFAFEFFFFFFF8FDFFFFF6FDFFFFF5FC
+      FFFFE8FAFEFFAFECFAFF8EE4F8FF87E3F8FF7DE0F7FF72DDF6FF68DBF5FFE9F9
+      FDFF3594DAFFFFFFFF00FFFFFF0036A1DAF9F6FCFEFFC8F2FCFFB9EFFBFFACEC
+      FAFF8CE4F8FF8AE3F8FF82E1F7FF79DFF7FF6DDDF6FF61DAF5FF57D7F4FFE7F8
+      FDFF3594DAFFFFFFFF00FFFFFF00369ADAF8F2FAFDFFB3EDFAFFA4E9F9FF95E6
+      F8FF85E2F7FF81E1F7FF7AE0F7FF6FDDF6FF62DAF5FF54D6F3FF47D3F2FFE8F9
+      FDFF3594DAFFFFFFFF00FFFFFF003594DAF7EFFAFEFFA1E9F9FF91E5F8FF81E1
+      F7FF72DEF6FF63DAF5FF54D7F4FF47D3F3FF39D0F2FF2ECDF1FF26CBF0FFCAF2
+      FBFF3594DAF7FFFFFF00FFFFFF00338ED9E6DCF0FAF0A7DDF4FD9EDBF4FF96DA
+      F3FF8ED8F3FF86D7F3FF7FD4F2FF79D3F2FF72D2F1FF6CD0F1FF69CFF1FFC2EA
+      F8FE338ED9F0FFFFFF00FFFFFF002C86D8002D88D8A62D87D8EA2D88D8F72D88
+      D8F72D88D8F72D88D8F72D88D8F72D88D8F72D88D8F72D88D8F72D87D8F72D88
+      D8F12C86D893FFFFFF00FFFFFF00
     }
   end
 end
diff --git a/src/ce_projinspect.pas b/src/ce_projinspect.pas
index f44f5b8c..23059a90 100644
--- a/src/ce_projinspect.pas
+++ b/src/ce_projinspect.pas
@@ -351,7 +351,7 @@ begin
     itm.SelectedIndex:= 3;
   end;
   // display Imports (-J)
-  for fold in FProject.currentConfiguration.pathsOptions.Imports do
+  for fold in FProject.currentConfiguration.pathsOptions.importStringPaths do
   begin
     if fold = '' then
       continue;
@@ -361,7 +361,7 @@ begin
   end;
   fImpsNode.Collapse(false);
   // display Includes (-I)
-  for fold in FProject.currentConfiguration.pathsOptions.Includes do
+  for fold in FProject.currentConfiguration.pathsOptions.importModulePaths do
   begin
     if fold = '' then
       continue;
diff --git a/src/ce_staticexplorer.pas b/src/ce_staticexplorer.pas
index 0a76df39..e4c87e7d 100644
--- a/src/ce_staticexplorer.pas
+++ b/src/ce_staticexplorer.pas
@@ -448,9 +448,9 @@ begin
       itm := fProj.getAbsoluteSourceName(i);
       if srcFname <> itm then fDmdProc.Parameters.Add(itm);
     end;
-    for itm in fProj.currentConfiguration.pathsOptions.Includes do
+    for itm in fProj.currentConfiguration.pathsOptions.importModulePaths do
       fDmdProc.Parameters.Add('-I' + symbolExpander.get(itm));
-    for itm in fProj.currentConfiguration.pathsOptions.Imports do
+    for itm in fProj.currentConfiguration.pathsOptions.importStringPaths do
       fDmdProc.Parameters.Add('-J' + symbolExpander.get(itm));
   end;