diff --git a/extensions/perl/syntaxes/Perl 6.tmLanguage b/extensions/perl/syntaxes/Perl 6.tmLanguage
index 68f9e59b6d1b8..a70f908c2bc34 100644
--- a/extensions/perl/syntaxes/Perl 6.tmLanguage	
+++ b/extensions/perl/syntaxes/Perl 6.tmLanguage	
@@ -10,7 +10,7 @@
 		<string>nqp</string>
 	</array>
 	<key>firstLineMatch</key>
-	<string>(^#!.*\bperl6\b)|use\s+v6</string>
+	<string>(^#!.*\b(perl6|nqp)\b)|use\s+v6</string>
 	<key>keyEquivalent</key>
 	<string>^~P</string>
 	<key>name</key>
@@ -58,9 +58,28 @@
 				</dict>
 			</array>
 		</dict>
+		<dict>
+			<key>captures</key>
+			<dict>
+				<key>1</key>
+				<dict>
+					<key>name</key>
+					<string>storage.type.class.perl.6</string>
+				</dict>
+				<key>3</key>
+				<dict>
+					<key>name</key>
+					<string>entity.name.type.class.perl.6</string>
+				</dict>
+			</dict>
+			<key>match</key>
+			<string>(class|enum|grammar|knowhow|module|package|role|slang|subset)(\s+)(((?:::|')?(?:([a-zA-Z_\x{C0}-\x{FF}\$])([a-zA-Z0-9_\x{C0}-\x{FF}\\$]|[\-'][a-zA-Z0-9_\x{C0}-\x{FF}\$])*))+)</string>
+			<key>name</key>
+			<string>meta.class.perl.6</string>
+		</dict>
 		<dict>
 			<key>begin</key>
-			<string>'</string>
+			<string>(?&lt;=\s)'</string>
 			<key>beginCaptures</key>
 			<dict>
 				<key>0</key>
@@ -279,12 +298,6 @@
 			<key>name</key>
 			<string>storage.type.declare.routine.perl</string>
 		</dict>
-		<dict>
-			<key>match</key>
-			<string>\b(module|class|role|package|enum|grammar|slang|subset)\b</string>
-			<key>name</key>
-			<string>keyword.other.module.perl</string>
-		</dict>
 		<dict>
 			<key>match</key>
 			<string>\b(self)\b</string>
@@ -361,19 +374,19 @@
 			<key>match</key>
 			<string>\b(Object|Any|Junction|Whatever|Capture|MatchSignature|Proxy|Matcher|Package|Module|ClassGrammar|Scalar|Array|Hash|KeyHash|KeySet|KeyBagPair|List|Seq|Range|Set|Bag|Mapping|Void|UndefFailure|Exception|Code|Block|Routine|Sub|MacroMethod|Submethod|Regex|Str|str|Blob|Char|ByteCodepoint|Grapheme|StrPos|StrLen|Version|NumComplex|num|complex|Bit|bit|bool|True|FalseIncreasing|Decreasing|Ordered|Callable|AnyCharPositional|Associative|Ordering|KeyExtractorComparator|OrderingPair|IO|KitchenSink|RoleInt|int|int1|int2|int4|int8|int16|int32|int64Rat|rat|rat1|rat2|rat4|rat8|rat16|rat32|rat64Buf|buf|buf1|buf2|buf4|buf8|buf16|buf32|buf64UInt|uint|uint1|uint2|uint4|uint8|uint16|uint32uint64|Abstraction|utf8|utf16|utf32)\b</string>
 			<key>name</key>
-			<string>support.type.perl</string>
+			<string>support.type.perl6</string>
 		</dict>
 		<dict>
 			<key>match</key>
-			<string>\b(div|x|xx|mod|also|leg|cmp|before|after|eq|ne|le|lt|gt|ge|eqv|ff|fff|and|andthen|Z|X|or|xor|orelse|extra|m|mm|rx|s|tr)\b</string>
+			<string>\b(div|xx|x|mod|also|leg|cmp|before|after|eq|ne|le|lt|not|gt|ge|eqv|ff|fff|and|andthen|or|xor|orelse|extra|lcm|gcd)\b</string>
 			<key>name</key>
 			<string>keyword.operator.perl</string>
 		</dict>
 		<dict>
 			<key>match</key>
