diff --git a/.gitignore b/.gitignore
index bdc3535f..ca26b19c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@ TestResults
 ## files generated by popular Visual Studio add-ons.
 
 # User-specific files
+.vs/
 *.suo
 *.user
 *.sln.docstates
@@ -106,3 +107,4 @@ Generated_Code #added for RIA/Silverlight projects
 _UpgradeReport_Files/
 Backup*/
 UpgradeLog*.XML
+/mytest
diff --git a/FastColoredTextBox.sln b/FastColoredTextBox.sln
index 17b7d834..d9184863 100644
--- a/FastColoredTextBox.sln
+++ b/FastColoredTextBox.sln
@@ -1,9 +1,11 @@
 
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.30320.27
+MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tester", "Tester\Tester.csproj", "{EBE443EE-F4C7-49E6-AC22-959CA62FAA05}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FastColoredTextBox", "FastColoredTextBox\FastColoredTextBox.csproj", "{6DD14A85-CCFC-4774-BD26-0F5772512319}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FastColoredTextBox", "FastColoredTextBox\FastColoredTextBox.csproj", "{6DD14A85-CCFC-4774-BD26-0F5772512319}"
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "TesterVB", "TesterVB\TesterVB.vbproj", "{3EF3A5A0-2365-41FD-97A0-254A2CFC6577}"
 EndProject
@@ -51,4 +53,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {742C02CF-4566-488A-A923-493BF132C1CA}
+	EndGlobalSection
 EndGlobal
diff --git a/FastColoredTextBox/AutocompleteItem.cs b/FastColoredTextBox/AutocompleteItem.cs
index 59feec4d..620ae588 100644
--- a/FastColoredTextBox/AutocompleteItem.cs
+++ b/FastColoredTextBox/AutocompleteItem.cs
@@ -59,7 +59,7 @@ public virtual string GetTextForReplace()
         /// </summary>
         public virtual CompareResult Compare(string fragmentText)
         {
-            if (Text.StartsWith(fragmentText, StringComparison.InvariantCultureIgnoreCase) &&
+            if(string.IsNullOrEmpty(fragmentText) || Text.ToLowerInvariant().Contains(fragmentText.ToLowerInvariant()) &&
                    Text != fragmentText)
                 return CompareResult.VisibleAndSelected;
 
diff --git a/FastColoredTextBox/AutocompleteMenu.cs b/FastColoredTextBox/AutocompleteMenu.cs
index 829783ac..ff34c2b0 100644
--- a/FastColoredTextBox/AutocompleteMenu.cs
+++ b/FastColoredTextBox/AutocompleteMenu.cs
@@ -402,7 +402,8 @@ internal void DoAutocomplete(bool forced)
                 && (tb.Selection.Start > fragment.Start || text.Length == 0/*pops up only if caret is after first letter*/)))
             {
                 Menu.Fragment = fragment;
-                bool foundSelected = false;
+                //bool foundSelected = false;
+                AutocompleteItem foundItem = null;
                 //build popup menu
                 foreach (var item in sourceItems)
                 {
@@ -410,15 +411,34 @@ internal void DoAutocomplete(bool forced)
                     CompareResult res = item.Compare(text);
                     if(res != CompareResult.Hidden)
                         visibleItems.Add(item);
-                    if (res == CompareResult.VisibleAndSelected && !foundSelected)
+                    if (res == CompareResult.VisibleAndSelected && foundItem != null)
                     {
-                        foundSelected = true;
-                        FocussedItemIndex = visibleItems.Count - 1;
+                        foundItem = item;
+                        //FocussedItemIndex = visibleItems.Count - 1;
                     }
                 }
 
-                if (foundSelected)
+                visibleItems.Sort((AutocompleteItem a, AutocompleteItem b)=> {
+                    var indexA = a.Text.IndexOf(text, StringComparison.InvariantCultureIgnoreCase);
+                    var indexB = b.Text.IndexOf(text, StringComparison.InvariantCultureIgnoreCase);
+
+                    if(indexA == indexB) {
+                        if(a.Text.Length == b.Text.Length) return string.Compare(a.Text, b.Text, true);
+                        return a.Text.Length - b.Text.Length;
+                    }
+                    else {
+                        if(indexA == -1) return 1;
+                        if(indexB == -1) return -1;
+                    }
+
+                    return indexA - indexB;
+                });
+
+                if (foundItem != null)
                 {
+
+                    FocussedItemIndex = visibleItems.IndexOf(foundItem);
+
                     AdjustScroll();
                     DoSelectedVisible();
                 }
diff --git a/FastColoredTextBox/CharSizeCache.cs b/FastColoredTextBox/CharSizeCache.cs
new file mode 100644
index 00000000..51dad64f
--- /dev/null
+++ b/FastColoredTextBox/CharSizeCache.cs
@@ -0,0 +1,46 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+
+namespace FastColoredTextBoxNS
+{
+    /// <summary>
+    /// Calling MeasureText on each char is extremly slow
+    /// Thankfully the size of the char does not change for the same font
+    /// However we would still need to indentify the font somehow
+    /// </summary>
+    static class CharSizeCache
+    {
+        static readonly Dictionary<string, SizeF> cache = new Dictionary<string, SizeF>();
+        internal static SizeF GetCharSize(Font font, char c)
+        {
+            var key = GetKey(font, c);
+            if (!cache.ContainsKey(key))
+            {
+                Size sz2 = TextRenderer.MeasureText("<" + c.ToString() + ">", font);
+                Size sz3 = TextRenderer.MeasureText("<>", font);
+                cache[key] = new SizeF(sz2.Width - sz3.Width + 1, /*sz2.Height*/font.Height);
+            }
+            return cache[key];
+        }
+
+        /// <summary>
+        /// Font is disposable, so we need to indentify it without keeping manged resources
+        /// </summary>
+        /// <param name="font"></param>
+        /// <param name="c"></param>
+        /// <returns></returns>
+        private static string GetKey(Font font, char c)
+        {
+            return font.FontFamily.Name
+                    + ":" + font.Size
+                    + ":" + font.Style
+                    + ":" + font.Unit
+                    + ":" + font.GdiCharSet
+                    + ":" + font.GdiVerticalFont
+                    + ":" + c;
+        }
+    }
+}
diff --git a/FastColoredTextBox/FastColoredTextBox.cs b/FastColoredTextBox/FastColoredTextBox.cs
index d7e2a1e9..aeec0473 100644
--- a/FastColoredTextBox/FastColoredTextBox.cs
+++ b/FastColoredTextBox/FastColoredTextBox.cs
@@ -169,8 +169,8 @@ public FastColoredTextBox()
             RightBracket = '\x0';
             LeftBracket2 = '\x0';
             RightBracket2 = '\x0';
-            SyntaxHighlighter = new SyntaxHighlighter(this);
             language = Language.Custom;
+            SyntaxHighlighter = SyntaxHighlighter.CreateSyntaxHighlighter(this, language);
             PreferredLineWidth = 0;
             needRecalc = true;
             lastNavigatedDateTime = DateTime.Now;
@@ -288,7 +288,7 @@ public override bool AllowDrop
             get { return base.AllowDrop; }
             set { base.AllowDrop = value; }
         }
-
+        
         /// <summary>
         /// Collection of Hints.
         /// This is temporary buffer for currently displayed hints.
@@ -821,7 +821,7 @@ public Style[] Styles
         /// </summary>
         [Description("Here you can change hotkeys for FastColoredTextBox.")]
         [Editor(typeof(HotkeysEditor), typeof(UITypeEditor))]
-        [DefaultValue("Tab=IndentIncrease, Escape=ClearHints, PgUp=GoPageUp, PgDn=GoPageDown, End=GoEnd, Home=GoHome, Left=GoLeft, Up=GoUp, Right=GoRight, Down=GoDown, Ins=ReplaceMode, Del=DeleteCharRight, F3=FindNext, Shift+Tab=IndentDecrease, Shift+PgUp=GoPageUpWithSelection, Shift+PgDn=GoPageDownWithSelection, Shift+End=GoEndWithSelection, Shift+Home=GoHomeWithSelection, Shift+Left=GoLeftWithSelection, Shift+Up=GoUpWithSelection, Shift+Right=GoRightWithSelection, Shift+Down=GoDownWithSelection, Shift+Ins=Paste, Shift+Del=Cut, Ctrl+Back=ClearWordLeft, Ctrl+Space=AutocompleteMenu, Ctrl+End=GoLastLine, Ctrl+Home=GoFirstLine, Ctrl+Left=GoWordLeft, Ctrl+Up=ScrollUp, Ctrl+Right=GoWordRight, Ctrl+Down=ScrollDown, Ctrl+Ins=Copy, Ctrl+Del=ClearWordRight, Ctrl+0=ZoomNormal, Ctrl+A=SelectAll, Ctrl+B=BookmarkLine, Ctrl+C=Copy, Ctrl+E=MacroExecute, Ctrl+F=FindDialog, Ctrl+G=GoToDialog, Ctrl+H=ReplaceDialog, Ctrl+I=AutoIndentChars, Ctrl+M=MacroRecord, Ctrl+N=GoNextBookmark, Ctrl+R=Redo, Ctrl+U=UpperCase, Ctrl+V=Paste, Ctrl+X=Cut, Ctrl+Z=Undo, Ctrl+Add=ZoomIn, Ctrl+Subtract=ZoomOut, Ctrl+OemMinus=NavigateBackward, Ctrl+Shift+End=GoLastLineWithSelection, Ctrl+Shift+Home=GoFirstLineWithSelection, Ctrl+Shift+Left=GoWordLeftWithSelection, Ctrl+Shift+Right=GoWordRightWithSelection, Ctrl+Shift+B=UnbookmarkLine, Ctrl+Shift+C=CommentSelected, Ctrl+Shift+N=GoPrevBookmark, Ctrl+Shift+U=LowerCase, Ctrl+Shift+OemMinus=NavigateForward, Alt+Back=Undo, Alt+Up=MoveSelectedLinesUp, Alt+Down=MoveSelectedLinesDown, Alt+F=FindChar, Alt+Shift+Left=GoLeft_ColumnSelectionMode, Alt+Shift+Up=GoUp_ColumnSelectionMode, Alt+Shift+Right=GoRight_ColumnSelectionMode, Alt+Shift+Down=GoDown_ColumnSelectionMode")]
+        [DefaultValue("Tab=IndentIncrease, Escape=ClearHints, PgUp=GoPageUp, PgDn=GoPageDown, End=GoEnd, Home=GoHome, Left=GoLeft, Up=GoUp, Right=GoRight, Down=GoDown, Ins=ReplaceMode, Del=DeleteCharRight, F3=FindNext, Shift+Tab=IndentDecrease, Shift+PgUp=GoPageUpWithSelection, Shift+PgDn=GoPageDownWithSelection, Shift+End=GoEndWithSelection, Shift+Home=GoHomeWithSelection, Shift+Left=GoLeftWithSelection, Shift+Up=GoUpWithSelection, Shift+Right=GoRightWithSelection, Shift+Down=GoDownWithSelection, Shift+Ins=Paste, Shift+Del=Cut, Ctrl+Back=ClearWordLeft, Ctrl+Space=AutocompleteMenu, Ctrl+End=GoLastLine, Ctrl+Home=GoFirstLine, Ctrl+Left=GoWordLeft, Ctrl+Up=ScrollUp, Ctrl+Right=GoWordRight, Ctrl+Down=ScrollDown, Ctrl+Ins=Copy, Ctrl+Del=ClearWordRight, Ctrl+0=ZoomNormal, Ctrl+A=SelectAll, Ctrl+B=BookmarkLine, Ctrl+C=Copy, Ctrl+E=MacroExecute, Ctrl+F=FindDialog, Ctrl+G=GoToDialog, Ctrl+H=ReplaceDialog, Ctrl+I=AutoIndentChars, Ctrl+M=MacroRecord, Ctrl+N=GoNextBookmark, Ctrl+R=Redo, Ctrl+U=UpperCase, Ctrl+V=Paste, Ctrl+X=Cut, Ctrl+Z=Undo, Ctrl+Add=ZoomIn, Ctrl+Subtract=ZoomOut, Ctrl+OemMinus=NavigateBackward, Ctrl+Shift+End=GoLastLineWithSelection, Ctrl+Shift+Home=GoFirstLineWithSelection, Ctrl+Shift+Left=GoWordLeftWithSelection, Ctrl+Shift+Right=GoWordRightWithSelection, Ctrl+Shift+B=UnbookmarkLine, Ctrl+Shift+C=CommentSelected, Ctrl+Shift+N=GoPrevBookmark, Ctrl+Shift+U=LowerCase, Ctrl+Shift+OemMinus=NavigateForward, Alt+Back=Undo, Alt+Up=MoveSelectedLinesUp, Alt+Down=MoveSelectedLinesDown, Alt+F=FindChar, Alt+Shift+Left=GoLeft_ColumnSelectionMode, Alt+Shift+Up=GoUp_ColumnSelectionMode, Alt+Shift+Right=GoRight_ColumnSelectionMode, Alt+Shift+Down=GoDown_ColumnSelectionMode, Ctrl+D=CloneLine")]
         public string Hotkeys { 
             get { return HotkeysMapping.ToString(); }
             set { HotkeysMapping = HotkeysMapping.Parse(value); }
@@ -1005,8 +1005,7 @@ public Language Language
             set
             {
                 language = value;
-                if (SyntaxHighlighter != null)
-                    SyntaxHighlighter.InitStyleSchema(language);
+                SyntaxHighlighter = SyntaxHighlighter.CreateSyntaxHighlighter(this, language);
                 Invalidate();
             }
         }
@@ -1020,13 +1019,13 @@ public Language Language
 
         /// <summary>
         /// XML file with description of syntax highlighting.
-        /// This property works only with Language == Language.Custom.
+        /// This property works only with Language == Language.FromXMLfile.
         /// </summary>
         [Browsable(true)]
         [DefaultValue(null)]
         [Editor(typeof (FileNameEditor), typeof (UITypeEditor))]
         [Description(
-            "XML file with description of syntax highlighting. This property works only with Language == Language.Custom."
+            "XML file with description of syntax highlighting. This property works only with Language == Language.FromXMLfile."
             )]
         public string DescriptionFile
         {
@@ -2901,10 +2900,7 @@ internal int GetOrSetStyleLayerIndex(Style style)
 
         public static SizeF GetCharSize(Font font, char c)
         {
-            Size sz2 = TextRenderer.MeasureText("<" + c.ToString() + ">", font);
-            Size sz3 = TextRenderer.MeasureText("<>", font);
-
-            return new SizeF(sz2.Width - sz3.Width + 1, /*sz2.Height*/font.Height);
+            return CharSizeCache.GetCharSize(font, c);
         }
 
         [DllImport("Imm32.dll")]
@@ -3752,6 +3748,10 @@ private void DoAction(FCTBAction action)
                     BookmarkLine(Selection.Start.iLine);
                     break;
 
+                case FCTBAction.CloneLine:
+                    CloneLine(Selection);
+                    break;
+
                 case FCTBAction.GoNextBookmark:
                     GotoNextBookmark(Selection.Start.iLine);
                     break;
@@ -4118,6 +4118,21 @@ public virtual void BookmarkLine(int iLine)
                 bookmarks.Add(iLine);
         }
 
+        /// <summary>
+        /// Clones current line
+        /// </summary>
+        public virtual void CloneLine(Range selection)
+        {
+            // expand selection
+            selection.Expand();
+            // get text of selected lines
+            string text = Environment.NewLine + selection.Text;
+            // move caret to end of selected lines
+            selection.Start = selection.End;
+            // insert text
+            InsertText(text);
+        }
+
         /// <summary>
         /// Unbookmarks current line
         /// </summary>
@@ -4731,7 +4746,7 @@ public virtual int CalcAutoIndent(int iLine)
 
             EventHandler<AutoIndentEventArgs> calculator = AutoIndentNeeded;
             if (calculator == null)
-                if (Language != Language.Custom && SyntaxHighlighter != null)
+                if (Language != Language.Custom && Language != Language.FromXMLfile && SyntaxHighlighter != null)
                     calculator = SyntaxHighlighter.AutoIndentNeeded;
                 else
                     calculator = CalcAutoIndentShiftByCodeFolding;
@@ -7265,10 +7280,7 @@ public virtual void OnSyntaxHighlight(TextChangedEventArgs args)
 
             if (SyntaxHighlighter != null)
             {
-                if (Language == Language.Custom && !string.IsNullOrEmpty(DescriptionFile))
-                    SyntaxHighlighter.HighlightSyntax(DescriptionFile, range);
-                else
-                    SyntaxHighlighter.HighlightSyntax(Language, range);
+                SyntaxHighlighter.SyntaxHighlight(range);
             }
 
 #if debug
diff --git a/FastColoredTextBox/FastColoredTextBox.csproj b/FastColoredTextBox/FastColoredTextBox.csproj
index 0707e4e2..938e167a 100644
--- a/FastColoredTextBox/FastColoredTextBox.csproj
+++ b/FastColoredTextBox/FastColoredTextBox.csproj
@@ -1,37 +1,17 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.21022</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{6DD14A85-CCFC-4774-BD26-0F5772512319}</ProjectGuid>
+    <TargetFrameworks>netcoreapp3.1;net35</TargetFrameworks>
+	<UseWindowsForms>true</UseWindowsForms>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>FastColoredTextBoxNS</RootNamespace>
-    <AssemblyName>FastColoredTextBox</AssemblyName>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'net35'">
+    <Reference Include="System.Design" />
+  </ItemGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
     <DocumentationFile>bin\Debug\FastColoredTextBox.XML</DocumentationFile>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
   <PropertyGroup>
     <SignAssembly>true</SignAssembly>
   </PropertyGroup>
@@ -39,110 +19,47 @@
     <AssemblyOriginatorKeyFile>FCTB_key.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Design" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.XML" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AutocompleteItem.cs" />
-    <Compile Include="AutocompleteMenu.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="Bookmarks.cs" />
-    <Compile Include="Char.cs" />
-    <Compile Include="DocumentMap.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="EncodingDetector.cs" />
-    <Compile Include="ExportToHTML.cs" />
-    <Compile Include="ExportToRTF.cs" />
-    <Compile Include="GoToForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="GoToForm.Designer.cs">
+    <Compile Update="AutocompleteMenu.cs" />
+    <Compile Update="DocumentMap.cs" />
+    <Compile Update="GoToForm.cs" />
+    <Compile Update="GoToForm.Designer.cs">
       <DependentUpon>GoToForm.cs</DependentUpon>
     </Compile>
-    <Compile Include="Hints.cs" />
-    <Compile Include="HotkeysEditorForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="HotkeysEditorForm.Designer.cs">
+    <Compile Update="HotkeysEditorForm.cs" />
+    <Compile Update="HotkeysEditorForm.Designer.cs">
       <DependentUpon>HotkeysEditorForm.cs</DependentUpon>
     </Compile>
-    <Compile Include="LineNumberFormatting.cs" />
-    <Compile Include="LinesAccessor.cs" />
-    <Compile Include="MacrosManager.cs" />
-    <Compile Include="PlatformType.cs" />
-    <Compile Include="Hotkeys.cs" />
-    <Compile Include="Ruler.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Ruler.Designer.cs">
+    <Compile Update="Ruler.cs" />
+    <Compile Update="Ruler.Designer.cs">
       <DependentUpon>Ruler.cs</DependentUpon>
     </Compile>
-    <Compile Include="SyntaxDescriptor.cs" />
-    <Compile Include="SyntaxHighlighter.cs" />
-    <Compile Include="ReplaceForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="ReplaceForm.Designer.cs">
+    <Compile Update="ReplaceForm.cs" />
+    <Compile Update="ReplaceForm.Designer.cs">
       <DependentUpon>ReplaceForm.cs</DependentUpon>
     </Compile>
-    <Compile Include="FastColoredTextBox.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="CommandManager.cs" />
-    <Compile Include="Commands.cs" />
-    <Compile Include="FindForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="FindForm.Designer.cs">
+    <Compile Update="FastColoredTextBox.cs" />
+    <Compile Update="FindForm.cs" />
+    <Compile Update="FindForm.Designer.cs">
       <DependentUpon>FindForm.cs</DependentUpon>
     </Compile>
-    <Compile Include="LimitedStack.cs" />
-    <Compile Include="Line.cs" />
-    <Compile Include="Place.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Range.cs" />
-    <Compile Include="Style.cs" />
-    <Compile Include="TextSource.cs" />
-    <Compile Include="TypeDescriptor.cs" />
-    <Compile Include="FileTextSource.cs" />
-    <Compile Include="UnfocusablePanel.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="VisualMarker.cs" />
+    <Compile Update="UnfocusablePanel.cs" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="FastColoredTextBox.resx">
+    <EmbeddedResource Update="FastColoredTextBox.resx">
       <DependentUpon>FastColoredTextBox.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="FindForm.resx">
+    <EmbeddedResource Update="FindForm.resx">
       <DependentUpon>FindForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="GoToForm.resx">
+    <EmbeddedResource Update="GoToForm.resx">
       <DependentUpon>GoToForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="HotkeysEditorForm.resx">
+    <EmbeddedResource Update="HotkeysEditorForm.resx">
       <DependentUpon>HotkeysEditorForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="ReplaceForm.resx">
+    <EmbeddedResource Update="ReplaceForm.resx">
       <DependentUpon>ReplaceForm.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="FCTB_key.snk" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>
\ No newline at end of file
diff --git a/FastColoredTextBox/Hotkeys.cs b/FastColoredTextBox/Hotkeys.cs
index 9bac1020..1bc2c522 100644
--- a/FastColoredTextBox/Hotkeys.cs
+++ b/FastColoredTextBox/Hotkeys.cs
@@ -91,7 +91,8 @@ public virtual void InitDefault()
             this[KEYS.Control | KEYS.Subtract] = FCTBAction.ZoomOut;
             this[KEYS.Control | KEYS.Add] = FCTBAction.ZoomIn;
             this[KEYS.Control | KEYS.D0] = FCTBAction.ZoomNormal;
-            this[KEYS.Control | KEYS.I] = FCTBAction.AutoIndentChars;   
+            this[KEYS.Control | KEYS.I] = FCTBAction.AutoIndentChars;
+            this[KEYS.Control | KEYS.D] = FCTBAction.CloneLine;
         }
 
         public override string ToString()
@@ -147,6 +148,7 @@ public enum FCTBAction
         ClearHints,
         ClearWordLeft,
         ClearWordRight,
+        CloneLine,
         CommentSelected,
         Copy,
         Cut,
diff --git a/FastColoredTextBox/Style.cs b/FastColoredTextBox/Style.cs
index 08b1833f..61b6b1b9 100644
--- a/FastColoredTextBox/Style.cs
+++ b/FastColoredTextBox/Style.cs
@@ -210,6 +210,16 @@ public override RTFStyleDescriptor GetRTF()
 
             return result;
         }
+
+        public override bool Equals(object obj)
+        {
+            TextStyle ts = obj as TextStyle;
+            if (ts != null)
+            {
+                return (ForeBrush == ts.ForeBrush) && (BackgroundBrush == ts.BackgroundBrush) && (FontStyle == ts.FontStyle) && (stringFormat == ts.stringFormat);
+            }
+            else return false;
+        }
     }
 
     /// <summary>
diff --git a/FastColoredTextBox/SyntaxHighlighter.cs b/FastColoredTextBox/SyntaxHighlighter.cs
index 17914b3e..e487405c 100644
--- a/FastColoredTextBox/SyntaxHighlighter.cs
+++ b/FastColoredTextBox/SyntaxHighlighter.cs
@@ -1,1466 +1,253 @@
 using System;
 using System.Collections.Generic;
 using System.Drawing;
-using System.Globalization;
-using System.IO;
+using System.Text;
 using System.Text.RegularExpressions;
