diff --git a/arrow-libs/ank/arrow-ank/src/main/kotlin/arrow/ank/interpreter.kt b/arrow-libs/ank/arrow-ank/src/main/kotlin/arrow/ank/interpreter.kt
index 6d0f05d5092..e9e4b03c275 100644
--- a/arrow-libs/ank/arrow-ank/src/main/kotlin/arrow/ank/interpreter.kt
+++ b/arrow-libs/ank/arrow-ank/src/main/kotlin/arrow/ank/interpreter.kt
@@ -146,12 +146,12 @@ public val interpreter: AnkOps = object : AnkOps {
       snippets.second.mapIndexed { i, snip ->
         val result = try {
           if (snip.isPlaygroundExtension) ""
-          else engineCache.getOrElse(snip.lang) {
+          else engineCache.getOrElse(snip.lang.trim { it == '`' }) {
             throw CompilationException(
               path = snippets.first,
               snippet = snip,
               underlying = IllegalStateException("No engine configured for `${snip.lang}`"),
-              msg = colored(ANSI_RED, "ΛNK compilation failed [ ${snippets.first} ]")
+              msg = colored(ANSI_RED, "ΛNK compilation failed - No engine configured for `${snip.lang}` [ ${snippets.first} ]")
             )
           }.eval(snip.code)
         } catch (e: Exception) {
diff --git a/arrow-libs/ank/arrow-ank/src/main/kotlin/arrow/ank/main.kt b/arrow-libs/ank/arrow-ank/src/main/kotlin/arrow/ank/main.kt
index 543b17276d5..8b51a969c29 100644
--- a/arrow-libs/ank/arrow-ank/src/main/kotlin/arrow/ank/main.kt
+++ b/arrow-libs/ank/arrow-ank/src/main/kotlin/arrow/ank/main.kt
@@ -7,12 +7,23 @@ import java.nio.file.Paths
 public suspend fun main(vararg args: String): Unit =
   when {
     args.size > 1 -> {
-      ank(
-        Paths.get(args[0]),
-        Paths.get(args[1]),
-        args.drop(2),
-        interpreter
-      )
+      println("####################################################################################################################")
+      println("####################################################################################################################")
+      println("####################################################################################################################")
+      println("####################################################################################################################")
+      println("####################################################################################################################")
+      println("####################################################################################################################")
+      try {
+        ank(
+          Paths.get(args[0]),
+          Paths.get(args[1]),
+          args.drop(2),
+          interpreter
+        )
+      } catch (e: Throwable) {
+        println("####################################################################################################################")
+        e.printStackTrace()
+      }
     }
     else -> throw IllegalArgumentException("Required first 2 args as directory paths in this order: <required: source> <required: destination> <optional: classpath entries, one per arg..>")
   }
diff --git a/arrow-libs/ank/settings.gradle b/arrow-libs/ank/settings.gradle
index 439114066d0..0bbcb95a285 100644
--- a/arrow-libs/ank/settings.gradle
+++ b/arrow-libs/ank/settings.gradle
@@ -24,3 +24,6 @@ include 'arrow-fx-coroutines-test'
 
 project(":arrow-fx-coroutines").projectDir = file("../fx/arrow-fx-coroutines")
 project(":arrow-fx-coroutines-test").projectDir = file("../fx/arrow-fx-coroutines-test")
+
+include 'jekyll'
+project(":jekyll").projectDir = file("dokka/jekyll")
\ No newline at end of file
diff --git a/arrow-libs/build.gradle b/arrow-libs/build.gradle
index 8b0505560e8..76d3fd4f8f6 100644
--- a/arrow-libs/build.gradle
+++ b/arrow-libs/build.gradle
@@ -22,7 +22,7 @@ plugins {
 apply from: "gradle/$ROOT_PROJECT"
 
 task generateDoc(type: Exec) {
-  commandLine "sh", "gradlew", "dokkaJekyll"
+  commandLine "sh", "gradlew", "dokkaGfm"
 }
 
 task runValidation(type: Exec) {
@@ -38,3 +38,7 @@ task buildDoc {
 }
 
 runValidation.mustRunAfter generateDoc
+
+apiValidation {
+    ignoredProjects += ["jekyll"]
+}
diff --git a/arrow-libs/core/arrow-core/src/commonMain/kotlin/arrow/core/Either.kt b/arrow-libs/core/arrow-core/src/commonMain/kotlin/arrow/core/Either.kt
index 69cb2d01ba8..63a8ac74671 100644
--- a/arrow-libs/core/arrow-core/src/commonMain/kotlin/arrow/core/Either.kt
+++ b/arrow-libs/core/arrow-core/src/commonMain/kotlin/arrow/core/Either.kt
@@ -71,6 +71,7 @@ import kotlin.jvm.JvmStatic
  *  println(left)
  * }
  * ```
+ *
  * Because `Either` is right-biased, it is possible to define a Monad instance for it.
  *
  * Since we only ever want the computation to continue in the case of `Right` (as captured by the right-bias nature),
@@ -1196,25 +1197,21 @@ public inline fun <A, B> Either<A, B>.filterOrElse(predicate: (B) -> Boolean, de
  *
  * Example:
  *
- * {: data-executable='true'}
- * ```kotlin:ank
+ * ```kotlin:ank:playground
  * import arrow.core.*
- * import arrow.core.Either.Right
  *
- * Right(12).filterOrOther({ it > 10 }, { -1 })
- * ```
- *
- * {: data-executable='true'}
- * ```kotlin:ank
- * Right(7).filterOrOther({ it > 10 }, { "Value '$it' not greater than 10" })
- * ```
+ * suspend fun main(): Unit {
+ *   //sampleStart
+ *   Either.Right(7).filterOrOther({ it == 10 }, { "Value '$it' is not equal to 10" })
+ *     .let(::println) // Either.Left(Value '7' is not equal to 10")
  *
- * {: data-executable='true'}
- * ```kotlin:ank
- * import arrow.core.Either.Left
+ *   Either.Right(10).filterOrOther({ it == 10 }, { "Value '$it' is not equal to 10" })
+ *     .let(::println) // Either.Right(10)
  *
- * val left: Either<Int, Int> = Left(12)
- * left.filterOrOther({ it > 10 }, { -1 })
+ *   Either.Left(12).filterOrOther({ str: String -> str.contains("impossible") }, { -1 })
+ *     .let(::println) // Either.Left(12)
+ *   //sampleEnd
+ * }
  * ```
  */
 public inline fun <A, B> Either<A, B>.filterOrOther(predicate: (B) -> Boolean, default: (B) -> A): Either<A, B> =
diff --git a/arrow-libs/core/arrow-core/src/commonMain/kotlin/arrow/core/NonFatal.kt b/arrow-libs/core/arrow-core/src/commonMain/kotlin/arrow/core/NonFatal.kt
index 5c79d20f358..4b61d3b7ca9 100644
--- a/arrow-libs/core/arrow-core/src/commonMain/kotlin/arrow/core/NonFatal.kt
+++ b/arrow-libs/core/arrow-core/src/commonMain/kotlin/arrow/core/NonFatal.kt
@@ -28,10 +28,10 @@ import kotlin.coroutines.cancellation.CancellationException
  *   val nonFatal: Either<Throwable, String> =
  *   //sampleStart
  *   try {
- *      Right(unsafeFunction(1))
+ *      Either.Right(unsafeFunction(1))
  *   } catch (t: Throwable) {
  *     if (NonFatal(t)) {
- *         Left(t)
+ *         Either.Left(t)
  *     } else {
  *         throw t
  *     }
diff --git a/arrow-libs/core/arrow-core/src/commonMain/kotlin/arrow/core/nonFatalOrThrow.kt b/arrow-libs/core/arrow-core/src/commonMain/kotlin/arrow/core/nonFatalOrThrow.kt
index 5cd8f6bac33..30f8caadca6 100644
--- a/arrow-libs/core/arrow-core/src/commonMain/kotlin/arrow/core/nonFatalOrThrow.kt
+++ b/arrow-libs/core/arrow-core/src/commonMain/kotlin/arrow/core/nonFatalOrThrow.kt
@@ -21,9 +21,9 @@ package arrow.core
  *   val nonFatal: Either<Throwable, String> =
  *   //sampleStart
  *   try {
- *      Right(unsafeFunction(1))
+ *      Either.Right(unsafeFunction(1))
  *   } catch (t: Throwable) {
- *       Left(t.nonFatalOrThrow())
+ *       Either.Left(t.nonFatalOrThrow())
  *   }
  *   //sampleEnd
  *   println(nonFatal)
diff --git a/arrow-libs/core/arrow-meta/arrow-meta-test-models/build.gradle b/arrow-libs/core/arrow-meta/arrow-meta-test-models/build.gradle
index a430466409d..dad1db3af53 100644
--- a/arrow-libs/core/arrow-meta/arrow-meta-test-models/build.gradle
+++ b/arrow-libs/core/arrow-meta/arrow-meta-test-models/build.gradle
@@ -4,8 +4,6 @@ plugins {
     id "org.jlleitschuh.gradle.ktlint"
 }
 
-apply from: "../$DOC_CREATION"
-
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$KOTLIN_VERSION"
     implementation "com.google.auto.service:auto-service:$GOOGLE_AUTO_SERVICE_VERSION"
diff --git a/arrow-libs/core/arrow-meta/build.gradle b/arrow-libs/core/arrow-meta/build.gradle
index 1b823dceaae..5cc6b0bc587 100644
--- a/arrow-libs/core/arrow-meta/build.gradle
+++ b/arrow-libs/core/arrow-meta/build.gradle
@@ -7,7 +7,6 @@ plugins {
 }
 
 apply from: "$SUB_PROJECT"
-apply from: "$DOC_CREATION"
 apply from: "$PUBLICATION"
 
 dependencies {
diff --git a/arrow-libs/core/settings.gradle b/arrow-libs/core/settings.gradle
index f857941dca3..8c28aadcee2 100644
--- a/arrow-libs/core/settings.gradle
+++ b/arrow-libs/core/settings.gradle
@@ -9,3 +9,6 @@ include 'arrow-core'
 include 'arrow-core-test'
 include 'arrow-continuations'
 include 'arrow-core-retrofit'
+
+include 'jekyll'
+project(":jekyll").projectDir = file("dokka/jekyll")
\ No newline at end of file
diff --git a/arrow-libs/dokka/jekyll/build.gradle b/arrow-libs/dokka/jekyll/build.gradle
new file mode 100644
index 00000000000..9cb3c56ebf1
--- /dev/null
+++ b/arrow-libs/dokka/jekyll/build.gradle
@@ -0,0 +1,12 @@
+plugins {
+    id "org.jetbrains.kotlin.jvm"
+    id "org.jlleitschuh.gradle.ktlint"
+}
+
+apply from: "$SUB_PROJECT"
+
+dependencies {
+    compileOnly "org.jetbrains.dokka:dokka-core:$DOKKA_VERSION"
+    implementation "org.jetbrains.dokka:dokka-base:$DOKKA_VERSION"
+    implementation "org.jetbrains.dokka:gfm-plugin:$DOKKA_VERSION"
+}
diff --git a/arrow-libs/dokka/jekyll/gradle.properties b/arrow-libs/dokka/jekyll/gradle.properties
new file mode 100644
index 00000000000..063f7e883eb
--- /dev/null
+++ b/arrow-libs/dokka/jekyll/gradle.properties
@@ -0,0 +1,4 @@
+# Maven publishing configuration
+POM_NAME=Arrow Dokka Jekyll
+POM_ARTIFACT_ID=arrow-dokka-jekyll
+POM_PACKAGING=jar
diff --git a/arrow-libs/dokka/jekyll/src/main/kotlin/com/github/nomisRev/DokkaFenceWorkaroundPlugin.kt b/arrow-libs/dokka/jekyll/src/main/kotlin/com/github/nomisRev/DokkaFenceWorkaroundPlugin.kt
new file mode 100644
index 00000000000..d2b0b8ebbab
--- /dev/null
+++ b/arrow-libs/dokka/jekyll/src/main/kotlin/com/github/nomisRev/DokkaFenceWorkaroundPlugin.kt
@@ -0,0 +1,228 @@
+package com.github.nomisRev
+
+import org.jetbrains.dokka.CoreExtensions
+import org.jetbrains.dokka.DokkaConfiguration
+import org.jetbrains.dokka.base.DokkaBase
+import org.jetbrains.dokka.base.renderers.PackageListCreator
+import org.jetbrains.dokka.base.renderers.RootCreator
+import org.jetbrains.dokka.base.resolvers.local.DokkaLocationProviderFactory
+import org.jetbrains.dokka.base.resolvers.local.LocationProviderFactory
+import org.jetbrains.dokka.base.resolvers.shared.RecognizedLinkFormat
+import org.jetbrains.dokka.base.transformers.pages.comments.CommentsToContentConverter
+import org.jetbrains.dokka.base.transformers.pages.comments.DocTagToContentConverter
+import org.jetbrains.dokka.gfm.GfmPlugin
+import org.jetbrains.dokka.gfm.renderer.BriefCommentPreprocessor
+import org.jetbrains.dokka.gfm.renderer.CommonmarkRenderer
+import org.jetbrains.dokka.model.DisplaySourceSet
+import org.jetbrains.dokka.model.doc.CodeBlock
+import org.jetbrains.dokka.model.doc.DocTag
+import org.jetbrains.dokka.model.properties.PropertyContainer
+import org.jetbrains.dokka.model.toDisplaySourceSets
+import org.jetbrains.dokka.pages.ContentCodeBlock
+import org.jetbrains.dokka.pages.ContentCodeInline
+import org.jetbrains.dokka.pages.ContentDivergentGroup
+import org.jetbrains.dokka.pages.ContentDivergentInstance
+import org.jetbrains.dokka.pages.ContentGroup
+import org.jetbrains.dokka.pages.ContentNode
+import org.jetbrains.dokka.pages.ContentPage
+import org.jetbrains.dokka.pages.ContentTable
+import org.jetbrains.dokka.pages.DCI
+import org.jetbrains.dokka.pages.PlatformHintedContent
+import org.jetbrains.dokka.pages.SimpleAttr
+import org.jetbrains.dokka.pages.Style
+import org.jetbrains.dokka.plugability.DokkaContext
+import org.jetbrains.dokka.plugability.DokkaPlugin
+import org.jetbrains.dokka.plugability.Extension
+import org.jetbrains.dokka.plugability.ExtensionPoint
+import org.jetbrains.dokka.plugability.plugin
+import org.jetbrains.dokka.plugability.query
+import org.jetbrains.dokka.renderers.Renderer
+import org.jetbrains.dokka.transformers.pages.PageTransformer
+
+public class DokkaFenceWorkaround : DokkaPlugin() {
+  public val jekyllPreprocessors: ExtensionPoint<PageTransformer> by extensionPoint()
+
+  private val dokkaBase by lazy { plugin<DokkaBase>() }
+  private val gfmPlugin by lazy { plugin<GfmPlugin>() }
+
+  public val renderer: Extension<Renderer, *, *> by extending {
+    (CoreExtensions.renderer
+      providing { JekyllRenderer(it) }
+      override plugin<GfmPlugin>().renderer)
+  }
+
+  public val comments: Extension<CommentsToContentConverter, *, *> by extending {
+    dokkaBase.commentsToContentConverter with PatchedDocTagToContentConverter() override dokkaBase.docTagToContentConverter
+  }
+
+  public val rootCreator: Extension<PageTransformer, *, *> by extending {
+    jekyllPreprocessors with RootCreator
+  }
+
+  public val briefCommentPreprocessor: Extension<PageTransformer, *, *> by extending {
+    jekyllPreprocessors with BriefCommentPreprocessor()
+  }
+
+  public val packageListCreator: Extension<PageTransformer, *, *> by extending {
+    jekyllPreprocessors providing {
+      PackageListCreator(it, RecognizedLinkFormat.DokkaJekyll)
+    } order { after(rootCreator) }
+  }
+
+  public val locationProvider: Extension<LocationProviderFactory, *, *> by extending {
+    dokkaBase.locationProviderFactory providing ::DokkaLocationProviderFactory override listOf(gfmPlugin.locationProvider)
+  }
+}
+
+public class JekyllRenderer(context: DokkaContext) : CommonmarkRenderer(context) {
+
+  override val preprocessors: List<PageTransformer> =
+    context.plugin<DokkaFenceWorkaround>().query { jekyllPreprocessors }
+
+  override fun StringBuilder.buildNewLine() {
+    append("\n")
+  }
+
+  public fun StringBuilder.buildParagraph() {
+    buildNewLine()
+    buildNewLine()
+  }
+
+  override fun buildPage(page: ContentPage, content: (StringBuilder, ContentPage) -> Unit): String {
+    val builder = StringBuilder()
+    builder.append("---\n")
+    builder.append("title: ${page.name}\n")
+    builder.append("---\n")
+    content(builder, page)
+    return builder.toString()
+  }
+
+  override fun StringBuilder.buildDivergent(node: ContentDivergentGroup, pageContext: ContentPage) {
+
+    val distinct =
+      node.groupDivergentInstances(pageContext, { instance, contentPage, sourceSet ->
+        instance.before?.let { before ->
+          buildString { buildContentNode(before, pageContext, sourceSet) }
+        } ?: ""
+      }, { instance, contentPage, sourceSet ->
+        instance.after?.let { after ->
+          buildString { buildContentNode(after, pageContext, sourceSet) }
+        } ?: ""
+      })
+
+    distinct.values.forEach { entry ->
+      val (instance, sourceSets) = entry.getInstanceAndSourceSets()
+
+      buildParagraph()
+      buildSourceSetTags(sourceSets)
+      buildNewLine()
+
+      instance.before?.let {
+        buildContentNode(
+          it,
+          pageContext,
+          sourceSets.first()
+        ) // It's workaround to render content only once
+        buildParagraph()
+      }
+
+      entry.groupBy { buildString { buildContentNode(it.first.divergent, pageContext, setOf(it.second)) } }
+        .values.forEach { innerEntry ->
+          val (innerInstance, innerSourceSets) = innerEntry.getInstanceAndSourceSets()
+          if (sourceSets.size > 1) {
+            buildSourceSetTags(innerSourceSets)
+            buildNewLine()
+          }
+          innerInstance.divergent.build(
+            this@buildDivergent,
+            pageContext,
+            setOf(innerSourceSets.first())
+          ) // It's workaround to render content only once
+          buildParagraph()
+        }
+
+      instance.after?.let {
+        buildContentNode(
+          it,
+          pageContext,
+          sourceSets.first()
+        ) // It's workaround to render content only once
+      }
+
+      buildParagraph()
+    }
+  }
+
+  private fun List<Pair<ContentDivergentInstance, DisplaySourceSet>>.getInstanceAndSourceSets() =
+    this.let { Pair(it.first().first, it.map { it.second }.toSet()) }
+
+  override fun StringBuilder.buildPlatformDependent(
+    content: PlatformHintedContent,
+    pageContext: ContentPage,
+    sourceSetRestriction: Set<DisplaySourceSet>?
+  ) {
+    buildPlatformDependentItem(content.inner, content.sourceSets, pageContext)
+  }
+
+  private fun StringBuilder.buildPlatformDependentItem(
+    content: ContentNode,
+    sourceSets: Set<DisplaySourceSet>,
+    pageContext: ContentPage,
+  ) {
+    if (content is ContentGroup && content.children.firstOrNull { it is ContentTable } != null) {
+      buildContentNode(content, pageContext, sourceSets)
+    } else {
+      val distinct = sourceSets.map {
+        it to buildString { buildContentNode(content, pageContext, setOf(it)) }
+      }.groupBy(Pair<DisplaySourceSet, String>::second, Pair<DisplaySourceSet, String>::first)
+
+      distinct.filter { it.key.isNotBlank() }.forEach { (text, platforms) ->
+        buildParagraph()
+        buildSourceSetTags(platforms.toSet())
+        buildNewLine()
+        append(text.trim())
+        buildParagraph()
+      }
+    }
+  }
+
+  private fun StringBuilder.buildSourceSetTags(sourceSets: Set<DisplaySourceSet>) =
+    sourceSets.forEach { append("""<span class="platform-${it.name}">${it.name}</span>""") }
+
+  override fun StringBuilder.buildCodeBlock(code: ContentCodeBlock, pageContext: ContentPage) {
+    append("```${code.language}\n")
+    code.children.forEach { it.build(this, pageContext) }
+    append("\n```")
+  }
+
+  override fun StringBuilder.buildCodeInline(code: ContentCodeInline, pageContext: ContentPage) {
+    append('`')
+    code.children.forEach { it.build(this, pageContext) }
+    append('`')
+  }
+}
+
+public class PatchedDocTagToContentConverter : DocTagToContentConverter() {
+  override fun buildContent(
+    docTag: DocTag,
+    dci: DCI,
+    sourceSets: Set<DokkaConfiguration.DokkaSourceSet>,
+    styles: Set<Style>,
+    extra: PropertyContainer<ContentNode>
+  ): List<ContentNode> {
+    fun buildChildren(docTag: DocTag, newStyles: Set<Style> = emptySet(), newExtras: SimpleAttr? = null) =
+      docTag.children.flatMap {
+        buildContent(it, dci, sourceSets, styles + newStyles, newExtras?.let { extra + it } ?: extra)
+      }
+
+    return if (docTag is CodeBlock) listOf(
+      ContentCodeBlock(
+        buildChildren(docTag),
+        docTag.params.getOrDefault("lang", ""),
+        dci,
+        sourceSets.toDisplaySourceSets(),
+        styles
+      )
+    ) else super.buildContent(docTag, dci, sourceSets, styles, extra)
+  }
+}
diff --git a/arrow-libs/dokka/jekyll/src/main/resources/META-INF/services/org.jetbrains.dokka.plugability.DokkaPlugin b/arrow-libs/dokka/jekyll/src/main/resources/META-INF/services/org.jetbrains.dokka.plugability.DokkaPlugin
new file mode 100644
index 00000000000..297b52c765d
--- /dev/null
+++ b/arrow-libs/dokka/jekyll/src/main/resources/META-INF/services/org.jetbrains.dokka.plugability.DokkaPlugin
@@ -0,0 +1 @@
+com.github.nomisRev.DokkaFenceWorkaround
diff --git a/arrow-libs/fx/arrow-fx-coroutines/src/commonMain/kotlin/arrow/fx/coroutines/CircuitBreaker.kt b/arrow-libs/fx/arrow-fx-coroutines/src/commonMain/kotlin/arrow/fx/coroutines/CircuitBreaker.kt
index 5356b94ca31..a8c38f2ea71 100644
--- a/arrow-libs/fx/arrow-fx-coroutines/src/commonMain/kotlin/arrow/fx/coroutines/CircuitBreaker.kt
+++ b/arrow-libs/fx/arrow-fx-coroutines/src/commonMain/kotlin/arrow/fx/coroutines/CircuitBreaker.kt
@@ -87,7 +87,7 @@ import kotlin.time.ExperimentalTime
  * import kotlinx.coroutines.delay
  *
  * @ExperimentalTime
- * public suspend fun main(): Unit {
+ * suspend fun main(): Unit {
  *   suspend fun apiCall(): Unit {
  *     println("apiCall . . .")
  *     throw RuntimeException("Overloaded service")
diff --git a/arrow-libs/fx/arrow-fx-coroutines/src/commonMain/kotlin/arrow/fx/coroutines/flow.kt b/arrow-libs/fx/arrow-fx-coroutines/src/commonMain/kotlin/arrow/fx/coroutines/flow.kt
index a626a1d276d..d22aa53eac3 100644
--- a/arrow-libs/fx/arrow-fx-coroutines/src/commonMain/kotlin/arrow/fx/coroutines/flow.kt
+++ b/arrow-libs/fx/arrow-fx-coroutines/src/commonMain/kotlin/arrow/fx/coroutines/flow.kt
@@ -109,6 +109,8 @@ public fun <A, B> Flow<A>.retry(schedule: Schedule<Throwable, B>): Flow<A> = flo
  * concurrently runs, "prefetching", the next element. i.e.
  *
  *  ```kotlin:ank:playground
+ *  import arrow.fx.coroutines.*
+ *
  *  suspend fun main(): Unit {
  *  //sampleStart
  *  val source = flowOf(1, 2, 3, 4)
diff --git a/arrow-libs/fx/arrow-fx-stm/src/commonMain/kotlin/arrow/fx/stm/STM.kt b/arrow-libs/fx/arrow-fx-stm/src/commonMain/kotlin/arrow/fx/stm/STM.kt
index ad9780059cf..0464dfe1875 100644
--- a/arrow-libs/fx/arrow-fx-stm/src/commonMain/kotlin/arrow/fx/stm/STM.kt
+++ b/arrow-libs/fx/arrow-fx-stm/src/commonMain/kotlin/arrow/fx/stm/STM.kt
@@ -1497,7 +1497,7 @@ public inline fun <A> stm(noinline f: STM.() -> A): STM.() -> A = f
  *   val i = 4
  *   val result = atomically {
  *     stm {
- *       check(i > 5) // This calls retry and aborts if i <= 5
+ *       check(i <= 5) // This calls retry and aborts if i <= 5
  *       "Larger than 5"
  *     } orElse { "Smaller than or equal to 5" }
  *   }
diff --git a/arrow-libs/fx/settings.gradle b/arrow-libs/fx/settings.gradle
index befb18cbeb5..c2aca72f237 100644
--- a/arrow-libs/fx/settings.gradle
+++ b/arrow-libs/fx/settings.gradle
@@ -19,3 +19,6 @@ project(":arrow-core-test").projectDir = file("../core/arrow-core-test")
 project(":arrow-annotations").projectDir = file("../core/arrow-annotations")
 project(":arrow-continuations").projectDir = file("../core/arrow-continuations")
 project(":arrow-core-retrofit").projectDir = file("../core/arrow-core-retrofit")
+
+include 'jekyll'
+project(":jekyll").projectDir = file("dokka/jekyll")
\ No newline at end of file
diff --git a/arrow-libs/gradle/apidoc-creation.gradle b/arrow-libs/gradle/apidoc-creation.gradle
index a4b028643a4..589f0c49770 100644
--- a/arrow-libs/gradle/apidoc-creation.gradle
+++ b/arrow-libs/gradle/apidoc-creation.gradle
@@ -16,26 +16,71 @@
 
 apply plugin: "org.jetbrains.dokka"
 
-dokkaJekyll {
-    enabled = file("README.md").exists()
+dokkaGfm {
     outputDirectory = file("${rootDir}/../arrow-site/docs/apidocs")
     dokkaSourceSets {
-        main {
-            includes.from(files("README.md"))
-            reportUndocumented.set(false)
-            // Specifies the location of the project source code on the Web.
-            // If provided, Dokka generates "source" links for each declaration.
-            // Repeat for multiple mappings
-            sourceLink {
-                // Source directory
-                localDirectory.set(file("src/commonMain/kotlin"))
-
-                // URL showing where the source code can be accessed through the web browser
-                remoteUrl.set(uri("https://github.com/arrow-kt/arrow/blob/main/${relativeProjectPath('src/main/kotlin')}").toURL())
-
-                // Suffix which is used to append the line number to the URL. Use #L for GitHub
-                remoteLineSuffix.set("#L")
+        if (file("src/commonMain/kotlin").exists()) {
+            commonMain {
+                perPackageOption {
+                    matchingRegex.set(".*\\.internal.*") // will match all .internal packages and sub-packages
+                    suppress.set(true)
+                }
+                skipDeprecated.set(true)
+                reportUndocumented.set(false)
+                sourceLink {
+                    localDirectory.set(file("src/commonMain/kotlin"))
+                    remoteUrl.set(uri("https://github.com/arrow-kt/arrow/blob/main/${relativeProjectPath('src/commonMain/kotlin')}").toURL())
+                    remoteLineSuffix.set("#L")
+                }
+            }
+        } else if(file("src/main/kotlin").exists()) {
+            main {
+                perPackageOption {
+                    matchingRegex.set(".*\\.internal.*") // will match all .internal packages and sub-packages
+                    suppress.set(true)
+                }
+                skipDeprecated.set(true)
+                reportUndocumented.set(false)
+                sourceLink {
+                    localDirectory.set(file("src/main/kotlin"))
+                    remoteUrl.set(uri("https://github.com/arrow-kt/arrow/blob/main/${relativeProjectPath('src/main/kotlin')}").toURL())
+                    remoteLineSuffix.set("#L")
+                }
+            }
+        }
+        if(file("src/jvmMain/kotlin").exists()) {
+            jvmMain {
+                perPackageOption {
+                    matchingRegex.set(".*\\.internal.*") // will match all .internal packages and sub-packages
+                    suppress.set(true)
+                }
+                skipDeprecated.set(true)
+                reportUndocumented.set(false)
+                sourceLink {
+                    localDirectory.set(file("src/jvmMain/kotlin"))
+                    remoteUrl.set(uri("https://github.com/arrow-kt/arrow/blob/main/${relativeProjectPath('src/jvmMain/kotlin')}").toURL())
+                    remoteLineSuffix.set("#L")
+                }
+            }
+        }
+        if(file("src/jsMain/kotlin").exists()) {
+            jsMain {
+                perPackageOption {
+                    matchingRegex.set(".*\\.internal.*") // will match all .internal packages and sub-packages
+                    suppress.set(true)
+                }
+                skipDeprecated.set(true)
+                reportUndocumented.set(false)
+                sourceLink {
+                    localDirectory.set(file("src/jsMain/kotlin"))
+                    remoteUrl.set(uri("https://github.com/arrow-kt/arrow/blob/main/${relativeProjectPath('src/jsMain/kotlin')}").toURL())
+                    remoteLineSuffix.set("#L")
+                }
             }
         }
     }
 }
+
+dependencies {
+    dokkaGfmPlugin(project(":jekyll"))
+}
diff --git a/arrow-libs/gradle/subproject-mpp.gradle b/arrow-libs/gradle/subproject-mpp.gradle
index d3caedbc338..626c4903aab 100644
--- a/arrow-libs/gradle/subproject-mpp.gradle
+++ b/arrow-libs/gradle/subproject-mpp.gradle
@@ -115,10 +115,6 @@ ktlint {
     version = KTLINT_VERSION
 }
 
-clean.doFirst {
-    delete "${projectDir}/docs/apidocs"
-}
-
 group = GROUP
 archivesBaseName = POM_ARTIFACT_ID
 
diff --git a/arrow-libs/gradle/subproject.gradle b/arrow-libs/gradle/subproject.gradle
index f3ec667c9c6..fa7c321566e 100644
--- a/arrow-libs/gradle/subproject.gradle
+++ b/arrow-libs/gradle/subproject.gradle
@@ -36,7 +36,7 @@ ktlint {
 }
 
 clean.doFirst {
-    delete "${projectDir}/docs/apidocs"
+    delete "${projectDir}/../../../arrow-site/docs/apidocs"
 }
 
 group = GROUP
diff --git a/arrow-libs/optics/settings.gradle b/arrow-libs/optics/settings.gradle
index 547082ce71a..2ff3b277aec 100644
--- a/arrow-libs/optics/settings.gradle
+++ b/arrow-libs/optics/settings.gradle
@@ -20,3 +20,6 @@ project(":arrow-annotations").projectDir = file("../core/arrow-annotations")
 project(":arrow-continuations").projectDir = file("../core/arrow-continuations")
 project(":arrow-meta").projectDir = file("../core/arrow-meta")
 project(":arrow-core-retrofit").projectDir = file("../core/arrow-core-retrofit")
+
+include 'jekyll'
+project(":jekyll").projectDir = file("dokka/jekyll")
\ No newline at end of file
diff --git a/arrow-libs/settings.gradle b/arrow-libs/settings.gradle
index 4a4324b72d1..dc82673beba 100644
--- a/arrow-libs/settings.gradle
+++ b/arrow-libs/settings.gradle
@@ -56,3 +56,8 @@ include 'arrow-ank-gradle'
 project(":arrow-ank").projectDir = file("ank/arrow-ank")
 project(":arrow-ank-gradle").projectDir = file("ank/arrow-ank-gradle")
 
+include 'jekyll'
+project(":jekyll").projectDir = file("dokka/jekyll")
+
+// Examples
+include 'examples'
diff --git a/arrow-site/build.gradle b/arrow-site/build.gradle
index 01c28494059..75dc38e3aba 100644
--- a/arrow-site/build.gradle
+++ b/arrow-site/build.gradle
@@ -54,3 +54,7 @@ task buildSite {
 }
 
 generateSite.mustRunAfter generateAndValidateDoc
+
+clean.doFirst {
+    delete "${projectDir}/docs/apidocs"
+}
diff --git a/arrow-site/docs/_data/features.yml b/arrow-site/docs/_data/features.yml
index 216207da90c..01c2fdaf1a0 100644
--- a/arrow-site/docs/_data/features.yml
+++ b/arrow-site/docs/_data/features.yml
@@ -1,4 +1,10 @@
 content:
+    - title: Quickstart
+      description: Λrrow is a library for Typed Functional Programming in Kotlin.
+      icon: img/home/arrow-core-lines
+      url: /quickstart/
+      id: quickstart
+
     - title: Core
       description: Functional companion to Kotlin's Standard Library
       icon: img/home/arrow-core-lines
@@ -14,12 +20,11 @@ content:
     - title: Optics
       description: Deep access and transformations over immutable data
       icon: img/home/arrow-optics-lines
-      url: /optics/dsl/
+      url: /optics/
       id: optics
 
     - title: Meta
       description: Metaprogramming library for Kotlin compiler plugins
       icon: img/home/arrow-meta-lines
-      url: https://meta.arrow-kt.io/
+      url: /meta/
       id: meta
-
diff --git a/arrow-site/docs/_data/menu.yml b/arrow-site/docs/_data/menu.yml
index ef02d5057e9..b8e6d009b77 100644
--- a/arrow-site/docs/_data/menu.yml
+++ b/arrow-site/docs/_data/menu.yml
@@ -3,7 +3,12 @@ nav:
       url: https://media.arrow-kt.io
 
     - title: Training
-      url: https://www.47deg.com/trainings/
+      icon: <i class="far fa-angle-down"></i>
+      externals:
+        - company: 47 Degrees
+          url: https://www.47deg.com/
+        - company: Instil
+          url: https://instil.co/
 
     - title: Support
       url: https://www.47deg.com/services/
diff --git a/arrow-site/docs/_data/quickstart.yml b/arrow-site/docs/_data/quickstart.yml
new file mode 100644
index 00000000000..e0789023984
--- /dev/null
+++ b/arrow-site/docs/_data/quickstart.yml
@@ -0,0 +1,3 @@
+quickstartCtaName: "Quickstart"
+quickstartCtaUrl: /quickstart/
+---
diff --git a/arrow-site/docs/_data/sidebar-core.yml b/arrow-site/docs/_data/sidebar-core.yml
index 54c7455bbe0..63093df93cc 100644
--- a/arrow-site/docs/_data/sidebar-core.yml
+++ b/arrow-site/docs/_data/sidebar-core.yml
@@ -2,23 +2,7 @@ options:
   - title: Quick Start
     url: /core/
 
-  - title: Tutorials
-
-    nested_options:
-
-      - title: Error Handling
-        url: /patterns/error_handling/
-
-      - title: The Monad Tutorial
-        url: /patterns/monads/
-
-      - title: Monad Comprehensions
-        url: /patterns/monad_comprehensions/
-
-      - title: Coroutines & Computation blocks
-        url: /fx/coroutines/
-
-  - title: Types
+  - title: Extensions and data types
 
     nested_options:
 
@@ -28,23 +12,11 @@ options:
       - title: Validated
         url: /apidocs/arrow-core/arrow.core/-validated/
 
-      - title: Iterable
-        url: /apidocs/arrow-core/arrow.core/kotlin.collections.-iterable/
-
       - title: Option
         url: /apidocs/arrow-core/arrow.core/-option/
 
-      - title: List
-        url: /apidocs/arrow-core/arrow.core/kotlin.collections.-list/
-
       - title: NonEmptyList
-        url: /arrow/core/nonemptylist/
-
-      - title: Sequence
-        url: /apidocs/arrow-core/arrow.core/kotlin.sequences.-sequence/
-
-      - title: Map
-        url: /apidocs/arrow-core/arrow.core/kotlin.collections.-map/
+        url: /apidocs/arrow-core/arrow.core/-non-empty-list/
 
       - title: Ior
         url: /apidocs/arrow-core/arrow.core/-ior/
@@ -61,11 +33,30 @@ options:
       - title: Semiring
         url: /apidocs/arrow-core/arrow.typeclasses/-semiring/
 
+      - title: Extensions
+        url: /apidocs/arrow-core/arrow.core/index.html#functions
+
+  - title: Tutorials
+
+    nested_options:
+
+      - title: Error Handling
+        url: /patterns/error_handling/
+
+      - title: The Monad Tutorial
+        url: /patterns/monads/
+
+      - title: Monad Comprehensions
+        url: /patterns/monad_comprehensions/
+
+      - title: Coroutines & Computation blocks
+        url: /fx/coroutines/
+
   - title: Media
     url: https://media.arrow-kt.io/tags/core/
 
-  - title: Docs
-    url: /apidocs/arrow-core/
+  - title: Api Docs
+    url: /apidocs/arrow-core/arrow.core
 
   - title: License
     url: https://github.com/arrow-kt/arrow/blob/main/LICENSE
diff --git a/arrow-site/docs/_data/sidebar-fx.yml b/arrow-site/docs/_data/sidebar-fx.yml
index 08f5b9e687b..e92a81aa381 100644
--- a/arrow-site/docs/_data/sidebar-fx.yml
+++ b/arrow-site/docs/_data/sidebar-fx.yml
@@ -8,9 +8,6 @@ options:
       - title: Parallel
         url: /fx/parallel/
 
-      - title: Flow
-        url: /apidocs/arrow-fx-coroutines/arrow.fx.coroutines/kotlinx.coroutines.flow/-flow/
-
       - title: Atomic
         url: /apidocs/arrow-fx-coroutines/arrow.fx.coroutines/-atomic/
 
@@ -44,7 +41,7 @@ options:
     nested_options:
 
       - title: Arrow Fx Coroutines
-        url: /apidocs/arrow-fx-coroutines/
+        url: /apidocs/arrow-fx-coroutines/arrow.fx.coroutines/
 
       - title: Arrow Fx STM
-        url: /apidocs/arrow-fx-stm/
+        url: /apidocs/arrow-fx-stm/arrow.fx.stm/
diff --git a/arrow-site/docs/_data/sidebar-optics.yml b/arrow-site/docs/_data/sidebar-optics.yml
index adc0e732fd9..c7238299347 100644
--- a/arrow-site/docs/_data/sidebar-optics.yml
+++ b/arrow-site/docs/_data/sidebar-optics.yml
@@ -1,5 +1,8 @@
 options:
   - title: Quick Start
+    url: /optics/
+
+  - title: DSL
     url: /optics/dsl/
 
   - title: Types
@@ -51,5 +54,5 @@ options:
   - title: Media
     url: https://media.arrow-kt.io/tags/optics/
 
-  - title: Docs
-    url: /apidocs/arrow-optics/
+  - title: Api Docs
+    url: /apidocs/arrow-optics/arrow.optics
diff --git a/arrow-site/docs/_data/sidebar-quickstart.yml b/arrow-site/docs/_data/sidebar-quickstart.yml
new file mode 100644
index 00000000000..0060e148c3c
--- /dev/null
+++ b/arrow-site/docs/_data/sidebar-quickstart.yml
@@ -0,0 +1,25 @@
+options:
+  - title: Introduction
+    url: /quickstart/#rrow-is-a-library-for-typed-functional-programming-in-kotlin
+
+  - title: Setup
+    url: /quickstart/#setup
+
+  - title: Media
+    url: https://media.arrow-kt.io
+
+  - title: Training
+
+    nested_options:
+
+      - title: 47 Degrees
+        url: https://www.47deg.com/
+
+      - title: Instill
+        url: https://instil.co/
+
+  - title: Code of Conduct
+    url: https://github.com/arrow-kt/arrow/blob/main/CODE_OF_CONDUCT.md
+
+  - title: License
+    url: https://github.com/arrow-kt/arrow/blob/main/LICENSE
diff --git a/arrow-site/docs/_includes/_doc-wrapper.html b/arrow-site/docs/_includes/_doc-wrapper.html
index e097aafb472..fd50640b5b7 100644
--- a/arrow-site/docs/_includes/_doc-wrapper.html
+++ b/arrow-site/docs/_includes/_doc-wrapper.html
@@ -8,6 +8,12 @@
       <input id="docsearch" class="search" placeholder="Search documentation..." type="search">
     </div>
     <ul class="menu-doc-search">
+      <li>
+        <a class="menu-links" href="https://www.47deg.com/" title="47 Degrees">
+          <span>Sponsored by</span>
+          <img src="{{ '/img/docs/47deg-header-doc.svg' | relative_url }}" title="47 Degrees" alt="47 Degrees">
+        </a>
+      </li>
       <li>
         <a class="menu-links" href="{{ site.github_repo }}" title="Github">Github</a>
       </li>
@@ -19,6 +25,11 @@
     </ul>
   </div>
   <div class="doc-content">
+    {% unless page.path contains 'apidocs' %}
+    <div class="content-edit-page">
+      <a href="https://github.com/arrow-kt/arrow/edit/main/arrow-site/docs/{{ page.path }}"><i class="fab fa-github"></i> <span>Edit Page</span></a>
+    </div>
+    {% endunless %}
     {% if page.video %}
     {% include _media-wrapper.html id=page.video %}
     {% endif %}
diff --git a/arrow-site/docs/_includes/_footer.html b/arrow-site/docs/_includes/_footer.html
index 9c4da28947d..1a87b80d90a 100644
--- a/arrow-site/docs/_includes/_footer.html
+++ b/arrow-site/docs/_includes/_footer.html
@@ -2,6 +2,10 @@
   <div class="wrapper">
     <div class="footer-flex">
       <div class="footer-dev">
+        <div class="footer-47">
+          <img id="footer-47-dark" src="/img/home/47deg-footer-brand.svg" title="47 Degrees" alt="47 Degrees">
+          <img id="footer-47-white" src="/img/home/47deg-footer-brand-white.svg" title="47 Degrees" alt="47 Degrees">
+        </div>
         <p>Arrow is designed and developed by <a class="site-name" href="{{site.data.commons.github}}">{{ site.name }}</a>
           with support from <a class="company-link" href="https://www.47deg.com/">47 Degrees</a></p>
       </div>
diff --git a/arrow-site/docs/_includes/_head-docs.html b/arrow-site/docs/_includes/_head-docs.html
index b24f72e0001..b908b474cfa 100644
--- a/arrow-site/docs/_includes/_head-docs.html
+++ b/arrow-site/docs/_includes/_head-docs.html
@@ -35,6 +35,9 @@
   <meta name="twitter:creator" content="{{site.twitter_handle}}">
   <meta name="twitter:image" content="https://arrow-kt.io/img/poster.png" />
 
+  <!-- Fontawesome -->
+  <script src="https://kit.fontawesome.com/ca2f98aa9e.js" crossorigin="anonymous"></script>
+
   <!-- Favicon -->
   <link rel="shortcut icon" type="image/png" href="{{ '/img/favicon.png' | relative_url }}">
 
diff --git a/arrow-site/docs/_includes/_head.html b/arrow-site/docs/_includes/_head.html
index 5b59c7c2383..73b493f2c96 100644
--- a/arrow-site/docs/_includes/_head.html
+++ b/arrow-site/docs/_includes/_head.html
@@ -24,6 +24,9 @@
   <script defer src="/js/main-hovers.js"></script>
   <script defer src="/js/animations.js"></script>
 
+  <!-- Fontawesome -->
+  <script src="https://kit.fontawesome.com/ca2f98aa9e.js" crossorigin="anonymous"></script>
+
   <!-- Favicon -->
   <link rel="shortcut icon" type="image/png" href="/img/favicon.png">
 
@@ -39,6 +42,8 @@
   <script>
     hljs.initHighlightingOnLoad();
   </script>
+  <script src="https://code.jquery.com/jquery-3.6.0.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script>
+  <script src="/js/text-animation.js"></script>
 
   {% if jekyll.environment == 'production' and site.data.commons.google_analytics %}
   {% include _google-tag-manager.html %}
diff --git a/arrow-site/docs/_includes/_main.html b/arrow-site/docs/_includes/_main.html
index cbe04b761c3..e584f7d9ab2 100644
--- a/arrow-site/docs/_includes/_main.html
+++ b/arrow-site/docs/_includes/_main.html
@@ -3,8 +3,8 @@
     <div id="main-flex" class="main-flex">
       {% for item in site.data.features.content %}
       {% assign title = item.title | downcase  %}
+      {% if item.id != "quickstart" %}
       <a id="{{ item.id }}" class="{{ item.id }} main-item feature" href="{{ item.url | relative_url }}">
-
         <div id="{{ item.id }}-header" class="item-header">
           <div id="icon-{{ item.id }}-content" class="icon-content">
             <img id="{{ item.id }}-dark" class="cat-icon-dark" src="{{ item.icon }}.svg" alt="{{ item.title }}">
@@ -15,6 +15,7 @@ <h2 id="{{ item.id }}-title">{{ item.title }}</h2>
           <p id="{{ item.id }}-description">{{ item.description }}</p>
         </div>
       </a>
+      {% endif %}
       {% endfor %}
     </div>
   </div>
diff --git a/arrow-site/docs/_includes/_nav.html b/arrow-site/docs/_includes/_nav.html
index 9de78f5a0b5..e506eb1997a 100644
--- a/arrow-site/docs/_includes/_nav.html
+++ b/arrow-site/docs/_includes/_nav.html
@@ -13,9 +13,22 @@
         <ul>
           {% for item in site.data.menu.nav%}
           {% if item.title != 'Github' %}
+          {% if item.title != "Training" %}
           <li class="nav-menu-item">
             <a class="menu-links" href="{{ item.url }}" title="{{ item.title }}">{{ item.title }}</a>
           </li>
+          {% else %}
+          <li class="nav-menu-item">
+            <span onclick="myFunction()" class="menu-links dropdown-btn" title="{{ item.title }}">{{ item.title }}{{ item.icon }}</span>
+            <div id="dropdown" class="dropdown-content">
+              <ul>
+                {% for external in item.externals %}
+                <li><a href="{{ external.url }}">{{ external.company }}</a></li>
+                {% endfor %}
+              </ul>
+            </div>
+          </li>
+          {% endif %}
           {% endif %}
           {% endfor %}
           <div class="nav-stars">
diff --git a/arrow-site/docs/_includes/_quickstart.html b/arrow-site/docs/_includes/_quickstart.html
new file mode 100644
index 00000000000..9f3a8d2043d
--- /dev/null
+++ b/arrow-site/docs/_includes/_quickstart.html
@@ -0,0 +1,14 @@
+<div class="site-quickstart">
+  <div class="wrapper">
+    <div class="quickstart-content">
+    
+      <div class="container py-5">
+  <div class="output" id="output">
+    <h1 class="cursor"></h1>
+    <p></p>
+  </div>
+</div>
+      <a class="quickstart-cta" href="{{ site.data.quickstart.quickstartCtaUrl | relative_url }}">{{site.data.quickstart.quickstartCtaName}}</a>
+    </div>
+  </div>
+</div>
diff --git a/arrow-site/docs/_layouts/home.html b/arrow-site/docs/_layouts/home.html
index 5671f7385f2..bfb027f8b8e 100644
--- a/arrow-site/docs/_layouts/home.html
+++ b/arrow-site/docs/_layouts/home.html
@@ -4,6 +4,7 @@
 
 <body id="arrow-main">
   {% include _nav.html %}
+  {% include _quickstart.html %}
   {% include _main.html %}
   {% include _footer.html %}
   {% include _slack-link.html %}
diff --git a/arrow-site/docs/_layouts/quickstart-core.html b/arrow-site/docs/_layouts/quickstart-core.html
new file mode 100644
index 00000000000..53dc84f261d
--- /dev/null
+++ b/arrow-site/docs/_layouts/quickstart-core.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html>
+{% assign cat_id = "core" %}
+{% assign cat_id_cap = cat_id | capitalize %}
+{% include _head-docs.html %}
+
+<body id="doc-body">
+  <div id="wrapper">
+    {% include _sidebar-wrapper.html %}
+    <div class="quickstart-wrapper">
+      {% include _doc-wrapper.html %}
+    </div>
+  </div>
+  {% include _github-modal.html %}
+  {% include _slack-link.html %}
+  {% include _js-bottom-docs.html %}
+</body>
+
+</html>
diff --git a/arrow-site/docs/_layouts/quickstart-fx.html b/arrow-site/docs/_layouts/quickstart-fx.html
new file mode 100644
index 00000000000..61f204f16be
--- /dev/null
+++ b/arrow-site/docs/_layouts/quickstart-fx.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html>
+{% assign cat_id = "fx" %}
+{% assign cat_id_cap = cat_id | capitalize %}
+{% include _head-docs.html %}
+
+<body id="doc-body">
+  <div id="wrapper">
+    {% include _sidebar-wrapper.html %}
+    <div class="quickstart-wrapper">
+      {% include _doc-wrapper.html %}
+    </div>
+  </div>
+  {% include _github-modal.html %}
+  {% include _slack-link.html %}
+  {% include _js-bottom-docs.html %}
+</body>
+
+</html>
\ No newline at end of file
diff --git a/arrow-site/docs/_layouts/quickstart-optics.html b/arrow-site/docs/_layouts/quickstart-optics.html
new file mode 100644
index 00000000000..f30eee9b3c7
--- /dev/null
+++ b/arrow-site/docs/_layouts/quickstart-optics.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html>
+{% assign cat_id = "optics" %}
+{% assign cat_id_cap = cat_id | capitalize %}
+{% include _head-docs.html %}
+
+<body id="doc-body">
+  <div id="wrapper">
+    {% include _sidebar-wrapper.html %}
+    <div class="quickstart-wrapper">
+      {% include _doc-wrapper.html %}
+    </div>
+  </div>
+  {% include _github-modal.html %}
+  {% include _slack-link.html %}
+  {% include _js-bottom-docs.html %}
+</body>
+
+</html>
diff --git a/arrow-site/docs/_layouts/quickstart.html b/arrow-site/docs/_layouts/quickstart.html
new file mode 100644
index 00000000000..bb1826071fd
--- /dev/null
+++ b/arrow-site/docs/_layouts/quickstart.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html>
+{% assign cat_id = "quickstart" %}
+{% assign cat_id_cap = cat_id | capitalize %}
+{% include _head-docs.html %}
+
+<body id="doc-body">
+  <div id="wrapper">
+    {% include _sidebar-wrapper.html %}
+    <div class="quickstart-wrapper">
+      {% include _doc-wrapper.html %}
+    </div>
+  </div>
+  {% include _github-modal.html %}
+  {% include _slack-link.html %}
+  {% include _js-bottom-docs.html %}
+</body>
+
+</html>
diff --git a/arrow-site/docs/_plugins/replace_source_by_button.rb b/arrow-site/docs/_plugins/replace_source_by_button.rb
new file mode 100644
index 00000000000..afbebd8726c
--- /dev/null
+++ b/arrow-site/docs/_plugins/replace_source_by_button.rb
@@ -0,0 +1,28 @@
+module Jekyll
+    class ReplaceSourceByButton < Converter
+        safe true
+        priority :low
+
+    def matches(ext)
+        ext =~ /^\.md$/i
+    end
+
+    def output_ext(ext)
+        ".html"
+    end
+
+    # HTML code comes from _includes/_doc-wrapper.html
+    def convert(content)
+        button_parts = content.match('div class="content-edit-page"')
+        source_parts = content.match(/<a href="([^"]+)">\(source\)<\/a>/)
+        if button_parts == nil and source_parts != nil
+            url = source_parts[1]
+            button_start = '<div class="content-edit-page"><a href="'
+            button_end = '"><i class="fab fa-github"></i> <span>Edit Page</span></a></div>'
+            button_start.concat(url.gsub('blob', 'edit'), button_end, content)
+        else
+            content
+        end
+    end
+  end
+end
diff --git a/arrow-site/docs/_sass/base/_base.scss b/arrow-site/docs/_sass/base/_base.scss
index 8357102a9da..d131c66ef3c 100644
--- a/arrow-site/docs/_sass/base/_base.scss
+++ b/arrow-site/docs/_sass/base/_base.scss
@@ -45,6 +45,7 @@ h6 {
   color: $header-font-color;
   font-family: $header-font-family;
   font-weight: $font-semibold;
+  line-height: $heading-line-height;
 }
 
 a {
@@ -58,7 +59,7 @@ a {
 
   &:hover {
     color: $link-hover;
-    text-decoration: underline;
+    text-decoration: none;
   }
 
   &:active {
diff --git a/arrow-site/docs/_sass/base/_fonts.scss b/arrow-site/docs/_sass/base/_fonts.scss
index a3b37447e77..457b751e553 100644
--- a/arrow-site/docs/_sass/base/_fonts.scss
+++ b/arrow-site/docs/_sass/base/_fonts.scss
@@ -24,6 +24,45 @@
 	font-style: normal;
 	src: url("../fonts/woff2/iosevka-bold.woff2") format('woff2'), url("../fonts/woff/iosevka-bold.woff") format('woff'), url("../fonts/ttf/iosevka-bold.ttf") format('truetype');
 }
+
+@font-face {
+    font-family: 'jetbrains_mono_nlbold';
+    src: url('../fonts/jetbrainsmononl-bold-webfont.woff2') format('woff2'),
+         url('../fonts/jetbrainsmononl-bold-webfont.woff') format('woff');
+    font-weight: normal;
+    font-style: normal;
+
+}
+
+
+@font-face {
+    font-family: 'jetbrains_mono_nlregular';
+    src: url('../fonts/jetbrainsmononl-regular-webfont.woff2') format('woff2'),
+         url('../fonts/jetbrainsmononl-regular-webfont.woff') format('woff');
+    font-weight: normal;
+    font-style: normal;
+
+}
+
+
+@font-face {
+    font-family: 'jetbrains_mono_nlbold';
+    src: url('../fonts/jetbrainsmononl-bold-webfont.woff2') format('woff2'),
+         url('../fonts/jetbrainsmononl-bold-webfont.woff') format('woff');
+    font-weight: normal;
+    font-style: normal;
+
+}
+
+
+@font-face {
+    font-family: 'jetbrains_mono_nlregular';
+    src: url('../fonts/jetbrainsmononl-regular-webfont.woff2') format('woff2'),
+         url('../fonts/jetbrainsmononl-regular-webfont.woff') format('woff');
+    font-weight: normal;
+    font-style: normal;
+
+}
 // Google Fonts
 // -----------------------------------------------
 @import url('https://fonts.googleapis.com/css?family=Montserrat:400,600,700|Source+Code+Pro&display=optional');
diff --git a/arrow-site/docs/_sass/base/_global.scss b/arrow-site/docs/_sass/base/_global.scss
index ee9867da103..f4ac10ea918 100644
--- a/arrow-site/docs/_sass/base/_global.scss
+++ b/arrow-site/docs/_sass/base/_global.scss
@@ -64,11 +64,18 @@
 
 }
 
+
 html {
     box-sizing: border-box;
     font-size: $base-font-size;
 }
 
+@media (prefers-reduced-motion: no-preference) {
+  html {
+    scroll-behavior: smooth;
+  }
+}
+
 *,
 *::after,
 *::before {
diff --git a/arrow-site/docs/_sass/components/common/_footer.scss b/arrow-site/docs/_sass/components/common/_footer.scss
index 9e051f5e04a..292b187fd07 100644
--- a/arrow-site/docs/_sass/components/common/_footer.scss
+++ b/arrow-site/docs/_sass/components/common/_footer.scss
@@ -14,9 +14,22 @@
     line-height: ($base-point-grid * 3);
 
     .footer-dev {
+      display: flex;
       width: $column-4;
       transition: color $base-duration $base-timing;
 
+      .footer-47 {
+        position: relative;
+        margin-right: 1.25rem;
+        #footer-47-dark {
+          position: absolute;
+          opacity: 1;
+        }
+        #footer-47-white {
+          opacity: 0;
+        }
+      }
+
       .site-name {
         text-transform: uppercase;
 
diff --git a/arrow-site/docs/_sass/components/docs/_code.scss b/arrow-site/docs/_sass/components/docs/_code.scss
index af63d55ec08..314b35dcfa4 100644
--- a/arrow-site/docs/_sass/components/docs/_code.scss
+++ b/arrow-site/docs/_sass/components/docs/_code.scss
@@ -3,29 +3,36 @@
 // -----------------------------------------------
 
 p,
-ul {
+ul,
+table {
     code {
-        font-family: $code-font-family;
-        padding: 0 $base-point-grid ($base-point-grid - 4) $base-point-grid;
+        font-family: $code-doc-font-famil;
+        padding: 0 0.3rem;
+        margin: 0;
         font-size: 16px;
-        border-radius: 3px;
-        color: rgba(#263238, 0.7);
+        border-radius: 2px;
+        color: rgba($dark-color-doc, 0.9);
+        background: rgba($quickstart-background, 0.08);
     }
 }
 
 
 .doc-content {
 
+  pre {
+    margin-bottom: 1rem;
+  }
 
     .CodeMirror,
     .hljs {
-        font-size: 15px;
-        font-family: $code-font-family;
+        font-size: 1rem;
+        font-family: $code-doc-font-famil;
+        line-height: 1.9;
 
-        pre {
-            line-height: 1.8;
-        }
+    }
 
+    .hljs {
+      background: rgba($quickstart-background, 0.06);
     }
 
     .cm-s-arrow span.cm-keyword {
@@ -35,16 +42,19 @@ ul {
         pre {
 
         &.highlight {
-            border: 1px solid $code-border-color;
             margin-bottom: $code-margin;
+            border: none;
 
-            .hljs {
-                padding: $code-padding;
-            }
         }
     }
-
+    .executable-fragment-wrapper {
+      margin: 1.5rem 0 2.5rem 0;
+    }
     .executable-fragment {
+    border: none;
+    .js-code-output-executor {
+      border: none;
+    }
       .console-close,
       .run-button {
         width: 24px;
diff --git a/arrow-site/docs/_sass/components/docs/_doc-body.scss b/arrow-site/docs/_sass/components/docs/_doc-body.scss
index 523178705e3..812e627e32b 100644
--- a/arrow-site/docs/_sass/components/docs/_doc-body.scss
+++ b/arrow-site/docs/_sass/components/docs/_doc-body.scss
@@ -2,5 +2,5 @@
 // -----------------------------------------------
 // -----------------------------------------------
 #doc-body {
-    background: $white;
+    background: rgba($core-background, 0.03);
 }
diff --git a/arrow-site/docs/_sass/components/docs/_doc-content-core.scss b/arrow-site/docs/_sass/components/docs/_doc-content-core.scss
index 70c477d69ac..2672c55f627 100644
--- a/arrow-site/docs/_sass/components/docs/_doc-content-core.scss
+++ b/arrow-site/docs/_sass/components/docs/_doc-content-core.scss
@@ -3,50 +3,61 @@
 // -----------------------------------------------
 
 .doc-content-core {
-    .doc-content {
-        a {
-            color: $core-color;
-        }
+  .doc-content {
+    a {
+      //color: $core-color;
+    }
 
-        p,
-        ul {
-            code {
-                background: rgba($core-background, 0.08);
-            }
-            
-            a {
-                code {
-                    text-decoration: underline;
-                }
-            }
-        }
+    p,
+    ul {
+      code {
+        background: rgba($core-background, 0.08);
+      }
 
-        .cm-s-arrow span.cm-keyword {
-            color: $core-color;
+      a {
+        code {
+          //text-decoration: underline;
         }
+      }
+    }
+    // Codemirror
+    .cm-s-arrow.CodeMirror {
+      background: rgba($core-background, 0.06);
+    }
 
+    .cm-s-arrow .CodeMirror-gutters {
+      background-color: rgba($core-background, 0.08);
+    }
 
-        .hljs-variable,
-        .hljs-template-variable,
-        .hljs-tag,
-        .hljs-name,
-        .hljs-selector-id,
-        .hljs-selector-class,
-        .hljs-regexp,
-        .hljs-deletion {
-            color: $core-color;
-        }
+    .CodeMirror-linebackground.unmodifiable-line {
+      background-color: rgba($core-background, 0.06);
+    }
 
-        .button-video {
-            background: $white;
-            border: 2px solid $core-color;
-            transition: background $base-duration;
 
-            &:hover {
-                background: $core-color;
-                color: $white;
-            }
-        }
+    .cm-s-arrow span.cm-keyword {
+      //color: $core-color;
+    }
+
+    .hljs-deletion,
+    .hljs-name,
+    .hljs-regexp,
+    .hljs-selector-class,
+    .hljs-selector-id,
+    .hljs-tag,
+    .hljs-template-variable,
+    .hljs-variable {
+      //color: $core-color;
     }
 
-}
\ No newline at end of file
+    .button-video {
+      background: $core-color;
+      border: 2px solid $core-color;
+      transition: background $base-duration;
+
+      &:hover {
+        background: $core-color;
+        color: $white;
+      }
+    }
+  }
+}
diff --git a/arrow-site/docs/_sass/components/docs/_doc-content-fx.scss b/arrow-site/docs/_sass/components/docs/_doc-content-fx.scss
index a09f0a88ca4..ac369c29078 100644
--- a/arrow-site/docs/_sass/components/docs/_doc-content-fx.scss
+++ b/arrow-site/docs/_sass/components/docs/_doc-content-fx.scss
@@ -5,7 +5,7 @@
 .doc-content-fx {
     .doc-content {
         a {
-            color: $fx-color;
+            //color: $fx-color;
         }
 
         p,
@@ -16,9 +16,22 @@
         }
 
         .cm-s-arrow span.cm-keyword {
-            color: $fx-color;
+            //color: $fx-color;
         }
-        
+
+        // Codemirror
+        .cm-s-arrow.CodeMirror {
+          background: rgba($fx-background, 0.06);
+        }
+
+        .cm-s-arrow .CodeMirror-gutters {
+          background-color: rgba($fx-background, 0.08);
+        }
+
+        .CodeMirror-linebackground.unmodifiable-line {
+          background-color: rgba($fx-background, 0.06);
+        }
+
                 .hljs-variable,
         .hljs-template-variable,
         .hljs-tag,
@@ -27,11 +40,11 @@
         .hljs-selector-class,
         .hljs-regexp,
         .hljs-deletion {
-            color: $fx-color;
+            //color: $fx-color;
         }
 
         .button-video {
-            background: $white;
+            background: $fx-color;
             border: 2px solid $fx-color;
             transition: background $base-duration;
 
diff --git a/arrow-site/docs/_sass/components/docs/_doc-content-meta.scss b/arrow-site/docs/_sass/components/docs/_doc-content-meta.scss
index 443590b6399..91ee85ae8cc 100644
--- a/arrow-site/docs/_sass/components/docs/_doc-content-meta.scss
+++ b/arrow-site/docs/_sass/components/docs/_doc-content-meta.scss
@@ -5,20 +5,35 @@
 .doc-content-meta {
     .doc-content {
         a {
-            color: $meta-color;
+            //color: $meta-color;
         }
 
         p,
-        ul {
+        ul,
+        table {
             code {
                 background: rgba($meta-background, 0.08);
+                font-family: $code-doc-font-famil;
             }
         }
 
         .cm-s-arrow span.cm-keyword {
-            color: $meta-color;
+            //color: $meta-color;
         }
-        
+
+        // Codemirror
+        .cm-s-arrow.CodeMirror {
+          background: rgba($meta-background, 0.06);
+        }
+
+        .cm-s-arrow .CodeMirror-gutters {
+          background-color: rgba($meta-background, 0.08);
+        }
+
+        .CodeMirror-linebackground.unmodifiable-line {
+          background-color: rgba($meta-background, 0.06);
+        }
+
                 .hljs-variable,
         .hljs-template-variable,
         .hljs-tag,
@@ -27,11 +42,11 @@
         .hljs-selector-class,
         .hljs-regexp,
         .hljs-deletion {
-            color: $meta-color;
+            //color: $meta-color;
         }
 
         .button-video {
-            background: $white;
+            background: $meta-color;
             border: 2px solid $meta-color;
             transition: background $base-duration;
 
diff --git a/arrow-site/docs/_sass/components/docs/_doc-content-optics.scss b/arrow-site/docs/_sass/components/docs/_doc-content-optics.scss
index f081a5cf863..6131bb4a140 100644
--- a/arrow-site/docs/_sass/components/docs/_doc-content-optics.scss
+++ b/arrow-site/docs/_sass/components/docs/_doc-content-optics.scss
@@ -5,7 +5,7 @@
 .doc-content-optics {
     .doc-content {
         a {
-            color: $optics-color;
+            //color: $optics-color;
         }
 
         p,
@@ -17,10 +17,23 @@
         }
 
         .cm-s-arrow span.cm-keyword {
-            color: $optics-color;
+            //color: $optics-color;
         }
-        
-        
+
+        // Codemirror
+        .cm-s-arrow.CodeMirror {
+          background: rgba($optics-background, 0.08);
+        }
+
+        .cm-s-arrow .CodeMirror-gutters {
+          background-color: rgba($optics-background, 0.08);
+        }
+
+        .CodeMirror-linebackground.unmodifiable-line {
+          background-color: rgba($optics-background, 0.06);
+        }
+
+
                 .hljs-variable,
         .hljs-template-variable,
         .hljs-tag,
@@ -29,11 +42,11 @@
         .hljs-selector-class,
         .hljs-regexp,
         .hljs-deletion {
-            color: $optics-color;
+            //color: $optics-color;
         }
 
         .button-video {
-            background: $white;
+            background: $optics-color;
             border: 2px solid $optics-color;
             transition: background $base-duration;
 
diff --git a/arrow-site/docs/_sass/components/docs/_doc-content.scss b/arrow-site/docs/_sass/components/docs/_doc-content.scss
index 767927c8bf7..294e90ae596 100644
--- a/arrow-site/docs/_sass/components/docs/_doc-content.scss
+++ b/arrow-site/docs/_sass/components/docs/_doc-content.scss
@@ -3,125 +3,322 @@
 // -----------------------------------------------
 
 .doc-content {
-    font-family: $doc-font-family;
-    position: relative;
-    padding: ($base-point-grid * 4);
-    font-size: 1.125rem;
+  padding: 3rem 3.5rem;
+  margin: 2.5rem;
+  background: #fff;
+  box-shadow: $base-box-shadow;
+  max-width: 100%;
+  font-family: $doc-font-family;
+  position: relative;
+  box-sizing: content-box;
+  color: rgba($dark-color-doc, 0.9);
+  font-size: 1rem;
+  //border-right: 1px solid rgba($core-background, 0.15);
+  h1,
+  h2,
+  h3,
+  h4,
+  h5,
+  h6 {
+    margin-bottom: 1.5rem;
+    margin-top: 3rem;
+    font-family: $heading-font-family;
+    font-weight: $font-bold;
+    color: $header-font-color;
+
+    &:first-child {
+      margin-top: 0;
+    }
+  }
+
+  h1 {
+    font-size: 2rem;
+  }
+
+  h2 {
+    padding-bottom: 1rem;
+    font-size: 1.8rem;
+    border-bottom: 1px solid rgba($core-background, 0.15);
+  }
+
+  h3 {
+    font-size: 1.6rem;
+  }
 
-    h1,
-    h2,
-    h3,
-    h4,
-    h5,
-    h6 {
-        margin-bottom: ($base-point-grid * 2);
-        margin-top: ($base-point-grid * 4);
-        color: $header-font-color;
+  h4 {
+    font-size: 1.3rem;
+  }
 
-        &:first-child {
-            margin-top: 0;
-        }
+  h5 {
+    font-size: 1.25rem;
+  }
+
+  h6 {
+    font-size: 1rem;
+    text-transform: uppercase;
+  }
+
+  p {
+    margin-bottom: ($base-point-grid * 2);
+  }
+
+  a {
+    border-bottom: 1px solid rgba($dark-color-doc, 0.3);
+
+    &:hover {
+      border-bottom: 1px solid rgba($dark-color-doc, 0.6);
     }
 
-    h1 {
-        font-size: 2.25rem;
+    &:not( > img) {
+      border-bottom: none;
     }
+  }
+
+  .browser {
+    margin-top: ($base-point-grid * 3);
+  }
+
+  ol,
+  ul {
+    padding-left: 2.5rem;
+    margin: 2.2rem 0;
+  }
 
-    h2 {
-        font-size: 1.9rem;
+  ul {
+    list-style: none;
+
+    li {
+      margin-bottom: 0.55rem;
+
+      &::before {
+        content: "\2022";
+        color: $dark-color-doc;
+        font-weight: bold;
+        position: absolute;
+        width: 1em;
+        margin-left: -1em;
+      }
     }
+  }
 
-    h3 {
-        font-size: 1.675rem;
+  ol {
+    li {
+      list-style-type: decimal;
     }
+  }
+
+  strong {
+    font-weight: $font-bold;
+  }
 
-    h4 {
-        font-size: 1.425rem;
+  del {
+    text-decoration: line-through;
+  }
+
+  em {
+    font-style: italic;
+  }
+
+  blockquote {
+    position: relative;
+    padding: 1rem;
+    background: rgba($blocquote-info, 0.2);
+    margin-bottom: 1rem;
+
+    &::before {
+      position: absolute;
+      font-size: 1.375rem;
+      top: 13px;
+      content: "";
+      color: rgba($blocquote-info, 0.9);
+      font-family: 'Font Awesome 5 Pro';
     }
 
-    h5 {}
+    &.blockquote-alert {
+      background: rgba($blocquote-alert, 0.2);
 
-    h6 {}
+      &::before {
+        content: "";
+        color: rgba($blocquote-alert, 0.9);
+      }
+    }
 
     p {
-        margin-bottom: ($base-point-grid * 2);
+      padding-left: 1rem;
+      margin-bottom: 0;
+      padding-left: 2.4rem;
     }
+  }
+
+  hr {
+    border: none;
+    height: 1px;
+    width: 100%;
+    background: rgba($dark-color-doc, 0.26);
+  }
 
-    .browser {
-        margin-top: ($base-point-grid * 3);
+  table {
+    width: 100%;
+    font-size: 16px;
+
+    thead {
+      text-align: left;
+      font-weight: bold;
     }
 
-    ul, ol {
-        padding-left: ($base-point-grid * 3);
+    tbody {
+      width: 100%;
     }
 
-    ul {
+    tr {
+      &:nth-child(2n) {
+        background: rgba($dark-color-doc, 0.03);
+      }
+    }
 
-        li {
-            list-style: circle;
-        }
+    td,
+    th {
+      padding: 1rem;
+      border: 1px solid rgba($dark-color-doc, 0.16);
+      border-left: 0;
+      border-right: 0;
     }
+  }
 
-    ol {
-        li {
-            list-style-type: decimal;
-        }
+  .header-link {
+    float: left;
+    font-size: 1.4rem;
+    line-height: 1;
+    margin-left: -24px;
+    margin-top: 10px;
+    opacity: 0;
+    transition: opacity $base-duration $base-timing;
+  }
+
+  h1:hover,
+  h2:hover,
+  h3:hover,
+  h4:hover,
+  h5:hover,
+  h6:hover {
+    .header-link {
+      opacity: 1;
+    }
+  }
+
+  .content-edit-page {
+    display: flex;
+    justify-content: flex-end;
+    margin-top: -20px;
+
+    a {
+      border: 1px solid rgba($dark-color-doc, 0.2);
+      display: flex;
+      align-items: center;
+      padding: 0.25rem 0.5rem;
+      border-radius: 3px;
+      background: $white;
+
+      span {
+        font-size: 0.813rem;
+      }
+
+      i {
+        font-size: 1.125rem;
+        margin-right: 0.25rem;
+      }
+
+      &:hover {
+        background: darken($white, 3%);
+      }
+    }
+  }
+
+  .platform-common,
+  .platform-js,
+  .platform-jvm,
+  .platform-native {
+    font-family: $heading-font-family;
+    color: $white;
+    font-weight: $font-medium;
+    margin-right: 0.5rem;
+    font-size: 0.625rem;
+    padding: 0 0.7rem;
+    border-radius: 10rem;
+    position: relative;
+    display: inline-block;
+    align-items: center;
+
+    &:before {
+      margin-right: 0.5rem;
+      display: none;
+      background: #765;
+      width: 20px;
+      height: 20px;
+      background-color: rgba(#000, 0.04);
+      position: absolute;
+      left: 0;
+    }
+  }
+
+  .platform-common {
+    background: $label-common;
+    &::first-letter {
+      text-transform: uppercase;
     }
 
-    strong {
-        font-weight: $font-bold;
+    &:before {
+      content: '';
+      background: url("../img/labels/icon-label-common.svg") repeat-y;
     }
+  }
 
-    del {
-        text-decoration: line-through;
+  .platform-native {
+    background: $label-native;
+    &::first-letter {
+      text-transform: uppercase;
     }
 
-    em {
-        font-style: italic;
+    &:before {
+      content: '';
+      background: url("../img/labels/icon-label-native.svg") repeat-y;
     }
+  }
 
-    hr {
-        border: none;
-        height: 1px;
-        width: 100%;
-        background: rgba($brand-secondary, 0.9);
+  .platform-jvm {
+    background: $label-jvm;
+    text-transform: uppercase;
+
+    &:before {
+      content: '';
+      background: url("../img/labels/icon-label-jvm.svg") repeat-y;
     }
-    
+  }
+
+  .platform-js {
+    background: $label-js;
+    text-transform: uppercase;
+
+
+    &:before {
+      content: '';
+      background: url("../img/labels/icon-label-js.svg") repeat-y;
+    }
+  }
+}
+@include bp(large) {
+  .doc-content {
+    padding: 1.5rem 1rem;
+    margin: 1rem;
+
     table {
-        width: 100%;
-        thead {
-            text-align: left;
-            font-weight: bold;
-        }
-        
-        th, td {
-            padding: $base-point-grid;
-            border: 1px solid rgba($brand-secondary, 0.9);
-        }
-        
-        tr:nth-child(2n) {
-            background: $background-color;
-        }
+      display: block;
+      overflow-x: auto;
+      white-space: nowrap;
     }
 
-    .header-link {
-        float: left;
-        font-size: 1.4rem;
-        line-height: 1;
-        margin-left: -24px;
-        margin-top: 10px;
-        opacity: 0;
-        transition: opacity $base-duration $base-timing;
-    }
-
-    h1:hover,
-    h2:hover,
-    h3:hover,
-    h4:hover,
-    h5:hover,
-    h6:hover {
-        .header-link {
-            opacity: 1;
-        }
+    .content-edit-page {
+      display: none;
     }
+  }
 }
diff --git a/arrow-site/docs/_sass/components/docs/_doc-header.scss b/arrow-site/docs/_sass/components/docs/_doc-header.scss
index d54243d7936..4b0229a4b51 100644
--- a/arrow-site/docs/_sass/components/docs/_doc-header.scss
+++ b/arrow-site/docs/_sass/components/docs/_doc-header.scss
@@ -3,82 +3,102 @@
 // -----------------------------------------------
 
 .doc-header {
+  display: flex;
+  align-items: center;
+  height: ($base-point-grid * 8);
+  background: $white;
+  box-shadow: 0 2px 16px 0 rgba($core-background, 0.06);
+
+  .search-wrapper {
     display: flex;
-    align-items: center;
-    height: ($base-point-grid * 8);
-    background: $white;
-    border-bottom: 1px solid $doc-header-border;
+    position: relative;
+    width: 100%;
 
-    .search-wrapper {
-        display: flex;
-        position: relative;
-        width: 100%;
+    .search {
+      display: block;
+      width: calc(100% - 1.5rem);
+      padding: $base-point-grid 0;
+      font-family: $doc-font-family;
+      font-size: $base-docs-font-size;
+      margin-left: 1.5rem;
+      border: none;
+      cursor: auto;
+      position: relative;
+      outline: none;
+      -webkit-appearance: textfield;
+    }
+    /* clears the 'X' from Internet Explorer */
+    input[type=search]::-ms-clear {
+      display: none;
+      width: 0;
+      height: 0;
+    }
 
-        .search {
-            display: block;
-            width: calc(100% - 1.5rem);
-            padding: $base-point-grid 0;
-            font-family: $base-font-family;
-            font-size: $base-docs-font-size;
-            margin-left: 1.5rem;
-            border: none;
-            cursor: auto;
-            position: relative;
-            outline: none;
-             -webkit-appearance: textfield;
-        }
+    input[type=search]::-ms-reveal {
+      display: none;
+      width: 0;
+      height: 0;
+    }
+    /* clears the 'X' from Chrome */
+    input[type="search"]::-webkit-search-decoration,
+    input[type="search"]::-webkit-search-cancel-button,
+    input[type="search"]::-webkit-search-results-button,
+    input[type="search"]::-webkit-search-results-decoration {
+      display: none;
+    }
+  }
 
-        /* clears the 'X' from Internet Explorer */
-        input[type=search]::-ms-clear {
-            display: none;
-            width: 0;
-            height: 0;
-        }
+  a {
+    &:hover {
+      text-decoration: none;
+    }
+  }
 
-        input[type=search]::-ms-reveal {
-            display: none;
-            width: 0;
-            height: 0;
-        }
+  .fa {
+    margin-right: ($base-point-grid / 2);
+  }
 
-        /* clears the 'X' from Chrome */
-        input[type="search"]::-webkit-search-decoration,
-        input[type="search"]::-webkit-search-cancel-button,
-        input[type="search"]::-webkit-search-results-button,
-        input[type="search"]::-webkit-search-results-decoration {
-            display: none;
-        }
-    }
+  .menu-doc-search {
+    display: inline-flex;
+    margin-right: ($base-point-grid * 2);
 
-    a {
-        &:hover {
-            text-decoration: none;
-        }
-    }
+    li {
+      &:first-child {
+        padding-right: 1rem;
+        margin-right: 1rem;
+        border-right: 1px solid rgba($dark-color-doc, 0.1);
 
-    .fa {
-        margin-right: ($base-point-grid / 2);
-    }
+        .menu-links {
+          display: flex;
+          align-items: center;
 
-    .menu-doc-search {
-      display: inline-flex;
+          span {
+            font-family: $doc-font-family;
+            font-size: 0.813rem;
+            margin-right: 0.75rem;
+            font-style: italic;
+            text-transform: none;
+            font-weight: $font-regular;
+          }
+        }
+      }
 
       .menu-links {
         padding-bottom: 4px;
+        font-size: 0.938rem;
+        font-family: $base-font-family;
         text-transform: uppercase;
         font-weight: $font-semibold;
+        white-space: nowrap;
         @include links($link-color, $link-color, lighten($link-color, 30%), lighten($link-color, 30%));
 
         &:hover {
           text-decoration: none;
         }
       }
-      &:last-child {
-          margin-right: ($base-point-grid * 2);
-      }
     }
+  }
 }
-
 // Responsive
 @include bp(large) {
   #doc-wrapper {
@@ -86,10 +106,21 @@
       .doc-stars-container {
         display: none;
       }
+
+      .menu-doc-search {
+        li {
+          &:first-child {
+            .menu-links {
+              span {
+                display: none;
+              }
+            }
+          }
+        }
+      }
     }
   }
 }
-
 @include bp(medium) {
   #doc-wrapper {
     .doc-header {
diff --git a/arrow-site/docs/_sass/components/docs/_highlight.scss b/arrow-site/docs/_sass/components/docs/_highlight.scss
new file mode 100644
index 00000000000..80f949abae6
--- /dev/null
+++ b/arrow-site/docs/_sass/components/docs/_highlight.scss
@@ -0,0 +1,106 @@
+/*
+
+Darcula color scheme from the JetBrains family of IDEs
+
+*/
+
+
+/*
+
+Original highlight.js style (c) Ivan Sagalaev <maniac@softwaremaniacs.org>
+
+*/
+
+.hljs {
+  display: block;
+  overflow-x: auto;
+  padding: 1.5rem;
+  background: #F0F0F0;
+}
+
+
+/* Base color: saturation 0; */
+
+.hljs,
+.hljs-subst {
+  color: rgba($dark-color-doc, 0.9);
+}
+
+.hljs-comment {
+  color: #888888;
+}
+
+.hljs-keyword,
+.hljs-attribute,
+.hljs-selector-tag,
+.hljs-meta-keyword,
+.hljs-doctag,
+.hljs-name {
+  font-weight: bold;
+}
+
+
+/* User color: hue: 0 */
+
+.hljs-type,
+.hljs-string,
+.hljs-number,
+.hljs-selector-id,
+.hljs-selector-class,
+.hljs-quote,
+.hljs-template-tag,
+.hljs-deletion {
+  color: $core-color;
+}
+
+.hljs-title,
+.hljs-section {
+  color: $core-color;
+  font-weight: bold;
+}
+
+.hljs-regexp,
+.hljs-symbol,
+.hljs-variable,
+.hljs-template-variable,
+.hljs-link,
+.hljs-selector-attr,
+.hljs-selector-pseudo {
+  color: $core-color;
+}
+
+
+/* Language color: hue: 90; */
+
+.hljs-literal {
+  color: #78A960;
+}
+
+.hljs-built_in,
+.hljs-bullet,
+.hljs-code,
+.hljs-addition {
+  color: #397300;
+}
+
+
+/* Meta color: hue: 200 */
+
+.hljs-meta {
+  color: #1f7199;
+}
+
+.hljs-meta-string {
+  color: #4d99bf;
+}
+
+
+/* Misc effects */
+
+.hljs-emphasis {
+  font-style: italic;
+}
+
+.hljs-strong {
+  font-weight: bold;
+}
diff --git a/arrow-site/docs/_sass/components/docs/_playground-theme.scss b/arrow-site/docs/_sass/components/docs/_playground-theme.scss
new file mode 100644
index 00000000000..3d54780d4b7
--- /dev/null
+++ b/arrow-site/docs/_sass/components/docs/_playground-theme.scss
@@ -0,0 +1,38 @@
+
+.cm-s-arrow span.cm-meta { color: #9F9F5B; }
+.cm-s-arrow span.cm-number { color: #385EBA; }
+.cm-s-arrow span.cm-keyword { line-height: 1em; font-weight: bold; color: #375396; }
+.cm-s-arrow span.cm-atom { font-weight: bold; color: #5376CB; }
+.cm-s-arrow span.cm-def { color: darken($dark-color-doc, 10%); }
+.cm-s-arrow span.cm-variable { color: darken($dark-color-doc, 0.9); }
+.cm-s-arrow span.cm-variable-2 { color: rgba($dark-color-doc, 0.9); }
+.cm-s-arrow span.cm-variable-3, .cm-s-arrow span.cm-type { color: rgba($dark-color-doc, 0.9) }
+.cm-s-arrow span.cm-property { color: rgba($dark-color-doc, 0.9); }
+.cm-s-arrow span.cm-operator { color: rgba($dark-color-doc, 0.9); }
+.cm-s-arrow span.cm-comment { color: #808080; }
+.cm-s-arrow span.cm-string { color: #2EAF62; }
+.cm-s-arrow span.cm-string-2 { color: #2EAF62; }
+.cm-s-arrow span.cm-qualifier { color: #555; }
+.cm-s-arrow span.cm-error { color: #E45454; }
+.cm-s-arrow span.cm-attribute { color: #385EBA; }
+.cm-s-arrow span.cm-tag { color: #375396; }
+.cm-s-arrow span.cm-link { color: #385EBA; }
+.cm-s-arrow .CodeMirror-activeline-background { background: #FFFAE3; }
+
+.cm-s-arrow span.cm-builtin { color: #30a; }
+.cm-s-arrow span.cm-bracket { color: #cc7; }
+.cm-s-arrow  { font-family: Consolas, Menlo, Monaco, Lucida Console, Liberation Mono, DejaVu Sans Mono, Bitstream Vera Sans Mono, Courier New, monospace, serif;}
+
+
+.cm-s-arrow .CodeMirror-matchingbracket { outline:1px solid grey; color:black !important; }
+
+.CodeMirror-hints.idea {
+  font-family: Menlo, Monaco, Consolas, 'Courier New', monospace;
+  color: #616569;
+  background-color: #ebf3fd !important;
+}
+
+.CodeMirror-hints.idea .CodeMirror-hint-active {
+  background-color: #a2b8c9 !important;
+  color: #5c6065 !important;
+}
diff --git a/arrow-site/docs/_sass/components/docs/_quickstart-doc.scss b/arrow-site/docs/_sass/components/docs/_quickstart-doc.scss
new file mode 100644
index 00000000000..5ac5db3406d
--- /dev/null
+++ b/arrow-site/docs/_sass/components/docs/_quickstart-doc.scss
@@ -0,0 +1,313 @@
+// Quickstart docs
+// -----------------------------------------------
+// -----------------------------------------------
+
+.card-quickstart {
+  padding: 3rem;
+  background: #fff;
+  box-shadow: $base-box-shadow;
+}
+
+
+
+
+.quickstart-wrapper {
+  background: url("../img/quickstart-pattern.svg") repeat-y;
+
+  .doc-content {
+    margin: 0;
+    background: none;
+    box-shadow: none;
+    max-width: 1072px;
+  }
+}
+
+.quick-snap {
+  display: flex;
+  justify-content: center;
+}
+
+.quickstart-doc {
+  .quickstart-intro {
+    margin: 3.5rem 0 5.5rem 0;
+    @extend .card-quickstart;
+    h1 {
+      font-size: 2.5rem;
+    }
+  }
+
+  .quickstart-coroutines-list {
+    display: grid;
+    gap: 32px;
+    grid-template-columns: repeat(2, 1fr);
+    .quickstart-coroutines-item {
+      padding: 2rem;
+      background: rgba($core-background, 0.03);
+
+      ul {
+        padding-left: 1rem;
+        margin: 2rem 0 0 0;
+
+        li {
+          &::before {
+            content: "\f178";
+            color: $dark-color-doc;
+            position: relative;
+            font-weight: lighter;
+            margin-right: 0.5rem;
+            width: auto;
+            font-family: "Font Awesome 5 Pro"
+          }
+        }
+      }
+
+      &:nth-child(1) {}
+      &:nth-child(2) {}
+      &:nth-child(3) {}
+      &:nth-child(4) {}
+    }
+  }
+
+  .modular-libraries {
+    margin-bottom: 7.75rem;
+
+    .modular-libraries-header {
+      text-align: center;
+
+      h1 {
+        margin: 2rem 0;
+        font-size: 3.5rem;
+      }
+
+      p {
+        font-size: 1.5rem;
+      }
+    }
+
+    .libraries-list {
+      margin-top: 4.5rem;
+      display: grid;
+      grid-template-columns: 1fr;
+      grid-gap: 2.5rem;
+
+      .library-item {
+        display: flex;
+        @extend .card-quickstart;
+
+        .library-item-content {
+          margin-right: 2rem;
+
+          h3 {
+            font-size: 1.5rem;
+          }
+
+          p {
+            &:nth-child(3) {
+              margin: 0;
+            }
+          }
+
+          .library-cta {
+            padding: 0.75rem 1.5rem;
+            font-family: $heading-font-family;
+            font-size: 0.9375rem;
+            color: #fff;
+            display: inline-block;
+            transition: background-color 300ms $base-timing;
+
+            &:hover {
+              text-decoration: none;
+            }
+
+            &.core {
+              background: $core-color;
+
+              &:hover {
+                background: darken($core-color, 10%);
+              }
+            }
+
+            &.fx {
+              background: $fx-color;
+
+              &:hover {
+                background: darken($fx-color, 10%);
+              }
+            }
+
+            &.optics {
+              background: $optics-color;
+
+              &:hover {
+                background: darken($optics-color, 10%);
+              }
+            }
+
+            &.meta {
+              background: $meta-color;
+
+              &:hover {
+                background: darken($meta-color, 10%);
+              }
+            }
+          }
+        }
+
+        .library-item-brand {
+          p {
+            margin: 0;
+          }
+        }
+      }
+    }
+  }
+
+  .setup {
+    h2 {
+      padding-bottom: 0;
+      border-bottom: none;
+      font-size: 2rem;
+      text-align: center;
+    }
+
+    .setup-subtitle {
+      margin-bottom: 4rem;
+      text-align: center;
+      font-size: 1.25rem;
+    }
+
+    .setup-jdk-android {
+      display: grid;
+      grid-template-columns: repeat(2, 1fr);
+      @extend .card-quickstart;
+
+      .jdk-item {
+        padding-right: 4.5rem;
+        border-right: 1px solid rgba($dark-color-doc, 0.14);
+      }
+
+      .android-item {
+        margin-left: 4.5rem;
+      }
+
+      .android-item,
+      .jdk-item {
+        display: flex;
+        align-items: center;
+
+        p {
+          margin-bottom: 0;
+
+          &:first-child {
+            margin-right: 2rem;
+          }
+        }
+      }
+    }
+
+    .setup-graddle-maven {
+      margin-top: 2.5rem;
+      background: #fff;
+      box-shadow: $base-box-shadow;
+
+      .tab {
+        overflow: hidden;
+        p {
+          display: grid;
+          grid-template-columns: repeat(3, 1fr);
+          button:nth-child(2) {
+            border-right: 1px solid #DCDEE1;
+            border-left: 1px solid #DCDEE1;
+          }
+        }
+      }
+
+      .tab button {
+        background-color: rgba($dark-color-doc, 0.03);
+        border: none;
+        outline: none;
+        cursor: pointer;
+        padding: 1.75rem 1rem;
+        font-size: 1.25rem;
+        font-family: $heading-font-family;
+        font-weight: $font-bold;
+        transition: 0.3s;
+        box-shadow: 0 1px #DCDEE1;
+      }
+      /* Change background color of buttons on hover */
+      .tab button:hover {
+        background-color: rgba($dark-color-doc, 0.01);
+      }
+      /* Create an active/current tablink class */
+      .tab button.active {
+        background: none;
+        box-shadow: none;
+
+
+
+      }
+      /* Style the tab content */
+      .tabcontent {
+        display: none;
+        padding: 2.5rem;
+      }
+    }
+  }
+}
+
+@include bp(large) {
+  .card-quickstart {
+    padding: 1.5rem 1rem;
+  }
+
+  .quickstart-doc {
+    .modular-libraries {
+      .modular-libraries-header {
+        text-align: center;
+
+        h1 {
+          margin: 2rem 0;
+          font-size: 2rem;
+        }
+
+        p {
+          font-size: 1.5rem;
+        }
+      }
+      .libraries-list {
+        .library-item {
+          flex-direction: column-reverse;
+          text-align: center;
+
+          .library-item-content {
+            margin-right: 0;
+          }
+        }
+      }
+    }
+
+    .setup {
+      .setup-jdk-android {
+        grid-template-columns: 1fr;
+
+        .jdk-item {
+          padding-right: 0;
+          border-right: none;
+          border-bottom: 1px solid rgba($dark-color-doc, 0.14);
+          padding-bottom: 2rem;
+          margin-bottom: 2rem;
+        }
+
+        .android-item {
+          margin-left: 0;
+        }
+      }
+      .setup-graddle-maven {
+        .tabcontent {
+          padding: 1rem;
+        }
+      }
+
+    }
+  }
+}
diff --git a/arrow-site/docs/_sass/components/docs/_sidebar-core.scss b/arrow-site/docs/_sass/components/docs/_sidebar-core.scss
index 43eb7caebf0..9e4fa0e8af5 100644
--- a/arrow-site/docs/_sass/components/docs/_sidebar-core.scss
+++ b/arrow-site/docs/_sass/components/docs/_sidebar-core.scss
@@ -69,6 +69,7 @@
             background: $core-background;
 
             > a {
+                font-family: $heading-font-family;
                 transition: background $base-duration $base-timing;
 
                 &:hover {
@@ -92,7 +93,6 @@
 
                 a {
                     color: $white;
-                    padding-left: 10px;
 
                     &:hover {
                         @include links($white, $white, rgba($white, 0.5), rgba($white, 0.5));
diff --git a/arrow-site/docs/_sass/components/docs/_sidebar-fx.scss b/arrow-site/docs/_sass/components/docs/_sidebar-fx.scss
index 3e2dee03d79..b03980627fd 100644
--- a/arrow-site/docs/_sass/components/docs/_sidebar-fx.scss
+++ b/arrow-site/docs/_sass/components/docs/_sidebar-fx.scss
@@ -69,6 +69,7 @@
             background: $fx-background;
 
             > a {
+                font-family: $heading-font-family;
                 transition: background $base-duration $base-timing;
 
                 &:hover {
@@ -92,7 +93,6 @@
 
                 a {
                     color: $white;
-                    padding-left: 10px;
 
                     &:hover {
                         @include links($white, $white, rgba($white, 0.5), rgba($white, 0.5));
diff --git a/arrow-site/docs/_sass/components/docs/_sidebar-menu.scss b/arrow-site/docs/_sass/components/docs/_sidebar-menu.scss
index 5cd9b56327a..d7d2a633a60 100644
--- a/arrow-site/docs/_sass/components/docs/_sidebar-menu.scss
+++ b/arrow-site/docs/_sass/components/docs/_sidebar-menu.scss
@@ -28,8 +28,8 @@
       display: flex;
       padding: 12px 32px;
       width: 100%;
-      font-size: 1.1rem;
-      font-family: $base-font-family;
+      font-size: 0.938rem;
+      font-family: $heading-font-family;
       color: $white;
       transition: background $base-duration $base-timing;
 
@@ -62,7 +62,7 @@
       }
 
       a {
-        font-size: 1rem;
+        font-size: 0.875rem;
         padding: $base-point-grid ($base-point-grid * 2);
         @include links($white, $white, rgba($white, 0.5), rgba($white, 0.5));
 
diff --git a/arrow-site/docs/_sass/components/docs/_sidebar-optics.scss b/arrow-site/docs/_sass/components/docs/_sidebar-optics.scss
index 6e10e583d85..25ba94ccf52 100644
--- a/arrow-site/docs/_sass/components/docs/_sidebar-optics.scss
+++ b/arrow-site/docs/_sass/components/docs/_sidebar-optics.scss
@@ -68,6 +68,7 @@
         .sidebar-nav-item {
             background: $optics-background;
             > a {
+              font-family: $heading-font-family;
                 transition: background $base-duration $base-timing;
                 &:hover {
                     background: $optics-hover;
@@ -90,7 +91,6 @@
 
                 a {
                     color: $white;
-                    padding-left: 10px;
 
                     &:hover {
                         @include links($white, $white, rgba($white, 0.5), rgba($white, 0.5));
diff --git a/arrow-site/docs/_sass/components/docs/_sidebar-quickstart.scss b/arrow-site/docs/_sass/components/docs/_sidebar-quickstart.scss
new file mode 100644
index 00000000000..b9a94cd5031
--- /dev/null
+++ b/arrow-site/docs/_sass/components/docs/_sidebar-quickstart.scss
@@ -0,0 +1,104 @@
+.quickstart {
+  background: $quickstart-background;
+
+  .sidebar-menu {
+    .sidebar-menu-item {
+      &.active {
+        & > button {
+          border-left: 4px solid $quickstart-color;
+        }
+      }
+
+      &.open {
+        a {
+          background: $quickstart-hover;
+        }
+
+        & > button {
+          background: $quickstart-hover;
+        }
+      }
+    }
+  }
+}
+
+#cat-quickstart-dropdown {
+  min-width: $sidebar-cat-button;
+
+  .sidebar-nav {
+    .sidebar-nav-item {
+      > a {
+        transition: background $base-duration $base-timing;
+
+        &:hover {
+          background: $quickstart-hover;
+          box-shadow: $sidebar-cat-dropdow;
+        }
+      }
+
+      &.active {
+        > a {
+          background: $quickstart-hover;
+          box-shadow: $sidebar-cat-dropdow;
+        }
+      }
+
+      ul {
+        width: 100%;
+        z-index: 1;
+        box-shadow: $sidebar-cat-dropdow;
+        background: $quickstart-hover;
+
+        a {
+          color: $white;
+          transition: all $base-duration $base-timing;
+
+          &:hover {
+            background: rgba($white, 0.05);
+            color: rgba($white, 0.8);
+          }
+        }
+      }
+    }
+  }
+}
+
+#doc-quickstart-version-button {
+  .sidebar-doc-versions {
+    .sidebar-nav-item {
+      background: $quickstart-background;
+
+      > a {
+        font-family: $heading-font-family;
+        transition: background $base-duration $base-timing;
+
+        &:hover {
+          background: $quickstart-hover;
+          box-shadow: $sidebar-cat-dropdow;
+        }
+      }
+
+      &.active {
+        > a {
+          background: $quickstart-hover;
+          box-shadow: $sidebar-cat-dropdow;
+        }
+      }
+
+      ul {
+        width: 100%;
+        z-index: 1;
+        box-shadow: $sidebar-cat-dropdow;
+        background: $quickstart-hover;
+
+        a {
+          color: $white;
+
+          &:hover {
+            @include links($white, $white, rgba($white, 0.5), rgba($white, 0.5));
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/arrow-site/docs/_sass/components/docs/_sidebar.scss b/arrow-site/docs/_sass/components/docs/_sidebar.scss
index 0534279054e..9569ed68c84 100644
--- a/arrow-site/docs/_sass/components/docs/_sidebar.scss
+++ b/arrow-site/docs/_sass/components/docs/_sidebar.scss
@@ -66,11 +66,15 @@
     flex-direction: column;
     align-items: center;
 
+    > a {
+      margin-bottom: 1rem;
+    }
+
     .brand-title {
-        font-family: $base-font-family;
+        font-family: $heading-font-family;
         font-size: 18px;
         font-weight: $font-medium;
-        text-transform: uppercase;
+        text-transform: capitalize;
         letter-spacing: 1px;
         line-height: 23px;
         color: $white;
@@ -86,7 +90,7 @@
             align-items: center;
             justify-content: space-between;
             @include links($white, $white, $white, $white);
-            padding: ($base-point-grid * 1.5) ($base-point-grid * 4);
+            padding: 12px 32px;
 
             &:hover {
                 text-decoration: none;
@@ -94,7 +98,7 @@
             }
 
             .fa {
-                  margin-left: ($base-point-grid * 2);
+                  margin-left: 1.5rem;
                   font-size: 18px;
                   transition: all .3s;
                   -moz-osx-font-smoothing: unset;
@@ -103,7 +107,7 @@
 
         &.active {
             > a {
-                padding-left: 28px;
+                padding: 12px 32px;
                 .fa {
                      @include rotate(90deg);
                 }
@@ -113,6 +117,7 @@
 
         ul {
             display: none;
+            font-family: $heading-font-family;
 
 
             li {
@@ -120,7 +125,7 @@
                     display: flex;
                     align-items: flex-start;
                     @include links($white, $white, rgba($white, 0.5), rgba($white, 0.5));
-                    padding: $base-point-grid ($base-point-grid * 2);
+                    padding: 12px 32px;
                     font-size: 15px;
 
 
diff --git a/arrow-site/docs/_sass/components/home/_header.scss b/arrow-site/docs/_sass/components/home/_header.scss
index 5f2dd78cd7a..40c70caabc3 100644
--- a/arrow-site/docs/_sass/components/home/_header.scss
+++ b/arrow-site/docs/_sass/components/home/_header.scss
@@ -89,7 +89,8 @@
           font-size: 13px;
         }
 
-        .executable-fragment-wrapper {
+
+        -wrapper {
           margin-bottom: 0;
 
           .compiler-info {
diff --git a/arrow-site/docs/_sass/components/home/_main.scss b/arrow-site/docs/_sass/components/home/_main.scss
index 507d44e8141..b3c380a3a1e 100644
--- a/arrow-site/docs/_sass/components/home/_main.scss
+++ b/arrow-site/docs/_sass/components/home/_main.scss
@@ -3,7 +3,7 @@
 // -----------------------------------------------
 
 #site-main {
-  padding: 200px 0 0 0;
+  padding: 96px 0 0 0;
 
   .main-flex {
     display: flex;
diff --git a/arrow-site/docs/_sass/components/home/_nav.scss b/arrow-site/docs/_sass/components/home/_nav.scss
index 2e76c19f484..940cfb17098 100644
--- a/arrow-site/docs/_sass/components/home/_nav.scss
+++ b/arrow-site/docs/_sass/components/home/_nav.scss
@@ -81,10 +81,11 @@
       transition: all $base-duration $base-timing;
       font-weight: bold;
 
-      ul {
+      > ul {
         display: flex;
 
         .nav-menu-item {
+          position: relative;
           &:not(:last-child) {
             margin-right: ($base-point-grid * 5);
           }
@@ -94,9 +95,25 @@
             text-transform: uppercase;
             font-size: ($base-point-grid * 2);
 
+            i {
+              margin-left: 8px;
+            }
+
+            &:after {
+              display: block;
+              content: '';
+              border-bottom: 2px solid $brand-primary;
+              transform: scaleX(0);
+              transition: transform 0.3s ease-in-out;
+              margin-top: 0;
+            }
+
             &:hover {
               text-decoration: none;
-              border-bottom: 2px solid $brand-primary;
+
+              &:after {
+                transform: scaleX(1);
+              }
             }
 
             &.hover-mode {
@@ -119,22 +136,72 @@
     }
 
     .nav-icon-close {
-        display: none;
-        padding: 6px;
-        left: 85%;
-        top: 32px;
+      display: none;
+      padding: 6px;
+      left: 85%;
+      top: 32px;
 
-        img {
-            display: block;
-            transition: transform .3s ease;
+      img {
+        display: block;
+        transition: transform 0.3s ease;
 
-            &:hover {
-              transform: rotate(180deg);
-            }
+        &:hover {
+          transform: rotate(180deg);
+        }
+      }
+    }
+  }
+}
+
+.dropdown-btn {
+  &:hover {
+    cursor: pointer;
+  }
+}
+
+.dropdown-content {
+  padding: 16px 0;
+  position: absolute;
+  top: 32px;
+  left: 0;
+  overflow: auto;
+  z-index: 1;
+  transition: all 0.35s ease-out;
+  visibility: hidden;
+  opacity: 0;
+  background: rgba(#fff, 0.95);
+  box-shadow: 0px 0px 6px rgba($box-text-color, 0.3);
+  border-radius: 2px;
+  min-width: 148px;
+
+  ul {
+    display: flex;
+    flex-direction: column;
+    li {
+      a {
+        display: block;
+        padding: 2px 16px;
+        white-space: nowrap;
+        color: $box-text-color;
+        text-transform: uppercase;
+        transition: all 0.4s ease-out;
+        &:hover {
+          color: $box-text-color;
+          text-decoration: none;
+          background: rgba($box-text-color, 0.07);
+          border-radius: 2px;
         }
+      }
     }
   }
+
+  &.show {
+    top: 40px;
+    visibility: visible;
+    opacity: 1;
+  }
 }
+
 // Responsive
 // -----------------------------------------------
 @include bp(medium) {
@@ -170,6 +237,7 @@
             margin-top: ($base-point-grid * 4);
           }
         }
+
         &.top-scroll {
           padding-top: $base-point-grid;
         }
diff --git a/arrow-site/docs/_sass/components/home/_quickstart.scss b/arrow-site/docs/_sass/components/home/_quickstart.scss
new file mode 100644
index 00000000000..cb491ea10a0
--- /dev/null
+++ b/arrow-site/docs/_sass/components/home/_quickstart.scss
@@ -0,0 +1,91 @@
+// Quickstart
+// -----------------------------------------------
+// -----------------------------------------------
+
+.site-quickstart {
+  .quickstart-content {
+    margin: 180px auto 0;
+    text-align: center;
+    position: relative;
+    overflow: hidden;
+
+    h1 {
+      font-size: 4.2rem;
+      line-height: 1.4;
+      overflow: hidden;
+    }
+
+    .quickstart-cta {
+      padding: 12px 40px;
+      display: inline-block;
+      margin-top: 48px;
+      font-size: 1.429rem;
+      text-transform: uppercase;
+      border: 2px solid $brand-primary;
+
+      &:hover {
+        text-decoration: none;
+        background: #fff;
+      }
+    }
+  }
+}
+
+.container {
+  min-height: 192px;
+}
+
+.output {
+  text-align:center;
+  font-family: 'Source Code Pro', monospace;
+  color:white;
+  h1 {
+    font-size:30px;
+  }
+}
+.cursor::after {
+  content:'';
+  display:inline-block;
+  margin-left: 3px;
+  margin-top: 4px;
+  background-color: $brand-primary;
+  animation-name:blink;
+  animation-duration: 0.9s;
+  animation-iteration-count: infinite;
+}
+
+h1.cursor::after {
+  height: 6px;
+  width: 40px;
+}
+
+@keyframes blink {
+  0% {
+    opacity:1;
+  }
+  49% {
+    opacity:1;
+  }
+  50% {
+    opacity:0;
+  }
+  100% {
+    opacity:0;
+  }
+}
+
+// Responsive
+@include bp(medium) {
+  .site-quickstart {
+    .quickstart-content {
+      h1 {
+        font-size: 2.9rem;
+      }
+    }
+  }
+
+  h1.cursor::after {
+    height: 4px;
+    width: 32px;
+  }
+}
diff --git a/arrow-site/docs/_sass/utils/_variables.scss b/arrow-site/docs/_sass/utils/_variables.scss
index 477669d74df..d7b1f788e4d 100644
--- a/arrow-site/docs/_sass/utils/_variables.scss
+++ b/arrow-site/docs/_sass/utils/_variables.scss
@@ -1,6 +1,7 @@
 // Variables
 // -----------------------------------------------
 // -----------------------------------------------
+ @import url('https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;700&display=swap');
 // Colors
 // -----------------------------------------------
 $brand-primary: var(--color-primary);
@@ -12,6 +13,11 @@ $link-color: darken(#263238, 10%);
 $link-hover: darken(#263238, 15%);
 $background-color: #F5F7F8;
 $box-text-color: #263238;
+$dark-color-doc: #273244;
+// quickstart
+$quickstart-color: #CC528A;
+$quickstart-background: #273244;
+$quickstart-hover: #374252;
 // core
 $core-color: #2D9DFF;
 $core-background: #354755;
@@ -28,25 +34,37 @@ $optics-hover: #3f5b63;
 $meta-color: #CD151D;
 $meta-background: #2E3B44;
 $meta-hover: #424E56;
+
+$blocquote-info:#6AA848;
+$blocquote-alert: #BD4545;
+
+// label
+$label-common: #5ACABD;
+$label-native: #6EAAFB;
+$label-jvm: #FB936E;
+$label-js: #F2D15B;
 // Typography
 // -----------------------------------------------
 $base-font-family: 'Iosevka Web';
 $header-font-family: $base-font-family;
 $code-font-family: $base-font-family;
 $doc-font-family: 'Open Sans', sans-serif;
+$code-doc-font-famil: 'jetbrains_mono_nlregular';
+$heading-font-family: 'Montserrat', sans-serif;
 $base-font-color: $brand-primary;
 $header-font-color: $brand-primary;
 $font-regular: 400;
 $font-medium: 500;
 $font-semibold: 600;
 $font-bold: 700;
-$base-font-size: 14px;
-$base-line-height: 28px;
-$base-docs-font-size: 16px;
+$base-font-size: 16px;
+$base-line-height: 1.7;
+$heading-line-height: 1.3;
+$base-docs-font-size: 1rem;
 // Sizes
 // -----------------------------------------------
-$base-point-grid: 8px;
-$sidebar-cat-button: 164px;
+$base-point-grid: 0.5rem;
+$sidebar-cat-button: 192px;
 $sidebar-doc-version-button: 200px;
 $height-home-code-block: 400px;
 $width-home-code-block: 580px;
@@ -87,6 +105,7 @@ $gutter-margin: ($base-point-grid * 4);
 $border-color: rgba($gray-primary, 0.1);
 $doc-header-border: rgba($brand-secondary, 0.8);
 $sidebar-cat-dropdow: rgba(0, 0, 0, 0.2) 0 2px 8px 0;
+
 // Code
 // -----------------------------------------------
 $code-border-color: rgba($gray-primary, 0.2);
@@ -98,6 +117,7 @@ $sidebar-width: 325px;
 // Box Shadow
 $box-shadow-item: rgba($brand-primary, 0.10) 0 0 20px;
 $box-shadow-button: rgba(0,0,0,0.3) 0 2px 8px 0;
+$base-box-shadow: 0 4px 10px rgba($core-background, 0.08);
 // Docsearch dropdown
 $dropdown-config: (
   main-color: $brand-tertiary,
diff --git a/arrow-site/docs/_sass/vendors/highlight/atom-one-dark.css b/arrow-site/docs/_sass/vendors/highlight/_atom-one-dark.scss
similarity index 100%
rename from arrow-site/docs/_sass/vendors/highlight/atom-one-dark.css
rename to arrow-site/docs/_sass/vendors/highlight/_atom-one-dark.scss
diff --git a/arrow-site/docs/_sass/vendors/highlight/default.css b/arrow-site/docs/_sass/vendors/highlight/_default.scss
similarity index 100%
rename from arrow-site/docs/_sass/vendors/highlight/default.css
rename to arrow-site/docs/_sass/vendors/highlight/_default.scss
diff --git a/arrow-site/docs/_sass/vendors/highlight/darcula.css b/arrow-site/docs/_sass/vendors/highlight/_dracula.scss
similarity index 100%
rename from arrow-site/docs/_sass/vendors/highlight/darcula.css
rename to arrow-site/docs/_sass/vendors/highlight/_dracula.scss
diff --git a/arrow-site/docs/css/docs-styles.scss b/arrow-site/docs/css/docs-styles.scss
index e93914eaede..7fa3bd735d4 100644
--- a/arrow-site/docs/css/docs-styles.scss
+++ b/arrow-site/docs/css/docs-styles.scss
@@ -8,7 +8,7 @@
 @import "utils/mixins/general-mixins";
 
 // Vendors
-@import "vendors/highlight/color-brewer";
+@import "vendors/highlight/default";
 
 // Base
 @import "base/reset";
@@ -17,6 +17,8 @@
 @import "base/fonts";
 
 // Components
+@import "components/docs/playground-theme";
+@import "components/docs/highlight";
 @import "components/docs/code";
 @import "components/docs/doc-body";
 @import "components/docs/doc-content-core";
@@ -30,8 +32,10 @@
 @import "components/docs/sidebar-menu";
 @import "components/docs/sidebar";
 @import "components/docs/sidebar-core";
+@import "components/docs/sidebar-quickstart";
 @import "components/docs/navigation";
 @import "components/common/dropdown";
 @import "components/common/button";
+@import "components/docs/quickstart-doc";
 
 @include dropdown($dropdown-config...);
diff --git a/arrow-site/docs/css/home-styles.scss b/arrow-site/docs/css/home-styles.scss
index 50bde5961fb..3e281204082 100644
--- a/arrow-site/docs/css/home-styles.scss
+++ b/arrow-site/docs/css/home-styles.scss
@@ -19,5 +19,6 @@
 @import "components/home/nav";
 @import "components/home/header";
 @import "components/home/main";
+@import "components/home/quickstart";
 @import "components/docs/doc-body";
 @import "components/docs/doc-content";
diff --git a/arrow-site/docs/docs/core/README.md b/arrow-site/docs/docs/core/README.md
new file mode 100644
index 00000000000..89f1f518d84
--- /dev/null
+++ b/arrow-site/docs/docs/core/README.md
@@ -0,0 +1,267 @@
+---
+layout: quickstart-core
+title: Core
+permalink: /core/
+---
+
+<div class="quick-snap" markdown="1">
+[![Maven Central](https://img.shields.io/maven-central/v/io.arrow-kt/arrow-core?color=4caf50&label=latest%20release)](https://maven-badges.herokuapp.com/maven-central/io.arrow-kt/arrow-core)
+[![Latest snapshot](https://img.shields.io/badge/dynamic/xml?color=orange&label=latest%20snapshot&prefix=v&query=%2F%2Fmetadata%2Fversioning%2Flatest&url=https%3A%2F%2Foss.sonatype.org%2Fservice%2Flocal%2Frepositories%2Fsnapshots%2Fcontent%2Fio%2Farrow-kt%2Farrow-core%2Fmaven-metadata.xml)](https://oss.sonatype.org/service/local/repositories/snapshots/content/io/arrow-kt/)
+[![Kotlin version](https://img.shields.io/badge/Kotlin-1.4-blue)](https://kotlinlang.org/docs/reference/whatsnew14.html)
+[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://www.apache.org/licenses/LICENSE-2.0)
+[![StackOverflow](https://img.shields.io/badge/arrow--kt-grey.svg?logo=stackoverflow)](https://stackoverflow.com/questions/tagged/arrow-kt)
+[![Twitter](https://img.shields.io/twitter/follow/arrow_kt?color=blue&style=flat)](https://twitter.com/arrow_kt)
+</div>
+
+<div class="quickstart-doc" markdown="1">
+<div class="quickstart-intro" markdown="1">
+
+# Arrow Core. Functional companion to Kotlin’s Standard Library
+Arrow Core includes types such as [`Either`]({{ '/apidocs/arrow-core/arrow.core/-either/' | relative_url }}), [`Validated`]({{ '/apidocs/arrow-core/arrow.core/-validated/' | relative_url }}) and many extensions to [`Iterable`]({{ '/apidocs/arrow-core/arrow.core/index.html#functions' | relative_url }}) that can be used when implementing [error handling patterns]({{ '/patterns/error_handling/' | relative_url }}).
+
+Core also includes the base continuation effects system, which includes patterns to remove callbacks and enables controlled effects in direct syntax. Some applications of the effect system reduce boilerplate and enable direct syntax including [monad comprehensions and computation expressions]({{ '/patterns/monad_comprehensions/' | relative_url }}).
+</div>
+
+<div class="quickstart-intro" markdown="1">
+## Arrow Core Overview
+
+<div class="quickstart-coroutines-list" markdown="1">
+
+<div class="quickstart-coroutines-item" markdown="1">
+#### Quick Start
+  - [Gradle Setup]({{ '/core/#Gradle-kotlin' | relative_url }})
+  - [Maven Setup]({{ '/core/#Maven' | relative_url }})
+</div>
+
+<div class="quickstart-coroutines-item" markdown="1">
+#### Extensions and data types
+  - [Either]({{ '/apidocs/arrow-core/arrow.core/-either/' | relative_url }})
+  - [Validated]({{ '/apidocs/arrow-core/arrow.core/-validated/' | relative_url }})
+  - [Option]({{ '/apidocs/arrow-core/arrow.core/-option/' | relative_url }})
+  - [NonEmptyList]({{ '/apidocs/arrow-core/arrow.core/-non-empty-list/' | relative_url }})
+  - [Ior]({{ '/apidocs/arrow-core/arrow.core/-ior/' | relative_url }})
+  - [Eval]({{ '/apidocs/arrow-core/arrow.core/-eval/' | relative_url }})
+  - [Monoid]({{ '/arrow/typeclasses/monoid/' | relative_url }})
+  - [Semiring]({{ '/apidocs/arrow-core/arrow.typeclasses/-semiring/' | relative_url }})
+  - [Extensions]({{ '/apidocs/arrow-core/arrow.core/index.html#functions' | relative_url }})
+
+</div>
+
+<div class="quickstart-coroutines-item" markdown="1">
+#### Tutorials 
+  - [Error Handling]({{ '/patterns/error_handling/' | relative_url }})
+  - [Monads]({{ '/patterns/monads/' | relative_url }})
+  - [Monad Comprehensions]({{ '/patterns/monad_comprehensions/' | relative_url }})
+  - [Coroutines & Computation blocks]({{ '/fx/coroutines/' | relative_url }})
+
+</div>
+
+<div class="quickstart-coroutines-item" markdown="1">
+#### Additional information
+  - [Kotlin's Std Lib Guide](https://kotlinlang.org/api/latest/jvm/stdlib/)
+  - [Pure & Referentially Transparent Functions]({{ '/fx/purity-and-referentially-transparent-functions/' | relative_url }})
+  - [Why suspend over IO monad]({{ '/effects/io/' | relative_url }})
+</div>
+</div>
+</div>
+
+<div class="setup" markdown="1">
+## Setup
+
+{: .setup-subtitle}
+Configure Arrow for your project
+<div class="setup-jdk-android" markdown="1">
+<div class="jdk-item" markdown="1">
+![Jdk](/img/quickstart/jdk-logo.svg "jdk")
+
+Make sure to have the latest version of JDK 1.8 installed.
+</div>
+<div class="android-item" markdown="1">
+![Android](/img/quickstart/android-logo.svg "android")
+
+<!--- Module Libraries -->
+Arrow supports Android starting on API 21 and up.
+</div>
+</div>
+
+<div class="setup-graddle-maven" markdown="1">
+<!-- Tab links -->
+<div class="tab" markdown="1">
+  <button class="tablinks" onclick="openSetup(event, 'Gradle-kotlin')" id="defaultOpen" markdown="1">Gradle Kotlin DSL</button>
+  <button class="tablinks" onclick="openSetup(event, 'Gradle-Groovy')" markdown="1">Gradle Groovy DSL</button>
+  <button class="tablinks" onclick="openSetup(event, 'Maven')" markdown="1">Maven</button>
+</div>
+
+<!-- Tab content -->
+<div id="Gradle-kotlin" class="tabcontent" markdown="1">
+
+#### Basic Setup
+
+In your project's root `build.gradle.kts`, append this repository to your list:
+
+```
+allprojects {
+    repositories {
+        mavenCentral()
+    }
+}
+```
+
+Add the dependencies into the project's `build.gradle.kts`:
+
+```
+dependencies {
+    implementation("io.arrow-kt:arrow-core:0.13.2")
+}
+```
+
+#### BOM file
+
+To avoid specifying the Arrow version for every dependency, a BOM file is available:
+
+```
+dependencies {
+    implementation(platform("io.arrow-kt:arrow-stack:0.13.2"))
+
+    implementation("io.arrow-kt:arrow-core")
+    ...
+}
+```
+
+#### Next development version
+
+If you want to try the latest features, replace `0.13.2` with `1.0.0-SNAPSHOT` and add this configuration:
+
+```
+allprojects {
+    repositories {
+        ...
+        maven(url = "https://oss.sonatype.org/content/repositories/snapshots/")
+    }
+
+    // To use latest artifacts
+    configurations.all { resolutionStrategy.cacheChangingModulesFor(0, "seconds") }
+}
+```
+
+</div>
+
+<div id="Gradle-Groovy" class="tabcontent" markdown="1">
+
+#### Basic Setup
+
+In your project's root `build.gradle`, append this repository to your list:
+
+```groovy
+allprojects {
+    repositories {
+        mavenCentral()
+    }
+}
+```
+
+Add the dependencies into the project's `build.gradle`:
+
+##### Arrow Core
+
+```groovy
+def arrow_version = "0.13.2"
+dependencies {
+    implementation "io.arrow-kt:arrow-core:$arrow_version"
+}
+```
+
+#### BOM file
+
+To avoid specifying the Arrow version for every dependency, a BOM file is available:
+
+```groovy
+def arrow_version = "0.13.2"
+dependencies {
+    implementation platform("io.arrow-kt:arrow-stack:$arrow_version")
+
+    implementation "io.arrow-kt:arrow-core"
+    ...
+}
+```
+
+#### Next development version
+
+If you want to try the latest features, replace `0.13.2` with `1.0.0-SNAPSHOT` and add this configuration:
+
+```groovy
+allprojects {
+    repositories {
+        ...
+        maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
+    }
+
+    // To use latest artifacts
+    configurations.all { resolutionStrategy.cacheChangingModulesFor 0, 'seconds' }
+}
+```
+
+</div>
+
+<div id="Maven" class="tabcontent" markdown="1">
+
+#### Basic Setup
+
+Make sure to have at least the latest version of JDK 1.8 installed.
+Add to your pom.xml file the following properties:
+
+```xml
+<properties>
+    <kotlin.version>1.4.0</kotlin.version>
+    <arrow.version>0.13.2</arrow.version>
+</properties>
+```
+
+Add the dependencies that you want to use:
+
+```xml
+<dependency>
+  <groupId>io.arrow-kt</groupId>
+  <artifactId>arrow-core</artifactId>
+  <version>${arrow.version}</version>
+</dependency>
+```
+
+#### BOM file
+
+To avoid specifying the Arrow version for every dependency, a BOM file is available:
+
+```xml
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>io.arrow-kt</groupId>
+        <artifactId>arrow-stack</artifactId>
+        <version>${arrow.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+  <dependencies>
+    ...
+  </dependencies>
+```
+
+#### Next development version
+
+If you want to try the latest features, replace `0.13.2` with `1.0.0-SNAPSHOT` and add this configuration:
+
+```xml
+<repository>
+  <snapshotss>
+    <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
+    <updatePolicy>always</updatePolicy>
+  </snapshots>
+</repository>
+```
+
+</div>
+</div>
+
+</div>
diff --git a/arrow-site/docs/docs/dsl/README.md b/arrow-site/docs/docs/dsl/README.md
index f2afb5bf460..4417190c15b 100644
--- a/arrow-site/docs/docs/dsl/README.md
+++ b/arrow-site/docs/docs/dsl/README.md
@@ -8,15 +8,23 @@ permalink: /optics/dsl/
 
 
 Arrow offers an Optics DSL to compose different Optics while improving ease of use and readability.
-To avoid boilerplate, Arrow will generate this property-like DSL using `@optics` annotation.
+To avoid boilerplate, Arrow will generate this property-like DSL using `@optics` annotation. For Arrow Optics to generate the DSL all the annotated classes should declare a `companion object` where the optics properties will be projected as extensions.
 
 ```kotlin
 package com.example.domain
 
-@optics data class Street(val number: Int, val name: String)
-@optics data class Address(val city: String, val street: Street)
-@optics data class Company(val name: String, val address: Address)
-@optics data class Employee(val name: String, val company: Company?)
+@optics data class Street(val number: Int, val name: String) {
+  companion object
+}
+@optics data class Address(val city: String, val street: Street) {
+  companion object
+}
+@optics data class Company(val name: String, val address: Address) {
+  companion object
+}
+@optics data class Employee(val name: String, val company: Company?) {
+  companion object
+}
 ```
 
 The DSL will be generated in the same package as your `data class`, and can be used on the `Companion` of your class.
@@ -37,10 +45,18 @@ Arrow can also generate DSL for a `sealed class`, which can help reduce boilerpl
 ```kotlin
 package com.example.domain
 
-@optics sealed class NetworkResult
-@optics data class Success(val content: String): NetworkResult()
-@optics sealed class NetworkError : NetworkResult()
-@optics data class HttpError(val message: String): NetworkError()
+@optics sealed class NetworkResult {
+  companion object
+}
+@optics data class Success(val content: String): NetworkResult() {
+  companion object
+}
+@optics sealed class NetworkError : NetworkResult() {
+  companion object
+}
+@optics data class HttpError(val message: String): NetworkError() {
+  companion object
+}
 object TimeoutError: NetworkError()
 ```
 
@@ -69,7 +85,9 @@ The DSL also has special support for [Every]({{ '/optics/every' | relative_url }
 `Every` can be used to focus into a structure `S` and see all its foci `A`. Here, we focus into all `Employee`s in the `Employees`.
 
 ```kotlin
-@optics data class Employees(val employees: List<Employee>)
+@optics data class Employees(val employees: List<Employee>) {
+  companion object
+}
 ```
 
 ```kotlin:ank
@@ -94,7 +112,9 @@ Every.list<Employee>().run {
 `At` can be used to focus in `A` at a given index `I` for a given structure `S`.
 
 ```kotlin
-@optics data class Db(val content: Map<Int, String>)
+@optics data class Db(val content: Map<Int, String>) {
+  companion object
+}
 ```
 
 Here we focus into the value of a given key in `MapK`.
diff --git a/arrow-site/docs/docs/fx/README.md b/arrow-site/docs/docs/fx/README.md
index d052e7b8723..61d544cc7f5 100644
--- a/arrow-site/docs/docs/fx/README.md
+++ b/arrow-site/docs/docs/fx/README.md
@@ -1,9 +1,21 @@
 ---
-layout: docs-fx
+layout: quickstart-fx
 title: Arrow Fx. Async and Concurrent Functional Programming for Kotlin
 permalink: /fx/
 ---
 
+<div class="quick-snap" markdown="1">
+[![Maven Central](https://img.shields.io/maven-central/v/io.arrow-kt/arrow-core?color=4caf50&label=latest%20release)](https://maven-badges.herokuapp.com/maven-central/io.arrow-kt/arrow-core)
+[![Latest snapshot](https://img.shields.io/badge/dynamic/xml?color=orange&label=latest%20snapshot&prefix=v&query=%2F%2Fmetadata%2Fversioning%2Flatest&url=https%3A%2F%2Foss.sonatype.org%2Fservice%2Flocal%2Frepositories%2Fsnapshots%2Fcontent%2Fio%2Farrow-kt%2Farrow-core%2Fmaven-metadata.xml)](https://oss.sonatype.org/service/local/repositories/snapshots/content/io/arrow-kt/)
+[![Kotlin version](https://img.shields.io/badge/Kotlin-1.4-blue)](https://kotlinlang.org/docs/reference/whatsnew14.html)
+[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://www.apache.org/licenses/LICENSE-2.0)
+[![StackOverflow](https://img.shields.io/badge/arrow--kt-grey.svg?logo=stackoverflow)](https://stackoverflow.com/questions/tagged/arrow-kt)
+[![Twitter](https://img.shields.io/twitter/follow/arrow_kt?color=blue&style=flat)](https://twitter.com/arrow_kt)
+</div>
+
+<div class="quickstart-doc" markdown="1">
+<div class="quickstart-intro" markdown="1">
+
 # Arrow Fx. Typed FP for the masses
 
 Arrow Fx is a next-generation Typed FP Effects Library that makes tracked effectful programming first class in Kotlin built on top of Kotlin's suspend system and [KotlinX Coroutines](https://kotlinlang.org/docs/reference/coroutines/coroutines-guide.html)
@@ -12,90 +24,304 @@ Arrow Fx is a functional companion to KotlinX Coroutines augmenting its api with
 The library brings purity, referential transparency, and direct imperative syntax to typed FP in Kotlin, and is a fun and easy tool for creating Typed Pure Functional Programs.
 
 If you're not familiar yet with Coroutines in Kotlin, it's recommended to first read Kotlin's [Coroutines Guide](https://kotlinlang.org/docs/coroutines-guide.html) on KotlinX Coroutines.
+</div>
+
+<div class="quickstart-intro" markdown="1">
+## Arrow Fx Coroutines Overview
+
+<div class="quickstart-coroutines-list" markdown="1">
+
+<div class="quickstart-coroutines-item" markdown="1">
+#### Quick Start
+  - [Gradle Setup]({{ '/fx/#Gradle-kotlin' | relative_url }})
+  - [Maven Setup]({{ '/fx/#Maven' | relative_url }})
+</div>
+
+<div class="quickstart-coroutines-item" markdown="1">
+#### Extensions and data types
+  - [Parallel]({{ '/fx/parallel' | relative_url }})
+  - [Schedule]({{ '/apidocs/arrow-fx-coroutines/arrow.fx.coroutines/-schedule/' | relative_url }})
+  - [Resource]({{ '/apidocs/arrow-fx-coroutines/arrow.fx.coroutines/-resource/' | relative_url }})
+  - [CircuitBreaker]({{ '/apidocs/arrow-fx-coroutines/arrow.fx.coroutines/-circuit-breaker' | relative_url }})
+  - [Atomic]({{ '/apidocs/arrow-fx-coroutines/arrow.fx.coroutines/-atomic/' | relative_url }})
+  - [STM]({{ '/apidocs/arrow-fx-stm/arrow.fx.stm/-s-t-m/' | relative_url }})
+</div>
 
-## Arrow Fx Coroutines Overview 
-
-- Quick Start
-  - [Gradle Setup](Gradle-Setup)
-  - [Maven Setup](Maven-setup)
-- Extensions and data types   
-  - [Parallel](parallel/)
-  - [Flow](/apidocs/arrow-fx-coroutines/arrow.fx.coroutines/kotlinx.coroutines.flow.-flow/) 
-  - [Schedule](/apidocs/arrow-fx-coroutines/arrow.fx.coroutines/-schedule/)
-  - [Resource](/apidocs/arrow-fx-coroutines/arrow.fx.coroutines/-resource/)
-  - [CircuitBreaker](/apidocs/arrow-fx-coroutines/arrow.fx.coroutines/-circuit-breaker/)
-  - [Atomic](/apidocs/arrow-fx-coroutines/arrow.fx.coroutines/-atomic/)
-  - [STM](/apidocs/arrow-fx-stm/arrow.fx.stm/-s-t-m/)
-- [Integrating with 3rd-party libraries](Integrating-with-3rd-party-libraries)
-- Additional Information
+<div class="quickstart-coroutines-item" markdown="1">
+#### Integrating 
+  - [Integrating with 3rd-party libraries]({{ '/fx/#integrating-with-3rd-party-libraries' | relative_url }})
+</div>
+
+<div class="quickstart-coroutines-item" markdown="1">
+#### Additional Information
   - [Kotlin's Coroutines Guide](https://kotlinlang.org/docs/coroutines-guide.html)
-  - [Pure & Referentially Transparent Functions](purity-and-referentially-transparent-functions/)
-  - [Kotlin's Std Coroutines package](coroutines/)
-  - [Why suspend over IO monad](/effects/io/)
+  - [Pure & Referentially Transparent Functions]({{ '/fx/purity-and-referentially-transparent-functions/' | relative_url }})
+  - [Kotlin's Std Coroutines package]({{ '/fx/coroutines/' | relative_url }})
+  - [Why suspend over IO monad]({{ '/effects/io/' | relative_url }})
+</div>
+</div>
+</div>
 
-## Gradle Setup
+<!--- Setup
+--------------------------------------------------------------------------------
+--------------------------------------------------------------------------------
+-->
 
-```groovy
+<div class="setup" markdown="1">
+## Setup
+
+{: .setup-subtitle}
+Configure Arrow for your project
+<div class="setup-jdk-android" markdown="1">
+<div class="jdk-item" markdown="1">
+![Jdk](/img/quickstart/jdk-logo.svg "jdk")
+
+Make sure to have the latest version of JDK 1.8 installed.
+</div>
+<div class="android-item" markdown="1">
+![Android](/img/quickstart/android-logo.svg "android")
+
+<!--- Module Libraries -->
+Arrow supports Android starting on API 21 and up.
+</div>
+</div>
+
+<div class="setup-graddle-maven" markdown="1">
+<!-- Tab links -->
+<div class="tab" markdown="1">
+  <button class="tablinks" onclick="openSetup(event, 'Gradle-kotlin')" id="defaultOpen" markdown="1">Gradle Kotlin DSL</button>
+  <button class="tablinks" onclick="openSetup(event, 'Gradle-Groovy')" markdown="1">Gradle Groovy DSL</button>
+  <button class="tablinks" onclick="openSetup(event, 'Maven')" markdown="1">Maven</button>
+</div>
+
+<!-- Tab content -->
+<div id="Gradle-kotlin" class="tabcontent" markdown="1">
+
+#### Basic Setup
+
+In your project's root `build.gradle.kts`, append this repository to your list:
+
+```
+allprojects {
+    repositories {
+        mavenCentral()
+    }
+}
+```
+
+Add the dependencies into the project's `build.gradle.kts`:
+
+```
 dependencies {
-  implementation "io.arrow-kt:arrow-fx-coroutines:0.13.2"
-  implementation "io.arrow-kt:arrow-fx-stm:0.13.2"
+    implementation("io.arrow-kt:arrow-fx-coroutines:0.13.2")
+    implementation("io.arrow-kt:arrow-fx-stm:0.13.2")
 }
 ```
 
-### Snapshot version
+#### BOM file
+
+To avoid specifying the Arrow version for every dependency, a BOM file is available:
+
+```
+dependencies {
+    implementation(platform("io.arrow-kt:arrow-stack:0.13.2"))
+
+    implementation("io.arrow-kt:arrow-fx-coroutines")
+    implementation("io.arrow-kt:arrow-fx-stm")
+}
+```
+
+#### Next development version
+
+If you want to try the latest features, replace `0.13.2` with `1.0.0-SNAPSHOT` and add this configuration:
+
+```
+allprojects {
+    repositories {
+        maven(url = "https://oss.sonatype.org/content/repositories/snapshots/")
+    }
+
+    // To use latest artifacts
+    configurations.all { resolutionStrategy.cacheChangingModulesFor(0, "seconds") }
+}
+```
 
-If you want to try the latest features, replace `0.13.2` with `1.0.0-SNAPSHOT` and add this repository:
+</div>
+
+<div id="Gradle-Groovy" class="tabcontent" markdown="1">
+
+#### Basic Setup
+
+In your project's root `build.gradle`, append this repository to your list:
 
 ```groovy
 allprojects {
     repositories {
-        maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
+        mavenCentral()
     }
 }
 ```
 
-### Gradle BOM file
+Add the dependencies into the project's `build.gradle`:
+
+```groovy
+def arrow_version = "0.13.2"
+dependencies {
+    implementation "io.arrow-kt:arrow-fx-coroutines:$arrow_version"
+    implementation "io.arrow-kt:arrow-fx-stm:$arrow_version"
+}
+```
+
+#### BOM file
 
 To avoid specifying the Arrow version for every dependency, a BOM file is available:
 
 ```groovy
-implementation platform("io.arrow-kt:arrow-stack:$arrow_version")
+def arrow_version = "0.13.2"
+dependencies {
+    implementation platform("io.arrow-kt:arrow-stack:$arrow_version")
+
+    implementation "io.arrow-kt:arrow-fx-coroutines"
+    implementation "io.arrow-kt:arrow-fx-stm"
+}
+```
+
+#### Next development version
+
+If you want to try the latest features, replace `0.13.2` with `1.0.0-SNAPSHOT` and add this configuration:
+
+```groovy
+allprojects {
+    repositories {
+        maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
+    }
 
-implementation "io.arrow-kt:arrow-fx-coroutines"
-implementation "io.arrow-kt:arrow-fx-stm"
+    // To use latest artifacts
+    configurations.all { resolutionStrategy.cacheChangingModulesFor 0, 'seconds' }
+}
 ```
 
-## Maven Setup
+</div>
+
+<div id="Maven" class="tabcontent" markdown="1">
+
+#### Basic Setup
+
+Make sure to have at least the latest version of JDK 1.8 installed.
+Add to your pom.xml file the following properties:
+
+```xml
+<properties>
+    <kotlin.version>1.5.20</kotlin.version>
+    <arrow.version>0.13.2</arrow.version>
+</properties>
+```
 
 Add the dependencies that you want to use:
+
 ```xml
 <dependency>
-    <groupId>io.arrow-kt</groupId>
-    <artifactId>arrow-core</artifactId>
-    <version>0.13.2</version>
+  <groupId>io.arrow-kt</groupId>
+  <artifactId>arrow-core</artifactId>
+  <version>${arrow.version}</version>
 </dependency>
 ```
 
-### Maven BOM file
+#### Enabling kapt for the Optics DSL
+
+For the Optics DSL, enable annotation processing using Kotlin plugin:
+
+```xml
+<plugin>
+    <groupId>org.jetbrains.kotlin</groupId>
+    <artifactId>kotlin-maven-plugin</artifactId>
+    <version>${kotlin.version}</version>
+    <executions>
+        <execution>
+            <id>kapt</id>
+            <goals>
+                <goal>kapt</goal>
+            </goals>
+            <configuration>
+                <sourceDirs>
+                    <sourceDir>src/main/kotlin</sourceDir>
+                </sourceDirs>
+                <annotationProcessorPaths>
+                    <annotationProcessorPath>
+                        <groupId>io.arrow-kt</groupId>
+                        <artifactId>arrow-meta</artifactId>
+                        <version>${arrow.version}</version>
+                    </annotationProcessorPath>
+                </annotationProcessorPaths>
+            </configuration>
+        </execution>
+        <execution>
+            <id>compile</id>
+            <phase>compile</phase>
+            <goals>
+                <goal>compile</goal>
+            </goals>
+            <configuration>
+                <sourceDirs>
+                    <sourceDir>src/main/kotlin</sourceDir>
+                </sourceDirs>
+            </configuration>
+        </execution>
+        <execution>
+            <id>test-compile</id>
+            <phase>test-compile</phase>
+            <goals>
+                <goal>test-compile</goal>
+            </goals>
+        </execution>
+    </executions>
+</plugin>
+```
+
+#### BOM file
 
 To avoid specifying the Arrow version for every dependency, a BOM file is available:
 
 ```xml
-<dependencyManagement>
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>io.arrow-kt</groupId>
+        <artifactId>arrow-stack</artifactId>
+        <version>${arrow.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
   <dependencies>
-    <dependency>
-      <groupId>io.arrow-kt</groupId>
-      <artifactId>arrow-stack</artifactId>
-      <version>${arrow.version}</version>
-      <type>pom</type>
-      <scope>import</scope>
-    </dependency>
+    ...
   </dependencies>
-</dependencyManagement>
 ```
 
+#### Next development version
+
+If you want to try the latest features, replace `0.13.2` with `1.0.0-SNAPSHOT` and add this configuration:
+
+```xml
+<repository>
+  <snapshotss>
+    <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
+    <updatePolicy>always</updatePolicy>
+  </snapshots>
+</repository>
+```
+
+</div>
+</div>
+
+</div>
+
+<div class="quickstart-intro" markdown="1">
 ## Integrating with 3rd-party libraries
 
 Arrow Fx integrates with KotlinX Coroutines Fx, Reactor framework, and any library that can model effectful async/concurrent computations as `suspend`.
 
 If you are interested in the Arrow Fx library, please contact us in the #Arrow channel on the official [Kotlin Lang Slack](https://kotlinlang.slack.com/messages/C5UPMM0A0) with any questions and we'll help you along the way.
+</div>
+</div>
diff --git a/arrow-site/docs/docs/fx/coroutines/README.md b/arrow-site/docs/docs/fx/coroutines/README.md
index fda601f1482..5f979a85bfc 100644
--- a/arrow-site/docs/docs/fx/coroutines/README.md
+++ b/arrow-site/docs/docs/fx/coroutines/README.md
@@ -42,8 +42,6 @@ This `typealias Coroutine = Contination<Unit>` will start running every time you
 
 ## Kotlin Standard Library Coroutines
 
-[Kotlin Std Coroutines](img/kotlin-stdlib.png)
-
 The standard library offers a powerful set of primitives to build powerful applications on top of `Continuation`s,
 together with the compiler's ability to rewrite continuation based code to a beautiful `suspend` syntax.
 
diff --git a/arrow-site/docs/docs/fx/parallel/README.MD b/arrow-site/docs/docs/fx/parallel/README.MD
index 35b97d3135c..9b73e78cbb4 100644
--- a/arrow-site/docs/docs/fx/parallel/README.MD
+++ b/arrow-site/docs/docs/fx/parallel/README.MD
@@ -12,7 +12,7 @@ The resulting expressions enjoy the same syntax that most OOP and Java programme
 
 This page discuss the semantics of parallel operations in Arrow Fx, which follows the system of Structured Concurrency.
 
-You can find all functions in the API docs [here](/apidocs/arrow-fx-coroutines/arrow.fx.coroutines/index.html#functions), and all the parallel traverse extensions can be find on [`Iterable`](/apidocs/arrow-fx-coroutines/arrow.fx.coroutines/kotlin.collections.-iterable/index.html).
+You can find all functions and extension functions for Kotlin's Std in the API docs [here](/docs/apidocs/arrow-fx-coroutines/arrow.fx.coroutines/index.html#functions).
 
 ## Parallelization & Concurrency
 
diff --git a/arrow-site/docs/docs/optics/README.md b/arrow-site/docs/docs/optics/README.md
new file mode 100644
index 00000000000..389c4e446f6
--- /dev/null
+++ b/arrow-site/docs/docs/optics/README.md
@@ -0,0 +1,332 @@
+---
+layout: quickstart-optics
+title: Optics
+permalink: /optics/
+---
+
+<div class="quick-snap" markdown="1">
+[![Maven Central](https://img.shields.io/maven-central/v/io.arrow-kt/arrow-core?color=4caf50&label=latest%20release)](https://maven-badges.herokuapp.com/maven-central/io.arrow-kt/arrow-core)
+[![Latest snapshot](https://img.shields.io/badge/dynamic/xml?color=orange&label=latest%20snapshot&prefix=v&query=%2F%2Fmetadata%2Fversioning%2Flatest&url=https%3A%2F%2Foss.sonatype.org%2Fservice%2Flocal%2Frepositories%2Fsnapshots%2Fcontent%2Fio%2Farrow-kt%2Farrow-core%2Fmaven-metadata.xml)](https://oss.sonatype.org/service/local/repositories/snapshots/content/io/arrow-kt/)
+[![Kotlin version](https://img.shields.io/badge/Kotlin-1.4-blue)](https://kotlinlang.org/docs/reference/whatsnew14.html)
+[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://www.apache.org/licenses/LICENSE-2.0)
+[![StackOverflow](https://img.shields.io/badge/arrow--kt-grey.svg?logo=stackoverflow)](https://stackoverflow.com/questions/tagged/arrow-kt)
+[![Twitter](https://img.shields.io/twitter/follow/arrow_kt?color=blue&style=flat)](https://twitter.com/arrow_kt)
+</div>
+
+<div class="quickstart-doc" markdown="1">
+<div class="quickstart-intro" markdown="1">
+
+# Arrow Optics. Transforming and computing over immutable data models in Kotlin
+Arrow Optics provides an automatic DSL that allows users to use `.` notation when accessing, composing, and transforming deeply nested immutable data structures.
+
+Optics also offers all the base types such as [Lens]({{ "/optics/lens/" | relative_url }}), [Prism]({{ '/optics/prism/' | relative_url }}), and others from which we can generalize accessing and traversing deep values in sealed and data classes models.s
+</div>
+
+<div class="quickstart-intro" markdown="1">
+## Arrow Optics Overview
+
+<div class="quickstart-coroutines-list" markdown="1">
+
+<div class="quickstart-coroutines-item" markdown="1">
+#### Quick Start
+  - [Gradle Setup]({{ '/optics/#Gradle-kotlin' | relative_url }})
+  - [Maven Setup]({{ '/optics/#Maven' | relative_url }})
+</div>
+
+<div class="quickstart-coroutines-item" markdown="1">
+#### DSL 
+  - [Optics DSL]({{ '/optics/dsl/' | relative_url }})
+</div>
+
+<div class="quickstart-coroutines-item" markdown="1">
+#### Extensions and data types
+  - [Iso]({{ '/optics/iso/' | relative_url }})
+  - [Lens]({{ '/optics/lens/' | relative_url }})
+  - [Optional]({{ '/optics/optional/' | relative_url }})
+  - [Prism]({{ '/optics/prims/' | relative_url }})
+  - [Getter]({{ '/optics/getter/' | relative_url }})
+  - [Setter]({{ '/optics/setter/' | relative_url }})
+  - [Fold]({{ '/optics/fold/' | relative_url }})
+  - [Traversal]({{ '/optics/traversal/' | relative_url }})
+  - [Every]({{ '/optics/every/' | relative_url }})
+  - [Cons]({{ '/optics/cons/' | relative_url }})
+  - [Snoc]({{ '/optics/snoc/' | relative_url }})
+  - [At]({{ '/optics/at/' | relative_url }})
+  - [Index]({{ '/optics/index/' | relative_url }})
+  - [FilterIndex]({{ '/optics/filterindex/' | relative_url }})
+</div>
+
+<div class="quickstart-coroutines-item" markdown="1">
+#### Additional information
+  - [Kotlin Data classes](https://kotlinlang.org/docs/data-classes.html)
+  - [Kotlin Sealed classes](https://kotlinlang.org/docs/sealed-classes.html)
+</div>
+</div>
+</div>
+
+
+<!--- Setup
+--------------------------------------------------------------------------------
+--------------------------------------------------------------------------------
+-->
+
+<div class="setup" markdown="1">
+## Setup
+
+{: .setup-subtitle}
+Configure Arrow for your project
+<div class="setup-jdk-android" markdown="1">
+<div class="jdk-item" markdown="1">
+![Jdk](/img/quickstart/jdk-logo.svg "jdk")
+
+Make sure to have the latest version of JDK 1.8 installed.
+</div>
+<div class="android-item" markdown="1">
+![Android](/img/quickstart/android-logo.svg "android")
+
+<!--- Module Libraries -->
+Arrow supports Android starting on API 21 and up.
+</div>
+</div>
+
+<div class="setup-graddle-maven" markdown="1">
+<!-- Tab links -->
+<div class="tab" markdown="1">
+  <button class="tablinks" onclick="openSetup(event, 'Gradle-kotlin')" id="defaultOpen" markdown="1">Gradle Kotlin DSL</button>
+  <button class="tablinks" onclick="openSetup(event, 'Gradle-Groovy')" markdown="1">Gradle Groovy DSL</button>
+  <button class="tablinks" onclick="openSetup(event, 'Maven')" markdown="1">Maven</button>
+</div>
+
+<!-- Tab content -->
+<div id="Gradle-kotlin" class="tabcontent" markdown="1">
+
+#### Basic Setup
+
+In your project's root `build.gradle.kts`, append this repository to your list:
+
+```
+allprojects {
+    repositories {
+        mavenCentral()
+    }
+}
+```
+
+Add the dependencies into the project's `build.gradle.kts`:
+
+```
+apply plugin: 'kotlin-kapt'
+
+dependencies {
+    implementation("io.arrow-kt:arrow-optics:0.13.2")
+    kapt("io.arrow-kt:arrow-meta:0.13.2")
+}
+```
+
+#### BOM file
+
+To avoid specifying the Arrow version for every dependency, a BOM file is available:
+
+```
+dependencies {
+    implementation(platform("io.arrow-kt:arrow-stack:0.13.2"))
+
+    implementation("io.arrow-kt:arrow-core")
+    implementation("io.arrow-kt:arrow-optics")
+    ...
+}
+```
+
+#### Next development version
+
+If you want to try the latest features, replace `0.13.2` with `1.0.0-SNAPSHOT` and add this configuration:
+
+```
+allprojects {
+    repositories {
+        ...
+        maven(url = "https://oss.sonatype.org/content/repositories/snapshots/")
+    }
+
+    // To use latest artifacts
+    configurations.all { resolutionStrategy.cacheChangingModulesFor(0, "seconds") }
+}
+```
+
+</div>
+
+<div id="Gradle-Groovy" class="tabcontent" markdown="1">
+
+#### Basic Setup
+
+In your project's root `build.gradle`, append this repository to your list:
+
+```groovy
+allprojects {
+    repositories {
+        mavenCentral()
+    }
+}
+```
+
+Add the dependencies into the project's `build.gradle`:
+
+```groovy
+apply plugin: 'kotlin-kapt'
+
+def arrow_version = "0.13.2"
+dependencies {
+    implementation "io.arrow-kt:arrow-optics:$arrow_version"
+    kapt    "io.arrow-kt:arrow-meta:$arrow_version"
+}
+```
+
+#### BOM file
+
+To avoid specifying the Arrow version for every dependency, a BOM file is available:
+
+```groovy
+def arrow_version = "0.13.2"
+dependencies {
+    implementation platform("io.arrow-kt:arrow-stack:$arrow_version")
+
+    implementation "io.arrow-kt:arrow-core"
+    implementation "io.arrow-kt:arrow-optics"
+    ...
+}
+```
+
+#### Next development version
+
+If you want to try the latest features, replace `0.13.2` with `1.0.0-SNAPSHOT` and add this configuration:
+
+```groovy
+allprojects {
+    repositories {
+        ...
+        maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
+    }
+
+    // To use latest artifacts
+    configurations.all { resolutionStrategy.cacheChangingModulesFor 0, 'seconds' }
+}
+```
+
+</div>
+
+<div id="Maven" class="tabcontent" markdown="1">
+
+#### Basic Setup
+
+Make sure to have at least the latest version of JDK 1.8 installed.
+Add to your pom.xml file the following properties:
+
+```xml
+<properties>
+    <kotlin.version>1.4.0</kotlin.version>
+    <arrow.version>0.13.2</arrow.version>
+</properties>
+```
+
+Add the dependencies that you want to use:
+
+```xml
+<dependency>
+  <groupId>io.arrow-kt</groupId>
+  <artifactId>arrow-core</artifactId>
+  <version>${arrow.version}</version>
+</dependency>
+```
+
+#### Enabling kapt for the Optics DSL
+
+For the Optics DSL, enable annotation processing using Kotlin plugin:
+
+```xml
+<plugin>
+    <groupId>org.jetbrains.kotlin</groupId>
+    <artifactId>kotlin-maven-plugin</artifactId>
+    <version>${kotlin.version}</version>
+    <executions>
+        <execution>
+            <id>kapt</id>
+            <goals>
+                <goal>kapt</goal>
+            </goals>
+            <configuration>
+                <sourceDirs>
+                    <sourceDir>src/main/kotlin</sourceDir>
+                </sourceDirs>
+                <annotationProcessorPaths>
+                    <annotationProcessorPath>
+                        <groupId>io.arrow-kt</groupId>
+                        <artifactId>arrow-meta</artifactId>
+                        <version>${arrow.version}</version>
+                    </annotationProcessorPath>
+                </annotationProcessorPaths>
+            </configuration>
+        </execution>
+        <execution>
+            <id>compile</id>
+            <phase>compile</phase>
+            <goals>
+                <goal>compile</goal>
+            </goals>
+            <configuration>
+                <sourceDirs>
+                    <sourceDir>src/main/kotlin</sourceDir>
+                </sourceDirs>
+            </configuration>
+        </execution>
+        <execution>
+            <id>test-compile</id>
+            <phase>test-compile</phase>
+            <goals>
+                <goal>test-compile</goal>
+            </goals>
+        </execution>
+    </executions>
+</plugin>
+```
+
+#### BOM file
+
+To avoid specifying the Arrow version for every dependency, a BOM file is available:
+
+```xml
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>io.arrow-kt</groupId>
+        <artifactId>arrow-stack</artifactId>
+        <version>${arrow.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+  <dependencies>
+    ...
+  </dependencies>
+```
+
+#### Next development version
+
+If you want to try the latest features, replace `0.13.2` with `1.0.0-SNAPSHOT` and add this configuration:
+
+```xml
+<repository>
+  <snapshotss>
+    <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
+    <updatePolicy>always</updatePolicy>
+  </snapshots>
+</repository>
+```
+
+</div>
+</div>
+
+</div>
+
+
+</div>
diff --git a/arrow-site/docs/docs/quickstart/README.md b/arrow-site/docs/docs/quickstart/README.md
index 55570f754f3..0aba2a073b4 100644
--- a/arrow-site/docs/docs/quickstart/README.md
+++ b/arrow-site/docs/docs/quickstart/README.md
@@ -1,45 +1,204 @@
 ---
-layout: docs-core
+layout: quickstart
 title: Quick Start
-permalink: /core/
+permalink: /quickstart/
 ---
 
+<div class="quick-snap" markdown="1">
 [![Maven Central](https://img.shields.io/maven-central/v/io.arrow-kt/arrow-core?color=4caf50&label=latest%20release)](https://maven-badges.herokuapp.com/maven-central/io.arrow-kt/arrow-core)
 [![Latest snapshot](https://img.shields.io/badge/dynamic/xml?color=orange&label=latest%20snapshot&prefix=v&query=%2F%2Fmetadata%2Fversioning%2Flatest&url=https%3A%2F%2Foss.sonatype.org%2Fservice%2Flocal%2Frepositories%2Fsnapshots%2Fcontent%2Fio%2Farrow-kt%2Farrow-core%2Fmaven-metadata.xml)](https://oss.sonatype.org/service/local/repositories/snapshots/content/io/arrow-kt/)
 [![Kotlin version](https://img.shields.io/badge/Kotlin-1.4-blue)](https://kotlinlang.org/docs/reference/whatsnew14.html)
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://www.apache.org/licenses/LICENSE-2.0)
 [![StackOverflow](https://img.shields.io/badge/arrow--kt-grey.svg?logo=stackoverflow)](https://stackoverflow.com/questions/tagged/arrow-kt)
 [![Twitter](https://img.shields.io/twitter/follow/arrow_kt?color=blue&style=flat)](https://twitter.com/arrow_kt)
-
-Λrrow is a library for Typed Functional Programming in Kotlin.
-
-Arrow complements the Kotlin standard library and KotlinX Coroutines libraries with functional patterns that favor composition, effect control, and immutability.
-
-Arrow is composed of 4 main modular libraries:
-
-* [**Core**]({{ '/core/' | relative_url }}): Arrow Core includes types such as [`Either`]({{ '/apidocs/arrow-core/arrow.core/-either/' | relative_url }}), [`Validated`]({{ '/apidocs/arrow-core/arrow.core/-validated/' | relative_url }}) and many extensions to [`Iterable`]({{ '/apidocs/arrow-core/arrow.core/kotlin.collections.-iterable/' | relative_url }}) that can be used when implementing [error handling patterns]({{ '/patterns/error_handling/' | relative_url }}).
+</div>
+
+
+<div class="quickstart-doc" markdown="1">
+
+<!--- Module Libraries
+--------------------------------------------------------------------------------
+--------------------------------------------------------------------------------
+-->
+<div class="modular-libraries" markdown="1">
+<div class="modular-libraries-header" markdown="1">
+# Λrrow is a library for Typed Functional Programming in Kotlin.
+Arrow is composed of 4 main modular libraries
+</div>
+<div class="libraries-list" markdown="1">
+<!--- Module library Core
+-------------------------------------
+-->
+<div href="#" class="library-item" markdown="1">
+<div class="library-item-content" markdown="1">
+### Core
+Arrow Core includes types such as [`Either`]({{ '/apidocs/arrow-core/arrow.core/-either/' | relative_url }}), [`Validated`]({{ '/apidocs/arrow-core/arrow.core/-validated/' | relative_url }}) and many extensions to [`Iterable`]({{ '/apidocs/arrow-core/arrow.core/index.html#functions' | relative_url }}) that can be used when implementing [error handling patterns]({{ '/patterns/error_handling/' | relative_url }}).
 Core also includes the base continuation effects system, which includes patterns to remove callbacks and enables controlled effects in direct syntax. Some applications of the effect system reduce boilerplate and enable direct syntax including [monad comprehensions and computation expressions]({{ '/patterns/monad_comprehensions/' | relative_url }}).
 
-* [**Fx**]({{ '/fx/' | relative_url }}): Arrow Fx is a full-featured, high-performance, asynchronous framework that brings functional operators to Kotlin's `suspend` functions.
+<a href="{{ "/core/" | relative_url }}" class="library-cta core" markdown="1">Read more</a>
+</div>
+<div class="library-item-brand" markdown="1">
+![Core](/img/quickstart/modular-libraries-core.svg "Arrow Core")
+</div>
+</div>
+<!--- Module library Fx
+-------------------------------------
+-->
+<div href="#" class="library-item" markdown="1">
+<div class="library-item-content" markdown="1">
+### Fx
+Arrow Fx is a full-featured, high-performance, asynchronous framework that brings functional operators to Kotlin's `suspend` functions.
 By leveraging the power of KotlinX Coroutines and the compiler support for CPS transformations, Arrow Fx results in optimal async programs with increased throughput and decreased allocations.
 
-* [**Optics**]({{ '/optics/dsl/' | relative_url }}): Arrow Optics provides an automatic DSL that allows users to use `.` notation when accessing, composing, and transforming deeply nested immutable data structures.
-Optics also offers all the base types such as [Lens]({{ '/optics/lens/' | relative_url }}), [Prism]({{ '/optics/prism/' | relative_url }}), and others from which we can generalize accessing and traversing deep values in sealed and data classes models.
-
-* [**Meta**](https://meta.arrow-kt.io): Arrow Meta is a general purpose library for meta-programming in Kotlin to build compiler plugins.
+<a href="{{ "/fx/" | relative_url }}" class="library-cta fx">Read more</a>
+</div>
+<div class="library-item-brand" markdown="1">
+![Core](/img/quickstart/modular-libraries-fx.svg "Arrow Core")
+</div>
+</div>
+<!--- Module library Optics
+-------------------------------------
+-->
+<div href="{{ "/optics/dsl/" | relative_url }}" class="library-item" markdown="1">
+<div class="library-item-content" markdown="1">
+### Optics
+Arrow Optics provides an automatic DSL that allows users to use `.` notation when accessing, composing, and transforming deeply nested immutable data structures.
+Optics also offers all the base types such as [Lens]({{ "/optics/lens/" | relative_url }}), [Prism]({{ '/optics/prism/' | relative_url }}), and others from which we can generalize accessing and traversing deep values in sealed and data classes models.
+
+<a href="{{ "/optics/" | relative_url }}" class="library-cta optics">Read more</a>
+</div>
+<div class="library-item-brand" markdown="1">
+![Core](/img/quickstart/modular-libraries-optics.svg "Arrow Core")
+</div>
+</div>
+<!--- Module library Meta start
+-------------------------------------
+-->
+<div href="{{ "/meta/" | relative_url }}" class="library-item" markdown="1">
+<div class="library-item-content" markdown="1">
+### Meta
+Arrow Meta is a general purpose library for meta-programming in Kotlin to build compiler plugins.
 Some type system features proposed by Arrow such as union types, product types, proof derivation, and others are built with Arrow Meta and serve as examples of what could be incorporated in the Kotlin compiler.
 
+<a href="{{ "/meta/" | relative_url }}" class="library-cta meta">Read more</a>
+</div>
+<div class="library-item-brand" markdown="1">
+![Core](/img/quickstart/modular-libraries-meta.svg "Arrow Core")
+</div>
+</div>
+
+</div>
+</div>
+
+<!--- Setup
+--------------------------------------------------------------------------------
+--------------------------------------------------------------------------------
+-->
+
+<div class="setup" markdown="1">
 ## Setup
 
-### JDK
+{: .setup-subtitle}
+Configure Arrow for your project
+<div class="setup-jdk-android" markdown="1">
+<div class="jdk-item" markdown="1">
+![Jdk](/img/quickstart/jdk-logo.svg "jdk")
 
 Make sure to have the latest version of JDK 1.8 installed.
+</div>
+<div class="android-item" markdown="1">
+![Android](/img/quickstart/android-logo.svg "android")
 
-### Android
-
+<!--- Module Libraries -->
 Arrow supports Android starting on API 21 and up.
+</div>
+</div>
+
+<div class="setup-graddle-maven" markdown="1">
+<!-- Tab links -->
+<div class="tab" markdown="1">
+  <button class="tablinks" onclick="openSetup(event, 'Gradle-kotlin')" id="defaultOpen" markdown="1">Gradle Kotlin DSL</button>
+  <button class="tablinks" onclick="openSetup(event, 'Gradle-Groovy')" markdown="1">Gradle Groovy DSL</button>
+  <button class="tablinks" onclick="openSetup(event, 'Maven')" markdown="1">Maven</button>
+</div>
+
+<!-- Tab content -->
+<div id="Gradle-kotlin" class="tabcontent" markdown="1">
+
+#### Basic Setup
+
+In your project's root `build.gradle.kts`, append this repository to your list:
+
+```
+allprojects {
+    repositories {
+        mavenCentral()
+    }
+}
+```
+
+Add the dependencies into the project's `build.gradle.kts`:
+
+##### Arrow Core
+
+```
+dependencies {
+    implementation("io.arrow-kt:arrow-core:0.13.2")
+}
+```
+
+##### Arrow Core + Arrow Optics
+
+```
+apply plugin: 'kotlin-kapt'
+
+dependencies {
+    implementation("io.arrow-kt:arrow-optics:0.13.2")
+    kapt("io.arrow-kt:arrow-meta:0.13.2")
+}
+```
+
+##### Arrow Core + Arrow Fx
+
+```
+dependencies {
+    implementation("io.arrow-kt:arrow-fx-coroutines:0.13.2")
+}
+```
+
+#### BOM file
+
+To avoid specifying the Arrow version for every dependency, a BOM file is available:
+
+```
+dependencies {
+    implementation(platform("io.arrow-kt:arrow-stack:0.13.2"))
+
+    implementation("io.arrow-kt:arrow-core")
+    implementation("io.arrow-kt:arrow-fx-coroutines")
+    ...
+}
+```
+
+#### Next development version
+
+If you want to try the latest features, replace `0.13.2` with `1.0.0-SNAPSHOT` and add this configuration:
+
+```
+allprojects {
+    repositories {
+        ...
+        maven(url = "https://oss.sonatype.org/content/repositories/snapshots/")
+    }
 
-### Gradle
+    // To use latest artifacts
+    configurations.all { resolutionStrategy.cacheChangingModulesFor(0, "seconds") }
+}
+```
+
+</div>
+
+<div id="Gradle-Groovy" class="tabcontent" markdown="1">
 
 #### Basic Setup
 
@@ -89,21 +248,43 @@ dependencies {
 
 To avoid specifying the Arrow version for every dependency, a BOM file is available:
 
-```
+```groovy
+def arrow_version = "0.13.2"
+dependencies {
     implementation platform("io.arrow-kt:arrow-stack:$arrow_version")
 
     implementation "io.arrow-kt:arrow-core"
     implementation "io.arrow-kt:arrow-fx-coroutines"
     ...
+}
+```
+
+#### Next development version
+
+If you want to try the latest features, replace `0.13.2` with `1.0.0-SNAPSHOT` and add this configuration:
+
+```groovy
+allprojects {
+    repositories {
+        ...
+        maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
+    }
+
+    // To use latest artifacts
+    configurations.all { resolutionStrategy.cacheChangingModulesFor 0, 'seconds' }
+}
 ```
 
-### Maven
+</div>
+
+<div id="Maven" class="tabcontent" markdown="1">
 
 #### Basic Setup
 
 Make sure to have at least the latest version of JDK 1.8 installed.
 Add to your pom.xml file the following properties:
-```
+
+```xml
 <properties>
     <kotlin.version>1.4.0</kotlin.version>
     <arrow.version>0.13.2</arrow.version>
@@ -111,19 +292,20 @@ Add to your pom.xml file the following properties:
 ```
 
 Add the dependencies that you want to use:
-```
-        <dependency>
-            <groupId>io.arrow-kt</groupId>
-            <artifactId>arrow-core</artifactId>
-            <version>${arrow.version}</version>
-        </dependency>
 
+```xml
+<dependency>
+  <groupId>io.arrow-kt</groupId>
+  <artifactId>arrow-core</artifactId>
+  <version>${arrow.version}</version>
+</dependency>
 ```
 
 #### Enabling kapt for the Optics DSL
 
 For the Optics DSL, enable annotation processing using Kotlin plugin:
-```
+
+```xml
 <plugin>
     <groupId>org.jetbrains.kotlin</groupId>
     <artifactId>kotlin-maven-plugin</artifactId>
@@ -174,7 +356,7 @@ For the Optics DSL, enable annotation processing using Kotlin plugin:
 
 To avoid specifying the Arrow version for every dependency, a BOM file is available:
 
-```
+```xml
   <dependencyManagement>
     <dependencies>
       <dependency>
@@ -191,15 +373,23 @@ To avoid specifying the Arrow version for every dependency, a BOM file is availa
   </dependencies>
 ```
 
-## Next development version
+#### Next development version
 
-If you want to try the latest features, replace `0.13.2` with `1.0.0-SNAPSHOT` and add this repository:
+If you want to try the latest features, replace `0.13.2` with `1.0.0-SNAPSHOT` and add this configuration:
 
-```groovy
-allprojects {
-    repositories {
-        ...
-        maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
-    }
-}
+```xml
+<repository>
+  <snapshotss>
+    <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
+    <updatePolicy>always</updatePolicy>
+  </snapshots>
+</repository>
 ```
+
+</div>
+</div>
+
+</div>
+
+
+</div>
diff --git a/arrow-site/docs/fonts/jetbrainsmononl-bold-webfont.woff b/arrow-site/docs/fonts/jetbrainsmononl-bold-webfont.woff
new file mode 100644
index 00000000000..5714c62f628
Binary files /dev/null and b/arrow-site/docs/fonts/jetbrainsmononl-bold-webfont.woff differ
diff --git a/arrow-site/docs/fonts/jetbrainsmononl-bold-webfont.woff2 b/arrow-site/docs/fonts/jetbrainsmononl-bold-webfont.woff2
new file mode 100644
index 00000000000..bb56711bd86
Binary files /dev/null and b/arrow-site/docs/fonts/jetbrainsmononl-bold-webfont.woff2 differ
diff --git a/arrow-site/docs/fonts/jetbrainsmononl-regular-webfont.woff b/arrow-site/docs/fonts/jetbrainsmononl-regular-webfont.woff
new file mode 100644
index 00000000000..2370e352236
Binary files /dev/null and b/arrow-site/docs/fonts/jetbrainsmononl-regular-webfont.woff differ
diff --git a/arrow-site/docs/fonts/jetbrainsmononl-regular-webfont.woff2 b/arrow-site/docs/fonts/jetbrainsmononl-regular-webfont.woff2
new file mode 100644
index 00000000000..5d021155445
Binary files /dev/null and b/arrow-site/docs/fonts/jetbrainsmononl-regular-webfont.woff2 differ
diff --git a/arrow-site/docs/img/docs/47deg-header-doc.svg b/arrow-site/docs/img/docs/47deg-header-doc.svg
new file mode 100644
index 00000000000..26c02e86fc0
--- /dev/null
+++ b/arrow-site/docs/img/docs/47deg-header-doc.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="28px" height="28px" viewBox="0 0 28 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>47deg-header-doc</title>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 Z M12.1920661,9.12228202 L6.37724171,17.1770025 L11.4469747,17.1770025 L11.4469747,18.9452752 L12.1987621,18.9452752 L12.1987621,17.1770026 L13.4825955,17.1770026 L13.4825955,16.4816725 L12.1920661,16.4816725 L12.1920661,9.12228202 Z M14.6077552,9.49581829 L14.6103922,10.1700129 L20.2257783,10.1700129 L14.2003986,18.7251547 L14.7650244,19.1300405 L21.5534458,9.49581829 L14.6077552,9.49581829 Z M11.4484332,11.272552 L11.438073,16.4837239 L7.70049612,16.4837239 L11.4484332,11.272552 Z" id="Shape" fill="#263237" fill-rule="nonzero"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/arrow-site/docs/img/home/47deg-footer-brand-white.svg b/arrow-site/docs/img/home/47deg-footer-brand-white.svg
new file mode 100644
index 00000000000..0ec3c1f46d9
--- /dev/null
+++ b/arrow-site/docs/img/home/47deg-footer-brand-white.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="48px" height="48px" viewBox="0 0 48 48" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>47deg-footer-brand-white</title>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="47deg-logo-copy" fill="#FFFFFF" fill-rule="nonzero">
+            <path d="M24,48 C10.745166,48 0,37.254834 0,24 C0,10.745166 10.745166,0 24,0 C37.254834,0 48,10.745166 48,24 C48,37.254834 37.254834,48 24,48 Z M20.9006848,15.6381977 L10.9324144,29.44629 L19.6233851,29.44629 L19.6233851,32.4776147 L20.9121636,32.4776147 L20.9121636,29.4462902 L23.1130209,29.4462902 L23.1130209,28.2542957 L20.9006848,28.2542957 L20.9006848,15.6381977 Z M25.0418661,16.2785456 L25.0463867,17.4343078 L34.6727629,17.4343079 L24.3435405,32.1002651 L25.3114704,32.7943551 L36.9487642,16.2785456 L25.0418661,16.2785456 Z M19.6258854,19.3243749 L19.6081251,28.2578124 L13.2008505,28.2578124 L19.6258854,19.3243749 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/arrow-site/docs/img/home/47deg-footer-brand.svg b/arrow-site/docs/img/home/47deg-footer-brand.svg
new file mode 100644
index 00000000000..c759090822c
--- /dev/null
+++ b/arrow-site/docs/img/home/47deg-footer-brand.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="48px" height="48px" viewBox="0 0 48 48" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>47deg-footer-brand</title>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="47deg-logo" fill="#263237" fill-rule="nonzero">
+            <path d="M24,48 C10.745166,48 0,37.254834 0,24 C0,10.745166 10.745166,0 24,0 C37.254834,0 48,10.745166 48,24 C48,37.254834 37.254834,48 24,48 Z M20.9006848,15.6381977 L10.9324144,29.44629 L19.6233851,29.44629 L19.6233851,32.4776147 L20.9121636,32.4776147 L20.9121636,29.4462902 L23.1130209,29.4462902 L23.1130209,28.2542957 L20.9006848,28.2542957 L20.9006848,15.6381977 Z M25.0418661,16.2785456 L25.0463867,17.4343078 L34.6727629,17.4343079 L24.3435405,32.1002651 L25.3114704,32.7943551 L36.9487642,16.2785456 L25.0418661,16.2785456 Z M19.6258854,19.3243749 L19.6081251,28.2578124 L13.2008505,28.2578124 L19.6258854,19.3243749 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/arrow-site/docs/img/labels/icon-label-common.svg b/arrow-site/docs/img/labels/icon-label-common.svg
new file mode 100644
index 00000000000..672c27afacd
--- /dev/null
+++ b/arrow-site/docs/img/labels/icon-label-common.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon-label-common</title>
+    <g id="icon-label-common" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M7.93749061,15.8749979 C8.17896419,15.8749979 8.37498957,15.6789725 8.37498957,15.437499 L8.37498957,14.562501 C8.37498957,14.3210275 8.17896419,14.1250021 7.93749061,14.1250021 L5.74999583,14.1250021 L5.74999583,5.37502295 L7.93749061,5.37502295 C8.17896419,5.37502295 8.37498957,5.17899757 8.37498957,4.93752399 L8.37498957,4.06252608 C8.37498957,3.8210525 8.17896419,3.62502712 7.93749061,3.62502712 L4.87499791,3.62502712 C4.39207746,3.62502712 4,4.01710458 4,4.50002503 L4,15 C4,15.4829204 4.39207746,15.8749979 4.87499791,15.8749979 L7.93749061,15.8749979 Z M15.3749812,15.8749979 C15.8578933,15.8749979 16.2499708,15.4829204 16.2499708,15 L16.2499708,4.50002503 C16.2499708,4.01710458 15.8578933,3.62502712 15.3749812,3.62502712 L12.3124802,3.62502712 C12.0710066,3.62502712 11.8749812,3.8210525 11.8749812,4.06252608 L11.8749812,4.93752399 C11.8749812,5.17899757 12.0710066,5.37502295 12.3124802,5.37502295 L14.499975,5.37502295 L14.499975,14.1250021 L12.3124802,14.1250021 C12.0710066,14.1250021 11.8749812,14.3210275 11.8749812,14.562501 L11.8749812,15.437499 C11.8749812,15.6789725 12.0710066,15.8749979 12.3124802,15.8749979 L15.3749812,15.8749979 Z" id="" fill="#FFFFFF" fill-rule="nonzero"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/arrow-site/docs/img/labels/icon-label-js.svg b/arrow-site/docs/img/labels/icon-label-js.svg
new file mode 100644
index 00000000000..9916ca15c9f
--- /dev/null
+++ b/arrow-site/docs/img/labels/icon-label-js.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon-label-js</title>
+    <g id="icon-label-js" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M15.9506341,11.9260565 C15.8171558,11.0477509 15.2745756,10.31034 13.6676365,9.62233392 C13.1094549,9.351523 12.4871344,9.15758213 12.3016517,8.71109177 C12.2357793,8.45125967 12.2271119,8.30487539 12.2687155,8.14751229 C12.3883258,7.63699711 12.9655758,7.4778042 13.4232154,7.62418848 C13.7179075,7.72848728 13.9969983,7.96820984 14.1651462,8.35062048 C14.9521477,7.81267654 14.9504142,7.81631785 15.4999284,7.44671584 C15.2988443,7.11735121 15.1913684,6.96545922 15.0596236,6.82458265 C14.5863827,6.26649258 13.9415269,5.97921343 12.9101043,6.00117107 C12.7315555,6.02495851 12.5512906,6.05055746 12.3727245,6.07436321 C11.8578973,6.21159847 11.3673041,6.49704782 11.0795459,6.87947675 C10.2162712,7.91331574 10.4624258,9.72297311 11.5129167,10.4677214 C12.5478063,11.2874734 14.0680712,11.4741134 14.2622213,12.240801 C14.451171,13.1794902 13.6087154,13.4832193 12.7714256,13.3752792 C12.1543056,13.2398738 11.8110932,12.9086793 11.4401104,12.306674 C10.7571353,12.7238692 10.7571353,12.7238692 10.0550746,13.1502134 C10.221489,13.5344721 10.3965535,13.7083035 10.6756616,14.0413277 C11.9965759,15.4557658 15.3023113,15.3862333 15.8951799,13.2453632 C15.9194314,13.1721527 16.0789292,12.6817654 15.9506341,11.9260565 L15.9506341,11.9260565 Z M9.12070975,6.11460059 L7.41496215,6.11460059 C7.41496215,7.66993357 7.40804556,9.21428774 7.40804556,10.7696207 C7.40804556,11.7595444 7.45658309,12.667127 7.30403656,12.9452571 C7.05441496,13.4923501 6.40782568,13.4246656 6.11313351,13.3185187 C5.81324089,13.1629854 5.66069436,12.9415792 5.48387906,12.6287011 C5.43534153,12.5390407 5.39893838,12.4695082 5.38678666,12.4640188 C4.92396395,12.7622767 4.46284005,13.0623462 4,13.3606225 C4.23057062,13.8601589 4.57031601,14.2938223 5.00542033,14.5755937 C5.65547658,14.9872995 6.52915217,15.113556 7.44271522,14.8921497 C8.0373,14.7091694 8.55039373,14.3304184 8.81908365,13.7540303 C9.20738391,12.9983214 9.12417671,12.0834196 9.12070975,11.0715383 C9.12937716,9.42105553 9.12070975,7.77057277 9.12070975,6.11460059 Z" id="Shape" fill="#FFFFFF" fill-rule="nonzero"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/arrow-site/docs/img/labels/icon-label-jvm.svg b/arrow-site/docs/img/labels/icon-label-jvm.svg
new file mode 100644
index 00000000000..9158ef41580
--- /dev/null
+++ b/arrow-site/docs/img/labels/icon-label-jvm.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon-label-jvm</title>
+    <g id="icon-label-jvm" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M15.3749705,12.6250033 L15.3749705,5.40627049 C15.3749705,4.83907595 14.9109175,4.37502295 14.343723,4.37502295 L5.40624426,4.37502295 C4.83904972,4.37502295 4.37499672,4.83907595 4.37499672,5.40627049 L4.37499672,12.6250033 L15.3749705,12.6250033 Z M13.9999738,11.2500066 L5.74999344,11.2500066 L5.74999344,5.75001967 L13.9999738,5.75001967 L13.9999738,11.2500066 Z M15.3749705,15.3749967 C16.1312229,15.3749967 16.7499672,14.7562524 16.7499672,14 L16.7499672,13.6562508 C16.7499672,13.467193 16.5952759,13.3125016 16.406218,13.3125016 L11.1971297,13.3125016 C11.1812263,13.7380969 10.8810962,14 10.4937279,14 L9.18748525,14 C8.785934,14 8.47808295,13.6246747 8.48345403,13.3125016 L3.34374918,13.3125016 C3.15469133,13.3125016 3,13.467193 3,13.6562508 L3,14 C3,14.7562524 3.61874433,15.3749967 4.37499672,15.3749967 L15.3749705,15.3749967 Z" id="" fill="#FFFFFF" fill-rule="nonzero"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/arrow-site/docs/img/labels/icon-label-native.svg b/arrow-site/docs/img/labels/icon-label-native.svg
new file mode 100644
index 00000000000..8d81516b8bf
--- /dev/null
+++ b/arrow-site/docs/img/labels/icon-label-native.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon-label-native</title>
+    <g id="icon-label-native" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M15.4999678,16.4999964 C16.327305,16.4999964 16.9999642,15.8273372 16.9999642,15 C16.9999642,14.1726628 16.327305,13.5000036 15.4999678,13.5000036 C15.1624595,13.5000036 14.8531035,13.6171908 14.6023183,13.8046903 L12.3523236,12.4547027 C12.4413814,12.1921988 12.499975,11.9156415 12.499975,11.6226735 C12.499975,10.1718865 11.3257682,8.99767972 9.87498122,8.99767972 C9.67809754,8.99767972 9.48592881,9.02345175 9.30309843,9.06563457 L8.34685529,7.01721569 C8.59530593,6.75001967 8.74999106,6.39376594 8.74999106,6.00002503 C8.74999106,5.17268426 8.07732468,4.50002503 7.24999106,4.50002503 C6.42265028,4.50002503 5.74999106,5.17268426 5.74999106,6.00002503 C5.74999106,6.82735866 6.42265028,7.50002503 7.24999106,7.50002503 C7.27575952,7.50002503 7.29919696,7.49299123 7.32499188,7.49299123 L8.28592709,9.55079424 C7.66014276,10.0289273 7.24999106,10.776568 7.24999106,11.625008 C7.24999106,13.075795 8.42419428,14.2500018 9.87498122,14.2500018 C10.627314,14.2500018 11.2999732,13.9289042 11.7781063,13.4226646 L14.0234088,14.7703176 C14.0116901,14.845322 13.9999714,14.922661 13.9999714,15 C13.9999714,15.8273372 14.6726306,16.4999964 15.4999678,16.4999964 Z M15.4999714,9.00002146 C16.327305,9.00002146 16.9999714,8.32735508 16.9999714,7.50002146 C16.9999714,6.67268068 16.327305,6.00002146 15.4999714,6.00002146 C14.6726306,6.00002146 13.9999714,6.67268068 13.9999714,7.50002146 C13.9999714,8.32735508 14.6726306,9.00002146 15.4999714,9.00002146 Z M12.9124648,10.0968821 L14.0374621,9.25313412 L13.5874815,8.65314471 L12.4624842,9.4968927 L12.9124648,10.0968821 Z M3.5,13.1250116 C4.32733362,13.1250116 5,12.4523452 5,11.6250116 C5,10.7976708 4.32733362,10.1250116 3.5,10.1250116 C2.67265922,10.1250116 2,10.7976708 2,11.6250116 C2,12.4523452 2.67265922,13.1250116 3.5,13.1250116 Z M9.87498122,12.7500054 C9.25388896,12.7500054 8.74998391,12.2461003 8.74998391,11.625008 C8.74998391,11.0039158 9.25388896,10.5000107 9.87498122,10.5000107 C10.4960735,10.5000107 10.9999785,11.0039158 10.9999785,11.625008 C10.9999785,12.2461003 10.4960735,12.7500054 9.87498122,12.7500054 Z M6.68748882,12.0000072 L6.68748882,11.2500089 L5.56249151,11.2500089 L5.56249151,12.0000072 L6.68748882,12.0000072 Z" id="" fill="#FFFFFF" fill-rule="nonzero"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/arrow-site/docs/img/quickstart-pattern.svg b/arrow-site/docs/img/quickstart-pattern.svg
new file mode 100644
index 00000000000..6d44cd1e9a5
--- /dev/null
+++ b/arrow-site/docs/img/quickstart-pattern.svg
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="1504px" height="700px" viewBox="0 0 1504 700" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>quickstart-pattern</title>
+    <g id="quickstart-pattern" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.32" stroke-linecap="round" stroke-linejoin="round">
+        <g id="pattern" transform="translate(-230.000000, -0.499600)" stroke="#273244">
+            <line x1="970.159" y1="589.224" x2="970.159" y2="677.8299" stroke-dasharray="70,40,40,10,5,10"></line>
+            <line x1="1399.8163" y1="517.9807" x2="1399.8163" y2="700.2507" stroke-dasharray="70,40,40,10,5,10"></line>
+            <line x1="1399.8163" y1="152.3294" x2="1399.8163" y2="213.3884" stroke-dasharray="70,40,40,10,5,10"></line>
+            <line x1="928.5535" y1="288.8284" x2="1164.4055" y2="407.6194" stroke-dasharray="100,20,40,10,5,10"></line>
+            <line x1="850.0828" y1="555.3528" x2="1035.9638" y2="651.9968" stroke-dasharray="70,40,40,10,5,10"></line>
+            <line x1="1576.9179" y1="345.8294" x2="1400.4079" y2="436.8364" stroke-dasharray="100,20,40,10,5,10"></line>
+            <line x1="1757.7099" y1="198.3841" x2="1641.3889" y2="258.8031" stroke-dasharray="100,20,40,10,5,10"></line>
+            <line x1="614.2039" y1="0.0013" x2="603.4349" y2="5.5903" stroke-dasharray="100,20,40,10,5,10"></line>
+            <line x1="339.5086" y1="213.388" x2="542.5936" y2="322.552" stroke-dasharray="100,20,40,10,5,10"></line>
+            <line x1="1203.4442" y1="410.3294" x2="824.2542" y2="614.7194" stroke-dasharray="70,40,40,10,5,10"></line>
+            <line x1="1095.8495" y1="312.9017" x2="1018.1165" y2="353.9037" stroke-dasharray="100,20,40,10,5,10"></line>
+            <line x1="850.0828" y1="555.3528" x2="1035.9638" y2="651.9968" stroke-dasharray="70,40,40,10,5,10"></line>
+            <line x1="790.6307" y1="331.1165" x2="1075.5637" y2="479.2595" stroke-dasharray="100,20,40,10,5,10"></line>
+            <line x1="1148.0868" y1="524.1594" x2="904.8118" y2="651.9964" stroke-dasharray="70,40,40,10,5,10"></line>
+            <line x1="1193.5868" y1="575.9534" x2="1313.3478" y2="638.4274" stroke-dasharray="70,40,40,10,5,10"></line>
+            <line x1="1655.1356" y1="551.5335" x2="1510.0086" y2="626.9145" stroke-dasharray="70,40,40,10,5,10"></line>
+            <line x1="1281.9999" y1="579.594" x2="1466.2499" y2="675.5361" stroke-dasharray="70,40,40,10,5,10"></line>
+            <line x1="1624.537" y1="630.7737" x2="1655.136" y2="646.6827" stroke-dasharray="70,40,40,10,5,10"></line>
+            <line x1="1446.3798" y1="617.0598" x2="1335.0978" y2="675.5368" stroke-dasharray="70,40,40,10,5,10"></line>
+            <line x1="204.9911" y1="52.8655" x2="380.3781" y2="144.0535" stroke-dasharray="100,20,40,10,5,10"></line>
+            <line x1="346.5594" y1="2.4671" x2="204.9914" y2="76.8591" stroke-dasharray="100,20,40,10,5,10"></line>
+            <line x1="707.8065" y1="0.0013" x2="777.2905" y2="36.1273" stroke-dasharray="100,20,40,10,5,10"></line>
+            <line x1="805.8055" y1="0.8216" x2="849.0825" y2="23.4236" stroke-dasharray="100,20,40,10,5,10"></line>
+            <line x1="805.8055" y1="0.8216" x2="738.2055" y2="37.2336" stroke-dasharray="100,20,40,10,5,10"></line>
+            <line x1="438.8817" y1="65.8118" x2="717.5347" y2="210.6898" stroke-dasharray="100,20,40,10,5,10"></line>
+            <line x1="245.6903" y1="0.0013" x2="374.1623" y2="66.7973" stroke-dasharray="100,20,40,10,5,10"></line>
+            <line x1="709.1307" y1="192.3431" x2="558.2707" y2="271.6171" stroke-dasharray="100,20,40,10,5,10"></line>
+            <line x1="781.0438" y1="152.3226" x2="724.0048" y2="182.7986" stroke-dasharray="100,20,40,10,5,10"></line>
+            <line x1="486.87" y1="67.1585" x2="283.352" y2="174.1025" stroke-dasharray="100,20,40,10,5,10"></line>
+            <line x1="243.4061" y1="236.1634" x2="65.6021" y2="144.0534" stroke-dasharray="100,20,40,10,5,10"></line>
+            <line x1="850.0828" y1="555.3528" x2="345.0668" y2="288.8288" stroke-dasharray="70,40,40,10,5,10"></line>
+            <line x1="562.5409" y1="74.3929" x2="419.0709" y2="0.0009" stroke-dasharray="100,20,40,10,5,10"></line>
+            <line x1="1109.5185" y1="266.8763" x2="865.5915" y2="144.0533" stroke-dasharray="100,20,40,10,5,10"></line>
+            <line x1="1638.4687" y1="0.0013" x2="1876.9507" y2="123.9933" stroke-dasharray="100,20,40,10,5,10"></line>
+            <line x1="695.745" y1="215.6312" x2="695.745" y2="155.2712" stroke-dasharray="100,20,40,10,5,10"></line>
+            <line x1="805.8055" y1="98.8118" x2="805.8055" y2="0.8218" stroke-dasharray="100,20,40,10,5,10"></line>
+            <line x1="44.3729" y1="442.7503" x2="367.6309" y2="610.8183" stroke-dasharray="70,40,40,10,5,10"></line>
+            <line x1="430.3094" y1="635.3841" x2="468.5404" y2="655.2621" stroke-dasharray="70,40,40,10,5,10"></line>
+            <line x1="447.2723" y1="442.763" x2="538.6903" y2="490.292" stroke-dasharray="100,20,40,10,5,10"></line>
+            <line x1="249.9842" y1="610.8186" x2="204.9912" y2="634.4626" stroke-dasharray="70,40,40,10,5,10"></line>
+            <line x1="357.7147" y1="554.2083" x2="274.4017" y2="597.9873" stroke-dasharray="70,40,40,10,5,10"></line>
+            <line x1="519.5301" y1="471.6575" x2="488.7931" y2="487.8085" stroke-dasharray="70,40,40,10,5,10"></line>
+            <line x1="862.7371" y1="288.8284" x2="558.2701" y2="448.8204" stroke-dasharray="70,40,40,10,5,10"></line>
+            <line x1="462.3358" y1="141.013" x2="598.8108" y2="211.969" stroke-dasharray="100,20,40,10,5,10"></line>
+            <line x1="491.5262" y1="295.1019" x2="408.0892" y2="338.9469" stroke-dasharray="100,20,40,10,5,10"></line>
+            <line x1="603.4354" y1="186.7757" x2="517.4114" y2="231.9797" stroke-dasharray="100,20,40,10,5,10"></line>
+            <line x1="875.2352" y1="410.3294" x2="491.4322" y2="612.0114" stroke-dasharray="70,40,40,10,5,10"></line>
+            <line x1="331.3407" y1="326.0892" x2="54.0747" y2="471.7872" stroke-dasharray="100,20,40,10,5,10"></line>
+            <line x1="673.4461" y1="634.4622" x2="206.4831" y2="392.3332" stroke-dasharray="70,40,40,10,5,10"></line>
+            <line x1="857.4803" y1="668.7747" x2="711.1093" y2="592.8787" stroke-dasharray="70,40,40,10,5,10"></line>
+            <line x1="308.0477" y1="579.594" x2="308.0477" y2="445.012" stroke-dasharray="100,20,40,10,5,10"></line>
+            <line x1="424.12" y1="369.7356" x2="424.12" y2="330.6206" stroke-dasharray="100,20,40,10,5,10"></line>
+            <line x1="1182.9364" y1="171.0745" x2="1341.3784" y2="253.4515" stroke-dasharray="100,20,40,10,5,10"></line>
+            <line x1="1555.788" y1="128.8685" x2="1639.837" y2="172.5675" stroke-dasharray="100,20,40,10,5,10"></line>
+            <line x1="1614.33" y1="138.9417" x2="1463.826" y2="218.0297" stroke-dasharray="100,20,40,10,5,10"></line>
+            <line x1="1750.4608" y1="0.0013" x2="1664.5868" y2="45.1333" stroke-dasharray="100,20,40,10,5,10"></line>
+            <line x1="1313.3476" y1="61.221" x2="1175.6616" y2="133.403" stroke-dasharray="100,20,40,10,5,10"></line>
+            <line x1="1666.8935" y1="117.761" x2="1797.0595" y2="185.438" stroke-dasharray="100,20,40,10,5,10"></line>
+            <line x1="1440.3983" y1="0.0013" x2="1569.2633" y2="67.0013" stroke-dasharray="100,20,40,10,5,10"></line>
+            <line x1="1531.536" y1="0.0013" x2="1721.585" y2="98.8123" stroke-dasharray="100,20,40,10,5,10"></line>
+            <line x1="1585.8485" y1="288.8284" x2="1473.7525" y2="347.7324" stroke-dasharray="100,20,40,10,5,10"></line>
+            <line x1="1439.9677" y1="129.4905" x2="1400.9637" y2="150.3295" stroke-dasharray="100,20,40,10,5,10"></line>
+            <line x1="1391.3056" y1="155.2708" x2="1129.2026" y2="293.0008" stroke-dasharray="100,20,40,10,5,10"></line>
+            <line x1="1662.0077" y1="569.9759" x2="1143.4987" y2="305.7699" stroke-dasharray="70,40,40,10,5,10"></line>
+            <line x1="1794.9442" y1="484.4261" x2="1732.6552" y2="452.6861" stroke-dasharray="100,20,40,10,5,10"></line>
+            <line x1="1816.3905" y1="368.386" x2="1107.2195" y2="0" stroke-dasharray="100,20,40,10,5,10"></line>
+            <line x1="1182.9364" y1="263.3909" x2="1182.9364" y2="117.7609" stroke-dasharray="100,20,40,10,5,10"></line>
+            <line x1="1594.3925" y1="210.6898" x2="1594.3925" y2="138.2508" stroke-dasharray="100,20,40,10,5,10"></line>
+            <line x1="1428.7792" y1="62.0862" x2="1428.7792" y2="0.0012" stroke-dasharray="100,20,40,10,5,10"></line>
+            <line x1="1473.7528" y1="49.4065" x2="1473.7528" y2="0.0015" stroke-dasharray="100,20,40,10,5,10"></line>
+            <line x1="940.7186" y1="140.5032" x2="729.1906" y2="247.3912" stroke-dasharray="100,20,40,10,5,10"></line>
+            <line x1="1247.5214" y1="0.0013" x2="1029.4754" y2="110.2073" stroke-dasharray="100,20,40,10,5,10"></line>
+            <line x1="1313.3476" y1="107.0745" x2="1092.6326" y2="218.0295" stroke-dasharray="100,20,40,10,5,10"></line>
+            <path d="M1104.3993,190.2982 C1104.3993,218.4192 1084.5333,229.7462 1060.0273,215.5972 C1035.5203,201.4482 1015.6543,167.1822 1015.6543,139.0612 C1015.6543,110.9412 1035.5203,99.6132 1060.0273,113.7632 C1084.5333,127.9112 1104.3993,162.1782 1104.3993,190.2982 Z" stroke-dasharray="100,20,40,10,5,10"></path>
+            <path d="M1392.4724,0.212313184 C1392.5362,1.368831 1392.5686,2.51706717 1392.5686,3.6553 C1392.5686,8.9383 1391.8696,13.6303 1390.5756,17.6753" stroke-dasharray="100,20,40,10,5,10"></path>
+            <line x1="264.7479" y1="145.4749" x2="13.8209" y2="271.6179" stroke-dasharray="100,20,40,10,5,10"></line>
+            <line x1="325.1034" y1="255.5355" x2="76.9784" y2="379.4385" stroke-dasharray="100,20,40,10,5,10"></line>
+            <path d="M339.5086,226.2454 C339.5086,254.4994 319.5486,265.8794 294.9256,251.6634 C270.3036,237.4474 250.3426,203.0184 250.3426,174.7654 C250.3426,146.5114 270.3036,135.1304 294.9256,149.3464 C319.5486,163.5614 339.5086,197.9904 339.5086,226.2454 Z" stroke-dasharray="100,20,40,10,5,10"></path>
+            <line x1="1642.2948" y1="345.8294" x2="1887.6868" y2="473.4134" stroke-dasharray="100,20,40,10,5,10"></line>
+            <line x1="1872.5897" y1="199.7024" x2="1607.0877" y2="339.2184" stroke-dasharray="100,20,40,10,5,10"></line>
+            <line x1="1588.2782" y1="456.2083" x2="1865.9982" y2="600.6013" stroke-dasharray="70,40,40,10,5,10"></line>
+            <line x1="1916.3817" y1="420.6126" x2="1719.3907" y2="524.1276" stroke-dasharray="100,20,40,10,5,10"></line>
+            <line x1="1750.4608" y1="617.0598" x2="1686.9188" y2="584.1418" stroke-dasharray="70,40,40,10,5,10"></line>
+            <line x1="1207.9022" y1="490.3011" x2="1187.7302" y2="500.9021" stroke-dasharray="70,40,40,10,5,10"></line>
+            <line x1="1683.3935" y1="393.3421" x2="1683.3935" y2="299.2581" stroke-dasharray="100,20,40,10,5,10"></line>
+            <path d="M1717.4696,239.469 C1717.4696,251.148 1709.2186,255.851 1699.0406,249.975 C1688.8646,244.1 1680.6136,229.868 1680.6136,218.191 C1680.6136,206.512 1688.8646,201.808 1699.0406,207.684 C1709.2186,213.56 1717.4696,227.79 1717.4696,239.469 Z" stroke-dasharray="100,20,40,10,5,10"></path>
+            <line x1="865.9539" y1="32.095" x2="935.3909" y2="68.197" stroke-dasharray="100,20,40,10,5,10"></line>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/arrow-site/docs/img/quickstart/android-logo.svg b/arrow-site/docs/img/quickstart/android-logo.svg
new file mode 100644
index 00000000000..6d90091b509
--- /dev/null
+++ b/arrow-site/docs/img/quickstart/android-logo.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="54px" height="60px" viewBox="0 0 54 60" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>android-logo</title>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="android-logo">
+            <path d="M34.977617,36.4754291 C32.924117,36.4754291 31.259417,38.1349568 31.259417,40.1820131 L31.259417,56.0823487 C31.259417,58.129405 32.924117,59.7887334 34.977617,59.7887334 C37.030817,59.7887334 38.695417,58.129405 38.695417,56.0823487 L38.695417,40.1820131 C38.695417,38.1352557 37.030817,36.4757281 34.977617,36.4757281 L34.977617,36.4754291 Z" id="Path" fill="#A4C639" fill-rule="nonzero"></path>
+            <path d="M43.465717,17.3582765 C43.478017,17.4987793 43.488717,17.6408765 43.488717,17.7845681 L43.488717,41.8750223 C43.488717,44.4658544 41.431617,46.552969 38.877917,46.552969 L14.303317,46.552969 C11.749417,46.552969 9.692317,44.4655555 9.692317,41.8750223 L9.692317,17.7845681 C9.692317,17.6408765 9.697517,17.4982811 9.709517,17.3582765 L43.465717,17.3582765 Z" id="Path" fill="#A4C639" fill-rule="nonzero"></path>
+            <path d="M18.203217,36.4749309 C16.149817,36.4749309 14.485117,38.1344585 14.485117,40.1815149 L14.485117,56.0818504 C14.485117,58.1289068 16.149817,59.7881355 18.203217,59.7881355 C20.256417,59.7881355 21.921117,58.1289068 21.921117,56.0818504 L21.921117,40.1815149 C21.921117,38.1346578 20.256417,36.4749309 18.203217,36.4749309 L18.203217,36.4749309 Z M49.462717,19.5022898 C47.409517,19.5022898 45.744817,21.1617178 45.744817,23.2088738 L45.744817,39.1092093 C45.744817,41.1562657 47.409517,42.8157933 49.462717,42.8157933 C51.516117,42.8157933 53.180817,41.1562657 53.180817,39.1094086 L53.180817,23.2090731 C53.181117,21.1620167 51.516417,19.5022898 49.462717,19.5022898 Z M3.717877,19.5022898 C1.664697,19.5022898 0,21.1617178 0,23.2088738 L0,39.1092093 C0,41.1562657 1.664697,42.8157933 3.717877,42.8157933 C5.771337,42.8157933 7.436017,41.1562657 7.436017,39.1094086 L7.436017,23.2090731 C7.436017,21.1620167 5.771337,19.5022898 3.717877,19.5022898 Z M43.357117,15.775876 C43.253717,8.3761803 36.775117,2.30911903 28.459017,1.50954836 L24.722317,1.50954836 C16.405617,2.30937811 9.927617,8.37669847 9.824217,15.775876 L43.357117,15.775876 Z" id="Shape" fill="#A4C639" fill-rule="nonzero"></path>
+            <path d="M31.5853081,9.14493003 C31.582117,10.1792799 32.440817,11.0202042 33.503517,11.0231 C34.565617,11.0256848 35.429217,10.1896432 35.4324238,9.15534318 L35.4324238,9.14493003 C35.435217,8.11033103 34.576517,7.26963589 33.514217,7.26676864 C32.452117,7.26390616 31.588417,8.09965879 31.5853081,9.13451688 L31.5853081,9.14493003 Z M17.2265086,9.14493003 C17.223417,10.1792799 18.082117,11.0202042 19.144717,11.0231 C20.206817,11.0256848 21.070517,10.1896432 21.0736243,9.15534318 L21.0736243,9.14493003 C21.076517,8.11033103 20.217817,7.26963589 19.155417,7.26676864 C18.093317,7.26390616 17.229617,8.09965879 17.2265086,9.13451688 L17.2265086,9.14493003 Z" id="Shape" fill="#FFFFFF" fill-rule="nonzero"></path>
+            <path d="M42.462917,0.106624708 C42.081017,-0.112960275 41.592817,0.0174956971 41.372517,0.398006632 L37.450417,7.17041698 C37.230117,7.55092054 37.361017,8.0373991 37.742817,8.25698209 C38.124717,8.47656508 38.612917,8.34611669 38.833317,7.96560316 L42.755317,1.19319779 C42.975717,0.812684266 42.844817,0.326209691 42.462917,0.106624708 Z M10.717517,0.106636665 C10.335617,0.32623261 10.204717,0.812710175 10.425117,1.19321772 L14.347417,7.96562309 C14.567717,8.34612665 15.055917,8.47656508 15.437817,8.25697213 C15.819717,8.03737917 15.950617,7.55090061 15.730217,7.17039705 L11.807917,0.397986703 C11.587517,0.0174822447 11.099317,-0.112960275 10.717517,0.106636665 Z" id="Shape" fill="#A4C639"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/arrow-site/docs/img/quickstart/arrow-quickstart-brand-sidebar.svg b/arrow-site/docs/img/quickstart/arrow-quickstart-brand-sidebar.svg
new file mode 100644
index 00000000000..420b9b2653c
--- /dev/null
+++ b/arrow-site/docs/img/quickstart/arrow-quickstart-brand-sidebar.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="102px" height="100px" viewBox="0 0 102 100" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>arrow-quickstart-brand-sidebar</title>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <polyline id="path" stroke="#FFFFFF" stroke-width="2" points="65.6636877 80.2044179 51 89 36.6661449 80.3996869"></polyline>
+        <path d="M51,1.002 L99,97 L51,73 L3,97 L50.999,1.002 L51,1.001 L51,1.002 Z" id="path" stroke="#FFFFFF" stroke-width="2" fill-opacity="0" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/arrow-site/docs/img/quickstart/jdk-logo.svg b/arrow-site/docs/img/quickstart/jdk-logo.svg
new file mode 100644
index 00000000000..4ee1cba6012
--- /dev/null
+++ b/arrow-site/docs/img/quickstart/jdk-logo.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="54px" height="72px" viewBox="0 0 54 72" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>jdk-logo</title>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="jdk-logo" fill-rule="nonzero">
+            <path d="M17.0713587,55.3857652 C17.0713587,55.3857652 14.3248587,56.9773333 19.0258587,57.5159274 C24.7211587,58.1633365 27.6318587,58.0704652 33.9080587,56.8868535 C33.9080587,56.8868535 35.5581587,57.9178054 37.8625587,58.8107456 C23.7930587,64.8194833 6.02044872,58.4627769 17.0713587,55.3857652 Z" id="Path" fill="#5382A1"></path>
+            <path d="M15.3520587,47.5449106 C15.3520587,47.5449106 12.2715587,49.8170704 16.9761587,50.3019546 C23.0599587,50.9274413 27.8645587,50.9785604 36.1781587,49.3833053 C36.1781587,49.3833053 37.3280587,50.5449946 39.1362587,51.1802467 C22.1253587,56.1369072 3.17821872,51.5711634 15.3520587,47.5449106 Z" id="Path" fill="#5382A1"></path>
+            <path d="M29.8457587,34.2437776 C33.3124587,38.2210039 28.9348587,41.8000392 28.9348587,41.8000392 C28.9348587,41.8000392 37.7375587,37.2718625 33.6948587,31.6015274 C29.9191587,26.3136389 27.0236587,23.6862362 42.6985587,14.6273915 C42.6985587,14.6273915 18.0942587,20.7508234 29.8457587,34.2437776 Z" id="Path" fill="#E76F00"></path>
+            <path d="M48.4537587,61.185343 C48.4537587,61.185343 50.4861587,62.8540382 46.2153587,64.1450698 C38.0942587,66.5965949 12.4143587,67.3368753 5.28062872,64.2427242 C2.71622872,63.1310579 7.52520872,61.588317 9.03792872,61.2646623 C10.6155587,60.9237686 11.5170587,60.9872439 11.5170587,60.9872439 C8.66521872,58.9853279 -6.91626128,64.9181342 3.60247872,66.6172219 C32.2885587,71.2529181 55.8945587,64.5298083 48.4537587,61.185343 Z" id="Path" fill="#5382A1"></path>
+            <path d="M18.3920587,39.4207585 C18.3920587,39.4207585 5.32963872,42.5124184 13.7663587,43.6350459 C17.3285587,44.1102643 24.4297587,44.0027448 31.0443587,43.4504989 C36.4501587,42.9961068 41.8782587,42.0300254 41.8782587,42.0300254 C41.8782587,42.0300254 39.9721587,42.843447 38.5930587,43.7817269 C25.3283587,47.2581254 -0.29643328,45.6408482 7.08062872,42.0850308 C13.3194587,39.0798647 18.3920587,39.4207585 18.3920587,39.4207585 Z" id="Path" fill="#5382A1"></path>
+            <path d="M41.8243587,52.4722748 C55.3084587,45.4900817 49.0739587,38.7803247 44.7223587,39.6842262 C43.6557587,39.9054434 43.1801587,40.097165 43.1801587,40.097165 C43.1801587,40.097165 43.5761587,39.4790522 44.3323587,39.2114989 C52.9412587,36.195571 59.5620587,48.1066229 41.5533587,52.8241299 C41.5533587,52.824329 41.7619587,52.6384866 41.8243587,52.4722748 Z" id="Path" fill="#5382A1"></path>
+            <path d="M33.6948587,0 C33.6948587,0 41.1625587,7.44390083 26.6119587,18.8905062 C14.9439587,28.0727143 23.9513587,33.3080886 26.6071587,39.2897222 C19.7963587,33.16639 14.7980587,27.7759644 18.1512587,22.7591169 C23.0730587,15.3946765 36.7078587,11.8242108 33.6948587,0 Z" id="Path" fill="#E76F00"></path>
+            <path d="M19.7170587,71.3924245 C32.6601587,72.2180031 52.5357587,70.9343454 53.0064587,64.8316403 C53.0064587,64.8316403 52.1016587,67.1451537 42.3097587,68.9823527 C31.2625587,71.0540219 17.6373587,70.8121777 9.55615872,69.4844759 C9.55615872,69.4842766 11.2104587,70.848848 19.7170587,71.3924245 Z" id="Path" fill="#5382A1"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/arrow-site/docs/img/quickstart/modular-libraries-core.svg b/arrow-site/docs/img/quickstart/modular-libraries-core.svg
new file mode 100644
index 00000000000..0a663086219
--- /dev/null
+++ b/arrow-site/docs/img/quickstart/modular-libraries-core.svg
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="219px" height="238px" viewBox="0 0 219 238" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>modular-libraries-core</title>
+    <defs>
+        <linearGradient x1="50%" y1="-7.62487258%" x2="50%" y2="76.0624167%" id="linearGradient-1">
+            <stop stop-color="#132532" offset="0%"></stop>
+            <stop stop-color="#132532" stop-opacity="0" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="50.3918946%" y1="8.80127178%" x2="48.8877265%" y2="99.3063812%" id="linearGradient-2">
+            <stop stop-color="#379CE6" offset="0%"></stop>
+            <stop stop-color="#006FD0" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="49.6081054%" y1="8.80127178%" x2="51.1216008%" y2="99.8685444%" id="linearGradient-3">
+            <stop stop-color="#5BBAFF" offset="0%"></stop>
+            <stop stop-color="#1182E5" offset="99.9367%"></stop>
+        </linearGradient>
+        <linearGradient x1="100%" y1="0%" x2="100%" y2="94.9293588%" id="linearGradient-4">
+            <stop stop-color="#00567F" offset="0%"></stop>
+            <stop stop-color="#0075AE" stop-opacity="0.089953" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="0%" y1="0%" x2="0%" y2="94.9293588%" id="linearGradient-5">
+            <stop stop-color="#005B87" offset="0%"></stop>
+            <stop stop-color="#0075AE" stop-opacity="0.089953" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="48.126304%" y1="36.8829091%" x2="60.5667708%" y2="55.0392764%" id="linearGradient-6">
+            <stop stop-color="#F1F1F1" offset="0%"></stop>
+            <stop stop-color="#FFFFFF" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="44.3310989%" y1="27.560187%" x2="62.9102906%" y2="55.1002372%" id="linearGradient-7">
+            <stop stop-color="#F4F4F4" offset="0%"></stop>
+            <stop stop-color="#EAEAEA" offset="99.9789%"></stop>
+        </linearGradient>
+        <linearGradient x1="45.5610836%" y1="10.0013425%" x2="66.0584843%" y2="64.6731105%" id="linearGradient-8">
+            <stop stop-color="#FFFFFF" offset="0%"></stop>
+            <stop stop-color="#E6E6E6" offset="99.9789%"></stop>
+        </linearGradient>
+        <linearGradient x1="50.0002521%" y1="100%" x2="50.0002521%" y2="0%" id="linearGradient-9">
+            <stop stop-color="#EDEDED" offset="0%"></stop>
+            <stop stop-color="#CECECE" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="52.855664%" y1="64.2246881%" x2="36.4583263%" y2="39.9335928%" id="linearGradient-10">
+            <stop stop-color="#5EB4FF" offset="0%"></stop>
+            <stop stop-color="#1C8AEB" offset="99.9789%"></stop>
+            <stop stop-color="#2D9DFF" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="47.3764146%" y1="73.2640548%" x2="62.9590684%" y2="31.4369171%" id="linearGradient-11">
+            <stop stop-color="#2185E8" offset="0%"></stop>
+            <stop stop-color="#036ED8" offset="99.9789%"></stop>
+        </linearGradient>
+        <linearGradient x1="50.0003529%" y1="0%" x2="50.0003529%" y2="100%" id="linearGradient-12">
+            <stop stop-color="#4AAAFF" offset="0%"></stop>
+            <stop stop-color="#73BEFF" offset="100%"></stop>
+        </linearGradient>
+    </defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="logo" transform="translate(1.000000, 1.000000)">
+            <g id="logo-pattern" opacity="0.16" stroke="#273244">
+                <ellipse id="path" cx="108.095594" cy="123.341772" rx="92.4342013" ry="92.9957806"></ellipse>
+                <rect id="path" x="31.3116282" y="46.0084388" width="153.567932" height="153.687764"></rect>
+                <polygon id="path" transform="translate(108.584664, 123.180952) rotate(-315.000000) translate(-108.584664, -123.180952) " points="31.8037118 46.4 185.238638 46.5269785 185.365617 199.961905 31.9306903 199.834926"></polygon>
+                <line x1="139.608604" y1="0.276190476" x2="21.8067614" y2="231.765617" id="Line-2" stroke-linecap="square"></line>
+                <line x1="196.340707" y1="0.276190476" x2="78.5388637" y2="231.765617" id="Line-2-Copy" stroke-linecap="square" transform="translate(137.439785, 116.000000) scale(-1, 1) translate(-137.439785, -116.000000) "></line>
+                <line x1="107.789297" y1="161.749575" x2="178.816125" y2="200.34632" id="Path-6"></line>
+                <line x1="37.3618331" y1="161.749575" x2="108.041972" y2="200.34632" id="Path-6-Copy" transform="translate(72.882565, 181.097046) scale(-1, 1) translate(-72.882565, -181.097046) "></line>
+            </g>
+            <g transform="translate(37.084664, 62.000000)" id="path">
+                <polygon fill-opacity="0.7" fill="url(#linearGradient-1)" points="0 142.549094 72.0044471 106.779661 144 142.549094 72 175"></polygon>
+                <polygon fill="url(#linearGradient-2)" points="72 0 0 142.372881 72 106.779608"></polygon>
+                <polygon fill="url(#linearGradient-3)" points="72 0 144 142.372881 72 106.779608"></polygon>
+                <line x1="72" y1="86.0169492" x2="72" y2="96.8926554" stroke="#2D9DFF" stroke-width="4.14246575"></line>
+                <line x1="55.2328767" y1="115.677966" x2="65.0958904" y2="108.757062" stroke="#2D9DFF" stroke-width="4.14246575"></line>
+                <line x1="88.7671233" y1="115.677966" x2="78.9041096" y2="108.757062" stroke="#2D9DFF" stroke-width="4.14246575"></line>
+                <path d="M71.5069569,112.711864 C76.1370303,112.711864 79.890411,108.949454 79.890411,104.30791 C79.890411,99.6665839 76.1370303,95.9039548 71.5069569,95.9039548 C66.8768836,95.9039548 63.1232877,99.6665839 63.1232877,104.30791 C63.1232877,108.949454 66.8768836,112.711864 71.5069569,112.711864 Z" stroke="#2D9DFF" stroke-width="4.14246575"></path>
+                <polygon fill-opacity="0.7" fill="url(#linearGradient-4)" opacity="0.739281" points="37.4794521 92.9378531 37.4794521 123.731993 17.7534247 133.474576"></polygon>
+                <polygon fill-opacity="0.7" fill="url(#linearGradient-5)" opacity="0.658854" points="106.520548 92.9378531 106.520548 123.556752 126.246575 133.474576"></polygon>
+                <polygon fill="#FFFFFF" points="71.9948087 73.1638418 106.520548 93.9266069 106.510165 135.451924 71.9948087 156.214689 37.4794521 135.451924 37.4794521 93.9266069"></polygon>
+                <polygon fill="url(#linearGradient-6)" points="106.520548 93.9265537 72 114.175276 72 156.214689 106.510165 135.451977"></polygon>
+                <polygon fill="url(#linearGradient-7)" points="51.2876712 127.542373 72 115.301596 72 88.9830508 51.2876712 101.945942"></polygon>
+                <polygon fill="url(#linearGradient-8)" points="92.7123288 127.542373 72 115.301596 72 88.9830508 92.7123288 101.836158"></polygon>
+                <polygon fill="url(#linearGradient-9)" points="71.5041764 139.40678 50.3013699 127.048023 71.5069562 114.689266 92.7123288 127.033884"></polygon>
+                <polygon fill="url(#linearGradient-10)" points="86.7945205 104.80226 72 113.590551 72 132.485876 86.7945205 123.179019"></polygon>
+                <polygon fill="url(#linearGradient-11)" points="57.2054795 104.80226 72 113.590551 72 132.485876 57.2054795 123.257932"></polygon>
+                <polygon fill="url(#linearGradient-12)" points="72.0019842 95.9039548 86.7945205 104.80215 72.0001044 113.700565 57.2054795 104.812455"></polygon>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/arrow-site/docs/img/quickstart/modular-libraries-fx.svg b/arrow-site/docs/img/quickstart/modular-libraries-fx.svg
new file mode 100644
index 00000000000..4df2122870e
--- /dev/null
+++ b/arrow-site/docs/img/quickstart/modular-libraries-fx.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="219px" height="236px" viewBox="0 0 219 236" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>modular-libraries-fx</title>
+    <defs>
+        <linearGradient x1="50%" y1="0.50147765%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#8D7979" offset="0%"></stop>
+            <stop stop-color="#655656" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="50%" y1="0.50147765%" x2="50%" y2="100%" id="linearGradient-2">
+            <stop stop-color="#C0A4A4" offset="0%"></stop>
+            <stop stop-color="#726363" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="100%" y1="-21.3344833%" x2="100%" y2="156.379044%" id="linearGradient-3">
+            <stop stop-color="#3E3333" offset="0%"></stop>
+            <stop stop-color="#756A6A" stop-opacity="0" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="100%" y1="-23.2797828%" x2="100%" y2="155.118761%" id="linearGradient-4">
+            <stop stop-color="#3E3333" offset="0%"></stop>
+            <stop stop-color="#756A6A" stop-opacity="0" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="50%" y1="-7.62523362%" x2="50%" y2="76.0623794%" id="linearGradient-5">
+            <stop stop-color="#132532" offset="0%"></stop>
+            <stop stop-color="#132532" stop-opacity="0" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="50.251809%" y1="0%" x2="46.0746472%" y2="58.9795778%" id="linearGradient-6">
+            <stop stop-color="#CBCBCB" offset="0%"></stop>
+            <stop stop-color="#FFFFFF" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="49.7313805%" y1="100%" x2="54.3420727%" y2="37.9768354%" id="linearGradient-7">
+            <stop stop-color="#CBCBCB" offset="0%"></stop>
+            <stop stop-color="#FFFFFF" offset="100%"></stop>
+        </linearGradient>
+    </defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="logo-copy" transform="translate(1.000000, 1.000000)">
+            <g id="logo-pattern" opacity="0.16" stroke="#273244">
+                <ellipse id="path" cx="108.095594" cy="123.341772" rx="92.4342013" ry="92.9957806"></ellipse>
+                <rect id="path" x="31.3116282" y="46.0084388" width="153.567932" height="153.687764"></rect>
+                <polygon id="path" transform="translate(108.584664, 123.180952) rotate(-315.000000) translate(-108.584664, -123.180952) " points="31.8037118 46.4 185.238638 46.5269785 185.365617 199.961905 31.9306903 199.834926"></polygon>
+                <line x1="139.608604" y1="0.276190476" x2="21.8067614" y2="231.765617" id="Line-2" stroke-linecap="square"></line>
+                <line x1="196.340707" y1="0.276190476" x2="78.5388637" y2="231.765617" id="Line-2-Copy" stroke-linecap="square" transform="translate(137.439785, 116.000000) scale(-1, 1) translate(-137.439785, -116.000000) "></line>
+                <line x1="107.789297" y1="161.749575" x2="178.816125" y2="200.34632" id="Path-6"></line>
+                <line x1="37.3618331" y1="161.749575" x2="108.041972" y2="200.34632" id="Path-6-Copy" transform="translate(72.882565, 181.097046) scale(-1, 1) translate(-72.882565, -181.097046) "></line>
+            </g>
+            <g id="logo" transform="translate(37.084664, 57.000000)">
+                <polygon id="path" fill="url(#linearGradient-1)" points="72 0 0 145.092075 72 108.81911"></polygon>
+                <polygon id="path" fill="url(#linearGradient-2)" points="72 0 144 145.092075 72 108.81911"></polygon>
+                <polygon id="path" fill-opacity="0.7" fill="url(#linearGradient-3)" points="112.448753 129.16769 101.999859 96.7279796 92.2108235 119.003468"></polygon>
+                <polygon id="path" fill-opacity="0.7" fill="url(#linearGradient-4)" points="87.7605882 102.850803 72.0523059 55.9210255 72.0523059 102.850803"></polygon>
+                <polygon id="path" fill-opacity="0.7" fill="url(#linearGradient-5)" points="0 145.092075 72.0044471 108.81911 144 145.092075 72 178"></polygon>
+                <polygon id="path" fill="#FFFFFF" points="72.0224471 164.796516 102.000071 96.7279796 72 102.773439"></polygon>
+                <polygon id="path" fill="url(#linearGradient-6)" points="72.0224471 164.796516 85.0887529 115.642665 72 117.943891"></polygon>
+                <polygon id="path" fill="#FFFFFF" points="71.9775529 55.9212375 41.9999294 123.989562 72 117.944103"></polygon>
+                <polygon id="path" fill="url(#linearGradient-7)" points="71.9775529 55.9208135 58.6395529 105.294676 72 102.773439"></polygon>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/arrow-site/docs/img/quickstart/modular-libraries-meta.svg b/arrow-site/docs/img/quickstart/modular-libraries-meta.svg
new file mode 100644
index 00000000000..1d065422cd7
--- /dev/null
+++ b/arrow-site/docs/img/quickstart/modular-libraries-meta.svg
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="219px" height="236px" viewBox="0 0 219 236" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>modular-libraries-meta</title>
+    <defs>
+        <linearGradient x1="50%" y1="9.97548529%" x2="50%" y2="99.7788235%" id="linearGradient-1">
+            <stop stop-color="#CE1010" offset="0%"></stop>
+            <stop stop-color="#9D1212" offset="99.9182%"></stop>
+        </linearGradient>
+        <linearGradient x1="50%" y1="9.63032353%" x2="50%" y2="99.7141176%" id="linearGradient-2">
+            <stop stop-color="#F63F18" offset="0%"></stop>
+            <stop stop-color="#950F0F" offset="99.9367%"></stop>
+        </linearGradient>
+        <linearGradient x1="50%" y1="-7.62485774%" x2="50%" y2="76.0622893%" id="linearGradient-3">
+            <stop stop-color="#132532" offset="0%"></stop>
+            <stop stop-color="#132532" stop-opacity="0" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="91.6085294%" id="linearGradient-4">
+            <stop stop-color="#E5E5E5" offset="0%"></stop>
+            <stop stop-color="#FFFFFF" offset="100%"></stop>
+        </linearGradient>
+    </defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="logo-copy" transform="translate(1.000000, 1.000000)">
+            <g id="logo-pattern" opacity="0.16" stroke="#273244">
+                <ellipse id="path" cx="108.095594" cy="123.341772" rx="92.4342013" ry="92.9957806"></ellipse>
+                <rect id="path" x="31.3116282" y="46.0084388" width="153.567932" height="153.687764"></rect>
+                <polygon id="path" transform="translate(108.584664, 123.180952) rotate(-315.000000) translate(-108.584664, -123.180952) " points="31.8037118 46.4 185.238638 46.5269785 185.365617 199.961905 31.9306903 199.834926"></polygon>
+                <line x1="139.608604" y1="0.276190476" x2="21.8067614" y2="231.765617" id="Line-2" stroke-linecap="square"></line>
+                <line x1="196.340707" y1="0.276190476" x2="78.5388637" y2="231.765617" id="Line-2-Copy" stroke-linecap="square" transform="translate(137.439785, 116.000000) scale(-1, 1) translate(-137.439785, -116.000000) "></line>
+                <line x1="107.789297" y1="161.749575" x2="178.816125" y2="200.34632" id="Path-6"></line>
+                <line x1="37.3618331" y1="161.749575" x2="108.041972" y2="200.34632" id="Path-6-Copy" transform="translate(72.882565, 181.097046) scale(-1, 1) translate(-72.882565, -181.097046) "></line>
+            </g>
+            <g id="logo" transform="translate(37.084664, 58.000000)">
+                <polygon id="path" fill="url(#linearGradient-1)" points="72 0 0 144.276931 74.7525176 106.892657"></polygon>
+                <polygon id="path" fill="url(#linearGradient-2)" points="72 0 144 144.276931 72 108.207698"></polygon>
+                <polygon id="path" fill-opacity="0.7" fill="url(#linearGradient-3)" points="0 144.276931 72.0044471 108.207698 144 144.276931 72 177"></polygon>
+                <polygon id="path" fill="#FFFFFF" points="72.1192235 72.1384656 36 144.276931 73.4999294 125.584794"></polygon>
+                <polygon id="path" fill="url(#linearGradient-4)" points="72 72.1384656 108 144.276931 72 126.242315"></polygon>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/arrow-site/docs/img/quickstart/modular-libraries-optics.svg b/arrow-site/docs/img/quickstart/modular-libraries-optics.svg
new file mode 100644
index 00000000000..a6c58526157
--- /dev/null
+++ b/arrow-site/docs/img/quickstart/modular-libraries-optics.svg
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="219px" height="236px" viewBox="0 0 219 236" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>modular-libraries-optics</title>
+    <defs>
+        <linearGradient x1="50%" y1="0.530365726%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#00D8B2" offset="0.0290329%"></stop>
+            <stop stop-color="#00A394" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="50%" y1="0.501477838%" x2="50%" y2="100%" id="linearGradient-2">
+            <stop stop-color="#1EFFD3" offset="0%"></stop>
+            <stop stop-color="#00B4A4" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="49.5572968%" y1="16.1575325%" x2="63.1674112%" y2="90.8896409%" id="linearGradient-3">
+            <stop stop-color="#005948" offset="0%"></stop>
+            <stop stop-color="#18CDAA" stop-opacity="0" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="50.4628015%" y1="16.1571223%" x2="36.5700079%" y2="90.7685213%" id="linearGradient-4">
+            <stop stop-color="#005948" offset="0%"></stop>
+            <stop stop-color="#18CDAA" stop-opacity="0" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="50%" y1="-7.62510075%" x2="50%" y2="76.0624258%" id="linearGradient-5">
+            <stop stop-color="#132532" offset="0%"></stop>
+            <stop stop-color="#132532" stop-opacity="0" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-6">
+            <stop stop-color="#E9E9E9" offset="0%"></stop>
+            <stop stop-color="#FFFFFF" offset="78.1426%"></stop>
+            <stop stop-color="#CEE7E3" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-7">
+            <stop stop-color="#2AFFCE" offset="0%"></stop>
+            <stop stop-color="#00A18F" stop-opacity="0" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="50%" y1="100%" x2="50%" y2="16.4583105%" id="linearGradient-8">
+            <stop stop-color="#2AFFCE" offset="0%"></stop>
+            <stop stop-color="#009A77" stop-opacity="0" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="9.55041586%" y1="8.25453049%" x2="52.4581365%" y2="49.8900551%" id="linearGradient-9">
+            <stop stop-color="#FFFFFF" offset="0%"></stop>
+            <stop stop-color="#20DCB3" stop-opacity="0" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="11.3648193%" y1="10.7947945%" x2="74.4824645%" y2="80.3548588%" id="linearGradient-10">
+            <stop stop-color="#FFFFFF" offset="0%"></stop>
+            <stop stop-color="#88FFE4" stop-opacity="0" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="11.3647643%" y1="10.7946087%" x2="74.4830464%" y2="80.3540535%" id="linearGradient-11">
+            <stop stop-color="#FFFFFF" offset="0%"></stop>
+            <stop stop-color="#88FFE4" stop-opacity="0" offset="100%"></stop>
+        </linearGradient>
+        <radialGradient cx="39.4781176%" cy="-169.28963%" fx="39.4781176%" fy="-169.28963%" r="41.6534798%" gradientTransform="translate(0.394781,-1.692896),scale(1.000000,0.998079),rotate(-112.533845),translate(-0.394781,1.692896)" id="radialGradient-12">
+            <stop stop-color="#FFFFFF" offset="0%"></stop>
+            <stop stop-color="#FFFFFF" stop-opacity="0" offset="100%"></stop>
+        </radialGradient>
+    </defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="logo-copy" transform="translate(1.000000, 1.000000)">
+            <g id="logo-pattern" opacity="0.16" stroke="#273244">
+                <ellipse id="path" cx="108.095594" cy="123.341772" rx="92.4342013" ry="92.9957806"></ellipse>
+                <rect id="path" x="31.3116282" y="46.0084388" width="153.567932" height="153.687764"></rect>
+                <polygon id="path" transform="translate(108.584664, 123.180952) rotate(-315.000000) translate(-108.584664, -123.180952) " points="31.8037118 46.4 185.238638 46.5269785 185.365617 199.961905 31.9306903 199.834926"></polygon>
+                <line x1="139.608604" y1="0.276190476" x2="21.8067614" y2="231.765617" id="Line-2" stroke-linecap="square"></line>
+                <line x1="196.340707" y1="0.276190476" x2="78.5388637" y2="231.765617" id="Line-2-Copy" stroke-linecap="square" transform="translate(137.439785, 116.000000) scale(-1, 1) translate(-137.439785, -116.000000) "></line>
+                <line x1="107.789297" y1="161.749575" x2="178.816125" y2="200.34632" id="Path-6"></line>
+                <line x1="37.3618331" y1="161.749575" x2="108.041972" y2="200.34632" id="Path-6-Copy" transform="translate(72.882565, 181.097046) scale(-1, 1) translate(-72.882565, -181.097046) "></line>
+            </g>
+            <g id="logo" transform="translate(37.084664, 58.000000)">
+                <polygon id="path" fill="url(#linearGradient-1)" points="72 0 0 144.276831 72 108.207782"></polygon>
+                <polygon id="path" fill="url(#linearGradient-2)" points="72 0 144 144.276831 72 108.207782"></polygon>
+                <polygon id="path" fill-opacity="0.7" fill="url(#linearGradient-3)" opacity="0.723563" points="123.263576 133.950316 101.999859 87.3608983 101.999859 122.92669"></polygon>
+                <polygon id="path" fill-opacity="0.7" fill="url(#linearGradient-4)" opacity="0.723563" points="20.3983835 133.975288 41.9999294 87.1672563 41.9999294 123.236305"></polygon>
+                <polygon id="path" fill-opacity="0.7" fill="url(#linearGradient-5)" points="0 144.277042 72.0044471 108.207782 144 144.277042 72 177"></polygon>
+                <path d="M72,138.265464 C91.8821647,138.265464 108,122.116779 108,102.196203 C108,82.2758384 91.8821647,66.1271541 72,66.1271541 C52.1178353,66.1271541 36,82.2758384 36,102.196203 C36,122.116779 52.1178353,138.265464 72,138.265464 Z" id="path" fill="#FFFFFF" fill-rule="nonzero"></path>
+                <path d="M72,133.112682 C89.0419765,133.112682 102.857082,119.270771 102.857082,102.196203 C102.857082,85.1214234 89.0419765,71.2797242 72,71.2797242 C54.9580235,71.2797242 41.1429176,85.1214234 41.1429176,102.196203 C41.1429176,119.270771 54.9580235,133.112682 72,133.112682 Z" id="path" fill="url(#linearGradient-6)" fill-rule="nonzero"></path>
+                <path d="M72,129.248096 C86.9116235,129.248096 99,117.136688 99,102.196203 C99,87.2559295 86.9116235,75.1443105 72,75.1443105 C57.0883765,75.1443105 45,87.2559295 45,102.196203 C45,117.136688 57.0883765,129.248096 72,129.248096 Z" id="path" fill="#01362C" fill-rule="nonzero"></path>
+                <path d="M72,124.739517 C84.4263529,124.739517 94.5,114.646431 94.5,102.196203 C94.5,89.7457635 84.4263529,79.6528888 72,79.6528888 C59.5736471,79.6528888 49.5,89.7457635 49.5,102.196203 C49.5,114.646431 59.5736471,124.739517 72,124.739517 Z" id="path" fill="url(#linearGradient-7)" fill-rule="nonzero"></path>
+                <path d="M72,115.722361 C79.4558118,115.722361 85.5,109.666551 85.5,102.196415 C85.5,94.7262779 79.4558118,88.6704684 72,88.6704684 C64.5441882,88.6704684 58.5,94.7262779 58.5,102.196415 C58.5,109.666551 64.5441882,115.722361 72,115.722361 Z" id="path" fill="url(#linearGradient-8)" fill-rule="nonzero"></path>
+                <path d="M72.0002118,121.733728 C82.7697176,121.733728 91.5001412,112.986401 91.5001412,102.196203 C91.5001412,91.4057939 82.7697176,82.6586781 72.0002118,82.6586781 C61.2307059,82.6586781 52.5000706,91.4057939 52.5000706,102.196203 C52.5000706,112.986401 61.2307059,121.733728 72.0002118,121.733728 Z" id="path" fill="url(#linearGradient-9)" fill-rule="nonzero"></path>
+                <path d="M72,111.213571 C76.9705412,111.213571 81,107.176294 81,102.196203 C81,97.2161119 76.9705412,93.1790467 72,93.1790467 C67.0294588,93.1790467 63,97.2161119 63,102.196203 C63,107.176294 67.0294588,111.213571 72,111.213571 Z" id="path" fill="url(#linearGradient-10)" fill-rule="nonzero" opacity="0.683919"></path>
+                <path d="M66.7501412,100.693414 C69.6496235,100.693414 72.0002118,98.338389 72.0002118,95.4333358 C72.0002118,92.5282826 69.6496235,90.1732573 66.7501412,90.1732573 C63.8506588,90.1732573 61.5000706,92.5282826 61.5000706,95.4333358 C61.5000706,98.338389 63.8506588,100.693414 66.7501412,100.693414 Z" id="path" fill="url(#linearGradient-11)" fill-rule="nonzero" opacity="0.683919"></path>
+                <path d="M49.5127059,101.431793 C49.9008706,112.710011 59.1486353,121.733728 70.5000706,121.733728 C82.098,121.733728 91.4999294,112.313627 91.4999294,100.693203 C91.4999294,89.3201744 82.4937882,80.0545636 71.2370118,79.6655866 C71.4902824,79.6571214 71.7446118,79.6528888 72,79.6528888 C84.4263529,79.6528888 94.5,89.7457635 94.5,102.196203 C94.5,114.646431 84.4263529,124.739517 72,124.739517 C59.5736471,124.739517 49.5,114.646431 49.5,102.196203 C49.5,101.940342 49.5042353,101.685538 49.5127059,101.431793 Z" id="path" fill="url(#radialGradient-12)" opacity="0.268415"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/arrow-site/docs/js/functions.js b/arrow-site/docs/js/functions.js
index f6cc11c7c4a..70482d49847 100755
--- a/arrow-site/docs/js/functions.js
+++ b/arrow-site/docs/js/functions.js
@@ -116,3 +116,27 @@ function activateParent(element, activeClass = 'active') {
   const elemParent = element.parentNode;
   activate(elemParent, activeClass);
 }
+
+function openSetup(evt, setupName) {
+  // Declare all variables
+  var i, tabcontent, tablinks;
+
+  // Get all elements with class="tabcontent" and hide them
+  tabcontent = document.getElementsByClassName("tabcontent");
+  for (i = 0; i < tabcontent.length; i++) {
+    tabcontent[i].style.display = "none";
+  }
+
+  // Get all elements with class="tablinks" and remove the class "active"
+  tablinks = document.getElementsByClassName("tablinks");
+  for (i = 0; i < tablinks.length; i++) {
+    tablinks[i].className = tablinks[i].className.replace(" active", "");
+  }
+
+  // Show the current tab, and add an "active" class to the button that opened the tab
+  document.getElementById(setupName).style.display = "block";
+  evt.currentTarget.className += " active";
+}
+
+// Get the element with id="defaultOpen" and click on it
+document.getElementById("defaultOpen").click();
diff --git a/arrow-site/docs/js/main-hovers.js b/arrow-site/docs/js/main-hovers.js
index 1c0b4f45b0c..3b16cf480ef 100644
--- a/arrow-site/docs/js/main-hovers.js
+++ b/arrow-site/docs/js/main-hovers.js
@@ -8,6 +8,8 @@ const arrayHomeCodeBlock = Array.from(homeCodeBlock);
 const siteNav = document.getElementById('site-nav');
 const navBrandWhite = document.getElementById('nav-brand-white');
 const navBrandDark = document.getElementById('nav-brand-dark');
+const footerBrandWhite = document.getElementById('footer-47-white');
+const footerBrandDark = document.getElementById('footer-47-dark');
 const navLinks = siteNav.querySelectorAll('a');
 const arrayNavLinks = Array.from(navLinks);
 const navMenuLinks = document.querySelectorAll('.nav-menu-item a');
@@ -144,6 +146,8 @@ function commonHoverStyle(id) {
   animateCodeCSS(arrayHomeCodeBlock, 'fadeInDown', id);
   navBrandDark.style.opacity = 0;
   navBrandWhite.style.opacity = 1;
+  footerBrandDark.style.opacity = 0;
+  footerBrandWhite.style.opacity = 1;
   baseArrowLogo.style.opacity = 0;
   siteNav.classList.remove('core', 'fx', 'meta', 'optics');
   arrayCategoryIconDark.map(obj => obj.style.opacity = 0);
@@ -215,6 +219,8 @@ function resetHovers() {
     body.style.background = "#F5F7F8 url('img/home/lines-header-bg.svg') repeat-x";
     navBrandWhite.style.opacity = 0;
     navBrandDark.style.opacity = 1;
+    footerBrandWhite.style.opacity = 0;
+    footerBrandDark.style.opacity = 1;
     headerText.style.opacity = 1;
     arrayCategoryIconDark.map(el => el.style.opacity = 1);
     arrayCategoryIconWhite.map(el => el.style.opacity = 0);
diff --git a/arrow-site/docs/js/main.js b/arrow-site/docs/js/main.js
index 6caadedeb47..1da31744126 100644
--- a/arrow-site/docs/js/main.js
+++ b/arrow-site/docs/js/main.js
@@ -80,7 +80,7 @@ window.addEventListener("resize", mobileViewControl);
 // Init call
 function loadEvent() {
   mobileViewControl();
-  
+
   document.addEventListener("scroll", scrollFunction);
 
   function baseAnimation() {
@@ -145,5 +145,26 @@ function loadEvent() {
 
 }
 
+
+function myFunction() {
+  document.getElementById("dropdown").classList.toggle("show");
+}
+
+
+window.onclick = function(event) {
+  if (!event.target.matches('.dropdown-btn')) {
+    var dropdowns = document.getElementsByClassName("dropdown-content");
+    var i;
+    for (i = 0; i < dropdowns.length; i++) {
+      var openDropdown = dropdowns[i];
+      if (openDropdown.classList.contains('show')) {
+        openDropdown.classList.remove('show');
+      }
+    }
+  }
+}
+
+
+
 // Attach the functions to each event they are interested in
 window.addEventListener("load", loadEvent);
diff --git a/arrow-site/docs/js/text-animation.js b/arrow-site/docs/js/text-animation.js
new file mode 100644
index 00000000000..0486637300b
--- /dev/null
+++ b/arrow-site/docs/js/text-animation.js
@@ -0,0 +1,94 @@
+// values to keep track of the number of letters typed, which quote to use. etc. Don't change these values.
+var i = 0,
+    a = 0,
+    isBackspacing = false,
+    isParagraph = false;
+
+// Typerwrite text content. Use a pipe to indicate the start of the second line "|".
+var textArray = [
+  " Functional companion to Kotlin's Standard Library",
+  "Functional Effects Framework companion to KotlinX Coroutines",
+  "Deep access and transformations over immutable data",
+  "Deep access and transformations over immutable data",
+  "Metaprogramming library for Kotlin compiler plugins"
+];
+
+// Speed (in milliseconds) of typing.
+var speedForward = 40, //Typing Speed
+    speedWait = 9000, // Wait between typing and backspacing
+    speedBetweenLines = 1000, //Wait between first and second lines
+    speedBackspace = 40; //Backspace Speed
+
+//Run the loop
+typeWriter("output", textArray);
+
+function typeWriter(id, ar) {
+  var element = $("#" + id),
+      aString = ar[a],
+      eHeader = element.children("h1"), //Header element
+      eParagraph = element.children("p"); //Subheader element
+
+  // Determine if animation should be typing or backspacing
+  if (!isBackspacing) {
+
+    // If full string hasn't yet been typed out, continue typing
+    if (i < aString.length) {
+
+      // If character about to be typed is a pipe, switch to second line and continue.
+      if (aString.charAt(i) == "|") {
+        isParagraph = true;
+        eHeader.removeClass("cursor");
+        eParagraph.addClass("cursor");
+        i++;
+        setTimeout(function(){ typeWriter(id, ar); }, speedBetweenLines);
+
+      // If character isn't a pipe, continue typing.
+      } else {
+        // Type header or subheader depending on whether pipe has been detected
+        if (!isParagraph) {
+          eHeader.text(eHeader.text() + aString.charAt(i));
+        } else {
+          eParagraph.text(eParagraph.text() + aString.charAt(i));
+        }
+        i++;
+        setTimeout(function(){ typeWriter(id, ar); }, speedForward);
+      }
+
+    // If full string has been typed, switch to backspace mode.
+    } else if (i == aString.length) {
+
+      isBackspacing = true;
+      setTimeout(function(){ typeWriter(id, ar); }, speedWait);
+
+    }
+
+  // If backspacing is enabled
+  } else {
+
+    // If either the header or the paragraph still has text, continue backspacing
+    if (eHeader.text().length > 0 || eParagraph.text().length > 0) {
+
+      // If paragraph still has text, continue erasing, otherwise switch to the header.
+      if (eParagraph.text().length > 0) {
+        eParagraph.text(eParagraph.text().substring(0, eParagraph.text().length - 1));
+      } else if (eHeader.text().length > 0) {
+        eParagraph.removeClass("cursor");
+        eHeader.addClass("cursor");
+        eHeader.text(eHeader.text().substring(0, eHeader.text().length - 1));
+      }
+      setTimeout(function(){ typeWriter(id, ar); }, speedBackspace);
+
+    // If neither head or paragraph still has text, switch to next quote in array and start typing.
+    } else {
+
+      isBackspacing = false;
+      i = 0;
+      isParagraph = false;
+      a = (a + 1) % ar.length; //Moves to next position in array, always looping back to 0
+      setTimeout(function(){ typeWriter(id, ar); }, 50);
+
+    }
+  }
+}
+
+Resources