From 8071fbf466776efa79e6fbfb0dad61fd5060120c Mon Sep 17 00:00:00 2001
From: FrozenAssassine <Julius@skirsch.de>
Date: Thu, 26 Jan 2023 07:23:38 +0100
Subject: [PATCH 1/2] This fixes #367

---
 TextControlBox/TextControlBox.xaml.cs | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/TextControlBox/TextControlBox.xaml.cs b/TextControlBox/TextControlBox.xaml.cs
index c32f634..4eaf59c 100644
--- a/TextControlBox/TextControlBox.xaml.cs
+++ b/TextControlBox/TextControlBox.xaml.cs
@@ -704,11 +704,21 @@ private async void Safe_Paste(bool HandleException = true)
                 DataPackageView dataPackageView = Clipboard.GetContent();
                 if (dataPackageView.Contains(StandardDataFormats.Text))
                 {
-                    string Text = await dataPackageView.GetTextAsync();
-                    if (await Utils.IsOverTextLimit(Text.Length))
+                    string text = null;
+                    try
+                    {
+                        text = await dataPackageView.GetTextAsync();
+                    }
+                    catch(Exception ex) //When longer holding Ctrl + V the clipboard may throw an exception:
+                    {
+                        Debug.WriteLine("Clipboard exception: " + ex.Message);
+                        return;
+                    }
+
+                    if (await Utils.IsOverTextLimit(text.Length))
                         return;
 
-                    AddCharacter(stringManager.CleanUpString(Text));
+                    AddCharacter(stringManager.CleanUpString(text));
                 }
             }
             catch (OutOfMemoryException)

From 52b2ceb21ec2e064bf45137a022709cf473617f8 Mon Sep 17 00:00:00 2001
From: FrozenAssassine <Julius@skirsch.de>
Date: Mon, 30 Jan 2023 10:25:23 +0100
Subject: [PATCH 2/2] This fixes #367

---
 .gitignore                                    |   1 +
 TextControlBox-TestApp/MainPage.xaml.cs       |  11 +-
 .../TextControlBox-TestApp.csproj             |   6 +
 TextControlBox/Languages/Batch.json           |  48 ---
 TextControlBox/Languages/CSharp.json          |  80 -----
 TextControlBox/Languages/ConfigFile.json      |  39 ---
 TextControlBox/Languages/Cpp.json             |  61 ----
 TextControlBox/Languages/GCode.json           |  62 ----
 TextControlBox/Languages/Hex.json             |  59 ----
 TextControlBox/Languages/Html.json            |  62 ----
 TextControlBox/Languages/Java.json            |  56 ----
 TextControlBox/Languages/Javascript.json      |  74 -----
 TextControlBox/Languages/Json.json            |  55 ----
 TextControlBox/Languages/Languages.cs         | 283 ++++++++++++++++++
 TextControlBox/Languages/PHP.json             |  82 -----
 TextControlBox/Languages/QSharp.json          |  32 --
 TextControlBox/Languages/Xml.json             |  56 ----
 TextControlBox/TextControlBox.csproj          |  30 +-
 TextControlBox/TextControlBox.xaml.cs         |  52 ++--
 19 files changed, 317 insertions(+), 832 deletions(-)
 delete mode 100644 TextControlBox/Languages/Batch.json
 delete mode 100644 TextControlBox/Languages/CSharp.json
 delete mode 100644 TextControlBox/Languages/ConfigFile.json
 delete mode 100644 TextControlBox/Languages/Cpp.json
 delete mode 100644 TextControlBox/Languages/GCode.json
 delete mode 100644 TextControlBox/Languages/Hex.json
 delete mode 100644 TextControlBox/Languages/Html.json
 delete mode 100644 TextControlBox/Languages/Java.json
 delete mode 100644 TextControlBox/Languages/Javascript.json
 delete mode 100644 TextControlBox/Languages/Json.json
 create mode 100644 TextControlBox/Languages/Languages.cs
 delete mode 100644 TextControlBox/Languages/PHP.json
 delete mode 100644 TextControlBox/Languages/QSharp.json
 delete mode 100644 TextControlBox/Languages/Xml.json

diff --git a/.gitignore b/.gitignore
index ff61fe7..c028245 100644
--- a/.gitignore
+++ b/.gitignore
@@ -365,3 +365,4 @@ FodyWeavers.xsd
 /TextControlBox/TextControlBox.nuspec
 /TextControlBox/icon1.png
 /TextControlBox/.nuget
+/Cloned
diff --git a/TextControlBox-TestApp/MainPage.xaml.cs b/TextControlBox-TestApp/MainPage.xaml.cs
index 1fc97ef..5a97f74 100644
--- a/TextControlBox-TestApp/MainPage.xaml.cs
+++ b/TextControlBox-TestApp/MainPage.xaml.cs
@@ -37,19 +37,16 @@ public MainPage()
         }
         private void Load()
         {
-            textbox.CodeLanguage = TextControlBox.TextControlBox.GetCodeLanguageFromId("CSharp");
+            textbox.CodeLanguage = TextControlBox.TextControlBox.GetCodeLanguageFromId("Json");
+            textbox.SyntaxHighlighting = true;
             textbox.LoadLines(GenerateContent());
         }
         private IEnumerable<string> GenerateContent()
         {
-            int Length = 0;
-            int Limit = 50;
-            for (int i = 1; i < Limit; i++)
+            foreach (var language in TextControlBox.TextControlBox.CodeLanguages)
             {
-                Length += ("Line LOL: " + i).Length;
-                yield return "Line LOL: " + i;
+                yield return language.Value.Name;
             }
-            Debug.WriteLine("Length: " + Length);
         }
 
         private async void CoreWindow_KeyDown(Windows.UI.Core.CoreWindow sender, Windows.UI.Core.KeyEventArgs args)
diff --git a/TextControlBox-TestApp/TextControlBox-TestApp.csproj b/TextControlBox-TestApp/TextControlBox-TestApp.csproj
index 23da5a5..968fbad 100644
--- a/TextControlBox-TestApp/TextControlBox-TestApp.csproj
+++ b/TextControlBox-TestApp/TextControlBox-TestApp.csproj
@@ -18,6 +18,12 @@
     <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WindowsXamlEnableOverview>true</WindowsXamlEnableOverview>
     <AppxPackageSigningEnabled>false</AppxPackageSigningEnabled>