-using System.Xml;
+using FastColoredTextBoxNS.SyntaxSources;
 
 namespace FastColoredTextBoxNS
 {
-    public class SyntaxHighlighter : IDisposable
+    public abstract class SyntaxHighlighter : IDisposable
     {
-        //styles
-        protected static readonly Platform platformType = PlatformType.GetOperationSystemPlatform();
-        public readonly Style BlueBoldStyle = new TextStyle(Brushes.Blue, null, FontStyle.Bold);
-        public readonly Style BlueStyle = new TextStyle(Brushes.Blue, null, FontStyle.Regular);
-        public readonly Style BoldStyle = new TextStyle(null, null, FontStyle.Bold | FontStyle.Underline);
-        public readonly Style BrownStyle = new TextStyle(Brushes.Brown, null, FontStyle.Italic);
-        public readonly Style GrayStyle = new TextStyle(Brushes.Gray, null, FontStyle.Regular);
-        public readonly Style GreenStyle = new TextStyle(Brushes.Green, null, FontStyle.Italic);
-        public readonly Style MagentaStyle = new TextStyle(Brushes.Magenta, null, FontStyle.Regular);
-        public readonly Style MaroonStyle = new TextStyle(Brushes.Maroon, null, FontStyle.Regular);
-        public readonly Style RedStyle = new TextStyle(Brushes.Red, null, FontStyle.Regular);
-        public readonly Style BlackStyle = new TextStyle(Brushes.Black, null, FontStyle.Regular);
-        //
-        protected readonly Dictionary<string, SyntaxDescriptor> descByXMLfileNames =
-            new Dictionary<string, SyntaxDescriptor>();
-
-        protected readonly List<Style> resilientStyles = new List<Style>(5);
-
-        protected Regex CSharpAttributeRegex,
-                      CSharpClassNameRegex;
-
-        protected Regex CSharpCommentRegex1,
-                      CSharpCommentRegex2,
-                      CSharpCommentRegex3;
-
-        protected Regex CSharpKeywordRegex;
-        protected Regex CSharpNumberRegex;
-        protected Regex CSharpStringRegex;
-
-        protected Regex HTMLAttrRegex,
-                      HTMLAttrValRegex,
-                      HTMLCommentRegex1,
-                      HTMLCommentRegex2;
-
-        protected Regex HTMLEndTagRegex;
-
-        protected Regex HTMLEntityRegex,
-                      HTMLTagContentRegex;
-
-        protected Regex HTMLTagNameRegex;
-        protected Regex HTMLTagRegex;
-
-        protected Regex XMLAttrRegex,
-                      XMLAttrValRegex,
-                      XMLCommentRegex1,
-                      XMLCommentRegex2;
-
-        protected Regex XMLEndTagRegex;
-
-        protected Regex XMLEntityRegex,
-                      XMLTagContentRegex;
-
-        protected Regex XMLTagNameRegex;
-        protected Regex XMLTagRegex;
-        protected Regex XMLCDataRegex;
-        protected Regex XMLFoldingRegex;
-
-        protected Regex JScriptCommentRegex1,
-                      JScriptCommentRegex2,
-                      JScriptCommentRegex3;
-
-        protected Regex JScriptKeywordRegex;
-        protected Regex JScriptNumberRegex;
-        protected Regex JScriptStringRegex;
-
-        protected Regex JSONKeywordRegex;
-        protected Regex JSONNumberRegex;
-        protected Regex JSONStringRegex;
-
-        protected Regex LuaCommentRegex1,
-                      LuaCommentRegex2,
-                      LuaCommentRegex3;
-
-        protected Regex LuaKeywordRegex;
-        protected Regex LuaNumberRegex;
-        protected Regex LuaStringRegex;
-        protected Regex LuaFunctionsRegex;
-
-        protected Regex PHPCommentRegex1,
-                      PHPCommentRegex2,
-                      PHPCommentRegex3;
-
-        protected Regex PHPKeywordRegex1,
-                      PHPKeywordRegex2,
-                      PHPKeywordRegex3;
-
-        protected Regex PHPNumberRegex;
-        protected Regex PHPStringRegex;
-        protected Regex PHPVarRegex;
-
-        protected Regex SQLCommentRegex1,
-                      SQLCommentRegex2,
-                      SQLCommentRegex3, 
-                      SQLCommentRegex4;
-
-        protected Regex SQLFunctionsRegex;
-        protected Regex SQLKeywordsRegex;
-        protected Regex SQLNumberRegex;
-        protected Regex SQLStatementsRegex;
-        protected Regex SQLStringRegex;
-        protected Regex SQLTypesRegex;
-        protected Regex SQLVarRegex;
-        protected Regex VBClassNameRegex;
-        protected Regex VBCommentRegex;
-        protected Regex VBKeywordRegex;
-        protected Regex VBNumberRegex;
-        protected Regex VBStringRegex;
-
-        protected FastColoredTextBox currentTb;
-
-        public static RegexOptions RegexCompiledOption
-        {
-            get
-            {
-                if (platformType == Platform.X86)
-                    return RegexOptions.Compiled;
-                else
-                    return RegexOptions.None;
-            }
-        }
-
-        public SyntaxHighlighter(FastColoredTextBox currentTb) {
-            this.currentTb = currentTb;
-        }
-
-        #region IDisposable Members
-
-        public void Dispose()
-        {
-            foreach (SyntaxDescriptor desc in descByXMLfileNames.Values)
-                desc.Dispose();
-        }
-
-        #endregion
-
-        /// <summary>
-        /// Highlights syntax for given language
-        /// </summary>
-        public virtual void HighlightSyntax(Language language, Range range)
+        public static SyntaxHighlighter CreateSyntaxHighlighter(FastColoredTextBox textbox, Language language)
         {
             switch (language)
             {
-                case Language.CSharp:
-                    CSharpSyntaxHighlight(range);
-                    break;
-                case Language.VB:
-                    VBSyntaxHighlight(range);
-                    break;
-                case Language.HTML:
-                    HTMLSyntaxHighlight(range);
-                    break;
-                case Language.XML:
-                    XMLSyntaxHighlight(range);
-                    break;
-                case Language.SQL:
-                    SQLSyntaxHighlight(range);
-                    break;
-                case Language.PHP:
-                    PHPSyntaxHighlight(range);
-                    break;
-                case Language.JS:
-                    JScriptSyntaxHighlight(range);
-                    break;
-                case Language.Lua:
-                    LuaSyntaxHighlight(range);
-                    break;
-                case Language.JSON:
-                    JSONSyntaxHighlight(range);
-                    break;
-                default:
-                    break;
+                case Language.AVRASM: return new AvrasmSyntaxSource(textbox);
+                case Language.JS: return new JScriptSyntaxSource(textbox);
+                case Language.JSON: return new JSONSyntaxSource(textbox);
+                case Language.Lua: return new LuaSyntaxSources(textbox);
+                case Language.SQL: return new SQLSyntaxSource(textbox);
+                case Language.VB: return new VBSyntaxSource(textbox);
+                case Language.XML: return new XMLSyntaxSource(textbox);
+                case Language.CSharp: return new CSharpSyntaxSource(textbox);
+                case Language.HTML: return new HTMLSyntaxSource(textbox);
+                case Language.PHP: return new PHPSyntaxSource(textbox);
+                case Language.FromXMLfile: return new FromXMLfileSyntaxSource(textbox);
+                case Language.Custom:
+                default: return new CustomSyntaxSource(textbox);
             }
         }
 
-        /// <summary>
-        /// Highlights syntax for given XML description file
-        /// </summary>
-        public virtual void HighlightSyntax(string XMLdescriptionFile, Range range)
+        public static class PredefinedStyles
         {
-            SyntaxDescriptor desc = null;
-            if (!descByXMLfileNames.TryGetValue(XMLdescriptionFile, out desc))
-            {
-                var doc = new XmlDocument();
-                string file = XMLdescriptionFile;
-                if (!File.Exists(file))
-                    file = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, Path.GetFileName(file));
-
-                doc.LoadXml(File.ReadAllText(file));
-                desc = ParseXmlDescription(doc);
-                descByXMLfileNames[XMLdescriptionFile] = desc;
-            }
-
-            HighlightSyntax(desc, range);
+            public static readonly Style BlueBoldStyle = new TextStyle(Brushes.Blue, null, FontStyle.Bold);
+            public static readonly Style BlueStyle = new TextStyle(Brushes.Blue, null, FontStyle.Regular);
+            public static readonly Style BoldStyle = new TextStyle(null, null, FontStyle.Bold | FontStyle.Underline);
+            public static readonly Style BrownStyle = new TextStyle(Brushes.Brown, null, FontStyle.Italic);
+            public static readonly Style GrayStyle = new TextStyle(Brushes.Gray, null, FontStyle.Regular);
+            public static readonly Style GreenStyle = new TextStyle(Brushes.Green, null, FontStyle.Italic);
+            public static readonly Style MagentaStyle = new TextStyle(Brushes.Magenta, null, FontStyle.Regular);
+            public static readonly Style MaroonStyle = new TextStyle(Brushes.Maroon, null, FontStyle.Regular);
+            public static readonly Style RedStyle = new TextStyle(Brushes.Red, null, FontStyle.Regular);
+            public static readonly Style BlackStyle = new TextStyle(Brushes.Black, null, FontStyle.Regular);
+            public static readonly Style DarkGreenBoldStyle = new TextStyle(Brushes.DarkGreen, null, FontStyle.Bold);
         }
 
-        public virtual void AutoIndentNeeded(object sender, AutoIndentEventArgs args)
-        {
-            var tb = (sender as FastColoredTextBox);
-            Language language = tb.Language;
-            switch (language)
-            {
-                case Language.CSharp:
-                    CSharpAutoIndentNeeded(sender, args);
-                    break;
-                case Language.VB:
-                    VBAutoIndentNeeded(sender, args);
-                    break;
-                case Language.HTML:
-                    HTMLAutoIndentNeeded(sender, args);
-                    break;
-                case Language.XML:
-                    XMLAutoIndentNeeded(sender, args);
-                    break;
-                case Language.SQL:
-                    SQLAutoIndentNeeded(sender, args);
-                    break;
-                case Language.PHP:
-                    PHPAutoIndentNeeded(sender, args);
-                    break;
-                case Language.JS:
-                    CSharpAutoIndentNeeded(sender, args);
-                    break; //JS like C#
-                case Language.Lua:
-                    LuaAutoIndentNeeded(sender, args);
-                    break;
-                default:
-                    break;
-            }
-        }
+        public StyleDescriptionList StyleSchema = new StyleDescriptionList();
+        protected List<FoldingDescription> FoldingSchema = new List<FoldingDescription>();
+        protected FastColoredTextBox Textbox;
 
-        protected void PHPAutoIndentNeeded(object sender, AutoIndentEventArgs args)
+        protected static readonly Platform platformType = PlatformType.GetOperationSystemPlatform();
+        public static RegexOptions RegexCompiledOption
         {
-            /*
-            FastColoredTextBox tb = sender as FastColoredTextBox;
-            tb.CalcAutoIndentShiftByCodeFolding(sender, args);*/
-            //block {}
-            if (Regex.IsMatch(args.LineText, @"^[^""']*\{.*\}[^""']*$"))
-                return;
-            //start of block {}
-            if (Regex.IsMatch(args.LineText, @"^[^""']*\{"))
-            {
-                args.ShiftNextLines = args.TabLength;
-                return;
-            }
-            //end of block {}
-            if (Regex.IsMatch(args.LineText, @"}[^""']*$"))
+            get
             {
-                args.Shift = -args.TabLength;
-                args.ShiftNextLines = -args.TabLength;
-                return;
+                if (platformType == Platform.X86)
+                    return RegexOptions.Compiled;
+                else
+                    return RegexOptions.None;
             }
-            //is unclosed operator in previous line ?
-            if (Regex.IsMatch(args.PrevLineText, @"^\s*(if|for|foreach|while|[\}\s]*else)\b[^{]*$"))
-                if (!Regex.IsMatch(args.PrevLineText, @"(;\s*$)|(;\s*//)")) //operator is unclosed
-                {
-                    args.Shift = args.TabLength;
-                    return;
-                }
-        }
-
-        protected void SQLAutoIndentNeeded(object sender, AutoIndentEventArgs args)
-        {
-            var tb = sender as FastColoredTextBox;
-            tb.CalcAutoIndentShiftByCodeFolding(sender, args);
         }
 
-        protected void HTMLAutoIndentNeeded(object sender, AutoIndentEventArgs args)
+        protected SyntaxHighlighter(FastColoredTextBox textbox)
         {
-            var tb = sender as FastColoredTextBox;
-            tb.CalcAutoIndentShiftByCodeFolding(sender, args);
+            Textbox = textbox;
         }
 
-        protected void XMLAutoIndentNeeded(object sender, AutoIndentEventArgs args)
+        public void AddStyle(string styleName, Style style, Regex rule)
         {
-            var tb = sender as FastColoredTextBox;
-            tb.CalcAutoIndentShiftByCodeFolding(sender, args);
-        }
-
-        protected void VBAutoIndentNeeded(object sender, AutoIndentEventArgs args)
-        {
-            //end of block
-            if (Regex.IsMatch(args.LineText, @"^\s*(End|EndIf|Next|Loop)\b", RegexOptions.IgnoreCase))
-            {
-                args.Shift = -args.TabLength;
-                args.ShiftNextLines = -args.TabLength;
-                return;
-            }
-            //start of declaration
-            if (Regex.IsMatch(args.LineText,
-                              @"\b(Class|Property|Enum|Structure|Sub|Function|Namespace|Interface|Get)\b|(Set\s*\()",
-                              RegexOptions.IgnoreCase))
-            {
-                args.ShiftNextLines = args.TabLength;
-                return;
-            }
-            // then ...
-            if (Regex.IsMatch(args.LineText, @"\b(Then)\s*\S+", RegexOptions.IgnoreCase))
-                return;
-            //start of operator block
-            if (Regex.IsMatch(args.LineText, @"^\s*(If|While|For|Do|Try|With|Using|Select)\b", RegexOptions.IgnoreCase))
-            {
-                args.ShiftNextLines = args.TabLength;
-                return;
-            }
-
-            //Statements else, elseif, case etc
-            if (Regex.IsMatch(args.LineText, @"^\s*(Else|ElseIf|Case|Catch|Finally)\b", RegexOptions.IgnoreCase))
-            {
-                args.Shift = -args.TabLength;
-                return;
-            }
-
-            //Char _
-            if (args.PrevLineText.TrimEnd().EndsWith("_"))
-            {
-                args.Shift = args.TabLength;
-                return;
-            }
+            StyleSchema.Add(styleName, style, rule);
         }
-
-        protected void CSharpAutoIndentNeeded(object sender, AutoIndentEventArgs args)
+        public void RemoveStyle (string styleName)
         {
-            //block {}
-            if (Regex.IsMatch(args.LineText, @"^[^""']*\{.*\}[^""']*$"))
-                return;
-            //start of block {}
-            if (Regex.IsMatch(args.LineText, @"^[^""']*\{"))
-            {
-                args.ShiftNextLines = args.TabLength;
-                return;
-            }
-            //end of block {}
-            if (Regex.IsMatch(args.LineText, @"}[^""']*$"))
-            {
-                args.Shift = -args.TabLength;
-                args.ShiftNextLines = -args.TabLength;
-                return;
-            }
-            //label
-            if (Regex.IsMatch(args.LineText, @"^\s*\w+\s*:\s*($|//)") &&
-                !Regex.IsMatch(args.LineText, @"^\s*default\s*:"))
-            {
-                args.Shift = -args.TabLength;
-                return;
-            }
-            //some statements: case, default
-            if (Regex.IsMatch(args.LineText, @"^\s*(case|default)\b.*:\s*($|//)"))
-            {
-                args.Shift = -args.TabLength / 2;
-                return;
-            }
-            //is unclosed operator in previous line ?
-            if (Regex.IsMatch(args.PrevLineText, @"^\s*(if|for|foreach|while|[\}\s]*else)\b[^{]*$"))
-                if (!Regex.IsMatch(args.PrevLineText, @"(;\s*$)|(;\s*//)")) //operator is unclosed
-                {
-                    args.Shift = args.TabLength;
-                    return;
-                }
+            StyleSchema.Remove(styleName);
         }
-
-        /// <summary>
-        /// Uses the given <paramref name="doc"/> to parse a XML description and adds it as syntax descriptor. 
-        /// The syntax descriptor is used for highlighting when 
-        /// <list type="bullet">
-        ///     <item>Language property of FCTB is set to <see cref="Language.Custom"/></item>
-        ///     <item>DescriptionFile property of FCTB has the same value as the method parameter <paramref name="descriptionFileName"/></item>
-        /// </list>
-        /// </summary>
-        /// <param name="descriptionFileName">Name of the description file</param>
-        /// <param name="doc">XmlDocument to parse</param>
-        public virtual void AddXmlDescription(string descriptionFileName, XmlDocument doc)
+        public void AddFoldingRule(string startMarkerRule, string endMarkerRule, RegexOptions options = RegexOptions.None)
         {
-            SyntaxDescriptor desc = ParseXmlDescription(doc);
-            descByXMLfileNames[descriptionFileName] = desc;
+            FoldingDescription desc = new FoldingDescription();
+            desc.startMarkerRegex = startMarkerRule;
+            desc.endMarkerRegex = endMarkerRule;
+            desc.options = options;
+            FoldingSchema.Add(desc);
         }
-
-        /// <summary>
-        /// Adds the given <paramref name="style"/> as resilient style. A resilient style is additionally available when highlighting is 
-        /// based on a syntax descriptor that has been derived from a XML description file. In the run of the highlighting routine 
-        /// the styles used by the FCTB are always dropped and replaced with the (initial) ones from the syntax descriptor. Resilient styles are 
-        /// added afterwards and can be used anyway. 
-        /// </summary>
-        /// <param name="style">Style to add</param>
-        public virtual void AddResilientStyle(Style style)
+        public virtual void SyntaxHighlight(Range range)
         {
-            if (resilientStyles.Contains(style)) return;
-            currentTb.CheckStylesBufferSize(); // Prevent buffer overflow
-            resilientStyles.Add(style);
+            //clear style of changed range
+            range.ClearStyle(StyleSchema.Styles);
+            //
+            //string highlighting
+            foreach (var styleInfo in StyleSchema)
+                range.SetStyle(styleInfo.Style, styleInfo.Rule);
+            //clear folding markers
+            range.ClearFoldingMarkers();
+            //set folding markers
+            foreach (var foldRule in FoldingSchema)
+                range.SetFoldingMarkers(foldRule.startMarkerRegex, foldRule.endMarkerRegex, foldRule.options);
         }
-
-        public static SyntaxDescriptor ParseXmlDescription(XmlDocument doc)
+        public virtual void AutoIndentNeeded(object sender, AutoIndentEventArgs args)
         {
-            var desc = new SyntaxDescriptor();
-            XmlNode brackets = doc.SelectSingleNode("doc/brackets");
-            if (brackets != null)
-            {
-                if (brackets.Attributes["left"] == null || brackets.Attributes["right"] == null ||
-                    brackets.Attributes["left"].Value == "" || brackets.Attributes["right"].Value == "")
-                {
-                    desc.leftBracket = '\x0';
-                    desc.rightBracket = '\x0';
-                }
-                else
-                {
-                    desc.leftBracket = brackets.Attributes["left"].Value[0];
-                    desc.rightBracket = brackets.Attributes["right"].Value[0];
-                }
-
-                if (brackets.Attributes["left2"] == null || brackets.Attributes["right2"] == null ||
-                    brackets.Attributes["left2"].Value == "" || brackets.Attributes["right2"].Value == "")
-                {
-                    desc.leftBracket2 = '\x0';
-                    desc.rightBracket2 = '\x0';
-                }
-                else
-                {
-                    desc.leftBracket2 = brackets.Attributes["left2"].Value[0];
-                    desc.rightBracket2 = brackets.Attributes["right2"].Value[0];
-                }
-
-                if (brackets.Attributes["strategy"] == null || brackets.Attributes["strategy"].Value == "")
-                    desc.bracketsHighlightStrategy = BracketsHighlightStrategy.Strategy2;
-                else
-                    desc.bracketsHighlightStrategy = (BracketsHighlightStrategy)Enum.Parse(typeof(BracketsHighlightStrategy), brackets.Attributes["strategy"].Value);
-            }
-
-            var styleByName = new Dictionary<string, Style>();
-
-            foreach (XmlNode style in doc.SelectNodes("doc/style"))
-            {
-                Style s = ParseStyle(style);
-                styleByName[style.Attributes["name"].Value] = s;
-                desc.styles.Add(s);
-            }
-            foreach (XmlNode rule in doc.SelectNodes("doc/rule"))
-                desc.rules.Add(ParseRule(rule, styleByName));
-            foreach (XmlNode folding in doc.SelectNodes("doc/folding"))
-                desc.foldings.Add(ParseFolding(folding));
 
-            return desc;
         }
-
-        protected static FoldingDesc ParseFolding(XmlNode foldingNode)
+        public abstract void Init();
+        public virtual void Dispose()
         {
-            var folding = new FoldingDesc();
-            //regex
-            folding.startMarkerRegex = foldingNode.Attributes["start"].Value;
-            folding.finishMarkerRegex = foldingNode.Attributes["finish"].Value;
-            //options
-            XmlAttribute optionsA = foldingNode.Attributes["options"];
-            if (optionsA != null)
-                folding.options = (RegexOptions)Enum.Parse(typeof(RegexOptions), optionsA.Value);
-
-            return folding;
+            if (StyleSchema != null) StyleSchema.Dispose();
         }
+    }
 
-        protected static RuleDesc ParseRule(XmlNode ruleNode, Dictionary<string, Style> styles)
-        {
-            var rule = new RuleDesc();
-            rule.pattern = ruleNode.InnerText;
-            //
-            XmlAttribute styleA = ruleNode.Attributes["style"];
-            XmlAttribute optionsA = ruleNode.Attributes["options"];
-            //Style
-            if (styleA == null)
-                throw new Exception("Rule must contain style name.");
-            if (!styles.ContainsKey(styleA.Value))
-                throw new Exception("Style '" + styleA.Value + "' is not found.");
-            rule.style = styles[styleA.Value];
-            //options
-            if (optionsA != null)
-                rule.options = (RegexOptions)Enum.Parse(typeof(RegexOptions), optionsA.Value);
-
-            return rule;
-        }
 