-			<string>(\$|@|%|&amp;)(\*|:|!|\^|~|=|\?|(&lt;(?=.+&gt;)))?([A-Za-z_])([A-Za-z0-9_]|[\-'][A-Za-z0-9_])*</string>
+			<string>(\$|@|%|&amp;)(\*|:|!|\^|~|=|\?|(&lt;(?=.+&gt;)))?([a-zA-Z_\x{C0}-\x{FF}\$])([a-zA-Z0-9_\x{C0}-\x{FF}\$]|[\-'][a-zA-Z0-9_\x{C0}-\x{FF}\$])*</string>
 			<key>name</key>
-			<string>variable.other.basic.perl</string>
+			<string>variable.other.identifier.perl.6</string>
 		</dict>
 		<dict>
 			<key>match</key>
diff --git a/extensions/perl/syntaxes/Perl.plist b/extensions/perl/syntaxes/Perl.plist
index beab27aada271..7b6ee3888ddfe 100644
--- a/extensions/perl/syntaxes/Perl.plist
+++ b/extensions/perl/syntaxes/Perl.plist
@@ -14,6 +14,7 @@
 		<string>t</string>
 		<string>PL</string>
 		<string>psgi</string>
+		<string>vcl</string>
 	</array>
 	<key>firstLineMatch</key>
 	<string>^#!.*\bperl\b</string>
@@ -304,7 +305,7 @@
 			<key>applyEndPatternLast</key>
 			<integer>1</integer>
 			<key>begin</key>
-			<string>\b(?=m\s*[^\sa-zA-Z0-9])</string>
+			<string>(?&lt;!\{|\+|\-)\b(?=m\s*[^\sa-zA-Z0-9])</string>
 			<key>comment</key>
 			<string>string.regexp.find-m.perl</string>
 			<key>end</key>
@@ -503,7 +504,7 @@
 				</dict>
 				<dict>
 					<key>begin</key>
-					<string>(m)\s*([^\sa-zA-Z0-9'\{\[\(\&lt;])</string>
+					<string>(?&lt;!\{|\+|\-)(m)\s*([^\sa-zA-Z0-9'\{\[\(\&lt;])</string>
 					<key>captures</key>
 					<dict>
 						<key>0</key>
@@ -1040,7 +1041,7 @@
 			<key>comment</key>
 			<string>string.regexp.replace.extended</string>
 			<key>end</key>
-			<string>\2((([egimosradlupc]*x[egimosradlupc]*)))\b</string>
+			<string>((([egimosradlupc]*x[egimosradlupc]*)))\b</string>
 			<key>endCaptures</key>
 			<dict>
 				<key>1</key>
@@ -1343,10 +1344,26 @@
 		</dict>
 		<dict>
 			<key>match</key>
-			<string>\b(__FILE__|__LINE__|__PACKAGE__|__SUB__|__DATA__|__END__)\b</string>
+			<string>\b(__FILE__|__LINE__|__PACKAGE__|__SUB__)\b</string>
 			<key>name</key>
 			<string>constant.language.perl</string>
 		</dict>
+		<dict>
+			<key>begin</key>
+			<string>\b(__DATA__|__END__)\n?</string>
+			<key>beginCaptures</key>
+			<dict>
+				<key>1</key>
+				<dict>
+					<key>name</key>
+					<string>constant.language.perl</string>
+				</dict>
+			</dict>
+			<key>contentName</key>
+			<string>text.plain</string>
+			<key>end</key>
+			<string>\z</string>
+		</dict>
 		<dict>
 			<key>match</key>
 			<string>(?&lt;!-&gt;)\b(continue|die|do|else|elsif|exit|for|foreach|goto|if|last|next|redo|return|select|unless|until|wait|while|switch|case|require|use|eval)\b</string>