diff --git a/api/build/BuildRunner.cfc b/api/build/BuildRunner.cfc
index 3ed00b8fb..66d164468 100644
--- a/api/build/BuildRunner.cfc
+++ b/api/build/BuildRunner.cfc
@@ -88,14 +88,19 @@ component accessors=true {
 
 		arguments.builder.injectMethod = this.injectMethod;
 
-		arguments.builder.injectMethod( "renderLinks", function( required string text ){
-			return new api.rendering.WikiLinksRenderer( docTree=variables.docTree ).renderLinks( text=arguments.text, builder=variables._builder );
+		arguments.builder.injectMethod( "renderLinks", function( required string text, required struct args, boolean markdown=false ){
+			return new api.rendering.WikiLinksRenderer( docTree=variables.docTree ).renderLinks(
+				text = arguments.text,
+				builder = variables._builder,
+				args = arguments.args,
+				markdown = arguments.markdown
+			);
 		} );
-		arguments.builder.injectMethod( "renderTemplate", function( required string template, struct args={} ){
+		arguments.builder.injectMethod( "renderTemplate", function( required string template, struct args={}, boolean markdown=false ){
 			var renderer = new api.rendering.TemplateRenderer();
-			var rendered = renderer.render( argumentCollection=arguments, template=_rootPathForRenderer & arguments.template );
+			var rendered = renderer.render( argumentCollection=arguments, template=_rootPathForRenderer & arguments.template, markdown=arguments.markdown );
 
-			return builder.renderLinks( rendered );
+			return builder.renderLinks( rendered, args, arguments.markdown );
 		} );
 
 		StructDelete( arguments.builder, "injectMethod" );
diff --git a/api/data/FunctionPage.cfc b/api/data/FunctionPage.cfc
index c37c7b19f..97f99b1c1 100644
--- a/api/data/FunctionPage.cfc
+++ b/api/data/FunctionPage.cfc
@@ -17,13 +17,13 @@ component accessors=true extends="Page" {
 		return super.getTitle() & "()";
 	}
 
-	public string function getUsageSignature() {
+	public string function getUsageSignature( boolean plainText=false ) {
 		var usage = super.getTitle() & "(";
 		var delim = " ";
 		var optionalCount = 0;
 
 		for( var argument in this.getArguments() ) {
-			if ( !argument.required ) {
+			if ( !argument.required && !arguments.plainText ) {
 				usage &= "<em title='optional'>";
 				optionalCount++;
 			}
@@ -34,7 +34,9 @@ component accessors=true extends="Page" {
 			} else {
 				usage &= argument.type;
 		   	}
-			usage &= "</em>";
+			if ( !argument.required && !arguments.plainText ) {
+				usage &= "</em>";
+			}
 			delim = ", ";
 		}
 		//usage &= "</em>";
diff --git a/api/data/MethodPage.cfc b/api/data/MethodPage.cfc
index 6755ed394..8e6368fe5 100644
--- a/api/data/MethodPage.cfc
+++ b/api/data/MethodPage.cfc
@@ -16,13 +16,13 @@ component accessors=true extends="Page" {
 	property name="member"       type="struct";
 	property name="alias"        type="string";
 
-	public string function getUsageSignature() {
+	public string function getUsageSignature( boolean plainText=false ) {
 		var usage = this.getMethodObject() & "." & this.getMethodName() & "(";
 		var delim = " ";
 		var optionalCount = 0;
 
 		for( var argument in this.getArguments() ) {
-			if ( !argument.required ) {
+			if ( !argument.required && !arguments.plainText ) {
 				usage &= "<em title='optional'>";
 				optionalCount++;
 			}
@@ -34,10 +34,14 @@ component accessors=true extends="Page" {
 			} else {
 				usage &= argument.type;
 		   	}
-			usage &= "</em>";
+			if ( !argument.required && !arguments.plainText ) {
+				usage &= "</em>";
+			}
 			delim = ", ";
 		}
-		usage &= "</em>";
+		if ( !arguments.plainText ) {
+			usage &= "</em>";
+		}
 		//usage &= RepeatString( " ]", optionalCount );
 		usage &= " )";
 
diff --git a/api/data/TagPage.cfc b/api/data/TagPage.cfc
index 91d82cb13..93041fc5f 100644
--- a/api/data/TagPage.cfc
+++ b/api/data/TagPage.cfc
@@ -15,11 +15,11 @@ component accessors=true extends="Page" {
 	property name="srcExtension"         type="struct";
 	property name="introduced"           type="string";
 
-	public string function getUsageSignature() {
+	public string function getUsageSignature( boolean plainText=false ) {
 		var newLine           = Chr(10);
 		var indent            = RepeatString( " ", 4 );
 		var tagName           = "cf" & LCase( this.getName() );
-		var usage             = "&lt;" & tagName;
+		var usage             = ( arguments.plainText ? "<" : "&lt;" ) & tagName;
 		var closingTag        = "";
 		var bodyType          = this.getBodyContentType();
 		var unnamedAttributes = ( this.getAttributeType() ?: "" ) == "noname";
@@ -30,7 +30,7 @@ component accessors=true extends="Page" {
 				usage &= " ###attribute.type# #attribute.name###";
 			} else {
 				usage &= newline & indent;
-				if ( !attribute.required ) {
+				if ( !attribute.required && !arguments.plainText ) {
 					usage &= "<em title='optional'>";
 				}
 
@@ -42,7 +42,7 @@ component accessors=true extends="Page" {
  					usage &= attribute.type;
 				}
 
-				if ( !attribute.required ) {
+				if ( !attribute.required && !arguments.plainText ) {
 					usage &= "</em>";
 				}
 			}
@@ -54,13 +54,21 @@ component accessors=true extends="Page" {
 
 		switch( bodyType ) {
 			case "free":
-				closingTag &=  htmlEditFormat("><!--- body --->[</#tagName#>]")
+				if ( arguments.plainText ) {
+					closingTag &= "><!--- body ---></#tagName#>";
+				} else {
+					closingTag &=  htmlEditFormat("><!--- body --->[</#tagName#>]");
+				}
 			break;
 			case "required":
-				closingTag &=  htmlEditFormat("><!--- body ---></#tagName#>")
+				if ( arguments.plainText ) {
+					closingTag &= "><!--- body ---></#tagName#>";
+				} else {
+					closingTag &=  htmlEditFormat("><!--- body ---></#tagName#>");
+				}
 			break;
 			default:
-				closingTag &= "&gt;";
+				closingTag &= ( arguments.plainText ? ">" : "&gt;" );
 			break;
 		}
 
diff --git a/api/rendering/MarkdownSyntaxHighlighter.cfc b/api/rendering/MarkdownSyntaxHighlighter.cfc
new file mode 100644
index 000000000..02684d99c
--- /dev/null
+++ b/api/rendering/MarkdownSyntaxHighlighter.cfc
@@ -0,0 +1,69 @@
+component {
+
+	public string function renderHighlights( required string text ) {
+		var rendered  = arguments.text;
+		var highlight = "";
+		var pos = 1;
+
+		do {
+			highlight = _getNextHighlight( rendered, pos );
+			if ( !IsNull( highlight ) ) {
+				rendered  = Replace( rendered, highlight.rawMatch, renderHighlight( highlight.code, highlight.language ), "all" );
+				pos = highlight.pos;
+			}
+		} while( !IsNull( highlight ) );
+
+		return rendered;
+	}
+
+	public string function renderHighlight( required string code, required string language ) {
+		// Strip +trycf suffix for markdown
+		var cleanLanguage = arguments.language.reReplace( "\+trycf$", "" );
+
+		// Normalize language names for markdown
+		if ( cleanLanguage.reFindNoCase( "^(luceescript|cfs)" ) ) {
+			cleanLanguage = "javascript"; // or "js" depending on your markdown renderer
+		} else if ( cleanLanguage.reFindNoCase( "^(lucee|cfm|coldfusion)" ) ) {
+			cleanLanguage = "html"; // or "cfml" if supported
+		} else if ( cleanLanguage eq "yml" ) {
+			cleanLanguage = "yaml";
+		}
+
+		// Return plain markdown code block
+		return "```" & cleanLanguage & chr(10) & arguments.code & chr(10) & "```";
+	}
+
+// PRIVATE HELPERS
+	private any function _getNextHighlight( required string text, required string startPos=1 ) {
+		var referenceRegex  = "```([a-zA-Z\+]+)?\n(.*?)\n```";
+		var match = ReFind( referenceRegex, arguments.text, arguments.startPos, true );
+		var found           = match.len[1] > 0;
+		var result          = {};
+
+		if ( !found ) {
+			return;
+		}
+
+		var precedingContent = match.pos[1] == 1 ? "" : Trim( Left( arguments.text, match.pos[1]-1 ) );
+		var matchIsWithinCodeBlock = precedingContent.endsWith( "<pre>" ) || precedingContent.endsWith( "<code>" );
+
+		if ( matchIsWithinCodeBlock ) {
+			return _getNextHighlight( arguments.text, match.pos[1]+match.len[1] );
+		}
+
+		result = {
+			  rawMatch = Mid( arguments.text, match.pos[1], match.len[1] )
+			, code     = Mid( arguments.text, match.pos[3], match.len[3] )
+			, pos = match.len[3]
+		};
+
+		if ( match.pos[2] ) {
+			result.language = Mid( arguments.text, match.pos[2], match.len[2] );
+		} else {
+			result.language = "text";
+		}
+
+		return result;
+	}
+
+}
diff --git a/api/rendering/SyntaxHighlighter.cfc b/api/rendering/SyntaxHighlighter.cfc
index bfe77936b..457bb3047 100644
--- a/api/rendering/SyntaxHighlighter.cfc
+++ b/api/rendering/SyntaxHighlighter.cfc
@@ -1,6 +1,15 @@
 component {
 
-	public string function renderHighlights( required string text ) {
+	public string function renderHighlights( required string text, boolean markdown=false ) {
+		// For markdown mode, strip +trycf and normalize language names
+		if ( arguments.markdown ) {
+			var result = arguments.text.reReplace( "```([a-zA-Z]+)\+trycf\n", "```\1" & chr( 10 ), "all" );
+			// Replace luceescript with cfml for better LLM compatibility
+			result = result.reReplace( "```luceescript\n", "```cfml" & chr( 10 ), "all" );
+			result = result.reReplace( "```lucee\n", "```cfml" & chr( 10 ), "all" );
+			return result;
+		}
+
 		var rendered  = arguments.text;
 		var highlight = "";
 		var pos = 1;
@@ -8,7 +17,7 @@ component {
 		do {
 			highlight = _getNextHighlight( rendered, pos );
 			if ( !IsNull( highlight ) ) {
-				rendered  = Replace( rendered, highlight.rawMatch, renderHighlight( highlight.code, highlight.language ), "all" );
+				rendered  = Replace( rendered, highlight.rawMatch, renderHighlight( highlight.code, highlight.language, arguments.markdown ), "all" );
 				pos = highlight.pos;
 			}
 		} while( !IsNull( highlight ) );
@@ -16,7 +25,23 @@ component {
 		return rendered;
 	}
 
-	public string function renderHighlight( required string code, required string language ) {
+	public string function renderHighlight( required string code, required string language, boolean markdown=false ) {
+		// If markdown mode, just clean up the code block and return it as markdown
+		if ( arguments.markdown ) {
+			var cleanLanguage = arguments.language.reReplace( "\+trycf$", "" );
+
+			// Normalize language names for markdown
+			if ( cleanLanguage.reFindNoCase( "^(luceescript|cfs)" ) ) {
+				cleanLanguage = "javascript";
+			} else if ( cleanLanguage.reFindNoCase( "^(lucee|cfm|coldfusion)" ) ) {
+				cleanLanguage = "html";
+			} else if ( cleanLanguage eq "yml" ) {
+				cleanLanguage = "yaml";
+			}
+
+			return "```" & cleanLanguage & chr( 10 ) & arguments.code & chr( 10 ) & "```";
+		}
+
 		var highlighter = new Pygments();
 		var useTryCf    = reFind( "\+trycf$", arguments.language ) > 0;
 
diff --git a/api/rendering/TemplateRenderer.cfc b/api/rendering/TemplateRenderer.cfc
index 60983bac3..dd0e75b16 100644
--- a/api/rendering/TemplateRenderer.cfc
+++ b/api/rendering/TemplateRenderer.cfc
@@ -1,6 +1,6 @@
 component {
 
-	public string function render( required string template, struct args={}, string helpers="" ) {
+	public string function render( required string template, struct args={}, string helpers="", boolean markdown=false ) {
 		var rendered = "";
 
 		_includeHelpers( arguments.helpers );
@@ -9,7 +9,7 @@ component {
 			include template=arguments.template;
 		}
 
-		rendered = new SyntaxHighlighter().renderHighlights( rendered );
+		rendered = new SyntaxHighlighter().renderHighlights( rendered, arguments.markdown );
 
 		return Trim( rendered );
 	}
diff --git a/api/rendering/WikiLinksRenderer.cfc b/api/rendering/WikiLinksRenderer.cfc
index d66455443..3e809a3ea 100644
--- a/api/rendering/WikiLinksRenderer.cfc
+++ b/api/rendering/WikiLinksRenderer.cfc
@@ -2,7 +2,7 @@ component accessors=true {
 
 	property name="docTree";
 
-	public string function renderLinks( required string text, required any builder ) {
+	public string function renderLinks( required string text, required any builder, required struct args, boolean markdown=false ) {
 		var rendered = arguments.text;
 		var link     = "";
 		var startPos = 1;
@@ -14,7 +14,8 @@ component accessors=true {
 					rendered = Replace( rendered, link.rawMatch, content, "one" );
 					//startPos = link.nextStartPos + len( content );
 				} else {
-					rendered = Replace( rendered, link.rawMatch, arguments.builder.renderLink( link.page ?: NullValue(), link.title ), "all" );
+					rendered = Replace( rendered, link.rawMatch,
+						arguments.builder.renderLink( link.page ?: NullValue(), link.title, args, arguments.markdown ), "all" );
 					startPos = link.nextStartPos;
 				}
 			}
diff --git a/builders/html/Builder.cfc b/builders/html/Builder.cfc
index 097369a76..adc79dd0a 100644
--- a/builders/html/Builder.cfc
+++ b/builders/html/Builder.cfc
@@ -1,16 +1,4 @@
 component {
-	public string function renderLink( any page, required string title ) {
-		if ( IsNull( arguments.page ) ) {
-			if (arguments.title.left(4) eq "http"){
-				return '<a href="#arguments.title#">#HtmlEditFormat( arguments.title )#</a>';
-			} else {
-				request.logger (text="Missing docs link: [[#HtmlEditFormat( arguments.title )#]]", type="WARN");
-				return '<a class="missing-link" title="missing link">#HtmlEditFormat( arguments.title )#</a>';
-			}
-		}
-		var link = arguments.page.getPath() & ".html";
-		return '<a href="#link#">#HtmlEditFormat( arguments.title )#</a>';
-	}
 
 	public string function renderContent( any docTree, required string content ) {
 		return docTree.renderContent( content );
@@ -32,6 +20,11 @@ component {
 		request.filesWritten = 0;
 		request.filesToWrite = StructCount(pagePaths);
 
+		// purge previous build directory contents
+		if ( directoryExists( buildDirectory ) )
+			DirectoryDelete( buildDirectory, true );
+		directoryCreate( buildDirectory );
+
 		request.logger (text="Builder HTML directory: #arguments.buildDirectory#");
 
 		new api.parsers.ParserFactory().getMarkdownParser(); // so the parser in use shows up in logs
@@ -39,10 +32,20 @@ component {
 		//for ( var path in pagePaths ) {
 		each(pagePaths, function(path){
 			var tick = getTickCount();
-			if (pagePaths[arguments.path].page.isPage())
-				_writePage( pagePaths[arguments.path].page, buildDirectory, docTree );
+			var page = pagePaths[ arguments.path ].page;
+
+			if ( page.isPage() ) {
+				// write out full html page
+				var pageContent = renderPageContent( page, docTree, false, {} );
+				_writePage( page, buildDirectory, docTree, pageContent, {} );
+
+				// write out markdown page
+				var markdownContent = renderMarkdownContent( page, docTree );
+				_writeMarkdownPage( page, buildDirectory, markdownContent, docTree );
+
+				request.filesWritten++;
+			}
 
-			request.filesWritten++;
 			if ((request.filesWritten mod 100) eq 0){
 				request.logger(text="Rendering Documentation (#request.filesWritten# / #request.filesToWrite#)");
 			}
@@ -58,12 +61,34 @@ component {
 		_writeSearchIndex( arguments.docTree, arguments.buildDirectory );
 	}
 
-	public string function renderPage( required any page, required any docTree, required boolean edit ){
+	public string function renderPageContent( required any page, required any docTree,
+			required boolean edit, required struct htmlOpts  ){
+		try {
+			var contentArgs = { page = arguments.page, docTree=arguments.docTree, edit=arguments.edit, htmlOpts=arguments.htmlOpts };
+
+			var pageContent = renderTemplate(
+				template = "templates/#_getPageLayoutFile( arguments.page )#.cfm"
+				, args     = contentArgs
+				, helpers  = "/builders/html/helpers"
+			);
+		} catch( any e ) {
+			e.additional.luceeDocsTitle = arguments.page.getTitle();
+			e.additional.luceeDocsPath = arguments.page.getPath();
+			e.additional.luceeDocsPageId = arguments.page.getid();
+			rethrow;
+		}
+		return pageContent;
+	}
+
+	public string function renderMarkdownContent( required any page, required any docTree ){
 		try {
-			var renderedPage = renderTemplate(
-				  template = "templates/#_getPageLayoutFile( arguments.page )#.cfm"
-				, args     = { page = arguments.page, docTree=arguments.docTree, edit=arguments.edit }
+			var contentArgs = { page = arguments.page, docTree=arguments.docTree, edit=false };
+
+			var markdownContent = renderTemplate(
+				template = "../markdown/templates/#_getPageLayoutFile( arguments.page )#.cfm"
+				, args     = contentArgs
 				, helpers  = "/builders/html/helpers"
+				, markdown = true
 			);
 		} catch( any e ) {
 			e.additional.luceeDocsTitle = arguments.page.getTitle();
@@ -71,7 +96,13 @@ component {
 			e.additional.luceeDocsPageId = arguments.page.getid();
 			rethrow;
 		}
-		var crumbs = arguments.docTree.getPageBreadCrumbs(arguments.page);
+		return markdownContent;
+	}
+
+	public string function renderPage( required any page, required any docTree,
+			required string pageContent, required boolean edit, required struct htmlOptions ){
+
+		var crumbs = arguments.docTree.getPageBreadCrumbs( arguments.page );
 		var excludeLinkMap = {}; // tracks links to exclude from See also
 		var links = [];
 		var categories = [];
@@ -117,21 +148,50 @@ component {
 					break;
 			}
 		}
+
+		var template = arguments.htmlOptions.mainTemplate ?: "main.cfm";
+		var crumbsArgs = {
+			crumbs:crumbs,
+			page: arguments.page,
+			docTree: arguments.docTree,
+			categories: categories.sort("textNoCase"),
+			edit: arguments.edit,
+			htmlOpts:  arguments.htmlOptions
+		};
+		var seeAlsoArgs = {
+			links= links,
+			htmlOpts=arguments.htmlOptions
+		}
+
 		try {
+
+			var args = {
+				body       = Trim( arguments.pageContent )
+				, htmlOpts   = arguments.htmlOptions
+				, page       = arguments.page
+				, edit       = arguments.edit
+				, crumbs     = renderTemplate( template="layouts/breadcrumbs.cfm", helpers  = "/builders/html/helpers",
+					args = crumbsArgs
+				)
+				, seeAlso    = renderTemplate( template="layouts/seeAlso.cfm"    , helpers  = "/builders/html/helpers",
+					args = seeAlsoArgs )
+			};
+
+			if ( !structKeyExists(arguments.htmlOptions, "no_navigation" ) ){
+				args.navTree    = renderTemplate( template="layouts/sideNavTree.cfm", helpers  = "/builders/html/helpers", args={
+					crumbs=crumbs,
+					docTree=arguments.docTree,
+					pageLineage=arguments.page.getLineage(),
+					pageLineageMap=arguments.page.getPageLineageMap()
+				} );
+			} else  {
+				args.navTree = "";
+			}
+
 			var pageContent = renderTemplate(
-				template = "layouts/main.cfm"
+				template = "layouts/#template#"
 				, helpers  = "/builders/html/helpers"
-				, args     = {
-					body       = Trim( renderedPage )
-					, page       = arguments.page
-					, edit       = arguments.edit
-					, crumbs     = renderTemplate( template="layouts/breadcrumbs.cfm", helpers  = "/builders/html/helpers", args={ crumbs=crumbs, page=arguments.page, docTree=arguments.docTree, categories=categories.sort("textNoCase"), edit= arguments.edit } )
-					, navTree    = renderTemplate( template="layouts/sideNavTree.cfm", helpers  = "/builders/html/helpers", args={
-						crumbs=crumbs, docTree=arguments.docTree, pageLineage=arguments.page.getLineage(), pageLineageMap=arguments.page.getPageLineageMap()
-					} )
-					, seeAlso    = renderTemplate( template="layouts/seeAlso.cfm"    , helpers  = "/builders/html/helpers",
-						args={ links=links } )
-				}
+				, args     = args
 			);
 		} catch( any e ) {
 			//e.additional.luceeDocsPage = arguments.page;
@@ -178,18 +238,24 @@ component {
 	}
 
 // PRIVATE HELPERS
-	private void function _writePage( required any page, required string buildDirectory, required any docTree ) {
+	private void function _writePage( required any page, required string buildDirectory,
+			required any docTree, required string pageContent, required struct htmlOptions ) {
 		var filePath      = variables._getHtmlFilePath( arguments.page, arguments.buildDirectory );
 		var fileDirectory = GetDirectoryFromPath( filePath );
 
-		//var starttime = getTickCount();
 		lock name="CreateDirectory" timeout=10 {
 			if ( !DirectoryExists( fileDirectory ) ) {
 				DirectoryCreate( fileDirectory );
 			}
 		}
-		var pageContent = variables.cleanHtml(variables.renderPage( arguments.page, arguments.docTree, false ));
-		FileWrite( filePath, pageContent );
+
+		var html = variables.cleanHtml(
+			variables.renderPage( arguments.page,
+				arguments.docTree, arguments.pageContent, false ,
+				arguments.htmlOptions, arguments.buildDirectory
+			)
+		);
+		FileWrite( filePath, html );
 	}
 
 	// regex strips left over whitespace multiple new lines
@@ -206,6 +272,35 @@ component {
 		return arguments.buildDirectory & arguments.page.getPath() & ".html";
 	}
 
+	private void function _writeMarkdownPage( required any page, required string buildDirectory, required string markdownContent, required any docTree ) {
+		var filePath      = _getMarkdownFilePath( arguments.page, arguments.buildDirectory );
+		var fileDirectory = GetDirectoryFromPath( filePath );
+
+		lock name="CreateDirectory" timeout=10 {
+			if ( !DirectoryExists( fileDirectory ) ) {
+				DirectoryCreate( fileDirectory );
+			}
+		}
+
+		FileWrite( filePath, arguments.markdownContent );
+
+		// Set last modified date from git for recipes
+		var recipeDates = arguments.docTree.getRecipeDates();
+		var pageId = arguments.page.getId();
+		if ( structKeyExists( recipeDates, pageId ) ) {
+			FileSetLastModified( filePath, recipeDates[pageId] );
+		}
+	}
+
+	private string function _getMarkdownFilePath( required any page, required string buildDirectory ) {
+		if ( arguments.page.getPath() == "/home" ) {
+			return arguments.buildDirectory & "/index.md";
+		}
+
+		return arguments.buildDirectory & arguments.page.getPath() & ".md";
+	}
+
+
 	private void function _copyStaticAssets( required string buildDirectory ) {
 		updateHighlightsCss( arguments.buildDirectory );
 		var subdirs = directoryList(path=GetDirectoryFromPath( GetCurrentTemplatePath() ) & "/assets", type="dir", recurse="false");
@@ -219,8 +314,10 @@ component {
 
 	private function updateHighlightsCss( required string buildDirectory ){
 		var highlighter = new api.rendering.Pygments();
-		var cssFile = path=GetDirectoryFromPath( GetCurrentTemplatePath() ) & "/assets/css/highlight.css";
-		fileWrite( cssFile, highlighter.getCss() );
+		var cssFile = GetDirectoryFromPath( GetCurrentTemplatePath() ) & "/assets/css/highlight.css";
+		var css = highlighter.getCss();
+		if ( trim( css ) neq trim( fileRead( cssFile ) ) )
+			fileWrite( cssFile, highlighter.getCss() ); // only update if changed
 	}
 
 	private void function _copySiteImages( required string buildDirectory, required any docTree ) {
@@ -310,4 +407,104 @@ component {
 		return '<?xml version="1.0" encoding="UTF-8"?><urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">#chr(10)#' &
 			ArrayToList(siteMap, chr(10) ) & '#chr(10)#</urlset>';
 	}
+
+	public string function renderLink( any page, required string title, struct args={}, boolean markdown=false ) {
+		if ( IsNull( arguments.page ) ) {
+			if ( arguments.title.left( 4 ) eq "http" ){
+				if ( arguments.markdown ) {
+					return "[#arguments.title#](#arguments.title#)";
+				}
+				return '<a href="#arguments.title#">#HtmlEditFormat( arguments.title )#</a>';
+			} else {
+				request.logger( text="Missing docs link: [[#HtmlEditFormat( arguments.title )#]]", type="WARN" );
+				if ( arguments.markdown ) {
+					return "**#arguments.title#**";
+				}
+				return '<a class="missing-link" title="missing link">#HtmlEditFormat( arguments.title )#</a>';
+			}
+		}
+
+		var extension = arguments.markdown ? ".md" : ".html";
+		var link = arguments.page.getPath() & extension;
+
+		// For markdown, use relative paths
+		if ( arguments.markdown && structKeyExists( arguments.args, "page" ) ) {
+			link = _calculateRelativePath( arguments.args.page.getPath(), arguments.page.getPath() ) & extension;
+		} else if ( structKeyExists( arguments.args, "htmlOpts" )
+				&& structKeyExists( arguments.args.htmlOpts, "base_href" ) ){
+			link = arguments.args.htmlOpts.base_href & link;
+		}
+
+		if ( arguments.markdown ) {
+			return "[#arguments.title#](#link#)";
+		}
+		return '<a href="#link#">#HtmlEditFormat( arguments.title )#</a>';
+	}
+
+	private string function _calculateRelativePath( required string fromPath, required string toPath ) {
+		// Handle home page specially
+		if ( arguments.fromPath == "/home" ) {
+			arguments.fromPath = "/";
+		}
+		if ( arguments.toPath == "/home" ) {
+			arguments.toPath = "/";
+		}
+
+		// Split paths into parts (excluding filename)
+		var fromParts = listToArray( arguments.fromPath, "/" );
+		var toParts = listToArray( arguments.toPath, "/" );
+
+		// If they're in the same directory, just use the filename
+		if ( arrayLen( fromParts ) == arrayLen( toParts ) ) {
+			var samePath = true;
+			for ( var i = 1; i < arrayLen( fromParts ); i++ ) {
+				if ( fromParts[i] != toParts[i] ) {
+					samePath = false;
+					break;
+				}
+			}
+			if ( samePath ) {
+				return listLast( arguments.toPath, "/" );
+			}
+		}
+
+		// Find common prefix
+		var commonLength = 0;
+		var minLength = min( arrayLen( fromParts ) - 1, arrayLen( toParts ) - 1 );
+		for ( var i = 1; i <= minLength; i++ ) {
+			if ( fromParts[i] == toParts[i] ) {
+				commonLength = i;
+			} else {
+				break;
+			}
+		}
+
+		// Build relative path
+		var relativeParts = [];
+
+		// Go up from current location (exclude the filename itself)
+		var upLevels = arrayLen( fromParts ) - 1 - commonLength;
+		for ( var i = 1; i <= upLevels; i++ ) {
+			arrayAppend( relativeParts, ".." );
+		}
+
+		// Go down to target location
+		for ( var i = commonLength + 1; i <= arrayLen( toParts ); i++ ) {
+			arrayAppend( relativeParts, toParts[i] );
+		}
+
+		return arrayToList( relativeParts, "/" );
+	}
+
+	public string function _getIssueTrackerLink(required string name) {
+		var link = Replace( new api.build.BuildProperties().getIssueTrackerLink(), "{search}", urlEncodedFormat(arguments.name) )
+		return '<a href="#link#" class="no-oembed" target="_blank">Search Issue Tracker <i class="fa fa-external-link"></i></a>';
+	}
+
+	public string function _getTestCasesLink(required string name) {
+		var link = Replace( new api.build.BuildProperties().getTestCasesLink(), "{search}", urlEncodedFormat(arguments.name) )
+		return '<a href="#link#" class="no-oembed" target="_blank">Search Lucee Test Cases <i class="fa fa-external-link"></i></a> (good for further, detailed examples)';
+	}
+
+
 }
diff --git a/builders/html/helpers/categoriesAndRelated.cfm b/builders/html/helpers/categoriesAndRelated.cfm
new file mode 100644
index 000000000..4a9f0411d
--- /dev/null
+++ b/builders/html/helpers/categoriesAndRelated.cfm
@@ -0,0 +1,41 @@
+<cfscript>
+function renderCategoriesAndRelated( required any page, required any docTree, boolean markdown=false ) {
+	var categories = [];
+	var related = [];
+	var output = "";
+
+	if ( !IsNull( arguments.page.getCategories() ) ) {
+		for ( var cat in arguments.page.getCategories() ) {
+			var catId = "category-" & cat;
+			if ( arguments.docTree.pageExists( catId ) ) {
+				arrayAppend( categories, "[[#catId#]]" );
+			}
+		}
+	}
+
+	var excludeMap = {};
+	excludeMap[arguments.page.getId()] = "";
+	for ( var child in arguments.page.getChildren() ) {
+		excludeMap[child.getId()] = "";
+	}
+
+	var relatedIds = arguments.docTree.getPageRelated( arguments.page );
+	for ( var relId in relatedIds ) {
+		if ( len( relId ) gt 0 and not structKeyExists( excludeMap, relId ) ) {
+			arrayAppend( related, "[[#relId#]]" );
+		}
+	}
+
+	if ( arrayLen( categories ) ) {
+		output &= chr( 10 ) & "## Categories" & chr( 10 ) & chr( 10 );
+		output &= arrayToList( categories, ", " ) & chr( 10 );
+	}
+
+	if ( arrayLen( related ) ) {
+		output &= chr( 10 ) & "## See Also" & chr( 10 ) & chr( 10 );
+		output &= arrayToList( related, ", " ) & chr( 10 );
+	}
+
+	return output;
+}
+</cfscript>
diff --git a/builders/html/helpers/markdownTableCell.cfm b/builders/html/helpers/markdownTableCell.cfm
new file mode 100644
index 000000000..b0dd2a54c
--- /dev/null
+++ b/builders/html/helpers/markdownTableCell.cfm
@@ -0,0 +1,14 @@
+<cfscript>
+function markdownTableCell( required string content ) {
+	var cleaned = arguments.content;
+	// Remove newlines and replace with spaces
+	cleaned = reReplace( cleaned, "\r?\n", " ", "all" );
+	// Remove pipes that would break the table
+	cleaned = replace( cleaned, "|", "\|", "all" );
+	// Collapse multiple spaces
+	cleaned = reReplace( cleaned, "\s+", " ", "all" );
+	// Trim
+	cleaned = trim( cleaned );
+	return cleaned;
+}
+</cfscript>
diff --git a/builders/html/layouts/breadcrumbs.cfm b/builders/html/layouts/breadcrumbs.cfm
index 263700897..34af6a36c 100644
--- a/builders/html/layouts/breadcrumbs.cfm
+++ b/builders/html/layouts/breadcrumbs.cfm
@@ -3,14 +3,17 @@
 <cfparam name="args.categories" type="array" />
 <cfparam name="args.docTree"   type="any" />
 <cfparam name="args.page"   type="any" />
-
 <cfif args.edit>
 	<cfset local.docs_base_url = "http://#cgi.http_host#">
 <cfelse>
-	<cfset local.docs_base_url = "https://docs.lucee.org">
+	<cfif structKeyExists( args, "htmlOpts" ) 
+		&& structKeyExists( args.htmlOpts, "base_href" )>
+		<cfset local.docs_base_url = args.htmlOpts.base_href>
+	<cfelse>
+		<cfset local.docs_base_url = "https://docs.lucee.org">
+	</cfif>	
 </cfif>
 
-
 <cfif args.page.getId() neq "/home" and ArrayLen(args.crumbs)>
 	<!--- pages may have multiple crumbs LD-112 --->
 	<cfloop array="#args.crumbs#" item="local._crumbs">
diff --git a/builders/html/layouts/html_head.cfm b/builders/html/layouts/html_head.cfm
new file mode 100644
index 000000000..f5ef336b2
--- /dev/null
+++ b/builders/html/layouts/html_head.cfm
@@ -0,0 +1,69 @@
+<cfscript>
+	local.baseHref = ( repeatString( '../', args.page.getDepth()-1 ) );
+	// this breaks the /static/ local server mode
+	//if (baseHref eq "")
+	//	baseHref = "/";
+	local.path = args.page.getPath();
+	if ( local.path eq "/home" )
+		local.path = "/index";
+	local.pageHref = "https://docs.lucee.org#local.path#.html";
+	local.pagePath = "#local.path#.html";
+	local.pagePathMd = "#local.path#.md";
+	if (args.page.getTitle() neq "Lucee Documentation")
+		local.pageTitle = args.page.getTitle() & " :: Lucee Documentation";
+	else
+		local.pageTitle = args.page.getTitle();
+	// many sites (slack, discord one box etc) can't handle the escaped <cfcontent> and strip out the tag name from previews
+	local.safePageTitle = EncodeForHtml( Replace( Replace( local.pageTitle, "<", "", "all" ), ">", "", "all" ) );
+	local.pageTitle = EncodeForHtml( local.pageTitle );
+	local.pageDescription = getMetaDescription( args.page, args.body );
+</cfscript>
+
+<cfoutput>
+	<head>
+		<title>#local.pageTitle#</title>
+		<cfif !structKeyExists(args.htmlOpts, "no_google_analytics")>
+			<script async src="https://www.googletagmanager.com/gtag/js?id=UA-116664465-1"></script>
+			<script>
+				window._gaTrackingID = 'UA-116664465-1';
+				window.dataLayer = window.dataLayer || [];
+				function gtag(){dataLayer.push(arguments);}
+				gtag('js', new Date());
+				gtag('config', window._gaTrackingID);
+			</script>
+		</cfif>
+		<cfif args.edit>
+			<base href="#local.baseHref#">
+		</cfif>
+		<link rel="canonical" href="#local.pageHref#">
+		<link rel="alternate" type="text/markdown" href="#local.pagePathMd#">
+		<meta name="robots" content="index, follow">
+		<meta content="#getMetaDescription( args.page, args.body )#" name="description">
+		<meta content="initial-scale=1.0, width=device-width" name="viewport">
+		<meta name="twitter:card" content="summary">
+		<meta name="twitter:site" content="@lucee_server">
+		<meta name="twitter:title" content="#local.safePageTitle#">
+		<meta name="twitter:description" content="#local.pageDescription#">
+		<meta name="twitter:image" content="https://docs.lucee.org/assets/images/favicon.png">
+		<meta name="twitter:image:alt" content="Lucee">
+		<meta property="og:title" content="#local.safePageTitle#">
+		<meta property="og:url" content="#local.pageHref#">
+		<meta property="og:type" content="article">
+		<meta property="og:image" content="https://docs.lucee.org/assets/images/favicon.png">
+		<meta property="og:image:alt" content="Lucee">
+		<cfif !structKeyExists(local.args.htmlOpts, "no_css")>
+			<cfif args.edit>
+				<link href="/assets/css/base.css" rel="stylesheet">
+				<link href="/assets/css/project.css" rel="stylesheet">
+			<cfelse>
+				<link href="/assets/css/base.#application.assetBundleVersion#.min.css" rel="stylesheet">
+				<link href="/assets/css/project.css" rel="stylesheet">
+			<!---
+			<link href="/assets/css/project.#application.assetBundleVersion#.min.css" rel="stylesheet">
+			--->
+			</cfif>
+			<link href="/assets/css/highlight.css" rel="stylesheet">
+		</cfif>
+		<link rel="icon" type="image/png" href="https://docs.lucee.org/assets/images/favicon.png">
+	</head>
+</cfoutput>
diff --git a/builders/html/layouts/main.cfm b/builders/html/layouts/main.cfm
index 8c5585d1e..1eaeb8ebc 100644
--- a/builders/html/layouts/main.cfm
+++ b/builders/html/layouts/main.cfm
@@ -4,71 +4,13 @@
 <cfparam name="args.crumbs"     type="string" />
 <cfparam name="args.navTree"    type="string" />
 <cfparam name="args.seeAlso"    type="string" />
-
-<cfscript>
-	local.baseHref = ( repeatString( '../', args.page.getDepth()-1 ) );
-	// this breaks the /static/ local server mode
-	//if (baseHref eq "")
-	//	baseHref = "/";
-	local.path = args.page.getPath();
-	if ( local.path eq "/home" )
-		local.path = "/index";
-	local.pageHref = "https://docs.lucee.org#local.path#.html";
-	local.pagePath = "#local.path#.html";
-	if (args.page.getTitle() neq "Lucee Documentation")
-		local.pageTitle = args.page.getTitle() & " :: Lucee Documentation";
-	else
-		local.pageTitle = args.page.getTitle();
-	// many sites (slack, discord one box etc) can't handle the escaped <cfcontent> and strip out the tag name from previews
-	local.safePageTitle = EncodeForHtml( Replace( Replace( local.pageTitle, "<", "", "all" ), ">", "", "all" ) );
-	local.pageTitle = EncodeForHtml( local.pageTitle );
-	local.pageDescription = getMetaDescription( args.page, args.body );
-</cfscript>
+<cfparam name="args.seeAlso"    type="string" />
+<cfparam name="args.htmlOpts"   type="any" />
 
 <cfoutput><!DOCTYPE html>
 <html lang="en">
-	<head>
-		<title>#local.pageTitle#</title>
-		<script async src="https://www.googletagmanager.com/gtag/js?id=UA-116664465-1"></script>
-		<script>
-			window._gaTrackingID = 'UA-116664465-1';
-			window.dataLayer = window.dataLayer || [];
-			function gtag(){dataLayer.push(arguments);}
-			gtag('js', new Date());
-			gtag('config', window._gaTrackingID);
-		</script>
-		<cfif args.edit>
-			<base href="#local.baseHref#">
-		</cfif>
-		<link rel="canonical" href="#local.pageHref#">
-		<meta name="robots" content="index, follow">
-		<meta content="#getMetaDescription( args.page, args.body )#" name="description">
-		<meta content="initial-scale=1.0, width=device-width" name="viewport">
-		<meta name="twitter:card" content="summary">
-		<meta name="twitter:site" content="@lucee_server">
-		<meta name="twitter:title" content="#local.safePageTitle#">
-		<meta name="twitter:description" content="#local.pageDescription#">
-		<meta name="twitter:image" content="https://docs.lucee.org/assets/images/favicon.png">
-		<meta name="twitter:image:alt" content="Lucee">
-		<meta property="og:title" content="#local.safePageTitle#">
-		<meta property="og:url" content="#local.pageHref#">
-		<meta property="og:type" content="article">
-		<meta property="og:image" content="https://docs.lucee.org/assets/images/favicon.png">
-		<meta property="og:image:alt" content="Lucee">
-		<cfif args.edit>
-		<link href="/assets/css/base.css" rel="stylesheet">
-		<link href="/assets/css/project.css" rel="stylesheet">
-		<cfelse>
-		<link href="/assets/css/base.#application.assetBundleVersion#.min.css" rel="stylesheet">
-		<link href="/assets/css/project.css" rel="stylesheet">
-		<!---
-		<link href="/assets/css/project.#application.assetBundleVersion#.min.css" rel="stylesheet">
-		--->
-		</cfif>
-		<link href="/assets/css/highlight.css" rel="stylesheet">
-		<link rel="icon" type="image/png" href="/assets/images/favicon.png">
-	</head>
-
+	<cfinclude template="html_head.cfm">
+	
 	<body class="#LCase( args.page.getPageType() )#">
 		<nav class="menu menu-left nav-drawer" id="menu">
 			<div class="menu-scroll">
diff --git a/builders/markdown/templates/_method.cfm b/builders/markdown/templates/_method.cfm
new file mode 100644
index 000000000..e5d0cfe5d
--- /dev/null
+++ b/builders/markdown/templates/_method.cfm
@@ -0,0 +1,62 @@
+<cfscript>
+	param name="arguments.args.page" type="page";
+	local.args = arguments.args;
+	local.meth = args.page;
+	local.argumentsHaveDefaultValues = local.meth.argumentsHaveDefaultValues();
+
+	// Title
+	echo( "## " & local.meth.getTitle() & chr(10) & chr(10) );
+
+	// Body
+	echo( local.meth.getBody() & chr(10) & chr(10) );
+
+	// Introduced
+	if ( len( local.meth.getIntroduced() ) gt 0 ) {
+		echo( "**Introduced:** " & local.meth.getIntroduced() & chr(10) & chr(10) );
+	}
+
+	// Usage signature
+	echo( "```" & chr(10) );
+	echo( local.meth.getUsageSignature( plainText=true ) );
+	echo( chr(10) & "```" & chr(10) & chr(10) );
+
+	// Returns
+	echo( "**Returns:** " & local.meth.getReturnType() & chr(10) & chr(10) );
+
+	// Arguments
+	if ( !local.meth.getArguments().len() ) {
+		if ( local.meth.getArgumentType() == "dynamic" ) {
+			echo( "*This function takes zero or more dynamic arguments. See examples for details.*" & chr(10) & chr(10) );
+		} else {
+			echo( "*This function does not take any arguments.*" & chr(10) & chr(10) );
+		}
+	} else {
+		echo( "## Arguments" & chr(10) & chr(10) );
+		echo( "| Argument | Type | Required | Description | Default |" & chr(10) );
+		echo( "|----------|------|----------|-------------|---------|" & chr(10) );
+
+		for ( local.arg in local.meth.getArguments() ) {
+			if ( local.arg.status eq "hidden" ) {
+				continue;
+			}
+			echo( "| " & markdownTableCell( local.arg.name ) );
+			echo( " | " & markdownTableCell( local.arg.type ) );
+			echo( " | " & ( local.arg.required ? 'Yes' : 'No' ) );
+			echo( " | " & markdownTableCell( trim( local.arg.description ) & ( local.arg.keyExists( "alias" ) and len( local.arg.alias ) gt 0 ? " *Alias: " & ListChangeDelims( local.arg.alias, ", ", "," ) & "*" : "" ) ) );
+			echo( " | " & markdownTableCell( local.arg.default ?: "" ) );
+			echo( " |" & chr(10) );
+		}
+		echo( chr(10) );
+	}
+
+	// Examples
+	echo( "## Examples" & chr(10) & chr(10) );
+	if ( len( trim( local.meth.getExamples() ) ) ) {
+		echo( trim( local.meth.getExamples() ) & chr(10) );
+	} else {
+		echo( "*There are currently no examples for this function*" & chr(10) );
+	}
+
+	// Categories and related
+	echo( renderCategoriesAndRelated( local.meth, args.docTree, true ) );
+</cfscript>
diff --git a/builders/markdown/templates/_object.cfm b/builders/markdown/templates/_object.cfm
new file mode 100644
index 000000000..f2b34f3e2
--- /dev/null
+++ b/builders/markdown/templates/_object.cfm
@@ -0,0 +1,22 @@
+<cfscript>
+	param name="arguments.args.page" type="page";
+	local.pg = arguments.args.page;
+	local.body = local.pg.getBody();
+	if ( !len( local.body ) ) {
+		local.body = "Object";
+	}
+
+	// Title
+	echo( "## " & local.pg.getTitle() & chr(10) & chr(10) );
+
+	// Body
+	echo( local.body & chr(10) & chr(10) );
+
+	// Children
+	for ( local.child in local.pg.getChildren() ) {
+		echo( "- [[" & local.child.getId() & "]] - " & local.child.getDescription() & chr(10) );
+	}
+
+	// Categories and related
+	echo( renderCategoriesAndRelated( local.pg, arguments.args.docTree, true ) );
+</cfscript>
diff --git a/builders/markdown/templates/aToZIndex.cfm b/builders/markdown/templates/aToZIndex.cfm
new file mode 100644
index 000000000..959d11d46
--- /dev/null
+++ b/builders/markdown/templates/aToZIndex.cfm
@@ -0,0 +1,19 @@
+<cfscript>
+	param name="arguments.args.page" type="page";
+	local.pg = arguments.args.page;
+	local.body = local.pg.getBody();
+
+	// Title
+	echo( "## " & local.pg.getTitle() & chr(10) & chr(10) );
+
+	// Body
+	echo( local.body & chr(10) & chr(10) );
+
+	// Children
+	for ( local.child in local.pg.getChildren() ) {
+		echo( "- [[" & local.child.getId() & "]] - " & local.child.getDescription() & chr(10) );
+	}
+
+	// Categories and related
+	echo( renderCategoriesAndRelated( local.pg, arguments.args.docTree, true ) );
+</cfscript>
diff --git a/builders/markdown/templates/category.cfm b/builders/markdown/templates/category.cfm
new file mode 100644
index 000000000..f7d2b5a91
--- /dev/null
+++ b/builders/markdown/templates/category.cfm
@@ -0,0 +1,57 @@
+<cfscript>
+	local.args = arguments.args;
+	param name="args.page" type="page";
+	param name="args.docTree" type="any";
+
+	local.category = args.page;
+	local.pages = args.docTree.getPagesByCategory( local.category.getSlug() );
+	local.pages = args.docTree.sortPagesByType( local.pages );
+
+	local.currentPageType = "";
+	// this enforces the sub category order
+	local.pageTypeTitles = [
+		"function" = { title="Functions", pages=0 },
+		"tag"      = { title="Tags", pages=0 },
+		 "_method" = { title="Methods", pages=0 },
+		 "_object" = { title="Objects", pages=0 },
+		"category" = { title="Categories", pages=0 },
+		"page"     = { title="Guides",pages=0 }
+	];
+
+	local.missingPageTypes = {};
+	loop array="#local.pages#" index="local.i" item="local.page" {
+		if ( !structKeyExists( local.pageTypeTitles, local.page.getPageType() ) ) {
+			request.logger( text="Unknown page type: [ #local.page.getPageType()# ] page [#local.page.getSourceFile()#] defaulting to [page.md]", type="WARN" );
+			local.page.setPageType( "page" );
+		}
+		local.pageTypeTitles[ local.page.getPageType() ].pages++;
+	}
+
+	// Title
+	echo( "## " & local.category.getTitle() & chr(10) & chr(10) );
+
+	// Body
+	echo( local.category.getBody() & chr(10) & chr(10) );
+
+	// Pages
+	if ( !local.pages.len() ) {
+		echo( "*There are no pages tagged with this category.*" & chr(10) );
+	} else {
+		loop collection="#local.pageTypeTitles#" key="local.pageTypeKey" value="local.pageType" {
+			if ( local.pageType.pages gt 0 ) {
+				echo( "## " & local.pageType.title & chr(10) & chr(10) );
+
+				loop array="#local.pages#" index="local.i" item="local.page" {
+					if ( local.pageTypeKey eq local.page.getPageType() ) {
+						local.desc = reReplace( getMetaDescription( local.page, local.page.getBody() ), "\s*" & chr(35) & "{1,6}\s*", " ", "all" );
+						echo( "- **" & htmleditformat( local.page.getId() ) & "** - " & htmleditformat( local.desc ) & chr(10) );
+					}
+				}
+				echo( chr(10) );
+			}
+		}
+	}
+
+	// Categories and related
+	echo( renderCategoriesAndRelated( local.category, args.docTree, true ) );
+</cfscript>
diff --git a/builders/markdown/templates/changelog.cfm b/builders/markdown/templates/changelog.cfm
new file mode 100644
index 000000000..c018e6a75
--- /dev/null
+++ b/builders/markdown/templates/changelog.cfm
@@ -0,0 +1,86 @@
+<cfscript>
+	param name="args.page" type="page";
+	param name="args.docTree" type="any";
+
+	local.args = arguments.args;
+	local.changeLog = args.page;
+	pc = args.docTree.getPageCache().getPages();
+	checklist = {
+		function: true,
+		tag: true
+	};
+	q = QueryNew( "type,ref,name,introduced,sort,description" );
+
+	function addChangeLog( q, page, ref, name, introduced, description ){
+		var r = queryAddRow( q );
+		querySetCell( q, "type", arguments.page.getPageType() );
+		querySetCell( q, "ref", arguments.ref );
+		querySetCell( q, "name", arguments.name );
+		querySetCell( q, "introduced", arguments.introduced );
+
+		var sort = [];
+		var intro = [];
+		loop list="#arguments.introduced#" delimiters="." item="local.v" {
+			if ( v eq "000" ) v = 0;
+			arrayAppend( sort, numberFormat( v, "0000" ) );
+			arrayAppend( intro, v );
+		}
+		querySetCell( q, "introduced", intro.toList( "." ) );
+		querySetCell( q, "sort", sort.toList( "" ) );
+		querySetCell( q, "description", arguments.description );
+	}
+
+	loop collection="#pc#" key="key" value="value" {
+		if ( structKeyExists( checklist, value.page.getPageType() ) ) {
+			if ( len( value.page.getIntroduced() ) gt 0 ) {
+				addChangeLog( q, value.page, key, value.page.getTitle(), value.page.getIntroduced(), "" );
+			} else if ( value.page.getPageType() eq "tag" ) {
+				tagAttr = value.page.getAttributes();
+				if ( isArray( tagAttr ) ) {
+					for ( attr in tagAttr ) {
+						if ( len( attr.introduced ?: "" ) ) {
+							addChangeLog( q, value.page, key, value.page.getName(), attr.introduced,
+								'<cf#value.page.getName()# #attr.name#="#attr.type#">'
+							);
+						}
+					}
+				}
+			} else if ( value.page.getPageType() eq "function" ) {
+				funcArg = value.page.getArguments();
+				if ( isArray( funcArg ) ) {
+					for ( arg in funcArg ) {
+						if ( len( arg.introduced ?: "" ) ) {
+							addChangeLog( q, value.page, key, value.page.getName(), arg.introduced,
+								'#listFirst( value.page.getTitle(), "()" )#( #arg.name#="#arg.type#")'
+							);
+						}
+					}
+				}
+			}
+		}
+	}
+
+	q = new Query( dbtype="query", q=q, sql="select * from q order by sort desc" ).execute().getResult();
+
+	// Body
+	echo( local.changeLog.getBody() & chr(10) & chr(10) );
+
+	// Version
+	echo( "Generated from **" & server.lucee.version & "**" & chr(10) & chr(10) );
+
+	// Changelog items
+	prevIntroduced = "";
+	for ( row in q ) {
+		if ( prevIntroduced neq row.introduced ) {
+			echo( "## " & row.introduced & chr(10) & chr(10) );
+			prevIntroduced = row.introduced;
+		}
+		echo( "- [[" & row.ref & "]] " );
+		if ( len( row.description ) ) {
+			echo( row.description );
+		} else {
+			echo( row.name );
+		}
+		echo( chr(10) );
+	}
+</cfscript>
diff --git a/builders/markdown/templates/function.cfm b/builders/markdown/templates/function.cfm
new file mode 100644
index 000000000..fbd7b8292
--- /dev/null
+++ b/builders/markdown/templates/function.cfm
@@ -0,0 +1,85 @@
+<cfscript>
+	param name="arguments.args.page" type="page";
+	local.args = arguments.args;
+	local.fn = args.page;
+	local.argumentsHaveDefaultValues = local.fn.argumentsHaveDefaultValues();
+
+	// Title
+	echo( "## " & local.fn.getTitle() & chr(10) & chr(10) );
+
+	// Body
+	echo( local.fn.getBody() & chr(10) );
+
+	// Status
+	if ( len( local.fn.getStatus() ) gt 0 and ( local.fn.getStatus() neq "implemented" and local.fn.getStatus() neq "implemeted" ) ) {
+		echo( chr(10) & "**Status:** " & local.fn.getStatus() & chr(10) );
+	}
+
+	// Alias
+	if ( len( local.fn.getAlias() ) gt 0 ) {
+		echo( chr(10) & "**Alias:** " & local.fn.getAlias() & chr(10) );
+	}
+
+	// Introduced
+	if ( len( local.fn.getIntroduced() ) gt 0 ) {
+		echo( chr(10) & "**Introduced:** " & local.fn.getIntroduced() & chr(10) );
+	}
+
+	// Extension
+	if ( len( local.fn.getSrcExtension() ) gt 0 ) {
+		echo( chr(10) & "**Requires Extension:** [" & local.fn.getSrcExtension().name & "](https://download.lucee.org/##" & local.fn.getSrcExtension().id & ")" & chr(10) );
+	}
+
+	// Usage signature
+	echo( chr(10) & "```" & chr(10) );
+	echo( local.fn.getUsageSignature( plainText=true ) );
+	echo( chr(10) & "```" & chr(10) & chr(10) );
+
+	// Returns
+	echo( "**Returns:** " & local.fn.getReturnType() & chr(10) );
+	if ( len( trim( local.fn.getReturnTypeDesc() ) ) ) {
+		echo( chr(10) & trim( local.fn.getReturnTypeDesc() ) & chr(10) );
+	}
+
+	// Arguments
+	if ( !local.fn.getArguments().len() ) {
+		if ( local.fn.getArgumentType() == "dynamic" ) {
+			echo( chr(10) & "*This function takes zero or more dynamic arguments. See examples for details.*" & chr(10) );
+		} else {
+			echo( chr(10) & "*This function does not take any arguments.*" & chr(10) );
+		}
+	} else {
+		echo( chr(10) & "## Arguments" & chr(10) & chr(10) );
+		echo( "| Argument | Type | Required | Description | Default |" & chr(10) );
+		echo( "|----------|------|----------|-------------|---------|" & chr(10) );
+
+		for ( local.arg in local.fn.getArguments() ) {
+			if ( local.arg.status neq "implemented" ) {
+				continue;
+			}
+			echo( "| " & markdownTableCell( local.arg.name ) );
+			echo( " | " & markdownTableCell( local.arg.type ) );
+			echo( " | " & ( local.arg.required ? 'Yes' : 'No' ) );
+			echo( " | " & markdownTableCell( trim( local.arg.description ) & ( len( local.arg.alias ) gt 0 ? " *Alias: " & ListChangeDelims( local.arg.alias, ", ", "," ) & "*" : "" ) ) );
+			echo( " | " & markdownTableCell( local.arg.default ?: "" ) );
+			echo( " |" & chr(10) );
+		}
+	}
+
+	// Usage notes
+	if ( len( trim( local.fn.getUsageNotes() ) ) ) {
+		echo( chr(10) & "## Usage Notes" & chr(10) & chr(10) );
+		echo( trim( local.fn.getUsageNotes() ) & chr(10) );
+	}
+
+	// Examples
+	echo( chr(10) & "## Examples" & chr(10) );
+	if ( len( trim( local.fn.getExamples() ) ) ) {
+		echo( chr(10) & trim( local.fn.getExamples() ) & chr(10) );
+	} else {
+		echo( chr(10) & "*There are currently no examples for this function*" & chr(10) );
+	}
+
+	// Categories and related
+	echo( renderCategoriesAndRelated( local.fn, args.docTree, true ) );
+</cfscript>
diff --git a/builders/markdown/templates/implementationStatus.cfm b/builders/markdown/templates/implementationStatus.cfm
new file mode 100644
index 000000000..ec2328858
--- /dev/null
+++ b/builders/markdown/templates/implementationStatus.cfm
@@ -0,0 +1,31 @@
+<cfscript>
+	param name="args.page" type="page";
+	param name="args.docTree" type="any";
+
+	local.pg = args.page;
+	local.status = arguments.args.docTree.getReferenceByStatus( arguments.args.page.getStatusFilter() );
+
+	// Title
+	echo( "## " & local.pg.getTitle() & chr(10) & chr(10) );
+
+	// Body
+	echo( local.pg.getBody() & chr(10) & chr(10) );
+
+	// Functions
+	if ( structCount( local.status.function ) gt 0 ) {
+		echo( "## Functions" & chr(10) & chr(10) );
+		loop collection="#local.status.function#" index="local.i" item="local.child" {
+			echo( "- [[" & local.child.getId() & "]] - " & local.child.getDescription() & chr(10) );
+		}
+		echo( chr(10) );
+	}
+
+	// Tags
+	if ( structCount( local.status.tag ) gt 0 ) {
+		echo( "## Tags" & chr(10) & chr(10) );
+		loop collection="#local.status.tag#" index="local.i" item="local.child" {
+			echo( "- [[" & local.child.getId() & "]] - " & local.child.getDescription() & chr(10) );
+		}
+		echo( chr(10) );
+	}
+</cfscript>
diff --git a/builders/markdown/templates/page.cfm b/builders/markdown/templates/page.cfm
new file mode 100644
index 000000000..c0deeb4f6
--- /dev/null
+++ b/builders/markdown/templates/page.cfm
@@ -0,0 +1,19 @@
+<cfscript>
+	param name="arguments.args.page" type="page";
+	local.pg = arguments.args.page;
+	local.body = local.pg.getBody();
+
+	// Title
+	echo( "## " & local.pg.getTitle() & chr(10) );
+
+	// Introduced
+	if ( structKeyExists( local.pg, "since" ) ) {
+		echo( chr(10) & "**Introduced:** " & local.pg.since & chr(10) );
+	}
+
+	// Body
+	echo( chr(10) & local.body & chr(10) );
+
+	// Categories and related
+	echo( renderCategoriesAndRelated( local.pg, arguments.args.docTree, true ) );
+</cfscript>
diff --git a/builders/markdown/templates/tag.cfm b/builders/markdown/templates/tag.cfm
new file mode 100644
index 000000000..b97ad7100
--- /dev/null
+++ b/builders/markdown/templates/tag.cfm
@@ -0,0 +1,80 @@
+<cfscript>
+	local.args = arguments.args;
+	param name="args.page" type="page";
+
+	local.tag = args.page;
+	local.attributesHaveDefaultValues = tag.attributesHaveDefaultValues();
+
+	// Title
+	echo( "## " & local.tag.getTitle() & chr(10) & chr(10) );
+
+	// Body
+	echo( local.tag.getBody() & chr(10) & chr(10) );
+
+	// Body type and script support
+	if ( len( trim( local.tag.getBodyTypeDescription() ) ) ) {
+		echo( trim( local.tag.getBodyTypeDescription() ) & chr(10) );
+	}
+	if ( len( trim( local.tag.getScriptSupportDescription() ) ) ) {
+		echo( trim( local.tag.getScriptSupportDescription() ) & chr(10) );
+	}
+
+	// Status
+	if ( len( local.tag.getStatus() ) gt 0 and ( local.tag.getStatus() neq "implemented" and local.tag.getStatus() neq "implemeted" ) ) {
+		echo( chr(10) & "**Status:** " & local.tag.getStatus() & chr(10) );
+	}
+
+	// Introduced
+	if ( len( local.tag.getIntroduced() ) gt 0 ) {
+		echo( chr(10) & "**Introduced:** " & local.tag.getIntroduced() & chr(10) );
+	}
+
+	// Extension
+	if ( len( local.tag.getSrcExtension() ) gt 0 ) {
+		echo( chr(10) & "**Requires Extension:** [" & local.tag.getSrcExtension().name & "](https://download.lucee.org/##" & local.tag.getSrcExtension().id & ")" & chr(10) );
+	}
+
+	// Usage signature
+	echo( chr(10) & "```" & chr(10) );
+	echo( local.tag.getUsageSignature( plainText=true ) );
+	echo( chr(10) & "```" & chr(10) & chr(10) );
+
+	// Attributes
+	if ( !local.tag.getAttributes().len() ) {
+		echo( "*This tag does not use any attributes.*" & chr(10) & chr(10) );
+	} else {
+		echo( "## Attributes" & chr(10) & chr(10) );
+		echo( "| Attribute | Type | Required | Description | Default |" & chr(10) );
+		echo( "|-----------|------|----------|-------------|---------|" & chr(10) );
+
+		for ( local.attrib in local.tag.getAttributes() ) {
+			if ( local.attrib.status neq "implemented" ) {
+				continue;
+			}
+			echo( "| " & markdownTableCell( local.attrib.name ) );
+			echo( " | " & markdownTableCell( local.attrib.type ) );
+			echo( " | " & ( local.attrib.required ? 'Yes' : 'No' ) );
+			echo( " | " & markdownTableCell( ( local.attrib.description ?: "" ) & ( structKeyExists( local.attrib, "aliases" ) && ArrayLen( local.attrib.aliases ) gt 0 ? " *Alias: " & ArrayToList( local.attrib.aliases, ", " ) & "*" : "" ) ) );
+			echo( " | " & markdownTableCell( local.attrib.defaultValue ?: "" ) );
+			echo( " |" & chr(10) );
+		}
+		echo( chr(10) );
+	}
+
+	// Usage notes
+	if ( len( trim( local.tag.getUsageNotes() ) ) ) {
+		echo( chr(10) & "## Usage Notes" & chr(10) & chr(10) );
+		echo( trim( local.tag.getUsageNotes() ) & chr(10) & chr(10) );
+	}
+
+	// Examples
+	echo( "## Examples" & chr(10) & chr(10) );
+	if ( len( trim( local.tag.getExamples() ) ) ) {
+		echo( trim( local.tag.getExamples() ) & chr(10) & chr(10) );
+	} else {
+		echo( "*There are currently no examples for this tag.*" & chr(10) & chr(10) );
+	}
+
+	// Categories and related
+	echo( renderCategoriesAndRelated( local.tag, args.docTree, true ) );
+</cfscript>
diff --git a/server/Application.cfc b/server/Application.cfc
index 0b4752153..fd442840d 100644
--- a/server/Application.cfc
+++ b/server/Application.cfc
@@ -109,7 +109,8 @@ component {
 			_404(pagePath, "/");
 		}
 
-		WriteOutput( buildRunner.getBuilder( "html" ).renderPage( page, docTree, true ) );
+		var pageContent = buildRunner.getBuilder( "html" ).renderPageContent( page, docTree, false, {} );
+		WriteOutput( buildRunner.getBuilder( "html" ).renderPage( page, docTree, pageContent, true, {} ) );
 	}
 
 	private void function _renderSource() {
@@ -185,17 +186,37 @@ component {
 	}
 
 	private void function _renderStatic() {
-		var staticFile = listRest(_getRequestUri(), "/");
+		var requestUri = _getRequestUri();
+		var staticFile = listRest(requestUri, "/");
 		if (len(staticFile) eq 0)
 			staticFile = "index.html";
 
-		var staticAssetPath = "/builds/html/" & staticFile ;
+		// Check Accept header for content negotiation
+		var acceptHeader = cgi.http_accept ?: "";
+		var preferMarkdown = findNoCase("text/markdown", acceptHeader) gt 0;
+
+		// If markdown is preferred and requesting an HTML file, try to serve .md instead
+		if (preferMarkdown and listLast(staticFile, ".") eq "html") {
+			var baseName = listDeleteAt(staticFile, listLen(staticFile, "."), ".");
+			var mdFile = baseName & ".md";
+			var mdPath = "/builds/html/" & mdFile;
+			if (FileExists(mdPath)) {
+				staticFile = mdFile;
+			}
+		}
+
+		var staticAssetPath = "/builds/html/" & staticFile;
 
 		if ( !FileExists( staticAssetPath ) ) {
 			_404(staticAssetPath, "/static/");
 		}
 		var pageContent = fileRead(staticAssetPath);
-		pagecontent = reReplace(pagecontent, '\<a href="\/', '<a href="/static/', 'all');
+
+		// Only rewrite links for HTML files
+		var fileExt = listLast(staticFile, ".");
+		if (fileExt eq "html") {
+			pagecontent = reReplace(pagecontent, '\<a href="\/', '<a href="/static/', 'all');
+		}
 
 		header name="cache-control" value="no-cache";
 		setting showdebugoutput="no";
@@ -360,6 +381,7 @@ component {
 			case "ttf": return "application/octet-stream";
 			case "html": return "text/html";
 			case "text": return "text/plain";
+			case "md": return "text/markdown";
 		}
 
 		return "application/octet-stream";