+    <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
+    <AppxAutoIncrementPackageRevision>True</AppxAutoIncrementPackageRevision>
+    <GenerateTestArtifacts>True</GenerateTestArtifacts>
+    <AppxBundle>Always</AppxBundle>
+    <AppxBundlePlatforms>x64</AppxBundlePlatforms>
+    <HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
diff --git a/TextControlBox/Languages/Batch.json b/TextControlBox/Languages/Batch.json
deleted file mode 100644
index 2a56a1f..0000000
--- a/TextControlBox/Languages/Batch.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "Highlights": [
-    {
-      //-/+ floating numbers
-      "Pattern": "\\b([+-]?(?=\\.\\d|\\d)(?:\\d+)?(?:\\.?\\d*))(?:[eE]([+-]?\\d+))?\\b",
-      "ColorDark": "#ff00ff",
-      "ColorLight": "#dd00dd"
-    },
-    {
-      //keywords
-      "Pattern": "(?i)(set|echo|for|pushd|popd|pause|exit|cd|if|else|goto|del)\\s",
-      "ColorDark": "#dd00dd",
-      "ColorLight": "#dd00dd"
-    },
-    {
-      //class names
-      "Pattern": "(:.*)",
-      "ColorDark": "#ffff00",
-      "ColorLight": "#00C000"
-    },
-    {
-      //variables
-      "Pattern": "(\\\".+?\\\"|\\'.+?\\')",
-      "ColorDark": "#ff0000",
-      "ColorLight": "#ff0000"
-    },
-    {
-      "Pattern": "(@|%)",
-      "ColorDark": "#dd0077",
-      "ColorLight": "#dd0077"
-    },
-    {
-      "Pattern": "(\\*)",
-      "ColorDark": "#dd0077",
-      "ColorLight": "#dd0077"
-    },
-    {
-      //Comments
-      "Pattern": "((?i)rem.*)",
-      "ColorDark": "#888888",
-      "ColorLight": "#888888"
-    }
-  ],
-  "Name": "Batch",
-  "Filter": ".bat",
-  "Description": "Syntax highlighting for Batch language",
-  "Author": "Julius Kirsch"
-}
\ No newline at end of file
diff --git a/TextControlBox/Languages/CSharp.json b/TextControlBox/Languages/CSharp.json
deleted file mode 100644
index 6417c5d..0000000
--- a/TextControlBox/Languages/CSharp.json
+++ /dev/null
@@ -1,80 +0,0 @@
-{
-  "Highlights": [
-    {
-      //-/+ floating numbers
-      "Pattern": "\\b([+-]?(?=\\.\\d|\\d)(?:\\d+)?(?:\\.?\\d*))(?:[eE]([+-]?\\d+))?\\b",
-      "ColorDark": "#ff00ff",
-      "ColorLight": "#ff00ff"
-    },
-    {
-      //Functions
-      "Pattern": "(?<!(def\\s))(?<=^|\\s|.)[a-zA-Z_][\\w_]*(?=\\()",
-      "ColorDark": "#ffbb00",
-      "ColorLight": "#880088"
-    },
-    {
-      //Keywords
-      "Pattern": "\\b(abstract|as|base|bool|break|byte|case|catch|char|checked|class|const|continue|decimal|default|delegate|do|double|else|enum|event|explicit|extern|external|false|final|finally|fixed|float|for|foreach|get|goto|if|implicit|in|int|interface|internal|is|lock|long|namespace|new|null|object|operator|out|override|params|partial|private|protected|public|readonly|ref|return|sbyte|sealed|set|short|sizeof|stackalloc|static|string|struct|switch|this|throw|true|try|typeof|uint|ulong|unchecked|unsafe|ushort|using|value|var|virtual|void|volatile|while)\\b",
-      "ColorDark": "#00ffff",
-      "ColorLight": "#0066bb"
-    },
-    {
-      //Classes
-      "Pattern": "\\b(List|Color|Console|Debug|Dictionary|Stack|Queue|GC)\\b",
-      "ColorDark": "#ff9900",
-      "ColorLight": "#008000"
-    },
-    {
-      //try/catch/finally
-      "Pattern": "\\b(try|catch|finally)\\b",
-      "ColorDark": "#6666ff",
-      "ColorLight": "#9922ff"
-    },
-    {
-      //regions
-      "CodeStyle": {
-        "Bold": true
-      },
-      "Pattern": "(#region)+(.*?)($|\n)",
-      "ColorDark": "#ff0000",
-      "ColorLight": "#ff0000"
-    },
-    {
-      //endregions
-      "CodeStyle": {
-        "Bold": true
-      },
-      "Pattern": "#endregion",
-      "ColorDark": "#ff0000",
-      "ColorLight": "#ff0000"
-    },
-    {
-      //strings: ""
-      "Pattern": "\"[^\\n]*?\"",
-      "ColorDark": "#00FF00",
-      "ColorLight": "#ff5500"
-    },
-    {
-      //strings: ''
-      "Pattern": "'[^\\n]*?'",
-      "ColorDark": "#00FF00",
-      "ColorLight": "#00CA00"
-    },
-    {
-      //Comment multiline /**/
-      "Pattern": "/\\*[^*]*\\*+(?:[^/*][^*]*\\*+)*/",
-      "ColorDark": "#646464",
-      "ColorLight": "#888888"
-    },
-    {
-      //Comment singleline //
-      "Pattern": "//(.*?)\\r?\\n",
-      "ColorDark": "#646464",
-      "ColorLight": "#888888"
-    }
-  ],
-  "Name": "C#",
-  "Filter": ".cs",
-  "Description": "Syntaxhighlighting for C# language",
-  "Author": "Julius Kirsch"
-}
\ No newline at end of file
diff --git a/TextControlBox/Languages/ConfigFile.json b/TextControlBox/Languages/ConfigFile.json
deleted file mode 100644
index 5b9cbed..0000000
--- a/TextControlBox/Languages/ConfigFile.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  "Highlights": [
-
-    {
-      "Description": "brackets",
-      "Pattern": "[\\[\\]]",
-      "ColorDark": "#0000FF",
-      "ColorLight": "#0000FF"
-    },
-    {
-      "Description": "sections",
-      "Pattern": "\\[[\\t\\s]*(\\w+)[\\t\\s]*\\]",
-      "ColorDark": "#9900FF",
-      "ColorLight": "#9900FF"
-    },
-    {
-      "Description": "keys",
-      "Pattern": "(\\w+)\\=",
-      "ColorDark": "#DDDD00",
-      "ColorLight": "#DDDD00"
-    },
-    {
-      "Description": "values",
-      "Pattern": "\\=(.+)",
-      "ColorDark": "#EE0000",
-      "ColorLight": "#EE0000"
-    },
-    {
-      "Description": "comments",
-      "Pattern": ";.*",
-      "ColorDark": "#888888",
-      "ColorLight": "#888888"
-    }
-  ],
-  "Name": "ConfigFile",
-  "Filter": ".ini",
-  "Description": "Syntaxhighlighting for configuration files.",
-  "Author": "Finn Freitag"
-}
\ No newline at end of file
diff --git a/TextControlBox/Languages/Cpp.json b/TextControlBox/Languages/Cpp.json
deleted file mode 100644
index 4e69ee2..0000000
--- a/TextControlBox/Languages/Cpp.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-  "Highlights": [
-    {
-      //+/- floating numbers
-      "Pattern": "\\b([+-]?(?=\\.\\d|\\d)(?:\\d+)?(?:\\.?\\d*))(?:[eE]([+-]?\\d+))?\\b",
-      "ColorDark": "#00ff00",
-      "ColorLight": "#dd00dd"
-    },
-    {
-      //Functions
-      "Pattern": "(?<!(def\\s))(?<=^|\\s|.)[a-zA-Z_][\\w_]*(?=\\()",
-      "ColorDark": "#ffbb00",
-      "ColorLight": "#4455ff"
-    },
-    {
-      //Keywords
-      "Pattern": "\\b(string|uint16_t|uint8_t|alignas|alignof|and|and_eq|asm|auto|bitand|bitor|bool|break|case|catch|char|char8_t|char16_t|char32_t|class|compl|concept|const|const_cast|consteval|constexpr|constinit|continue|co_await|co_return|co_yield|decltype|default|delete|do|double|dynamic_cast|else|enum|explicit|export|extern|false|float|for|friend|goto|if|inline|int|long|mutable|namespace|new|noexcept|not|not_eq|nullptr|operator|or|or_eq|private|protected|public|register|reinterpret_cast|requires|return|short|signed|sizeof|static|static_assert|static_cast|struct|switch|template|this|thread_local|throw|true|try|typedef|typeid|typename|union|unsigned|using|virtual|void|volatile|wchar_t|while|xor|xor_eq)\\b",
-      "ColorDark": "#dd00dd",
-      "ColorLight": "#dd00dd"
-    },
-    {
-      //#-Keywords
-      "Pattern": "\\B#(define|elif|else|endif|error|ifndef|ifdef|if|import|include|line|pragma|region|undef|using)",
-      "ColorDark": "#999999",
-      "ColorLight": "#bbbbbb"
-    },
-    {
-      "Pattern": "(\\\".+?\\\"|\\'.+?\\')",
-      "ColorDark": "#ff000f",
-      "ColorLight": "#ffff00"
-    },
-    {
-      //strings: "TEST"
-      "Pattern": "\"[^\\n]*?\"",
-      "ColorDark": "#00FF00",
-      "ColorLight": "#00CA00"
-    },
-    {
-      //strings: 'TEST'
-      "Pattern": "'[^\\n]*?'",
-      "ColorDark": "#00FF00",
-      "ColorLight": "#00CA00"
-    },
-    {
-      //Comment multiline /**/
-      "Pattern": "/\\*[^*]*\\*+(?:[^/*][^*]*\\*+)*/",
-      "ColorDark": "#ff0000",
-      "ColorLight": "#888888"
-    },
-    {
-      //Comment singleline //
-      "Pattern": "//(.*?)\\r?\\n",
-      "ColorDark": "#646464",
-      "ColorLight": "#888888"
-    }
-  ],
-  "Name": "C++",
-  "Filter": ".cpp|.cxx|.cc|.hpp|.h|.c",
-  "Description": "Syntax highlighting for C++ language",
-  "Author": "Julius Kirsch"
-}
\ No newline at end of file
diff --git a/TextControlBox/Languages/GCode.json b/TextControlBox/Languages/GCode.json
deleted file mode 100644
index 3df086d..0000000
--- a/TextControlBox/Languages/GCode.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "Highlights": [
-    {
-      //Axis Y
-      "Pattern": "\\bY(?=([0-9]|(\\+|\\-)[0-9]))",
-      "ColorDark": "#00ff00",
-      "ColorLight": "#00ff00"
-    },
-    {
-      //Axis X
-      "Pattern": "\\bX(?=([0-9]|(\\+|\\-)[0-9]))",
-      "ColorDark": "#ff0000",
-      "ColorLight": "#ff0000"
-    },
-    {
-      //Axis Z
-      "Pattern": "\\bZ(?=([0-9]|(\\+|\\-)[0-9]))",
-      "ColorDark": "#0077ff",
-      "ColorLight": "#0077ff"
-    },
-    {
-      //Axis A
-      "Pattern": "\\bA(?=([0-9]|(\\+|\\-)[0-9]))",
-      "ColorDark": "#ff00ff",
-      "ColorLight": "#ff00ff"
-    },
-    {
-      //Feedrate E | F
-      "Pattern": "\\b(E|F)(?=([0-9]|(\\+|\\-)[0-9]))",
-      "ColorDark": "#ffAA00",
-      "ColorLight": "#ffAA00"
-    },
-    {
-      //Extruder
-      "Pattern": "\\b(S|T)(?=([0-9]|(\\+|\\-)[0-9]))",
-      "ColorDark": "#ffff00",
-      "ColorLight": "#ffff00"
-    },
-    {
-      //-/+ floating numbers
-      "Pattern": "([+-]?(?=\\.\\d|\\d)(?:\\d+)?(?:\\.?\\d*))(?:[eE]([+-]?\\d+))?",
-      "ColorDark": "#9f009f",
-      "ColorLight": "#ff00ff"
-    },
-    {
-      //G0 - G999 & M0 - M999
-      "Pattern": "[G|M][0-999].*?[\\s|\\n]",
-      "ColorDark": "#00ffff",
-      "ColorLight": "#00aaaa"
-    },
-    {
-      //Comments
-      "Pattern": "(;|\/\/|\brem\b).*",
-      "ColorDark": "#888888",
-      "ColorLight": "#888888"
-    }
-  ],
-  "Name": "GCode",
-  "Filter": ".ngc|.tap|.gcode|.nc|.cnc",
-  "Description": "Syntaxhighlighting for GCode language",
-  "Author": "Julius Kirsch"
-}
\ No newline at end of file
diff --git a/TextControlBox/Languages/Hex.json b/TextControlBox/Languages/Hex.json
deleted file mode 100644
index 20d5593..0000000
--- a/TextControlBox/Languages/Hex.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Highlights": [
-    {
-      "Description": "Double points",
-      "Pattern": "\\:",
-      "ColorDark": "#FFFF00",
-      "ColorLight": "#FFFF00"
-    },
-    {
-      "Description": "Byte count",
-      "Pattern": "\\:([0-9A-Fa-f]{2})",
-      "ColorDark": "#00FF00",
-      "ColorLight": "#00FF00"
-    },
-    {
-      "Description": "Address",
-      "Pattern": "\\:[0-9A-Fa-f]{2}([0-9A-Fa-f]{4})",
-      "ColorDark": "#00FF00",
-      "ColorLight": "#00FF00"
-    },
-    {
-      "Description": "Record type",
-      "Pattern": "\\:[0-9A-Fa-f]{6}([0-9A-Fa-f]{2})",
-      "ColorDark": "#FF5500",
-      "ColorLight": "#FF5500"
-    },
-    {
-      "Description": "Data",
-      "Pattern": "\\:[0-9A-Fa-f]{8}([0-9A-Fa-f]*)[0-9A-Fa-f]{2}",
-      "ColorDark": "#00FFFF",
-      "ColorLight": "#00FFFF"
-    },
-    {
-      "Description": "Checksum",
-      "Pattern": "\\:[0-9A-Fa-f]{8}[0-9A-Fa-f]*([0-9A-Fa-f]{2})",
-      "ColorDark": "#666666",
-      "ColorLight": "#666666"
-    },
-    {
-      "Description": "Comment",
-      "Pattern": "//.*",
-      "ColorDark": "#666666",
-      "ColorLight": "#666666"
-    },
-    {
-      "Description": "Exceptions",
-      "Pattern": "[^0-9A-Fa-f\\:\\n]",
-      "CodeStyle": {
-        "Underlined": true
-      },
-      "ColorDark": "#FF0000",
-      "ColorLight": "#FF0000"
-    }
-  ],
-  "Name": "HexFile",
-  "Filter": ".hex|.bin",
-  "Description": "Syntaxhighlighting for hex and binary code.",
-  "Author": "Finn Freitag"
-}
\ No newline at end of file
diff --git a/TextControlBox/Languages/Html.json b/TextControlBox/Languages/Html.json
deleted file mode 100644
index 68a069b..0000000
--- a/TextControlBox/Languages/Html.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "Highlights": [
-    {
-      //-/+ floating numbers
-      "Pattern": "\\b([+-]?(?=\\.\\d|\\d)(?:\\d+)?(?:\\.?\\d*))(?:[eE]([+-]?\\d+))?\\b",
-      "ColorDark": "#ff00ff",
-      "ColorLight": "#dd00dd"
-    },
-    {
-      //Keywords
-      "Pattern": "[-A-Za-z_]+\\=",
-      "ColorDark": "#Ff0000",
-      "ColorLight": "#00CA00"
-    },
-    {
-      //Opening tag 1
-      "Pattern": "<+[a-zA-Z0-9:]+>",
-      "ColorDark": "#0099ff",
-      "ColorLight": "#00AADD"
-    },
-    {
-      //Opening tag 2
-      "Pattern": "[<]+[a-zA-Z0-9:]+\\s",
-      "ColorDark": "#0099ff",
-      "ColorLight": "#969696"
-    },
-    {
-      //Opening tag 2
-      "Pattern": "<+[/]+[a-zA-Z0-9:]+>",
-      "ColorDark": "#0099ff",
-      "ColorLight": "#969696"
-    },
-    {
-      //strings: "TEST"
-      "Pattern": "\"[^\\n]*?\"",
-      "ColorDark": "#00FF00",
-      "ColorLight": "#00CA00"
-    },
-    {
-      //strings: 'TEST'
-      "Pattern": "'[^\\n]*?'",
-      "ColorDark": "#00FF00",
-      "ColorLight": "#00CA00"
-    },
-    {
-      //Units
-      "Pattern": "[0-9]+(px|rem|em|vh|vw|px|pt|pc|in|mm|cm|deg|%)",
-      "ColorDark": "#dd00dd",
-      "ColorLight": "#ff00ff"
-    },
-    {
-      //Comment multiline /**/
-      "Pattern": "<!--[\\s\\S]*?-->",
-      "ColorDark": "#888888",
-      "ColorLight": "#888888"
-    }
-  ],
-  "Name": "Html",
-  "Filter": ".html|.htm",
-  "Description": "Syntax highlighting for Html language",
-  "Author": "Julius Kirsch"
-}
\ No newline at end of file
diff --git a/TextControlBox/Languages/Java.json b/TextControlBox/Languages/Java.json
deleted file mode 100644
index e556035..0000000
--- a/TextControlBox/Languages/Java.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-  "Highlights": [
-    {
-      //-/+ floating numbers
-      "Pattern": "\\b([+-]?(?=\\.\\d|\\d)(?:\\d+)?(?:\\.?\\d*))(?:[eE]([+-]?\\d+))?\\b",
-      "ColorDark": "#ff00ff",
-      "ColorLight": "#ff00ff"
-    },
-    {
-      //Functions
-      "Pattern": "(?<!(def\\s))(?<=^|\\s|.)[a-zA-Z_][\\w_]*(?=\\()",
-      "ColorDark": "#ffbb00",
-      "ColorLight": "#880088"
-    },
-    {
-      //Classes
-      "Pattern": "\\b(System.out|System|Math)\\b",
-      "ColorDark": "#ff9900",
-      "ColorLight": "#008000"
-    },
-    {
-      //Keywords
-      "Pattern": "\\b(abstract|assert|boolean|break|byte|case|catch|char|class|const|continue|default|do|double|else|enum|extends|final|finally|float|for|goto|if|implements|import|instanceof|int|interface|long|native|new|package|private|protected|public|return|short|static|super|switch|synchronized|this|throw|throws|transient|try|void|volatile|while|exports|modle|non-sealed|open|opens|permits|provides|record|requires|sealed|to|transitive|uses|var|with|yield|true|false|null)\\b",
-      "ColorDark": "#00ffff",
-      "ColorLight": "#0066bb"
-    },
-    {
-      //strings: ""
-      "Pattern": "\"[^\\n]*?\"",
-      "ColorDark": "#00FF00",
-      "ColorLight": "#ff5500"
-    },
-    {
-      //strings: ''
-      "Pattern": "'[^\\n]*?'",
-      "ColorDark": "#00FF00",
-      "ColorLight": "#00CA00"
-    },
-    {
-      //Comment multiline /**/
-      "Pattern": "/\\*[^*]*\\*+(?:[^/*][^*]*\\*+)*/",
-      "ColorDark": "#646464",
-      "ColorLight": "#888888"
-    },
-    {
-      //Comment singleline //
-      "Pattern": "//(.*?)\\r?\\n",
-      "ColorDark": "#646464",
-      "ColorLight": "#888888"
-    }
-  ],
-  "Name": "Java",
-  "Filter": ".java|.class",
-  "Description": "Syntaxhighlighting for Java language",
-  "Author": "Julius Kirsch"
-}
\ No newline at end of file
diff --git a/TextControlBox/Languages/Javascript.json b/TextControlBox/Languages/Javascript.json
deleted file mode 100644
index 4adb403..0000000
--- a/TextControlBox/Languages/Javascript.json
+++ /dev/null
@@ -1,74 +0,0 @@
-{
-  "Highlights": [
-    {
-      "Description": "punctuation",
-      "Pattern": "\\W",
-      "ColorDark": "#CC0066",
-      "ColorLight": "#990033"
-    },
-    {
-      "Description": "operators",
-      "Pattern": "(\\+|\\-|\\*|/|%|\\=|\\:|\\!|>|\\<|\\?|&|\\||\\~|\\^)",
-      "ColorDark": "#77FF77",
-      "ColorLight": "#77FF77"
-    },
-    {
-      "Description": "-/+ floating numbers",
-      "Pattern": "\\b([+-]?(?=\\.\\d|\\d)(?:\\d+)?(?:\\.?\\d*))(?:[eE]([+-]?\\d+))?\\b",
-      "ColorDark": "#ff00ff",
-      "ColorLight": "#ff00ff"
-    },
-    {
-      "Description": "functions",
-      "Pattern": "(?<!(def\\s))(?<=^|\\s|.)[a-zA-Z_][\\w_]*(?=\\()",
-      "ColorDark": "#ffbb00",
-      "ColorLight": "#880088"
-    },
-    {
-      "Description": "keywords",
-      "Pattern": "\\b(goto|in|instanceof|static|arguments|public|do|else|const|function|class|return|let|eval|for|if|this|break|debugger|yield|extends|enum|continue|export|null|switch|private|new|throw|while|case|await|delete|super|default|void|var|protected|package|interface|false|typeof|implements|with|import|true)\\b",
-      "ColorDark": "#00ffff",
-      "ColorLight": "#0066bb"
-    },
-    {
-      "Description": "something else",
-      "Pattern": "\\b(document|window|screen)\\b",
-      "ColorDark": "#33BB00",
-      "ColorLight": "#008000"
-    },
-    {
-      "Description": "try/catch/finally",
-      "Pattern": "\\b(try|catch|finally)\\b",
-      "ColorDark": "#6666ff",
-      "ColorLight": "#9922ff"
-    },
-    {
-      "Description": "regex patterns",
-      "Pattern": "/[^\\n]*/i{0,1}",
-      "ColorDark": "#FFFF00",
-      "ColorLight": "#FFFF00"
-    },
-    {
-      "Description": "strings",
-      "Pattern": "[\"'][^\\n]*?[\"']",
-      "ColorDark": "#00FF00",
-      "ColorLight": "#ff5500"
-    },
-    {
-      "Description": "multiline comments",
-      "Pattern": "/\\*[^*]*\\*+(?:[^/*][^*]*\\*+)*/",
-      "ColorDark": "#646464",
-      "ColorLight": "#888888"
-    },
-    {
-      "Description": "single line comment",
-      "Pattern": "//(.*?)\\r?\\n",
-      "ColorDark": "#646464",
-      "ColorLight": "#888888"
-    }
-  ],
-  "Name": "Javascript",
-  "Filter": ".js",
-  "Description": "Syntaxhighlighting for Javascript language.",
-  "Author": "Finn Freitag"
-}
\ No newline at end of file
diff --git a/TextControlBox/Languages/Json.json b/TextControlBox/Languages/Json.json
deleted file mode 100644
index 211f0dc..0000000
--- a/TextControlBox/Languages/Json.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "Highlights": [
-    {
-      //-/+ floating numbers
-      "Pattern": "\\b([+-]?(?=\\.\\d|\\d)(?:\\d+)?(?:\\.?\\d*))(?:[eE]([+-]?\\d+))?\\b",
-      "ColorDark": "#ff00ff",
-      "ColorLight": "#dd00dd"
-    },
-    {
-      //null, true, false
-      "Pattern": "(null|true|false)",
-      "ColorDark": "#0099ff",
-      "ColorLight": "#00AADD"
-    },
-    {
-      //Brackets
-      "Pattern": "(,|{|}|\\[|\\])",
-      "ColorDark": "#646464",
-      "ColorLight": "#969696"
-    },
-    {
-      "Pattern": "(\".+\")\\:",
-      "ColorDark": "#dddd00",
-      "ColorLight": "#00CA00"
-    },
-    {
-      //Comment multiline /**/
-      "Pattern": "/\\*[^*]*\\*+(?:[^/*][^*]*\\*+)*/",
-      "ColorDark": "#646464",
-      "ColorLight": "#888888"
-    },
-    {
-      //Comment singleline //
-      "Pattern": "//(.*?)\\r?\\n",
-      "ColorDark": "#646464",
-      "ColorLight": "#888888"
-    },
-    {
-      //strings: ''
-      "Pattern": "'[^\\n]*?'",
-      "ColorDark": "#00FF00",
-      "ColorLight": "#00CA00"
-    },
-    {
-      //strings: ""
-      "Pattern": "\"[^\\n]*?\"",
-      "ColorDark": "#00FF00",
-      "ColorLight": "#00CA00"
-    }
-  ],
-  "Name": "Json",
-  "Description": "Syntax highlighting for Json language",
-  "Filter":  ".json",
-  "Author": "Julius Kirsch"
-}
\ No newline at end of file
diff --git a/TextControlBox/Languages/Languages.cs b/TextControlBox/Languages/Languages.cs
new file mode 100644
index 0000000..fe8ceb4
--- /dev/null
+++ b/TextControlBox/Languages/Languages.cs
@@ -0,0 +1,283 @@
+using TextControlBox.Renderer;
+
+namespace TextControlBox.Languages
+{
+    internal class Batch : CodeLanguage
+    {
+        public Batch()
+        {
+            this.Name = "Batch";
+            this.Author = "Julius Kirsch";
+            this.Filter = new string[1] { ".bat" };
+            this.Description = "Syntax highlighting for Batch language";
+            this.Highlights = new SyntaxHighlights[]
+            {
+                new SyntaxHighlights("\\b([+-]?(?=\\.\\d|\\d)(?:\\d+)?(?:\\.?\\d*))(?:[eE]([+-]?\\d+))?\\b", "#dd00dd", "#ff00ff"),
+                new SyntaxHighlights("(?i)(set|echo|for|pushd|popd|pause|exit|cd|if|else|goto|del)\\s", "#dd00dd", "#dd00dd"),
+                new SyntaxHighlights("(:.*)", "#00C000", "#ffff00"),
+                new SyntaxHighlights("(\\\".+?\\\"|\\'.+?\\')", "#00C000", "#ffff00"),
+                new SyntaxHighlights("(@|%)", "#dd0077", "#dd0077"),
+                new SyntaxHighlights("(\\*)", "#dd0077", "#dd0077"),
+                new SyntaxHighlights("((?i)rem.*)", "#888888", "#888888"),
+            };
+        }
+    }
+    internal class ConfigFile : CodeLanguage
+    {
+        public ConfigFile()
+        {
+            this.Name = "ConfigFile";
+            this.Author = "Finn Freitag";
+            this.Filter = new string[1] { ".ini" };
+            this.Description = "Syntax highlighting for configuration files";
+            this.Highlights = new SyntaxHighlights[]
+            {
+                new SyntaxHighlights("[\\[\\]]", "#0000FF", "#0000FF"),
+                new SyntaxHighlights("\\[[\\t\\s]*(\\w+)[\\t\\s]*\\]", "#9900FF", "#9900FF"),
+                new SyntaxHighlights("(\\w+)\\=", "#DDDD00", "#DDDD00"),
+                new SyntaxHighlights("\\=(.+)", "#EE0000", "#EE0000"),
+                new SyntaxHighlights(";.*", "#888888", "#888888"),
+            };
+        }
+    }
+    internal class Cpp : CodeLanguage
+    {
+        public Cpp()
+        {
+            this.Name = "C++";
+            this.Author = "Julius Kirsch";
+            this.Filter = new string[6] { ".cpp", ".cxx", ".cc", ".hpp", ".h", ".c" };
+            this.Description = "Syntax highlighting for C++ language";
+            this.Highlights = new SyntaxHighlights[]
+            {
+                new SyntaxHighlights("\\b([+-]?(?=\\.\\d|\\d)(?:\\d+)?(?:\\.?\\d*))(?:[eE]([+-]?\\d+))?\\b", "#dd00dd", "#00ff00"),
+                new SyntaxHighlights("(?<!(def\\s))(?<=^|\\s|.)[a-zA-Z_][\\w_]*(?=\\()", "#4455ff", "#ffbb00"),
+                new SyntaxHighlights("\\b(string|uint16_t|uint8_t|alignas|alignof|and|and_eq|asm|auto|bitand|bitor|bool|break|case|catch|char|char8_t|char16_t|char32_t|class|compl|concept|const|const_cast|consteval|constexpr|constinit|continue|co_await|co_return|co_yield|decltype|default|delete|do|double|dynamic_cast|else|enum|explicit|export|extern|false|float|for|friend|goto|if|inline|int|long|mutable|namespace|new|noexcept|not|not_eq|nullptr|operator|or|or_eq|private|protected|public|register|reinterpret_cast|requires|return|short|signed|sizeof|static|static_assert|static_cast|struct|switch|template|this|thread_local|throw|true|try|typedef|typeid|typename|union|unsigned|using|virtual|void|volatile|wchar_t|while|xor|xor_eq)\\b", "#dd00dd", "#dd00dd"),
+                new SyntaxHighlights("\\B#(define|elif|else|endif|error|ifndef|ifdef|if|import|include|line|pragma|region|undef|using)", "#bbbbbb", "#999999"),
+                new SyntaxHighlights("(\\\".+?\\\"|\\'.+?\\')", "#ffff00", "#ff000f"),
+                new SyntaxHighlights("\"[^\\n]*?\"", "#00CA00", "#00FF00"),
+                new SyntaxHighlights("'[^\\n]*?'", "#00CA00", "#00FF00"),
+                new SyntaxHighlights("/\\*[^*]*\\*+(?:[^/*][^*]*\\*+)*/", "#888888", "#ff0000"),
+                new SyntaxHighlights("//(.*?)\\r?\\n", "#888888", "#646464"),
+            };
+        }
+    }
+    internal class CSharp : CodeLanguage
+    {
+        public CSharp()
+        {
+            this.Name = "C#";
+            this.Author = "Julius Kirsch";
+            this.Filter = new string[1] { ".cs" };
+            this.Description = "Syntax highlighting for C# language";
+            this.Highlights = new SyntaxHighlights[]
+            {
+                new SyntaxHighlights("\\b([+-]?(?=\\.\\d|\\d)(?:\\d+)?(?:\\.?\\d*))(?:[eE]([+-]?\\d+))?\\b", "#ff00ff", "#ff00ff"),
+                new SyntaxHighlights("(?<!(def\\s))(?<=^|\\s|.)[a-zA-Z_][\\w_]*(?=\\()", "#880088", "#ffbb00"),
+                new SyntaxHighlights("\\b(abstract|as|base|bool|break|byte|case|catch|char|checked|class|const|continue|decimal|default|delegate|do|double|else|enum|event|explicit|extern|external|false|final|finally|fixed|float|for|foreach|get|goto|if|implicit|in|int|interface|internal|is|lock|long|namespace|new|null|object|operator|out|override|params|partial|private|protected|public|readonly|ref|return|sbyte|sealed|set|short|sizeof|stackalloc|static|string|struct|switch|this|throw|true|try|typeof|uint|ulong|unchecked|unsafe|ushort|using|value|var|virtual|void|volatile|while)\\b", "#0066bb", "#00ffff"),
+                new SyntaxHighlights("\\b(List|Color|Console|Debug|Dictionary|Stack|Queue|GC)\\b", "#008000", "#ff9900"),
+                new SyntaxHighlights("\\b(try|catch|finally)\\b", "#9922ff", "#6666ff"),
+                new SyntaxHighlights("(#region)+(.*?)($|\n)", "#ff0000", "#ff0000", true),
+                new SyntaxHighlights("#endregion", "#ff0000", "#ff0000", true),
+                new SyntaxHighlights("\"[^\\n]*?\"", "#ff5500", "#00FF00"),
+                new SyntaxHighlights("'[^\\n]*?'", "#00CA00", "#00FF00"),
+                new SyntaxHighlights("/\\*[^*]*\\*+(?:[^/*][^*]*\\*+)*/", "#888888", "#646464"),
+                new SyntaxHighlights("//(.*?)\\r?\\n", "#888888", "#646464"),
+            };
+        }
+    }
+    internal class GCode : CodeLanguage
+    {
+        public GCode()
+        {
+            this.Name = "GCode";
+            this.Author = "Julius Kirsch";
+            this.Filter = new string[5] { ".ngc", ".tap", ".gcode", ".nc", ".cnc" };
+            this.Description = "Syntax highlighting for GCode language";
+            this.Highlights = new SyntaxHighlights[]
+            {
+                new SyntaxHighlights("\\bY(?=([0-9]|(\\+|\\-)[0-9]))", "#00ff00", "#00ff00"),
+                new SyntaxHighlights("\\bX(?=([0-9]|(\\+|\\-)[0-9]))", "#ff0000", "#ff0000"),
+                new SyntaxHighlights("\\bZ(?=([0-9]|(\\+|\\-)[0-9]))", "#0077ff", "#0077ff"),
+                new SyntaxHighlights("\\bA(?=([0-9]|(\\+|\\-)[0-9]))", "#ff00ff", "#ff00ff"),
+                new SyntaxHighlights("\\b(E|F)(?=([0-9]|(\\+|\\-)[0-9]))", "#ffAA00", "#ffAA00"),
+                new SyntaxHighlights("\\b(S|T)(?=([0-9]|(\\+|\\-)[0-9]))", "#ffff00", "#ffff00"),
+                new SyntaxHighlights("([+-]?(?=\\.\\d|\\d)(?:\\d+)?(?:\\.?\\d*))(?:[eE]([+-]?\\d+))?", "#ff00ff", "#9f009f"),
+                new SyntaxHighlights("[G|M][0-999].*?[\\s|\\n]", "#00aaaa", "#00ffff"),
+                new SyntaxHighlights("(;|\\/\\/|\\brem\\b).*", "#888888", "#888888"),
+            };
+        }
+    }
+    internal class HexFile : CodeLanguage
+    {
+        public HexFile()
+        {
+            this.Name = "HexFile";
+            this.Author = "Finn Freitag";
+            this.Filter = new string[2] { ".hex", ".bin" };
+            this.Description = "Syntaxhighlighting for hex and binary code.";
+            this.Highlights = new SyntaxHighlights[]
+            {
+                new SyntaxHighlights("\\:", "#FFFF00", "#FFFF00"),
+                new SyntaxHighlights("\\:([0-9A-Fa-f]{2})", "#00FF00", "#00FF00"),
+                new SyntaxHighlights("\\:[0-9A-Fa-f]{2}([0-9A-Fa-f]{4})", "#00FF00", "#00FF00"),
+                new SyntaxHighlights("\\:[0-9A-Fa-f]{6}([0-9A-Fa-f]{2})", "#FF5500", "#FF5500"),
+                new SyntaxHighlights("\\:[0-9A-Fa-f]{8}([0-9A-Fa-f]*)[0-9A-Fa-f]{2}", "#00FFFF", "#00FFFF"),
+                new SyntaxHighlights("\\:[0-9A-Fa-f]{8}[0-9A-Fa-f]*([0-9A-Fa-f]{2})", "#666666", "#666666"),
+                new SyntaxHighlights("//.*", "#666666", "#666666"),
+                new SyntaxHighlights("[^0-9A-Fa-f\\:\\n]", "#FF0000", "#FF0000", false, false, true),
+            };
+        }
+    }
+    internal class Html : CodeLanguage
+    {
+        public Html()
+        {
+            this.Name = "Html";
+            this.Author = "Julius Kirsch";
+            this.Filter = new string[2] { ".html", ".htm" };
+            this.Description = "Syntax highlighting for Html language";
+            this.Highlights = new SyntaxHighlights[]
+            {
+                new SyntaxHighlights("\\b([+-]?(?=\\.\\d|\\d)(?:\\d+)?(?:\\.?\\d*))(?:[eE]([+-]?\\d+))?\\b", "#dd00dd", "#ff00ff"),
+                new SyntaxHighlights("[-A-Za-z_]+\\=", "#00CA00", "#Ff0000"),
+                new SyntaxHighlights("<+[a-zA-Z0-9:]+>", "#00AADD", "#0099ff"),
+                new SyntaxHighlights("[<]+[a-zA-Z0-9:]+\\s", "#969696", "#0099ff"),
+                new SyntaxHighlights("<+[/]+[a-zA-Z0-9:]+>", "#969696", "#0099ff"),
+                new SyntaxHighlights("\"[^\\n]*?\"", "#00CA00", "#00FF00"),
+                new SyntaxHighlights("'[^\\n]*?'", "#00CA00", "#00FF00"),
+                new SyntaxHighlights("[0-9]+(px|rem|em|vh|vw|px|pt|pc|in|mm|cm|deg|%)", "#ff00ff", "#dd00dd"),
+                new SyntaxHighlights("<!--[\\s\\S]*?-->", "#888888", "#888888"),
+            };
+        }
+    }
+    internal class Java : CodeLanguage
+    {
+        public Java()
+        {
+            this.Name = "Java";
+            this.Author = "Julius Kirsch";
+            this.Filter = new string[2] { ".java", ".class" };
+            this.Description = "Syntax highlighting for Java language";
+            this.Highlights = new SyntaxHighlights[]
+            {
+                new SyntaxHighlights("\\b([+-]?(?=\\.\\d|\\d)(?:\\d+)?(?:\\.?\\d*))(?:[eE]([+-]?\\d+))?\\b", "#ff00ff", "#ff00ff"),
+                new SyntaxHighlights("(?<!(def\\s))(?<=^|\\s|.)[a-zA-Z_][\\w_]*(?=\\()", "#880088", "#ffbb00"),
+                new SyntaxHighlights("\\b(System.out|System|Math)\\b", "#008000", "#ff9900"),
+                new SyntaxHighlights("\\b(abstract|assert|boolean|break|byte|case|catch|char|class|const|continue|default|do|double|else|enum|extends|final|finally|float|for|goto|if|implements|import|instanceof|int|interface|long|native|new|package|private|protected|public|return|short|static|super|switch|synchronized|this|throw|throws|transient|try|void|volatile|while|exports|modle|non-sealed|open|opens|permits|provides|record|requires|sealed|to|transitive|uses|var|with|yield|true|false|null)\\b", "#0066bb", "#00ffff"),
+                new SyntaxHighlights("\"[^\\n]*?\"", "#ff5500", "#00FF00"),
+                new SyntaxHighlights("'[^\\n]*?'", "#00CA00", "#00FF00"),
+                new SyntaxHighlights("/\\*[^*]*\\*+(?:[^/*][^*]*\\*+)*/", "#888888", "#646464"),
+                new SyntaxHighlights("//(.*?)\\r?\\n", "#888888", "#646464"),
+            };
+        }
+    }
+    internal class Javascript : CodeLanguage
+    {
+        public Javascript()
+        {
+            this.Name = "Javascript";
+            this.Author = "Finn Freitag";
+            this.Filter = new string[1] { ".js" };
+            this.Description = "Syntax highlighting for Javascript language";
+            this.Highlights = new SyntaxHighlights[]
+            {
+                new SyntaxHighlights("\\W", "#990033", "#CC0066"),
+                new SyntaxHighlights("(\\+|\\-|\\*|/|%|\\=|\\:|\\!|>|\\<|\\?|&|\\||\\~|\\^)", "#77FF77", "#77FF77"),
+                new SyntaxHighlights("\\b([+-]?(?=\\.\\d|\\d)(?:\\d+)?(?:\\.?\\d*))(?:[eE]([+-]?\\d+))?\\b", "#ff00ff", "#ff00ff"),
+                new SyntaxHighlights("(?<!(def\\s))(?<=^|\\s|.)[a-zA-Z_][\\w_]*(?=\\()", "#880088", "#ffbb00"),
+                new SyntaxHighlights("\\b(goto|in|instanceof|static|arguments|public|do|else|const|function|class|return|let|eval|for|if|this|break|debugger|yield|extends|enum|continue|export|null|switch|private|new|throw|while|case|await|delete|super|default|void|var|protected|package|interface|false|typeof|implements|with|import|true)\\b", "#0066bb", "#00ffff"),
+                new SyntaxHighlights("\\b(document|window|screen)\\b", "#008000", "#33BB00"),
+                new SyntaxHighlights("\\b(try|catch|finally)\\b", "#9922ff", "#6666ff"),
+                new SyntaxHighlights("/[^\\n]*/i{0,1}", "#FFFF00", "#FFFF00"),
+                new SyntaxHighlights("[\"'][^\\n]*?[\"']", "#ff5500", "#00FF00"),
+                new SyntaxHighlights("/\\*[^*]*\\*+(?:[^/*][^*]*\\*+)*/", "#888888", "#646464"),
+                new SyntaxHighlights("//(.*?)\\r?\\n", "#888888", "#646464"),
+            };
+        }
+    }
+    internal class Json : CodeLanguage
+    {
+        public Json()
+        {
+            this.Name = "Json";
+            this.Author = "Julius Kirsch";
+            this.Filter = new string[1] { ".json" };
+            this.Description = "Syntax highlighting for Json language";
+            this.Highlights = new SyntaxHighlights[]
+            {
+                new SyntaxHighlights("\\b([+-]?(?=\\.\\d|\\d)(?:\\d+)?(?:\\.?\\d*))(?:[eE]([+-]?\\d+))?\\b", "#dd00dd", "#ff00ff"),
+                new SyntaxHighlights("(null|true|false)", "#00AADD", "#0099ff"),
+                new SyntaxHighlights("(,|{|}|\\[|\\])", "#969696", "#646464"),
+                new SyntaxHighlights("(\".+\")\\:", "#00CA00", "#dddd00"),
+                new SyntaxHighlights("/\\*[^*]*\\*+(?:[^/*][^*]*\\*+)*/", "#888888", "#646464"),
+                new SyntaxHighlights("//(.*?)\\r?\\n", "#888888", "#646464"),
+                new SyntaxHighlights("'[^\\n]*?'", "#00CA00", "#00FF00"),
+                new SyntaxHighlights("\"[^\\n]*?\"", "#00CA00", "#00FF00"),
+            };
+        }
+    }
+    internal class PHP : CodeLanguage
+    {
+        public PHP()
+        {
+            this.Name = "PHP";
+            this.Author = "Finn Freitag";
+            this.Filter = new string[1] { ".php" };
+            this.Description = "Syntax highlighting for PHP language";
+            this.Highlights = new SyntaxHighlights[]
+            {
+                new SyntaxHighlights("\\<\\?php", "#FF0000", "#FF0000"),
+                new SyntaxHighlights("\\?\\>", "#FF0000", "#FF0000"),
+                new SyntaxHighlights("(?<!(def\\s))(?<=^|\\s|.)[a-zA-Z_][\\w_]*(?=\\()", "#3300FF", "#aa00FF"),
+                new SyntaxHighlights("\\b(echo|if|case|while|else|switch|foreach|function|default|break|null|true|false)\\b", "#0077FF", "#0077FF"),
+                new SyntaxHighlights("\\b([+-]?(?=\\.\\d|\\d)(?:\\d+)?(?:\\.?\\d*))(?:[eE]([+-]?\\d+))?\\b", "#ff00ff", "#ff00ff"),
+                new SyntaxHighlights("(\\+|\\-|\\*|/|%|\\=|\\:|\\!|>|\\<|\\?|&|\\||\\~|\\^)", "#77FF77", "#77FF77"),
+                new SyntaxHighlights("\\$\\w+", "#440044", "#FFBBFF"),
+                new SyntaxHighlights("\"[^\\n]*?\"", "#ff5500", "#00FF00"),
+                new SyntaxHighlights("\\'[^\\n]*?\\'", "#ff5500", "#00FF00"),
+                new SyntaxHighlights("\"/[^\\n]*/i{0,1}\"", "#ff5500", "#00FF00"),
+                new SyntaxHighlights("/\\*[^*]*\\*+(?:[^/*][^*]*\\*+)*/", "#888888", "#646464"),
+                new SyntaxHighlights("//(.*?)\\r?\\n", "#888888", "#646464"),
+            };
+        }
+    }
+    internal class QSharp : CodeLanguage
+    {
+        public QSharp()
+        {
+            this.Name = "QSharp";
+            this.Author = "Finn Freitag";
+            this.Filter = new string[1] { ".qs" };
+            this.Description = "Syntax highlighting for QSharp language";
+            this.Highlights = new SyntaxHighlights[]
+            {
+                new SyntaxHighlights("\\W", "#BB0000", "#BB0000"),
+                new SyntaxHighlights("//(.*?)\\r?\\n", "#888888", "#646464"),
+                new SyntaxHighlights("\\b(namespace|open|operation|using|let|H|M|Reset|return)\\b", "#0066bb", "#00ffff"),
+                new SyntaxHighlights("\\b(Qubit|Result)\\b", "#00bb66", "#00ff00"),
+            };
+        }
+    }
+    internal class XML : CodeLanguage
+    {
+        public XML()
+        {
+            this.Name = "XML";
+            this.Author = "Julius Kirsch";
+            this.Filter = new string[2] { ".xml", ".xaml" };
+            this.Description = "Syntax highlighting for Xml language";
+            this.Highlights = new SyntaxHighlights[]
+            {
+                new SyntaxHighlights("\\b([+-]?(?=\\.\\d|\\d)(?:\\d+)?(?:\\.?\\d*))(?:[eE]([+-]?\\d+))?\\b", "#dd00dd", "#ff00ff"),
+                new SyntaxHighlights("<([^ >!\\/]+)[^>]*>", "#969696", "#0099ff"),
+                new SyntaxHighlights("<+[/]+[a-zA-Z0-9:?\\-]+>", "#969696", "#0099ff"),
+                new SyntaxHighlights("<[a-zA-Z0-9:?\\-]+?.*\\/>", "#969696", "#0099ff"),
+                new SyntaxHighlights("[-A-Za-z_]+\\=", "#00CA00", "#Ff0000"),
+                new SyntaxHighlights("\"[^\\n]*?\"", "#00CA00", "#00FF00"),
+                new SyntaxHighlights("'[^\\n]*?'", "#00CA00", "#00FF00"),
+                new SyntaxHighlights("<!--[\\s\\S]*?-->", "#888888", "#888888"),
+            };
+        }
+    }
+}
diff --git a/TextControlBox/Languages/PHP.json b/TextControlBox/Languages/PHP.json
deleted file mode 100644
index de0d693..0000000
--- a/TextControlBox/Languages/PHP.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-  "Highlights": [
-    {
-      "Description": "php start",
-      "Pattern": "\\<\\?php",
-      "ColorDark": "#FF0000",
-      "ColorLight": "#FF0000"
-    },
-    {
-      "Description": "php end",
-      "Pattern": "\\?\\>",
-      "ColorDark": "#FF0000",
-      "ColorLight": "#FF0000"
-    },
-    {
-      "Description": "functions",
-      "Pattern": "(?<!(def\\s))(?<=^|\\s|.)[a-zA-Z_][\\w_]*(?=\\()",
-      "ColorDark": "#aa00FF",
-      "ColorLight": "#3300FF"
-    },
-    {
-      "Description": "keywords",
-      "Pattern": "\\b(echo|if|case|while|else|switch|foreach|function|default|break|null|true|false)\\b",
-      "ColorDark": "#0077FF",
-      "ColorLight": "#0077FF"
-    },
-
-    {
-      "Description": "-/+ floating numbers",
-      "Pattern": "\\b([+-]?(?=\\.\\d|\\d)(?:\\d+)?(?:\\.?\\d*))(?:[eE]([+-]?\\d+))?\\b",
-      "ColorDark": "#ff00ff",
-      "ColorLight": "#ff00ff"
-    },
-    {
-      "Description": "operators",
-      "Pattern": "(\\+|\\-|\\*|/|%|\\=|\\:|\\!|>|\\<|\\?|&|\\||\\~|\\^)",
-      "ColorDark": "#77FF77",
-      "ColorLight": "#77FF77"
-    },
-
-    {
-      "Description": "variables",
-      "Pattern": "\\$\\w+",
-      "ColorDark": "#FFBBFF",
-      "ColorLight": "#440044"
-    },
-    {
-      "Description": "strings",
-      "Pattern": "\"[^\\n]*?\"",
-      "ColorDark": "#00FF00",
-      "ColorLight": "#ff5500"
-    },
-    {
-      "Description": "strings",
-      "Pattern": "\\'[^\\n]*?\\'",
-      "ColorDark": "#00FF00",
-      "ColorLight": "#ff5500"
-    },
-    {
-      "Description": "regular expressions",
-      "Pattern": "\"/[^\\n]*/i{0,1}\"",
-      "ColorDark": "#00FF00",
-      "ColorLight": "#ff5500"
-    },
-    {
-      "Description": "multiline comments",
-      "Pattern": "/\\*[^*]*\\*+(?:[^/*][^*]*\\*+)*/",
-      "ColorDark": "#646464",
-      "ColorLight": "#888888"
-    },
-    {
-      "Description": "single line comment",
-      "Pattern": "//(.*?)\\r?\\n",
-      "ColorDark": "#646464",
-      "ColorLight": "#888888"
-    }
-  ],
-  "Name": "PHP",
-  "Filter": ".php",
-  "Description": "Syntaxhighlighting for PHP language.",
-  "Author": "Finn Freitag"
-}
\ No newline at end of file
diff --git a/TextControlBox/Languages/QSharp.json b/TextControlBox/Languages/QSharp.json
deleted file mode 100644
index a7627af..0000000
--- a/TextControlBox/Languages/QSharp.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-    "Highlights": [
-        {
-            "Description": "punctuation",
-            "Pattern": "\\W",
-            "ColorDark": "#BB0000",
-            "ColorLight": "#BB0000"
-        },
-        {
-            "Description": "comment",
-            "Pattern": "//(.*?)\\r?\\n",
-            "ColorDark": "#646464",
-            "ColorLight": "#888888"
-        },
-        {
-            "Description": "keywords",
-            "Pattern": "\\b(namespace|open|operation|using|let|H|M|Reset|return)\\b",
-            "ColorDark": "#00ffff",
-            "ColorLight": "#0066bb"
-        },
-        {
-            "Description": "classes",
-            "Pattern": "\\b(Qubit|Result)\\b",
-            "ColorDark": "#00ff00",
-            "ColorLight": "#00bb66"
-        }
-    ],
-    "Name": "QSharp",
-    "Filter": ".qs",
-    "Description": "Syntaxhighlighting for QSharp language.",
-    "Author": "Finn Freitag"
-}
\ No newline at end of file
diff --git a/TextControlBox/Languages/Xml.json b/TextControlBox/Languages/Xml.json
deleted file mode 100644
index 0dca509..0000000
--- a/TextControlBox/Languages/Xml.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-  "Highlights": [
-    {
-      //-/+ floating numbers
-      "Pattern": "\\b([+-]?(?=\\.\\d|\\d)(?:\\d+)?(?:\\.?\\d*))(?:[eE]([+-]?\\d+))?\\b",
-      "ColorDark": "#ff00ff",
-      "ColorLight": "#dd00dd"
-    },
-    {
-      //Opening tag
-      "Pattern": "<([^ >!\/]+)[^>]*>",
-      "ColorDark": "#0099ff",
-      "ColorLight": "#969696"
-    },
-    {
-      //Closing tag
-      "Pattern": "<+[/]+[a-zA-Z0-9:?\\-]+>",
-      "ColorDark": "#0099ff",
-      "ColorLight": "#969696"
-    },
-    {
-      //Open-closing tag (oneline)
-      "Pattern": "<[a-zA-Z0-9:?\\-]+?.*\\/>",
-      "ColorDark": "#0099ff",
-      "ColorLight": "#969696"
-    },
-    {
-      //Keywords
-      "Pattern": "[-A-Za-z_]+\\=",
-      "ColorDark": "#Ff0000",
-      "ColorLight": "#00CA00"
-    },
-    {
-      //strings: "TEST"
-      "Pattern": "\"[^\\n]*?\"",
-      "ColorDark": "#00FF00",
-      "ColorLight": "#00CA00"
-    },
-    {
-      //strings: 'TEST'
-      "Pattern": "'[^\\n]*?'",
-      "ColorDark": "#00FF00",
-      "ColorLight": "#00CA00"
-    },
-    {
-      //Comment multiline /**/
-      "Pattern": "<!--[\\s\\S]*?-->",
-      "ColorDark": "#888888",
-      "ColorLight": "#888888"
-    }
-  ],
-  "Name": "Xml",
-  "Filter": ".xml|.xaml",
-  "Description": "Syntax highlighting for Xml language",
-  "Author": "Julius Kirsch"
-}
\ No newline at end of file
diff --git a/TextControlBox/TextControlBox.csproj b/TextControlBox/TextControlBox.csproj
index 2eabd51..5ef7311 100644
--- a/TextControlBox/TextControlBox.csproj
+++ b/TextControlBox/TextControlBox.csproj
@@ -132,6 +132,7 @@
     <Compile Include="Helper\FlyoutHelper.cs" />
     <Compile Include="Helper\SearchHelper.cs" />
     <Compile Include="Helper\TabSpaceHelper.cs" />