-        protected static Style ParseStyle(XmlNode styleNode)
-        {
-            XmlAttribute typeA = styleNode.Attributes["type"];
-            XmlAttribute colorA = styleNode.Attributes["color"];
-            XmlAttribute backColorA = styleNode.Attributes["backColor"];
-            XmlAttribute fontStyleA = styleNode.Attributes["fontStyle"];
-            XmlAttribute nameA = styleNode.Attributes["name"];
-            //colors
-            SolidBrush foreBrush = null;
-            if (colorA != null)
-                foreBrush = new SolidBrush(ParseColor(colorA.Value));
-            SolidBrush backBrush = null;
-            if (backColorA != null)
-                backBrush = new SolidBrush(ParseColor(backColorA.Value));
-            //fontStyle
-            FontStyle fontStyle = FontStyle.Regular;
-            if (fontStyleA != null)
-                fontStyle = (FontStyle)Enum.Parse(typeof(FontStyle), fontStyleA.Value);
+    /// <summary>
+    /// Style and associated Regex Combinations
+    /// </summary>
+    public class StyleDescriptionList : ICollection<StyleDescription>, IDisposable
+    {
+        private List<string> names = new List<string>();
+        private List<Style> styles = new List<Style>();
+        private List<Regex> regexs = new List<Regex>();
 
-            return new TextStyle(foreBrush, backBrush, fontStyle);
-        }
+        public bool IsReadOnly { get { return false; } }
+        public int Count { get { return names.Count; } }
 
-        protected static Color ParseColor(string s)
+        public void Add(string name, Style style, Regex regex)
         {
-            if (s.StartsWith("#"))
+            if (!names.Contains(name))
             {
-                if (s.Length <= 7)
-                    return Color.FromArgb(255,
-                                          Color.FromArgb(Int32.Parse(s.Substring(1), NumberStyles.AllowHexSpecifier)));
-                else
-                    return Color.FromArgb(Int32.Parse(s.Substring(1), NumberStyles.AllowHexSpecifier));
+                names.Add(name);
+                styles.Add(style);
+                regexs.Add(regex);
             }
             else
-                return Color.FromName(s);
+                throw new ArgumentException("List contained style with name " + name);
         }
-
-        public void HighlightSyntax(SyntaxDescriptor desc, Range range)
+        public void Add(StyleDescription style)
         {
-            //set style order
-            range.tb.ClearStylesBuffer();
-            for (int i = 0; i < desc.styles.Count; i++)
-                range.tb.Styles[i] = desc.styles[i];
-            // add resilient styles
-            int l = desc.styles.Count;
-            for (int i = 0; i < resilientStyles.Count; i++)
-                range.tb.Styles[l + i] = resilientStyles[i];
-            //brackets
-            char[] oldBrackets = RememberBrackets(range.tb);
-            range.tb.LeftBracket = desc.leftBracket;
-            range.tb.RightBracket = desc.rightBracket;
-            range.tb.LeftBracket2 = desc.leftBracket2;
-            range.tb.RightBracket2 = desc.rightBracket2;
-            //clear styles of range
-            range.ClearStyle(desc.styles.ToArray());
-            //highlight syntax
-            foreach (RuleDesc rule in desc.rules)
-                range.SetStyle(rule.style, rule.Regex);
-            //clear folding
-            range.ClearFoldingMarkers();
-            //folding markers
-            foreach (FoldingDesc folding in desc.foldings)
-                range.SetFoldingMarkers(folding.startMarkerRegex, folding.finishMarkerRegex, folding.options);
-
-            //
-            RestoreBrackets(range.tb, oldBrackets);
+            Add(style.Name, style.Style, style.Rule);
         }
-
-        protected void RestoreBrackets(FastColoredTextBox tb, char[] oldBrackets)
+        public bool Remove(string name)
         {
-            tb.LeftBracket = oldBrackets[0];
-            tb.RightBracket = oldBrackets[1];
-            tb.LeftBracket2 = oldBrackets[2];
-            tb.RightBracket2 = oldBrackets[3];
-        }
-
-        protected char[] RememberBrackets(FastColoredTextBox tb)
-        {
-            return new[] { tb.LeftBracket, tb.RightBracket, tb.LeftBracket2, tb.RightBracket2 };
-        }
-
-        protected void InitCShaprRegex()
-        {
-            //CSharpStringRegex = new Regex( @"""""|@""""|''|@"".*?""|(?<!@)(?<range>"".*?[^\\]"")|'.*?[^\\]'", RegexCompiledOption);
-
-            CSharpStringRegex =
-                new Regex(
-                    @"
-                            # Character definitions:
-                            '
-                            (?> # disable backtracking
-                              (?:
-                                \\[^\r\n]|    # escaped meta char
-                                [^'\r\n]      # any character except '
-                              )*
-                            )
-                            '?
-                            |
-                            # Normal string & verbatim strings definitions:
-                            (?<verbatimIdentifier>@)?         # this group matches if it is an verbatim string
-                            ""
-                            (?> # disable backtracking
-                              (?:
-                                # match and consume an escaped character including escaped double quote ("") char
-                                (?(verbatimIdentifier)        # if it is a verbatim string ...
-                                  """"|                         #   then: only match an escaped double quote ("") char
-                                  \\.                         #   else: match an escaped sequence
-                                )
-                                | # OR
-            
-                                # match any char except double quote char ("")
-                                [^""]
-                              )*
-                            )
-                            ""
-                        ",
-                    RegexOptions.ExplicitCapture | RegexOptions.Singleline | RegexOptions.IgnorePatternWhitespace |
-                    RegexCompiledOption
-                    ); //thanks to rittergig for this regex
-
-            CSharpCommentRegex1 = new Regex(@"//.*$", RegexOptions.Multiline | RegexCompiledOption);
-            CSharpCommentRegex2 = new Regex(@"(/\*.*?\*/)|(/\*.*)", RegexOptions.Singleline | RegexCompiledOption);
-            CSharpCommentRegex3 = new Regex(@"(/\*.*?\*/)|(.*\*/)",
-                                            RegexOptions.Singleline | RegexOptions.RightToLeft | RegexCompiledOption);
-            CSharpNumberRegex = new Regex(@"\b\d+[\.]?\d*([eE]\-?\d+)?[lLdDfF]?\b|\b0x[a-fA-F\d]+\b",
-                                          RegexCompiledOption);
-            CSharpAttributeRegex = new Regex(@"^\s*(?<range>\[.+?\])\s*$", RegexOptions.Multiline | RegexCompiledOption);
-            CSharpClassNameRegex = new Regex(@"\b(class|struct|enum|interface)\s+(?<range>\w+?)\b", RegexCompiledOption);
-            CSharpKeywordRegex =
-                new Regex(
-                    @"\b(abstract|add|alias|as|ascending|async|await|base|bool|break|by|byte|case|catch|char|checked|class|const|continue|decimal|default|delegate|descending|do|double|dynamic|else|enum|equals|event|explicit|extern|false|finally|fixed|float|for|foreach|from|get|global|goto|group|if|implicit|in|int|interface|internal|into|is|join|let|lock|long|nameof|namespace|new|null|object|on|operator|orderby|out|override|params|partial|private|protected|public|readonly|ref|remove|return|sbyte|sealed|select|set|short|sizeof|stackalloc|static|static|string|struct|switch|this|throw|true|try|typeof|uint|ulong|unchecked|unsafe|ushort|using|using|value|var|virtual|void|volatile|when|where|while|yield)\b|#region\b|#endregion\b",
-                    RegexCompiledOption);
-        }
-
-        public void InitStyleSchema(Language lang)
-        {
-            switch (lang)
+            if (names.Contains(name))
             {
-                case Language.CSharp:
-                    StringStyle = BrownStyle;
-                    CommentStyle = GreenStyle;
-                    NumberStyle = MagentaStyle;
-                    AttributeStyle = GreenStyle;
-                    ClassNameStyle = BoldStyle;
-                    KeywordStyle = BlueStyle;
-                    CommentTagStyle = GrayStyle;
-                    break;
-                case Language.VB:
-                    StringStyle = BrownStyle;
-                    CommentStyle = GreenStyle;
-                    NumberStyle = MagentaStyle;
-                    ClassNameStyle = BoldStyle;
-                    KeywordStyle = BlueStyle;
-                    break;
-                case Language.HTML:
-                    CommentStyle = GreenStyle;
-                    TagBracketStyle = BlueStyle;
-                    TagNameStyle = MaroonStyle;
-                    AttributeStyle = RedStyle;
-                    AttributeValueStyle = BlueStyle;
-                    HtmlEntityStyle = RedStyle;
-                    break;
-                case Language.XML:
-                    CommentStyle = GreenStyle;
-                    XmlTagBracketStyle = BlueStyle;
-                    XmlTagNameStyle = MaroonStyle;
-                    XmlAttributeStyle = RedStyle;
-                    XmlAttributeValueStyle = BlueStyle;
-                    XmlEntityStyle = RedStyle;
-                    XmlCDataStyle = BlackStyle;
-                    break;
-                case Language.JS:
-                    StringStyle = BrownStyle;
-                    CommentStyle = GreenStyle;
-                    NumberStyle = MagentaStyle;
-                    KeywordStyle = BlueStyle;
-                    break;
-                case Language.Lua:
-                    StringStyle = BrownStyle;
-                    CommentStyle = GreenStyle;
-                    NumberStyle = MagentaStyle;
-                    KeywordStyle = BlueBoldStyle;
-                    FunctionsStyle = MaroonStyle;
-                    break;
-                case Language.PHP:
-                    StringStyle = RedStyle;
-                    CommentStyle = GreenStyle;
-                    NumberStyle = RedStyle;
-                    VariableStyle = MaroonStyle;
-                    KeywordStyle = MagentaStyle;
-                    KeywordStyle2 = BlueStyle;
-                    KeywordStyle3 = GrayStyle;
-                    break;
-                case Language.SQL:
-                    StringStyle = RedStyle;
-                    CommentStyle = GreenStyle;
-                    NumberStyle = MagentaStyle;
-                    KeywordStyle = BlueBoldStyle;
-                    StatementsStyle = BlueBoldStyle;
-                    FunctionsStyle = MaroonStyle;
-                    VariableStyle = MaroonStyle;
-                    TypesStyle = BrownStyle;
-                    break;
-                case Language.JSON:
-                    StringStyle = BrownStyle;
-                    NumberStyle = MagentaStyle;
-                    KeywordStyle = BlueStyle;
-                    break;
+                int index = names.IndexOf(name);
+                names.RemoveAt(index);
+                styles.RemoveAt(index);
+                regexs.RemoveAt(index);
+                return true;
             }
+            else
+                return false;
         }
 
-        /// <summary>
-        /// Highlights C# code
-        /// </summary>
-        /// <param name="range"></param>
-        public virtual void CSharpSyntaxHighlight(Range range)
-        {
-            range.tb.CommentPrefix = "//";
-            range.tb.LeftBracket = '(';
-            range.tb.RightBracket = ')';
-            range.tb.LeftBracket2 = '{';
-            range.tb.RightBracket2 = '}';
-            range.tb.BracketsHighlightStrategy = BracketsHighlightStrategy.Strategy2;
-
-            range.tb.AutoIndentCharsPatterns
-                = @"
-^\s*[\w\.]+(\s\w+)?\s*(?<range>=)\s*(?<range>[^;=]+);
-^\s*(case|default)\s*[^:]*(?<range>:)\s*(?<range>[^;]+);
-";
-            //clear style of changed range
-            range.ClearStyle(StringStyle, CommentStyle, NumberStyle, AttributeStyle, ClassNameStyle, KeywordStyle);
-            //
-            if (CSharpStringRegex == null)
-                InitCShaprRegex();
-            //string highlighting
-            range.SetStyle(StringStyle, CSharpStringRegex);
-            //comment highlighting
-            range.SetStyle(CommentStyle, CSharpCommentRegex1);
-            range.SetStyle(CommentStyle, CSharpCommentRegex2);
-            range.SetStyle(CommentStyle, CSharpCommentRegex3);
-            //number highlighting
-            range.SetStyle(NumberStyle, CSharpNumberRegex);
-            //attribute highlighting
-            range.SetStyle(AttributeStyle, CSharpAttributeRegex);
-            //class name highlighting
-            range.SetStyle(ClassNameStyle, CSharpClassNameRegex);
-            //keyword highlighting
-            range.SetStyle(KeywordStyle, CSharpKeywordRegex);
-
-            //find document comments
-            foreach (Range r in range.GetRanges(@"^\s*///.*$", RegexOptions.Multiline))
-            {
-                //remove C# highlighting from this fragment
-                r.ClearStyle(StyleIndex.All);
-                //do XML highlighting
-                if (HTMLTagRegex == null)
-                    InitHTMLRegex();
-                //
-                r.SetStyle(CommentStyle);
-                //tags
-                foreach (Range rr in r.GetRanges(HTMLTagContentRegex))
-                {
-                    rr.ClearStyle(StyleIndex.All);
-                    rr.SetStyle(CommentTagStyle);
-                }
-                //prefix '///'
-                foreach (Range rr in r.GetRanges(@"^\s*///", RegexOptions.Multiline))
-                {
-                    rr.ClearStyle(StyleIndex.All);
-                    rr.SetStyle(CommentTagStyle);
-                }
-            }
-
-            //clear folding markers
-            range.ClearFoldingMarkers();
-            //set folding markers
-            range.SetFoldingMarkers("{", "}"); //allow to collapse brackets block
-            range.SetFoldingMarkers(@"#region\b", @"#endregion\b"); //allow to collapse #region blocks
-            range.SetFoldingMarkers(@"/\*", @"\*/"); //allow to collapse comment block
-        }
-
-        protected void InitVBRegex()
+        public bool Remove(StyleDescription style)
         {
-            VBStringRegex = new Regex(@"""""|"".*?[^\\]""", RegexCompiledOption);
-            VBCommentRegex = new Regex(@"'.*$", RegexOptions.Multiline | RegexCompiledOption);
-            VBNumberRegex = new Regex(@"\b\d+[\.]?\d*([eE]\-?\d+)?\b", RegexCompiledOption);
-            VBClassNameRegex = new Regex(@"\b(Class|Structure|Enum|Interface)[ ]+(?<range>\w+?)\b",
-                                         RegexOptions.IgnoreCase | RegexCompiledOption);
-            VBKeywordRegex =
-                new Regex(
-                    @"\b(AddHandler|AddressOf|Alias|And|AndAlso|As|Boolean|ByRef|Byte|ByVal|Call|Case|Catch|CBool|CByte|CChar|CDate|CDbl|CDec|Char|CInt|Class|CLng|CObj|Const|Continue|CSByte|CShort|CSng|CStr|CType|CUInt|CULng|CUShort|Date|Decimal|Declare|Default|Delegate|Dim|DirectCast|Do|Double|Each|Else|ElseIf|End|EndIf|Enum|Erase|Error|Event|Exit|False|Finally|For|Friend|Function|Get|GetType|GetXMLNamespace|Global|GoSub|GoTo|Handles|If|Implements|Imports|In|Inherits|Integer|Interface|Is|IsNot|Let|Lib|Like|Long|Loop|Me|Mod|Module|MustInherit|MustOverride|MyBase|MyClass|Namespace|Narrowing|New|Next|Not|Nothing|NotInheritable|NotOverridable|Object|Of|On|Operator|Option|Optional|Or|OrElse|Overloads|Overridable|Overrides|ParamArray|Partial|Private|Property|Protected|Public|RaiseEvent|ReadOnly|ReDim|REM|RemoveHandler|Resume|Return|SByte|Select|Set|Shadows|Shared|Short|Single|Static|Step|Stop|String|Structure|Sub|SyncLock|Then|Throw|To|True|Try|TryCast|TypeOf|UInteger|ULong|UShort|Using|Variant|Wend|When|While|Widening|With|WithEvents|WriteOnly|Xor|Region)\b|(#Const|#Else|#ElseIf|#End|#If|#Region)\b",
-                    RegexOptions.IgnoreCase | RegexCompiledOption);
+            return Remove(style.Name);
         }
 
-        /// <summary>
-        /// Highlights VB code
-        /// </summary>
-        /// <param name="range"></param>
-        public virtual void VBSyntaxHighlight(Range range)
+        public void Clear()
         {
-            range.tb.CommentPrefix = "'";
-            range.tb.LeftBracket = '(';
-            range.tb.RightBracket = ')';
-            range.tb.LeftBracket2 = '\x0';
-            range.tb.RightBracket2 = '\x0';
-
-            range.tb.AutoIndentCharsPatterns
-                = @"
-^\s*[\w\.\(\)]+\s*(?<range>=)\s*(?<range>.+)
-";
-            //clear style of changed range
-            range.ClearStyle(StringStyle, CommentStyle, NumberStyle, ClassNameStyle, KeywordStyle);
-            //
-            if (VBStringRegex == null)
-                InitVBRegex();
-            //string highlighting
-            range.SetStyle(StringStyle, VBStringRegex);
-            //comment highlighting
-            range.SetStyle(CommentStyle, VBCommentRegex);
-            //number highlighting
-            range.SetStyle(NumberStyle, VBNumberRegex);
-            //class name highlighting
-            range.SetStyle(ClassNameStyle, VBClassNameRegex);
-            //keyword highlighting
-            range.SetStyle(KeywordStyle, VBKeywordRegex);
-
-            //clear folding markers
-            range.ClearFoldingMarkers();
-            //set folding markers
-            range.SetFoldingMarkers(@"#Region\b", @"#End\s+Region\b", RegexOptions.IgnoreCase);
-            range.SetFoldingMarkers(@"\b(Class|Property|Enum|Structure|Interface)[ \t]+\S+",
-                                    @"\bEnd (Class|Property|Enum|Structure|Interface)\b", RegexOptions.IgnoreCase);
-            range.SetFoldingMarkers(@"^\s*(?<range>While)[ \t]+\S+", @"^\s*(?<range>End While)\b",
-                                    RegexOptions.Multiline | RegexOptions.IgnoreCase);
-            range.SetFoldingMarkers(@"\b(Sub|Function)[ \t]+[^\s']+", @"\bEnd (Sub|Function)\b", RegexOptions.IgnoreCase);
-            //this declared separately because Sub and Function can be unclosed
-            range.SetFoldingMarkers(@"(\r|\n|^)[ \t]*(?<range>Get|Set)[ \t]*(\r|\n|$)", @"\bEnd (Get|Set)\b",
-                                    RegexOptions.IgnoreCase);
-            range.SetFoldingMarkers(@"^\s*(?<range>For|For\s+Each)\b", @"^\s*(?<range>Next)\b",
-                                    RegexOptions.Multiline | RegexOptions.IgnoreCase);
-            range.SetFoldingMarkers(@"^\s*(?<range>Do)\b", @"^\s*(?<range>Loop)\b",
-                                    RegexOptions.Multiline | RegexOptions.IgnoreCase);
+            names.Clear();
+            styles.Clear();
+            regexs.Clear();
         }
-
-        protected void InitHTMLRegex()
+        public bool Contains (StyleDescription style)
         {
-            HTMLCommentRegex1 = new Regex(@"(<!--.*?-->)|(<!--.*)", RegexOptions.Singleline | RegexCompiledOption);
-            HTMLCommentRegex2 = new Regex(@"(<!--.*?-->)|(.*-->)",
-                                          RegexOptions.Singleline | RegexOptions.RightToLeft | RegexCompiledOption);
-            HTMLTagRegex = new Regex(@"<|/>|</|>", RegexCompiledOption);
-            HTMLTagNameRegex = new Regex(@"<(?<range>[!\w:]+)", RegexCompiledOption);
-            HTMLEndTagRegex = new Regex(@"</(?<range>[\w:]+)>", RegexCompiledOption);
-            HTMLTagContentRegex = new Regex(@"<[^>]+>", RegexCompiledOption);
-            HTMLAttrRegex =
-                new Regex(
-                    @"(?<range>[\w\d\-]{1,20}?)='[^']*'|(?<range>[\w\d\-]{1,20})=""[^""]*""|(?<range>[\w\d\-]{1,20})=[\w\d\-]{1,20}",
-                    RegexCompiledOption);
-            HTMLAttrValRegex =
-                new Regex(
-                    @"[\w\d\-]{1,20}?=(?<range>'[^']*')|[\w\d\-]{1,20}=(?<range>""[^""]*"")|[\w\d\-]{1,20}=(?<range>[\w\d\-]{1,20})",
-                    RegexCompiledOption);
-            HTMLEntityRegex = new Regex(@"\&(amp|gt|lt|nbsp|quot|apos|copy|reg|#[0-9]{1,8}|#x[0-9a-f]{1,8});",
-                                        RegexCompiledOption | RegexOptions.IgnoreCase);
+            return names.Contains(style.Name);
         }
-
-        /// <summary>
-        /// Highlights HTML code
-        /// </summary>
-        /// <param name="range"></param>
-        public virtual void HTMLSyntaxHighlight(Range range)
+        public bool Contains(string styleName)
         {
-            range.tb.CommentPrefix = null;
-            range.tb.LeftBracket = '<';
-            range.tb.RightBracket = '>';
-            range.tb.LeftBracket2 = '(';
-            range.tb.RightBracket2 = ')';
-            range.tb.AutoIndentCharsPatterns = @"";
-            //clear style of changed range
-            range.ClearStyle(CommentStyle, TagBracketStyle, TagNameStyle, AttributeStyle, AttributeValueStyle,
-                             HtmlEntityStyle);
-            //
-            if (HTMLTagRegex == null)
-                InitHTMLRegex();
-            //comment highlighting
-            range.SetStyle(CommentStyle, HTMLCommentRegex1);
-            range.SetStyle(CommentStyle, HTMLCommentRegex2);
-            //tag brackets highlighting
-            range.SetStyle(TagBracketStyle, HTMLTagRegex);
-            //tag name
-            range.SetStyle(TagNameStyle, HTMLTagNameRegex);
-            //end of tag
-            range.SetStyle(TagNameStyle, HTMLEndTagRegex);
-            //attributes
-            range.SetStyle(AttributeStyle, HTMLAttrRegex);
-            //attribute values
-            range.SetStyle(AttributeValueStyle, HTMLAttrValRegex);
-            //html entity
-            range.SetStyle(HtmlEntityStyle, HTMLEntityRegex);
-
-            //clear folding markers
-            range.ClearFoldingMarkers();
-            //set folding markers
-            range.SetFoldingMarkers("<head", "</head>", RegexOptions.IgnoreCase);
-            range.SetFoldingMarkers("<body", "</body>", RegexOptions.IgnoreCase);
-            range.SetFoldingMarkers("<table", "</table>", RegexOptions.IgnoreCase);
-            range.SetFoldingMarkers("<form", "</form>", RegexOptions.IgnoreCase);
-            range.SetFoldingMarkers("<div", "</div>", RegexOptions.IgnoreCase);
-            range.SetFoldingMarkers("<script", "</script>", RegexOptions.IgnoreCase);
-            range.SetFoldingMarkers("<tr", "</tr>", RegexOptions.IgnoreCase);
+            return names.Contains(styleName);
         }
-
-        protected void InitXMLRegex()
+        public void CopyTo(StyleDescription[] styles, int index)
         {
-            XMLCommentRegex1 = new Regex(@"(<!--.*?-->)|(<!--.*)", RegexOptions.Singleline | RegexCompiledOption);
-            XMLCommentRegex2 = new Regex(@"(<!--.*?-->)|(.*-->)",
-                                          RegexOptions.Singleline | RegexOptions.RightToLeft | RegexCompiledOption);
-            XMLTagRegex = new Regex(@"<\?|<|/>|</|>|\?>", RegexCompiledOption);
-            XMLTagNameRegex = new Regex(@"<[?](?<range1>[x][m][l]{1})|<(?<range>[!\w:]+)", RegexCompiledOption);
-            XMLEndTagRegex = new Regex(@"</(?<range>[\w:]+)>", RegexCompiledOption);
-            XMLTagContentRegex = new Regex(@"<[^>]+>", RegexCompiledOption);
-            XMLAttrRegex =
-                new Regex(
-                    @"(?<range>[\w\d\-\:]+)[ ]*=[ ]*'[^']*'|(?<range>[\w\d\-\:]+)[ ]*=[ ]*""[^""]*""|(?<range>[\w\d\-\:]+)[ ]*=[ ]*[\w\d\-\:]+",
-                    RegexCompiledOption);
-            XMLAttrValRegex =
-                new Regex(
-                    @"[\w\d\-]+?=(?<range>'[^']*')|[\w\d\-]+[ ]*=[ ]*(?<range>""[^""]*"")|[\w\d\-]+[ ]*=[ ]*(?<range>[\w\d\-]+)",
-                    RegexCompiledOption);
-            XMLEntityRegex = new Regex(@"\&(amp|gt|lt|nbsp|quot|apos|copy|reg|#[0-9]{1,8}|#x[0-9a-f]{1,8});",
-                                        RegexCompiledOption | RegexOptions.IgnoreCase);
-            XMLCDataRegex = new Regex(@"<!\s*\[CDATA\s*\[(?<text>(?>[^]]+|](?!]>))*)]]>", RegexCompiledOption | RegexOptions.IgnoreCase); // http://stackoverflow.com/questions/21681861/i-need-a-regex-that-matches-cdata-elements-in-html
-            XMLFoldingRegex = new Regex(@"<(?<range>/?\w+)\s[^>]*?[^/]>|<(?<range>/?\w+)\s*>", RegexOptions.Singleline | RegexCompiledOption);
+            for (int i = 0; i < names.Count; ++i)
+                styles[index + i] = this[i];
         }
-
-        /// <summary>
-        /// Highlights XML code
-        /// </summary>
-        /// <param name="range"></param>
-        public virtual void XMLSyntaxHighlight(Range range)
+        public StyleDescription this[int i]
         {
-            range.tb.CommentPrefix = null;
-            range.tb.LeftBracket = '<';
-            range.tb.RightBracket = '>';
-            range.tb.LeftBracket2 = '(';
-            range.tb.RightBracket2 = ')';
-            range.tb.AutoIndentCharsPatterns = @"";
-            //clear style of changed range
-            range.ClearStyle(CommentStyle, XmlTagBracketStyle, XmlTagNameStyle, XmlAttributeStyle, XmlAttributeValueStyle,
-                             XmlEntityStyle, XmlCDataStyle);
-
-            //
-            if (XMLTagRegex == null)
+            get
             {
-                InitXMLRegex();
+                return new StyleDescription(names[i], styles[i], regexs[i]);
             }
-
-            //xml CData
-            range.SetStyle(XmlCDataStyle, XMLCDataRegex);
-
-            //comment highlighting
-            range.SetStyle(CommentStyle, XMLCommentRegex1);
-            range.SetStyle(CommentStyle, XMLCommentRegex2);
-
-            //tag brackets highlighting
-            range.SetStyle(XmlTagBracketStyle, XMLTagRegex);
-
-            //tag name
-            range.SetStyle(XmlTagNameStyle, XMLTagNameRegex);
-
-            //end of tag
-            range.SetStyle(XmlTagNameStyle, XMLEndTagRegex);
-
-            //attributes
-            range.SetStyle(XmlAttributeStyle, XMLAttrRegex);
-
-            //attribute values
-            range.SetStyle(XmlAttributeValueStyle, XMLAttrValRegex);
-
-            //xml entity
-            range.SetStyle(XmlEntityStyle, XMLEntityRegex);
-
-            //clear folding markers
-            range.ClearFoldingMarkers();
-
-            //set folding markers
-            XmlFolding(range);
+            
         }
-
-        private void XmlFolding(Range range)
+        public StyleDescription this[string name]
         {
-            var stack = new Stack<XmlFoldingTag>();
-            var id = 0;
-            var fctb = range.tb;
-            //extract opening and closing tags (exclude open-close tags: <TAG/>)
-            foreach (var r in range.GetRanges(XMLFoldingRegex))
+            get
             {
-                var tagName = r.Text;
-                var iLine = r.Start.iLine;
-                //if it is opening tag...
-                if (tagName[0] != '/')
-                {
-                    // ...push into stack
-                    var tag = new XmlFoldingTag { Name = tagName, id = id++, startLine = r.Start.iLine };
-                    stack.Push(tag);
-                    // if this line has no markers - set marker
-                    if (string.IsNullOrEmpty(fctb[iLine].FoldingStartMarker))
-                        fctb[iLine].FoldingStartMarker = tag.Marker;
-                }
+                int i = names.IndexOf(name);
+                if (i >= 0 && i < names.Count)
+                    return this[i];
                 else
-                {
-                    //if it is closing tag - pop from stack
-                    if (stack.Count > 0)
-                    {
-                        var tag = stack.Pop();
-                        //compare line number
-                        if (iLine == tag.startLine)
-                        {
-                            //remove marker, because same line can not be folding
-                            if (fctb[iLine].FoldingStartMarker == tag.Marker) //was it our marker?
-                                fctb[iLine].FoldingStartMarker = null;
-                        }
-                        else
-                        {
-                            //set end folding marker
-                            if (string.IsNullOrEmpty(fctb[iLine].FoldingEndMarker))
-                                fctb[iLine].FoldingEndMarker = tag.Marker;
-                        }
-                    }
-                }
+                    throw new ArgumentOutOfRangeException("StyleDescriptionList not contained style with name \"" + name + "\"");
             }
         }
-
-        class XmlFoldingTag
+        public void ChangeStyle(string styleName, Style newStyle)
         {
-            public string Name;
-            public int id;
-            public int startLine;
-            public string Marker { get { return Name + id; } }
+            int index = names.IndexOf(styleName);
+            ChangeStyle(index, newStyle);
         }
-
-        protected void InitSQLRegex()
+        public void ChangeStyle(int index, Style newStyle)
         {
-            SQLStringRegex = new Regex(@"""""|''|"".*?[^\\]""|'.*?[^\\]'", RegexCompiledOption);
-            SQLNumberRegex = new Regex(@"\b\d+[\.]?\d*([eE]\-?\d+)?\b", RegexCompiledOption);
-            SQLCommentRegex1 = new Regex(@"--.*$", RegexOptions.Multiline | RegexCompiledOption);
-            SQLCommentRegex2 = new Regex(@"(/\*.*?\*/)|(/\*.*)", RegexOptions.Singleline | RegexCompiledOption);
-            SQLCommentRegex3 = new Regex(@"(/\*.*?\*/)|(.*\*/)", RegexOptions.Singleline | RegexOptions.RightToLeft | RegexCompiledOption);
-            SQLCommentRegex4 = new Regex(@"#.*$", RegexOptions.Multiline | RegexCompiledOption);
-            SQLVarRegex = new Regex(@"@[a-zA-Z_\d]*\b", RegexCompiledOption);
-            SQLStatementsRegex = new Regex(@"\b(ALTER APPLICATION ROLE|ALTER ASSEMBLY|ALTER ASYMMETRIC KEY|ALTER AUTHORIZATION|ALTER BROKER PRIORITY|ALTER CERTIFICATE|ALTER CREDENTIAL|ALTER CRYPTOGRAPHIC PROVIDER|ALTER DATABASE|ALTER DATABASE AUDIT SPECIFICATION|ALTER DATABASE ENCRYPTION KEY|ALTER ENDPOINT|ALTER EVENT SESSION|ALTER FULLTEXT CATALOG|ALTER FULLTEXT INDEX|ALTER FULLTEXT STOPLIST|ALTER FUNCTION|ALTER INDEX|ALTER LOGIN|ALTER MASTER KEY|ALTER MESSAGE TYPE|ALTER PARTITION FUNCTION|ALTER PARTITION SCHEME|ALTER PROCEDURE|ALTER QUEUE|ALTER REMOTE SERVICE BINDING|ALTER RESOURCE GOVERNOR|ALTER RESOURCE POOL|ALTER ROLE|ALTER ROUTE|ALTER SCHEMA|ALTER SERVER AUDIT|ALTER SERVER AUDIT SPECIFICATION|ALTER SERVICE|ALTER SERVICE MASTER KEY|ALTER SYMMETRIC KEY|ALTER TABLE|ALTER TRIGGER|ALTER USER|ALTER VIEW|ALTER WORKLOAD GROUP|ALTER XML SCHEMA COLLECTION|BULK INSERT|CREATE AGGREGATE|CREATE APPLICATION ROLE|CREATE ASSEMBLY|CREATE ASYMMETRIC KEY|CREATE BROKER PRIORITY|CREATE CERTIFICATE|CREATE CONTRACT|CREATE CREDENTIAL|CREATE CRYPTOGRAPHIC PROVIDER|CREATE DATABASE|CREATE DATABASE AUDIT SPECIFICATION|CREATE DATABASE ENCRYPTION KEY|CREATE DEFAULT|CREATE ENDPOINT|CREATE EVENT NOTIFICATION|CREATE EVENT SESSION|CREATE FULLTEXT CATALOG|CREATE FULLTEXT INDEX|CREATE FULLTEXT STOPLIST|CREATE FUNCTION|CREATE INDEX|CREATE LOGIN|CREATE MASTER KEY|CREATE MESSAGE TYPE|CREATE PARTITION FUNCTION|CREATE PARTITION SCHEME|CREATE PROCEDURE|CREATE QUEUE|CREATE REMOTE SERVICE BINDING|CREATE RESOURCE POOL|CREATE ROLE|CREATE ROUTE|CREATE RULE|CREATE SCHEMA|CREATE SERVER AUDIT|CREATE SERVER AUDIT SPECIFICATION|CREATE SERVICE|CREATE SPATIAL INDEX|CREATE STATISTICS|CREATE SYMMETRIC KEY|CREATE SYNONYM|CREATE TABLE|CREATE TRIGGER|CREATE TYPE|CREATE USER|CREATE VIEW|CREATE WORKLOAD GROUP|CREATE XML INDEX|CREATE XML SCHEMA COLLECTION|DELETE|DISABLE TRIGGER|DROP AGGREGATE|DROP APPLICATION ROLE|DROP ASSEMBLY|DROP ASYMMETRIC KEY|DROP BROKER PRIORITY|DROP CERTIFICATE|DROP CONTRACT|DROP CREDENTIAL|DROP CRYPTOGRAPHIC PROVIDER|DROP DATABASE|DROP DATABASE AUDIT SPECIFICATION|DROP DATABASE ENCRYPTION KEY|DROP DEFAULT|DROP ENDPOINT|DROP EVENT NOTIFICATION|DROP EVENT SESSION|DROP FULLTEXT CATALOG|DROP FULLTEXT INDEX|DROP FULLTEXT STOPLIST|DROP FUNCTION|DROP INDEX|DROP LOGIN|DROP MASTER KEY|DROP MESSAGE TYPE|DROP PARTITION FUNCTION|DROP PARTITION SCHEME|DROP PROCEDURE|DROP QUEUE|DROP REMOTE SERVICE BINDING|DROP RESOURCE POOL|DROP ROLE|DROP ROUTE|DROP RULE|DROP SCHEMA|DROP SERVER AUDIT|DROP SERVER AUDIT SPECIFICATION|DROP SERVICE|DROP SIGNATURE|DROP STATISTICS|DROP SYMMETRIC KEY|DROP SYNONYM|DROP TABLE|DROP TRIGGER|DROP TYPE|DROP USER|DROP VIEW|DROP WORKLOAD GROUP|DROP XML SCHEMA COLLECTION|ENABLE TRIGGER|EXEC|EXECUTE|REPLACE|FROM|INSERT|MERGE|OPTION|OUTPUT|SELECT|TOP|TRUNCATE TABLE|UPDATE|UPDATE STATISTICS|WHERE|WITH|INTO|IN|SET)\b", RegexOptions.IgnoreCase | RegexCompiledOption);
-            SQLKeywordsRegex = new Regex(@"\b(ADD|ALL|AND|ANY|AS|ASC|AUTHORIZATION|BACKUP|BEGIN|BETWEEN|BREAK|BROWSE|BY|CASCADE|CHECK|CHECKPOINT|CLOSE|CLUSTERED|COLLATE|COLUMN|COMMIT|COMPUTE|CONSTRAINT|CONTAINS|CONTINUE|CROSS|CURRENT|CURRENT_DATE|CURRENT_TIME|CURSOR|DATABASE|DBCC|DEALLOCATE|DECLARE|DEFAULT|DENY|DESC|DISK|DISTINCT|DISTRIBUTED|DOUBLE|DUMP|ELSE|END|ERRLVL|ESCAPE|EXCEPT|EXISTS|EXIT|EXTERNAL|FETCH|FILE|FILLFACTOR|FOR|FOREIGN|FREETEXT|FULL|FUNCTION|GOTO|GRANT|GROUP|HAVING|HOLDLOCK|IDENTITY|IDENTITY_INSERT|IDENTITYCOL|IF|INDEX|INNER|INTERSECT|IS|JOIN|KEY|KILL|LIKE|LINENO|LOAD|NATIONAL|NOCHECK|NONCLUSTERED|NOT|NULL|OF|OFF|OFFSETS|ON|OPEN|OR|ORDER|OUTER|OVER|PERCENT|PIVOT|PLAN|PRECISION|PRIMARY|PRINT|PROC|PROCEDURE|PUBLIC|RAISERROR|READ|READTEXT|RECONFIGURE|REFERENCES|REPLICATION|RESTORE|RESTRICT|RETURN|REVERT|REVOKE|ROLLBACK|ROWCOUNT|ROWGUIDCOL|RULE|SAVE|SCHEMA|SECURITYAUDIT|SHUTDOWN|SOME|STATISTICS|TABLE|TABLESAMPLE|TEXTSIZE|THEN|TO|TRAN|TRANSACTION|TRIGGER|TSEQUAL|UNION|UNIQUE|UNPIVOT|UPDATETEXT|USE|USER|VALUES|VARYING|VIEW|WAITFOR|WHEN|WHILE|WRITETEXT)\b", RegexOptions.IgnoreCase | RegexCompiledOption);
-            SQLFunctionsRegex = new Regex(@"(@@CONNECTIONS|@@CPU_BUSY|@@CURSOR_ROWS|@@DATEFIRST|@@DATEFIRST|@@DBTS|@@ERROR|@@FETCH_STATUS|@@IDENTITY|@@IDLE|@@IO_BUSY|@@LANGID|@@LANGUAGE|@@LOCK_TIMEOUT|@@MAX_CONNECTIONS|@@MAX_PRECISION|@@NESTLEVEL|@@OPTIONS|@@PACKET_ERRORS|@@PROCID|@@REMSERVER|@@ROWCOUNT|@@SERVERNAME|@@SERVICENAME|@@SPID|@@TEXTSIZE|@@TRANCOUNT|@@VERSION)\b|\b(ABS|ACOS|APP_NAME|ASCII|ASIN|ASSEMBLYPROPERTY|AsymKey_ID|ASYMKEY_ID|asymkeyproperty|ASYMKEYPROPERTY|ATAN|ATN2|AVG|CASE|CAST|CEILING|Cert_ID|Cert_ID|CertProperty|CHAR|CHARINDEX|CHECKSUM_AGG|COALESCE|COL_LENGTH|COL_NAME|COLLATIONPROPERTY|COLLATIONPROPERTY|COLUMNPROPERTY|COLUMNS_UPDATED|COLUMNS_UPDATED|CONTAINSTABLE|CONVERT|COS|COT|COUNT|COUNT_BIG|CRYPT_GEN_RANDOM|CURRENT_TIMESTAMP|CURRENT_TIMESTAMP|CURRENT_USER|CURRENT_USER|CURSOR_STATUS|DATABASE_PRINCIPAL_ID|DATABASE_PRINCIPAL_ID|DATABASEPROPERTY|DATABASEPROPERTYEX|DATALENGTH|DATALENGTH|DATEADD|DATEDIFF|DATENAME|DATEPART|DAY|DB_ID|DB_NAME|DECRYPTBYASYMKEY|DECRYPTBYCERT|DECRYPTBYKEY|DECRYPTBYKEYAUTOASYMKEY|DECRYPTBYKEYAUTOCERT|DECRYPTBYPASSPHRASE|DEGREES|DENSE_RANK|DIFFERENCE|ENCRYPTBYASYMKEY|ENCRYPTBYCERT|ENCRYPTBYKEY|ENCRYPTBYPASSPHRASE|ERROR_LINE|ERROR_MESSAGE|ERROR_NUMBER|ERROR_PROCEDURE|ERROR_SEVERITY|ERROR_STATE|EVENTDATA|EXP|FILE_ID|FILE_IDEX|FILE_NAME|FILEGROUP_ID|FILEGROUP_NAME|FILEGROUPPROPERTY|FILEPROPERTY|FLOOR|fn_helpcollations|fn_listextendedproperty|fn_servershareddrives|fn_virtualfilestats|fn_virtualfilestats|FORMATMESSAGE|FREETEXTTABLE|FULLTEXTCATALOGPROPERTY|FULLTEXTSERVICEPROPERTY|GETANSINULL|GETDATE|GETUTCDATE|GROUPING|HAS_PERMS_BY_NAME|HOST_ID|HOST_NAME|IDENT_CURRENT|IDENT_CURRENT|IDENT_INCR|IDENT_INCR|IDENT_SEED|IDENTITY\(|INDEX_COL|INDEXKEY_PROPERTY|INDEXPROPERTY|IS_MEMBER|IS_OBJECTSIGNED|IS_SRVROLEMEMBER|ISDATE|ISDATE|ISNULL|ISNUMERIC|Key_GUID|Key_GUID|Key_ID|Key_ID|KEY_NAME|KEY_NAME|LEFT|LEN|LOG|LOG10|LOWER|LTRIM|MAX|MIN|MONTH|NCHAR|NEWID|NTILE|NULLIF|OBJECT_DEFINITION|OBJECT_ID|OBJECT_NAME|OBJECT_SCHEMA_NAME|OBJECTPROPERTY|OBJECTPROPERTYEX|OPENDATASOURCE|OPENQUERY|OPENROWSET|OPENXML|ORIGINAL_LOGIN|ORIGINAL_LOGIN|PARSENAME|PATINDEX|PATINDEX|PERMISSIONS|PI|POWER|PUBLISHINGSERVERNAME|PWDCOMPARE|PWDENCRYPT|QUOTENAME|RADIANS|RAND|RANK|REPLICATE|REVERSE|RIGHT|ROUND|ROW_NUMBER|ROWCOUNT_BIG|RTRIM|SCHEMA_ID|SCHEMA_ID|SCHEMA_NAME|SCHEMA_NAME|SCOPE_IDENTITY|SERVERPROPERTY|SESSION_USER|SESSION_USER|SESSIONPROPERTY|SETUSER|SIGN|SignByAsymKey|SignByCert|SIN|SOUNDEX|SPACE|SQL_VARIANT_PROPERTY|SQRT|SQUARE|STATS_DATE|STDEV|STDEVP|STR|STUFF|SUBSTRING|SUM|SUSER_ID|SUSER_NAME|SUSER_SID|SUSER_SNAME|SWITCHOFFSET|SYMKEYPROPERTY|symkeyproperty|sys\.dm_db_index_physical_stats|sys\.fn_builtin_permissions|sys\.fn_my_permissions|SYSDATETIME|SYSDATETIMEOFFSET|SYSTEM_USER|SYSTEM_USER|SYSUTCDATETIME|TAN|TERTIARY_WEIGHTS|TEXTPTR|TODATETIMEOFFSET|TRIGGER_NESTLEVEL|TYPE_ID|TYPE_NAME|TYPEPROPERTY|UNICODE|UPDATE\(|UPPER|USER_ID|USER_NAME|USER_NAME|VAR|VARP|VerifySignedByAsymKey|VerifySignedByCert|XACT_STATE|YEAR)\b", RegexOptions.IgnoreCase | RegexCompiledOption);
-            SQLTypesRegex =
-                new Regex(
-                    @"\b(BIGINT|NUMERIC|BIT|SMALLINT|DECIMAL|SMALLMONEY|INT|TINYINT|MONEY|FLOAT|REAL|DATE|DATETIMEOFFSET|DATETIME2|SMALLDATETIME|DATETIME|TIME|CHAR|VARCHAR|TEXT|NCHAR|NVARCHAR|NTEXT|BINARY|VARBINARY|IMAGE|TIMESTAMP|HIERARCHYID|TABLE|UNIQUEIDENTIFIER|SQL_VARIANT|XML)\b",
-                    RegexOptions.IgnoreCase | RegexCompiledOption);
+            styles[index] = newStyle;
         }
-
-        /// <summary>
-        /// Highlights SQL code
-        /// </summary>
-        /// <param name="range"></param>
-        public virtual void SQLSyntaxHighlight(Range range)
+        public Style[] Styles
         {
-            range.tb.CommentPrefix = "--";
-            range.tb.LeftBracket = '(';
-            range.tb.RightBracket = ')';
-            range.tb.LeftBracket2 = '\x0';
-            range.tb.RightBracket2 = '\x0';
-
-            range.tb.AutoIndentCharsPatterns = @"";
-            //clear style of changed range
-            range.ClearStyle(CommentStyle, StringStyle, NumberStyle, VariableStyle, StatementsStyle, KeywordStyle,
-                             FunctionsStyle, TypesStyle);
-            //
-            if (SQLStringRegex == null)
-                InitSQLRegex();
-            //comment highlighting
-            range.SetStyle(CommentStyle, SQLCommentRegex1);
-            range.SetStyle(CommentStyle, SQLCommentRegex2);
-            range.SetStyle(CommentStyle, SQLCommentRegex3);
-            range.SetStyle(CommentStyle, SQLCommentRegex4);
-            //string highlighting
-            range.SetStyle(StringStyle, SQLStringRegex);
-            //number highlighting
-            range.SetStyle(NumberStyle, SQLNumberRegex);
-            //types highlighting
-            range.SetStyle(TypesStyle, SQLTypesRegex);
-            //var highlighting
-            range.SetStyle(VariableStyle, SQLVarRegex);
-            //statements
-            range.SetStyle(StatementsStyle, SQLStatementsRegex);
-            //keywords
-            range.SetStyle(KeywordStyle, SQLKeywordsRegex);
-            //functions
-            range.SetStyle(FunctionsStyle, SQLFunctionsRegex);
-
-            //clear folding markers
-            range.ClearFoldingMarkers();
-            //set folding markers
-            range.SetFoldingMarkers(@"\bBEGIN\b", @"\bEND\b", RegexOptions.IgnoreCase);
-            //allow to collapse BEGIN..END blocks
-            range.SetFoldingMarkers(@"/\*", @"\*/"); //allow to collapse comment block
-        }
-
-        protected void InitPHPRegex()
-        {
-            PHPStringRegex = new Regex(@"""""|''|"".*?[^\\]""|'.*?[^\\]'", RegexCompiledOption);
-            PHPNumberRegex = new Regex(@"\b\d+[\.]?\d*\b", RegexCompiledOption);
-            PHPCommentRegex1 = new Regex(@"(//|#).*$", RegexOptions.Multiline | RegexCompiledOption);
-            PHPCommentRegex2 = new Regex(@"(/\*.*?\*/)|(/\*.*)", RegexOptions.Singleline | RegexCompiledOption);
-            PHPCommentRegex3 = new Regex(@"(/\*.*?\*/)|(.*\*/)",
-                                         RegexOptions.Singleline | RegexOptions.RightToLeft | RegexCompiledOption);
-            PHPVarRegex = new Regex(@"\$[a-zA-Z_\d]*\b", RegexCompiledOption);
-            PHPKeywordRegex1 =
-                new Regex(
-                    @"\b(die|echo|empty|exit|eval|include|include_once|isset|list|require|require_once|return|print|unset)\b",
-                    RegexCompiledOption);
-            PHPKeywordRegex2 =
-                new Regex(
-                    @"\b(abstract|and|array|as|break|case|catch|cfunction|class|clone|const|continue|declare|default|do|else|elseif|enddeclare|endfor|endforeach|endif|endswitch|endwhile|extends|final|for|foreach|function|global|goto|if|implements|instanceof|interface|namespace|new|or|private|protected|public|static|switch|throw|try|use|var|while|xor)\b",
-                    RegexCompiledOption);
-            PHPKeywordRegex3 = new Regex(@"__CLASS__|__DIR__|__FILE__|__LINE__|__FUNCTION__|__METHOD__|__NAMESPACE__",
-                                         RegexCompiledOption);
-        }
-
-        /// <summary>
-        /// Highlights PHP code
-        /// </summary>
-        /// <param name="range"></param>
-        public virtual void PHPSyntaxHighlight(Range range)
-        {
-            range.tb.CommentPrefix = "//";
-            range.tb.LeftBracket = '(';
-            range.tb.RightBracket = ')';
-            range.tb.LeftBracket2 = '{';
-            range.tb.RightBracket2 = '}';
-            range.tb.BracketsHighlightStrategy = BracketsHighlightStrategy.Strategy2;
-            //clear style of changed range
-            range.ClearStyle(StringStyle, CommentStyle, NumberStyle, VariableStyle, KeywordStyle, KeywordStyle2,
-                             KeywordStyle3);
-
-            range.tb.AutoIndentCharsPatterns
-                = @"
-^\s*\$[\w\.\[\]\'\""]+\s*(?<range>=)\s*(?<range>[^;]+);
-";
-
-            //
-            if (PHPStringRegex == null)
-                InitPHPRegex();
-            //string highlighting
-            range.SetStyle(StringStyle, PHPStringRegex);
-            //comment highlighting
-            range.SetStyle(CommentStyle, PHPCommentRegex1);
-            range.SetStyle(CommentStyle, PHPCommentRegex2);
-            range.SetStyle(CommentStyle, PHPCommentRegex3);
-            //number highlighting
-            range.SetStyle(NumberStyle, PHPNumberRegex);
-            //var highlighting
-            range.SetStyle(VariableStyle, PHPVarRegex);
-            //keyword highlighting
-            range.SetStyle(KeywordStyle, PHPKeywordRegex1);
-            range.SetStyle(KeywordStyle2, PHPKeywordRegex2);
-            range.SetStyle(KeywordStyle3, PHPKeywordRegex3);
-
-            //clear folding markers
-            range.ClearFoldingMarkers();
-            //set folding markers
-            range.SetFoldingMarkers("{", "}"); //allow to collapse brackets block
-            range.SetFoldingMarkers(@"/\*", @"\*/"); //allow to collapse comment block
-        }
-
-        protected void InitJScriptRegex()
-        {
-            JScriptStringRegex = new Regex(@"""""|''|"".*?[^\\]""|'.*?[^\\]'", RegexCompiledOption);
-            JScriptCommentRegex1 = new Regex(@"//.*$", RegexOptions.Multiline | RegexCompiledOption);
-            JScriptCommentRegex2 = new Regex(@"(/\*.*?\*/)|(/\*.*)", RegexOptions.Singleline | RegexCompiledOption);
-            JScriptCommentRegex3 = new Regex(@"(/\*.*?\*/)|(.*\*/)",
-                                             RegexOptions.Singleline | RegexOptions.RightToLeft | RegexCompiledOption);
-            JScriptNumberRegex = new Regex(@"\b\d+[\.]?\d*([eE]\-?\d+)?[lLdDfF]?\b|\b0x[a-fA-F\d]+\b",
-                                           RegexCompiledOption);
-            JScriptKeywordRegex =
-                new Regex(
-                    @"\b(true|false|break|case|catch|const|continue|default|delete|do|else|export|for|function|if|in|instanceof|new|null|return|switch|this|throw|try|var|void|while|with|typeof)\b",
-                    RegexCompiledOption);
+            get
+            {
+                return styles.ToArray();
+            }
         }
-
-        /// <summary>
-        /// Highlights JavaScript code
-        /// </summary>
-        /// <param name="range"></param>
-        public virtual void JScriptSyntaxHighlight(Range range)
+        public IEnumerator<StyleDescription> GetEnumerator()
         {
-            range.tb.CommentPrefix = "//";
-            range.tb.LeftBracket = '(';
-            range.tb.RightBracket = ')';
-            range.tb.LeftBracket2 = '{';
-            range.tb.RightBracket2 = '}';
-            range.tb.BracketsHighlightStrategy = BracketsHighlightStrategy.Strategy2;
-
-            range.tb.AutoIndentCharsPatterns
-                = @"
-^\s*[\w\.]+(\s\w+)?\s*(?<range>=)\s*(?<range>[^;]+);
-";
-
-            //clear style of changed range
-            range.ClearStyle(StringStyle, CommentStyle, NumberStyle, KeywordStyle);
-            //
-            if (JScriptStringRegex == null)
-                InitJScriptRegex();
-            //string highlighting
-            range.SetStyle(StringStyle, JScriptStringRegex);
-            //comment highlighting
-            range.SetStyle(CommentStyle, JScriptCommentRegex1);
-            range.SetStyle(CommentStyle, JScriptCommentRegex2);
-            range.SetStyle(CommentStyle, JScriptCommentRegex3);
-            //number highlighting
-            range.SetStyle(NumberStyle, JScriptNumberRegex);
-            //keyword highlighting
-            range.SetStyle(KeywordStyle, JScriptKeywordRegex);
-            //clear folding markers
-            range.ClearFoldingMarkers();
-            //set folding markers
-            range.SetFoldingMarkers("{", "}"); //allow to collapse brackets block
-            range.SetFoldingMarkers(@"/\*", @"\*/"); //allow to collapse comment block
+            for (int i = 0; i < names.Count; ++i)
+                yield return this[i];
         }
-
-        protected void InitLuaRegex()
+        
+        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
         {
-            LuaStringRegex = new Regex(@"""""|''|"".*?[^\\]""|'.*?[^\\]'", RegexCompiledOption);
-            LuaCommentRegex1 = new Regex(@"--.*$", RegexOptions.Multiline | RegexCompiledOption);
-            LuaCommentRegex2 = new Regex(@"(--\[\[.*?\]\])|(--\[\[.*)", RegexOptions.Singleline | RegexCompiledOption);
-            LuaCommentRegex3 = new Regex(@"(--\[\[.*?\]\])|(.*\]\])",
-                                             RegexOptions.Singleline | RegexOptions.RightToLeft | RegexCompiledOption);
-            LuaNumberRegex = new Regex(@"\b\d+[\.]?\d*([eE]\-?\d+)?[lLdDfF]?\b|\b0x[a-fA-F\d]+\b",
-                                           RegexCompiledOption);
-            LuaKeywordRegex =
-                new Regex(
-                    @"\b(and|break|do|else|elseif|end|false|for|function|if|in|local|nil|not|or|repeat|return|then|true|until|while)\b",
-                    RegexCompiledOption);
-
-            LuaFunctionsRegex =
-                new Regex(
-                    @"\b(assert|collectgarbage|dofile|error|getfenv|getmetatable|ipairs|load|loadfile|loadstring|module|next|pairs|pcall|print|rawequal|rawget|rawset|require|select|setfenv|setmetatable|tonumber|tostring|type|unpack|xpcall)\b",
-                    RegexCompiledOption);
+            return GetEnumerator();
         }
 
-        /// <summary>
-        /// Highlights Lua code
-        /// </summary>
-        /// <param name="range"></param>
-        public virtual void LuaSyntaxHighlight(Range range)
-        {
-            range.tb.CommentPrefix = "--";
-            range.tb.LeftBracket = '(';
-            range.tb.RightBracket = ')';
-            range.tb.LeftBracket2 = '{';
-            range.tb.RightBracket2 = '}';
-            range.tb.BracketsHighlightStrategy = BracketsHighlightStrategy.Strategy2;
-
-            range.tb.AutoIndentCharsPatterns
-                = @"
-^\s*[\w\.]+(\s\w+)?\s*(?<range>=)\s*(?<range>.+)
-";
-
-            //clear style of changed range
-            range.ClearStyle(StringStyle, CommentStyle, NumberStyle, KeywordStyle, FunctionsStyle);
-            //
-            if (LuaStringRegex == null)
-                InitLuaRegex();
-            //string highlighting
-            range.SetStyle(StringStyle, LuaStringRegex);
-            //comment highlighting
-            range.SetStyle(CommentStyle, LuaCommentRegex1);
-            range.SetStyle(CommentStyle, LuaCommentRegex2);
-            range.SetStyle(CommentStyle, LuaCommentRegex3);
-            //number highlighting
-            range.SetStyle(NumberStyle, LuaNumberRegex);
-            //keyword highlighting
-            range.SetStyle(KeywordStyle, LuaKeywordRegex);
-            //functions highlighting
-            range.SetStyle(FunctionsStyle, LuaFunctionsRegex);
-            //clear folding markers
-            range.ClearFoldingMarkers();
-            //set folding markers
-            range.SetFoldingMarkers("{", "}"); //allow to collapse brackets block
-            range.SetFoldingMarkers(@"--\[\[", @"\]\]"); //allow to collapse comment block
-        }
-
-        protected void LuaAutoIndentNeeded(object sender, AutoIndentEventArgs args)
+        public void Dispose()
         {
-            //end of block
-            if (Regex.IsMatch(args.LineText, @"^\s*(end|until)\b"))
-            {
-                args.Shift = -args.TabLength;
-                args.ShiftNextLines = -args.TabLength;
-                return;
-            }
-            // then ...
-            if (Regex.IsMatch(args.LineText, @"\b(then)\s*\S+"))
-                return;
-            //start of operator block
-            if (Regex.IsMatch(args.LineText, @"^\s*(function|do|for|while|repeat|if)\b"))
+            if (styles.Count != 0)
             {
-                args.ShiftNextLines = args.TabLength;
-                return;
-            }
-
-            //Statements else, elseif, case etc
-            if (Regex.IsMatch(args.LineText, @"^\s*(else|elseif)\b", RegexOptions.IgnoreCase))
-            {
-                args.Shift = -args.TabLength;
-                return;
+                foreach (var st in Styles) st.Dispose();
             }
         }
+    }
 
-        protected void InitJSONRegex()
-        {
-            JSONStringRegex = new Regex(@"""([^\\""]|\\"")*""", RegexCompiledOption);
-            JSONNumberRegex = new Regex(@"\b(\d+[\.]?\d*|true|false|null)\b", RegexCompiledOption);
-            JSONKeywordRegex = new Regex(@"(?<range>""([^\\""]|\\"")*"")\s*:", RegexCompiledOption);
-        }
-
-        /// <summary>
-        /// Highlights JSON code
-        /// </summary>
-        /// <param name="range"></param>
-        public virtual void JSONSyntaxHighlight(Range range)
+    /// <summary>
+    /// Contained Name, Style information and Regex of Style;
+    /// </summary>
+    public struct StyleDescription
+    {
+        public readonly string Name;
+        public readonly Style Style;
+        public readonly Regex Rule;
+        public StyleDescription(string name, Style style, Regex regex)
         {
-            range.tb.LeftBracket = '[';
-            range.tb.RightBracket = ']';
-            range.tb.LeftBracket2 = '{';
-            range.tb.RightBracket2 = '}';
-            range.tb.BracketsHighlightStrategy = BracketsHighlightStrategy.Strategy2;
-
-            range.tb.AutoIndentCharsPatterns
-                = @"
-^\s*[\w\.]+(\s\w+)?\s*(?<range>=)\s*(?<range>[^;]+);
-";
-
-            //clear style of changed range
-            range.ClearStyle(StringStyle, NumberStyle, KeywordStyle);
-            //
-            if (JSONStringRegex == null)
-                InitJSONRegex();
-            //keyword highlighting
-            range.SetStyle(KeywordStyle, JSONKeywordRegex);
-            //string highlighting
-            range.SetStyle(StringStyle, JSONStringRegex);
-            //number highlighting
-            range.SetStyle(NumberStyle, JSONNumberRegex);
-            //clear folding markers
-            range.ClearFoldingMarkers();
-            //set folding markers
-            range.SetFoldingMarkers("{", "}"); //allow to collapse brackets block
-            range.SetFoldingMarkers(@"\[", @"\]"); //allow to collapse comment block
+            Name = name;
+            Style = style;
+            Rule = regex;
         }
+    }
 
-        #region Styles
-
-        /// <summary>
-        /// String style
-        /// </summary>
-        public Style StringStyle { get; set; }
-
-        /// <summary>
-        /// Comment style
-        /// </summary>
-        public Style CommentStyle { get; set; }
-
-        /// <summary>
-        /// Number style
-        /// </summary>
-        public Style NumberStyle { get; set; }
-
-        /// <summary>
-        /// C# attribute style
-        /// </summary>
-        public Style AttributeStyle { get; set; }
-
-        /// <summary>
-        /// Class name style
-        /// </summary>
-        public Style ClassNameStyle { get; set; }
-
-        /// <summary>
-        /// Keyword style
-        /// </summary>
-        public Style KeywordStyle { get; set; }
-
-        /// <summary>
-        /// Style of tags in comments of C#
-        /// </summary>
-        public Style CommentTagStyle { get; set; }
-
-        /// <summary>
-        /// HTML attribute value style
-        /// </summary>
-        public Style AttributeValueStyle { get; set; }
-
-        /// <summary>
-        /// HTML tag brackets style
-        /// </summary>
-        public Style TagBracketStyle { get; set; }
-
-        /// <summary>
-        /// HTML tag name style
-        /// </summary>
-        public Style TagNameStyle { get; set; }
-
-        /// <summary>
-        /// HTML Entity style
-        /// </summary>
-        public Style HtmlEntityStyle { get; set; }
-
-        /// <summary>
-        /// XML attribute style
-        /// </summary>
-        public Style XmlAttributeStyle { get; set; }
-
-        /// <summary>
-        /// XML attribute value style
-        /// </summary>
-        public Style XmlAttributeValueStyle { get; set; }
-
-        /// <summary>
-        /// XML tag brackets style
-        /// </summary>
-        public Style XmlTagBracketStyle { get; set; }
-
-        /// <summary>
-        /// XML tag name style
-        /// </summary>
-        public Style XmlTagNameStyle { get; set; }
-
-        /// <summary>
-        /// XML Entity style
-        /// </summary>
-        public Style XmlEntityStyle { get; set; }
-
-        /// <summary>
-        /// XML CData style
-        /// </summary>
-        public Style XmlCDataStyle { get; set; }
-
-        /// <summary>
-        /// Variable style
-        /// </summary>
-        public Style VariableStyle { get; set; }
-
-        /// <summary>
-        /// Specific PHP keyword style
-        /// </summary>
-        public Style KeywordStyle2 { get; set; }
-
-        /// <summary>
-        /// Specific PHP keyword style
-        /// </summary>
-        public Style KeywordStyle3 { get; set; }
-
-        /// <summary>
-        /// SQL Statements style
-        /// </summary>
-        public Style StatementsStyle { get; set; }
-
-        /// <summary>
-        /// SQL Functions style
-        /// </summary>
-        public Style FunctionsStyle { get; set; }
-
-        /// <summary>
-        /// SQL Types style
-        /// </summary>
-        public Style TypesStyle { get; set; }
-
-        #endregion
+    public struct FoldingDescription
+    {
+        public string startMarkerRegex;
+        public string endMarkerRegex;
+        public RegexOptions options;
     }
 
     /// <summary>
@@ -1469,6 +256,7 @@ public virtual void JSONSyntaxHighlight(Range range)
     public enum Language
     {
         Custom,
+        FromXMLfile,
         CSharp,
         VB,
         HTML,
@@ -1477,6 +265,7 @@ public enum Language
         PHP,
         JS,
         Lua,
-        JSON
+        JSON,
+        AVRASM
     }
-}
\ No newline at end of file
+}
diff --git a/FastColoredTextBox/SyntaxHighlighter.cs.old b/FastColoredTextBox/SyntaxHighlighter.cs.old
deleted file mode 100644
index 30a53a3f..00000000
--- a/FastColoredTextBox/SyntaxHighlighter.cs.old
+++ /dev/null
@@ -1,509 +0,0 @@
-using System.Drawing;
-using System.Text.RegularExpressions;
-using System.Collections.Generic;
-using System.Xml;
-using System.IO;
-using System;
-
-namespace FastColoredTextBoxNS
-{
-    public class SyntaxHighlighter: IDisposable
-    {
-        //styles
-        public readonly Style BlueStyle = new TextStyle(Brushes.Blue, null, FontStyle.Regular);
-        public readonly Style BlueBoldStyle = new TextStyle(Brushes.Blue, null, FontStyle.Bold);
-        public readonly Style BoldStyle = new TextStyle(null, null, FontStyle.Bold | FontStyle.Underline);
-        public readonly Style GrayStyle = new TextStyle(Brushes.Gray, null, FontStyle.Regular);
-        public readonly Style MagentaStyle = new TextStyle(Brushes.Magenta, null, FontStyle.Regular);
-        public readonly Style GreenStyle = new TextStyle(Brushes.Green, null, FontStyle.Italic);
-        public readonly Style BrownStyle = new TextStyle(Brushes.Brown, null, FontStyle.Italic);
-        public readonly Style RedStyle = new TextStyle(Brushes.Red, null, FontStyle.Regular);
-        public readonly Style MaroonStyle = new TextStyle(Brushes.Maroon, null, FontStyle.Regular);
-        //
-        Dictionary<string, SyntaxDescriptor> descByXMLfileNames = new Dictionary<string, SyntaxDescriptor>();
-
-        /// <summary>
-        /// Highlights syntax for given language
-        /// </summary>
-        public virtual void HighlightSyntax(Language language, Range range)
-        {
-            switch (language)
-            {
-                case Language.CSharp: CSharpSyntaxHighlight(range); break;
-                case Language.VB: VBSyntaxHighlight(range); break;
-                case Language.HTML: HTMLSyntaxHighlight(range); break;
-                case Language.SQL: SQLSyntaxHighlight(range); break;
-                case Language.PHP: PHPSyntaxHighlight(range); break;
-                default:
-                    break;
-            }
-        }
-
-        /// <summary>
-        /// Highlights syntax for given XML description file
-        /// </summary>
-        public virtual void HighlightSyntax(string XMLdescriptionFile, Range range)
-        {
-            SyntaxDescriptor desc = null;
-            if (!descByXMLfileNames.TryGetValue(XMLdescriptionFile, out desc))
-            {
-                var doc = new XmlDocument();
-                string file = XMLdescriptionFile;
-                if (!File.Exists(file))
-                    file = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, Path.GetFileName(file));
-
-                doc.LoadXml(File.ReadAllText(file));
-                desc = ParseXmlDescription(doc);
-                descByXMLfileNames[XMLdescriptionFile] = desc;
-            }
-            HighlightSyntax(desc, range);
-        }
-
-        public virtual void AutoIndentNeeded(object sender, AutoIndentEventArgs args)
-        {
-            FastColoredTextBox tb = (sender as FastColoredTextBox);
-            Language language = tb.Language;
-            switch (language)
-            {
-                case Language.CSharp: CSharpAutoIndentNeeded(sender, args); break;
-                case Language.VB: VBAutoIndentNeeded(sender, args); break;
-                case Language.HTML: HTMLAutoIndentNeeded(sender, args); break;
-                case Language.SQL: SQLAutoIndentNeeded(sender, args); break;
-                case Language.PHP: PHPAutoIndentNeeded(sender, args); break;
-                default:
-                    break;
-            }
-        }
-
-        private void PHPAutoIndentNeeded(object sender, AutoIndentEventArgs args)
-        {
-            FastColoredTextBox tb = sender as FastColoredTextBox;
-            tb.CalcAutoIndentShiftByCodeFolding(sender, args);
-        }
-
-        private void SQLAutoIndentNeeded(object sender, AutoIndentEventArgs args)
-        {
-            FastColoredTextBox tb = sender as FastColoredTextBox;
-            tb.CalcAutoIndentShiftByCodeFolding(sender, args);
-        }
-
-        private void HTMLAutoIndentNeeded(object sender, AutoIndentEventArgs args)
-        {
-            FastColoredTextBox tb = sender as FastColoredTextBox;
-            tb.CalcAutoIndentShiftByCodeFolding(sender, args);
-        }
-
-        private void VBAutoIndentNeeded(object sender, AutoIndentEventArgs args)
-        {
-            //end of block
-            if (Regex.IsMatch(args.LineText, @"^\s*(End|EndIf|Next|Loop)\b", RegexOptions.IgnoreCase))
-            {
-                args.Shift = -args.TabLength;
-                args.ShiftNextLines = -args.TabLength;
-                return;
-            }
-            //start of declaration
-            if (Regex.IsMatch(args.LineText, @"\b(Class|Property|Enum|Structure|Sub|Function|Namespace|Interface|Get|Set)\b", RegexOptions.IgnoreCase))
-            {
-                args.ShiftNextLines = args.TabLength;
-                return;
-            }
-            // then ...
-            if (Regex.IsMatch(args.LineText, @"\b(Then)\s*\S+", RegexOptions.IgnoreCase))
-                return;
-            //start of operator block
-            if (Regex.IsMatch(args.LineText, @"^\s*(If|While|For|Do|Try|With|Using|Select)\b", RegexOptions.IgnoreCase))
-            {
-                args.ShiftNextLines = args.TabLength;
-                return;
-            }
-
-            //Statements else, elseif, case etc
-            if (Regex.IsMatch(args.LineText, @"^\s*(Else|ElseIf|Case|Catch|Finally)\b", RegexOptions.IgnoreCase))
-            {
-                args.Shift = -args.TabLength;
-                return;
-            }
-
-            //Char _
-            if (args.PrevLineText.TrimEnd().EndsWith("_"))
-            {
-                args.Shift = args.TabLength;
-                return;
-            }
-        }
-
-        private void CSharpAutoIndentNeeded(object sender, AutoIndentEventArgs args)
-        {
-            //block {}
-            if (Regex.IsMatch(args.LineText, @"^[^""']*\{.*\}[^""']*$"))
-                return;
-            //start of block {}
-            if (Regex.IsMatch(args.LineText, @"^[^""']*\{"))
-            {
-                args.ShiftNextLines = args.TabLength;
-                return;
-            }
-            //end of block {}
-            if (Regex.IsMatch(args.LineText, @"}[^""']*$"))
-            {
-                args.Shift = -args.TabLength;
-                args.ShiftNextLines = -args.TabLength;
-                return;
-            }
-            //label
-            if (Regex.IsMatch(args.LineText, @"^\s*\w+\s*:\s*($|//)") &&
-                !Regex.IsMatch(args.LineText, @"^\s*default\s*:"))
-            {
-                args.Shift = -args.TabLength;
-                return;
-            }
-            //some statements: case, default
-            if (Regex.IsMatch(args.LineText, @"^\s*(case|default)\b.*:\s*($|//)"))
-            {
-                args.Shift = -args.TabLength/2;
-                return;
-            }
-            //is unclosed operator in previous line ?
-            if (Regex.IsMatch(args.PrevLineText, @"^\s*(if|for|foreach|while|[\}\s]*else)\b[^{]*$"))
-            if (!Regex.IsMatch(args.PrevLineText, @"(;\s*$)|(;\s*//)"))//operator is unclosed
-            {
-                args.Shift = args.TabLength;
-                return;
-            }            
-        }
-
-        public static SyntaxDescriptor ParseXmlDescription(XmlDocument doc)
-        {
-            SyntaxDescriptor desc = new SyntaxDescriptor();
-            XmlNode brackets = doc.SelectSingleNode("doc/brackets");
-            if (brackets != null)
-            {
-                if (brackets.Attributes["left"] == null || brackets.Attributes["right"] == null ||
-                    brackets.Attributes["left"].Value == "" || brackets.Attributes["right"].Value == "")
-                {
-                    desc.leftBracket = '\x0';
-                    desc.rightBracket = '\x0';
-                }
-                else
-                {
-                    desc.leftBracket = brackets.Attributes["left"].Value[0];
-                    desc.rightBracket = brackets.Attributes["right"].Value[0];
-                }
-
-                if (brackets.Attributes["left2"] == null || brackets.Attributes["right2"] == null ||
-    brackets.Attributes["left2"].Value == "" || brackets.Attributes["right2"].Value == "")
-                {
-                    desc.leftBracket2 = '\x0';
-                    desc.rightBracket2 = '\x0';
-                }
-                else
-                {
-                    desc.leftBracket2 = brackets.Attributes["left2"].Value[0];
-                    desc.rightBracket2 = brackets.Attributes["right2"].Value[0];
-                }
-            }
-
-            Dictionary<string, Style> styleByName = new Dictionary<string, Style>();
-
-            foreach (XmlNode style in doc.SelectNodes("doc/style"))
-            {
-                var s = ParseStyle(style);
-                styleByName[style.Attributes["name"].Value] = s;
-                desc.styles.Add(s);
-            }
-            foreach (XmlNode rule in doc.SelectNodes("doc/rule"))
-                desc.rules.Add(ParseRule(rule, styleByName));
-            foreach (XmlNode folding in doc.SelectNodes("doc/folding"))
-                desc.foldings.Add(ParseFolding(folding));
-
-            return desc;
-        }
-
-        private static FoldingDesc ParseFolding(XmlNode foldingNode)
-        {
-            FoldingDesc folding = new FoldingDesc();
-            //regex
-            folding.startMarkerRegex = foldingNode.Attributes["start"].Value;
-            folding.finishMarkerRegex = foldingNode.Attributes["finish"].Value;
-            //options
-            var optionsA = foldingNode.Attributes["options"];
-            if (optionsA != null)
-                folding.options = (RegexOptions)Enum.Parse(typeof(RegexOptions), optionsA.Value);
-
-            return folding;
-        }
-
-        private static RuleDesc ParseRule(XmlNode ruleNode, Dictionary<string, Style> styles)
-        {
-            RuleDesc rule = new RuleDesc();
-            rule.regex = ruleNode.InnerText;
-            //
-            var styleA = ruleNode.Attributes["style"];
-            var optionsA = ruleNode.Attributes["options"];
-            //Style
-            if (styleA == null)
-                throw new Exception("Rule must contain style name.");
-            if(!styles.ContainsKey(styleA.Value))
-                throw new Exception("Style '"+styleA.Value+"' is not found.");
-            rule.style = styles[styleA.Value];
-            //options
-            if (optionsA != null)
-                rule.options = (RegexOptions)Enum.Parse(typeof(RegexOptions), optionsA.Value);
-
-            return rule;
-        }
-
-        private static Style ParseStyle(XmlNode styleNode)
-        {
-            var typeA = styleNode.Attributes["type"];
-            var colorA = styleNode.Attributes["color"];
-            var backColorA = styleNode.Attributes["backColor"];
-            var fontStyleA = styleNode.Attributes["fontStyle"];
-            var nameA = styleNode.Attributes["name"];
-            //colors
-            SolidBrush foreBrush = null;
-            if (colorA != null)
-                foreBrush = new SolidBrush(ParseColor(colorA.Value));
-            SolidBrush backBrush = null;
-            if (backColorA != null)
-                backBrush = new SolidBrush(ParseColor(backColorA.Value));
-            //fontStyle
-            FontStyle fontStyle = FontStyle.Regular;
-            if (fontStyleA != null)
-                fontStyle = (FontStyle)Enum.Parse(typeof(FontStyle), fontStyleA.Value);
-
-            return new TextStyle(foreBrush, backBrush, fontStyle);
-        }
-
-        private static Color ParseColor(string s)
-        {
-            if (s.StartsWith("#"))
-            {
-                if(s.Length<=7)
-                    return Color.FromArgb(255, Color.FromArgb(Int32.Parse(s.Substring(1), System.Globalization.NumberStyles.AllowHexSpecifier)));
-                else
-                    return Color.FromArgb(Int32.Parse(s.Substring(1), System.Globalization.NumberStyles.AllowHexSpecifier));
-            }
-            else
-                return Color.FromName(s);
-        }
-
-        public void HighlightSyntax(SyntaxDescriptor desc, Range range)
-        {
-            //set style order
-            range.tb.ClearStylesBuffer();
-            for(int i=0;i<desc.styles.Count;i++)
-                range.tb.Styles[i] = desc.styles[i];
-            //brackets
-            range.tb.LeftBracket = desc.leftBracket;
-            range.tb.RightBracket = desc.rightBracket;
-            range.tb.LeftBracket2 = desc.leftBracket2;
-            range.tb.RightBracket2 = desc.rightBracket2;
-            //clear styles of range
-            range.ClearStyle(desc.styles.ToArray());
-            //highlight syntax
-            foreach (var rule in desc.rules)
-                range.SetStyle(rule.style, rule.regex, rule.options);
-            //clear folding
-            range.ClearFoldingMarkers();
-            //folding markers
-            foreach (var folding in desc.foldings)
-                range.SetFoldingMarkers(folding.startMarkerRegex, folding.finishMarkerRegex, folding.options);
-        }
-
-        /// <summary>
-        /// Highlights C# code
-        /// </summary>
-        /// <param name="range"></param>
-        public virtual void CSharpSyntaxHighlight(Range range)
-        {
-            range.tb.CommentPrefix = "//";
-            range.tb.LeftBracket = '(';
-            range.tb.RightBracket = ')';
-            range.tb.LeftBracket2 = '\x0';
-            range.tb.RightBracket2 = '\x0';
-            //clear style of changed range
-            range.ClearStyle(BlueStyle, BoldStyle, GrayStyle, MagentaStyle, GreenStyle, BrownStyle);
-            //string highlighting
-            range.SetStyle(BrownStyle, @""".*?""|'.+?'");
-            //comment highlighting
-            range.SetStyle(GreenStyle, @"//.*$", RegexOptions.Multiline);
-            range.SetStyle(GreenStyle, @"(/\*.*?\*/)|(/\*.*)", RegexOptions.Singleline);
-            range.SetStyle(GreenStyle, @"(/\*.*?\*/)|(.*\*/)", RegexOptions.Singleline | RegexOptions.RightToLeft);
-            //number highlighting
-            range.SetStyle(MagentaStyle, @"\b\d+[\.]?\d*([eE]\-?\d+)?[lLdDfF]?\b|\b0x[a-fA-F\d]+\b");
-            //attribute highlighting
-            range.SetStyle(GrayStyle, @"^\s*(?<range>\[.+?\])\s*$", RegexOptions.Multiline);
-            //class name highlighting
-            range.SetStyle(BoldStyle, @"\b(class|struct|enum|interface)\s+(?<range>\w+?)\b");
-            //keyword highlighting
-            range.SetStyle(BlueStyle, @"\b(abstract|as|base|bool|break|byte|case|catch|char|checked|class|const|continue|decimal|default|delegate|do|double|else|enum|event|explicit|extern|false|finally|fixed|float|for|foreach|goto|if|implicit|in|int|interface|internal|is|lock|long|namespace|new|null|object|operator|out|override|params|private|protected|public|readonly|ref|return|sbyte|sealed|short|sizeof|stackalloc|static|string|struct|switch|this|throw|true|try|typeof|uint|ulong|unchecked|unsafe|ushort|using|virtual|void|volatile|while|add|alias|ascending|descending|dynamic|from|get|global|group|into|join|let|orderby|partial|remove|select|set|value|var|where|yield)\b|#region\b|#endregion\b");
-
-            //clear folding markers
-            range.ClearFoldingMarkers();
-            //set folding markers
-            range.SetFoldingMarkers("{", "}");//allow to collapse brackets block
-            range.SetFoldingMarkers(@"#region\b", @"#endregion\b");//allow to collapse #region blocks
-            range.SetFoldingMarkers(@"/\*", @"\*/");//allow to collapse comment block
-        }
-
-        /// <summary>
-        /// Highlights VB code
-        /// </summary>
-        /// <param name="range"></param>
-        public virtual void VBSyntaxHighlight(Range range)
-        {
-            range.tb.CommentPrefix = "'";
-            range.tb.LeftBracket = '(';
-            range.tb.RightBracket = ')';
-            range.tb.LeftBracket2 = '\x0';
-            range.tb.RightBracket2 = '\x0';
-            //clear style of changed range
-            range.ClearStyle(BrownStyle, GreenStyle, MagentaStyle, BoldStyle, BlueStyle);
-            //string highlighting
-            range.SetStyle(BrownStyle, @""".*?""");
-            //comment highlighting
-            range.SetStyle(GreenStyle, @"'.*$", RegexOptions.Multiline);
-            //number highlighting
-            range.SetStyle(MagentaStyle, @"\b\d+[\.]?\d*([eE]\-?\d+)?\b");
-            //class name highlighting
-            range.SetStyle(BoldStyle, @"\b(Class|Structure|Enum|Interface)[ ]+(?<range>\w+?)\b", RegexOptions.IgnoreCase);
-            //keyword highlighting
-            range.SetStyle(BlueStyle, @"\b(AddHandler|AddressOf|Alias|And|AndAlso|As|Boolean|ByRef|Byte|ByVal|Call|Case|Catch|CBool|CByte|CChar|CDate|CDbl|CDec|Char|CInt|Class|CLng|CObj|Const|Continue|CSByte|CShort|CSng|CStr|CType|CUInt|CULng|CUShort|Date|Decimal|Declare|Default|Delegate|Dim|DirectCast|Do|Double|Each|Else|ElseIf|End|EndIf|Enum|Erase|Error|Event|Exit|False|Finally|For|Friend|Function|Get|GetType|GetXMLNamespace|Global|GoSub|GoTo|Handles|If|Implements|Imports|In|Inherits|Integer|Interface|Is|IsNot|Let|Lib|Like|Long|Loop|Me|Mod|Module|MustInherit|MustOverride|MyBase|MyClass|Namespace|Narrowing|New|Next|Not|Nothing|NotInheritable|NotOverridable|Object|Of|On|Operator|Option|Optional|Or|OrElse|Overloads|Overridable|Overrides|ParamArray|Partial|Private|Property|Protected|Public|RaiseEvent|ReadOnly|ReDim|REM|RemoveHandler|Resume|Return|SByte|Select|Set|Shadows|Shared|Short|Single|Static|Step|Stop|String|Structure|Sub|SyncLock|Then|Throw|To|True|Try|TryCast|TypeOf|UInteger|ULong|UShort|Using|Variant|Wend|When|While|Widening|With|WithEvents|WriteOnly|Xor|Region)\b|(#Const|#Else|#ElseIf|#End|#If|#Region)\b", RegexOptions.IgnoreCase);
-
-            //clear folding markers
-            range.ClearFoldingMarkers();
-            //set folding markers
-            range.SetFoldingMarkers(@"#Region\b", @"#End\s+Region\b", RegexOptions.IgnoreCase);
-            range.SetFoldingMarkers(@"\b(Class|Property|Enum|Structure|Interface)[ \t]+\S+", @"\bEnd (Class|Property|Enum|Structure|Interface)\b", RegexOptions.IgnoreCase);
-            range.SetFoldingMarkers(@"^\s*(?<range>While)[ \t]+\S+", @"^\s*(?<range>End While)\b", RegexOptions.Multiline | RegexOptions.IgnoreCase);
-            range.SetFoldingMarkers(@"\b(Sub|Function)[ \t]+[^\s']+", @"\bEnd (Sub|Function)\b", RegexOptions.IgnoreCase);//this declared separately because Sub and Function can be unclosed
-            range.SetFoldingMarkers(@"(\r|\n|^)[ \t]*(?<range>Get|Set)[ \t]*(\r|\n|$)", @"\bEnd (Get|Set)\b", RegexOptions.IgnoreCase);
-            range.SetFoldingMarkers(@"^\s*(?<range>For|For\s+Each)\b", @"^\s*(?<range>Next)\b", RegexOptions.Multiline | RegexOptions.IgnoreCase);
-            range.SetFoldingMarkers(@"^\s*(?<range>Do)\b", @"^\s*(?<range>Loop)\b", RegexOptions.Multiline | RegexOptions.IgnoreCase);
-        }
-
-        /// <summary>
-        /// Highlights HTML code
-        /// </summary>
-        /// <param name="range"></param>
-        public virtual void HTMLSyntaxHighlight(Range range)
-        {
-            range.tb.CommentPrefix = null;
-            range.tb.LeftBracket = '<';
-            range.tb.RightBracket = '>';
-            range.tb.LeftBracket2 = '(';
-            range.tb.RightBracket2 = ')';
-            //clear style of changed range
-            range.ClearStyle(BlueStyle, MaroonStyle, RedStyle);
-            //tag brackets highlighting
-            range.SetStyle(BlueStyle, @"<|/>|</|>");
-            //tag name
-            range.SetStyle(MaroonStyle, @"<(?<range>[!\w]+)");
-            //end of tag
-            range.SetStyle(MaroonStyle, @"</(?<range>\w+)>");
-            //attributes
-            range.SetStyle(RedStyle, @"(?<range>\S+?)='[^']*'|(?<range>\S+)=""[^""]*""|(?<range>\S+)=\S+");
-            //attribute values
-            range.SetStyle(BlueStyle, @"\S+?=(?<range>'[^']*')|\S+=(?<range>""[^""]*"")|\S+=(?<range>\S+)");
-
-            //clear folding markers
-            range.ClearFoldingMarkers();
-            //set folding markers
-            range.SetFoldingMarkers("<head", "</head>", RegexOptions.IgnoreCase);
-            range.SetFoldingMarkers("<body", "</body>", RegexOptions.IgnoreCase);
-            range.SetFoldingMarkers("<table", "</table>", RegexOptions.IgnoreCase);
-            range.SetFoldingMarkers("<form", "</form>", RegexOptions.IgnoreCase);
-            range.SetFoldingMarkers("<div", "</div>", RegexOptions.IgnoreCase);
-            range.SetFoldingMarkers("<script", "</script>", RegexOptions.IgnoreCase);
-            range.SetFoldingMarkers("<tr", "</tr>", RegexOptions.IgnoreCase);
-        }
-
-        /// <summary>
-        /// Highlights SQL code
-        /// </summary>
-        /// <param name="range"></param>
-        public virtual void SQLSyntaxHighlight(Range range)
-        {
-            range.tb.CommentPrefix = "--";
-            range.tb.LeftBracket = '(';
-            range.tb.RightBracket = ')';
-            range.tb.LeftBracket2 = '\x0';
-            range.tb.RightBracket2 = '\x0';
-            //clear style of changed range
-            range.ClearStyle(RedStyle, MagentaStyle, GreenStyle, BlueBoldStyle, BlueStyle, MaroonStyle);
-            //string highlighting
-            range.SetStyle(RedStyle, @""".*?""|'.+?'");
-            //number highlighting
-            range.SetStyle(MagentaStyle, @"\b\d+[\.]?\d*([eE]\-?\d+)?\b");
-            //comment highlighting
-            range.SetStyle(GreenStyle, @"--.*$", RegexOptions.Multiline);
-            range.SetStyle(GreenStyle, @"(/\*.*?\*/)|(/\*.*)", RegexOptions.Singleline);
-            range.SetStyle(GreenStyle, @"(/\*.*?\*/)|(.*\*/)", RegexOptions.Singleline | RegexOptions.RightToLeft);
-            //var highlighting
-            range.SetStyle(MaroonStyle, @"@[a-zA-Z_\d]*\b");
-            //statements
-            range.SetStyle(BlueBoldStyle, @"\b(ALTER APPLICATION ROLE|ALTER ASSEMBLY|ALTER ASYMMETRIC KEY|ALTER AUTHORIZATION|ALTER BROKER PRIORITY|ALTER CERTIFICATE|ALTER CREDENTIAL|ALTER CRYPTOGRAPHIC PROVIDER|ALTER DATABASE|ALTER DATABASE AUDIT SPECIFICATION|ALTER DATABASE ENCRYPTION KEY|ALTER ENDPOINT|ALTER EVENT SESSION|ALTER FULLTEXT CATALOG|ALTER FULLTEXT INDEX|ALTER FULLTEXT STOPLIST|ALTER FUNCTION|ALTER INDEX|ALTER LOGIN|ALTER MASTER KEY|ALTER MESSAGE TYPE|ALTER PARTITION FUNCTION|ALTER PARTITION SCHEME|ALTER PROCEDURE|ALTER QUEUE|ALTER REMOTE SERVICE BINDING|ALTER RESOURCE GOVERNOR|ALTER RESOURCE POOL|ALTER ROLE|ALTER ROUTE|ALTER SCHEMA|ALTER SERVER AUDIT|ALTER SERVER AUDIT SPECIFICATION|ALTER SERVICE|ALTER SERVICE MASTER KEY|ALTER SYMMETRIC KEY|ALTER TABLE|ALTER TRIGGER|ALTER USER|ALTER VIEW|ALTER WORKLOAD GROUP|ALTER XML SCHEMA COLLECTION|BULK INSERT|CREATE AGGREGATE|CREATE APPLICATION ROLE|CREATE ASSEMBLY|CREATE ASYMMETRIC KEY|CREATE BROKER PRIORITY|CREATE CERTIFICATE|CREATE CONTRACT|CREATE CREDENTIAL|CREATE CRYPTOGRAPHIC PROVIDER|CREATE DATABASE|CREATE DATABASE AUDIT SPECIFICATION|CREATE DATABASE ENCRYPTION KEY|CREATE DEFAULT|CREATE ENDPOINT|CREATE EVENT NOTIFICATION|CREATE EVENT SESSION|CREATE FULLTEXT CATALOG|CREATE FULLTEXT INDEX|CREATE FULLTEXT STOPLIST|CREATE FUNCTION|CREATE INDEX|CREATE LOGIN|CREATE MASTER KEY|CREATE MESSAGE TYPE|CREATE PARTITION FUNCTION|CREATE PARTITION SCHEME|CREATE PROCEDURE|CREATE QUEUE|CREATE REMOTE SERVICE BINDING|CREATE RESOURCE POOL|CREATE ROLE|CREATE ROUTE|CREATE RULE|CREATE SCHEMA|CREATE SERVER AUDIT|CREATE SERVER AUDIT SPECIFICATION|CREATE SERVICE|CREATE SPATIAL INDEX|CREATE STATISTICS|CREATE SYMMETRIC KEY|CREATE SYNONYM|CREATE TABLE|CREATE TRIGGER|CREATE TYPE|CREATE USER|CREATE VIEW|CREATE WORKLOAD GROUP|CREATE XML INDEX|CREATE XML SCHEMA COLLECTION|DELETE|DISABLE TRIGGER|DROP AGGREGATE|DROP APPLICATION ROLE|DROP ASSEMBLY|DROP ASYMMETRIC KEY|DROP BROKER PRIORITY|DROP CERTIFICATE|DROP CONTRACT|DROP CREDENTIAL|DROP CRYPTOGRAPHIC PROVIDER|DROP DATABASE|DROP DATABASE AUDIT SPECIFICATION|DROP DATABASE ENCRYPTION KEY|DROP DEFAULT|DROP ENDPOINT|DROP EVENT NOTIFICATION|DROP EVENT SESSION|DROP FULLTEXT CATALOG|DROP FULLTEXT INDEX|DROP FULLTEXT STOPLIST|DROP FUNCTION|DROP INDEX|DROP LOGIN|DROP MASTER KEY|DROP MESSAGE TYPE|DROP PARTITION FUNCTION|DROP PARTITION SCHEME|DROP PROCEDURE|DROP QUEUE|DROP REMOTE SERVICE BINDING|DROP RESOURCE POOL|DROP ROLE|DROP ROUTE|DROP RULE|DROP SCHEMA|DROP SERVER AUDIT|DROP SERVER AUDIT SPECIFICATION|DROP SERVICE|DROP SIGNATURE|DROP STATISTICS|DROP SYMMETRIC KEY|DROP SYNONYM|DROP TABLE|DROP TRIGGER|DROP TYPE|DROP USER|DROP VIEW|DROP WORKLOAD GROUP|DROP XML SCHEMA COLLECTION|ENABLE TRIGGER|EXEC|EXECUTE|FROM|INSERT|MERGE|OPTION|OUTPUT|SELECT|TOP|TRUNCATE TABLE|UPDATE|UPDATE STATISTICS|WHERE|WITH)\b", RegexOptions.IgnoreCase);
-            //key words
-            range.SetStyle(BlueStyle, @"\b(ADD|ALL|AND|ANY|AS|ASC|AUTHORIZATION|BACKUP|BEGIN|BETWEEN|BREAK|BROWSE|BY|CASCADE|CHECK|CHECKPOINT|CLOSE|CLUSTERED|COLLATE|COLUMN|COMMIT|COMPUTE|CONSTRAINT|CONTAINS|CONTINUE|CROSS|CURRENT|CURRENT_DATE|CURRENT_TIME|CURSOR|DATABASE|DBCC|DEALLOCATE|DECLARE|DEFAULT|DENY|DESC|DISK|DISTINCT|DISTRIBUTED|DOUBLE|DUMP|ELSE|END|ERRLVL|ESCAPE|EXCEPT|EXISTS|EXIT|EXTERNAL|FETCH|FILE|FILLFACTOR|FOR|FOREIGN|FREETEXT|FULL|FUNCTION|GOTO|GRANT|GROUP|HAVING|HOLDLOCK|IDENTITY|IDENTITY_INSERT|IDENTITYCOL|IF|IN|INDEX|INNER|INTERSECT|INTO|IS|JOIN|KEY|KILL|LIKE|LINENO|LOAD|NATIONAL|NOCHECK|NONCLUSTERED|NOT|NULL|OF|OFF|OFFSETS|ON|OPEN|OR|ORDER|OUTER|OVER|PERCENT|PIVOT|PLAN|PRECISION|PRIMARY|PRINT|PROC|PROCEDURE|PUBLIC|RAISERROR|READ|READTEXT|RECONFIGURE|REFERENCES|REPLICATION|RESTORE|RESTRICT|RETURN|REVERT|REVOKE|ROLLBACK|ROWCOUNT|ROWGUIDCOL|RULE|SAVE|SCHEMA|SECURITYAUDIT|SET|SHUTDOWN|SOME|STATISTICS|TABLE|TABLESAMPLE|TEXTSIZE|THEN|TO|TRAN|TRANSACTION|TRIGGER|TSEQUAL|UNION|UNIQUE|UNPIVOT|UPDATETEXT|USE|USER|VALUES|VARYING|VIEW|WAITFOR|WHEN|WHILE|WRITETEXT)\b", RegexOptions.IgnoreCase);
-            //functions
-            range.SetStyle(MaroonStyle, @"(@@CONNECTIONS|@@CPU_BUSY|@@CURSOR_ROWS|@@DATEFIRST|@@DATEFIRST|@@DBTS|@@ERROR|@@FETCH_STATUS|@@IDENTITY|@@IDLE|@@IO_BUSY|@@LANGID|@@LANGUAGE|@@LOCK_TIMEOUT|@@MAX_CONNECTIONS|@@MAX_PRECISION|@@NESTLEVEL|@@OPTIONS|@@PACKET_ERRORS|@@PROCID|@@REMSERVER|@@ROWCOUNT|@@SERVERNAME|@@SERVICENAME|@@SPID|@@TEXTSIZE|@@TRANCOUNT|@@VERSION)\b|\b(ABS|ACOS|APP_NAME|ASCII|ASIN|ASSEMBLYPROPERTY|AsymKey_ID|ASYMKEY_ID|asymkeyproperty|ASYMKEYPROPERTY|ATAN|ATN2|AVG|CASE|CAST|CEILING|Cert_ID|Cert_ID|CertProperty|CHAR|CHARINDEX|CHECKSUM_AGG|COALESCE|COL_LENGTH|COL_NAME|COLLATIONPROPERTY|COLLATIONPROPERTY|COLUMNPROPERTY|COLUMNS_UPDATED|COLUMNS_UPDATED|CONTAINSTABLE|CONVERT|COS|COT|COUNT|COUNT_BIG|CRYPT_GEN_RANDOM|CURRENT_TIMESTAMP|CURRENT_TIMESTAMP|CURRENT_USER|CURRENT_USER|CURSOR_STATUS|DATABASE_PRINCIPAL_ID|DATABASE_PRINCIPAL_ID|DATABASEPROPERTY|DATABASEPROPERTYEX|DATALENGTH|DATALENGTH|DATEADD|DATEDIFF|DATENAME|DATEPART|DAY|DB_ID|DB_NAME|DECRYPTBYASYMKEY|DECRYPTBYCERT|DECRYPTBYKEY|DECRYPTBYKEYAUTOASYMKEY|DECRYPTBYKEYAUTOCERT|DECRYPTBYPASSPHRASE|DEGREES|DENSE_RANK|DIFFERENCE|ENCRYPTBYASYMKEY|ENCRYPTBYCERT|ENCRYPTBYKEY|ENCRYPTBYPASSPHRASE|ERROR_LINE|ERROR_MESSAGE|ERROR_NUMBER|ERROR_PROCEDURE|ERROR_SEVERITY|ERROR_STATE|EVENTDATA|EXP|FILE_ID|FILE_IDEX|FILE_NAME|FILEGROUP_ID|FILEGROUP_NAME|FILEGROUPPROPERTY|FILEPROPERTY|FLOOR|fn_helpcollations|fn_listextendedproperty|fn_servershareddrives|fn_virtualfilestats|fn_virtualfilestats|FORMATMESSAGE|FREETEXTTABLE|FULLTEXTCATALOGPROPERTY|FULLTEXTSERVICEPROPERTY|GETANSINULL|GETDATE|GETUTCDATE|GROUPING|HAS_PERMS_BY_NAME|HOST_ID|HOST_NAME|IDENT_CURRENT|IDENT_CURRENT|IDENT_INCR|IDENT_INCR|IDENT_SEED|IDENTITY\(|INDEX_COL|INDEXKEY_PROPERTY|INDEXPROPERTY|IS_MEMBER|IS_OBJECTSIGNED|IS_SRVROLEMEMBER|ISDATE|ISDATE|ISNULL|ISNUMERIC|Key_GUID|Key_GUID|Key_ID|Key_ID|KEY_NAME|KEY_NAME|LEFT|LEN|LOG|LOG10|LOWER|LTRIM|MAX|MIN|MONTH|NCHAR|NEWID|NTILE|NULLIF|OBJECT_DEFINITION|OBJECT_ID|OBJECT_NAME|OBJECT_SCHEMA_NAME|OBJECTPROPERTY|OBJECTPROPERTYEX|OPENDATASOURCE|OPENQUERY|OPENROWSET|OPENXML|ORIGINAL_LOGIN|ORIGINAL_LOGIN|PARSENAME|PATINDEX|PATINDEX|PERMISSIONS|PI|POWER|PUBLISHINGSERVERNAME|PWDCOMPARE|PWDENCRYPT|QUOTENAME|RADIANS|RAND|RANK|REPLACE|REPLICATE|REVERSE|RIGHT|ROUND|ROW_NUMBER|ROWCOUNT_BIG|RTRIM|SCHEMA_ID|SCHEMA_ID|SCHEMA_NAME|SCHEMA_NAME|SCOPE_IDENTITY|SERVERPROPERTY|SESSION_USER|SESSION_USER|SESSIONPROPERTY|SETUSER|SIGN|SignByAsymKey|SignByCert|SIN|SOUNDEX|SPACE|SQL_VARIANT_PROPERTY|SQRT|SQUARE|STATS_DATE|STDEV|STDEVP|STR|STUFF|SUBSTRING|SUM|SUSER_ID|SUSER_NAME|SUSER_SID|SUSER_SNAME|SWITCHOFFSET|SYMKEYPROPERTY|symkeyproperty|sys\.dm_db_index_physical_stats|sys\.fn_builtin_permissions|sys\.fn_my_permissions|SYSDATETIME|SYSDATETIMEOFFSET|SYSTEM_USER|SYSTEM_USER|SYSUTCDATETIME|TAN|TERTIARY_WEIGHTS|TEXTPTR|TODATETIMEOFFSET|TRIGGER_NESTLEVEL|TYPE_ID|TYPE_NAME|TYPEPROPERTY|UNICODE|UPDATE\(|UPPER|USER_ID|USER_NAME|USER_NAME|VAR|VARP|VerifySignedByAsymKey|VerifySignedByCert|XACT_STATE|YEAR)\b", RegexOptions.IgnoreCase);
-
-            //clear folding markers
-            range.ClearFoldingMarkers();
-            //set folding markers
-            range.SetFoldingMarkers(@"\bBEGIN\b", @"\bEND\b", RegexOptions.IgnoreCase);//allow to collapse BEGIN..END blocks
-            range.SetFoldingMarkers(@"/\*", @"\*/");//allow to collapse comment block
-        }
-
-        /// <summary>
-        /// Highlights PHP code
-        /// </summary>
-        /// <param name="range"></param>
-        public virtual void PHPSyntaxHighlight(Range range)
-        {
-            range.tb.CommentPrefix = "#";
-            range.tb.LeftBracket = '(';
-            range.tb.RightBracket = ')';
-            range.tb.LeftBracket2 = '\x0';
-            range.tb.RightBracket2 = '\x0';
-            //clear style of changed range
-            range.ClearStyle(BlueStyle, GrayStyle, MagentaStyle, GreenStyle, RedStyle, MaroonStyle);
-            //string highlighting
-            range.SetStyle(RedStyle, @""".*?""|'.+?'");
-            //number highlighting
-            range.SetStyle(RedStyle, @"\b\d+[\.]?\d*\b");
-            //comment highlighting
-            range.SetStyle(GreenStyle, @"(//|#).*$", RegexOptions.Multiline);
-            range.SetStyle(GreenStyle, @"(/\*.*?\*/)|(/\*.*)", RegexOptions.Singleline);
-            range.SetStyle(GreenStyle, @"(/\*.*?\*/)|(.*\*/)", RegexOptions.Singleline | RegexOptions.RightToLeft);
-            //var highlighting
-            range.SetStyle(MaroonStyle, @"\$[a-zA-Z_\d]*\b");
-            //keyword highlighting
-            range.SetStyle(MagentaStyle, @"\b(die|echo|empty|exit|eval|include|include_once|isset|list|require|require_once|return|print|unset)\b");
-            range.SetStyle(BlueStyle, @"\b(abstract|and|array|as|break|case|catch|cfunction|class|clone|const|continue|declare|default|do|else|elseif|enddeclare|endfor|endforeach|endif|endswitch|endwhile|extends|final|for|foreach|function|global|goto|if|implements|instanceof|interface|namespace|new|or|private|protected|public|static|switch|throw|try|use|var|while|xor)\b");
-            range.SetStyle(GrayStyle, @"__CLASS__|__DIR__|__FILE__|__LINE__|__FUNCTION__|__METHOD__|__NAMESPACE__");
-
-            //clear folding markers
-            range.ClearFoldingMarkers();
-            //set folding markers
-            range.SetFoldingMarkers("{", "}");//allow to collapse brackets block
-            range.SetFoldingMarkers(@"/\*", @"\*/");//allow to collapse comment block
-        }
-
-        public void Dispose()
-        {
-            foreach (var desc in descByXMLfileNames.Values)
-                desc.Dispose();
-        }
-    }
-
-    /// <summary>
-    /// Language
-    /// </summary>
-    public enum Language
-    {
-        Custom, CSharp, VB, HTML, SQL, PHP
-    }
-}
diff --git a/FastColoredTextBox/SyntaxSources/AvrasmSyntaxSource.cs b/FastColoredTextBox/SyntaxSources/AvrasmSyntaxSource.cs
new file mode 100644
index 00000000..7a5a4bb0
--- /dev/null
+++ b/FastColoredTextBox/SyntaxSources/AvrasmSyntaxSource.cs
@@ -0,0 +1,114 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Text;
+using System.Text.RegularExpressions;
+
+namespace FastColoredTextBoxNS.SyntaxSources
+{
+    class AvrasmSyntaxSource : SyntaxHighlighter
+    {
+        public AvrasmSyntaxSource(FastColoredTextBox textbox) : base(textbox)
+        {
+            Init();
+        }
+        public override void AutoIndentNeeded(object sender, AutoIndentEventArgs args)
+        {
+            //block macro
+            if (Regex.IsMatch(args.LineText, @"^\.macro\s.*\.endm$"))
+                return;
+            //start of block macro
+            if (Regex.IsMatch(args.LineText, @"\.macro\b"))
+            {
+                args.AbsoluteIndentation = 0;
+                args.ShiftNextLines = args.TabLength;
+                return;
+            }
+            //end of block macro
+            if (Regex.IsMatch(args.LineText, @"\.endm(?:acro)?\b"))
+            {
+                args.AbsoluteIndentation = 0;
+                args.ShiftNextLines = args.TabLength;
+                return;
+            }
+            //Method start
+            if (Regex.IsMatch(args.LineText, @"^\s*[A-Z]\w+:"))
+            {
+                args.AbsoluteIndentation = 0;
+                args.ShiftNextLines = 2 * args.TabLength;
+                return;
+            }
+            //Method end
+            if (Regex.IsMatch(args.LineText, @"^\s*reti?"))
+            {
+                args.AbsoluteIndentation = 0;
+                args.ShiftNextLines = 2 * args.TabLength;
+                return;
+            }
+            if (Regex.IsMatch(args.LineText, @"^\s*[a-z]\w+:"))
+            {
+                args.Shift = -args.TabLength;
+                args.ShiftNextLines = args.TabLength;
+                return;
+            }
+        }
+        public override void Init()
+        {
+            //Brackets
+            Textbox.CommentPrefix = ";";
+            Textbox.LeftBracket = '\0';
+            Textbox.RightBracket = '\0';
+            Textbox.LeftBracket2 = '\0';
+            Textbox.RightBracket2 = '\0';
+            Textbox.BracketsHighlightStrategy = BracketsHighlightStrategy.Strategy2;
+
+            Textbox.AutoIndentCharsPatterns = @"";
+
+            //MainStyles
+            AddStyle("String",
+                PredefinedStyles.BrownStyle,
+                new Regex(@"'(?<=[^\\])(.|\\[0nrabftv\\'""]|\\x[A-Fa-f0-9]{ 2}|\\[0-3][0-7]{2})'(?=[^\\])|" +
+                @"""(?<=[^\\]).*?""(?=[^\\])", RegexOptions.Singleline | RegexCompiledOption));
+            AddStyle("Comment", 
+                PredefinedStyles.GreenStyle,
+                new Regex(@"(\;.*)|(\/\/.*)$", RegexOptions.Multiline | RegexCompiledOption));
+            AddStyle("Comment2", 
+                StyleSchema["Comment1"].Style,
+                new Regex(@"(\/\*.*?\*\/)|(\/\*.*)", RegexOptions.Singleline | RegexCompiledOption));
+            AddStyle("Number",
+                PredefinedStyles.GreenStyle,
+                new Regex(@"((?<=\W)\\\d{3}\b)|((?<=\W)[\\0]x[A-Fa-f0-9]{2}\b)|(\b\d+\b)", RegexCompiledOption));
+            AddStyle("PreProcessor Directive",
+                PredefinedStyles.DarkGreenBoldStyle,
+                new Regex(@"#(define|undef|ifn?def|(end)?if|el(if|se)|error|warning|message|include|pragma)?", RegexCompiledOption));
+            AddStyle("Assembler Directive",
+                PredefinedStyles.DarkGreenBoldStyle,     
+                new Regex(@"\.(byte|cseg(size)?|db|def|dseg|dw|endm(acro)?|equ|eseg|exit|include|list(mac)?|macro|nolist|org|set|el(se|if)" +
+                @"|endif|error|ifn?(def)?|message|dd|dq|undef|warning|(no)?overlap)\b", RegexOptions.IgnoreCase | RegexCompiledOption));
+            AddStyle("Instruction",
+                PredefinedStyles.MaroonStyle,
+                new Regex(@"\b(?:ad[dc]|adiw|subi?|sbci?|andi?|ori?|eor|com|neg|[cs]br|inc|dec|tst|sbiw|f?mul(?:s|su)?|(?:r|i|ei)?jmp|" +
+                @"(?:r|i|ei)?call|reti?|cp(?:se|c|i)?|sbr[cs]|sbi[cs]|brb[cs]|br(?:eq|ne|cs|cc|sh|lo|mi|pl|ge|lt|hs|hc|ts|tc|vs|vc|ie|id)|movw?|ld[is]?|la[cts]|" +
+                @"xch|st[s]?|e?lpm|e?spm|in|out|push|pop|ls[rl]|ro[lr]|asr|swap|bset|bclr|[cs]bi|bst|bld|se[chinrstvz]|cl[chinrstvz]|nop|sleep|wdr|break)\b",
+                RegexOptions.IgnoreCase | RegexCompiledOption));
+            AddStyle("Define Name",
+                PredefinedStyles.RedStyle,
+                new Regex(@"(?:(?<=\.(?:def|set|equ)\s)|(?<=#define\s))\w+\b", RegexOptions.IgnoreCase | RegexCompiledOption));
+            AddStyle("Method Name",
+                new TextStyle(Brushes.Gray, null, FontStyle.Bold),
+                new Regex(@"^[A-Z]\w*(?=:)", RegexOptions.Multiline | RegexCompiledOption));
+            AddStyle("Label Name",
+                PredefinedStyles.GrayStyle,
+                new Regex(@"\t[a-z]\w*(?=:)", RegexCompiledOption));
+            AddStyle("Macros Name",
+                PredefinedStyles.BlueStyle,
+                new Regex(@"(?<=\.macro\s)(?=\s*)\w+", RegexOptions.IgnoreCase | RegexCompiledOption));
+
+            AddFoldingRule(@"\.[Mm][Aa][Cc][Rr][Oo]\b", @"\.[Ee][Nn][Dd][Mm]\b");
+            AddFoldingRule(@"\.[Mm][Aa][Cc][Rr][Oo]\b", @"\.[Ee][Nn][Dd][Mm][Aa][Cc][Rr][Oo]\b");
+            AddFoldingRule(@"[A-Z]\w*:", @"reti?\b");
+            AddFoldingRule(@"/\*", @"\*/");
+
+        }
+    }
+}
diff --git a/FastColoredTextBox/SyntaxSources/CSharpSyntaxSource.cs b/FastColoredTextBox/SyntaxSources/CSharpSyntaxSource.cs
new file mode 100644
index 00000000..9c77d733
--- /dev/null
+++ b/FastColoredTextBox/SyntaxSources/CSharpSyntaxSource.cs
@@ -0,0 +1,178 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Text;
+using System.Text.RegularExpressions;
+
+namespace FastColoredTextBoxNS.SyntaxSources
+{
+    class CSharpSyntaxSource : SyntaxHighlighter
+    {
+        Style TagContentStyle = new TextStyle(Brushes.Gray, null, FontStyle.Regular);
+        Regex TagContentRegex = new Regex(@"<[^>]+>", RegexCompiledOption);
+
+        public CSharpSyntaxSource(FastColoredTextBox textbox) : base(textbox)
+        { 
+            Init();
+        }
+
+        public override void AutoIndentNeeded(object sender, AutoIndentEventArgs args)
+        {
+            //block {}
+            if (Regex.IsMatch(args.LineText, @"^[^""']*\{.*\}[^""']*$"))
+                return;
+            //start of block {}
+            if (Regex.IsMatch(args.LineText, @"^[^""']*\{"))
+            {
+                args.ShiftNextLines = args.TabLength;
+                return;
+            }
+            //end of block {}
+            if (Regex.IsMatch(args.LineText, @"}[^""']*$"))
+            {
+                args.Shift = -args.TabLength;
+                args.ShiftNextLines = -args.TabLength;
+                return;
+            }
+            //label
+            if (Regex.IsMatch(args.LineText, @"^\s*\w+\s*:\s*($|//)") &&
+                !Regex.IsMatch(args.LineText, @"^\s*default\s*:"))
+            {
+                args.Shift = -args.TabLength;
+                return;
+            }
+            //some statements: case, default
+            if (Regex.IsMatch(args.LineText, @"^\s*(case|default)\b.*:\s*($|//)"))
+            {
+                args.Shift = -args.TabLength / 2;
+                return;
+            }
+            //is unclosed operator in previous line ?
+            if (Regex.IsMatch(args.PrevLineText, @"^\s*(if|for|foreach|while|[\}\s]*else)\b[^{]*$"))
+                if (!Regex.IsMatch(args.PrevLineText, @"(;\s*$)|(;\s*//)")) //operator is unclosed
+                {
+                    args.Shift = args.TabLength;
+                    return;
+                }
+        }
+
+        public override void Init()
+        {
+            //Brackets
+            Textbox.CommentPrefix = "//";
+            Textbox.LeftBracket = '(';
+            Textbox.RightBracket = ')';
+            Textbox.LeftBracket2 = '{';
+            Textbox.RightBracket2 = '}';
+            Textbox.BracketsHighlightStrategy = BracketsHighlightStrategy.Strategy2;
+
+            Textbox.AutoIndentCharsPatterns = @"^\s*[\w\.]+(\s\w+)?\s*(?<range>=)\s*(?<range>[^;=]+);^\s*(case|default)\s*[^:]*(?<range>:)\s*(?<range>[^;]+);";
+
+            //MainStyles
+            AddStyle("String",
+                PredefinedStyles.BrownStyle,
+                new Regex(
+                    @"
+                            # Character definitions:
+                            '
+                            (?> # disable backtracking
+                              (?:
+                                \\[^\r\n]|    # escaped meta char
+                                [^'\r\n]      # any character except '
+                              )*
+                            )
+                            '?
+                            |
+                            # Normal string & verbatim strings definitions:
+                            (?<verbatimIdentifier>@)?         # this group matches if it is an verbatim string
+                            ""
+                            (?> # disable backtracking
+                              (?:
+                                # match and consume an escaped character including escaped double quote ("") char
+                                (?(verbatimIdentifier)        # if it is a verbatim string ...
+                                  """"|                         #   then: only match an escaped double quote ("") char
+                                  \\.                         #   else: match an escaped sequence
+                                )
+                                | # OR
+            
+                                # match any char except double quote char ("")
+                                [^""]
+                              )*
+                            )
+                            ""
+                        ",
+                    RegexOptions.ExplicitCapture | RegexOptions.Singleline | RegexOptions.IgnorePatternWhitespace |
+                    RegexCompiledOption
+                    )); //thanks to rittergig for this regex
+
+            AddStyle("Comment1",
+                PredefinedStyles.GreenStyle,
+                new Regex(@"//.*$", RegexOptions.Multiline | RegexCompiledOption));
+
+            AddStyle("Comment2",
+                PredefinedStyles.GreenStyle,
+                new Regex(@"(/\*.*?\*/)|(/\*.*)", RegexOptions.Singleline | RegexCompiledOption));
+
+            AddStyle("Comment3",
+                PredefinedStyles.GreenStyle,
+                new Regex(@"(/\*.*?\*/)|(.*\*/)", RegexOptions.Singleline | RegexOptions.RightToLeft | RegexCompiledOption));
+
+            AddStyle("Number",
+                PredefinedStyles.MagentaStyle,
+                new Regex(@"\b\d+[\.]?\d*([eE]\-?\d+)?[lLdDfF]?\b|\b0x[a-fA-F\d]+\b", RegexCompiledOption));
+
+            AddStyle("Attribute",
+                PredefinedStyles.GreenStyle,
+                new Regex(@"^\s*(?<range>\[.+?\])\s*$", RegexOptions.Multiline | RegexCompiledOption));
+
+            AddStyle("Class Name",
+                PredefinedStyles.BoldStyle,
+                new Regex(@"\b(class|struct|enum|interface)\s+(?<range>\w+?)\b", RegexCompiledOption));
+
+            AddStyle("Keyword",
+                PredefinedStyles.BlueStyle,
+                new Regex(@"\b(abstract|add|alias|as|ascending|async|await|base|bool|break|by|byte|case|catch|char|checked|class|const|continue|decimal|default|delegate|descending|do|double|dynamic|else|enum|equals|event|explicit|extern|false|finally|fixed|float|for|foreach|from|get|global|goto|group|if|implicit|in|int|interface|internal|into|is|join|let|lock|long|nameof|namespace|new|null|object|on|operator|orderby|out|override|params|partial|private|protected|public|readonly|ref|remove|return|sbyte|sealed|select|set|short|sizeof|stackalloc|static|static|string|struct|switch|this|throw|true|try|typeof|uint|ulong|unchecked|unsafe|ushort|using|using|value|var|virtual|void|volatile|when|where|while|yield)\b|#region\b|#endregion\b",
+                    RegexCompiledOption));
+
+            AddFoldingRule("{", "}");
+            AddFoldingRule(@"#region\b", @"#endregion\b");
+            AddFoldingRule(@"/\*", @"\*/");
+        }
+
+        public override void SyntaxHighlight(Range range)
+        {
+            //clear style of changed range
+            range.ClearStyle(StyleSchema.Styles);
+            //
+            //string highlighting
+            foreach (var styleInfo in StyleSchema)
+                range.SetStyle(styleInfo.Style, styleInfo.Rule);
+
+            //find document comments
+            foreach (Range r in range.GetRanges(@"^\s*///.*$", RegexOptions.Multiline))
+            {
+                //remove C# highlighting from this fragment
+                r.ClearStyle(StyleIndex.All);
+                r.SetStyle(StyleSchema["Comment1"].Style);
+                //tags
+                foreach (Range rr in r.GetRanges(TagContentRegex))
+                {
+                    rr.ClearStyle(StyleIndex.All);
+                    rr.SetStyle(TagContentStyle);
+                }
+                //prefix '///'
+                foreach (Range rr in r.GetRanges(@"^\s*///", RegexOptions.Multiline))
+                {
+                    rr.ClearStyle(StyleIndex.All);
+                    rr.SetStyle(TagContentStyle);
+                }
+            }
+
+            //clear folding markers
+            range.ClearFoldingMarkers();
+            //set folding markers
+            foreach (var foldRule in FoldingSchema)
+                range.SetFoldingMarkers(foldRule.startMarkerRegex, foldRule.endMarkerRegex);
+        }
+    }
+}
diff --git a/FastColoredTextBox/SyntaxSources/CustomSyntaxSource.cs b/FastColoredTextBox/SyntaxSources/CustomSyntaxSource.cs
new file mode 100644
index 00000000..84731a2e
--- /dev/null
+++ b/FastColoredTextBox/SyntaxSources/CustomSyntaxSource.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace FastColoredTextBoxNS.SyntaxSources
+{
+    class CustomSyntaxSource : SyntaxHighlighter
+    {
+        public CustomSyntaxSource(FastColoredTextBox textbox) : base(textbox)
+        { }
+        public override void Init()
+        {
+            
+        }
+    }
+}
diff --git a/FastColoredTextBox/SyntaxSources/FromXMLfileSyntaxSource.cs b/FastColoredTextBox/SyntaxSources/FromXMLfileSyntaxSource.cs
new file mode 100644
index 00000000..85c21837
--- /dev/null
+++ b/FastColoredTextBox/SyntaxSources/FromXMLfileSyntaxSource.cs
@@ -0,0 +1,147 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Globalization;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Xml;
+
+namespace FastColoredTextBoxNS.SyntaxSources
+{
+    class FromXMLfileSyntaxSource : SyntaxHighlighter
+    {
+        protected string XMLfile;
+        public FromXMLfileSyntaxSource(FastColoredTextBox textbox) : base(textbox)
+        {
+            XMLfile = textbox.DescriptionFile;
+            LoadStyleSchema();
+        }
+        public override void Init()
+        {
+            LoadStyleSchema();
+        }
+        public void LoadStyleSchema()
+        {
+            var doc = new XmlDocument();
+            if (!File.Exists(XMLfile))
+                XMLfile = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, Path.GetFileName(XMLfile));
+
+            doc.LoadXml(File.ReadAllText(XMLfile));
+
+            //Load Brakets
+            XmlNode brackets = doc.SelectSingleNode("doc/brackets");
+            if (brackets != null)
+            {
+                if (brackets.Attributes["left"] == null || brackets.Attributes["right"] == null ||
+                    brackets.Attributes["left"].Value == "" || brackets.Attributes["right"].Value == "")
+                {
+                    Textbox.LeftBracket = '\x0';
+                    Textbox.RightBracket = '\x0';
+                }
+                else
+                {
+                    Textbox.LeftBracket = brackets.Attributes["left"].Value[0];
+                    Textbox.RightBracket = brackets.Attributes["right"].Value[0];
+                }
+
+                if (brackets.Attributes["left2"] == null || brackets.Attributes["right2"] == null ||
+                    brackets.Attributes["left2"].Value == "" || brackets.Attributes["right2"].Value == "")
+                {
+                    Textbox.LeftBracket2 = '\x0';
+                    Textbox.RightBracket2 = '\x0';
+                }
+                else
+                {
+                    Textbox.LeftBracket2 = brackets.Attributes["left2"].Value[0];
+                    Textbox.RightBracket2 = brackets.Attributes["right2"].Value[0];
+                }
+
+                if (brackets.Attributes["strategy"] == null || brackets.Attributes["strategy"].Value == "")
+                    Textbox.BracketsHighlightStrategy = BracketsHighlightStrategy.Strategy2;
+                else
+                    Textbox.BracketsHighlightStrategy = (BracketsHighlightStrategy)Enum.Parse(typeof(BracketsHighlightStrategy), brackets.Attributes["strategy"].Value);
+            }
+
+            //Load MainStyles
+            foreach (XmlNode rule in doc.SelectNodes("doc/rule"))
+            {
+                string name = rule.Attributes["style"].Value;
+                Style st = null;
+                foreach (XmlNode style in doc.SelectNodes("doc/style"))
+                {
+                    if (style.Attributes["name"].Value == name)
+                    {
+                        st = ParseStyle(style);
+                        break;
+                    }
+                }
+                if (!StyleSchema.Contains(name))
+                {
+                    StyleSchema.Add(name, st, ParseRule(rule));
+                }
+            }
+
+            //Load FoldingRules
+            foreach (XmlNode frule in doc.SelectNodes("doc/folding"))
+            {
+                FoldingSchema.Add(ParseFolding(frule));
+            }
+
+        }
+        protected FoldingDescription ParseFolding(XmlNode foldingNode)
+        {
+            FoldingDescription folding = new FoldingDescription();
+            folding.startMarkerRegex = foldingNode.Attributes["start"].Value;
+            folding.endMarkerRegex = foldingNode.Attributes["finish"].Value;
+            XmlAttribute optionsA = foldingNode.Attributes["options"];
+            if (optionsA != null)
+                folding.options = RegexCompiledOption|(RegexOptions)Enum.Parse(typeof(RegexOptions), optionsA.Value);
+
+            return folding;
+        }
+        protected Regex ParseRule (XmlNode ruleNode)
+        {
+            string pattern = ruleNode.InnerText;
+            XmlAttribute optionsA = ruleNode.Attributes["options"];
+            RegexOptions options = RegexCompiledOption;
+            if (optionsA != null)
+                options = options|(RegexOptions)Enum.Parse(typeof(RegexOptions), optionsA.Value);
+            return new Regex(pattern, options);
+        }
+        protected Style ParseStyle(XmlNode styleNode)
+        {
+            XmlAttribute typeA = styleNode.Attributes["type"];
+            XmlAttribute colorA = styleNode.Attributes["color"];
+            XmlAttribute backColorA = styleNode.Attributes["backColor"];
+            XmlAttribute fontStyleA = styleNode.Attributes["fontStyle"];
+            XmlAttribute nameA = styleNode.Attributes["name"];
+            //colors
+            SolidBrush foreBrush = null;
+            if (colorA != null)
+                foreBrush = new SolidBrush(ParseColor(colorA.Value));
+            SolidBrush backBrush = null;
+            if (backColorA != null)
+                backBrush = new SolidBrush(ParseColor(backColorA.Value));
+            //fontStyle
+            FontStyle fontStyle = FontStyle.Regular;
+            if (fontStyleA != null)
+                fontStyle = (FontStyle)Enum.Parse(typeof(FontStyle), fontStyleA.Value);
+
+            return new TextStyle(foreBrush, backBrush, fontStyle);
+        }
+        protected Color ParseColor(string s)
+        {
+            if (s.StartsWith("#"))
+            {
+                if (s.Length <= 7)
+                    return Color.FromArgb(255,
+                                          Color.FromArgb(Int32.Parse(s.Substring(1), NumberStyles.AllowHexSpecifier)));
+                else
+                    return Color.FromArgb(Int32.Parse(s.Substring(1), NumberStyles.AllowHexSpecifier));
+            }
+            else
+                return Color.FromName(s);
+        }
+    }
+}
diff --git a/FastColoredTextBox/SyntaxSources/HTMLSyntaxSource.cs b/FastColoredTextBox/SyntaxSources/HTMLSyntaxSource.cs
new file mode 100644
index 00000000..8bb83b08
--- /dev/null
+++ b/FastColoredTextBox/SyntaxSources/HTMLSyntaxSource.cs
@@ -0,0 +1,64 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Text;
+using System.Text.RegularExpressions;
+
+namespace FastColoredTextBoxNS.SyntaxSources
+{
+    class HTMLSyntaxSource : SyntaxHighlighter
+    {
+        public HTMLSyntaxSource(FastColoredTextBox textbox) : base(textbox)
+        {
+            Init();
+        }
+
+        public override void AutoIndentNeeded(object sender, AutoIndentEventArgs args)
+        {
+            var tb = sender as FastColoredTextBox;
+            tb.CalcAutoIndentShiftByCodeFolding(sender, args);
+        }
+
+        public override void Init()
+        {
+            Textbox.CommentPrefix = null;
+            Textbox.LeftBracket = '<';
+            Textbox.RightBracket = '>';
+            Textbox.LeftBracket2 = '(';
+            Textbox.RightBracket2 = ')';
+            Textbox.AutoIndentCharsPatterns = @"";
+
+            AddStyle("Comment1", 
+                PredefinedStyles.GreenStyle, 
+                new Regex(@"(<!--.*?-->)|(<!--.*)", RegexOptions.Singleline | RegexCompiledOption));
+            AddStyle("Comment2",
+                PredefinedStyles.GreenStyle, 
+                new Regex(@"(<!--.*?-->)|(.*-->)", RegexOptions.Singleline | RegexOptions.RightToLeft | RegexCompiledOption));
+            AddStyle("Tag Bracket", 
+                PredefinedStyles.BlueStyle, 
+                new Regex(@"<|/>|</|>", RegexCompiledOption));
+            AddStyle("Tag Name", 
+                PredefinedStyles.MaroonStyle, 
+                new Regex(@"<(?<range>[!\w:]+)", RegexCompiledOption));
+            AddStyle("End Tag", 
+                PredefinedStyles.MaroonStyle, 
+                new Regex(@"</(?<range>[\w:]+)>", RegexCompiledOption));
+            AddStyle("Attribute", 
+                PredefinedStyles.RedStyle, 
+                new Regex(@"(?<range>[\w\d\-]{1,20}?)='[^']*'|(?<range>[\w\d\-]{1,20})=""[^""]*""|(?<range>[\w\d\-]{1,20})=[\w\d\-]{1,20}", RegexCompiledOption));
+            AddStyle("Attribute Value", 
+                PredefinedStyles.MagentaStyle, 
+                new Regex(@"[\w\d\-]{1,20}?=(?<range>'[^']*')|[\w\d\-]{1,20}=(?<range>""[^""]*"")|[\w\d\-]{1,20}=(?<range>[\w\d\-]{1,20})", RegexCompiledOption));
+            AddStyle("Entity", 
+                PredefinedStyles.RedStyle, 
+                new Regex(@"\&(amp|gt|lt|nbsp|quot|apos|copy|reg|#[0-9]{1,8}|#x[0-9a-f]{1,8});", RegexCompiledOption | RegexOptions.IgnoreCase));
+            AddFoldingRule("<head", "</head>", RegexOptions.IgnoreCase);
+            AddFoldingRule("<body", "</body>", RegexOptions.IgnoreCase);
+            AddFoldingRule("<table", "</table>", RegexOptions.IgnoreCase);
+            AddFoldingRule("<form", "</form>", RegexOptions.IgnoreCase);
+            AddFoldingRule("<div", "</div>", RegexOptions.IgnoreCase);
+            AddFoldingRule("<script", "</script>", RegexOptions.IgnoreCase);
+            AddFoldingRule("<tr", "</tr>", RegexOptions.IgnoreCase);
+        }
+    }
+}
diff --git a/FastColoredTextBox/SyntaxSources/JSONSyntaxSource.cs b/FastColoredTextBox/SyntaxSources/JSONSyntaxSource.cs
new file mode 100644
index 00000000..44d6acd6
--- /dev/null
+++ b/FastColoredTextBox/SyntaxSources/JSONSyntaxSource.cs
@@ -0,0 +1,41 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Text.RegularExpressions;
+
+namespace FastColoredTextBoxNS.SyntaxSources
+{
+    class JSONSyntaxSource : SyntaxHighlighter
+    {
+        public JSONSyntaxSource(FastColoredTextBox textbox) : base(textbox)
+        {
+            Init();
+        }
+        public override void Init()
+        {
+            Textbox.LeftBracket = '[';
+            Textbox.RightBracket = ']';
+            Textbox.LeftBracket2 = '{';
+            Textbox.RightBracket2 = '}';
+            Textbox.BracketsHighlightStrategy = BracketsHighlightStrategy.Strategy2;
+
+            Textbox.AutoIndentCharsPatterns
+                = @"
+^\s*[\w\.]+(\s\w+)?\s*(?<range>=)\s*(?<range>[^;]+);
+";
+
+            AddStyle("Keyword",
+                PredefinedStyles.BlueStyle,
+                new Regex(@"(?<range>""([^\\""]|\\"")*"")\s*:", RegexCompiledOption));
+            AddStyle("String",
+                PredefinedStyles.BrownStyle,
+                new Regex(@"""([^\\""]|\\"")*""", RegexCompiledOption));
+            AddStyle("Number",
+                PredefinedStyles.MagentaStyle,
+                new Regex(@"\b(\d+[\.]?\d*|true|false|null)\b", RegexCompiledOption));
+
+            AddFoldingRule("{", "}"); //allow to collapse brackets block
+            AddFoldingRule(@"\[", @"\]"); //allow to collapse comment block
+        }
+    }
+}
diff --git a/FastColoredTextBox/SyntaxSources/JScriptSyntaxSource.cs b/FastColoredTextBox/SyntaxSources/JScriptSyntaxSource.cs
new file mode 100644
index 00000000..6a774410
--- /dev/null
+++ b/FastColoredTextBox/SyntaxSources/JScriptSyntaxSource.cs
@@ -0,0 +1,93 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Text.RegularExpressions;
+
+namespace FastColoredTextBoxNS.SyntaxSources
+{
+    class JScriptSyntaxSource : SyntaxHighlighter
+    {
+        public JScriptSyntaxSource(FastColoredTextBox textbox) : base(textbox)
+        {
+            Init();
+        }
+
+        public override void Init()
+        {
+            Textbox.CommentPrefix = "//";
+            Textbox.LeftBracket = '(';
+            Textbox.RightBracket = ')';
+            Textbox.LeftBracket2 = '{';
+            Textbox.RightBracket2 = '}';
+            Textbox.BracketsHighlightStrategy = BracketsHighlightStrategy.Strategy2;
+
+            Textbox.AutoIndentCharsPatterns
+                = @"
+^\s*[\w\.]+(\s\w+)?\s*(?<range>=)\s*(?<range>[^;]+);
+";
+
+            AddStyle("String",
+                PredefinedStyles.BrownStyle,
+                new Regex(@"""""|''|"".*?[^\\]""|'.*?[^\\]'", RegexCompiledOption));
+            AddStyle("Comment",
+                PredefinedStyles.GreenStyle,
+                new Regex(@"//.*$", RegexOptions.Multiline | RegexCompiledOption));
+            AddStyle("Comment2",
+                PredefinedStyles.GreenStyle,
+                new Regex(@"(/\*.*?\*/)|(/\*.*)", RegexOptions.Singleline | RegexCompiledOption));
+            AddStyle("Comment3",
+                PredefinedStyles.GreenStyle,
+                new Regex(@"(/\*.*?\*/)|(.*\*/)", RegexOptions.Singleline | RegexOptions.RightToLeft | RegexCompiledOption));
+            AddStyle("Number",
+                PredefinedStyles.MagentaStyle,
+                new Regex(@"\b\d+[\.]?\d*([eE]\-?\d+)?[lLdDfF]?\b|\b0x[a-fA-F\d]+\b", RegexCompiledOption));
+            AddStyle("Keyword",
+                PredefinedStyles.BlueStyle,
+                new Regex(
+                    @"\b(true|false|break|case|catch|const|continue|default|delete|do|else|export|for|function|if|in|instanceof|new|null|return|switch|this|throw|try|var|void|while|with|typeof)\b",
+                    RegexCompiledOption));
+
+            AddFoldingRule("{", "}"); //allow to collapse brackets block
+            AddFoldingRule(@"/\*", @"\*/"); //allow to collapse comment block
+        }
+        public override void AutoIndentNeeded(object sender, AutoIndentEventArgs args)
+        {
+            //block {}
+            if (Regex.IsMatch(args.LineText, @"^[^""']*\{.*\}[^""']*$"))
+                return;
+            //start of block {}
+            if (Regex.IsMatch(args.LineText, @"^[^""']*\{"))
+            {
+                args.ShiftNextLines = args.TabLength;
+                return;
+            }
+            //end of block {}
+            if (Regex.IsMatch(args.LineText, @"}[^""']*$"))
+            {
+                args.Shift = -args.TabLength;
+                args.ShiftNextLines = -args.TabLength;
+                return;
+            }
+            //label
+            if (Regex.IsMatch(args.LineText, @"^\s*\w+\s*:\s*($|//)") &&
+                !Regex.IsMatch(args.LineText, @"^\s*default\s*:"))
+            {
+                args.Shift = -args.TabLength;
+                return;
+            }
+            //some statements: case, default
+            if (Regex.IsMatch(args.LineText, @"^\s*(case|default)\b.*:\s*($|//)"))
+            {
+                args.Shift = -args.TabLength / 2;
+                return;
+            }
+            //is unclosed operator in previous line ?
+            if (Regex.IsMatch(args.PrevLineText, @"^\s*(if|for|foreach|while|[\}\s]*else)\b[^{]*$"))
+                if (!Regex.IsMatch(args.PrevLineText, @"(;\s*$)|(;\s*//)")) //operator is unclosed
+                {
+                    args.Shift = args.TabLength;
+                    return;
+                }
+        }
+    }
+}
diff --git a/FastColoredTextBox/SyntaxSources/LuaSyntaxSources.cs b/FastColoredTextBox/SyntaxSources/LuaSyntaxSources.cs
new file mode 100644
index 00000000..4a9eee81
--- /dev/null
+++ b/FastColoredTextBox/SyntaxSources/LuaSyntaxSources.cs
@@ -0,0 +1,80 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Text.RegularExpressions;
+
+namespace FastColoredTextBoxNS.SyntaxSources
+{
+    class LuaSyntaxSources : SyntaxHighlighter
+    {
+        public LuaSyntaxSources(FastColoredTextBox textbox) : base(textbox)
+        {
+            Init();
+        }
+        public override void Init()
+        {
+            Textbox.CommentPrefix = "--";
+            Textbox.LeftBracket = '(';
+            Textbox.RightBracket = ')';
+            Textbox.LeftBracket2 = '{';
+            Textbox.RightBracket2 = '}';
+            Textbox.BracketsHighlightStrategy = BracketsHighlightStrategy.Strategy2;
+
+            Textbox.AutoIndentCharsPatterns
+                = @"
+^\s*[\w\.]+(\s\w+)?\s*(?<range>=)\s*(?<range>.+)
+";
+
+            AddStyle("String",
+                PredefinedStyles.BrownStyle,
+                new Regex(@"""""|''|"".*?[^\\]""|'.*?[^\\]'", RegexCompiledOption));
+            AddStyle("Comment",
+                PredefinedStyles.GreenStyle,
+                new Regex(@"--.*$", RegexOptions.Multiline | RegexCompiledOption));
+            AddStyle("Comment2",
+                PredefinedStyles.GreenStyle,
+                new Regex(@"(--\[\[.*?\]\])|(--\[\[.*)", RegexOptions.Singleline | RegexCompiledOption));
+            AddStyle("Comment3",
+                PredefinedStyles.GreenStyle,
+                new Regex(@"(--\[\[.*?\]\])|(.*\]\])", RegexOptions.Singleline | RegexOptions.RightToLeft | RegexCompiledOption));
+            AddStyle("Number",
+                PredefinedStyles.MagentaStyle,
+                new Regex(@"\b\d+[\.]?\d*([eE]\-?\d+)?[lLdDfF]?\b|\b0x[a-fA-F\d]+\b", RegexCompiledOption));
+            AddStyle("Keyword",
+                PredefinedStyles.BlueBoldStyle,
+                new Regex(@"\b(and|break|do|else|elseif|end|false|for|function|if|in|local|nil|not|or|repeat|return|then|true|until|while)\b", RegexCompiledOption));
+            AddStyle("Functions",
+                PredefinedStyles.MaroonStyle,
+                new Regex(@"\b(assert|collectgarbage|dofile|error|getfenv|getmetatable|ipairs|load|loadfile|loadstring|module|next|pairs|pcall|print|rawequal|rawget|rawset|require|select|setfenv|setmetatable|tonumber|tostring|type|unpack|xpcall)\b", RegexCompiledOption));
+
+            AddFoldingRule("{", "}"); //allow to collapse brackets block
+            AddFoldingRule(@"--\[\[", @"\]\]"); //allow to collapse comment block
+        }
+        public override void AutoIndentNeeded(object sender, AutoIndentEventArgs args)
+        {
+            //end of block
+            if (Regex.IsMatch(args.LineText, @"^\s*(end|until)\b"))
+            {
+                args.Shift = -args.TabLength;
+                args.ShiftNextLines = -args.TabLength;
+                return;
+            }
+            // then ...
+            if (Regex.IsMatch(args.LineText, @"\b(then)\s*\S+"))
+                return;
+            //start of operator block
+            if (Regex.IsMatch(args.LineText, @"^\s*(function|do|for|while|repeat|if)\b"))
+            {
+                args.ShiftNextLines = args.TabLength;
+                return;
+            }
+
+            //Statements else, elseif, case etc
+            if (Regex.IsMatch(args.LineText, @"^\s*(else|elseif)\b", RegexOptions.IgnoreCase))
+            {
+                args.Shift = -args.TabLength;
+                return;
+            }
+        }
+    }
+}
diff --git a/FastColoredTextBox/SyntaxSources/PHPSyntaxSource.cs b/FastColoredTextBox/SyntaxSources/PHPSyntaxSource.cs
new file mode 100644
index 00000000..4ea138b5
--- /dev/null
+++ b/FastColoredTextBox/SyntaxSources/PHPSyntaxSource.cs
@@ -0,0 +1,85 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Text.RegularExpressions;
+
+namespace FastColoredTextBoxNS.SyntaxSources
+{
+    class PHPSyntaxSource : SyntaxHighlighter
+    {
+        public PHPSyntaxSource (FastColoredTextBox textbox) : base(textbox)
+        { 
+            Init();
+        }
+
+        public override void AutoIndentNeeded(object sender, AutoIndentEventArgs args)
+        {
+            //block {}
+            if (Regex.IsMatch(args.LineText, @"^[^""']*\{.*\}[^""']*$"))
+                return;
+            //start of block {}
+            if (Regex.IsMatch(args.LineText, @"^[^""']*\{"))
+            {
+                args.ShiftNextLines = args.TabLength;
+                return;
+            }
+            //end of block {}
+            if (Regex.IsMatch(args.LineText, @"}[^""']*$"))
+            {
+                args.Shift = -args.TabLength;
+                args.ShiftNextLines = -args.TabLength;
+                return;
+            }
+            //is unclosed operator in previous line ?
+            if (Regex.IsMatch(args.PrevLineText, @"^\s*(if|for|foreach|while|[\}\s]*else)\b[^{]*$"))
+                if (!Regex.IsMatch(args.PrevLineText, @"(;\s*$)|(;\s*//)")) //operator is unclosed
+                {
+                    args.Shift = args.TabLength;
+                    return;
+                }
+        }
+
+        public override void Init()
+        {
+            Textbox.CommentPrefix = "//";
+            Textbox.LeftBracket = '(';
+            Textbox.RightBracket = ')';
+            Textbox.LeftBracket2 = '{';
+            Textbox.RightBracket2 = '}';
+            Textbox.BracketsHighlightStrategy = BracketsHighlightStrategy.Strategy2;
+
+            Textbox.AutoIndentCharsPatterns = @"^\s*\$[\w\.\[\]\'\""]+\s*(?<range>=)\s*(?<range>[^;]+);";
+
+            AddStyle("String",
+                PredefinedStyles.RedStyle,
+                new Regex(@"""""|''|"".*?[^\\]""|'.*?[^\\]'", RegexCompiledOption));
+            AddStyle("Comment",
+                PredefinedStyles.GreenStyle,
+                new Regex(@"(//|#).*$", RegexOptions.Multiline | RegexCompiledOption));
+            AddStyle("Comment2",
+                PredefinedStyles.GreenStyle,
+                new Regex(@"(/\*.*?\*/)|(/\*.*)", RegexOptions.Singleline | RegexCompiledOption));
+            AddStyle("Comment3",
+                PredefinedStyles.GreenStyle,
+                new Regex(@"(/\*.*?\*/)|(.*\*/)", RegexOptions.Singleline | RegexOptions.RightToLeft | RegexCompiledOption));
+            AddStyle("Number",
+                PredefinedStyles.RedStyle,
+                new Regex(@"\b\d+[\.]?\d*\b", RegexCompiledOption));
+            AddStyle("Variable",
+                PredefinedStyles.MaroonStyle,
+                new Regex(@"\$[a-zA-Z_\d]*\b", RegexCompiledOption));
+            AddStyle("Keyword",
+                PredefinedStyles.MagentaStyle,
+                new Regex(@"\b(die|echo|empty|exit|eval|include|include_once|isset|list|require|require_once|return|print|unset)\b", RegexCompiledOption));
+            AddStyle("Keyword2",
+                PredefinedStyles.BlueStyle,
+                new Regex(@"\b(abstract|and|array|as|break|case|catch|cfunction|class|clone|const|continue|declare|default|do|else|elseif|enddeclare|endfor|endforeach|endif|endswitch|endwhile|extends|final|for|foreach|function|global|goto|if|implements|instanceof|interface|namespace|new|or|private|protected|public|static|switch|throw|try|use|var|while|xor)\b", RegexCompiledOption));
+            AddStyle("Keyword3",
+                PredefinedStyles.GrayStyle,
+                new Regex(@"__CLASS__|__DIR__|__FILE__|__LINE__|__FUNCTION__|__METHOD__|__NAMESPACE__", RegexCompiledOption));
+
+            AddFoldingRule("{", "}");
+            AddFoldingRule(@"/\*", @"\*/");
+        }
+    }
+}
diff --git a/FastColoredTextBox/SyntaxSources/SQLSyntaxSource.cs b/FastColoredTextBox/SyntaxSources/SQLSyntaxSource.cs
new file mode 100644
index 00000000..c47df6f4
--- /dev/null
+++ b/FastColoredTextBox/SyntaxSources/SQLSyntaxSource.cs
@@ -0,0 +1,71 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Text.RegularExpressions;
+
+namespace FastColoredTextBoxNS.SyntaxSources
+{
+    class SQLSyntaxSource : SyntaxHighlighter
+    {
+        public SQLSyntaxSource(FastColoredTextBox textbox) : base(textbox)
+        {
+            Init();
+        }
+
+        public override void Init()
+        {
+            Textbox.CommentPrefix = "--";
+            Textbox.LeftBracket = '(';
+            Textbox.RightBracket = ')';
+            Textbox.LeftBracket2 = '\x0';
+            Textbox.RightBracket2 = '\x0';
+
+            Textbox.AutoIndentCharsPatterns = @"";
+
+            AddStyle("Comment",
+                PredefinedStyles.GreenStyle,
+                new Regex(@"--.*$", RegexOptions.Multiline | RegexCompiledOption));
+            AddStyle("Comment2",
+                PredefinedStyles.GreenStyle,
+                new Regex(@"(/\*.*?\*/)|(/\*.*)", RegexOptions.Singleline | RegexCompiledOption));
+            AddStyle("Comment3",
+                PredefinedStyles.GreenStyle,
+                new Regex(@"(/\*.*?\*/)|(.*\*/)", RegexOptions.Singleline | RegexOptions.RightToLeft | RegexCompiledOption));
+            AddStyle("Comment4",
+                PredefinedStyles.GreenStyle,
+                new Regex(@"#.*$", RegexOptions.Multiline | RegexCompiledOption));
+            AddStyle("String",
+                PredefinedStyles.RedStyle,
+                new Regex(@"""""|''|"".*?[^\\]""|'.*?[^\\]'", RegexCompiledOption));
+            AddStyle("Number",
+                PredefinedStyles.MagentaStyle,
+                new Regex(@"\b\d+[\.]?\d*([eE]\-?\d+)?\b", RegexCompiledOption));
+            AddStyle("Types",
+                PredefinedStyles.BrownStyle,
+                new Regex(@"\b(BIGINT|NUMERIC|BIT|SMALLINT|DECIMAL|SMALLMONEY|INT|TINYINT|MONEY|FLOAT|REAL|DATE|DATETIMEOFFSET|DATETIME2|SMALLDATETIME|DATETIME|TIME|CHAR|VARCHAR|TEXT|NCHAR|NVARCHAR|NTEXT|BINARY|VARBINARY|IMAGE|TIMESTAMP|HIERARCHYID|TABLE|UNIQUEIDENTIFIER|SQL_VARIANT|XML)\b",
+                    RegexOptions.IgnoreCase | RegexCompiledOption));
+            AddStyle("Variable",
+                PredefinedStyles.MaroonStyle,
+                new Regex(@"@[a-zA-Z_\d]*\b", RegexCompiledOption));
+            AddStyle("Statements",
+                PredefinedStyles.BlueBoldStyle,
+                new Regex(@"\b(ALTER APPLICATION ROLE|ALTER ASSEMBLY|ALTER ASYMMETRIC KEY|ALTER AUTHORIZATION|ALTER BROKER PRIORITY|ALTER CERTIFICATE|ALTER CREDENTIAL|ALTER CRYPTOGRAPHIC PROVIDER|ALTER DATABASE|ALTER DATABASE AUDIT SPECIFICATION|ALTER DATABASE ENCRYPTION KEY|ALTER ENDPOINT|ALTER EVENT SESSION|ALTER FULLTEXT CATALOG|ALTER FULLTEXT INDEX|ALTER FULLTEXT STOPLIST|ALTER FUNCTION|ALTER INDEX|ALTER LOGIN|ALTER MASTER KEY|ALTER MESSAGE TYPE|ALTER PARTITION FUNCTION|ALTER PARTITION SCHEME|ALTER PROCEDURE|ALTER QUEUE|ALTER REMOTE SERVICE BINDING|ALTER RESOURCE GOVERNOR|ALTER RESOURCE POOL|ALTER ROLE|ALTER ROUTE|ALTER SCHEMA|ALTER SERVER AUDIT|ALTER SERVER AUDIT SPECIFICATION|ALTER SERVICE|ALTER SERVICE MASTER KEY|ALTER SYMMETRIC KEY|ALTER TABLE|ALTER TRIGGER|ALTER USER|ALTER VIEW|ALTER WORKLOAD GROUP|ALTER XML SCHEMA COLLECTION|BULK INSERT|CREATE AGGREGATE|CREATE APPLICATION ROLE|CREATE ASSEMBLY|CREATE ASYMMETRIC KEY|CREATE BROKER PRIORITY|CREATE CERTIFICATE|CREATE CONTRACT|CREATE CREDENTIAL|CREATE CRYPTOGRAPHIC PROVIDER|CREATE DATABASE|CREATE DATABASE AUDIT SPECIFICATION|CREATE DATABASE ENCRYPTION KEY|CREATE DEFAULT|CREATE ENDPOINT|CREATE EVENT NOTIFICATION|CREATE EVENT SESSION|CREATE FULLTEXT CATALOG|CREATE FULLTEXT INDEX|CREATE FULLTEXT STOPLIST|CREATE FUNCTION|CREATE INDEX|CREATE LOGIN|CREATE MASTER KEY|CREATE MESSAGE TYPE|CREATE PARTITION FUNCTION|CREATE PARTITION SCHEME|CREATE PROCEDURE|CREATE QUEUE|CREATE REMOTE SERVICE BINDING|CREATE RESOURCE POOL|CREATE ROLE|CREATE ROUTE|CREATE RULE|CREATE SCHEMA|CREATE SERVER AUDIT|CREATE SERVER AUDIT SPECIFICATION|CREATE SERVICE|CREATE SPATIAL INDEX|CREATE STATISTICS|CREATE SYMMETRIC KEY|CREATE SYNONYM|CREATE TABLE|CREATE TRIGGER|CREATE TYPE|CREATE USER|CREATE VIEW|CREATE WORKLOAD GROUP|CREATE XML INDEX|CREATE XML SCHEMA COLLECTION|DELETE|DISABLE TRIGGER|DROP AGGREGATE|DROP APPLICATION ROLE|DROP ASSEMBLY|DROP ASYMMETRIC KEY|DROP BROKER PRIORITY|DROP CERTIFICATE|DROP CONTRACT|DROP CREDENTIAL|DROP CRYPTOGRAPHIC PROVIDER|DROP DATABASE|DROP DATABASE AUDIT SPECIFICATION|DROP DATABASE ENCRYPTION KEY|DROP DEFAULT|DROP ENDPOINT|DROP EVENT NOTIFICATION|DROP EVENT SESSION|DROP FULLTEXT CATALOG|DROP FULLTEXT INDEX|DROP FULLTEXT STOPLIST|DROP FUNCTION|DROP INDEX|DROP LOGIN|DROP MASTER KEY|DROP MESSAGE TYPE|DROP PARTITION FUNCTION|DROP PARTITION SCHEME|DROP PROCEDURE|DROP QUEUE|DROP REMOTE SERVICE BINDING|DROP RESOURCE POOL|DROP ROLE|DROP ROUTE|DROP RULE|DROP SCHEMA|DROP SERVER AUDIT|DROP SERVER AUDIT SPECIFICATION|DROP SERVICE|DROP SIGNATURE|DROP STATISTICS|DROP SYMMETRIC KEY|DROP SYNONYM|DROP TABLE|DROP TRIGGER|DROP TYPE|DROP USER|DROP VIEW|DROP WORKLOAD GROUP|DROP XML SCHEMA COLLECTION|ENABLE TRIGGER|EXEC|EXECUTE|REPLACE|FROM|INSERT|MERGE|OPTION|OUTPUT|SELECT|TOP|TRUNCATE TABLE|UPDATE|UPDATE STATISTICS|WHERE|WITH|INTO|IN|SET)\b", RegexOptions.IgnoreCase | RegexCompiledOption));
+            AddStyle("Keywords",
+                PredefinedStyles.BlueBoldStyle,
+                new Regex(@"\b(ADD|ALL|AND|ANY|AS|ASC|AUTHORIZATION|BACKUP|BEGIN|BETWEEN|BREAK|BROWSE|BY|CASCADE|CHECK|CHECKPOINT|CLOSE|CLUSTERED|COLLATE|COLUMN|COMMIT|COMPUTE|CONSTRAINT|CONTAINS|CONTINUE|CROSS|CURRENT|CURRENT_DATE|CURRENT_TIME|CURSOR|DATABASE|DBCC|DEALLOCATE|DECLARE|DEFAULT|DENY|DESC|DISK|DISTINCT|DISTRIBUTED|DOUBLE|DUMP|ELSE|END|ERRLVL|ESCAPE|EXCEPT|EXISTS|EXIT|EXTERNAL|FETCH|FILE|FILLFACTOR|FOR|FOREIGN|FREETEXT|FULL|FUNCTION|GOTO|GRANT|GROUP|HAVING|HOLDLOCK|IDENTITY|IDENTITY_INSERT|IDENTITYCOL|IF|INDEX|INNER|INTERSECT|IS|JOIN|KEY|KILL|LIKE|LINENO|LOAD|NATIONAL|NOCHECK|NONCLUSTERED|NOT|NULL|OF|OFF|OFFSETS|ON|OPEN|OR|ORDER|OUTER|OVER|PERCENT|PIVOT|PLAN|PRECISION|PRIMARY|PRINT|PROC|PROCEDURE|PUBLIC|RAISERROR|READ|READTEXT|RECONFIGURE|REFERENCES|REPLICATION|RESTORE|RESTRICT|RETURN|REVERT|REVOKE|ROLLBACK|ROWCOUNT|ROWGUIDCOL|RULE|SAVE|SCHEMA|SECURITYAUDIT|SHUTDOWN|SOME|STATISTICS|TABLE|TABLESAMPLE|TEXTSIZE|THEN|TO|TRAN|TRANSACTION|TRIGGER|TSEQUAL|UNION|UNIQUE|UNPIVOT|UPDATETEXT|USE|USER|VALUES|VARYING|VIEW|WAITFOR|WHEN|WHILE|WRITETEXT)\b", RegexOptions.IgnoreCase | RegexCompiledOption));
+            AddStyle("Functions",
+                PredefinedStyles.MaroonStyle,
+                new Regex(@"(@@CONNECTIONS|@@CPU_BUSY|@@CURSOR_ROWS|@@DATEFIRST|@@DATEFIRST|@@DBTS|@@ERROR|@@FETCH_STATUS|@@IDENTITY|@@IDLE|@@IO_BUSY|@@LANGID|@@LANGUAGE|@@LOCK_TIMEOUT|@@MAX_CONNECTIONS|@@MAX_PRECISION|@@NESTLEVEL|@@OPTIONS|@@PACKET_ERRORS|@@PROCID|@@REMSERVER|@@ROWCOUNT|@@SERVERNAME|@@SERVICENAME|@@SPID|@@TEXTSIZE|@@TRANCOUNT|@@VERSION)\b|\b(ABS|ACOS|APP_NAME|ASCII|ASIN|ASSEMBLYPROPERTY|AsymKey_ID|ASYMKEY_ID|asymkeyproperty|ASYMKEYPROPERTY|ATAN|ATN2|AVG|CASE|CAST|CEILING|Cert_ID|Cert_ID|CertProperty|CHAR|CHARINDEX|CHECKSUM_AGG|COALESCE|COL_LENGTH|COL_NAME|COLLATIONPROPERTY|COLLATIONPROPERTY|COLUMNPROPERTY|COLUMNS_UPDATED|COLUMNS_UPDATED|CONTAINSTABLE|CONVERT|COS|COT|COUNT|COUNT_BIG|CRYPT_GEN_RANDOM|CURRENT_TIMESTAMP|CURRENT_TIMESTAMP|CURRENT_USER|CURRENT_USER|CURSOR_STATUS|DATABASE_PRINCIPAL_ID|DATABASE_PRINCIPAL_ID|DATABASEPROPERTY|DATABASEPROPERTYEX|DATALENGTH|DATALENGTH|DATEADD|DATEDIFF|DATENAME|DATEPART|DAY|DB_ID|DB_NAME|DECRYPTBYASYMKEY|DECRYPTBYCERT|DECRYPTBYKEY|DECRYPTBYKEYAUTOASYMKEY|DECRYPTBYKEYAUTOCERT|DECRYPTBYPASSPHRASE|DEGREES|DENSE_RANK|DIFFERENCE|ENCRYPTBYASYMKEY|ENCRYPTBYCERT|ENCRYPTBYKEY|ENCRYPTBYPASSPHRASE|ERROR_LINE|ERROR_MESSAGE|ERROR_NUMBER|ERROR_PROCEDURE|ERROR_SEVERITY|ERROR_STATE|EVENTDATA|EXP|FILE_ID|FILE_IDEX|FILE_NAME|FILEGROUP_ID|FILEGROUP_NAME|FILEGROUPPROPERTY|FILEPROPERTY|FLOOR|fn_helpcollations|fn_listextendedproperty|fn_servershareddrives|fn_virtualfilestats|fn_virtualfilestats|FORMATMESSAGE|FREETEXTTABLE|FULLTEXTCATALOGPROPERTY|FULLTEXTSERVICEPROPERTY|GETANSINULL|GETDATE|GETUTCDATE|GROUPING|HAS_PERMS_BY_NAME|HOST_ID|HOST_NAME|IDENT_CURRENT|IDENT_CURRENT|IDENT_INCR|IDENT_INCR|IDENT_SEED|IDENTITY\(|INDEX_COL|INDEXKEY_PROPERTY|INDEXPROPERTY|IS_MEMBER|IS_OBJECTSIGNED|IS_SRVROLEMEMBER|ISDATE|ISDATE|ISNULL|ISNUMERIC|Key_GUID|Key_GUID|Key_ID|Key_ID|KEY_NAME|KEY_NAME|LEFT|LEN|LOG|LOG10|LOWER|LTRIM|MAX|MIN|MONTH|NCHAR|NEWID|NTILE|NULLIF|OBJECT_DEFINITION|OBJECT_ID|OBJECT_NAME|OBJECT_SCHEMA_NAME|OBJECTPROPERTY|OBJECTPROPERTYEX|OPENDATASOURCE|OPENQUERY|OPENROWSET|OPENXML|ORIGINAL_LOGIN|ORIGINAL_LOGIN|PARSENAME|PATINDEX|PATINDEX|PERMISSIONS|PI|POWER|PUBLISHINGSERVERNAME|PWDCOMPARE|PWDENCRYPT|QUOTENAME|RADIANS|RAND|RANK|REPLICATE|REVERSE|RIGHT|ROUND|ROW_NUMBER|ROWCOUNT_BIG|RTRIM|SCHEMA_ID|SCHEMA_ID|SCHEMA_NAME|SCHEMA_NAME|SCOPE_IDENTITY|SERVERPROPERTY|SESSION_USER|SESSION_USER|SESSIONPROPERTY|SETUSER|SIGN|SignByAsymKey|SignByCert|SIN|SOUNDEX|SPACE|SQL_VARIANT_PROPERTY|SQRT|SQUARE|STATS_DATE|STDEV|STDEVP|STR|STUFF|SUBSTRING|SUM|SUSER_ID|SUSER_NAME|SUSER_SID|SUSER_SNAME|SWITCHOFFSET|SYMKEYPROPERTY|symkeyproperty|sys\.dm_db_index_physical_stats|sys\.fn_builtin_permissions|sys\.fn_my_permissions|SYSDATETIME|SYSDATETIMEOFFSET|SYSTEM_USER|SYSTEM_USER|SYSUTCDATETIME|TAN|TERTIARY_WEIGHTS|TEXTPTR|TODATETIMEOFFSET|TRIGGER_NESTLEVEL|TYPE_ID|TYPE_NAME|TYPEPROPERTY|UNICODE|UPDATE\(|UPPER|USER_ID|USER_NAME|USER_NAME|VAR|VARP|VerifySignedByAsymKey|VerifySignedByCert|XACT_STATE|YEAR)\b", RegexOptions.IgnoreCase | RegexCompiledOption));
+            
+
+            AddFoldingRule(@"\bBEGIN\b", @"\bEND\b", RegexOptions.IgnoreCase);
+            //allow to collapse BEGIN..END blocks
+            AddFoldingRule(@"/\*", @"\*/"); //allow to collapse comment block
+        }
+        public override void AutoIndentNeeded(object sender, AutoIndentEventArgs args)
+        {
+            var tb = sender as FastColoredTextBox;
+            tb.CalcAutoIndentShiftByCodeFolding(sender, args);
+        }
+    }
+}
diff --git a/FastColoredTextBox/SyntaxSources/VBSyntaxSource.cs b/FastColoredTextBox/SyntaxSources/VBSyntaxSource.cs
new file mode 100644
index 00000000..1f8a2d7a
--- /dev/null
+++ b/FastColoredTextBox/SyntaxSources/VBSyntaxSource.cs
@@ -0,0 +1,98 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Text.RegularExpressions;
+
+namespace FastColoredTextBoxNS.SyntaxSources
+{
+    class VBSyntaxSource : SyntaxHighlighter
+    {
+        public VBSyntaxSource(FastColoredTextBox textbox) : base(textbox)
+        {
+            Init();
+        }
+        public override void AutoIndentNeeded(object sender, AutoIndentEventArgs args)
+        {
+            //end of block
+            if (Regex.IsMatch(args.LineText, @"^\s*(End|EndIf|Next|Loop)\b", RegexOptions.IgnoreCase))
+            {
+                args.Shift = -args.TabLength;
+                args.ShiftNextLines = -args.TabLength;
+                return;
+            }
+            //start of declaration
+            if (Regex.IsMatch(args.LineText,
+                              @"\b(Class|Property|Enum|Structure|Sub|Function|Namespace|Interface|Get)\b|(Set\s*\()",
+                              RegexOptions.IgnoreCase))
+            {
+                args.ShiftNextLines = args.TabLength;
+                return;
+            }
+            // then ...
+            if (Regex.IsMatch(args.LineText, @"\b(Then)\s*\S+", RegexOptions.IgnoreCase))
+                return;
+            //start of operator block
+            if (Regex.IsMatch(args.LineText, @"^\s*(If|While|For|Do|Try|With|Using|Select)\b", RegexOptions.IgnoreCase))
+            {
+                args.ShiftNextLines = args.TabLength;
+                return;
+            }
+
+            //Statements else, elseif, case etc
+            if (Regex.IsMatch(args.LineText, @"^\s*(Else|ElseIf|Case|Catch|Finally)\b", RegexOptions.IgnoreCase))
+            {
+                args.Shift = -args.TabLength;
+                return;
+            }
+
+            //Char _
+            if (args.PrevLineText.TrimEnd().EndsWith("_"))
+            {
+                args.Shift = args.TabLength;
+                return;
+            }
+        }
+        public override void Init()
+        {
+            Textbox.CommentPrefix = "'";
+            Textbox.LeftBracket = '(';
+            Textbox.RightBracket = ')';
+            Textbox.LeftBracket2 = '\x0';
+            Textbox.RightBracket2 = '\x0';
+
+            Textbox.AutoIndentCharsPatterns
+                = @"
+^\s*[\w\.\(\)]+\s*(?<range>=)\s*(?<range>.+)
+";
+            AddStyle("String",
+                PredefinedStyles.BrownStyle,
+                new Regex(@"""""|"".*?[^\\]""", RegexCompiledOption));
+            AddStyle("Comment",
+                PredefinedStyles.GreenStyle,
+                new Regex(@"'.*$", RegexOptions.Multiline | RegexCompiledOption));
+            AddStyle("Number",
+                PredefinedStyles.MagentaStyle,
+                new Regex(@"\b\d+[\.]?\d*([eE]\-?\d+)?\b", RegexCompiledOption));
+            AddStyle("Class Name",
+                PredefinedStyles.BoldStyle,
+                new Regex(@"\b(Class|Structure|Enum|Interface)[ ]+(?<range>\w+?)\b", RegexOptions.IgnoreCase | RegexCompiledOption));
+            AddStyle("Keyword",
+                PredefinedStyles.BlueStyle,
+                 new Regex(@"\b(AddHandler|AddressOf|Alias|And|AndAlso|As|Boolean|ByRef|Byte|ByVal|Call|Case|Catch|CBool|CByte|CChar|CDate|CDbl|CDec|Char|CInt|Class|CLng|CObj|Const|Continue|CSByte|CShort|CSng|CStr|CType|CUInt|CULng|CUShort|Date|Decimal|Declare|Default|Delegate|Dim|DirectCast|Do|Double|Each|Else|ElseIf|End|EndIf|Enum|Erase|Error|Event|Exit|False|Finally|For|Friend|Function|Get|GetType|GetXMLNamespace|Global|GoSub|GoTo|Handles|If|Implements|Imports|In|Inherits|Integer|Interface|Is|IsNot|Let|Lib|Like|Long|Loop|Me|Mod|Module|MustInherit|MustOverride|MyBase|MyClass|Namespace|Narrowing|New|Next|Not|Nothing|NotInheritable|NotOverridable|Object|Of|On|Operator|Option|Optional|Or|OrElse|Overloads|Overridable|Overrides|ParamArray|Partial|Private|Property|Protected|Public|RaiseEvent|ReadOnly|ReDim|REM|RemoveHandler|Resume|Return|SByte|Select|Set|Shadows|Shared|Short|Single|Static|Step|Stop|String|Structure|Sub|SyncLock|Then|Throw|To|True|Try|TryCast|TypeOf|UInteger|ULong|UShort|Using|Variant|Wend|When|While|Widening|With|WithEvents|WriteOnly|Xor|Region)\b|(#Const|#Else|#ElseIf|#End|#If|#Region)\b", RegexOptions.IgnoreCase | RegexCompiledOption));
+            
+            AddFoldingRule(@"#Region\b", @"#End\s+Region\b", RegexOptions.IgnoreCase);
+            AddFoldingRule(@"\b(Class|Property|Enum|Structure|Interface)[ \t]+\S+", 
+                @"\bEnd (Class|Property|Enum|Structure|Interface)\b", RegexOptions.IgnoreCase);
+            AddFoldingRule(@"^\s*(?<range>While)[ \t]+\S+", @"^\s*(?<range>End While)\b",
+                                    RegexOptions.Multiline | RegexOptions.IgnoreCase);
+            AddFoldingRule(@"\b(Sub|Function)[ \t]+[^\s']+", @"\bEnd (Sub|Function)\b", RegexOptions.IgnoreCase);
+            AddFoldingRule(@"(\r|\n|^)[ \t]*(?<range>Get|Set)[ \t]*(\r|\n|$)", @"\bEnd (Get|Set)\b",
+                                    RegexOptions.IgnoreCase);
+            AddFoldingRule(@"^\s*(?<range>For|For\s+Each)\b", @"^\s*(?<range>Next)\b",
+                                    RegexOptions.Multiline | RegexOptions.IgnoreCase);
+            AddFoldingRule(@"^\s*(?<range>Do)\b", @"^\s*(?<range>Loop)\b",
+                                    RegexOptions.Multiline | RegexOptions.IgnoreCase);
+        }
+
+    }
+}
diff --git a/FastColoredTextBox/SyntaxSources/XMLSyntaxSource.cs b/FastColoredTextBox/SyntaxSources/XMLSyntaxSource.cs
new file mode 100644
index 00000000..ad6c2fd8
--- /dev/null
+++ b/FastColoredTextBox/SyntaxSources/XMLSyntaxSource.cs
@@ -0,0 +1,114 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Text.RegularExpressions;
+
+namespace FastColoredTextBoxNS.SyntaxSources
+{
+    class XMLSyntaxSource : SyntaxHighlighter
+    {
+        Regex XMLFoldingRegex;
+        public XMLSyntaxSource(FastColoredTextBox textbox) : base(textbox)
+        {
+            Init();
+        }
+
+        public override void Init()
+        {
+            Textbox.CommentPrefix = null;
+            Textbox.LeftBracket = '<';
+            Textbox.RightBracket = '>';
+            Textbox.LeftBracket2 = '(';
+            Textbox.RightBracket2 = ')';
+            Textbox.AutoIndentCharsPatterns = @"";
+
+            AddStyle("CData",
+                PredefinedStyles.BlackStyle,
+                new Regex(@"<!\s*\[CDATA\s*\[(?<text>(?>[^]]+|](?!]>))*)]]>", RegexCompiledOption | RegexOptions.IgnoreCase)); // http://stackoverflow.com/questions/21681861/i-need-a-regex-that-matches-cdata-elements-in-html
+            AddStyle("Comment",
+                PredefinedStyles.GreenStyle,
+                new Regex(@"(<!--.*?-->)|(<!--.*)", RegexOptions.Singleline | RegexCompiledOption));
+            AddStyle("Comment2",
+                PredefinedStyles.GreenStyle,
+                new Regex(@"(<!--.*?-->)|(.*-->)", RegexOptions.Singleline | RegexOptions.RightToLeft | RegexCompiledOption));
+            AddStyle("Tag Bracket",
+                PredefinedStyles.BlueStyle,
+                new Regex(@"<\?|<|/>|</|>|\?>", RegexCompiledOption));
+            AddStyle("Tag Name",
+                PredefinedStyles.MaroonStyle,
+                new Regex(@"<[?](?<range1>[x][m][l]{1})|<(?<range>[!\w:]+)", RegexCompiledOption));
+            AddStyle("End of tag",
+                PredefinedStyles.MaroonStyle,
+                new Regex(@"</(?<range>[\w:]+)>", RegexCompiledOption));
+            AddStyle("Attribute",
+                PredefinedStyles.RedStyle,
+                new Regex(@"(?<range>[\w\d\-\:]+)[ ]*=[ ]*'[^']*'|(?<range>[\w\d\-\:]+)[ ]*=[ ]*""[^""]*""|(?<range>[\w\d\-\:]+)[ ]*=[ ]*[\w\d\-\:]+", RegexCompiledOption));
+            AddStyle("Attribute Value",
+                PredefinedStyles.BlueStyle,
+                new Regex(@"[\w\d\-]+?=(?<range>'[^']*')|[\w\d\-]+[ ]*=[ ]*(?<range>""[^""]*"")|[\w\d\-]+[ ]*=[ ]*(?<range>[\w\d\-]+)", RegexCompiledOption));
+            AddStyle("Entity",
+                PredefinedStyles.RedStyle,
+                new Regex(@"\&(amp|gt|lt|nbsp|quot|apos|copy|reg|#[0-9]{1,8}|#x[0-9a-f]{1,8});", RegexCompiledOption | RegexOptions.IgnoreCase));
+            
+            
+            XMLFoldingRegex = new Regex(@"<(?<range>/?\w+)\s[^>]*?[^/]>|<(?<range>/?\w+)\s*>", RegexOptions.Singleline | RegexCompiledOption);
+        }
+        public override void AutoIndentNeeded(object sender, AutoIndentEventArgs args)
+        {
+            var tb = sender as FastColoredTextBox;
+            tb.CalcAutoIndentShiftByCodeFolding(sender, args);
+        }
+        public override void SyntaxHighlight(Range range)
+        {
+            base.SyntaxHighlight(range);
+            var stack = new Stack<XmlFoldingTag>();
+            var id = 0;
+            var fctb = range.tb;
+            //extract opening and closing tags (exclude open-close tags: <TAG/>)
+            foreach (var r in range.GetRanges(XMLFoldingRegex))
+            {
+                var tagName = r.Text;
+                var iLine = r.Start.iLine;
+                //if it is opening tag...
+                if (tagName[0] != '/')
+                {
+                    // ...push into stack
+                    var tag = new XmlFoldingTag { Name = tagName, id = id++, startLine = r.Start.iLine };
+                    stack.Push(tag);
+                    // if this line has no markers - set marker
+                    if (string.IsNullOrEmpty(fctb[iLine].FoldingStartMarker))
+                        fctb[iLine].FoldingStartMarker = tag.Marker;
+                }
+                else
+                {
+                    //if it is closing tag - pop from stack
+                    if (stack.Count > 0)
+                    {
+                        var tag = stack.Pop();
+                        //compare line number
+                        if (iLine == tag.startLine)
+                        {
+                            //remove marker, because same line can not be folding
+                            if (fctb[iLine].FoldingStartMarker == tag.Marker) //was it our marker?
+                                fctb[iLine].FoldingStartMarker = null;
+                        }
+                        else
+                        {
+                            //set end folding marker
+                            if (string.IsNullOrEmpty(fctb[iLine].FoldingEndMarker))
+                                fctb[iLine].FoldingEndMarker = tag.Marker;
+                        }
+                    }
+                }
+            }
+        }
+
+        class XmlFoldingTag
+        {
+            public string Name;
+            public int id;
+            public int startLine;
+            public string Marker { get { return Name + id; } }
+        }
+    }
+}
diff --git a/Tester/BilingualHighlighterSample.Designer.cs b/Tester/BilingualHighlighterSample.Designer.cs
index c938bbe1..4cc4a0d7 100644
--- a/Tester/BilingualHighlighterSample.Designer.cs
+++ b/Tester/BilingualHighlighterSample.Designer.cs
@@ -29,27 +29,46 @@ protected override void Dispose(bool disposing)
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(BilingualHighlighterSample));
             this.tb = new FastColoredTextBoxNS.FastColoredTextBox();
             ((System.ComponentModel.ISupportInitialize)(this.tb)).BeginInit();
             this.SuspendLayout();
             // 
             // tb
             // 
-            this.tb.AllowDrop = true;
+            this.tb.AutoCompleteBracketsList = new char[] {
+        '(',
+        ')',
+        '{',
+        '}',
+        '[',
+        ']',
+        '\"',
+        '\"',
+        '\'',
+        '\''};
+            this.tb.AutoIndentCharsPatterns = "^\\s*[\\w\\.]+(\\s\\w+)?\\s*(?<range>=)\\s*(?<range>[^;=]+);\r\n^\\s*(case|default)\\s*[^:]*" +
+    "(?<range>:)\\s*(?<range>[^;]+);";
             this.tb.AutoScrollMinSize = new System.Drawing.Size(347, 154);
             this.tb.BackBrush = null;
+            this.tb.CharHeight = 14;
+            this.tb.CharWidth = 8;
             this.tb.Cursor = System.Windows.Forms.Cursors.IBeam;
             this.tb.DisabledColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(180)))), ((int)(((byte)(180)))), ((int)(((byte)(180)))));
             this.tb.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.tb.Font = new System.Drawing.Font("Courier New", 9.75F);
             this.tb.IsReplaceMode = false;
+            this.tb.Language = FastColoredTextBoxNS.Language.HTML;
             this.tb.Location = new System.Drawing.Point(0, 0);
             this.tb.Name = "tb";
             this.tb.Paddings = new System.Windows.Forms.Padding(0);
             this.tb.SelectionColor = System.Drawing.Color.FromArgb(((int)(((byte)(50)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(255)))));
+            this.tb.ServiceColors = ((FastColoredTextBoxNS.ServiceColors)(resources.GetObject("tb.ServiceColors")));
             this.tb.Size = new System.Drawing.Size(355, 321);
             this.tb.TabIndex = 0;
             this.tb.Text = "<html>\r\n <head></head>\r\n <body>\r\n <ul> \r\n  <?php for($i=1;$i<=5;$i++){ ?>\r\n  <li>" +
     "Menu Item <?php echo $i; ?></li> \r\n  <?php } ?>\r\n </ul> \r\n</body>\r\n</html>\r\n";
+            this.tb.Zoom = 100;
             this.tb.TextChangedDelayed += new System.EventHandler<FastColoredTextBoxNS.TextChangedEventArgs>(this.tb_TextChangedDelayed);
             // 
             // BilingualHighlighterSample
diff --git a/Tester/BilingualHighlighterSample.cs b/Tester/BilingualHighlighterSample.cs
index 919f188a..427b0779 100644
--- a/Tester/BilingualHighlighterSample.cs
+++ b/Tester/BilingualHighlighterSample.cs
@@ -23,17 +23,18 @@ private void tb_TextChangedDelayed(object sender, TextChangedEventArgs e)
             var tb = (FastColoredTextBox) sender;
             
             //highlight html
-            tb.SyntaxHighlighter.InitStyleSchema(Language.HTML);
-            tb.SyntaxHighlighter.HTMLSyntaxHighlight(tb.Range);
+            //tb.SyntaxHighlighter.InitStyleSchema(Language.HTML);
+            tb.SyntaxHighlighter.SyntaxHighlight(tb.Range);
             tb.Range.ClearFoldingMarkers();
             //find PHP fragments
+            SyntaxHighlighter phpSource = SyntaxHighlighter.CreateSyntaxHighlighter(tb, Language.PHP);
             foreach(var r in tb.GetRanges(@"<\?php.*?\?>", RegexOptions.Singleline))
             {
                 //remove HTML highlighting from this fragment
                 r.ClearStyle(StyleIndex.All);
                 //do PHP highlighting
-                tb.SyntaxHighlighter.InitStyleSchema(Language.PHP);
-                tb.SyntaxHighlighter.PHPSyntaxHighlight(r);
+                //tb.SyntaxHighlighter.InitStyleSchema(Language.PHP);
+                phpSource.SyntaxHighlight(r);
             }
         }
     }
