diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Resources/Boo.xshd b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Resources/Boo.xshd
index d6da787ff8..2c8ae55d63 100644
--- a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Resources/Boo.xshd
+++ b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Resources/Boo.xshd
@@ -1,314 +1,210 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- &<>~!@$%^*()-+=|\#/{}[]:;"' , .?
-
-
- """
- """
-
-
-
- #
-
-
-
- //
-
-
-
- /*
- */
-
-
-
- "
- "
-
-
-
- """
- """
-
-
-
- '
- '
-
-
-
- @@/
- /
-
-
-
- /@! @@!/@
- /
-
-
- (
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- &<>~!@%^*()-+=|\#/{}[]:;"' , .?
-
-
- /*
- */
-
-
-
-
-
- &<>~!@%^*()-+=|\#/{}[]:;"' , .?
-
-
- /*
- */
-
-
-
-
-
- &<>~!@%^*()-+=|\#/{}[]:;"' , .?
-
-
- ${
- }
-
-
-
-
-
-
-
-
+
+
+
+
+
+ """
+ """
+
+
+ \#
+
+
+ //
+
+
+ /\*
+ \*/
+
+
+ "
+ "
+
+
+
+
+ \$\{
+ }
+
+
+
+
+ '
+ '
+
+
+
+
+
+ @/
+ /
+
+
+ /(?!(\ ))
+ /
+
+
+ self
+ super
+
+
+ is
+ isa
+ and
+ or
+ not
+
+
+ else
+ elif
+ if
+ match
+ case
+ unless
+ otherwise
+ for
+ in
+ while
+
+
+ break
+ continue
+ return
+ yield
+ goto
+
+
+ try
+ raise
+ ensure
+ except
+ retry
+ success
+
+
+ fixed
+ unsafe
+
+
+ bool
+ double
+ single
+ byte
+ sbyte
+ short
+ ushort
+ int
+ uint
+ long
+ ulong
+ date
+ timespan
+ decimal
+ char
+ object
+ duck
+ string
+ regex
+
+
+ void
+
+
+ cast
+ as
+
+
+ override
+ static
+ virtual
+ abstract
+ final
+ transient
+ partial
+
+
+ public
+ protected
+ private
+ internal
+
+
+ namespace
+ import
+ from
+
+
+ get
+ set
+
+
+ null
+ value
+ true
+ false
+ ast
+
+
+ using
+ unchecked
+ checked
+ lock
+ getter
+ required
+ rawArrayIndexing
+ normalArrayIndexing
+ yieldAll
+
+
+ assert
+ array
+ matrix
+ print
+ gets
+ prompt
+ enumerate
+ zip
+ filter
+ map
+ cat
+ __eval__
+ __switch__
+
+
+ constructor
+ destructor
+ def
+ include
+ event
+ ref
+
+
+ pass
+
+
+ enum
+ class
+ struct
+ interface
+ mixin
+ callable
+ do
+ of
+
+ [\d\w_]+(?=(\s*\())
+ \b0[xX][0-9a-fA-F]+|\b(\d+(\.[0-9]+)?|\.[0-9]+)([eE][+-]?[0-9]+)?
+
+
+
+
+ /\*
+ \*/
+
+
+ /\*
+ \*/
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Resources/XML-Mode.xshd b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Resources/XML-Mode.xshd
index bfdfeb6407..032def7740 100644
--- a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Resources/XML-Mode.xshd
+++ b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Resources/XML-Mode.xshd
@@ -6,7 +6,7 @@
-
+