diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Resources/CPP-Mode.xshd b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Resources/CPP-Mode.xshd
index 09c1a6a497..f552ad4136 100644
--- a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Resources/CPP-Mode.xshd
+++ b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Resources/CPP-Mode.xshd
@@ -1,236 +1,195 @@
-
-
-
-
-
-
-
-
-
-
-
-
- ~!%^*()-+=|\#/{}[]:;"'<> , .?
-
-
- #
-
-
-
- //
-
-
-
- /*
- */
-
-
-
- "
- "
-
-
-
- '
- '
-
-
- (
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ [?,.;()\[\]{}+\-/%*<>^=~!&]+
+
+
+ __abstract
+ __box
+ __delegate
+ __gc
+ __identifier
+ __nogc
+ __pin
+ __property
+ __sealed
+ __try_cast
+ __typeof
+ __value
+ __event
+ __hook
+ __raise
+ __unhook
+ __interface
+ ref class
+ ref struct
+ value class
+ value struct
+ interface class
+ interface struct
+ enum class
+ enum struct
+ delegate
+ event
+ property
+ abstract
+ override
+ sealed
+ generic
+ where
+ finally
+ for each
+ gcnew
+ in
+ initonly
+ literal
+ nullptr
+
+
+ this
+
+
+ and
+ and_eq
+ bitand
+ bitor
+ new
+ not
+ not_eq
+ or
+ or_eq
+ xor
+ xor_eq
+
+
+ using
+ namespace
+
+
+ friend
+
+
+ private
+ protected
+ public
+ const
+ volatile
+ static
+
+
+ bool
+ char
+ unsigned
+ union
+ virtual
+ double
+ float
+ short
+ signed
+ void
+ class
+ enum
+ struct
+
+
+ false
+ true
+
+
+ do
+ for
+ while
+
+
+ break
+ continue
+ goto
+ return
+
+
+ catch
+ throw
+ try
+
+
+ case
+ else
+ if
+ switch
+ default
+
+
+ asm
+ auto
+ compl
+ mutable
+ const_cast
+ delete
+ dynamic_cast
+ explicit
+ export
+ extern
+ inline
+ int
+ long
+ operator
+ register
+ reinterpret_cast
+ sizeof
+ static_cast
+ template
+ typedef
+ typeid
+ typename
+
+
+ \#
+
+
+ //
+
+
+ /\*
+ \*/
+
+
+ "
+ "
+
+
+
+
+
+ '
+ '
+
+
+
+
+ [\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/HTML-Mode.xshd b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Resources/HTML-Mode.xshd
index 5ca4ec47ac..e23d6a624d 100644
--- a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Resources/HTML-Mode.xshd
+++ b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Resources/HTML-Mode.xshd
@@ -1,385 +1,384 @@
-
-
-
-
-
-
-
-
-
-
-
-
- <!--
- -->
-
-
- <script>
- </script>
-
-
- <script lang="JavaScript">
- </script>
-
-
- <script lang="JScript">
- </script>
-
-
- <script lang="VBScript">
- </script>
-
-
- <script@C
- </script>
-
-
- <
- >
-
-
-
- &
- ;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- /=
-
-
- "
- "
-
-
-
- '
- '
-
-
- =
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <!--
+ -->
+
+
+ <script>
+ </script>
+
+
+ <script\ lang="JavaScript">
+ </script>
+
+
+ <script\ lang="JScript">
+ </script>
+
+
+ <script\ lang="VBScript">
+ </script>
+
+
+ <script[^\w\d_]
+ </script>
+
+
+ <
+ >
+
+
+ &
+ ;
+
+ \b0[xX][0-9a-fA-F]+|(\b\d+(\.[0-9]+)?|\.[0-9]+)([eE][+-]?[0-9]+)?
+
+
+
+ \b0[xX][0-9a-fA-F]+|(\b\d+(\.[0-9]+)?|\.[0-9]+)([eE][+-]?[0-9]+)?
+
+
+
+ aacute
+ agrave
+ acirc
+ amp
+ atilde
+ aring
+ auml
+ aelig
+ ccedil
+ copy
+ eacute
+ egrave
+ ecirc
+ euml
+ iacute
+ igrave
+ icirc
+ iuml
+ eth
+ gt
+ lt
+ nbsp
+ ntilde
+ oacute
+ ograve
+ ocirc
+ otilde
+ ouml
+ oslash
+ quot
+ reg
+ szlig
+ uacute
+ ugrave
+ ucirc
+ uuml
+ yacute
+ thorn
+ trade
+ yuml
+
+ \b0[xX][0-9a-fA-F]+|(\b\d+(\.[0-9]+)?|\.[0-9]+)([eE][+-]?[0-9]+)?
+
+
+
+ /
+
+
+ =
+
+
+ !DOCTYPE
+ A
+ ABBR
+ ACRONYM
+ ADDRESS
+ APPLET
+ AREA
+ B
+ BASE
+ BASEFONT
+ BGSOUND
+ BDO
+ BIG
+ BLINK
+ BLOCKQUOTE
+ BODY
+ BR
+ BUTTON
+ CAPTION
+ CENTER
+ CITE
+ CODE
+ COL
+ COLGROUP
+ COMMENT
+ DD
+ DEL
+ DFN
+ DIR
+ DIV
+ DL
+ DT
+ EM
+ EMBED
+ FIELDSET
+ FONT
+ FORM
+ FRAME
+ FRAMESET
+ H
+ H1
+ H2
+ H3
+ H4
+ H5
+ H6
+ HEAD
+ HR
+ HTA:APPLICATION
+ HTML
+ I
+ IFRAME
+ IMG
+ INPUT
+ INS
+ ISINDEX
+ KBD
+ LABEL
+ LEGEnd
+ LI
+ LINK
+ LISTING
+ MAP
+ MARQUEE
+ MENU
+ META
+ MULTICOL
+ NEXTID
+ NOBR
+ NOFRAMES
+ NOSCRIPT
+ OBJECT
+ OL
+ OPTGROUP
+ OPTION
+ P
+ PARAM
+ PLAINTEXT
+ PRE
+ Q
+ S
+ SAMP
+ SCRIPT
+ SELECT
+ SERVER
+ SMALL
+ SOUND
+ SPACER
+ Span
+ STRONG
+ STYLE
+ SUB
+ SUP
+ TABLE
+ TBODY
+ TD
+ TEXTAREA
+ TEXTFLOW
+ TFOOT
+ TH
+ THEAD
+ TITLE
+ TR
+ TT
+ U
+ VAR
+ WBR
+ XMP
+
+
+ abbr
+ accept-charset
+ accept
+ accesskey
+ action
+ align
+ alink
+ alt
+ applicationname
+ archive
+ axis
+ background
+ behavior
+ bgcolor
+ bgproperties
+ border
+ bordercolor
+ bordercolordark
+ bordercolorligh
+ borderstyle
+ caption
+ cellpadding
+ cellspacing
+ char
+ charoff
+ charset
+ checked
+ cite
+ class
+ classid
+ clear
+ code
+ codetype
+ color
+ cols
+ colspan
+ compact
+ content
+ coords
+ data
+ datetime
+ declare
+ defer
+ dir
+ direction
+ disabled
+ dynsrc
+ enctype
+ face
+ for
+ frame
+ frameborder
+ framespacing
+ gutter
+ headers
+ height
+ href
+ hreflang
+ hspace
+ http-equiv
+ icon
+ id
+ ismap
+ label
+ language
+ leftmargin
+ link
+ longdesc
+ loop
+ lowsrc
+ marginheight
+ marginwidth
+ maximizebutton
+ maxlength
+ media
+ method
+ methods
+ minimizebutton
+ multiple
+ name
+ nohref
+ noresize
+ noshade
+ nowrap
+ object
+ onabort
+ onblur
+ onchange
+ onclick
+ ondblclick
+ onerror
+ onfocus
+ onkeydown
+ onkeypress
+ onkeyup
+ onload
+ onmousedown
+ onmousemove
+ onmouseout
+ onmouseover
+ onmouseup
+ onreset
+ onselect
+ onsubmit
+ onunload
+ profile
+ prompt
+ readonly
+ rel
+ rev
+ rows
+ rowspan
+ rules
+ runat
+ scheme
+ scope
+ scrollamount
+ scrolldelay
+ scrolling
+ selected
+ shape
+ showintaskbar
+ singleinstance
+ size
+ span
+ src
+ standby
+ start
+ style
+ summary
+ sysmenu
+ tabindex
+ target
+ text
+ title
+ topmargin
+ type
+ urn
+ usemap
+ valign
+ value
+ valuetype
+ version
+ vlink
+ vrml
+ vspace
+ width
+ windowstate
+ wrap
+
+
+ "
+ "
+
+
+ '
+ '
+
+ [\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/Java-Mode.xshd b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Resources/Java-Mode.xshd
index 913d16e95c..dd5053e911 100644
--- a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Resources/Java-Mode.xshd
+++ b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Resources/Java-Mode.xshd
@@ -1,180 +1,152 @@
-
-
-
-
-
-
-
-
-
-
-
-
- ~!%^*()-+=|\#/{}[]:;"'<> , .?
-
-
- //
-
-
-
- /*
- */
-
-
-
- "
- "
-
-
-
- '
- '
-
-
- (
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ~!%^*()-+=|\#/{}[]:;"'<> , .?
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ [?,.()\[\]{}+\-/%*<>^!|]+
+
+
+ this
+ super
+
+
+ new
+ instanceof
+ true
+ false
+
+
+ else
+ if
+ switch
+ case
+
+
+ do
+ for
+ while
+
+
+ break
+ continue
+ default
+ goto
+ return
+
+
+ try
+ throw
+ catch
+ finally
+
+
+ boolean
+ double
+ int
+ short
+ long
+ float
+ byte
+ char
+
+
+ class
+ interface
+ object
+
+
+ void
+
+
+ abstract
+ const
+ static
+ final
+ native
+ extends
+ implements
+ volatile
+ transient
+ throws
+ strictfp
+ synchronized
+
+
+ public
+ protected
+ private
+
+
+ package
+ import
+
+
+ null
+
+
+ //
+
+
+ /\*
+ \*/
+
+
+ "
+ "
+
+
+
+
+
+ '
+ '
+
+
+
+
+ [\d\w_]+(?=(\s*\())
+ \b0[xX][0-9a-fA-F]+|(\b\d+(\.[0-9]+)?|\.[0-9]+)([eE][+-]?[0-9]+)?
+
+
+
+ TODO
+
+
+ @author
+ @version
+ @param
+ @return
+ @exception
+ @throws
+ @see
+ @since
+ @serial
+ @serialField
+ @serialData
+ @deprecated
+
+ \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/JavaScript-Mode.xshd b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Resources/JavaScript-Mode.xshd
index 23a4708021..59556e4942 100644
--- a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Resources/JavaScript-Mode.xshd
+++ b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Resources/JavaScript-Mode.xshd
@@ -1,136 +1,123 @@
-
-
-
-
-
-
-
-
-
-
-
- =!><+-/*%&|^~.}{,;][?:
-
-
- //
-
-
-
- /*
- */
-
-
-
- "
- "
-
-
-
- '
- '
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+ break
+ continue
+ delete
+ else
+ for
+ function
+ if
+ in
+ new
+ return
+ this
+ typeof
+ var
+ void
+ while
+ with
+ abstract
+ boolean
+ byte
+ case
+ catch
+ char
+ class
+ const
+ debugger
+ default
+ do
+ double
+ enum
+ export
+ extends
+ final
+ finally
+ float
+ goto
+ implements
+ import
+ instanceof
+ int
+ interface
+ long
+ native
+ package
+ private
+ protected
+ public
+ short
+ static
+ super
+ switch
+ synchronized
+ throw
+ throws
+ transient
+ try
+ volatile
+
+
+ Array
+ Boolean
+ Date
+ Function
+ Global
+ Math
+ Number
+ Object
+ RegExp
+ String
+
+
+ false
+ null
+ true
+ NaN
+ Infinity
+
+
+ eval
+ parseInt
+ parseFloat
+ escape
+ unescape
+ isNaN
+ isFinite
+
+
+ //
+
+
+ /\*
+ \*/
+
+
+ "
+ "
+
+
+
+
+
+ '
+ '
+
+
+
+
+ \b0[xX][0-9a-fA-F]+|(\b\d+(\.[0-9]+)?|\.[0-9]+)([eE][+-]?[0-9]+)?
+
+
\ No newline at end of file