diff --git a/Tester/BilingualHighlighterSample.resx b/Tester/BilingualHighlighterSample.resx
index 7080a7d1..b2548449 100644
--- a/Tester/BilingualHighlighterSample.resx
+++ b/Tester/BilingualHighlighterSample.resx
@@ -117,4 +117,22 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="tb.ServiceColors" mimetype="application/x-microsoft.net.object.binary.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFdGYXN0Q29sb3JlZFRleHRCb3gsIFZlcnNpb249Mi4xNi4yNi4w
+        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWZiOGFhMTJiOTk0ZWY2MWIMAwAAAFFTeXN0
+        ZW0uRHJhd2luZywgVmVyc2lvbj0yLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2Vu
+        PWIwM2Y1ZjdmMTFkNTBhM2EFAQAAACJGYXN0Q29sb3JlZFRleHRCb3hOUy5TZXJ2aWNlQ29sb3JzBgAA
+        ACg8Q29sbGFwc2VNYXJrZXJGb3JlQ29sb3I+a19fQmFja2luZ0ZpZWxkKDxDb2xsYXBzZU1hcmtlckJh
+        Y2tDb2xvcj5rX19CYWNraW5nRmllbGQqPENvbGxhcHNlTWFya2VyQm9yZGVyQ29sb3I+a19fQmFja2lu
+        Z0ZpZWxkJjxFeHBhbmRNYXJrZXJGb3JlQ29sb3I+a19fQmFja2luZ0ZpZWxkJjxFeHBhbmRNYXJrZXJC
+        YWNrQ29sb3I+a19fQmFja2luZ0ZpZWxkKDxFeHBhbmRNYXJrZXJCb3JkZXJDb2xvcj5rX19CYWNraW5n
+        RmllbGQEBAQEBAQUU3lzdGVtLkRyYXdpbmcuQ29sb3IDAAAAFFN5c3RlbS5EcmF3aW5nLkNvbG9yAwAA
+        ABRTeXN0ZW0uRHJhd2luZy5Db2xvcgMAAAAUU3lzdGVtLkRyYXdpbmcuQ29sb3IDAAAAFFN5c3RlbS5E
+        cmF3aW5nLkNvbG9yAwAAABRTeXN0ZW0uRHJhd2luZy5Db2xvcgMAAAACAAAABfz///8UU3lzdGVtLkRy
+        YXdpbmcuQ29sb3IEAAAABG5hbWUFdmFsdWUKa25vd25Db2xvcgVzdGF0ZQEAAAAJBwcDAAAACgAAAAAA
+        AAAAlgABAAH7/////P///woAAAAAAAAAAKQAAQAB+v////z///8KAAAAAAAAAACWAAEAAfn////8////
+        CgAAAAAAAAAAjQABAAH4/////P///woAAAAAAAAAAKQAAQAB9/////z///8KAAAAAAAAAACWAAEACw==
+</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Tester/CustomTextSourceSample.cs b/Tester/CustomTextSourceSample.cs
index a7f8a322..e7ef0180 100644
--- a/Tester/CustomTextSourceSample.cs
+++ b/Tester/CustomTextSourceSample.cs
@@ -43,8 +43,8 @@ private void fctb_VisibleRangeChanged(object sender, EventArgs e)
         {
             var range = fctb.VisibleRange;
             range.ClearStyle(StyleIndex.All);
-            fctb.VisibleRange.SetStyle(fctb.SyntaxHighlighter.BrownStyle, "^.+?  ", RegexOptions.Multiline);
-            fctb.VisibleRange.SetStyle(fctb.SyntaxHighlighter.BlueBoldStyle, @"POST|GET", RegexOptions.Multiline);
+            fctb.VisibleRange.SetStyle(SyntaxHighlighter.PredefinedStyles.BrownStyle, "^.+?  ", RegexOptions.Multiline);
+            fctb.VisibleRange.SetStyle(SyntaxHighlighter.PredefinedStyles.BlueBoldStyle, @"POST|GET", RegexOptions.Multiline);
         }
     }
 
