diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Resources/Boo.xshd b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Resources/Boo.xshd
index 2c8ae55d63..b3379ad764 100644
--- a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Resources/Boo.xshd
+++ b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Resources/Boo.xshd
@@ -192,7 +192,7 @@
 			<Word>of</Word>
 		</Keywords>
 		<Rule foreground="MidnightBlue">[\d\w_]+(?=(\s*\())</Rule>
-		<Rule foreground="DarkBlue">\b0[xX][0-9a-fA-F]+|\b(\d+(\.[0-9]+)?|\.[0-9]+)([eE][+-]?[0-9]+)?</Rule>
+		<Rule foreground="DarkBlue">\b0[xX][0-9a-fA-F]+|(\b\d+(\.[0-9]+)?|\.[0-9]+)([eE][+-]?[0-9]+)?</Rule>
 	</RuleSet>
 	<RuleSet name="comments set">
 		<!-- allows nested /**/ comments, coloring them Green/Teal alternately -->
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Resources/CSharp-Mode.xshd b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Resources/CSharp-Mode.xshd
index c01c049aea..026f79c0c3 100644
--- a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Resources/CSharp-Mode.xshd
+++ b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Resources/CSharp-Mode.xshd
@@ -102,8 +102,9 @@
 			</RuleSet>
 		</Span>
 		
-		<Rule color="Punctuation">
-			[?,.;()\[\]{}+\-/%*&lt;&gt;^+~!|&amp;]+
+		<!-- don't highlight "@int" as keyword -->
+		<Rule>
+			@[\w\d_]+
 		</Rule>
 		
 		<Keywords fontWeight="bold" foreground="Black">
@@ -268,11 +269,15 @@
 		<!-- Digits -->
 		<Rule color="NumberLiteral">
 			\b0[xX][0-9a-fA-F]+  # hex number
-		|	\b
-			(	\d+(\.[0-9]+)?   #number with optional floating point
-			|	\.[0-9]+         #or just starting with floating point
+		|	
+			(	\b\d+(\.[0-9]+)?   #number with optional floating point
+			|	\.[0-9]+           #or just starting with floating point
 			)
 			([eE][+-]?[0-9]+)? # optional exponent
 		</Rule>
+		
+		<Rule color="Punctuation">
+			[?,.;()\[\]{}+\-/%*&lt;&gt;^+~!|&amp;]+
+		</Rule>
 	</RuleSet>
 </SyntaxDefinition>
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Xshd/V1Loader.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Xshd/V1Loader.cs
index b95ae24f16..448fcfc4c0 100644
--- a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Xshd/V1Loader.cs
+++ b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Xshd/V1Loader.cs
@@ -69,8 +69,8 @@ namespace ICSharpCode.AvalonEdit.Highlighting.Xshd
 							ColorReference = GetColorReference(syntaxDefinition["Digits"]),
 							RegexType = XshdRegexType.IgnorePatternWhitespace,
 							Regex = @"\b0[xX][0-9a-fA-F]+"
-								+ @"|\b"
-								+ @"(\d+(" + floatingPoint + ")?"
+								+ @"|"
+								+ @"(\b\d+(" + floatingPoint + ")?"
 								+ @"|" + floatingPoint + ")"
 								+ optionalExponent
 						});