+    <Compile Include="Languages\Languages.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Helper\DebugHelper.cs" />
     <Compile Include="Helper\ListHelper.cs" />
@@ -178,35 +179,6 @@
       <SubType>Designer</SubType>
     </Page>
   </ItemGroup>
-  <ItemGroup>
-    <Content Include="Languages\CSharp.json" />
-    <Content Include="Languages\Html.json" />
-    <Content Include="Languages\Json.json" />
-    <Content Include="Languages\QSharp.json" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Languages\GCode.json" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Languages\Batch.json" />
-    <Content Include="Languages\Cpp.json" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Languages\ConfigFile.json" />
-    <Content Include="Languages\PHP.json" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Languages\Hex.json" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Languages\Javascript.json" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Languages\Java.json" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Languages\Xml.json" />
-  </ItemGroup>
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
     <VisualStudioVersion>14.0</VisualStudioVersion>
   </PropertyGroup>
diff --git a/TextControlBox/TextControlBox.xaml.cs b/TextControlBox/TextControlBox.xaml.cs
index 4eaf59c..928ea1b 100644
--- a/TextControlBox/TextControlBox.xaml.cs
+++ b/TextControlBox/TextControlBox.xaml.cs
@@ -15,14 +15,15 @@
 using System.Threading.Tasks;
 using TextControlBox.Extensions;
 using TextControlBox.Helper;