diff --git a/Tester/LazyLoadingSample.cs b/Tester/LazyLoadingSample.cs
index 8abf2c53..66c4b888 100644
--- a/Tester/LazyLoadingSample.cs
+++ b/Tester/LazyLoadingSample.cs
@@ -56,8 +56,8 @@ private void HighlightVisibleRange()
             range.SetFoldingMarkers(@"N\d\d00", @"N\d\d99");
             //
             range.ClearStyle(StyleIndex.All);
-            range.SetStyle(fctb.SyntaxHighlighter.BlueStyle, @"N\d+");
-            range.SetStyle(fctb.SyntaxHighlighter.RedStyle, @"[+\-]?[\d\.]+\d+");
+            range.SetStyle(SyntaxHighlighter.PredefinedStyles.BlueStyle, @"N\d+");
+            range.SetStyle(SyntaxHighlighter.PredefinedStyles.RedStyle, @"[+\-]?[\d\.]+\d+");
         }
 
         private void closeFileToolStripMenuItem_Click(object sender, EventArgs e)
diff --git a/Tester/PowerfulCSharpEditor.cs b/Tester/PowerfulCSharpEditor.cs
index af7fa332..ca806ad8 100644
--- a/Tester/PowerfulCSharpEditor.cs
+++ b/Tester/PowerfulCSharpEditor.cs
@@ -100,7 +100,7 @@ void popupMenu_Opening(object sender, CancelEventArgs e)
         {
             //---block autocomplete menu for comments
             //get index of green style (used for comments)
-            var iGreenStyle = CurrentTB.GetStyleIndex(CurrentTB.SyntaxHighlighter.GreenStyle);
+            var iGreenStyle = CurrentTB.GetStyleIndex(SyntaxHighlighter.PredefinedStyles.GreenStyle);
             if (iGreenStyle >= 0)
                 if (CurrentTB.Selection.Start.iChar > 0)
                 {
diff --git a/Tester/PowerfulSample.cs b/Tester/PowerfulSample.cs
index d103c0a2..e5b4b1ce 100644
--- a/Tester/PowerfulSample.cs
+++ b/Tester/PowerfulSample.cs
@@ -351,14 +351,18 @@ private void miPrint_Click(object sender, EventArgs e)
 
         private void miChangeColors_Click(object sender, EventArgs e)
         {
-            var styles = new Style[] { fctb.SyntaxHighlighter.BlueBoldStyle, fctb.SyntaxHighlighter.BlueStyle, fctb.SyntaxHighlighter.BoldStyle, fctb.SyntaxHighlighter.BrownStyle, fctb.SyntaxHighlighter.GrayStyle, fctb.SyntaxHighlighter.GreenStyle, fctb.SyntaxHighlighter.MagentaStyle, fctb.SyntaxHighlighter.MaroonStyle, fctb.SyntaxHighlighter.RedStyle };
-            fctb.SyntaxHighlighter.AttributeStyle = styles[rnd.Next(styles.Length)];
-            fctb.SyntaxHighlighter.ClassNameStyle = styles[rnd.Next(styles.Length)];
-            fctb.SyntaxHighlighter.CommentStyle = styles[rnd.Next(styles.Length)];
-            fctb.SyntaxHighlighter.CommentTagStyle = styles[rnd.Next(styles.Length)];
-            fctb.SyntaxHighlighter.KeywordStyle = styles[rnd.Next(styles.Length)];
-            fctb.SyntaxHighlighter.NumberStyle = styles[rnd.Next(styles.Length)];
-            fctb.SyntaxHighlighter.StringStyle = styles[rnd.Next(styles.Length)];
+            var styles = new Style[] { SyntaxHighlighter.PredefinedStyles.BlueBoldStyle, SyntaxHighlighter.PredefinedStyles.BlueStyle, SyntaxHighlighter.PredefinedStyles.BoldStyle, SyntaxHighlighter.PredefinedStyles.BrownStyle, SyntaxHighlighter.PredefinedStyles.GrayStyle, SyntaxHighlighter.PredefinedStyles.GreenStyle, SyntaxHighlighter.PredefinedStyles.MagentaStyle, SyntaxHighlighter.PredefinedStyles.MaroonStyle, SyntaxHighlighter.PredefinedStyles.RedStyle };
+            for (int i = 0; i < fctb.SyntaxHighlighter.StyleSchema.Count; ++i)
+            {
+                fctb.SyntaxHighlighter.StyleSchema.ChangeStyle(i, styles[rnd.Next(styles.Length)]);
+            }
+            //fctb.SyntaxHighlighter.AttributeStyle = styles[rnd.Next(styles.Length)];
+            //fctb.SyntaxHighlighter.ClassNameStyle = styles[rnd.Next(styles.Length)];
+            //fctb.SyntaxHighlighter.CommentStyle = styles[rnd.Next(styles.Length)];
+            //fctb.SyntaxHighlighter.CommentTagStyle = styles[rnd.Next(styles.Length)];
+            //fctb.SyntaxHighlighter.KeywordStyle = styles[rnd.Next(styles.Length)];
+            //fctb.SyntaxHighlighter.NumberStyle = styles[rnd.Next(styles.Length)];
+            //fctb.SyntaxHighlighter.StringStyle = styles[rnd.Next(styles.Length)];
 
             fctb.OnSyntaxHighlight(new TextChangedEventArgs(fctb.Range));
         }
diff --git a/Tester/SyntaxHighlightingByXmlDescription.Designer.cs b/Tester/SyntaxHighlightingByXmlDescription.Designer.cs
index 84b77a24..0fc24d24 100644
--- a/Tester/SyntaxHighlightingByXmlDescription.Designer.cs
+++ b/Tester/SyntaxHighlightingByXmlDescription.Designer.cs
@@ -28,10 +28,11 @@ protected override void Dispose(bool disposing)
         /// </summary>
         private void InitializeComponent()
         {
+            this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SyntaxHighlightingByXmlDescription));
             this.label1 = new System.Windows.Forms.Label();
             this.fctb = new FastColoredTextBoxNS.FastColoredTextBox();
-            FastColoredTextBoxNS.SyntaxHighlighter syntaxHighlighter1 = new FastColoredTextBoxNS.SyntaxHighlighter(fctb);
+            ((System.ComponentModel.ISupportInitialize)(this.fctb)).BeginInit();
             this.SuspendLayout();
             // 
             // label1
@@ -44,30 +45,44 @@ private void InitializeComponent()
             this.label1.TabIndex = 3;
             this.label1.Text = "This example uses XML file for description syntax highlighting.";
             // 
-            // fastColoredTextBox1
+            // fctb
             // 
-            this.fctb.AutoScroll = true;
-            this.fctb.AutoScrollMinSize = new System.Drawing.Size(0, 176);
+            this.fctb.AutoCompleteBracketsList = new char[] {
+        '(',
+        ')',
+        '{',
+        '}',
+        '[',
+        ']',
+        '\"',
+        '\"',
+        '\'',
+        '\''};
+            this.fctb.AutoIndentCharsPatterns = "^\\s*[\\w\\.]+(\\s\\w+)?\\s*(?<range>=)\\s*(?<range>[^;=]+);^\\s*(case|default)\\s*[^:]*(?" +
+    "<range>:)\\s*(?<range>[^;]+);";
+            this.fctb.AutoScrollMinSize = new System.Drawing.Size(0, 168);
+            this.fctb.BackBrush = null;
+            this.fctb.BracketsHighlightStrategy = FastColoredTextBoxNS.BracketsHighlightStrategy.Strategy2;
+            this.fctb.CharHeight = 14;
+            this.fctb.CharWidth = 8;
             this.fctb.Cursor = System.Windows.Forms.Cursors.IBeam;
-            this.fctb.DescriptionFile = "htmlDesc.xml";
+            this.fctb.DescriptionFile = "E:\\allej\\repos\\MyIdeas\\FastColoredTextBox\\Tester\\bin\\Debug\\htmlDesc.xml";
+            this.fctb.DisabledColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(180)))), ((int)(((byte)(180)))), ((int)(((byte)(180)))));
             this.fctb.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.fctb.IsChanged = true;
