diff --git a/components/extrasyn/SyneditHighlighters/syneditstrconstextra.pas b/components/extrasyn/SyneditHighlighters/syneditstrconstextra.pas
index 67da0a989..e4dc9c421 100644
--- a/components/extrasyn/SyneditHighlighters/syneditstrconstextra.pas
+++ b/components/extrasyn/SyneditHighlighters/syneditstrconstextra.pas
@@ -202,47 +202,47 @@ ResourceString
   SYNS_FilterVerilog     = 'Verilog Files (*.v;*.vl;*.ver)|*.v;*.vl;*.ver';
   SYNS_FilterJSON        = 'JSON Files (*.json)|*.json';
 
-  //SYNS_FilterX86Assembly = 'x86 Assembly Files (*.asm)|*.asm';
+  SYNS_FilterX86Asm      = 'x86 Assembly Files (*.asm)|*.asm';
   //SYNS_FilterPascal = 'Pascal Files (*.pas;*.pp;*.dpr;*.dpk;*.inc)|*.pas;*.pp;*.dpr;*.dpk;*.inc';
-  //SYNS_FilterHP48 = 'HP48 Files (*.s;*.sou;*.a;*.hp)|*.s;*.sou;*.a;*.hp';
-  //SYNS_FilterCAClipper = 'CA-Clipper Files (*.prg;*.ch;*.inc)|*.prg;*.ch;*.inc';
-  //SYNS_FilterCORBAIDL = 'CORBA IDL Files (*.idl)|*.idl';
+  SYNS_FilterHP48 = 'HP48 Files (*.s;*.sou;*.a;*.hp)|*.s;*.sou;*.a;*.hp';
+  SYNS_FilterCAClipper = 'CA-Clipper Files (*.prg;*.ch;*.inc)|*.prg;*.ch;*.inc';
+  SYNS_FilterCORBAIDL = 'CORBA IDL Files (*.idl)|*.idl';
   //SYNS_FilterCPM = 'CPM Reports (*.rdf;*.rif;*.rmf;*.rxf)|*.rdf;*.rif;*.rmf;*.rxf';
   //SYNS_FilterCPP = 'C/C++ Files (*.c;*.cpp;*.h;*.hpp)|*.c;*.cpp;*.h;*.hpp';
   //SYNS_FilterCS = 'C# Files (*.cs)|*.cs';
   //SYNS_FilterJava = 'Java Files (*.java)|*.java';
   //SYNS_FilterPerl = 'Perl Files (*.pl;*.pm;*.cgi)|*.pl;*.pm;*.cgi';
-  //SYNS_FilterAWK = 'AWK Scripts (*.awk)|*.awk';
+  SYNS_FilterAWK = 'AWK Scripts (*.awk)|*.awk';
   //SYNS_FilterHTML = 'HTML Documents (*.htm;*.html)|*.htm;*.html';
-  //SYNS_FilterVBScript = 'VBScript Files (*.vbs)|*.vbs';
-  //SYNS_FilterGalaxy = 'Galaxy Files (*.gtv;*.galrep;*.txt)|*.gtv;*.galrep;*.txt';
+  SYNS_FilterVBScript = 'VBScript Files (*.vbs)|*.vbs';
+  SYNS_FilterGalaxy = 'Galaxy Files (*.gtv;*.galrep;*.txt)|*.gtv;*.galrep;*.txt';
   //SYNS_FilterPython = 'Python Files (*.py)|*.py';
   //SYNS_FilterSQL = 'SQL Files (*.sql)|*.sql';
-  //SYNS_FilterTclTk = 'Tcl/Tk Files (*.tcl)|*.tcl';
+  SYNS_FilterTclTk = 'Tcl/Tk Files (*.tcl)|*.tcl';
   //SYNS_FilterRTF = 'Rich Text Format Documents (*.rtf)|*.rtf';
   //SYNS_FilterBatch = 'MS-DOS Batch Files (*.bat;*.cmd)|*.bat;*.cmd';
   //SYNS_FilterDFM = 'Borland Form Files (*.dfm;*.xfm)|*.dfm;*.xfm';
   //SYNS_FilterX86Assembly = 'x86 Assembly Files (*.asm)|*.asm';