+using TextControlBox.Languages;
 using TextControlBox.Renderer;
 using TextControlBox.Text;
 using Windows.ApplicationModel.DataTransfer;
 using Windows.Foundation;
-using Windows.Networking.Vpn;
 using Windows.Storage;
 using Windows.System;
 using Windows.UI.Core;
+using Windows.UI.Popups;
 using Windows.UI.Text.Core;
 using Windows.UI.ViewManagement;
 using Windows.UI.Xaml;
@@ -30,8 +31,6 @@
 using Windows.UI.Xaml.Controls.Primitives;
 using Windows.UI.Xaml.Input;
 using Windows.UI.Xaml.Media;
-using Windows.UI.Xaml.Shapes;
-using static System.Net.Mime.MediaTypeNames;
 using Color = Windows.UI.Color;
 
 namespace TextControlBox
@@ -2610,43 +2609,36 @@ public ScrollBarPosition ScrollBarPosition
 
         #region Static functions
         //static functions
-        private static void GetLanguagesFromBuffer()
-        {
-            _CodeLanguages = new Dictionary<string, CodeLanguage>();
-
-            var files = Directory.GetFiles("TextControlBox/Languages");
-            for (int i = 0; i < files.Length; i++)
-            {
-                var result = SyntaxHighlightingRenderer.GetCodeLanguageFromJson(File.ReadAllText(files[i]));
-                if(result.Succeed)
-                    _CodeLanguages.Add(result.CodeLanguage.Name.ToLower(), result.CodeLanguage);
-            }
-        }
-        private static Dictionary<string, CodeLanguage> _CodeLanguages = null;
-
         /// <summary>