-            this.fctb.LeftBracket = '(';
+            this.fctb.IsReplaceMode = false;
+            this.fctb.Language = FastColoredTextBoxNS.Language.FromXMLfile;
+            this.fctb.LeftBracket = '<';
             this.fctb.Location = new System.Drawing.Point(0, 39);
-            this.fctb.Name = "fastColoredTextBox1";
-            this.fctb.RightBracket = ')';
-            this.fctb.SelectedText = "";
-            this.fctb.SelectionStart = 373;
+            this.fctb.Name = "fctb";
+            this.fctb.Paddings = new System.Windows.Forms.Padding(0);
+            this.fctb.RightBracket = '>';
+            this.fctb.SelectionColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(255)))));
+            this.fctb.ServiceColors = ((FastColoredTextBoxNS.ServiceColors)(resources.GetObject("fctb.ServiceColors")));
             this.fctb.Size = new System.Drawing.Size(370, 275);
-            this.fctb.SyntaxHighlighter = syntaxHighlighter1;
             this.fctb.TabIndex = 4;
-            this.fctb.Text = @"<div class=""clip5x9 nav_arrows"">
-      <img src=""http://i3.msdn.microsoft.com/Hash/0f73868cd340280cac28f7eeb3d2dd7d.png"" class=""cl_nav_arrow"" alt="""" />
-</div>
-    
-<div class=""nav_div_currentroot"">
-<a href=""http://msdn.microsoft.com/en-us/library/abeh092z(v=VS.90).aspx"" title=""System.Globalization Namespace"">System.Globalization Namespace</a></div>";
+            this.fctb.Text = resources.GetString("fctb.Text");
             this.fctb.WordWrap = true;
