7 files changed, 13 insertions, 13 deletions
diff --git a/www/src/components/BlogHeader.astro b/www/src/components/BlogHeader.astro
index 82a7b0ff0..9e80cc1c0 100644
--- a/www/src/components/BlogHeader.astro
+++ b/www/src/components/BlogHeader.astro
@@ -36,7 +36,7 @@
       <svg xmlns="http://www.w3.org/2000/svg" fill="currentColor"  viewBox="0 0 24 24"><path d="M24 4.557c-.883.392-1.832.656-2.828.775 1.017-.609 1.798-1.574 2.165-2.724-.951.564-2.005.974-3.127 1.195-.897-.957-2.178-1.555-3.594-1.555-3.179 0-5.515 2.966-4.797 6.045-4.091-.205-7.719-2.165-10.148-5.144-1.29 2.213-.669 5.108 1.523 6.574-.806-.026-1.566-.247-2.229-.616-.054 2.281 1.581 4.415 3.949 4.89-.693.188-1.452.232-2.224.084.626 1.956 2.444 3.379 4.6 3.419-2.07 1.623-4.678 2.348-7.29 2.04 2.179 1.397 4.768 2.212 7.548 2.212 9.142 0 14.307-7.721 13.995-14.646.962-.695 1.797-1.562 2.457-2.549z"/></svg>
       Twitter
     </a>
-    <a class="header-subitem header-subitem-secondary" href="https://github.com/snowpackjs/astro" target="_blank">
+    <a class="header-subitem header-subitem-secondary" href="https://github.com/withastro/astro" target="_blank">
       <svg xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 24 24">
         <path d="M12 0c-6.626 0-12 5.373-12 12 0 5.302 3.438 9.8 8.207 11.387.599.111.793-.261.793-.577v-2.234c-3.338.726-4.033-1.416-4.033-1.416-.546-1.387-1.333-1.756-1.333-1.756-1.089-.745.083-.729.083-.729 1.205.084 1.839 1.237 1.839 1.237 1.07 1.834 2.807 1.304 3.492.997.107-.775.418-1.305.762-1.604-2.665-.305-5.467-1.334-5.467-5.931 0-1.311.469-2.381 1.236-3.221-.124-.303-.535-1.524.117-3.176 0 0 1.008-.322 3.301 1.23.957-.266 1.983-.399 3.003-.404 1.02.005 2.047.138 3.006.404 2.291-1.552 3.297-1.23 3.297-1.23.653 1.653.242 2.874.118 3.176.77.84 1.235 1.911 1.235 3.221 0 4.609-2.807 5.624-5.479 5.921.43.372.823 1.102.823 2.222v3.293c0 .319.192.694.801.576 4.765-1.589 8.199-6.086 8.199-11.386 0-6.627-5.373-12-12-12z"/>
       </svg>
diff --git a/www/src/components/GithubStarButton.astro b/www/src/components/GithubStarButton.astro
index 9613c9e72..103561eb2 100644
--- a/www/src/components/GithubStarButton.astro
+++ b/www/src/components/GithubStarButton.astro
@@ -1,7 +1,7 @@
 <!-- Place this tag where you want the button to render. -->
 <div class="hidden-mobile" style="text-align: center; height: 36px; margin-top: 0.75rem;">
-    <a class="github-button" href="https://github.com/snowpackjs/astro" data-icon="octicon-star"
-    data-size="large" data-show-count="true" aria-label="Star snowpackjs/astro on GitHub">Star</a>
+    <a class="github-button" href="https://github.com/withastro/astro" data-icon="octicon-star"
+    data-size="large" data-show-count="true" aria-label="Star withastro/astro on GitHub">Star</a>
 </div>
 <!-- Place this tag in your head or just before your close body tag. -->
 <script async="async" defer="defer" src="https://buttons.github.io/buttons.js"></script>
 \ No newline at end of file
diff --git a/www/src/components/MainHeader.astro b/www/src/components/MainHeader.astro
index e76044a01..a54759172 100644
--- a/www/src/components/MainHeader.astro
+++ b/www/src/components/MainHeader.astro
@@ -47,7 +47,7 @@
         </a>
       </li>
       <li>
-        <a class="header-subitem header-subitem-secondary" href="https://github.com/snowpackjs/astro">
+        <a class="header-subitem header-subitem-secondary" href="https://github.com/withastro/astro">
           <svg xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 24 24">
             <path d="M12 0c-6.626 0-12 5.373-12 12 0 5.302 3.438 9.8 8.207 11.387.599.111.793-.261.793-.577v-2.234c-3.338.726-4.033-1.416-4.033-1.416-.546-1.387-1.333-1.756-1.333-1.756-1.089-.745.083-.729.083-.729 1.205.084 1.839 1.237 1.839 1.237 1.07 1.834 2.807 1.304 3.492.997.107-.775.418-1.305.762-1.604-2.665-.305-5.467-1.334-5.467-5.931 0-1.311.469-2.381 1.236-3.221-.124-.303-.535-1.524.117-3.176 0 0 1.008-.322 3.301 1.23.957-.266 1.983-.399 3.003-.404 1.02.005 2.047.138 3.006.404 2.291-1.552 3.297-1.23 3.297-1.23.653 1.653.242 2.874.118 3.176.77.84 1.235 1.911 1.235 3.221 0 4.609-2.807 5.624-5.479 5.921.43.372.823 1.102.823 2.222v3.293c0 .319.192.694.801.576 4.765-1.589 8.199-6.086 8.199-11.386 0-6.627-5.373-12-12-12z"/>
           </svg>
