diff --git a/extensions/markdown/package.json b/extensions/markdown/package.json
index 4e8b75029c074e6735770f37b0aa9de9e1e264ea..d07b223fda5ed65a622a2b9dabf89a9c62ca3bd3 100644
--- a/extensions/markdown/package.json
+++ b/extensions/markdown/package.json
@@ -43,8 +43,11 @@
 				"scopeName": "text.html.markdown",
 				"path": "./syntaxes/markdown.tmLanguage",
 				"embeddedLanguages": {
+					"meta.embedded.block.html": "html",
+					"source.js": "javascript",
+					"source.css": "css",
+
 					"meta.embedded.block.css": "css",
-					"meta.embedded.block.basic": "basic",
 					"meta.embedded.block.ini": "ini",
 					"meta.embedded.block.java": "java",
 					"meta.embedded.block.lua": "lua",
diff --git a/extensions/markdown/syntaxes/gulpfile.js b/extensions/markdown/syntaxes/gulpfile.js
index f5dab4efecf7a493138aa8fc12a8a7a736d9b950..9371f0ddc1881404aea53a04a9a447ecbbfe865a 100644
--- a/extensions/markdown/syntaxes/gulpfile.js
+++ b/extensions/markdown/syntaxes/gulpfile.js
@@ -7,7 +7,7 @@ var rename = require('gulp-rename');
 
 const languages = [
 	{ name: 'css', language: 'css', identifiers: ['css', 'css.erb'], source: 'source.css' },
-	{ name: 'basic', language: 'basic', identifiers: ['html', 'htm', 'shtml', 'xhtml', 'inc', 'tmpl', 'tpl'], source: 'text.html.basic' },
+	{ name: 'basic', language: 'html', identifiers: ['html', 'htm', 'shtml', 'xhtml', 'inc', 'tmpl', 'tpl'], source: 'text.html.basic' },
 	{ name: 'ini', language: 'ini', identifiers: ['ini', 'conf'], source: 'source.ini' },
 	{ name: 'java', language: 'java', identifiers: ['java', 'bsh'], source: 'source.java' },
 	{ name: 'lua', language: 'lua', identifiers: ['lua'], source: 'source.lua' },
diff --git a/extensions/markdown/syntaxes/markdown.tmLanguage b/extensions/markdown/syntaxes/markdown.tmLanguage
index db84533c1929b012651b91d128e819b7533ee902..7d5448a80d2abdd8c8f9120333ccfe3cb1d4c960 100644
--- a/extensions/markdown/syntaxes/markdown.tmLanguage
+++ b/extensions/markdown/syntaxes/markdown.tmLanguage
@@ -680,7 +680,7 @@
 							<key>while</key>
 							<string>(^|\G)(?!\s*([`~]{3,})\s*$)</string>
 							<key>contentName</key>
-							<string>meta.embedded.block.basic</string>
+							<string>meta.embedded.block.html</string>
 							<key>patterns</key>
 							<array>
 								<dict>