-  //SYNS_FilterGembase = 'GEMBASE Files (*.dml;*.gem)|*.dml;*.gem';
+  SYNS_FilterGembase = 'GEMBASE Files (*.dml;*.gem)|*.dml;*.gem';
   //SYNS_FilterINI = 'INI Files (*.ini)|*.ini';
-  //SYNS_FilterSML = 'Standard ML Files (*.sml)|*.sml';
+  SYNS_FilterSML = 'Standard ML Files (*.sml)|*.sml';
   //SYNS_FilterVisualBASIC = 'Visual Basic Files (*.bas)|*.bas';
-  //SYNS_FilterADSP21xx = 'DSP Files (*.dsp;*.inc)|*.dsp;*.inc';
+  SYNS_FilterADSP21xx = 'DSP Files (*.dsp;*.inc)|*.dsp;*.inc';
   //SYNS_FilterPHP = 'PHP Files (*.php;*.php3;*.phtml;*.inc)|*.php;*.php3;*.phtml;*.inc';
-  //SYNS_FilterCache = 'Cache Files (*.mac;*.inc;*.int)|*.mac;*.inc;*.int';
+  SYNS_FilterCache = 'Cache Files (*.mac;*.inc;*.int)|*.mac;*.inc;*.int';
   //SYNS_FilterCSS = 'Cascading Stylesheets (*.css)|*.css';
   //SYNS_FilterJScript = 'Javascript Files (*.js)|*.js';
-  //SYNS_FilterKIX = 'KiXtart Scripts (*.kix)|*.kix';
-  //SYNS_FilterBaan = 'Baan 4GL Files (*.cln)|*.cln';
-  //SYNS_FilterFoxpro = 'Foxpro Files (*.prg)|*.prg';
-  //SYNS_FilterFortran = 'Fortran Files (*.for)|*.for';
+  SYNS_FilterKIX = 'KiXtart Scripts (*.kix)|*.kix';
+  SYNS_FilterBaan = 'Baan 4GL Files (*.cln)|*.cln';
+  SYNS_FilterFoxpro = 'Foxpro Files (*.prg)|*.prg';
+  SYNS_FilterFortran = 'Fortran Files (*.for)|*.for';
   //SYNS_FilterAsm68HC11 = '68HC11 Assembler Files (*.hc11;*.asm;*.asc)|*.hc11;*.asm;*.asc';
-  //SYNS_FilterProgress = 'Progress Files (*.w;*.p;*.i)|*.w;*.p;*.i';
-  //SYNS_FilterModelica = 'Modelica Files (*.mo)|*.mo';
-  //SYNS_FilterModula3 = 'Modula-3 Files (*.m3)|*.m3';
-  //SYNS_FilterSDD = 'Semanta DD Files (*.sdd)|*.sdd';
+  SYNS_FilterProgress = 'Progress Files (*.w;*.p;*.i)|*.w;*.p;*.i';
+  SYNS_FilterModelica = 'Modelica Files (*.mo)|*.mo';
+  SYNS_FilterModula3 = 'Modula-3 Files (*.m3)|*.m3';
+  SYNS_FilterSDD = 'Semanta DD Files (*.sdd)|*.sdd';
   //SYNS_FilterXML = 'XML Files (*.xml;*.xsd;*.xsl;*.xslt;*.dtd)|*.xml;*.xsd;*.xsl;*.xslt;*.dtd';
-  //SYNS_FilterGWS = 'GW-TEL Scripts (*.gws)|*.gws';
+  SYNS_FilterGWS = 'GW-TEL Scripts (*.gws)|*.gws';
   //SYNS_FilterSynGenMsgfiles = 'Msg Files (*.msg)|*.msg';
   //SYNS_FilterST = 'Structured Text Files (*.st)|*.st';
   //SYNS_FilterTeX = 'TeX Files (*.tex)|*.tex';
@@ -272,8 +272,8 @@ ResourceString
   SYNS_LangVHDL    = 'VHDL';
   SYNS_LangVerilog = 'Verilog';
   SYNS_LangJSON    = 'JSON';
-  //SYNS_LangHP48 = 'HP48';
-  //SYNS_LangCAClipper = 'CA-Clipper';
+  SYNS_LangHP48    = 'HP48';
+  SYNS_LangCAClipper = 'CA-Clipper';
   //SYNS_LangCPM = 'COAS Product Manager Report';
   //SYNS_LangCPP = 'C/C++';
   //SYNS_LangCS = 'C#';
