diff --git a/website/src/components/layout/index.js b/website/src/components/layout/index.js
index 2a0878c3c..8467a1d7c 100644
--- a/website/src/components/layout/index.js
+++ b/website/src/components/layout/index.js
@@ -13,73 +13,13 @@ import Progress from '../progress'
 import Footer from '../footer'
 import SEO from '../seo'
 import Link from '../link'
-import Section, { Hr } from '../section'
-import { Table, Tr, Th, Tx, Td } from '../table'
-import { Pre, Code, InlineCode, TypeAnnotation } from '../code'
-import { Ol, Ul, Li } from '../list'
-import { H2, H3, H4, H5, P, Abbr, Help } from '../typography'
-import Accordion from '../accordion'
-import Infobox from '../infobox'
-import Aside from '../aside'
-import Button from '../button'
-import Tag from '../tag'
-import Grid from '../grid'
-import { YouTube, SoundCloud, Iframe, Image, GoogleSheet } from '../embed'
+import { InlineCode } from '../code'
 import Alert from '../alert'
 import Search from '../search'
-import Project from '../../widgets/project'
-import { Integration, IntegrationLogo } from '../../widgets/integration'
 
 import siteMetadata from '../../../meta/site.json'
 import { nightly, legacy } from '../../../meta/dynamicMeta'
-
-const mdxComponents = {
-    a: Link,
-    p: P,
-    pre: Pre,
-    code: Code,
-    inlineCode: InlineCode,
-    del: TypeAnnotation,
-    table: Table,
-    img: Image,
-    tr: Tr,
-    th: Th,
-    td: Td,
-    ol: Ol,
-    ul: Ul,
-    li: Li,
-    h2: H2,
-    h3: H3,
-    h4: H4,
-    h5: H5,
-    blockquote: Aside,
-    section: Section,
-    wrapper: ({ children }) => children,
-    hr: Hr,
-}
-
-const scopeComponents = {
-    Infobox,
-    Table,
-    Tr,
-    Tx,
-    Th,
-    Td,
-    Help,
-    Button,
-    YouTube,
-    SoundCloud,
-    Iframe,
-    GoogleSheet,
-    Abbr,
-    Tag,
-    Accordion,
-    Grid,
-    InlineCode,
-    Project,
-    Integration,
-    IntegrationLogo,
-}
+import { remarkComponents } from '../../markdown'
 
 const AlertSpace = ({ nightly, legacy }) => {
     const isOnline = useOnlineStatus()
@@ -158,7 +98,7 @@ class Layout extends React.Component {
         // NB: Compiling the scope here instead of in render() is super
         // important! Otherwise, it triggers unnecessary rerenders of ALL
         // consumers (e.g. mdx elements), even on anchor navigation!
-        this.state = { scope: { ...scopeComponents, ...props.scope } }
+        this.state = { scope: { ...remarkComponents, ...props.scope } }
     }
 
     render() {
@@ -170,7 +110,7 @@ class Layout extends React.Component {
         const bodyClass = classNames(`theme-${uiTheme}`, { 'search-exclude': !!searchExclude })
         const isDocs = ['usage', 'models', 'api', 'styleguide'].includes(section)
         const content = !mdx ? null : (
-            <MDXProvider components={mdxComponents}>
+            <MDXProvider components={remarkComponents}>
                 <MDXRenderer scope={this.state.scope}>{mdx.code.body}</MDXRenderer>
             </MDXProvider>
         )
diff --git a/website/src/markdown.js b/website/src/markdown.js
new file mode 100644
index 000000000..4924dd5c6
--- /dev/null
+++ b/website/src/markdown.js
@@ -0,0 +1,67 @@
+import React from 'react'
+
+import Accordion from './components/accordion'
+import Aside from './components/aside'
+import Button from './components/button'
+import { InlineCode, Pre, TypeAnnotation } from './components/code'
+import { GoogleSheet, Iframe, Image, SoundCloud, YouTube } from './components/embed'
+import Grid from './components/grid'
+import Infobox from './components/infobox'
+import Link from './components/link'
+import { Li, Ol, Ul } from './components/list'
+import Section, { Hr } from './components/section'
+import { Table, Td, Th, Tr, Tx } from './components/table'
+import Tag from './components/tag'
+import { Abbr, H2, H3, H4, H5, Help, Paragraph } from './components/typography'
+import { Integration, IntegrationLogo } from './widgets/integration'
+import Project from './widgets/project'
+
+export const remarkComponents = {
+    createElement: React.createElement,
+    components: {
+        a: Link,
+        p: Paragraph,
+        pre: Pre,
+        // code: Code,
+        code: InlineCode,
+        pre: Pre,
+        del: TypeAnnotation,
+        table: Table,
+        img: Image,
+        tr: Tr,
+        th: Th,
+        td: Td,
+        ol: Ol,
+        ul: Ul,
+        li: Li,
+        h2: H2,
+        h3: H3,
+        h4: H4,
+        h5: H5,
+        blockquote: Aside,
+        section: Section,
+        wrapper: ({ children }) => children,
+        hr: Hr,
+
+        infobox: Infobox,
+        table: Table,
+        tr: Tr,
+        tx: Tx,
+        th: Th,
+        td: Td,
+        help: Help,
+        button: Button,
+        youtube: YouTube,
+        soundcloud: SoundCloud,
+        iframe: Iframe,
+        googlesheet: GoogleSheet,
+        abbr: Abbr,
+        tag: Tag,
+        accordion: Accordion,
+        grid: Grid,
+        inlinecode: InlineCode,
+        project: Project,
+        integration: Integration,
+        integrationlogo: IntegrationLogo,
+    },
+}