diff --git a/README.md b/README.md
index 053ff85a9..d8358f6a2 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 This project aims to bring Google's new [Material Design](https://www.google.com/design/spec/material-design/introduction.html) to Ember. The goal is to encapsulate everything possible in Ember components. This project is packaged as an [Ember-cli](http://www.ember-cli.com/) addon.
 
-[Explore Ember Paper docs »](https://miguelcobain.github.io/ember-paper/)
+[Explore Ember Paper docs »](https://ember-paper.netlify.app)
 
 ## Installation
 
@@ -23,7 +23,7 @@ Navigate through the docs to understand how to use each component.
 
 - Contributors can often be found on the [#e-paper channel on discord](https://discord.gg/zT3asNS).
 
-- The [GitHub milestone issue](https://github.com/miguelcobain/ember-paper/issues/249) tracks our progress to version 1.0.
+- The [GitHub milestone issue](https://github.com/adopted-ember-addons/ember-paper/issues/249) tracks our progress to version 1.0.
 
 - Building the `ember-paper` demo application will give you your own up-to-date reference. This can be accomplished by cloning ember-paper as if it were an application and running `ember server`.
 
diff --git a/addon/components/paper-menu/content/component.js b/addon/components/paper-menu/content/component.js
index 96a62be56..d97162e19 100644
--- a/addon/components/paper-menu/content/component.js
+++ b/addon/components/paper-menu/content/component.js
@@ -61,8 +61,8 @@ class PaperMenuContent extends Component {
   async animateOut(element) {
     let parentElement = this.renderInPlace ? element.parentElement.parentElement : element.parentElement;
 
-    // workaround for https://github.com/miguelcobain/ember-paper/issues/1151. See also https://github.com/emberjs/ember.js/issues/18795.
-    // & https://github.com/miguelcobain/ember-paper/issues/1166
+    // workaround for https://github.com/adopted-ember-addons/ember-paper/issues/1151. See also https://github.com/emberjs/ember.js/issues/18795.
+    // & https://github.com/adopted-ember-addons/ember-paper/issues/1166
     if (!parentElement) {
       parentElement = ebdGetParent(getOwner(this));
     }
diff --git a/addon/components/paper-select/ebd-content/component.js b/addon/components/paper-select/ebd-content/component.js
index f406b3249..0688c62d0 100644
--- a/addon/components/paper-select/ebd-content/component.js
+++ b/addon/components/paper-select/ebd-content/component.js
@@ -69,7 +69,7 @@ class PaperSelectEbdContent extends Component {
   async animateOut(dropdownElement) {
     let parentElement = this.renderInPlace ? dropdownElement.parentElement.parentElement : dropdownElement.parentElement;
 
-    // workaround for https://github.com/miguelcobain/ember-paper/issues/1166
+    // workaround for https://github.com/adopted-ember-addons/ember-paper/issues/1166
     if (!parentElement) {
       parentElement = ebdGetParent(getOwner(this));
     }
diff --git a/addon/utils/ebd-get-parent.js b/addon/utils/ebd-get-parent.js
index 35030c8b9..57eff2b16 100644
--- a/addon/utils/ebd-get-parent.js
+++ b/addon/utils/ebd-get-parent.js
@@ -4,8 +4,8 @@ import requirejs from 'require';
 
 export default function ebdGetParent(owner) {
   // Try to fix :
-  // - https://github.com/miguelcobain/ember-paper/issues/1151
-  // - https://github.com/miguelcobain/ember-paper/issues/1166
+  // - https://github.com/adopted-ember-addons/ember-paper/issues/1151
+  // - https://github.com/adopted-ember-addons/ember-paper/issues/1166
   // By doing like https://github.com/cibernox/ember-basic-dropdown/blob/850c227c0a58148056d55d41aa0e5d88656b8165/addon/components/basic-dropdown.js#L273-L290
   let config = owner.resolveRegistration('config:environment');
   let id;
diff --git a/package.json b/package.json
index 77ea24be0..3d7b63dbc 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
     "paper"
   ],
   "bugs": {
-    "url": "https://github.com/miguelcobain/ember-paper/issues"
+    "url": "https://github.com/adopted-ember-addons/ember-paper/issues"
   },
   "repository": "https://github.com/adopted-ember-addons/ember-paper",
   "license": "MIT",
@@ -118,7 +118,7 @@
   },
   "ember-addon": {
     "configPath": "tests/dummy/config",
-    "demoURL": "https://miguelcobain.github.io/ember-paper",
+    "demoURL": "https://ember-paper.netlify.app",
     "before": "ember-cli-sri",
     "versionCompatibility": {
       "ember": ">=3.20.0 < 4.0.0"
diff --git a/tests/dummy/app/index.html b/tests/dummy/app/index.html
index 993868194..fcc3b1407 100644
--- a/tests/dummy/app/index.html
+++ b/tests/dummy/app/index.html
@@ -24,7 +24,8 @@
     <script src="{{rootURL}}assets/dummy.js"></script>
 
     {{content-for "body-footer"}}
-    <!-- Place this tag right after the last button or just before your close body tag. -->
-    <script async defer id="github-bjs" src="https://buttons.github.io/buttons.js"></script>
+
+    <!-- Place this tag in your head or just before your close body tag. -->
+    <script async defer src="https://buttons.github.io/buttons.js"></script>
   </body>
 </html>
diff --git a/tests/dummy/app/templates/addons.hbs b/tests/dummy/app/templates/addons.hbs
index 0e11c3d75..49ad6f256 100644
--- a/tests/dummy/app/templates/addons.hbs
+++ b/tests/dummy/app/templates/addons.hbs
@@ -178,7 +178,7 @@
     <h3>Contributing an addon</h3>
 
     <p>
-      If you have an <code>ember-paper</code> specific component, service etc that you think would be usable by others, please feel free to create an ember addon, publish to npm then <a href="https://github.com/miguelcobain/ember-paper/pulls">submit a pull request</a> on GitHub for it to be included here.
+      If you have an <code>ember-paper</code> specific component, service etc that you think would be usable by others, please feel free to create an ember addon, publish to npm then <a href="https://github.com/adopted-ember-addons/ember-paper/pulls">submit a pull request</a> on GitHub for it to be included here.
     </p>
   </div>
 </PaperContent>
diff --git a/tests/dummy/app/templates/components/page-toolbar.hbs b/tests/dummy/app/templates/components/page-toolbar.hbs
index 4cc84a3d8..b9e846491 100644
--- a/tests/dummy/app/templates/components/page-toolbar.hbs
+++ b/tests/dummy/app/templates/components/page-toolbar.hbs
@@ -22,7 +22,7 @@
       <div class="flex"></div>
 
       <div class="flex-nogrow">
-        <a href="https://github.com/miguelcobain/ember-paper" target="_blank" rel="noopener" aria-label="GitHub" class="nav-github">
+        <a href="https://github.com/adopted-ember-addons/ember-paper" target="_blank" rel="noopener" aria-label="GitHub" class="nav-github">
           <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 499.36" focusable="false" class="nav-github-icon">
             <title>GitHub</title>
             <path d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z" fill="currentColor" fill-rule="evenodd"></path>
diff --git a/tests/dummy/app/templates/cookbook.hbs b/tests/dummy/app/templates/cookbook.hbs
index 6540f8860..d286068dd 100644
--- a/tests/dummy/app/templates/cookbook.hbs
+++ b/tests/dummy/app/templates/cookbook.hbs
@@ -9,7 +9,7 @@
     <CodeSnippet @name="cookbook.no-char-count.scss" />
     <h3>Recipe contributions</h3>
     <p>
-      Have a great tip or solution for <code>ember-paper</code>? <a href="https://github.com/miguelcobain/ember-paper/pulls">Submit a pull request</a> on GitHub or discuss it with the team on <a href="https://discord.gg/zT3asNS"> Discord #e-paper</a> for inclusion here.
+      Have a great tip or solution for <code>ember-paper</code>? <a href="https://github.com/adopted-ember-addons/ember-paper/pulls">Submit a pull request</a> on GitHub or discuss it with the team on <a href="https://discord.gg/zT3asNS"> Discord #e-paper</a> for inclusion here.
     </p>
   </div>
 </PaperContent>
diff --git a/tests/dummy/app/templates/index.hbs b/tests/dummy/app/templates/index.hbs
index e8b1bc7e4..c1c2d53bb 100644
--- a/tests/dummy/app/templates/index.hbs
+++ b/tests/dummy/app/templates/index.hbs
@@ -80,7 +80,7 @@
     </p>
     <p>
       {{!-- Place this tag where you want the button to render. --}}
-      <a class="github-button" href="https://github.com/miguelcobain/ember-paper" data-style="mega" data-count-href="/miguelcobain/ember-paper/network" data-count-api="/repos/miguelcobain/ember-paper#forks_count">Fork</a>
+      <a class="github-button" href="https://github.com/adopted-ember-addons/ember-paper/fork" data-color-scheme="no-preference: light; light: light; dark: dark;" data-size="large" data-show-count="true" aria-label="Fork adopted-ember-addons/ember-paper on GitHub">Fork</a>
     </p>
   </div>
 </PaperContent>