diff --git a/extensions/html/client/src/htmlMain.ts b/extensions/html/client/src/htmlMain.ts
index 4f355644a04..db3d12b2f3a 100644
--- a/extensions/html/client/src/htmlMain.ts
+++ b/extensions/html/client/src/htmlMain.ts
@@ -86,7 +86,8 @@ export function activate(context: ExtensionContext) {
 			provideColorPresentations(color, context): Thenable<ColorPresentation[]> {
 				let params: ColorPresentationParams = {
 					textDocument: client.code2ProtocolConverter.asTextDocumentIdentifier(context.document),
-					colorInfo: { range: client.code2ProtocolConverter.asRange(context.range), color }
+					color,
+					range: client.code2ProtocolConverter.asRange(context.range)
 				};
 				return client.sendRequest(ColorPresentationRequest.type, params).then(presentations => {
 					return presentations.map(p => {
diff --git a/extensions/html/npm-shrinkwrap.json b/extensions/html/npm-shrinkwrap.json
index 1a98370fbb7..358372962ed 100644
--- a/extensions/html/npm-shrinkwrap.json
+++ b/extensions/html/npm-shrinkwrap.json
@@ -13,24 +13,24 @@
       "resolved": "https://registry.npmjs.org/vscode-extension-telemetry/-/vscode-extension-telemetry-0.0.8.tgz"
     },
     "vscode-jsonrpc": {
-      "version": "3.5.0-next.1",
-      "from": "vscode-jsonrpc@>=3.5.0-next.1 <4.0.0",
-      "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-3.5.0-next.1.tgz"
+      "version": "3.5.0-next.2",
+      "from": "vscode-jsonrpc@3.5.0-next.2",
+      "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-3.5.0-next.2.tgz"
     },
     "vscode-languageclient": {
-      "version": "3.5.0-next.3",
-      "from": "vscode-languageclient@3.5.0-next.3",
-      "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-3.5.0-next.3.tgz"
+      "version": "3.5.0-next.4",
+      "from": "vscode-languageclient@3.5.0-next.4",
+      "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-3.5.0-next.4.tgz"
     },
     "vscode-languageserver-protocol": {
-      "version": "3.5.0-next.3",
-      "from": "vscode-languageserver-protocol@3.5.0-next.3",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.5.0-next.3.tgz"
+      "version": "3.5.0-next.5",
+      "from": "vscode-languageserver-protocol@3.5.0-next.5",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.5.0-next.5.tgz"
     },
     "vscode-languageserver-types": {
-      "version": "3.5.0-next.1",
-      "from": "vscode-languageserver-types@>=3.5.0-next.1 <4.0.0",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.5.0-next.1.tgz"
+      "version": "3.5.0-next.2",
+      "from": "vscode-languageserver-types@3.5.0-next.2",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.5.0-next.2.tgz"
     },
     "vscode-nls": {
       "version": "2.0.2",
diff --git a/extensions/html/package.json b/extensions/html/package.json
index e4d2bc03945..da8612b9852 100644
--- a/extensions/html/package.json
+++ b/extensions/html/package.json
@@ -216,7 +216,7 @@
   },
   "dependencies": {
     "vscode-extension-telemetry": "0.0.8",
-    "vscode-languageclient": "3.5.0-next.3",
+    "vscode-languageclient": "3.5.0-next.4",
     "vscode-nls": "2.0.2"
   },
   "devDependencies": {
diff --git a/extensions/html/server/npm-shrinkwrap.json b/extensions/html/server/npm-shrinkwrap.json
index 7656d5faf8b..28596433531 100644
--- a/extensions/html/server/npm-shrinkwrap.json
+++ b/extensions/html/server/npm-shrinkwrap.json
@@ -3,34 +3,34 @@
   "version": "1.0.0",
   "dependencies": {
     "vscode-css-languageservice": {
-      "version": "2.1.11",
-      "from": "vscode-css-languageservice@next",
-      "resolved": "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-2.1.11.tgz"
+      "version": "3.0.0",
+      "from": "vscode-css-languageservice@3.0.0",
+      "resolved": "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-3.0.0.tgz"
     },
     "vscode-html-languageservice": {
       "version": "2.0.10",
-      "from": "vscode-html-languageservice@next",
+      "from": "vscode-html-languageservice@2.0.10",
       "resolved": "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-2.0.10.tgz"
     },
     "vscode-jsonrpc": {
-      "version": "3.5.0-next.1",
-      "from": "vscode-jsonrpc@>=3.5.0-next.1 <4.0.0",
-      "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-3.5.0-next.1.tgz"
+      "version": "3.5.0-next.2",
+      "from": "vscode-jsonrpc@3.5.0-next.2",
+      "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-3.5.0-next.2.tgz"
     },
     "vscode-languageserver": {
-      "version": "3.5.0-next.2",
-      "from": "vscode-languageserver@3.5.0-next.2",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-3.5.0-next.2.tgz"
+      "version": "3.5.0-next.6",
+      "from": "vscode-languageserver@3.5.0-next.6",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-3.5.0-next.6.tgz"
     },
     "vscode-languageserver-protocol": {
-      "version": "3.5.0-next.3",
-      "from": "vscode-languageserver-protocol@3.5.0-next.3",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.5.0-next.3.tgz"
+      "version": "3.5.0-next.5",
+      "from": "vscode-languageserver-protocol@3.5.0-next.5",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.5.0-next.5.tgz"
     },
     "vscode-languageserver-types": {
-      "version": "3.5.0-next.1",
-      "from": "vscode-languageserver-types@>=3.5.0-next.1 <4.0.0",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.5.0-next.1.tgz"
+      "version": "3.5.0-next.2",
+      "from": "vscode-languageserver-types@3.5.0-next.2",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.5.0-next.2.tgz"
     },
     "vscode-nls": {
       "version": "2.0.2",
diff --git a/extensions/html/server/package.json b/extensions/html/server/package.json
index 03f906222bc..9c54bcba388 100644
--- a/extensions/html/server/package.json
+++ b/extensions/html/server/package.json
@@ -8,9 +8,9 @@
     "node": "*"
   },
   "dependencies": {
-    "vscode-css-languageservice": "^2.1.11",
-    "vscode-html-languageservice": "^2.0.10",
-    "vscode-languageserver": "3.5.0-next.2",
+    "vscode-css-languageservice": "3.0.0",
+    "vscode-html-languageservice": "2.0.10",
+    "vscode-languageserver": "3.5.0-next.6",
     "vscode-nls": "^2.0.2",
     "vscode-uri": "^1.0.1"
   },
diff --git a/extensions/html/server/src/htmlServerMain.ts b/extensions/html/server/src/htmlServerMain.ts
index 3f7258197a8..ff5df2a8ebd 100644
--- a/extensions/html/server/src/htmlServerMain.ts
+++ b/extensions/html/server/src/htmlServerMain.ts
@@ -326,9 +326,9 @@ connection.onRequest(DocumentColorRequest.type, params => {
 connection.onRequest(ColorPresentationRequest.type, params => {
 	let document = documents.get(params.textDocument.uri);
 	if (document) {
-		let mode = languageModes.getModeAtPosition(document, params.colorInfo.range.start);
+		let mode = languageModes.getModeAtPosition(document, params.range.start);
 		if (mode && mode.getColorPresentations) {
-			return mode.getColorPresentations(document, params.colorInfo);
+			return mode.getColorPresentations(document, params.color, params.range);
 		}
 	}
 	return [];
diff --git a/extensions/html/server/src/modes/cssMode.ts b/extensions/html/server/src/modes/cssMode.ts
index 0dc06cc10ba..42125569e6c 100644
--- a/extensions/html/server/src/modes/cssMode.ts
+++ b/extensions/html/server/src/modes/cssMode.ts
@@ -5,10 +5,11 @@
 'use strict';
 
 import { LanguageModelCache, getLanguageModelCache } from '../languageModelCache';
-import { TextDocument, Position } from 'vscode-languageserver-types';
+import { TextDocument, Position, Range } from 'vscode-languageserver-types';
 import { getCSSLanguageService, Stylesheet } from 'vscode-css-languageservice';
-import { LanguageMode, Settings, ColorInformation } from './languageModes';
+import { LanguageMode, Settings } from './languageModes';
 import { HTMLDocumentRegions, CSS_STYLE_RULE } from './embeddedSupport';
+import { Color } from 'vscode-languageserver-protocol/lib/protocol.colorProvider.proposed';
 
 export function getCSSMode(documentRegions: LanguageModelCache<HTMLDocumentRegions>): LanguageMode {
 	let cssLanguageService = getCSSLanguageService();
@@ -54,9 +55,9 @@ export function getCSSMode(documentRegions: LanguageModelCache<HTMLDocumentRegio
 			let embedded = embeddedCSSDocuments.get(document);
 			return cssLanguageService.findDocumentColors(embedded, cssStylesheets.get(embedded));
 		},
-		getColorPresentations(document: TextDocument, colorInfo: ColorInformation) {
+		getColorPresentations(document: TextDocument, color: Color, range: Range) {
 			let embedded = embeddedCSSDocuments.get(document);
-			return cssLanguageService.getColorPresentations(embedded, cssStylesheets.get(embedded), colorInfo);
+			return cssLanguageService.getColorPresentations(embedded, cssStylesheets.get(embedded), color, range);
 		},
 		onDocumentRemoved(document: TextDocument) {
 			embeddedCSSDocuments.onDocumentRemoved(document);
diff --git a/extensions/html/server/src/modes/languageModes.ts b/extensions/html/server/src/modes/languageModes.ts
index e22514e63e7..c151970046f 100644
--- a/extensions/html/server/src/modes/languageModes.ts
+++ b/extensions/html/server/src/modes/languageModes.ts
@@ -10,7 +10,7 @@ import {
 	Hover, DocumentHighlight, CompletionList, Position, FormattingOptions, SymbolInformation
 } from 'vscode-languageserver-types';
 
-import { ColorInformation, ColorPresentation } from 'vscode-languageserver-protocol/lib/protocol.colorProvider.proposed';
+import { ColorInformation, ColorPresentation, Color } from 'vscode-languageserver-protocol/lib/protocol.colorProvider.proposed';
 
 import { getLanguageModelCache, LanguageModelCache } from '../languageModelCache';
 import { getDocumentRegions, HTMLDocumentRegions } from './embeddedSupport';
@@ -18,7 +18,7 @@ import { getCSSMode } from './cssMode';
 import { getJavascriptMode } from './javascriptMode';
 import { getHTMLMode } from './htmlMode';
 
-export { ColorInformation, ColorPresentation };
+export { ColorInformation, ColorPresentation, Color };
 
 export interface Settings {
 	css?: any;
@@ -45,7 +45,7 @@ export interface LanguageMode {
 	findReferences?: (document: TextDocument, position: Position) => Location[];
 	format?: (document: TextDocument, range: Range, options: FormattingOptions, settings: Settings) => TextEdit[];
 	findDocumentColors?: (document: TextDocument) => ColorInformation[];
-	getColorPresentations?: (document: TextDocument, colorInfo: ColorInformation) => ColorPresentation[];
+	getColorPresentations?: (document: TextDocument, color: Color, range: Range) => ColorPresentation[];
 	doAutoClose?: (document: TextDocument, position: Position) => string;
 	onDocumentRemoved(document: TextDocument): void;
 	dispose(): void;