diff --git a/www/src/data/blog-posts/astro-018.md b/www/src/data/blog-posts/astro-018.md
index a09a9f3b9..1f5d05b60 100644
--- a/www/src/data/blog-posts/astro-018.md
+++ b/www/src/data/blog-posts/astro-018.md
@@ -42,7 +42,7 @@ Named slots are particularly useful for page layouts. A layout can now specify s
 
 <img src="/assets/blog/astro-018/solid-logo-dark.svg" alt="Solid.js logo" style="background-color: rgb(65, 64, 66); padding: 2rem 4rem;" />
 
-[Solid](https://www.solidjs.com/) is a JSX-based UI framework that bills itself as the familiar, modern, more reactive alternative to React. We're really excited about Solid, and with the new [Solid renderer](https://github.com/snowpackjs/astro/tree/main/packages/renderers/renderer-solid) for Astro you can use Solid as a first-class framework in your project.
+[Solid](https://www.solidjs.com/) is a JSX-based UI framework that bills itself as the familiar, modern, more reactive alternative to React. We're really excited about Solid, and with the new [Solid renderer](https://github.com/withastro/astro/tree/main/packages/renderers/renderer-solid) for Astro you can use Solid as a first-class framework in your project.
 
 Adding support for Solid (our third officially-supported JSX framework) wasn't easy, and required a major refactoring of how Astro handles JSX. The final result was worth it: Astro is now much better at supporting different types of JSX and can even support the new React v17 JSX transform. This new foundation for Astro should support us well into the future.
 
@@ -53,7 +53,7 @@ The release of Solid v1.0 is the perfect showcase for Astro's multi-framework pr
 
 ![Lit logo](/assets/blog/astro-018/lit-logo.svg)
 
-Server-side rendering (SSR) for web components is finally here, thanks to Lit and the new [Lit renderer for Astro](https://github.com/snowpackjs/astro/tree/main/packages/renderers/renderer-lit).
+Server-side rendering (SSR) for web components is finally here, thanks to Lit and the new [Lit renderer for Astro](https://github.com/withastro/astro/tree/main/packages/renderers/renderer-lit).
 
 Thanks to the [Declarative Shadow DOM](https://web.dev/declarative-shadow-dom/) -- a new HTML feature that's now available in Chrome -- the Lit project was able to release experimental SSR support for Lit. Define a custom element in JavaScript and server render it with Astro as you would any other component from React or Vue. Unlike other JS components, you still use the custom element tag name in your HTML.
 
@@ -66,7 +66,7 @@ We've been absolutely blown away by the love Astro has recieved in such a short
 - Featured articles and guides from [Netlify](https://www.netlify.com/blog/2021/07/23/build-a-modern-shopping-site-with-astro-and-serverless-functions/), [Cloudflare](https://developers.cloudflare.com/pages/framework-guides/astro), [CSS Tricks](https://css-tricks.com/a-look-at-building-with-astro/), and more.
 - Over 2,000 developers have downloaded the [Astro VSCode extension](https://marketplace.visualstudio.com/items?itemName=astro-build.astro-vscode)
 - Over 500 weekly visitors to our [amazing Discord](https://astro.build/chat)
-- Over 300 public projects using Astro [on Github](https://github.com/snowpackjs/astro)
+- Over 300 public projects using Astro [on Github](https://github.com/withastro/astro)
 - 2 (TWO!) Astro jobs already posted on Discord!
 - [GitHub adds support for Astro component syntax highlighting](https://twitter.com/n_moore/status/1417881860051509250)
 
diff --git a/www/src/data/blog-posts/astro-019.md b/www/src/data/blog-posts/astro-019.md
index b53a72c3a..235bbd4e4 100644
--- a/www/src/data/blog-posts/astro-019.md
+++ b/www/src/data/blog-posts/astro-019.md
@@ -130,7 +130,7 @@ Not all developers speak English. In fact, most don't. Luckily, some amazing con
 - [Suomi](https://docs.astro.build/fi/getting-started)
 - [Русский](https://docs.astro.build/ru/getting-started)
 
-These are still a work in progress, and we'll keep working towards 100% translation as we creep closer to a v1.0 release. If you know a few languages and are able to contribute, [we could really use your help!](https://github.com/snowpackjs/astro/blob/main/CONTRIBUTING.md#translations)
+These are still a work in progress, and we'll keep working towards 100% translation as we creep closer to a v1.0 release. If you know a few languages and are able to contribute, [we could really use your help!](https://github.com/withastro/astro/blob/main/CONTRIBUTING.md#translations)
 
 ## Open Collective
 
@@ -142,7 +142,7 @@ We created an Open Collective because corporate sponsorship is one of the few pr
 
 Chances are, your company benefits from open source software. Invest in the technologies that power your business by sponsoring Astro and any other open source projects that you use. **Bonus:** thousands of developers will see your logo on our README and the [astro.build homepage](https://astro.build), every day. 
 
-100% of funds raised are invested directly back into the project and our community. You can read more about how funds are distributed by reading our [FUNDING.md](https://github.com/snowpackjs/astro/blob/main/FUNDING.md) doc on GitHub.
+100% of funds raised are invested directly back into the project and our community. You can read more about how funds are distributed by reading our [FUNDING.md](https://github.com/withastro/astro/blob/main/FUNDING.md) doc on GitHub.
 
 We'll be tweeting out personal "thank you" messages to every person and company who hits the ["Sponsor"](https://opencollective.com/astrodotbuild) button in the next 48 hours. Our first, very special THANK YOU goes out to [Chris Jennings](https://twitter.com/ckj), CCO and co-founder of [Sentry](https://sentry.io/), for being our first official sponsor! 🎉
 
diff --git a/www/src/data/blog-posts/astro-021-preview.md b/www/src/data/blog-posts/astro-021-preview.md
index 338cff00a..849564921 100644
--- a/www/src/data/blog-posts/astro-021-preview.md
+++ b/www/src/data/blog-posts/astro-021-preview.md
@@ -37,9 +37,9 @@ This switch from Snowpack to Vite might come as a surprise to some: Both Drew an
 
 ## Hello, WASM!
 
-Astro 0.21 features another huge low-level improvement: the brand new [@astrojs/compiler](https://github.com/snowpackjs/astro-compiler-next). Astro's new compiler is written in Go and distributed as WASM. You can run it right in your browser, or on the server in Node.js and Deno. 
+Astro 0.21 features another huge low-level improvement: the brand new [@astrojs/compiler](https://github.com/withastro/astro-compiler-next). Astro's new compiler is written in Go and distributed as WASM. You can run it right in your browser, or on the server in Node.js and Deno. 
 
-The new [@astrojs/compiler](https://github.com/snowpackjs/astro-compiler-next) unlocks:
+The new [@astrojs/compiler](https://github.com/withastro/astro-compiler-next) unlocks:
 
 - **Flexibility:** Run the compiler anywhere with WASM.
 - **Speed:** Build sites faster with Go's compiled-language performance.
@@ -89,7 +89,7 @@ Now, Astro's dev server sends HTML updates to the browser and then runs a small
 
 ## Try it today
 
-If you've read this far, we'd love your help trying out the latest release before launch. You can try out our latest release today [in the browser](https://gitpod.io#snapshot/5e7cf2f1-8108-4fa5-99d3-ed8de70d8c23) or by running `npm install astro@next--compiler` in a new project directory. You can follow our progress and leave feedback in the `next` PR on GitHub: https://github.com/snowpackjs/astro/pull/1406
+If you've read this far, we'd love your help trying out the latest release before launch. You can try out our latest release today [in the browser](https://gitpod.io#snapshot/5e7cf2f1-8108-4fa5-99d3-ed8de70d8c23) or by running `npm install astro@next--compiler` in a new project directory. You can follow our progress and leave feedback in the `next` PR on GitHub: https://github.com/withastro/astro/pull/1406
 
 Leave feedback, report bugs, and get involved with Astro's development in our [Discord server](https://astro.build/chat). You can also [follow along](https://twitter.com/astrodotbuild) on Twitter.
 
diff --git a/www/src/data/blog-posts/introducing-astro.md b/www/src/data/blog-posts/introducing-astro.md
index fd381e7ea..897f2c2ba 100644
--- a/www/src/data/blog-posts/introducing-astro.md
+++ b/www/src/data/blog-posts/introducing-astro.md
@@ -94,7 +94,7 @@ By building your site to static HTML by default, Astro makes it difficult (but n
 
 Astro is built by the team of open source developers behind [Snowpack](https://snowpack.dev) and [Skypack](https://skypack.dev), with additional contributions from the community.
 
-**Astro is and always will be free.** It is an open source project released under the [MIT license](https://github.com/snowpackjs/astro/blob/main/LICENSE). 
+**Astro is and always will be free.** It is an open source project released under the [MIT license](https://github.com/withastro/astro/blob/main/LICENSE). 
 
 We care deeply about building a more sustainable future for open source software.  At the same time, we need to support Astro's development long-term. This requires money (donations alone aren't enough.)