diff --git a/.all-contributorsrc b/.all-contributorsrc
index cda8d2c..c5c3d81 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -7,6 +7,24 @@
   "imageSize": 100,
   "commit": true,
   "contributors": [
+    {
+      "login": "aoc",
+      "name": "Andrés Calabrese",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/243161?v=3",
+      "profile": "https://github.com/aoc",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "andreyluiz",
+      "name": "Andrey Luiz",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/1965897?v=3",
+      "profile": "https://andreyluiz.github.io/",
+      "contributions": [
+        "code"
+      ]
+    },
     {
       "login": "alinporumb",
       "name": "Alin Porumb",
@@ -124,6 +142,24 @@
         "review"
       ]
     },
+    {
+      "login": "markshlick",
+      "name": "Mark Shlick",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/1624703?v=3",
+      "profile": "https://github.com/markshlick",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "rlindskog",
+      "name": "Ryan Lindskog",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/7436773?v=3",
+      "profile": "https://www.RyanLindskog.com/",
+      "contributions": [
+        "code"
+      ]
+    },
     {
       "login": "enten",
       "name": "Steven Enten",
@@ -183,42 +219,6 @@
       "contributions": [
         "code"
       ]
-    },
-    {
-      "login": "markshlick",
-      "name": "Mark Shlick",
-      "avatar_url": "https://avatars1.githubusercontent.com/u/1624703?v=3",
-      "profile": "https://github.com/markshlick",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "aoc",
-      "name": "Andrés Calabrese",
-      "avatar_url": "https://avatars3.githubusercontent.com/u/243161?v=3",
-      "profile": "https://github.com/aoc",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "rlindskog",
-      "name": "Ryan Lindskog",
-      "avatar_url": "https://avatars1.githubusercontent.com/u/7436773?v=3",
-      "profile": "https://www.RyanLindskog.com/",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "andreyluiz",
-      "name": "Andrey Luiz",
-      "avatar_url": "https://avatars3.githubusercontent.com/u/1965897?v=3",
-      "profile": "https://andreyluiz.github.io/",
-      "contributions": [
-        "code"
-      ]
     }
   ]
 }