+            this.fctb.Zoom = 100;
             // 
             // SyntaxHighlightingByXmlDescription
             // 
@@ -78,6 +93,7 @@ private void InitializeComponent()
             this.Controls.Add(this.label1);
             this.Name = "SyntaxHighlightingByXmlDescription";
             this.Text = "SyntaxHighlightingByXmlDescription";
+            ((System.ComponentModel.ISupportInitialize)(this.fctb)).EndInit();
             this.ResumeLayout(false);
 
         }
diff --git a/Tester/SyntaxHighlightingByXmlDescription.resx b/Tester/SyntaxHighlightingByXmlDescription.resx
index 421e4d82..0e26e6c5 100644
--- a/Tester/SyntaxHighlightingByXmlDescription.resx
+++ b/Tester/SyntaxHighlightingByXmlDescription.resx
@@ -117,12 +117,30 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="fastColoredTextBox1.Text" xml:space="preserve">
-    <value>    &lt;div class="clip5x9 nav_arrows"&gt;
+  <data name="fctb.ServiceColors" mimetype="application/x-microsoft.net.object.binary.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFdGYXN0Q29sb3JlZFRleHRCb3gsIFZlcnNpb249Mi4xNi4yNi4w
+        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWZiOGFhMTJiOTk0ZWY2MWIMAwAAAFFTeXN0
+        ZW0uRHJhd2luZywgVmVyc2lvbj0yLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2Vu
+        PWIwM2Y1ZjdmMTFkNTBhM2EFAQAAACJGYXN0Q29sb3JlZFRleHRCb3hOUy5TZXJ2aWNlQ29sb3JzBgAA
+        ACg8Q29sbGFwc2VNYXJrZXJGb3JlQ29sb3I+a19fQmFja2luZ0ZpZWxkKDxDb2xsYXBzZU1hcmtlckJh
+        Y2tDb2xvcj5rX19CYWNraW5nRmllbGQqPENvbGxhcHNlTWFya2VyQm9yZGVyQ29sb3I+a19fQmFja2lu
+        Z0ZpZWxkJjxFeHBhbmRNYXJrZXJGb3JlQ29sb3I+a19fQmFja2luZ0ZpZWxkJjxFeHBhbmRNYXJrZXJC
+        YWNrQ29sb3I+a19fQmFja2luZ0ZpZWxkKDxFeHBhbmRNYXJrZXJCb3JkZXJDb2xvcj5rX19CYWNraW5n
+        RmllbGQEBAQEBAQUU3lzdGVtLkRyYXdpbmcuQ29sb3IDAAAAFFN5c3RlbS5EcmF3aW5nLkNvbG9yAwAA
+        ABRTeXN0ZW0uRHJhd2luZy5Db2xvcgMAAAAUU3lzdGVtLkRyYXdpbmcuQ29sb3IDAAAAFFN5c3RlbS5E
+        cmF3aW5nLkNvbG9yAwAAABRTeXN0ZW0uRHJhd2luZy5Db2xvcgMAAAACAAAABfz///8UU3lzdGVtLkRy
+        YXdpbmcuQ29sb3IEAAAABG5hbWUFdmFsdWUKa25vd25Db2xvcgVzdGF0ZQEAAAAJBwcDAAAACgAAAAAA
+        AAAAlgABAAH7/////P///woAAAAAAAAAAKQAAQAB+v////z///8KAAAAAAAAAACWAAEAAfn////8////
+        CgAAAAAAAAAAjQABAAH4/////P///woAAAAAAAAAAKQAAQAB9/////z///8KAAAAAAAAAACWAAEACw==
+</value>
+  </data>
+  <data name="fctb.Text" xml:space="preserve">
+    <value>&lt;div class="clip5x9 nav_arrows"&gt;
       &lt;img src="http://i3.msdn.microsoft.com/Hash/0f73868cd340280cac28f7eeb3d2dd7d.png" class="cl_nav_arrow" alt="" /&gt;