-        /// Get all the builtin codelanguages for syntaxhighlighting
+        /// Get all the builtin code languages for syntaxhighlighting
         /// </summary>
-        public static Dictionary<string, CodeLanguage> CodeLanguages
+        public static Dictionary<string, CodeLanguage> CodeLanguages => new Dictionary<string, CodeLanguage>(StringComparer.OrdinalIgnoreCase)
         {
-            get
-            {
-                if (_CodeLanguages == null)
-                    GetLanguagesFromBuffer();
-
-                return _CodeLanguages;
-            }
-        }
+            { "Batch", new Batch() },
+            { "ConfigFile", new ConfigFile() },
+            { "C++", new Cpp() },
+            { "C#", new CSharp() },
+            { "GCode", new GCode() },
+            { "HexFile", new HexFile() },
+            { "Html", new Html() },
+            { "Java", new Java() },
+            { "Javascript", new Javascript() },
+            { "Json", new Json() },
+            { "PHP", new PHP() },
+            { "QSharp", new QSharp() },
+            { "XML", new XML() },
+        };
 
         /// <summary>
         /// Get a CodeLanguage by the identifier from the list
         /// </summary>
         /// <param name="Identifier"></param>
-        /// <returns></returns>
+        /// <returns>When found the Codelanguage. Otherwise null</returns>
         public static CodeLanguage GetCodeLanguageFromId(string Identifier)
         {
-            CodeLanguages.TryGetValue(Identifier.ToLower(), out CodeLanguage codelanguage);
-            return codelanguage;
+            if(CodeLanguages.TryGetValue(Identifier, out CodeLanguage codelanguage))
+                return codelanguage;
+            return null;
         }
 
         /// <summary>