diff --git a/syntax/syntaxes/Scala.tmLanguage b/syntax/syntaxes/Scala.tmLanguage
index 8f9e32c..dbbb975 100644
--- a/syntax/syntaxes/Scala.tmLanguage
+++ b/syntax/syntaxes/Scala.tmLanguage
@@ -407,6 +407,23 @@
 						\b(def)\s+
 						(`[^`]+`|[_$a-zA-Z][_$a-zA-Z0-9]*(?:_[^\t .,;()\[\]{}'"`\w])(?=[(\t ])|[_$a-zA-Z][_$a-zA-Z0-9]*|[-?~&gt;&lt;^+*%:!#|/@\\]+)</string>
 				</dict>
+				<dict>
+					<key>captures</key>
+					<dict>
+						<key>1</key>
+						<dict>
+							<key>name</key>
+							<string>keyword.declaration.scala</string>
+						</dict>
+						<key>2</key>
+						<dict>
+							<key>name</key>
+							<string>entity.name.class.declaration</string>
+						</dict>
+					</dict>
+					<key>match</key>
+					<string>\b(trait)\s+([^\s\{\(\[]+)</string>
+				</dict>
 				<dict>
 					<key>captures</key>
 					<dict>
@@ -427,7 +444,7 @@
 						</dict>
 					</dict>
 					<key>match</key>
-					<string>(case)?\b(class|trait|object)\s+([^\s\{\(\[]+)</string>
+					<string>\b(?:(case)\s+)?(class|object)\s+([^\s\{\(\[]+)</string>
 				</dict>
 				<dict>
 					<key>captures</key>