@@ -281,41 +281,41 @@ ResourceString
   //SYNS_LangPerl = 'Perl';
   //SYNS_LangBatch = 'MS-DOS Batch';
   //SYNS_LangDfm = 'Borland Forms';
-  //SYNS_LangAWK = 'AWK';
-  //SYNS_LangCORBAIDL = 'CORBA IDL';
+  SYNS_LangAWK = 'AWK';
+  SYNS_LangCORBAIDL = 'CORBA IDL';
   //SYNS_LangHTML = 'HTML';
-  //SYNS_LangVBSScript = 'MS VBScript';
-  //SYNS_LangGalaxy = 'Galaxy';
+  SYNS_LangVBSScript = 'MS VBScript';
+  SYNS_LangGalaxy = 'Galaxy';
   //SYNS_LangGeneral = 'General';
   //SYNS_LangPascal = 'Object Pascal';
-  //SYNS_LangX86Asm = 'x86 Assembly';
+  SYNS_LangX86Asm = 'x86 Assembly';
   //SYNS_LangPython = 'Python';
-  //SYNS_LangTclTk = 'Tcl/Tk';
+  SYNS_LangTclTk = 'Tcl/Tk';
   //SYNS_LangSQL = 'SQL';
-  //SYNS_LangGembase = 'Gembase';
+  SYNS_LangGembase = 'Gembase';
   //SYNS_LangINI = 'INI';
-  //SYNS_LangSML = 'Standard ML';
+  SYNS_LangSML = 'Standard ML';
   //SYNS_LangVisualBASIC = 'Visual Basic';
-  //SYNS_LangADSP21xx = 'ADSP21xx';
+  SYNS_LangADSP21xx = 'ADSP21xx';
   //SYNS_LangPHP = 'PHP';
   //SYNS_LangSybaseSQL = 'Sybase SQL';
   //SYNS_LangGeneralMulti = 'General Multi-Highlighter';
-  //SYNS_LangCache = 'Cache Object Script';
+  SYNS_LangCache = 'Cache Object Script';
   //SYNS_LangCSS = 'Cascading Style Sheet';
   //SYNS_LangJScript = 'JavaScript';
-  //SYNS_LangKIX = 'KiXtart';
-  //SYNS_LangBaan = 'Baan 4GL';
-  //SYNS_LangFoxpro = 'Foxpro';
-  //SYNS_LangFortran = 'Fortran';
+  SYNS_LangKIX = 'KiXtart';
+  SYNS_LangBaan = 'Baan 4GL';
+  SYNS_LangFoxpro = 'Foxpro';
+  SYNS_LangFortran = 'Fortran';
   //SYNS_Lang68HC11 = '68HC11 Assembler';
-  //SYNS_LangProgress = 'Progress';
-  //SYNS_LangModelica = 'Modelica';
-  //SYNS_LangModula3 = 'Modula 3';
-  //SYNS_LangSDD = 'Semanta Data Dictionary';
+  SYNS_LangProgress = 'Progress';
+  SYNS_LangModelica = 'Modelica';
+  SYNS_LangModula3 = 'Modula 3';
+  SYNS_LangSDD = 'Semanta Data Dictionary';
   //SYNS_LangXML = 'XML';
-  //SYNS_LangGWS = 'GW-TEL';
+  SYNS_LangGWS = 'GW-TEL';
   //SYNS_LangSynGenMsgfiles = 'SynGen Msg';
-  //SYNS_LangUnreal = 'Unreal';
+  SYNS_LangUnreal = 'Unreal';
   //SYNS_LangTeX = 'TeX';
   //SYNS_LangNameUNIXShellScript = 'UNIX Shell Script';
 
diff --git a/components/extrasyn/SyneditHighlighters/synhighlighterasm.pas b/components/extrasyn/SyneditHighlighters/synhighlighterasm.pas
index d4aead27e..8ce727aac 100644
--- a/components/extrasyn/SyneditHighlighters/synhighlighterasm.pas
+++ b/components/extrasyn/SyneditHighlighters/synhighlighterasm.pas
@@ -144,7 +144,7 @@ type
 implementation
 
 uses
