diff --git a/components/prism-markdown.js b/components/prism-markdown.js
index 18a5154cb1..94adc834b1 100644
--- a/components/prism-markdown.js
+++ b/components/prism-markdown.js
@@ -1,227 +1,283 @@
-Prism.languages.markdown = Prism.languages.extend('markup', {});
-Prism.languages.insertBefore('markdown', 'prolog', {
-	'blockquote': {
-		// > ...
-		pattern: /^>(?:[\t ]*>)*/m,
-		alias: 'punctuation'
-	},
-	'code': [
-		{
-			// Prefixed by 4 spaces or 1 tab
-			pattern: /^(?: {4}|\t).+/m,
-			alias: 'keyword'
+(function (Prism) {
+
+	// Allow only one line break
+	var inner = /\\.|[^\\\n\r_]|(?:\r?\n|\r)(?!\r?\n|\r)/.source;
+
+	/**
+	 * This function is intended for the creation of the bold or italic pattern.
+	 *
+	 * This also adds a lookbehind group to the given pattern to ensure that the pattern is not backslash-escaped.
+	 *
+	 * _Note:_ Keep in mind that this adds a capturing group.
+	 *
+	 * @param {string} pattern
+	 * @param {boolean} starAlternative Whether to also add an alternative where all `_`s are replaced with `*`s.
+	 * @returns {RegExp}
+	 */
+	function createInline(pattern, starAlternative) {
+		pattern = pattern.replace(/<inner>/g, inner);
+		if (starAlternative) {
+			pattern = pattern + '|' + pattern.replace(/_/g, '\\*');
+		}
+		return RegExp(/((?:^|[^\\])(?:\\{2})*)/.source + '(?:' + pattern + ')');
+	}
+
+
+	Prism.languages.markdown = Prism.languages.extend('markup', {});
+	Prism.languages.insertBefore('markdown', 'prolog', {
+		'blockquote': {
+			// > ...
+			pattern: /^>(?:[\t ]*>)*/m,
+			alias: 'punctuation'
 		},
-		{
-			// `code`
-			// ``code``
-			pattern: /``.+?``|`[^`\n]+`/,
-			alias: 'keyword'
+		'code': [
+			{
+				// Prefixed by 4 spaces or 1 tab
+				pattern: /^(?: {4}|\t).+/m,
+				alias: 'keyword'
+			},
+			{
+				// `code`
+				// ``code``
+				pattern: /``.+?``|`[^`\n]+`/,
+				alias: 'keyword'
+			},
+			{
+				// ```optional language
+				// code block
+				// ```
+				pattern: /^```[\s\S]*?^```$/m,
+				greedy: true,
+				inside: {
+					'code-block': {
+						pattern: /^(```.*(?:\r?\n|\r))[\s\S]+?(?=(?:\r?\n|\r)^```$)/m,
+						lookbehind: true
+					},
+					'code-language': {
+						pattern: /^(```).+/,
+						lookbehind: true
+					},
+					'punctuation': /```/
+				}
+			}
+		],
+		'title': [
+			{
+				// title 1
+				// =======
+
+				// title 2
+				// -------
+				pattern: /\S.*(?:\r?\n|\r)(?:==+|--+)/,
+				alias: 'important',
+				inside: {
+					punctuation: /==+$|--+$/
+				}
+			},
+			{
+				// # title 1
+				// ###### title 6
+				pattern: /(^\s*)#+.+/m,
+				lookbehind: true,
+				alias: 'important',
+				inside: {
+					punctuation: /^#+|#+$/
+				}
+			}
+		],
+		'hr': {
+			// ***
+			// ---
+			// * * *
+			// -----------
+			pattern: /(^\s*)([*-])(?:[\t ]*\2){2,}(?=\s*$)/m,
+			lookbehind: true,
+			alias: 'punctuation'
 		},
-		{
-			// ```optional language
-			// code block
-			// ```
-			pattern: /^```[\s\S]*?^```$/m,
-			greedy: true,
+		'list': {
+			// * item
+			// + item
+			// - item
+			// 1. item
+			pattern: /(^\s*)(?:[*+-]|\d+\.)(?=[\t ].)/m,
+			lookbehind: true,
+			alias: 'punctuation'
+		},
+		'url-reference': {
+			// [id]: http://example.com "Optional title"
+			// [id]: http://example.com 'Optional title'
+			// [id]: http://example.com (Optional title)
+			// [id]: <http://example.com> "Optional title"
+			pattern: /!?\[[^\]]+\]:[\t ]+(?:\S+|<(?:\\.|[^>\\])+>)(?:[\t ]+(?:"(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*'|\((?:\\.|[^)\\])*\)))?/,
 			inside: {
-				'code-block': {
-					pattern: /^(```.*(?:\r?\n|\r))[\s\S]+?(?=(?:\r?\n|\r)^```$)/m,
+				'variable': {
+					pattern: /^(!?\[)[^\]]+/,
 					lookbehind: true
 				},
-				'code-language': {
-					pattern: /^(```).+/,
-					lookbehind: true
+				'string': /(?:"(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*'|\((?:\\.|[^)\\])*\))$/,
+				'punctuation': /^[\[\]!:]|[<>]/
+			},
+			alias: 'url'
+		},
+		'bold': {
+			// **strong**
+			// __strong__
+
+			// allow one nested instance of italic text using the same delimiter
+			pattern: createInline(/__(?:<inner>|_(?:<inner>)+_)+__/.source, true),
+			lookbehind: true,
+			greedy: true,
+			inside: {
+				'content': {
+					pattern: /(^..)[\s\S]+(?=..$)/,
+					lookbehind: true,
+					inside: {} // see below
 				},
-				'punctuation': /```/
+				'punctuation': /\*\*|__/
 			}
-		}
-	],
-	'title': [
-		{
-			// title 1
-			// =======
-
-			// title 2
-			// -------
-			pattern: /\S.*(?:\r?\n|\r)(?:==+|--+)/,
-			alias: 'important',
+		},
+		'italic': {
+			// *em*
+			// _em_
+
+			// allow one nested instance of bold text using the same delimiter
+			pattern: createInline(/_(?:<inner>|__(?:<inner>)+__)+_/.source, true),
+			lookbehind: true,
+			greedy: true,
 			inside: {
-				punctuation: /==+$|--+$/
+				'content': {
+					pattern: /(^.)[\s\S]+(?=.$)/,
+					lookbehind: true,
+					inside: {} // see below
+				},
+				'punctuation': /[*_]/
 			}
 		},
-		{
-			// # title 1
-			// ###### title 6
-			pattern: /(^\s*)#+.+/m,
+		'strike': {
+			// ~~strike through~~
+			// ~strike~
+
+			// extra _ is because the inner pattern intentionally doesn't include it because of bold and italic
+			pattern: createInline(/(~~?)(?:<inner>|_)+?\2/.source, false),
 			lookbehind: true,
-			alias: 'important',
+			greedy: true,
 			inside: {
-				punctuation: /^#+|#+$/
+				'content': {
+					pattern: /(^~~?)[\s\S]+(?=\1$)/,
+					lookbehind: true,
+					inside: {} // see below
+				},
+				'punctuation': /~~?/
 			}
-		}
-	],
-	'hr': {
-		// ***
-		// ---
-		// * * *
-		// -----------
-		pattern: /(^\s*)([*-])(?:[\t ]*\2){2,}(?=\s*$)/m,
-		lookbehind: true,
-		alias: 'punctuation'
-	},
-	'list': {
-		// * item
-		// + item
-		// - item
-		// 1. item
-		pattern: /(^\s*)(?:[*+-]|\d+\.)(?=[\t ].)/m,
-		lookbehind: true,
-		alias: 'punctuation'
-	},
-	'url-reference': {
-		// [id]: http://example.com "Optional title"
-		// [id]: http://example.com 'Optional title'
-		// [id]: http://example.com (Optional title)
-		// [id]: <http://example.com> "Optional title"
-		pattern: /!?\[[^\]]+\]:[\t ]+(?:\S+|<(?:\\.|[^>\\])+>)(?:[\t ]+(?:"(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*'|\((?:\\.|[^)\\])*\)))?/,
-		inside: {
-			'variable': {
-				pattern: /^(!?\[)[^\]]+/,
-				lookbehind: true
-			},
-			'string': /(?:"(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*'|\((?:\\.|[^)\\])*\))$/,
-			'punctuation': /^[\[\]!:]|[<>]/
 		},
-		alias: 'url'
-	},
-	'bold': {
-		// **strong**
-		// __strong__
-
-		// Allow only one line break
-		pattern: /(^|[^\\])(\*\*|__)(?:(?:\r?\n|\r)(?!\r?\n|\r)|.)+?\2/,
-		lookbehind: true,
-		greedy: true,
-		inside: {
-			'punctuation': /^\*\*|^__|\*\*$|__$/
-		}
-	},
-	'italic': {
-		// *em*
-		// _em_
-
-		// Allow only one line break
-		pattern: /(^|[^\\])([*_])(?:(?:\r?\n|\r)(?!\r?\n|\r)|.)+?\2/,
-		lookbehind: true,
-		greedy: true,
-		inside: {
-			'punctuation': /^[*_]|[*_]$/
-		}
-	},
-	'strike': {
-		// ~~strike through~~
-		// ~strike~
-
-		// Allow only one line break
-		pattern: /(^|[^\\])(~~?)(?:(?:\r?\n|\r)(?!\r?\n|\r)|.)+?\2/,
-		lookbehind: true,
-		greedy: true,
-		inside: {
-			'punctuation': /^~~?|~~?$/
-		}
-	},
-	'url': {
-		// [example](http://example.com "Optional title")
-		// [example] [id]
-		pattern: /!?\[[^\]]+\](?:\([^\s)]+(?:[\t ]+"(?:\\.|[^"\\])*")?\)| ?\[[^\]\n]*\])/,
-		inside: {
-			'variable': {
-				pattern: /(!?\[)[^\]]+(?=\]$)/,
-				lookbehind: true
-			},
-			'string': {
-				pattern: /"(?:\\.|[^"\\])*"(?=\)$)/
+		'url': {
+			// [example](http://example.com "Optional title")
+			// [example] [id]
+			pattern: /!?\[[^\]]+\](?:\([^\s)]+(?:[\t ]+"(?:\\.|[^"\\])*")?\)| ?\[[^\]\n]*\])/,
+			inside: {
+				'variable': {
+					pattern: /(!?\[)[^\]]+(?=\]$)/,
+					lookbehind: true
+				},
+				'string': {
+					pattern: /"(?:\\.|[^"\\])*"(?=\)$)/
+				}
 			}
 		}
-	}
-});
-
-['bold', 'italic', 'strike'].forEach(function (token) {
-	['url', 'bold', 'italic', 'strike'].forEach(function (inside) {
-		if (token !== inside) {
-			Prism.languages.markdown[token].inside[inside] = Prism.languages.markdown[inside];
-		}
 	});
-});
 
-Prism.hooks.add('after-tokenize', function (env) {
-	if (env.language !== 'markdown' && env.language !== 'md') {
-		return;
-	}
+	['bold', 'italic', 'strike'].forEach(function (token) {
+		['url', 'bold', 'italic', 'strike'].forEach(function (inside) {
+			if (token !== inside) {
+				Prism.languages.markdown[token].inside.content.inside[inside] = Prism.languages.markdown[inside];
+			}
+		});
+	});
 
-	function walkTokens(tokens) {
-		if (!tokens || typeof tokens === 'string') {
+	Prism.hooks.add('after-tokenize', function (env) {
+		if (env.language !== 'markdown' && env.language !== 'md') {
 			return;
 		}
 
-		for (var i = 0, l = tokens.length; i < l; i++) {
-			var token = tokens[i];
-
-			if (token.type !== 'code') {
-				walkTokens(token.content);
-				continue;
+		function walkTokens(tokens) {
+			if (!tokens || typeof tokens === 'string') {
+				return;
 			}
 
-			var codeLang = token.content[1];
-			var codeBlock = token.content[3];
+			for (var i = 0, l = tokens.length; i < l; i++) {
+				var token = tokens[i];
+
+				if (token.type !== 'code') {
+					walkTokens(token.content);
+					continue;
+				}
+
+				/*
+				 * Add the correct `language-xxxx` class to this code block. Keep in mind that the `code-language` token
+				 * is optional. But the grammar is defined so that there is only one case we have to handle:
+				 *
+				 * token.content = [
+				 *     <span class="punctuation">```</span>,
+				 *     <span class="code-language">xxxx</span>,
+				 *     '\n', // exactly one new lines (\r or \n or \r\n)
+				 *     <span class="code-block">...</span>,
+				 *     '\n', // exactly one new lines again
+				 *     <span class="punctuation">```</span>
+				 * ];
+				 */
+
+				var codeLang = token.content[1];
+				var codeBlock = token.content[3];
 
-			if (codeLang && codeBlock &&
-				codeLang.type === 'code-language' && codeBlock.type === 'code-block' &&
-				typeof codeLang.content === 'string') {
+				if (codeLang && codeBlock &&
+					codeLang.type === 'code-language' && codeBlock.type === 'code-block' &&
+					typeof codeLang.content === 'string') {
 
-				// this might be a language that Prism does not support
-				var alias = 'language-' + codeLang.content.trim().split(/\s+/)[0].toLowerCase();
+					// this might be a language that Prism does not support
+					var alias = 'language-' + codeLang.content.trim().split(/\s+/)[0].toLowerCase();
 
-				// add alias
-				if (!codeBlock.alias) {
-					codeBlock.alias = [alias];
-				} else if (typeof codeBlock.alias === 'string') {
-					codeBlock.alias = [codeBlock.alias, alias];
-				} else {
-					codeBlock.alias.push(alias);
+					// add alias
+					if (!codeBlock.alias) {
+						codeBlock.alias = [alias];
+					} else if (typeof codeBlock.alias === 'string') {
+						codeBlock.alias = [codeBlock.alias, alias];
+					} else {
+						codeBlock.alias.push(alias);
+					}
 				}
 			}
 		}
-	}
 
-	walkTokens(env.tokens);
-});
+		walkTokens(env.tokens);
+	});
 
-Prism.hooks.add('wrap', function (env) {
-	if (env.type !== 'code-block') {
-		return;
-	}
+	Prism.hooks.add('wrap', function (env) {
+		if (env.type !== 'code-block') {
+			return;
+		}
 
-	var codeLang = '';
-	for (var i = 0, l = env.classes.length; i < l; i++) {
-		var cls = env.classes[i];
-		var match = /language-(.+)/.exec(cls);
-		if (match) {
-			codeLang = match[1];
-			break;
+		var codeLang = '';
+		for (var i = 0, l = env.classes.length; i < l; i++) {
+			var cls = env.classes[i];
+			var match = /language-(.+)/.exec(cls);
+			if (match) {
+				codeLang = match[1];
+				break;
+			}
 		}
-	}
 
-	var grammar = Prism.languages[codeLang];
+		var grammar = Prism.languages[codeLang];
 
-	if (!grammar) {
-		return;
-	}
+		if (!grammar) {
+			return;
+		}
 
-	// reverse Prism.util.encode
-	var code = env.content.replace(/&lt;/g, '<').replace(/&amp;/g, '&');
+		// reverse Prism.util.encode
+		var code = env.content.replace(/&lt;/g, '<').replace(/&amp;/g, '&');
+
+		env.content = Prism.highlight(code, grammar, codeLang);
+	});
 
-	env.content = Prism.highlight(code, grammar, codeLang);
-});
+	Prism.languages.md = Prism.languages.markdown;
 
-Prism.languages.md = Prism.languages.markdown;
+}(Prism));
diff --git a/components/prism-markdown.min.js b/components/prism-markdown.min.js
index b42f979300..fd5615fdf5 100644
--- a/components/prism-markdown.min.js
+++ b/components/prism-markdown.min.js
@@ -1 +1 @@
-Prism.languages.markdown=Prism.languages.extend("markup",{}),Prism.languages.insertBefore("markdown","prolog",{blockquote:{pattern:/^>(?:[\t ]*>)*/m,alias:"punctuation"},code:[{pattern:/^(?: {4}|\t).+/m,alias:"keyword"},{pattern:/``.+?``|`[^`\n]+`/,alias:"keyword"},{pattern:/^```[\s\S]*?^```$/m,greedy:!0,inside:{"code-block":{pattern:/^(```.*(?:\r?\n|\r))[\s\S]+?(?=(?:\r?\n|\r)^```$)/m,lookbehind:!0},"code-language":{pattern:/^(```).+/,lookbehind:!0},punctuation:/```/}}],title:[{pattern:/\S.*(?:\r?\n|\r)(?:==+|--+)/,alias:"important",inside:{punctuation:/==+$|--+$/}},{pattern:/(^\s*)#+.+/m,lookbehind:!0,alias:"important",inside:{punctuation:/^#+|#+$/}}],hr:{pattern:/(^\s*)([*-])(?:[\t ]*\2){2,}(?=\s*$)/m,lookbehind:!0,alias:"punctuation"},list:{pattern:/(^\s*)(?:[*+-]|\d+\.)(?=[\t ].)/m,lookbehind:!0,alias:"punctuation"},"url-reference":{pattern:/!?\[[^\]]+\]:[\t ]+(?:\S+|<(?:\\.|[^>\\])+>)(?:[\t ]+(?:"(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*'|\((?:\\.|[^)\\])*\)))?/,inside:{variable:{pattern:/^(!?\[)[^\]]+/,lookbehind:!0},string:/(?:"(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*'|\((?:\\.|[^)\\])*\))$/,punctuation:/^[\[\]!:]|[<>]/},alias:"url"},bold:{pattern:/(^|[^\\])(\*\*|__)(?:(?:\r?\n|\r)(?!\r?\n|\r)|.)+?\2/,lookbehind:!0,greedy:!0,inside:{punctuation:/^\*\*|^__|\*\*$|__$/}},italic:{pattern:/(^|[^\\])([*_])(?:(?:\r?\n|\r)(?!\r?\n|\r)|.)+?\2/,lookbehind:!0,greedy:!0,inside:{punctuation:/^[*_]|[*_]$/}},strike:{pattern:/(^|[^\\])(~~?)(?:(?:\r?\n|\r)(?!\r?\n|\r)|.)+?\2/,lookbehind:!0,greedy:!0,inside:{punctuation:/^~~?|~~?$/}},url:{pattern:/!?\[[^\]]+\](?:\([^\s)]+(?:[\t ]+"(?:\\.|[^"\\])*")?\)| ?\[[^\]\n]*\])/,inside:{variable:{pattern:/(!?\[)[^\]]+(?=\]$)/,lookbehind:!0},string:{pattern:/"(?:\\.|[^"\\])*"(?=\)$)/}}}}),["bold","italic","strike"].forEach(function(a){["url","bold","italic","strike"].forEach(function(n){a!==n&&(Prism.languages.markdown[a].inside[n]=Prism.languages.markdown[n])})}),Prism.hooks.add("after-tokenize",function(n){"markdown"!==n.language&&"md"!==n.language||!function n(a){if(a&&"string"!=typeof a)for(var t=0,e=a.length;t<e;t++){var r=a[t];if("code"===r.type){var i=r.content[1],o=r.content[3];if(i&&o&&"code-language"===i.type&&"code-block"===o.type&&"string"==typeof i.content){var s="language-"+i.content.trim().split(/\s+/)[0].toLowerCase();o.alias?"string"==typeof o.alias?o.alias=[o.alias,s]:o.alias.push(s):o.alias=[s]}}else n(r.content)}}(n.tokens)}),Prism.hooks.add("wrap",function(n){if("code-block"===n.type){for(var a="",t=0,e=n.classes.length;t<e;t++){var r=n.classes[t],i=/language-(.+)/.exec(r);if(i){a=i[1];break}}var o=Prism.languages[a];if(o){var s=n.content.replace(/&lt;/g,"<").replace(/&amp;/g,"&");n.content=Prism.highlight(s,o,a)}}}),Prism.languages.md=Prism.languages.markdown;
\ No newline at end of file
+!function(s){function n(n,e){return n=n.replace(/<inner>/g,"\\\\.|[^\\\\\\n\r_]|(?:\r?\n|\r)(?!\r?\n|\r)"),e&&(n=n+"|"+n.replace(/_/g,"\\*")),RegExp("((?:^|[^\\\\])(?:\\\\{2})*)(?:"+n+")")}s.languages.markdown=s.languages.extend("markup",{}),s.languages.insertBefore("markdown","prolog",{blockquote:{pattern:/^>(?:[\t ]*>)*/m,alias:"punctuation"},code:[{pattern:/^(?: {4}|\t).+/m,alias:"keyword"},{pattern:/``.+?``|`[^`\n]+`/,alias:"keyword"},{pattern:/^```[\s\S]*?^```$/m,greedy:!0,inside:{"code-block":{pattern:/^(```.*(?:\r?\n|\r))[\s\S]+?(?=(?:\r?\n|\r)^```$)/m,lookbehind:!0},"code-language":{pattern:/^(```).+/,lookbehind:!0},punctuation:/```/}}],title:[{pattern:/\S.*(?:\r?\n|\r)(?:==+|--+)/,alias:"important",inside:{punctuation:/==+$|--+$/}},{pattern:/(^\s*)#+.+/m,lookbehind:!0,alias:"important",inside:{punctuation:/^#+|#+$/}}],hr:{pattern:/(^\s*)([*-])(?:[\t ]*\2){2,}(?=\s*$)/m,lookbehind:!0,alias:"punctuation"},list:{pattern:/(^\s*)(?:[*+-]|\d+\.)(?=[\t ].)/m,lookbehind:!0,alias:"punctuation"},"url-reference":{pattern:/!?\[[^\]]+\]:[\t ]+(?:\S+|<(?:\\.|[^>\\])+>)(?:[\t ]+(?:"(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*'|\((?:\\.|[^)\\])*\)))?/,inside:{variable:{pattern:/^(!?\[)[^\]]+/,lookbehind:!0},string:/(?:"(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*'|\((?:\\.|[^)\\])*\))$/,punctuation:/^[\[\]!:]|[<>]/},alias:"url"},bold:{pattern:n("__(?:<inner>|_(?:<inner>)+_)+__",!0),lookbehind:!0,greedy:!0,inside:{content:{pattern:/(^..)[\s\S]+(?=..$)/,lookbehind:!0,inside:{}},punctuation:/\*\*|__/}},italic:{pattern:n("_(?:<inner>|__(?:<inner>)+__)+_",!0),lookbehind:!0,greedy:!0,inside:{content:{pattern:/(^.)[\s\S]+(?=.$)/,lookbehind:!0,inside:{}},punctuation:/[*_]/}},strike:{pattern:n("(~~?)(?:<inner>|_)+?\\2",!1),lookbehind:!0,greedy:!0,inside:{content:{pattern:/(^~~?)[\s\S]+(?=\1$)/,lookbehind:!0,inside:{}},punctuation:/~~?/}},url:{pattern:/!?\[[^\]]+\](?:\([^\s)]+(?:[\t ]+"(?:\\.|[^"\\])*")?\)| ?\[[^\]\n]*\])/,inside:{variable:{pattern:/(!?\[)[^\]]+(?=\]$)/,lookbehind:!0},string:{pattern:/"(?:\\.|[^"\\])*"(?=\)$)/}}}}),["bold","italic","strike"].forEach(function(e){["url","bold","italic","strike"].forEach(function(n){e!==n&&(s.languages.markdown[e].inside.content.inside[n]=s.languages.markdown[n])})}),s.hooks.add("after-tokenize",function(n){"markdown"!==n.language&&"md"!==n.language||!function n(e){if(e&&"string"!=typeof e)for(var t=0,a=e.length;t<a;t++){var i=e[t];if("code"===i.type){var o=i.content[1],r=i.content[3];if(o&&r&&"code-language"===o.type&&"code-block"===r.type&&"string"==typeof o.content){var l="language-"+o.content.trim().split(/\s+/)[0].toLowerCase();r.alias?"string"==typeof r.alias?r.alias=[r.alias,l]:r.alias.push(l):r.alias=[l]}}else n(i.content)}}(n.tokens)}),s.hooks.add("wrap",function(n){if("code-block"===n.type){for(var e="",t=0,a=n.classes.length;t<a;t++){var i=n.classes[t],o=/language-(.+)/.exec(i);if(o){e=o[1];break}}var r=s.languages[e];if(r){var l=n.content.replace(/&lt;/g,"<").replace(/&amp;/g,"&");n.content=s.highlight(l,r,e)}}}),s.languages.md=s.languages.markdown}(Prism);
\ No newline at end of file
diff --git a/tests/languages/markdown/bold_feature.test b/tests/languages/markdown/bold_feature.test
index 486e6ab60e..db915b9131 100644
--- a/tests/languages/markdown/bold_feature.test
+++ b/tests/languages/markdown/bold_feature.test
@@ -8,72 +8,185 @@ bar__
 __foo*bar*baz__
 __foo_bar_baz__
 __foo~bar~baz__
+__foo~~bar~~baz__
 __foo[bar](baz)__
 
+**foo*bar*baz**
+**foo_bar_baz**
+**foo~bar~baz**
+**foo~~bar~~baz**
+**foo[bar](baz)**
+
 ----------------------------------------------------
 
 [
 	["bold", [
 		["punctuation", "**"],
-		"foobar",
+		["content", [
+			"foobar"
+		]],
 		["punctuation", "**"]
 	]],
 	["bold", [
 		["punctuation", "**"],
-		"foo\r\nbar",
+		["content", [
+			"foo\r\nbar"
+		]],
 		["punctuation", "**"]
 	]],
 	["bold", [
 		["punctuation", "__"],
-		"foobar",
+		["content", [
+			"foobar"
+		]],
 		["punctuation", "__"]
 	]],
 	["bold", [
 		["punctuation", "__"],
-		"foo\r\nbar",
+		["content", [
+			"foo\r\nbar"
+		]],
+		["punctuation", "__"]
+	]],
+	["bold", [
+		["punctuation", "__"],
+		["content", [
+			"foo",
+			["italic", [
+				["punctuation", "*"],
+				["content", [
+					"bar"
+				]],
+				["punctuation", "*"]
+			]],
+			"baz"
+		]],
 		["punctuation", "__"]
 	]],
-
 	["bold", [
 		["punctuation", "__"],
-		"foo",
-		["italic", [
-			["punctuation", "*"],
-			"bar",
-			["punctuation", "*"]
+		["content", [
+			"foo",
+			["italic", [
+				["punctuation", "_"],
+				["content", [
+					"bar"
+				]],
+				["punctuation", "_"]
+			]],
+			"baz"
 		]],
-		"baz",
 		["punctuation", "__"]
 	]],
 	["bold", [
 		["punctuation", "__"],
-		"foo",
-		["italic", [
-			["punctuation", "_"],
-			"bar",
-			["punctuation", "_"]
+		["content", [
+			"foo",
+			["strike", [
+				["punctuation", "~"],
+				["content", [
+					"bar"
+				]],
+				["punctuation", "~"]
+			]],
+			"baz"
 		]],
-		"baz",
 		["punctuation", "__"]
 	]],
 	["bold", [
 		["punctuation", "__"],
-		"foo",
-		["strike", [
-			["punctuation", "~"],
-			"bar",
-			["punctuation", "~"]
+		["content", [
+			"foo",
+			["strike", [
+				["punctuation", "~~"],
+				["content", [
+					"bar"
+				]],
+				["punctuation", "~~"]
+			]],
+			"baz"
 		]],
-		"baz",
 		["punctuation", "__"]
 	]],
 	["bold", [
 		["punctuation", "__"],
-		"foo",
-		["url", [
-			"[bar](baz)"
+		["content", [
+			"foo",
+			["url", [
+				"[bar](baz)"
+			]]
 		]],
 		["punctuation", "__"]
+	]],
+	["bold", [
+		["punctuation", "**"],
+		["content", [
+			"foo",
+			["italic", [
+				["punctuation", "*"],
+				["content", [
+					"bar"
+				]],
+				["punctuation", "*"]
+			]],
+			"baz"
+		]],
+		["punctuation", "**"]
+	]],
+	["bold", [
+		["punctuation", "**"],
+		["content", [
+			"foo",
+			["italic", [
+				["punctuation", "_"],
+				["content", [
+					"bar"
+				]],
+				["punctuation", "_"]
+			]],
+			"baz"
+		]],
+		["punctuation", "**"]
+	]],
+	["bold", [
+		["punctuation", "**"],
+		["content", [
+			"foo",
+			["strike", [
+				["punctuation", "~"],
+				["content", [
+					"bar"
+				]],
+				["punctuation", "~"]
+			]],
+			"baz"
+		]],
+		["punctuation", "**"]
+	]],
+	["bold", [
+		["punctuation", "**"],
+		["content", [
+			"foo",
+			["strike", [
+				["punctuation", "~~"],
+				["content", [
+					"bar"
+				]],
+				["punctuation", "~~"]
+			]],
+			"baz"
+		]],
+		["punctuation", "**"]
+	]],
+	["bold", [
+		["punctuation", "**"],
+		["content", [
+			"foo",
+			["url", [
+				"[bar](baz)"
+			]]
+		]],
+		["punctuation", "**"]
 	]]
 ]
 
diff --git a/tests/languages/markdown/italic_feature.test b/tests/languages/markdown/italic_feature.test
index 02ced18027..fc9c6c858e 100644
--- a/tests/languages/markdown/italic_feature.test
+++ b/tests/languages/markdown/italic_feature.test
@@ -5,42 +5,191 @@ _foobar_
 _foo
 bar_
 
+_foo__bar__baz_
+_foo**bar**baz_
+_foo~bar~baz_
+_foo~~bar~~baz_
 _foo[bar](baz)_
 
+*foo__bar__baz*
+*foo**bar**baz*
+*foo~bar~baz*
+*foo~~bar~~baz*
+*foo[bar](baz)*
+
 ----------------------------------------------------
 
 [
 	["italic", [
 		["punctuation", "*"],
-		"foobar",
+		["content", [
+			"foobar"
+		]],
 		["punctuation", "*"]
 	]],
 	["italic", [
 		["punctuation", "*"],
-		"foo\r\nbar",
+		["content", [
+			"foo\r\nbar"
+		]],
 		["punctuation", "*"]
 	]],
 	["italic", [
 		["punctuation", "_"],
-		"foobar",
+		["content", [
+			"foobar"
+		]],
 		["punctuation", "_"]
 	]],
 	["italic", [
 		["punctuation", "_"],
-		"foo\r\nbar",
+		["content", [
+			"foo\r\nbar"
+		]],
+		["punctuation", "_"]
+	]],
+	["italic", [
+		["punctuation", "_"],
+		["content", [
+			"foo",
+			["bold", [
+				["punctuation", "__"],
+				["content", [
+					"bar"
+				]],
+				["punctuation", "__"]
+			]],
+			"baz"
+		]],
+		["punctuation", "_"]
+	]],
+	["italic", [
+		["punctuation", "_"],
+		["content", [
+			"foo",
+			["bold", [
+				["punctuation", "**"],
+				["content", [
+					"bar"
+				]],
+				["punctuation", "**"]
+			]],
+			"baz"
+		]],
+		["punctuation", "_"]
+	]],
+	["italic", [
+		["punctuation", "_"],
+		["content", [
+			"foo",
+			["strike", [
+				["punctuation", "~"],
+				["content", [
+					"bar"
+				]],
+				["punctuation", "~"]
+			]],
+			"baz"
+		]],
+		["punctuation", "_"]
+	]],
+	["italic", [
+		["punctuation", "_"],
+		["content", [
+			"foo",
+			["strike", [
+				["punctuation", "~~"],
+				["content", [
+					"bar"
+				]],
+				["punctuation", "~~"]
+			]],
+			"baz"
+		]],
 		["punctuation", "_"]
 	]],
-
 	["italic", [
 		["punctuation", "_"],
-		"foo",
-		["url", [
-			"[bar](baz)"
+		["content", [
+			"foo",
+			["url", [
+				"[bar](baz)"
+			]]
 		]],
 		["punctuation", "_"]
+	]],
+	["italic", [
+		["punctuation", "*"],
+		["content", [
+			"foo",
+			["bold", [
+				["punctuation", "__"],
+				["content", [
+					"bar"
+				]],
+				["punctuation", "__"]
+			]],
+			"baz"
+		]],
+		["punctuation", "*"]
+	]],
+	["italic", [
+		["punctuation", "*"],
+		["content", [
+			"foo",
+			["bold", [
+				["punctuation", "**"],
+				["content", [
+					"bar"
+				]],
+				["punctuation", "**"]
+			]],
+			"baz"
+		]],
+		["punctuation", "*"]
+	]],
+	["italic", [
+		["punctuation", "*"],
+		["content", [
+			"foo",
+			["strike", [
+				["punctuation", "~"],
+				["content", [
+					"bar"
+				]],
+				["punctuation", "~"]
+			]],
+			"baz"
+		]],
+		["punctuation", "*"]
+	]],
+	["italic", [
+		["punctuation", "*"],
+		["content", [
+			"foo",
+			["strike", [
+				["punctuation", "~~"],
+				["content", [
+					"bar"
+				]],
+				["punctuation", "~~"]
+			]],
+			"baz"
+		]],
+		["punctuation", "*"]
+	]],
+	["italic", [
+		["punctuation", "*"],
+		["content", [
+			"foo",
+			["url", [
+				"[bar](baz)"
+			]]
+		]],
+		["punctuation", "*"]
 	]]
 ]
 
 ----------------------------------------------------
 
-Checks for italic. Also tests for inclusion of url.
\ No newline at end of file
+Checks for italic. Also tests for inclusion of url.
diff --git a/tests/languages/markdown/nested_bold_italic_feature.test b/tests/languages/markdown/nested_bold_italic_feature.test
new file mode 100644
index 0000000000..63eefe4f33
--- /dev/null
+++ b/tests/languages/markdown/nested_bold_italic_feature.test
@@ -0,0 +1,162 @@
+**a *b* c**
+
+*a **b** c*
+
+***abc***
+
+*b **c***
+
+**b *c***
+
+***b *c**
+
+***c **c*
+
+*a \* b*
+
+*a **b***
+
+**a *b***
+
+----------------------------------------------------
+
+[
+	["bold", [
+		["punctuation", "**"],
+		["content", [
+			"a ",
+			["italic", [
+				["punctuation", "*"],
+				["content", [
+					"b"
+				]],
+				["punctuation", "*"]
+			]],
+			" c"
+		]],
+		["punctuation", "**"]
+	]],
+	["italic", [
+		["punctuation", "*"],
+		["content", [
+			"a ",
+			["bold", [
+				["punctuation", "**"],
+				["content", [
+					"b"
+				]],
+				["punctuation", "**"]
+			]],
+			" c"
+		]],
+		["punctuation", "*"]
+	]],
+	["bold", [
+		["punctuation", "**"],
+		["content", [
+			["italic", [
+				["punctuation", "*"],
+				["content", [
+					"abc"
+				]],
+				["punctuation", "*"]
+			]]
+		]],
+		["punctuation", "**"]
+	]],
+	["italic", [
+		["punctuation", "*"],
+		["content", [
+			"b ",
+			["bold", [
+				["punctuation", "**"],
+				["content", [
+					"c"
+				]],
+				["punctuation", "**"]
+			]]
+		]],
+		["punctuation", "*"]
+	]],
+	["bold", [
+		["punctuation", "**"],
+		["content", [
+			"b ",
+			["italic", [
+				["punctuation", "*"],
+				["content", [
+					"c"
+				]],
+				["punctuation", "*"]
+			]]
+		]],
+		["punctuation", "**"]
+	]],
+	["bold", [
+		["punctuation", "**"],
+		["content", [
+			["italic", [
+				["punctuation", "*"],
+				["content", [
+					"b "
+				]],
+				["punctuation", "*"]
+			]],
+			"c"
+		]],
+		["punctuation", "**"]
+	]],
+	["italic", [
+		["punctuation", "*"],
+		["content", [
+			["bold", [
+				["punctuation", "**"],
+				["content", [
+					"c "
+				]],
+				["punctuation", "**"]
+			]],
+			"c"
+		]],
+		["punctuation", "*"]
+	]],
+	["italic", [
+		["punctuation", "*"],
+		["content", [
+			"a \\* b"
+		]],
+		["punctuation", "*"]
+	]],
+	["italic", [
+		["punctuation", "*"],
+		["content", [
+			"a ",
+			["bold", [
+				["punctuation", "**"],
+				["content", [
+					"b"
+				]],
+				["punctuation", "**"]
+			]]
+		]],
+		["punctuation", "*"]
+	]],
+	["bold", [
+		["punctuation", "**"],
+		["content", [
+			"a ",
+			["italic", [
+				["punctuation", "*"],
+				["content", [
+					"b"
+				]],
+				["punctuation", "*"]
+			]]
+		]],
+		["punctuation", "**"]
+	]]
+]
+
+----------------------------------------------------
+
+Checks for nested versions of bold and italic.
diff --git a/tests/languages/markdown/strike_feature.test b/tests/languages/markdown/strike_feature.test
index 49a4a139a4..414fb8bdc0 100644
--- a/tests/languages/markdown/strike_feature.test
+++ b/tests/languages/markdown/strike_feature.test
@@ -6,62 +6,187 @@ bar~~
 bar~
 
 ~foo*bar*baz~
+~foo_bar_baz~
+~foo**bar**baz~
 ~foo__bar__baz~
 ~foo[bar](baz)~
 
+~~foo*bar*baz~~
+~~foo_bar_baz~~
+~~foo**bar**baz~~
+~~foo__bar__baz~~
+~~foo[bar](baz)~~
+
 ----------------------------------------------------
 
 [
 	["strike", [
 		["punctuation", "~~"],
-		"foobar",
+		["content", [
+			"foobar"
+		]],
 		["punctuation", "~~"]
 	]],
 	["strike", [
 		["punctuation", "~~"],
-		"foo\r\nbar",
+		["content", [
+			"foo\r\nbar"
+		]],
 		["punctuation", "~~"]
 	]],
 	["strike", [
 		["punctuation", "~"],
-		"foobar",
+		["content", [
+			"foobar"
+		]],
 		["punctuation", "~"]
 	]],
 	["strike", [
 		["punctuation", "~"],
-		"foo\r\nbar",
+		["content", [
+			"foo\r\nbar"
+		]],
+		["punctuation", "~"]
+	]],
+	["strike", [
+		["punctuation", "~"],
+		["content", [
+			"foo",
+			["italic", [
+				["punctuation", "*"],
+				["content", [
+					"bar"
+				]],
+				["punctuation", "*"]
+			]],
+			"baz"
+		]],
 		["punctuation", "~"]
 	]],
-
 	["strike", [
 		["punctuation", "~"],
-		"foo",
-		["italic", [
-			["punctuation", "*"],
-			"bar",
-			["punctuation", "*"]
+		["content", [
+			"foo",
+			["italic", [
+				["punctuation", "_"],
+				["content", [
+					"bar"
+				]],
+				["punctuation", "_"]
+			]],
+			"baz"
 		]],
-		"baz",
 		["punctuation", "~"]
 	]],
 	["strike", [
 		["punctuation", "~"],
-		"foo",
-		["bold", [
-			["punctuation", "__"],
-			"bar",
-			["punctuation", "__"]
+		["content", [
+			"foo",
+			["bold", [
+				["punctuation", "**"],
+				["content", [
+					"bar"
+				]],
+				["punctuation", "**"]
+			]],
+			"baz"
 		]],
-		"baz",
 		["punctuation", "~"]
 	]],
 	["strike", [
 		["punctuation", "~"],
-		"foo",
-		["url", [
-			"[bar](baz)"
+		["content", [
+			"foo",
+			["bold", [
+				["punctuation", "__"],
+				["content", [
+					"bar"
+				]],
+				["punctuation", "__"]
+			]],
+			"baz"
 		]],
 		["punctuation", "~"]
+	]],
+	["strike", [
+		["punctuation", "~"],
+		["content", [
+			"foo",
+			["url", [
+				"[bar](baz)"
+			]]
+		]],
+		["punctuation", "~"]
+	]],
+	["strike", [
+		["punctuation", "~~"],
+		["content", [
+			"foo",
+			["italic", [
+				["punctuation", "*"],
+				["content", [
+					"bar"
+				]],
+				["punctuation", "*"]
+			]],
+			"baz"
+		]],
+		["punctuation", "~~"]
+	]],
+	["strike", [
+		["punctuation", "~~"],
+		["content", [
+			"foo",
+			["italic", [
+				["punctuation", "_"],
+				["content", [
+					"bar"
+				]],
+				["punctuation", "_"]
+			]],
+			"baz"
+		]],
+		["punctuation", "~~"]
+	]],
+	["strike", [
+		["punctuation", "~~"],
+		["content", [
+			"foo",
+			["bold", [
+				["punctuation", "**"],
+				["content", [
+					"bar"
+				]],
+				["punctuation", "**"]
+			]],
+			"baz"
+		]],
+		["punctuation", "~~"]
+	]],
+	["strike", [
+		["punctuation", "~~"],
+		["content", [
+			"foo",
+			["bold", [
+				["punctuation", "__"],
+				["content", [
+					"bar"
+				]],
+				["punctuation", "__"]
+			]],
+			"baz"
+		]],
+		["punctuation", "~~"]
+	]],
+	["strike", [
+		["punctuation", "~~"],
+		["content", [
+			"foo",
+			["url", [
+				"[bar](baz)"
+			]]
+		]],
+		["punctuation", "~~"]
 	]]
 ]