diff --git a/README.md b/README.md
index 0e46fd9..1c10442 100644
--- a/README.md
+++ b/README.md
@@ -75,10 +75,10 @@ Now go make some changes to the `Home` component to see the tooling in action.
 Thanks goes to these wonderful people ([emoji key](https://github.com/kentcdodds/all-contributors#emoji-key)):
 
 <!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
-| [<img src="https://avatars3.githubusercontent.com/u/3148205?v=3" width="100px;"/><br /><sub>Alin Porumb</sub>](https://github.com/alinporumb)<br />[💻](https://github.com/ctrlplusb/react-universally/commits?author=alinporumb) | [<img src="https://avatars0.githubusercontent.com/u/4349324?v=3" width="100px;"/><br /><sub>Benjamin Kniffler</sub>](https://github.com/bkniffler)<br />[💻](https://github.com/ctrlplusb/react-universally/commits?author=bkniffler) | [<img src="https://avatars0.githubusercontent.com/u/180773?v=3" width="100px;"/><br /><sub>Birkir Rafn Guðjónsson</sub>](https://medium.com/@birkir.gudjonsson)<br />💬 [🐛](https://github.com/ctrlplusb/react-universally/issues?q=author%3Abirkir) [💻](https://github.com/ctrlplusb/react-universally/commits?author=birkir) 👀 | [<img src="https://avatars0.githubusercontent.com/u/2063102?v=3" width="100px;"/><br /><sub>Carson Perrotti</sub>](http://carsonperrotti.com)<br />💬 [💻](https://github.com/ctrlplusb/react-universally/commits?author=carsonperrotti) [📖](https://github.com/ctrlplusb/react-universally/commits?author=carsonperrotti) 👀 | [<img src="https://avatars1.githubusercontent.com/u/13365531?v=3" width="100px;"/><br /><sub>Christian Glombek</sub>](https://github.com/LorbusChris)<br />[🐛](https://github.com/ctrlplusb/react-universally/issues?q=author%3ALorbusChris) [💻](https://github.com/ctrlplusb/react-universally/commits?author=LorbusChris) | [<img src="https://avatars3.githubusercontent.com/u/603683?v=3" width="100px;"/><br /><sub>Christoph Werner</sub>](https://twitter.com/code_punkt)<br />💬 [🐛](https://github.com/ctrlplusb/react-universally/issues?q=author%3Acodepunkt) [💻](https://github.com/ctrlplusb/react-universally/commits?author=codepunkt) 👀 | [<img src="https://avatars0.githubusercontent.com/u/1399894?v=3" width="100px;"/><br /><sub>David Edmondson</sub>](https://github.com/threehams)<br />[💻](https://github.com/ctrlplusb/react-universally/commits?author=threehams) |
+| [<img src="https://avatars3.githubusercontent.com/u/243161?v=3" width="100px;"/><br /><sub>Andrés Calabrese</sub>](https://github.com/aoc)<br />[💻](https://github.com/ctrlplusb/react-universally/commits?author=aoc) | [<img src="https://avatars3.githubusercontent.com/u/1965897?v=3" width="100px;"/><br /><sub>Andrey Luiz</sub>](https://andreyluiz.github.io/)<br />[💻](https://github.com/ctrlplusb/react-universally/commits?author=andreyluiz) | [<img src="https://avatars3.githubusercontent.com/u/3148205?v=3" width="100px;"/><br /><sub>Alin Porumb</sub>](https://github.com/alinporumb)<br />[💻](https://github.com/ctrlplusb/react-universally/commits?author=alinporumb) | [<img src="https://avatars0.githubusercontent.com/u/4349324?v=3" width="100px;"/><br /><sub>Benjamin Kniffler</sub>](https://github.com/bkniffler)<br />[💻](https://github.com/ctrlplusb/react-universally/commits?author=bkniffler) | [<img src="https://avatars0.githubusercontent.com/u/180773?v=3" width="100px;"/><br /><sub>Birkir Rafn Guðjónsson</sub>](https://medium.com/@birkir.gudjonsson)<br />💬 [🐛](https://github.com/ctrlplusb/react-universally/issues?q=author%3Abirkir) [💻](https://github.com/ctrlplusb/react-universally/commits?author=birkir) 👀 | [<img src="https://avatars0.githubusercontent.com/u/2063102?v=3" width="100px;"/><br /><sub>Carson Perrotti</sub>](http://carsonperrotti.com)<br />💬 [💻](https://github.com/ctrlplusb/react-universally/commits?author=carsonperrotti) [📖](https://github.com/ctrlplusb/react-universally/commits?author=carsonperrotti) 👀 | [<img src="https://avatars1.githubusercontent.com/u/13365531?v=3" width="100px;"/><br /><sub>Christian Glombek</sub>](https://github.com/LorbusChris)<br />[🐛](https://github.com/ctrlplusb/react-universally/issues?q=author%3ALorbusChris) [💻](https://github.com/ctrlplusb/react-universally/commits?author=LorbusChris) |
 | :---: | :---: | :---: | :---: | :---: | :---: | :---: |
-| [<img src="https://avatars0.githubusercontent.com/u/10954870?v=3" width="100px;"/><br /><sub>Dion Dirza</sub>](https://github.com/diondirza)<br />💬 [🐛](https://github.com/ctrlplusb/react-universally/issues?q=author%3Adiondirza) [💻](https://github.com/ctrlplusb/react-universally/commits?author=diondirza) [📖](https://github.com/ctrlplusb/react-universally/commits?author=diondirza) 👀 | [<img src="https://avatars0.githubusercontent.com/u/254095?v=3" width="100px;"/><br /><sub>Evgeny Boxer</sub>](https://github.com/evgenyboxer)<br />[🐛](https://github.com/ctrlplusb/react-universally/issues?q=author%3Aevgenyboxer) [💻](https://github.com/ctrlplusb/react-universally/commits?author=evgenyboxer) | [<img src="https://avatars2.githubusercontent.com/u/191304?v=3" width="100px;"/><br /><sub>Joe Kohlmann</sub>](http://kohlmannj.com)<br />[🐛](https://github.com/ctrlplusb/react-universally/issues?q=author%3Akohlmannj) [💻](https://github.com/ctrlplusb/react-universally/commits?author=kohlmannj) | [<img src="https://avatars2.githubusercontent.com/u/24992?v=3" width="100px;"/><br /><sub>Lucian Lature</sub>](https://www.linkedin.com/in/lucianlature/)<br />[🐛](https://github.com/ctrlplusb/react-universally/issues?q=author%3Alucianlature) [💻](https://github.com/ctrlplusb/react-universally/commits?author=lucianlature) 👀 | [<img src="https://avatars1.githubusercontent.com/u/977713?v=3" width="100px;"/><br /><sub>Steven Enten</sub>](http://enten.fr)<br />💬 [🐛](https://github.com/ctrlplusb/react-universally/issues?q=author%3Aenten) [💻](https://github.com/ctrlplusb/react-universally/commits?author=enten) 👀 | [<img src="https://avatars1.githubusercontent.com/u/12164768?v=3" width="100px;"/><br /><sub>Sean Matheson</sub>](http://www.ctrlplusb.com)<br />💬 [🐛](https://github.com/ctrlplusb/react-universally/issues?q=author%3Actrlplusb) [💻](https://github.com/ctrlplusb/react-universally/commits?author=ctrlplusb) [📖](https://github.com/ctrlplusb/react-universally/commits?author=ctrlplusb) 💡 👀 [⚠️](https://github.com/ctrlplusb/react-universally/commits?author=ctrlplusb) 🔧 | [<img src="https://avatars0.githubusercontent.com/u/6218853?v=3" width="100px;"/><br /><sub>Steven Truesdell</sub>](https://steventruesdell.com)<br />💬 [🐛](https://github.com/ctrlplusb/react-universally/issues?q=author%3Astrues) [💻](https://github.com/ctrlplusb/react-universally/commits?author=strues) [📖](https://github.com/ctrlplusb/react-universally/commits?author=strues) [⚠️](https://github.com/ctrlplusb/react-universally/commits?author=strues) |
-| [<img src="https://avatars0.githubusercontent.com/u/10552487?v=3" width="100px;"/><br /><sub>Thomas Leitgeb</sub>](https://twitter.com/_datoml)<br />[🐛](https://github.com/ctrlplusb/react-universally/issues?q=author%3Adatoml) [💻](https://github.com/ctrlplusb/react-universally/commits?author=datoml) | [<img src="https://avatars0.githubusercontent.com/u/595711?v=3" width="100px;"/><br /><sub>Tyler Nieman</sub>](http://tsnieman.net/)<br />[💻](https://github.com/ctrlplusb/react-universally/commits?author=tsnieman) | [<img src="https://avatars1.githubusercontent.com/u/1624703?v=3" width="100px;"/><br /><sub>Mark Shlick</sub>](https://github.com/markshlick)<br />[💻](https://github.com/ctrlplusb/react-universally/commits?author=markshlick) | [<img src="https://avatars3.githubusercontent.com/u/243161?v=3" width="100px;"/><br /><sub>Andrés Calabrese</sub>](https://github.com/aoc)<br />[💻](https://github.com/ctrlplusb/react-universally/commits?author=aoc) | [<img src="https://avatars1.githubusercontent.com/u/7436773?v=3" width="100px;"/><br /><sub>Ryan Lindskog</sub>](https://www.RyanLindskog.com/)<br />[💻](https://github.com/ctrlplusb/react-universally/commits?author=rlindskog) | [<img src="https://avatars3.githubusercontent.com/u/1965897?v=3" width="100px;"/><br /><sub>Andrey Luiz</sub>](https://andreyluiz.github.io/)<br />[💻](https://github.com/ctrlplusb/react-universally/commits?author=andreyluiz) |
+| [<img src="https://avatars3.githubusercontent.com/u/603683?v=3" width="100px;"/><br /><sub>Christoph Werner</sub>](https://twitter.com/code_punkt)<br />💬 [🐛](https://github.com/ctrlplusb/react-universally/issues?q=author%3Acodepunkt) [💻](https://github.com/ctrlplusb/react-universally/commits?author=codepunkt) 👀 | [<img src="https://avatars0.githubusercontent.com/u/1399894?v=3" width="100px;"/><br /><sub>David Edmondson</sub>](https://github.com/threehams)<br />[💻](https://github.com/ctrlplusb/react-universally/commits?author=threehams) | [<img src="https://avatars0.githubusercontent.com/u/10954870?v=3" width="100px;"/><br /><sub>Dion Dirza</sub>](https://github.com/diondirza)<br />💬 [🐛](https://github.com/ctrlplusb/react-universally/issues?q=author%3Adiondirza) [💻](https://github.com/ctrlplusb/react-universally/commits?author=diondirza) [📖](https://github.com/ctrlplusb/react-universally/commits?author=diondirza) 👀 | [<img src="https://avatars0.githubusercontent.com/u/254095?v=3" width="100px;"/><br /><sub>Evgeny Boxer</sub>](https://github.com/evgenyboxer)<br />[🐛](https://github.com/ctrlplusb/react-universally/issues?q=author%3Aevgenyboxer) [💻](https://github.com/ctrlplusb/react-universally/commits?author=evgenyboxer) | [<img src="https://avatars2.githubusercontent.com/u/191304?v=3" width="100px;"/><br /><sub>Joe Kohlmann</sub>](http://kohlmannj.com)<br />[🐛](https://github.com/ctrlplusb/react-universally/issues?q=author%3Akohlmannj) [💻](https://github.com/ctrlplusb/react-universally/commits?author=kohlmannj) | [<img src="https://avatars2.githubusercontent.com/u/24992?v=3" width="100px;"/><br /><sub>Lucian Lature</sub>](https://www.linkedin.com/in/lucianlature/)<br />[🐛](https://github.com/ctrlplusb/react-universally/issues?q=author%3Alucianlature) [💻](https://github.com/ctrlplusb/react-universally/commits?author=lucianlature) 👀 | [<img src="https://avatars1.githubusercontent.com/u/1624703?v=3" width="100px;"/><br /><sub>Mark Shlick</sub>](https://github.com/markshlick)<br />[💻](https://github.com/ctrlplusb/react-universally/commits?author=markshlick) |
+| [<img src="https://avatars1.githubusercontent.com/u/7436773?v=3" width="100px;"/><br /><sub>Ryan Lindskog</sub>](https://www.RyanLindskog.com/)<br />[💻](https://github.com/ctrlplusb/react-universally/commits?author=rlindskog) | [<img src="https://avatars1.githubusercontent.com/u/977713?v=3" width="100px;"/><br /><sub>Steven Enten</sub>](http://enten.fr)<br />💬 [🐛](https://github.com/ctrlplusb/react-universally/issues?q=author%3Aenten) [💻](https://github.com/ctrlplusb/react-universally/commits?author=enten) 👀 | [<img src="https://avatars1.githubusercontent.com/u/12164768?v=3" width="100px;"/><br /><sub>Sean Matheson</sub>](http://www.ctrlplusb.com)<br />💬 [🐛](https://github.com/ctrlplusb/react-universally/issues?q=author%3Actrlplusb) [💻](https://github.com/ctrlplusb/react-universally/commits?author=ctrlplusb) [📖](https://github.com/ctrlplusb/react-universally/commits?author=ctrlplusb) 💡 👀 [⚠️](https://github.com/ctrlplusb/react-universally/commits?author=ctrlplusb) 🔧 | [<img src="https://avatars0.githubusercontent.com/u/6218853?v=3" width="100px;"/><br /><sub>Steven Truesdell</sub>](https://steventruesdell.com)<br />💬 [🐛](https://github.com/ctrlplusb/react-universally/issues?q=author%3Astrues) [💻](https://github.com/ctrlplusb/react-universally/commits?author=strues) [📖](https://github.com/ctrlplusb/react-universally/commits?author=strues) [⚠️](https://github.com/ctrlplusb/react-universally/commits?author=strues) | [<img src="https://avatars0.githubusercontent.com/u/10552487?v=3" width="100px;"/><br /><sub>Thomas Leitgeb</sub>](https://twitter.com/_datoml)<br />[🐛](https://github.com/ctrlplusb/react-universally/issues?q=author%3Adatoml) [💻](https://github.com/ctrlplusb/react-universally/commits?author=datoml) | [<img src="https://avatars0.githubusercontent.com/u/595711?v=3" width="100px;"/><br /><sub>Tyler Nieman</sub>](http://tsnieman.net/)<br />[💻](https://github.com/ctrlplusb/react-universally/commits?author=tsnieman) |
 <!-- ALL-CONTRIBUTORS-LIST:END -->
 
 This project follows the [all-contributors](https://github.com/kentcdodds/all-contributors) specification. Contributions of any kind welcome!