-  SynEditStrConst;
+  SynEditStrConst, SynEditStrConstExtra;
 
 var
   Identifiers: array[#0..#255] of ByteBool;
diff --git a/components/extrasyn/SyneditHighlighters/synhighlighterawk.pas b/components/extrasyn/SyneditHighlighters/synhighlighterawk.pas
index 384bd9beb..54113842c 100644
--- a/components/extrasyn/SyneditHighlighters/synhighlighterawk.pas
+++ b/components/extrasyn/SyneditHighlighters/synhighlighterawk.pas
@@ -148,7 +148,7 @@ type
 implementation
 
 uses
-  SynEditStrConst;
+  SynEditStrConst, SynEditStrConstExtra;
 
 procedure TSynAWKSyn.MakeSyntaxList;
 begin
diff --git a/components/extrasyn/SyneditHighlighters/synhighlighterbaan.pas b/components/extrasyn/SyneditHighlighters/synhighlighterbaan.pas
index d3854393b..0248aaf1e 100644
--- a/components/extrasyn/SyneditHighlighters/synhighlighterbaan.pas
+++ b/components/extrasyn/SyneditHighlighters/synhighlighterbaan.pas
@@ -244,7 +244,7 @@ type
 implementation
 
 uses
-  SynEditStrConst;
+  SynEditStrConst, SynEditStrConstExtra;
 
 var
   Identifiers: array[#0..#255] of ByteBool;
diff --git a/components/extrasyn/SyneditHighlighters/synhighlightercac.pas b/components/extrasyn/SyneditHighlighters/synhighlightercac.pas
index d034a5460..34f3f1e19 100644
--- a/components/extrasyn/SyneditHighlighters/synhighlightercac.pas
+++ b/components/extrasyn/SyneditHighlighters/synhighlightercac.pas
@@ -223,7 +223,7 @@ type
 implementation
 
 uses
-  SynEditStrConst;
+  SynEditStrConst, SynEditStrConstExtra;
 
 var
   Identifiers: array[#0..#255] of ByteBool;
diff --git a/components/extrasyn/SyneditHighlighters/synhighlightercache.pas b/components/extrasyn/SyneditHighlighters/synhighlightercache.pas
index 7172d07b7..89fda1167 100644
--- a/components/extrasyn/SyneditHighlighters/synhighlightercache.pas
+++ b/components/extrasyn/SyneditHighlighters/synhighlightercache.pas
@@ -313,7 +313,7 @@ uses
 {$IFDEF SYN_CLX}
   QSynEditStrConst;
 {$ELSE}
-  SynEditStrConst;
+  SynEditStrConst, SynEditStrConstExtra;
 {$ENDIF}
 
 var
diff --git a/components/extrasyn/SyneditHighlighters/synhighlighterdml.pas b/components/extrasyn/SyneditHighlighters/synhighlighterdml.pas
index b8ee01565..3a02fdd74 100644
--- a/components/extrasyn/SyneditHighlighters/synhighlighterdml.pas
+++ b/components/extrasyn/SyneditHighlighters/synhighlighterdml.pas
@@ -313,7 +313,7 @@ type
 implementation
 
 uses
-  SynEditStrConst;
+  SynEditStrConst, SynEditStrConstExtra;
 
 var
   Identifiers: array[#0..#255] of ByteBool;
diff --git a/components/extrasyn/SyneditHighlighters/synhighlighterfortran.pas b/components/extrasyn/SyneditHighlighters/synhighlighterfortran.pas
index fc3f4fb47..39d16cee8 100644
--- a/components/extrasyn/SyneditHighlighters/synhighlighterfortran.pas
+++ b/components/extrasyn/SyneditHighlighters/synhighlighterfortran.pas
@@ -196,7 +196,7 @@ type
 implementation
 
 uses
-  SynEditStrConst;
+  SynEditStrConst, SynEditStrConstExtra;
 
 var
   Identifiers: array[#0..#255] of ByteBool;
diff --git a/components/extrasyn/SyneditHighlighters/synhighlighterfoxpro.pas b/components/extrasyn/SyneditHighlighters/synhighlighterfoxpro.pas
index 88d919a36..b96f33b69 100644
--- a/components/extrasyn/SyneditHighlighters/synhighlighterfoxpro.pas
+++ b/components/extrasyn/SyneditHighlighters/synhighlighterfoxpro.pas
@@ -258,7 +258,7 @@ type
 implementation
 
 uses
-  SynEditStrConst;
+  SynEditStrConst, SynEditStrConstExtra;
 
 var
   Identifiers: array[#0..#255] of ByteBool;
diff --git a/components/extrasyn/SyneditHighlighters/synhighlightergalaxy.pas b/components/extrasyn/SyneditHighlighters/synhighlightergalaxy.pas
index 08d311b3a..de23ee53d 100644
--- a/components/extrasyn/SyneditHighlighters/synhighlightergalaxy.pas
+++ b/components/extrasyn/SyneditHighlighters/synhighlightergalaxy.pas
@@ -133,7 +133,7 @@ type
 implementation
 
 uses
-  SynEditStrConst;
+  SynEditStrConst, SynEditStrConstExtra;
 
 var
   Identifiers: array[#0..#255] of ByteBool;
diff --git a/components/extrasyn/SyneditHighlighters/synhighlightergws.pas b/components/extrasyn/SyneditHighlighters/synhighlightergws.pas
index d7e22187d..e2d21b42a 100644
--- a/components/extrasyn/SyneditHighlighters/synhighlightergws.pas
+++ b/components/extrasyn/SyneditHighlighters/synhighlightergws.pas
@@ -199,7 +199,7 @@ Type
 implementation
 
 uses
-  SynEditStrConst;
+  SynEditStrConst, SynEditStrConstExtra;
 
 var
   Identifiers: array[#0..#255] of ByteBool;
diff --git a/components/extrasyn/SyneditHighlighters/synhighlighteridl.pas b/components/extrasyn/SyneditHighlighters/synhighlighteridl.pas
index afb069f6d..9731b0e5a 100644
--- a/components/extrasyn/SyneditHighlighters/synhighlighteridl.pas
+++ b/components/extrasyn/SyneditHighlighters/synhighlighteridl.pas
@@ -193,7 +193,7 @@ type
 implementation
 
 uses
-  SynEditStrConst;
+  SynEditStrConst, SynEditStrConstExtra;
 
 var
   Identifiers: array[#0..#255] of ByteBool;
diff --git a/components/extrasyn/SyneditHighlighters/synhighlighterkix.pas b/components/extrasyn/SyneditHighlighters/synhighlighterkix.pas
index e56cb0ac9..d50805d2c 100644
--- a/components/extrasyn/SyneditHighlighters/synhighlighterkix.pas
+++ b/components/extrasyn/SyneditHighlighters/synhighlighterkix.pas
@@ -263,7 +263,7 @@ type
 implementation
 
 uses
-  SynEditStrConst;
+  SynEditStrConst, SynEditStrConstExtra;
 
 var
   Identifiers: array[#0..#255] of ByteBool;
diff --git a/components/extrasyn/SyneditHighlighters/synhighlighterm3.pas b/components/extrasyn/SyneditHighlighters/synhighlighterm3.pas
index 952f4a755..557539708 100644
--- a/components/extrasyn/SyneditHighlighters/synhighlighterm3.pas
+++ b/components/extrasyn/SyneditHighlighters/synhighlighterm3.pas
@@ -159,7 +159,7 @@ type
 implementation
 
 uses
-  SynEditStrConst;
+  SynEditStrConst, SynEditStrConstExtra;
 
 var
   Identifiers: array[#0..#255] of ByteBool;
diff --git a/components/extrasyn/SyneditHighlighters/synhighlightermodelica.pas b/components/extrasyn/SyneditHighlighters/synhighlightermodelica.pas
index a8f34f719..a8459a7af 100644
--- a/components/extrasyn/SyneditHighlighters/synhighlightermodelica.pas
+++ b/components/extrasyn/SyneditHighlighters/synhighlightermodelica.pas
@@ -190,7 +190,7 @@ type
 implementation
 
 uses
-  SynEditStrConst;
+  SynEditStrConst, SynEditStrConstExtra;
 
 var
   Identifiers: array[#0..#255] of ByteBool;
diff --git a/components/extrasyn/SyneditHighlighters/synhighlighterprogress.pas b/components/extrasyn/SyneditHighlighters/synhighlighterprogress.pas
index 566f2bc18..d337de39e 100644
--- a/components/extrasyn/SyneditHighlighters/synhighlighterprogress.pas
+++ b/components/extrasyn/SyneditHighlighters/synhighlighterprogress.pas
@@ -496,7 +496,7 @@ procedure Register;
 implementation
 
 uses
-  SynEditStrConst;
+  SynEditStrConst, SynEditStrConstExtra;
 
 var
   Identifiers: array[#0..#255] of ByteBool;
diff --git a/components/extrasyn/SyneditHighlighters/synhighlightersdd.pas b/components/extrasyn/SyneditHighlighters/synhighlightersdd.pas
index c2bee8055..a0c97e33f 100644
--- a/components/extrasyn/SyneditHighlighters/synhighlightersdd.pas
+++ b/components/extrasyn/SyneditHighlighters/synhighlightersdd.pas
@@ -175,7 +175,7 @@ uses
 {$IFDEF SYN_CLX}
   QSynEditStrConst;
 {$ELSE}
-  SynEditStrConst;
+  SynEditStrConst, SynEditStrConstExtra;
 {$ENDIF}
 
 var
diff --git a/components/extrasyn/SyneditHighlighters/synhighlightersml.pas b/components/extrasyn/SyneditHighlighters/synhighlightersml.pas
index 0d111a953..e16b8fade 100644
--- a/components/extrasyn/SyneditHighlighters/synhighlightersml.pas
+++ b/components/extrasyn/SyneditHighlighters/synhighlightersml.pas
@@ -211,7 +211,7 @@ uses
 {$IFDEF SYN_CLX}
   QSynEditStrConst;
 {$ELSE}
-  SynEditStrConst;
+  SynEditStrConst, SynEditStrConstExtra;
 {$ENDIF}
 
 const
diff --git a/components/extrasyn/SyneditHighlighters/synhighlightertcltk.pas b/components/extrasyn/SyneditHighlighters/synhighlightertcltk.pas
index 479a4c3b2..c853360bf 100644
--- a/components/extrasyn/SyneditHighlighters/synhighlightertcltk.pas
+++ b/components/extrasyn/SyneditHighlighters/synhighlightertcltk.pas
@@ -174,7 +174,7 @@ uses
 {$IFDEF SYN_CLX}
   QSynEditStrConst;
 {$ELSE}
-  SynEditStrConst;
+  SynEditStrConst, SynEditStrConstExtra;
 {$ENDIF}
 
 const
diff --git a/components/extrasyn/SyneditHighlighters/synhighlightervbscript.pas b/components/extrasyn/SyneditHighlighters/synhighlightervbscript.pas
index 3d727b403..23939a315 100644
--- a/components/extrasyn/SyneditHighlighters/synhighlightervbscript.pas
+++ b/components/extrasyn/SyneditHighlighters/synhighlightervbscript.pas
@@ -216,7 +216,7 @@ uses
 {$IFDEF SYN_CLX}
   QSynEditStrConst;
 {$ELSE}
-  SynEditStrConst;
+  SynEditStrConst, SynEditStrConstExtra;
 {$ENDIF}
 
 var
diff --git a/components/extrasyn/TestHighlighters/TestSynHighlighter.lpi b/components/extrasyn/TestHighlighters/TestSynHighlighter.lpi
index 07b8a9797..e349d1284 100644
--- a/components/extrasyn/TestHighlighters/TestSynHighlighter.lpi
+++ b/components/extrasyn/TestHighlighters/TestSynHighlighter.lpi
@@ -59,8 +59,8 @@
         <UnitName Value="Unit1"/>
         <IsVisibleTab Value="True"/>
         <EditorIndex Value="1"/>
-        <TopLine Value="71"/>
-        <CursorPos X="40" Y="95"/>
+        <TopLine Value="116"/>
+        <CursorPos X="53" Y="89"/>
         <UsageCount Value="81"/>
         <Bookmarks Count="1">
           <Item0 Y="144" ID="2"/>
@@ -967,6 +967,11 @@
         <UseAnsiStrings Value="False"/>
       </SyntaxOptions>
     </Parsing>
+    <Linking>
+      <Debugging>
+        <DebugInfoType Value="dsDwarf3"/>
+      </Debugging>
+    </Linking>
   </CompilerOptions>
   <Debugging>
     <Watches Count="1">