-    &lt;/div&gt;
+&lt;/div&gt;
     
-    &lt;div class="nav_div_currentroot"&gt;
-      &lt;a href="http://msdn.microsoft.com/en-us/library/abeh092z(v=VS.90).aspx" title="System.Globalization Namespace"&gt;System.Globalization Namespace&lt;/a&gt;&lt;/div&gt;</value>
+&lt;div class="nav_div_currentroot"&gt;
+&lt;a href="http://msdn.microsoft.com/en-us/library/abeh092z(v=VS.90).aspx" title="System.Globalization Namespace"&gt;System.Globalization Namespace&lt;/a&gt;&lt;/div&gt;</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/TesterVB/LazyLoadingSample.vb b/TesterVB/LazyLoadingSample.vb
index ff3915dc..16b7b8ec 100644
--- a/TesterVB/LazyLoadingSample.vb
+++ b/TesterVB/LazyLoadingSample.vb
@@ -184,8 +184,8 @@ Namespace TesterVB
             range.ClearFoldingMarkers()
             range.SetFoldingMarkers("N\d\d00", "N\d\d99")
             range.ClearStyle(StyleIndex.All)
-            range.SetStyle(Me.fctb.SyntaxHighlighter.BlueStyle, "N\d+")
-            range.SetStyle(Me.fctb.SyntaxHighlighter.RedStyle, "[+\-]?[\d\.]+\d+")
+            range.SetStyle(SyntaxHighlighter.PredefinedStyles.BlueStyle, "N\d+")
+            range.SetStyle(SyntaxHighlighter.PredefinedStyles.RedStyle, "[+\-]?[\d\.]+\d+")
         End Sub
 
         Private Sub closeFileToolStripMenuItem_Click(sender As Object, e As EventArgs)
diff --git a/TesterVB/PowerfulCSharpEditor.vb b/TesterVB/PowerfulCSharpEditor.vb
index eb5355bc..8bbf218f 100644
--- a/TesterVB/PowerfulCSharpEditor.vb
+++ b/TesterVB/PowerfulCSharpEditor.vb
@@ -971,7 +971,7 @@ Namespace TesterVB
         End Sub
 
         Private Sub popupMenu_Opening(sender As Object, e As CancelEventArgs)
-            Dim iGreenStyle As Integer = Me.CurrentTB.GetStyleIndex(Me.CurrentTB.SyntaxHighlighter.GreenStyle)
+            Dim iGreenStyle As Integer = Me.CurrentTB.GetStyleIndex(SyntaxHighlighter.PredefinedStyles.GreenStyle)
             If iGreenStyle >= 0 AndAlso Me.CurrentTB.Selection.Start.iChar > 0 Then
                 Dim c As FastColoredTextBoxNS.Char = Me.CurrentTB(Me.CurrentTB.Selection.Start.iLine)(Me.CurrentTB.Selection.Start.iChar - 1)
                 Dim greenStyleIndex As StyleIndex = Range.ToStyleIndex(iGreenStyle)
diff --git a/TesterVB/SyntaxHighlightingByXmlDescription.vb b/TesterVB/SyntaxHighlightingByXmlDescription.vb
index 003959b1..4e8b7f3f 100644
--- a/TesterVB/SyntaxHighlightingByXmlDescription.vb
+++ b/TesterVB/SyntaxHighlightingByXmlDescription.vb
@@ -25,7 +25,7 @@ Namespace TesterVB
             Dim resources As ComponentResourceManager = New ComponentResourceManager(GetType(SyntaxHighlightingByXmlDescription))
             Me.label1 = New Label()
             Me.fctb = New FastColoredTextBox()
-            Dim syntaxHighlighter As SyntaxHighlighter = New SyntaxHighlighter(fctb)
+            Dim syntaxHighlighter As SyntaxHighlighter = SyntaxHighlighter.CreateSyntaxHighlighter(fctb, Language.Custom)
             MyBase.SuspendLayout()
             Me.label1.Dock = DockStyle.Top
             Me.label1.Font = New Font("Microsoft Sans Serif", 9.75F, FontStyle.Regular, GraphicsUnit.Point, 204)