diff --git a/extensions/theme-colorful-defaults/package.json b/extensions/theme-colorful-defaults/package.json
index 0ca374b23a19f43962a1e0925a2d06403feec404..a1263407bc7f8c2e9a1e856ec527f069fe7457ff 100644
--- a/extensions/theme-colorful-defaults/package.json
+++ b/extensions/theme-colorful-defaults/package.json
@@ -3,7 +3,7 @@
 	"displayName": "Colorful Default Themes - Please provide feedback in issue 1849",
 	"description": "The default VS Code Light and Dark themes with a touch of color. We are considering adding these to the default themes in the January release. Please provide feedback in issue 1849.",
 	"categories": [ "Themes" ],
-	"version": "0.1.7",
+	"version": "0.1.8",
 	"publisher": "aeschli",
 	"engines": { "vscode": "*" },
 	"contributes": {
diff --git a/extensions/theme-colorful-defaults/themes/dark_plus.tmTheme b/extensions/theme-colorful-defaults/themes/dark_plus.tmTheme
index c532c39e0f5eabb080475a7cb39f6e7a74b77354..7c8cb4faf84320fde9306d45216b333c6c372ac8 100644
--- a/extensions/theme-colorful-defaults/themes/dark_plus.tmTheme
+++ b/extensions/theme-colorful-defaults/themes/dark_plus.tmTheme
@@ -21,7 +21,7 @@
 			<key>name</key>
 			<string>Types declaration and references</string>
 			<key>scope</key>
-			<string>meta.parameter.type, name.class, storage.type, return-type, meta.cast, meta.object.type, new.storage.type.ts, cast.storage.type.ts, heritage.storage.type.ts, annotation.storage.type.ts, var.annotation.storage.type.ts</string>
+			<string>meta.parameter.type, name.class, storage.type, meta.return.type, meta.object.type, return-type, meta.cast, new.storage.type.ts, cast.storage.type.ts, heritage.storage.type.ts, annotation.storage.type.ts, var.annotation.storage.type.ts</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
diff --git a/extensions/theme-colorful-defaults/themes/light_plus.tmTheme b/extensions/theme-colorful-defaults/themes/light_plus.tmTheme
index 09465f0d4093ce9f84c41acbd871e7199a247a4d..bb69f2254f533357933bc70d8980646644a81e75 100644
--- a/extensions/theme-colorful-defaults/themes/light_plus.tmTheme
+++ b/extensions/theme-colorful-defaults/themes/light_plus.tmTheme
@@ -21,7 +21,7 @@
 			<key>name</key>
 			<string>Types declaration and references</string>
 			<key>scope</key>
-			<string>meta.parameter.type, name.class, storage.type, meta.object.type, return-type, meta.cast, new.storage.type.ts, cast.storage.type.ts, heritage.storage.type.ts, annotation.storage.type.ts, var.annotation.storage.type.ts</string>
+			<string>meta.parameter.type, name.class, storage.type, meta.return.type, meta.object.type, return-type, meta.cast, new.storage.type.ts, cast.storage.type.ts, heritage.storage.type.ts, annotation.storage.type.ts, var.annotation.storage.type.ts</string>
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
diff --git a/src/vs/editor/browser/widget/media/tokens.css b/src/vs/editor/browser/widget/media/tokens.css
index b52e62f6db67ef4cbb13a33790c89785d6301e02..7f872d3554836f75931d894edfdf45c7d22f0036 100644
--- a/src/vs/editor/browser/widget/media/tokens.css
+++ b/src/vs/editor/browser/widget/media/tokens.css
@@ -346,7 +346,7 @@
 .monaco-editor.vs .token.meta.preprocessor.string				{ color: #A31515; }
 .monaco-editor.vs .token.meta.preprocessor.numeric				{ color: #09885A; }
 .monaco-editor.vs .token.meta.cast								{ color: #000000; }
-.monaco-editor.vs .token.meta.object.type							{ color: #000000; }
+.monaco-editor.vs .token.meta.object.type						{ color: #000000; }
 .monaco-editor.vs .token.meta.parameter.type					{ color: #000000; }
 .monaco-editor.vs .token.meta.parameter.type.variable			{ color: #000000; }
 .monaco-editor.vs .token.meta.dictionary.key					{ color: #0451A5; }