diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Resources/ModeV1.xsd b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Resources/ModeV1.xsd
index 81a79dc62f..82bce451db 100644
--- a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Resources/ModeV1.xsd
+++ b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Resources/ModeV1.xsd
@@ -43,6 +43,7 @@
 			<xsd:element name="VRuler" type="EnvironmentEntry" minOccurs="0" maxOccurs="1"/>
 			<xsd:element name="InvalidLines" type="EnvironmentEntry" minOccurs="0" maxOccurs="1"/>
 			<xsd:element name="CaretMarker" type="EnvironmentEntry" minOccurs="0" maxOccurs="1"/>
+			<xsd:element name="CaretLine" type="EnvironmentEntry" minOccurs="0" maxOccurs="1"/>
 			
 			<xsd:element name="LineNumbers" type="EnvironmentEntry" minOccurs="0" maxOccurs="1"/>
 			
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Xshd/XmlHighlightingDefinition.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Xshd/XmlHighlightingDefinition.cs
index eb84636e32..fe650967cf 100644
--- a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Xshd/XmlHighlightingDefinition.cs
+++ b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Xshd/XmlHighlightingDefinition.cs
@@ -8,6 +8,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
 
@@ -174,13 +175,21 @@ namespace ICSharpCode.AvalonEdit.Highlighting.Xshd
 			{
 				if (keywords.Words.Count == 0)
 					return Error(keywords, "Keyword group must not be empty.");
-				StringBuilder keyWordRegex = new StringBuilder(@"\b(");
-				for (int i = 0; i < keywords.Words.Count; i++) {
-					if (i > 0)
-						keyWordRegex.Append('|');
-					if (string.IsNullOrEmpty(keywords.Words[i]))
+				foreach (string keyword in keywords.Words) {
+					if (string.IsNullOrEmpty(keyword))
 						throw Error(keywords, "Cannot use empty string as keyword");
-					keyWordRegex.Append(Regex.Escape(keywords.Words[i]));
+				}
+				StringBuilder keyWordRegex = new StringBuilder(@"\b(?>");
+				// (?> = atomic group
+				// atomic groups increase matching performance, but we
+				// must ensure that the keywords are sorted correctly.
+				// "\b(?>in|int)\b" does not match "int" because the atomic group captures "in".
+				// To solve this, we are sorting the keywords by descending length.
+				int i = 0;
+				foreach (string keyword in keywords.Words.OrderByDescending(w=>w.Length)) {
+					if (i++ > 0)
+						keyWordRegex.Append('|');
+					keyWordRegex.Append(Regex.Escape(keyword));
 				}
 				keyWordRegex.Append(@")\b");
 				return new HighlightingRule {