diff --git a/docs/blog/2017-09-26-embracing-graphql/index.md b/docs/blog/2017-09-26-embracing-graphql/index.md
index 31abc50971019..47dc7268ef462 100644
--- a/docs/blog/2017-09-26-embracing-graphql/index.md
+++ b/docs/blog/2017-09-26-embracing-graphql/index.md
@@ -7,7 +7,7 @@ excerpt: "Moving to Gatsby 1.x and embracing the new GraphQL setup can be daunti
 tags: ["v1", "graphql", "getting-started"]
 ---
 
-Before I built [React FAQ](https://reactfaq.site/), I went looking for a static
+Before I built "React FAQ" (GitHub: https://github.com/timarney/react-faq), I went looking for a static
 site generator.
 
 I had a few criteria in mind.
diff --git a/docs/blog/2017-11-09-why-i-created-my-blog-with-gatsby-and-contentful/index.md b/docs/blog/2017-11-09-why-i-created-my-blog-with-gatsby-and-contentful/index.md
index e3076aba6057a..4601e1c246d61 100644
--- a/docs/blog/2017-11-09-why-i-created-my-blog-with-gatsby-and-contentful/index.md
+++ b/docs/blog/2017-11-09-why-i-created-my-blog-with-gatsby-and-contentful/index.md
@@ -133,8 +133,6 @@ nothing and end up with an infinitely more secure, scalable and faster website.
 
 Say what?
 
-<div style="width:100%;height:0;padding-bottom:75%;position:relative;"><iframe src="https://giphy.com/embed/xT0xeqCPRLHBUvWa88" width="100%" height="100%" style="position:absolute" frameBorder="0" class="giphy-embed" allowFullScreen></iframe></div><p><a href="https://giphy.com/gifs/way-orange-better-xT0xeqCPRLHBUvWa88">via GIPHY</a></p>
-
 ## Enter the world of static site generators...
 
 If you are a developer, you probably are familiar with Static Site Generators,
diff --git a/docs/blog/2017-12-07-taking-gatsby-for-a-spin/index.md b/docs/blog/2017-12-07-taking-gatsby-for-a-spin/index.md
index c52e777264d16..2890b77a0c070 100644
--- a/docs/blog/2017-12-07-taking-gatsby-for-a-spin/index.md
+++ b/docs/blog/2017-12-07-taking-gatsby-for-a-spin/index.md
@@ -79,7 +79,7 @@ export const query = graphql`
 
 After reading some articles on the Gatsby site, I decided to set up my Gatsby hosting on a free plan from [Netlify](https://www.netlify.com/) (which is ridiculously generous by the way, what's the catch?) and that has been a fun experience. Netlify already supports Gatsby out of the box, which means you can configure automatic deploys with `git` in a few clicks. Every time I push to master, the site gets rebuild and uploaded by Netlify. _Magic_. There's also the possibility to configure staging servers based on your branches, so you can always test out your changes before merging to master and deploying.
 
-But wait, there's more. If you use [Contentful](https://www.contentful.com/) as Content Management System and Netlify as your host, you can easily create a Webhook to trigger a rebuild on every content update! I haven't tried this myself yet, but [this posts](https://www.halfelectronic.com/post/setting-up-gatsby-js-contentful-and-netlify/) by [Fernando Poumián](https://twitter.com/fernandopoumian) is a great resource to get you going.
+But wait, there's more. If you use [Contentful](https://www.contentful.com/) as Content Management System and Netlify as your host, you can easily create a Webhook to trigger a rebuild on every content update! I haven't tried this myself yet, but [this posts](https://www.halfelectronic.com/post/setting-up-gatsby-js-contentful-and-netlify/) by Fernando Poumián is a great resource to get you going.
 
 Incremental builds aren't yet possible, so every update means a complete rebuild. I'm sure that's no cause for concern on smaller sites, but with larger sites that are updated often it could be a problem. Luckily, incremental builds will be part of Gatsby ['sooner than later'](https://twitter.com/gatsbyjs/status/937053640652611584), which will take care of that problem.
 
diff --git a/docs/blog/2018-09-17-gatsby-v2.md b/docs/blog/2018-09-17-gatsby-v2.md
index 2ea78e0020e10..7f3a77c0f913f 100644
--- a/docs/blog/2018-09-17-gatsby-v2.md
+++ b/docs/blog/2018-09-17-gatsby-v2.md
@@ -125,7 +125,7 @@ We've added experimental support for GraphQL stitching.
 
 More and more services offer native GraphQL APIs and GraphQL stitching lets you use their API directly in your Gatsby site without having to wrap the API with a source plugin.
 
-- [Read the RFC](https://github.com/gatsbyjs/rfcs/blob/master/text/0000-native-graphql-source.md)
+- [Read the RFC](https://github.com/gatsbyjs/rfcs/blob/master/text/0004-native-graphql-source.md)
 - [Try out the plugin gatsby-source-graphql](https://github.com/gatsbyjs/gatsby/blob/master/packages/gatsby-source-graphql/README.md)
 
 ### Ludicrous Mode (aka faster data hot reloading)
diff --git a/docs/blog/2018-10-15-beyond-static-intro/index.md b/docs/blog/2018-10-15-beyond-static-intro/index.md
index 9f32788d682be..ae7ab478681a7 100644
--- a/docs/blog/2018-10-15-beyond-static-intro/index.md
+++ b/docs/blog/2018-10-15-beyond-static-intro/index.md
@@ -43,7 +43,7 @@ One of the central ideas of Gatsby is that we statically generate our HTML conte
 1. Invoke [ReactDOM.hydrate method][hydrate] to pick up just where we left our static HTML
 1. Transfer rendering to the [React reconciler][reconciler]
 
-_This process is spelled out in more detail in the ["Understanding React Rehydration" guide](/docs/react-rehydration)_
+_This process is spelled out in more detail in the ["Understanding React Hydration" guide](/docs/react-hydration)_
 
 It's this last phase that bridges the gap between static sites and full-fledged applications. In this phase you can make data calls, authenticate users, and perform all the app-like functionality you desire.
 
diff --git a/docs/blog/2019-02-26-getting-started-with-gatsby-themes/index.md b/docs/blog/2019-02-26-getting-started-with-gatsby-themes/index.md
index 3c527c868723f..482fd535335d1 100644
--- a/docs/blog/2019-02-26-getting-started-with-gatsby-themes/index.md
+++ b/docs/blog/2019-02-26-getting-started-with-gatsby-themes/index.md
@@ -324,4 +324,4 @@ If you run into an error that your theme plugin can't be found, try clearing you
 
 to your _package.json_ file. Then you can use `npm run clean` in your terminal.
 
-If you happen to find this tutorial helpful, please feel free to let me know on Twitter [@KatieofCode](https://www.twitter.com/katieofcode)! I would love to see what kind of themes you build.
+If you happen to find this tutorial helpful, please feel free to let me know on Twitter [@KatieFujihara](https://www.twitter.com/KatieFujihara)! I would love to see what kind of themes you build.
diff --git a/docs/blog/2019-05-15-enterprise-gatsby-how-to-reduce-your-digital-total-cost-of-ownership-with-gatsby/index.md b/docs/blog/2019-05-15-enterprise-gatsby-how-to-reduce-your-digital-total-cost-of-ownership-with-gatsby/index.md
index 44529387f9493..1eb44f8a2f7be 100644
--- a/docs/blog/2019-05-15-enterprise-gatsby-how-to-reduce-your-digital-total-cost-of-ownership-with-gatsby/index.md
+++ b/docs/blog/2019-05-15-enterprise-gatsby-how-to-reduce-your-digital-total-cost-of-ownership-with-gatsby/index.md
@@ -37,7 +37,7 @@ Enterprise users seeking a quick way to limit their TCO may look to hosting prod
 
 One of the most common complaints I hear from enterprise users of CMSs is the paucity of available affordable developers to build out the digital architecture of their dreams. While there has always been downward pressure on the number of available Adobe and Sitecore developers due to their proprietary nature, the decline in the prevalence of Drupal and WordPress developers has reflected a larger trend.
 
-JavaScript is quickly winning out as the only language that can operate shared code across both client and server (in a paradigm known as [_universal_ or _isomorphic_ JavaScript](https://dri.es/a-history-of-javascript-across-the-stack)), and it has seen incredible growth in the web development community. In every year since 2014, JavaScript and Java have edged out other programming languages as the [most commonly used on GitHub](https://octoverse.github.com/projects#languages). Meanwhile, PHP fell from third to fourth, and other previously popular languages like Ruby are seeing even steeper declines.
+JavaScript is quickly winning out as the only language that can operate shared code across both client and server (in a paradigm known as [_universal_ or _isomorphic_ JavaScript](https://dri.es/a-history-of-javascript-across-the-stack)), and it has seen incredible growth in the web development community. In every year since 2014, JavaScript and Java have edged out other programming languages as the [most commonly used on GitHub](https://octoverse.github.com/#top-languages). Meanwhile, PHP fell from third to fourth, and other previously popular languages like Ruby are seeing even steeper declines.
 
 As university programs and coding bootcamps continue to swap previously intermixed curricula with JavaScript-only pedagogies, JavaScript adoption has continued to widen. In Stack Overflow’s yearly Developer Survey, JavaScript has posted increases every year since 2016, when it was [voted most popular language](https://insights.stackoverflow.com/survey/2016#technology-most-popular-technologies) by 55.4% of respondents. In 2019, [that percentage was 67.8%](https://insights.stackoverflow.com/survey/2019#most-popular-technologies). While these data only paint part of the picture, it is clear that JavaScript has emerged as the runaway victor when it comes to languages that cross the server–client divide.
 
diff --git a/docs/blog/2019-07-03-using-themes-for-distributed-docs/index.md b/docs/blog/2019-07-03-using-themes-for-distributed-docs/index.md
index f1ca134a51ac5..bba096832ed21 100644
--- a/docs/blog/2019-07-03-using-themes-for-distributed-docs/index.md
+++ b/docs/blog/2019-07-03-using-themes-for-distributed-docs/index.md
@@ -49,7 +49,7 @@ Using [MDX](/docs/mdx/), we’re able to write rich documentation by including R
 
 ![Enhanced code blocks](./images/code-blocks.gif)
 
-Lastly, MDX introduces the concept of composing pages from shared chunks of content. For example, we may want to document some commonly used steps to set up an Apollo project. Instead of copying and pasting that content into multiple pages, we can write it once as [an MDX file](https://github.com/apollographql/gatsby-theme-apollo/blob/master/packages/gatsby-theme-apollo-docs/mdx/project-config-panel.mdx), import it into other MDX files, and [render it like a React component](https://www.apollographql.com/docs/platform/schema-validation/#set-up-schema-validation). What’s more? Since we’re working with MDX, we can use interactive React elements within the shared content!
+Lastly, MDX introduces the concept of composing pages from shared chunks of content. For example, we may want to document some commonly used steps to set up an Apollo project. Instead of copying and pasting that content into multiple pages, we can write it once as [an MDX file](https://github.com/apollographql/gatsby-theme-apollo/blob/master/packages/gatsby-theme-apollo-docs/shared/project-config-panel.mdx), import it into other MDX files, and [render it like a React component](https://www.apollographql.com/docs/platform/schema-validation/#set-up-schema-validation). What’s more? Since we’re working with MDX, we can use interactive React elements within the shared content!
 
 ![Creating shared content in MDX](./images/shared-content.png)
 
diff --git a/docs/blog/2019-07-15-theme-jam-contest/index.md b/docs/blog/2019-07-15-theme-jam-contest/index.md
index 11580fb1b52bb..ceeb6e28b3ddb 100644
--- a/docs/blog/2019-07-15-theme-jam-contest/index.md
+++ b/docs/blog/2019-07-15-theme-jam-contest/index.md
@@ -15,11 +15,11 @@ To celebrate the [stable release of Gatsby Themes](/blog/2019-07-03-announcing-s
 
 Gatsby Themes are pre-built, installable packages for setting up a site’s default styling, components, plugins, and overall configuration that can be reused across multiple Gatsby sites. They’re a great way to simplify the early steps of configuring a new site; and, when it’s time to update your site’s styling or functionality, you only have to edit your theme or swap it out entirely with another compatible theme. You can find a more detailed explanation in the [Themes section of Gatsby’s documentation](/docs/themes/).
 
-If you’d like to see an example, check out Gatsby’s official [blog theme](https://github.com/gatsbyjs/gatsby/tree/master/themes/gatsby-theme-blog) or [notes theme](https://github.com/gatsbyjs/gatsby/tree/master/themes/gatsby-theme-notes).
+If you’d like to see an example, check out Gatsby’s official [blog theme](https://github.com/gatsbyjs/gatsby/tree/master/packages/gatsby-theme-blog) or [notes theme](https://github.com/gatsbyjs/gatsby/tree/master/packages/gatsby-theme-notes).
 
 ## How to build your Gatsby theme
 
-If you’re planning to build a theme for the contest, you may want to start with this [Gatsby Theme Jam Submission Example repository](https://github.com/jlengstorf/gatsby-theme-jam-example). You can build a child theme of an existing Gatsby theme (e.g. the [blog theme](https://github.com/gatsbyjs/gatsby/tree/master/themes/gatsby-theme-blog) or [notes theme](https://github.com/gatsbyjs/gatsby/tree/master/themes/gatsby-theme-notes)) with updated styling or added functionality, for example, or it can be a completely new theme.
+If you’re planning to build a theme for the contest, you may want to start with this [Gatsby Theme Jam Submission Example repository](https://github.com/jlengstorf/gatsby-theme-jam-example). You can build a child theme of an existing Gatsby theme (e.g. the [blog theme](https://github.com/gatsbyjs/gatsby/tree/master/packages/gatsby-theme-blog) or [notes theme](https://github.com/gatsbyjs/gatsby/tree/master/packages/gatsby-theme-notes)) with updated styling or added functionality, for example, or it can be a completely new theme.
 
 Here are some resources with detailed instructions on how to build a Gatsby theme:
 
diff --git a/docs/blog/2019-08-07-theme-jam/index.md b/docs/blog/2019-08-07-theme-jam/index.md
index d6659cc5ddd33..0c233f079b08e 100644
--- a/docs/blog/2019-08-07-theme-jam/index.md
+++ b/docs/blog/2019-08-07-theme-jam/index.md
@@ -43,7 +43,7 @@ Of the 111 submissions, 52 passed the automated review.
 
 ### Part 2: Manual Review
 
-Every theme that cleared the automated review was manually reviewed by [Jackson](https://twitter.com/jxnblk), [Amberley](https://twitter.com/amber1ey), [John](https://twitter.com/4lpine), [Kyle Gill](https://gill_kyle), [Chris](https://twitter.com/chrisbiscardi), [Flo](https://twitter.com/fk), and [me](https://twitter.com/jlengstorf).
+Every theme that cleared the automated review was manually reviewed by [Jackson](https://twitter.com/jxnblk), [Amberley](https://twitter.com/amber1ey), [John](https://twitter.com/4lpine), [Kyle Gill](https://twitter.com/gill_kyle), [Chris](https://twitter.com/chrisbiscardi), [Flo](https://twitter.com/fk), and [me](https://twitter.com/jlengstorf).
 
 Amberley did a manual accessibility audit. Nearly all of the themes we reviewed have a few accessibility issues, so we will be opening issues with feedback and suggestions to improve that.
 
diff --git a/docs/blog/author.yaml b/docs/blog/author.yaml
index 2a00c79bd85bd..7e1182e94d14e 100644
--- a/docs/blog/author.yaml
+++ b/docs/blog/author.yaml
@@ -53,7 +53,6 @@
 - id: Fernando Poumian
   bio: Full-Stack Web Developer - https://www.halfelectronic.com
   avatar: avatars/fernando-poumian.jpeg
-  twitter: "@fernandopoumian"
 - id: Josh Weaver
   bio: Developer at By the Book, Inc. Enjoys technology, writing and playing music. Can't turn down a decent board game.
   avatar: avatars/josh-weaver.jpg
@@ -245,7 +244,7 @@
 - id: Katie Fujihara
   bio: Lover of making beautiful UI. Portland tech community organizer.
   avatar: avatars/katie-fujihara.jpg
-  twitter: "@katieofcode"
+  twitter: "@KatieFujihara"
 - id: Sidhartha Chatterjee
   bio: Core team @ GatsbyJS. Full-Stack Developer. Scuba diver.
   avatar: avatars/sidhartha-chatterjee.jpg
diff --git a/docs/blog/gatsby-first-beta-release.md b/docs/blog/gatsby-first-beta-release.md
index 518fbeb138856..b56107720d961 100644
--- a/docs/blog/gatsby-first-beta-release.md
+++ b/docs/blog/gatsby-first-beta-release.md
@@ -46,7 +46,7 @@ individuals and companies.
 - [Jason Quense](https://github.com/jquense)
 - [Fabien Bernard](https://github.com/fabien0102)
 - [Scotty Eckenthal](https://github.com/scottyeck)
-- [Nicholas Young](https://github.com/nicholaswyoung)
+- [Nicholas Young](https://github.com/secretfader)
 - [Florian Kissling](https://github.com/fk)
 - [Jacob Bolda](https://github.com/jbolda)
 - [Noah Lange](https://github.com/noahlange)
diff --git a/docs/docs/adding-react-components.md b/docs/docs/adding-react-components.md
index 2b59bae1c88dc..ed7b95b33db69 100644
--- a/docs/docs/adding-react-components.md
+++ b/docs/docs/adding-react-components.md
@@ -75,7 +75,7 @@ To learn more about solutions for supporting SSR and client-side libraries, chec
 
 Some packages expect `window` or another browser global to be defined. These packages will have to be patched.
 
-You can learn how to patch these packages on the [Debugging HTML Builds documentation](docs/debugging-html-builds/#fixing-third-party-modules).
+You can learn how to patch these packages on the [Debugging HTML Builds documentation](/docs/debugging-html-builds/#fixing-third-party-modules).
 
 ### Components without server-side rendering
 
diff --git a/docs/tutorial/building-a-theme.md b/docs/tutorial/building-a-theme.md
index 8a29ac3a70168..d30bafba1940d 100644
--- a/docs/tutorial/building-a-theme.md
+++ b/docs/tutorial/building-a-theme.md
@@ -1546,7 +1546,7 @@ Congratulations! You've set up, built, and customized your first Gatsby theme!
 ### Further reading
 
 - Check out the [Gatsby themes docs](/docs/themes/) to keep learning.
-- Have an idea for a theme you'd like to build? Get a headstart on a local theme development workspace using the [Theme Workspace starter](https://github.com/gatsbyjs/gatsby/tree/master/themes/gatsby-starter-theme-workspace).
+- Have an idea for a theme you'd like to build? Get a headstart on a local theme development workspace using the [Theme Workspace starter](https://github.com/gatsbyjs/gatsby/tree/master/starters/gatsby-starter-theme-workspace).
 - Have you built a Gatsby starter before? Perhaps [convert that starter to a theme](/docs/themes/converting-a-starter).
 
 ### Livestreams