diff --git a/website/data/users.js b/website/data/users.js
new file mode 100644
index 0000000000..dea88e424d
--- /dev/null
+++ b/website/data/users.js
@@ -0,0 +1,221 @@
+module.exports = [
+  // Please add your logo in alphabetical order of caption.
+  {
+    caption: 'Almin',
+    image: '/img/users/almin.png',
+    infoLink: 'https://almin.js.org/',
+    fbOpenSource: false,
+    pinned: false,
+  },
+  {
+    caption: 'Anssr Data Platform',
+    image: '/img/users/anssr.svg',
+    infoLink: 'https://anssr.io/',
+    fbOpenSource: false,
+    pinned: false,
+  },
+  {
+    caption: 'Bemuse',
+    image: '/img/users/bemuse.png',
+    infoLink: 'https://bemuse.ninja/project/',
+    fbOpenSource: false,
+    pinned: false,
+  },
+  {
+    caption: 'BlueWhale',
+    image: '/img/users/BlueWhale.png',
+    infoLink: 'https://facebookresearch.github.io/BlueWhale/',
+    fbOpenSource: true,
+    pinned: true,
+  },
+  {
+    caption: 'BuckleScript',
+    image: '/img/users/bucklescript.svg',
+    infoLink: 'https://bucklescript.github.io/',
+    fbOpenSource: false,
+    pinned: true,
+  },
+  {
+    caption: 'CaptainDuckDuck',
+    image: '/img/users/captainduckduck.png',
+    infoLink: 'https://captainduckduck.com/',
+    fbOpenSource: false,
+    pinned: false,
+  },
+  {
+    caption: 'Dep',
+    image: '/img/users/golang-dep.svg',
+    infoLink: 'https://golang.github.io/dep/',
+    fbOpenSource: false,
+    pinned: false,
+  },
+  {
+    caption: 'Docusaurus',
+    image: '/img/users/docusaurus.svg',
+    infoLink: 'https://www.docusaurus.io',
+    fbOpenSource: true,
+    pinned: true,
+  },
+  {
+    caption: 'Draft.js',
+    image: '/img/users/draftjs.png',
+    infoLink: 'https://draftjs.org/',
+    fbOpenSource: true,
+    pinned: true,
+  },
+  {
+    caption: 'FastText',
+    image: '/img/users/fasttext.png',
+    infoLink: 'https://fasttext.cc',
+    fbOpenSource: true,
+    pinned: true,
+  },
+  {
+    caption: 'Instant Articles Builder',
+    image: '/img/users/facebook-instant-articles-rules-editor.svg',
+    infoLink: 'https://facebook.github.io/instant-articles-builder/',
+    fbOpenSource: true,
+    pinned: false,
+  },
+  {
+    caption: 'Goby',
+    image: 'https://goby-lang.org/img/goby-logo.svg',
+    infoLink: 'https://goby-lang.org',
+    fbOpenSource: false,
+    pinned: false,
+  },
+  {
+    caption: 'Home Assistant',
+    image: 'https://developers.home-assistant.io/img/logo-responsive.svg',
+    infoLink: 'https://developers.home-assistant.io/',
+    fbOpenSource: false,
+    pinned: false,
+  },
+  {
+    caption: 'Jest',
+    image: '/img/users/jest.png',
+    infoLink: 'https://facebook.github.io/jest/',
+    fbOpenSource: true,
+    pinned: true,
+  },
+  {
+    caption: 'MakeItOpen',
+    image: '/img/users/makeitopen.png',
+    infoLink: 'http://makeitopen.com/',
+    fbOpenSource: true,
+    pinned: true,
+  },
+  {
+    caption: 'Metro',
+    image: '/img/users/metro.svg',
+    infoLink: 'https://facebook.github.io/metro/',
+    fbOpenSource: true,
+    pinned: true,
+  },
+  {
+    caption: 'Open Power Quality',
+    image: 'https://openpowerquality.org/img/opqlogo.png',
+    infoLink: 'https://openpowerquality.org/',
+    fbOpenSource: false,
+    pinned: false,
+  },
+  {
+    caption: 'pnpm',
+    image: 'https://pnpm.js.org/img/pnpm.svg',
+    infoLink: 'https://pnpm.js.org/',
+    fbOpenSource: false,
+    pinned: false,
+  },
+  {
+    caption: 'Prettier',
+    image: '/img/users/prettier.png',
+    infoLink: 'https://www.prettier.io',
+    fbOpenSource: false,
+    pinned: true,
+  },
+  {
+    caption: 'Pyre',
+    image: '/img/users/pyre.svg',
+    infoLink: 'https://pyre-check.org',
+    fbOpenSource: true,
+    pinned: true,
+  },
+  {
+    caption: 'React Native',
+    image: '/img/users/react-native.svg',
+    infoLink: 'https://facebook.github.io/react-native',
+    fbOpenSource: true,
+    pinned: true,
+  },
+  {
+    caption: 'React Native Elements',
+    image: '/img/users/react-native-elements.png',
+    infoLink: 'https://react-native-training.github.io/react-native-elements/',
+    fbOpenSource: false,
+    pinned: false,
+  },
+  {
+    caption: 'react-native-ios-kit',
+    image: '/img/users/react-native-ios-kit.svg',
+    infoLink: 'https://callstack.github.io/react-native-ios-kit',
+    fbOpenSource: false,
+    pinned: false,
+  },
+  {
+    caption: 'Reason',
+    image: '/img/users/reason.svg',
+    infoLink: 'https://reasonml.github.io/',
+    fbOpenSource: true,
+    pinned: true,
+  },
+  {
+    caption: 'ReasonReact',
+    image: '/img/users/reason-react.svg',
+    infoLink: 'https://reasonml.github.io/reason-react/',
+    fbOpenSource: true,
+    pinned: true,
+  },
+  {
+    caption: 'Rejoiner',
+    image: '/img/users/rejoiner.svg',
+    infoLink: 'http://rejoiner.io/',
+    fbOpenSource: false,
+    pinned: false,
+  },
+  {
+    caption: 'Relay',
+    image: '/img/users/relay.svg',
+    infoLink: 'https://facebook.github.io/relay/',
+    fbOpenSource: true,
+    pinned: true,
+  },
+  {
+    caption: 'textlint',
+    image: 'https://textlint.github.io/img/textlint-icon.png',
+    infoLink: 'https://textlint.github.io/',
+    fbOpenSource: false,
+    pinned: false,
+  },
+  {
+    caption: 'Verdaccio',
+    image: 'http://www.verdaccio.org/img/verdaccio-tiny@2x.png',
+    infoLink: 'http://www.verdaccio.org/',
+    fbOpenSource: false,
+    pinned: false,
+  },
+  {
+    caption: 'Vuls',
+    image: 'https://vuls.io/img/docs/vuls_logo.png',
+    infoLink: 'https://vuls.io/',
+    fbOpenSource: false,
+    pinned: false,
+  },
+  {
+    caption: 'WarriorJS',
+    image: '/img/users/warriorjs.svg',
+    infoLink: 'https://warrior.js.org/',
+    fbOpenSource: false,
+    pinned: false,
+  },
+  // Please add your logo in alphabetical order of caption.
+];
diff --git a/website/data/users.json b/website/data/users.json
deleted file mode 100644
index 09625135f7..0000000000
--- a/website/data/users.json
+++ /dev/null
@@ -1,212 +0,0 @@
-[
-  {
-    "caption": "Almin",
-    "image": "/img/almin.png",
-    "infoLink": "https://almin.js.org/",
-    "fbOpenSource": false,
-    "pinned": false
-  },
-  {
-    "caption": "Bemuse",
-    "image": "/img/bemuse.png",
-    "infoLink": "https://bemuse.ninja/project/",
-    "fbOpenSource": false,
-    "pinned": false
-  },
-  {
-    "caption": "BlueWhale",
-    "image": "/img/BlueWhale.png",
-    "infoLink": "https://facebookresearch.github.io/BlueWhale/",
-    "fbOpenSource": true,
-    "pinned": true
-  },
-  {
-    "caption": "BuckleScript",
-    "image": "/img/bucklescript.svg",
-    "infoLink": "https://bucklescript.github.io/",
-    "fbOpenSource": false,
-    "pinned": true
-  },
-  {
-    "caption": "CaptainDuckDuck",
-    "image": "/img/captainduckduck.png",
-    "infoLink": "https://captainduckduck.com/",
-    "fbOpenSource": false,
-    "pinned": false
-  },
-  {
-    "caption": "Dep",
-    "image": "/img/golang-dep.svg",
-    "infoLink": "https://golang.github.io/dep/",
-    "fbOpenSource": false,
-    "pinned": false
-  },
-  {
-    "caption": "Docusaurus",
-    "image": "/img/docusaurus.svg",
-    "infoLink": "https://www.docusaurus.io",
-    "fbOpenSource": true,
-    "pinned": true
-  },
-  {
-    "caption": "Draft.js",
-    "image": "/img/draftjs.png",
-    "infoLink": "https://draftjs.org/",
-    "fbOpenSource": true,
-    "pinned": true
-  },
-  {
-    "caption": "FastText",
-    "image": "/img/fasttext.png",
-    "infoLink": "https://fasttext.cc",
-    "fbOpenSource": true,
-    "pinned": true
-  },
-  {
-    "caption": "Instant Articles Builder",
-    "image": "/img/facebook-instant-articles-rules-editor.svg",
-    "infoLink": "https://facebook.github.io/instant-articles-builder/",
-    "fbOpenSource": true,
-    "pinned": false
-  },
-  {
-    "caption": "Goby",
-    "image": "https://goby-lang.org/img/goby-logo.svg",
-    "infoLink": "https://goby-lang.org",
-    "fbOpenSource": false,
-    "pinned": false
-  },
-  {
-    "caption": "Home Assistant",
-    "image": "https://developers.home-assistant.io/img/logo-responsive.svg",
-    "infoLink": "https://developers.home-assistant.io/",
-    "fbOpenSource": false,
-    "pinned": false
-  },
-  {
-    "caption": "Jest",
-    "image": "/img/jest.png",
-    "infoLink": "https://facebook.github.io/jest/",
-    "fbOpenSource": true,
-    "pinned": true
-  },
-  {
-    "caption": "MakeItOpen",
-    "image": "/img/makeitopen.png",
-    "infoLink": "http://makeitopen.com/",
-    "fbOpenSource": true,
-    "pinned": true
-  },
-  {
-    "caption": "Open Power Quality",
-    "image": "https://openpowerquality.org/img/opqlogo.png",
-    "infoLink": "https://openpowerquality.org/",
-    "fbOpenSource": false,
-    "pinned": false
-  },
-  {
-    "caption": "pnpm",
-    "image": "https://pnpm.js.org/img/pnpm.svg",
-    "infoLink": "https://pnpm.js.org/",
-    "fbOpenSource": false,
-    "pinned": false
-  },
-  {
-    "caption": "Prettier",
-    "image": "/img/prettier.png",
-    "infoLink": "https://www.prettier.io",
-    "fbOpenSource": false,
-    "pinned": true
-  },
-  {
-    "caption": "Pyre",
-    "image": "/img/pyre.svg",
-    "infoLink": "https://pyre-check.org",
-    "fbOpenSource": true,
-    "pinned": true
-  },
-  {
-    "caption": "React Native",
-    "image": "/img/react-native.svg",
-    "infoLink": "https://facebook.github.io/react-native",
-    "fbOpenSource": true,
-    "pinned": true
-  },
-  {
-    "caption": "React Native Elements",
-    "image": "/img/react-native-elements.png",
-    "infoLink": "https://react-native-training.github.io/react-native-elements/",
-    "fbOpenSource": false,
-    "pinned": false
-  },
-  {
-    "caption": "react-native-ios-kit",
-    "image": "/img/react-native-ios-kit.svg",
-    "infoLink": "https://callstack.github.io/react-native-ios-kit",
-    "fbOpenSource": false,
-    "pinned": false
-  },
-  {
-    "caption": "Reason",
-    "image": "/img/reason.svg",
-    "infoLink": "https://reasonml.github.io/",
-    "fbOpenSource": true,
-    "pinned": true
-  },
-  {
-    "caption": "ReasonReact",
-    "image": "/img/reason-react.svg",
-    "infoLink": "https://reasonml.github.io/reason-react/",
-    "fbOpenSource": true,
-    "pinned": true
-  },
-  {
-    "caption": "Rejoiner",
-    "image": "/img/rejoiner.svg",
-    "infoLink": "http://rejoiner.io/",
-    "fbOpenSource": false,
-    "pinned": false
-  },
-  {
-    "caption": "Relay",
-    "image": "/img/relay.svg",
-    "infoLink": "https://facebook.github.io/relay/",
-    "fbOpenSource": true,
-    "pinned": true
-  },
-  {
-    "caption": "textlint",
-    "image": "https://textlint.github.io/img/textlint-icon.png",
-    "infoLink": "https://textlint.github.io/",
-    "fbOpenSource": false,
-    "pinned": false
-  },
-  {
-    "caption": "Verdaccio",
-    "image": "http://www.verdaccio.org/img/verdaccio-tiny@2x.png",
-    "infoLink": "http://www.verdaccio.org/",
-    "fbOpenSource": false,
-    "pinned": false
-  },
-  {
-    "caption": "Vuls",
-    "image": "https://vuls.io/img/docs/vuls_logo.png",
-    "infoLink": "https://vuls.io/",
-    "fbOpenSource": false,
-    "pinned": false
-  },
-  {
-    "caption": "WarriorJS",
-    "image": "/img/warriorjs.svg",
-    "infoLink": "https://warrior.js.org/",
-    "fbOpenSource": false,
-    "pinned": false
-  },
-  {
-    "caption": "Anssr Data Platform",
-    "image": "/img/anssr.svg",
-    "infoLink": "https://anssr.io/",
-    "fbOpenSource": false,
-    "pinned": false
-  }
-]
diff --git a/website/pages/en/users.js b/website/pages/en/users.js
index b2e5360cff..c0ed68e412 100644
--- a/website/pages/en/users.js
+++ b/website/pages/en/users.js
@@ -12,30 +12,22 @@ const siteConfig = require(process.cwd() + '/siteConfig.js');
 const translate = require('../../server/translate.js').translate;
 
 class Users extends React.Component {
+  renderUser(user, i) {
+    return (
+      <a href={user.infoLink} key={i}>
+        <img src={user.image} alt={user.caption} title={user.caption} />
+      </a>
+    );
+  }
+
   render() {
     const fbShowcase = siteConfig.users
-      .filter(user => {
-        return user.fbOpenSource === true;
-      })
-      .map((user, i) => {
-        return (
-          <a href={user.infoLink} key={i}>
-            <img src={user.image} alt={user.caption} title={user.caption} />
-          </a>
-        );
-      });
+      .filter(user => user.fbOpenSource)
+      .map((user, i) => this.renderUser(user, i));
 
     const showcase = siteConfig.users
-      .filter(user => {
-        return !user.fbOpenSource;
-      })
-      .map((user, i) => {
-        return (
-          <a href={user.infoLink} key={i}>
-            <img src={user.image} alt={user.caption} title={user.caption} />
-          </a>
-        );
-      });
+      .filter(user => !user.fbOpenSource)
+      .map((user, i) => this.renderUser(user, i));
 
     return (
       <div className="mainContainer">
@@ -67,7 +59,7 @@ class Users extends React.Component {
               </p>
               <p>
                 Edit this page with a{' '}
-                <a href="https://github.com/facebook/docusaurus/edit/master/website/data/users.json">
+                <a href="https://github.com/facebook/docusaurus/edit/master/website/data/users.js">
                   Pull Request
                 </a>{' '}
                 to add your logo.
diff --git a/website/siteConfig.js b/website/siteConfig.js
index 92ba47d50a..052977d9cf 100644
--- a/website/siteConfig.js
+++ b/website/siteConfig.js
@@ -6,7 +6,7 @@
  */
 
 /* List of projects/orgs using your project for the users page */
-const users = require('./data/users.json');
+const users = require('./data/users');
 
 const siteConfig = {
   title: 'Docusaurus',
@@ -52,9 +52,7 @@ const siteConfig = {
     'https://cdnjs.cloudflare.com/ajax/libs/clipboard.js/2.0.0/clipboard.min.js',
     '/js/code-blocks-buttons.js',
   ],
-  stylesheets: [
-    '/css/code-blocks-buttons.css',
-  ],
+  stylesheets: ['/css/code-blocks-buttons.css'],
   gaTrackingId: 'UA-44373548-31',
   facebookAppId: '199138890728411',
   facebookComments: true,
@@ -66,8 +64,8 @@ const siteConfig = {
   cleanUrl: true,
   scrollToTop: true,
   scrollToTopOptions: {
-    zIndex: 100
-  }
+    zIndex: 100,
+  },
 };
 
 module.exports = siteConfig;
diff --git a/website/static/img/BlueWhale.png b/website/static/img/users/BlueWhale.png
similarity index 100%
rename from website/static/img/BlueWhale.png
rename to website/static/img/users/BlueWhale.png
diff --git a/website/static/img/almin.png b/website/static/img/users/almin.png
similarity index 100%
rename from website/static/img/almin.png
rename to website/static/img/users/almin.png
diff --git a/website/static/img/anssr.svg b/website/static/img/users/anssr.svg
similarity index 100%
rename from website/static/img/anssr.svg
rename to website/static/img/users/anssr.svg
diff --git a/website/static/img/bemuse.png b/website/static/img/users/bemuse.png
similarity index 100%
rename from website/static/img/bemuse.png
rename to website/static/img/users/bemuse.png
diff --git a/website/static/img/bucklescript.svg b/website/static/img/users/bucklescript.svg
similarity index 100%
rename from website/static/img/bucklescript.svg
rename to website/static/img/users/bucklescript.svg
diff --git a/website/static/img/captainduckduck.png b/website/static/img/users/captainduckduck.png
similarity index 100%
rename from website/static/img/captainduckduck.png
rename to website/static/img/users/captainduckduck.png
diff --git a/website/static/img/users/docusaurus.svg b/website/static/img/users/docusaurus.svg
new file mode 100644
index 0000000000..9db6d0d066
--- /dev/null
+++ b/website/static/img/users/docusaurus.svg
@@ -0,0 +1 @@
+<svg width="200" height="200" viewBox="0 0 200 200" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd"><path fill="#FFF" d="M99 52h84v34H99z"/><path d="M23 163c-7.398 0-13.843-4.027-17.303-10A19.886 19.886 0 0 0 3 163c0 11.046 8.954 20 20 20h20v-20H23z" fill="#3ECC5F"/><path d="M112.98 57.376L183 53V43c0-11.046-8.954-20-20-20H73l-2.5-4.33c-1.112-1.925-3.889-1.925-5 0L63 23l-2.5-4.33c-1.111-1.925-3.889-1.925-5 0L53 23l-2.5-4.33c-1.111-1.925-3.889-1.925-5 0L43 23c-.022 0-.042.003-.065.003l-4.142-4.141c-1.57-1.571-4.252-.853-4.828 1.294l-1.369 5.104-5.192-1.392c-2.148-.575-4.111 1.389-3.535 3.536l1.39 5.193-5.102 1.367c-2.148.576-2.867 3.259-1.296 4.83l4.142 4.142c0 .021-.003.042-.003.064l-4.33 2.5c-1.925 1.111-1.925 3.889 0 5L23 53l-4.33 2.5c-1.925 1.111-1.925 3.889 0 5L23 63l-4.33 2.5c-1.925 1.111-1.925 3.889 0 5L23 73l-4.33 2.5c-1.925 1.111-1.925 3.889 0 5L23 83l-4.33 2.5c-1.925 1.111-1.925 3.889 0 5L23 93l-4.33 2.5c-1.925 1.111-1.925 3.889 0 5L23 103l-4.33 2.5c-1.925 1.111-1.925 3.889 0 5L23 113l-4.33 2.5c-1.925 1.111-1.925 3.889 0 5L23 123l-4.33 2.5c-1.925 1.111-1.925 3.889 0 5L23 133l-4.33 2.5c-1.925 1.111-1.925 3.889 0 5L23 143l-4.33 2.5c-1.925 1.111-1.925 3.889 0 5L23 153l-4.33 2.5c-1.925 1.111-1.925 3.889 0 5L23 163c0 11.046 8.954 20 20 20h120c11.046 0 20-8.954 20-20V83l-70.02-4.376A10.645 10.645 0 0 1 103 68c0-5.621 4.37-10.273 9.98-10.624" fill="#3ECC5F"/><path fill="#3ECC5F" d="M143 183h30v-40h-30z"/><path d="M193 158c-.219 0-.428.037-.639.064-.038-.15-.074-.301-.116-.451A5 5 0 0 0 190.32 148a4.96 4.96 0 0 0-3.016 1.036 26.531 26.531 0 0 0-.335-.336 4.955 4.955 0 0 0 1.011-2.987 5 5 0 0 0-9.599-1.959c-.148-.042-.297-.077-.445-.115.027-.211.064-.42.064-.639a5 5 0 0 0-5-5 5 5 0 0 0-5 5c0 .219.037.428.064.639-.148.038-.297.073-.445.115a4.998 4.998 0 0 0-9.599 1.959c0 1.125.384 2.151 1.011 2.987-3.717 3.632-6.031 8.693-6.031 14.3 0 11.046 8.954 20 20 20 9.339 0 17.16-6.41 19.361-15.064.211.027.42.064.639.064a5 5 0 0 0 5-5 5 5 0 0 0-5-5" fill="#44D860"/><path fill="#3ECC5F" d="M153 123h30v-20h-30z"/><path d="M193 115.5a2.5 2.5 0 1 0 0-5c-.109 0-.214.019-.319.032-.02-.075-.037-.15-.058-.225a2.501 2.501 0 0 0-.963-4.807c-.569 0-1.088.197-1.508.518a6.653 6.653 0 0 0-.168-.168c.314-.417.506-.931.506-1.494a2.5 2.5 0 0 0-4.8-.979A9.987 9.987 0 0 0 183 103c-5.522 0-10 4.478-10 10s4.478 10 10 10c.934 0 1.833-.138 2.69-.377a2.5 2.5 0 0 0 4.8-.979c0-.563-.192-1.077-.506-1.494.057-.055.113-.111.168-.168.42.321.939.518 1.508.518a2.5 2.5 0 0 0 .963-4.807c.021-.074.038-.15.058-.225.105.013.21.032.319.032" fill="#44D860"/><path d="M63 55.5a2.5 2.5 0 0 1-2.5-2.5c0-4.136-3.364-7.5-7.5-7.5s-7.5 3.364-7.5 7.5a2.5 2.5 0 1 1-5 0c0-6.893 5.607-12.5 12.5-12.5S65.5 46.107 65.5 53a2.5 2.5 0 0 1-2.5 2.5" fill="#000"/><path d="M103 183h60c11.046 0 20-8.954 20-20V93h-60c-11.046 0-20 8.954-20 20v70z" fill="#FFFF50"/><path d="M168.02 124h-50.04a1 1 0 1 1 0-2h50.04a1 1 0 1 1 0 2m0 20h-50.04a1 1 0 1 1 0-2h50.04a1 1 0 1 1 0 2m0 20h-50.04a1 1 0 1 1 0-2h50.04a1 1 0 1 1 0 2m0-49.814h-50.04a1 1 0 1 1 0-2h50.04a1 1 0 1 1 0 2m0 19.814h-50.04a1 1 0 1 1 0-2h50.04a1 1 0 1 1 0 2m0 20h-50.04a1 1 0 1 1 0-2h50.04a1 1 0 1 1 0 2M183 61.611c-.012 0-.022-.006-.034-.005-3.09.105-4.552 3.196-5.842 5.923-1.346 2.85-2.387 4.703-4.093 4.647-1.889-.068-2.969-2.202-4.113-4.46-1.314-2.594-2.814-5.536-5.963-5.426-3.046.104-4.513 2.794-5.807 5.167-1.377 2.528-2.314 4.065-4.121 3.994-1.927-.07-2.951-1.805-4.136-3.813-1.321-2.236-2.848-4.75-5.936-4.664-2.994.103-4.465 2.385-5.763 4.4-1.373 2.13-2.335 3.428-4.165 3.351-1.973-.07-2.992-1.51-4.171-3.177-1.324-1.873-2.816-3.993-5.895-3.89-2.928.1-4.399 1.97-5.696 3.618-1.232 1.564-2.194 2.802-4.229 2.724a1 1 0 0 0-.072 2c3.017.101 4.545-1.8 5.872-3.487 1.177-1.496 2.193-2.787 4.193-2.855 1.926-.082 2.829 1.115 4.195 3.045 1.297 1.834 2.769 3.914 5.731 4.021 3.103.104 4.596-2.215 5.918-4.267 1.182-1.834 2.202-3.417 4.15-3.484 1.793-.067 2.769 1.35 4.145 3.681 1.297 2.197 2.766 4.686 5.787 4.796 3.125.108 4.634-2.62 5.949-5.035 1.139-2.088 2.214-4.06 4.119-4.126 1.793-.042 2.728 1.595 4.111 4.33 1.292 2.553 2.757 5.445 5.825 5.556l.169.003c3.064 0 4.518-3.075 5.805-5.794 1.139-2.41 2.217-4.68 4.067-4.773v-2z" fill="#000"/><path fill="#3ECC5F" d="M83 183h40v-40H83z"/><path d="M143 158c-.219 0-.428.037-.639.064-.038-.15-.074-.301-.116-.451A5 5 0 0 0 140.32 148a4.96 4.96 0 0 0-3.016 1.036 26.531 26.531 0 0 0-.335-.336 4.955 4.955 0 0 0 1.011-2.987 5 5 0 0 0-9.599-1.959c-.148-.042-.297-.077-.445-.115.027-.211.064-.42.064-.639a5 5 0 0 0-5-5 5 5 0 0 0-5 5c0 .219.037.428.064.639-.148.038-.297.073-.445.115a4.998 4.998 0 0 0-9.599 1.959c0 1.125.384 2.151 1.011 2.987-3.717 3.632-6.031 8.693-6.031 14.3 0 11.046 8.954 20 20 20 9.339 0 17.16-6.41 19.361-15.064.211.027.42.064.639.064a5 5 0 0 0 5-5 5 5 0 0 0-5-5" fill="#44D860"/><path fill="#3ECC5F" d="M83 123h40v-20H83z"/><path d="M133 115.5a2.5 2.5 0 1 0 0-5c-.109 0-.214.019-.319.032-.02-.075-.037-.15-.058-.225a2.501 2.501 0 0 0-.963-4.807c-.569 0-1.088.197-1.508.518a6.653 6.653 0 0 0-.168-.168c.314-.417.506-.931.506-1.494a2.5 2.5 0 0 0-4.8-.979A9.987 9.987 0 0 0 123 103c-5.522 0-10 4.478-10 10s4.478 10 10 10c.934 0 1.833-.138 2.69-.377a2.5 2.5 0 0 0 4.8-.979c0-.563-.192-1.077-.506-1.494.057-.055.113-.111.168-.168.42.321.939.518 1.508.518a2.5 2.5 0 0 0 .963-4.807c.021-.074.038-.15.058-.225.105.013.21.032.319.032" fill="#44D860"/><path d="M143 41.75c-.16 0-.33-.02-.49-.05a2.52 2.52 0 0 1-.47-.14c-.15-.06-.29-.14-.431-.23-.13-.09-.259-.2-.38-.31-.109-.12-.219-.24-.309-.38s-.17-.28-.231-.43a2.619 2.619 0 0 1-.189-.96c0-.16.02-.33.05-.49.03-.16.08-.31.139-.47.061-.15.141-.29.231-.43.09-.13.2-.26.309-.38.121-.11.25-.22.38-.31.141-.09.281-.17.431-.23.149-.06.31-.11.47-.14.32-.07.65-.07.98 0 .159.03.32.08.47.14.149.06.29.14.43.23.13.09.259.2.38.31.11.12.22.25.31.38.09.14.17.28.23.43.06.16.11.31.14.47.029.16.05.33.05.49 0 .66-.271 1.31-.73 1.77-.121.11-.25.22-.38.31-.14.09-.281.17-.43.23a2.565 2.565 0 0 1-.96.19m20-1.25c-.66 0-1.3-.27-1.771-.73a3.802 3.802 0 0 1-.309-.38c-.09-.14-.17-.28-.231-.43a2.619 2.619 0 0 1-.189-.96c0-.66.27-1.3.729-1.77.121-.11.25-.22.38-.31.141-.09.281-.17.431-.23.149-.06.31-.11.47-.14.32-.07.66-.07.98 0 .159.03.32.08.47.14.149.06.29.14.43.23.13.09.259.2.38.31.459.47.73 1.11.73 1.77 0 .16-.021.33-.05.49-.03.16-.08.32-.14.47-.07.15-.14.29-.23.43-.09.13-.2.26-.31.38-.121.11-.25.22-.38.31-.14.09-.281.17-.43.23a2.565 2.565 0 0 1-.96.19" fill="#000"/></g></svg>
\ No newline at end of file
diff --git a/website/static/img/draftjs.png b/website/static/img/users/draftjs.png
similarity index 100%
rename from website/static/img/draftjs.png
rename to website/static/img/users/draftjs.png
diff --git a/website/static/img/facebook-instant-articles-rules-editor.svg b/website/static/img/users/facebook-instant-articles-rules-editor.svg
similarity index 100%
rename from website/static/img/facebook-instant-articles-rules-editor.svg
rename to website/static/img/users/facebook-instant-articles-rules-editor.svg
diff --git a/website/static/img/fasttext.png b/website/static/img/users/fasttext.png
similarity index 100%
rename from website/static/img/fasttext.png
rename to website/static/img/users/fasttext.png
diff --git a/website/static/img/golang-dep.svg b/website/static/img/users/golang-dep.svg
similarity index 100%
rename from website/static/img/golang-dep.svg
rename to website/static/img/users/golang-dep.svg
diff --git a/website/static/img/jest.png b/website/static/img/users/jest.png
similarity index 100%
rename from website/static/img/jest.png
rename to website/static/img/users/jest.png
diff --git a/website/static/img/makeitopen.png b/website/static/img/users/makeitopen.png
similarity index 100%
rename from website/static/img/makeitopen.png
rename to website/static/img/users/makeitopen.png
diff --git a/website/static/img/users/metro.svg b/website/static/img/users/metro.svg
new file mode 100644
index 0000000000..ef4adc4795
--- /dev/null
+++ b/website/static/img/users/metro.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 142.89 156.99"><defs><style>.cls-1{fill:#ef4242;}.cls-2{fill:#fff;}</style></defs><title>Metro</title><path class="cls-1" d="M9.66,53.52C9.66,46,15,36.81,21.47,33.06L69.29,5.45c6.5-3.75,17.13-3.75,23.63,0l47.82,27.61c6.5,3.75,11.82,13,11.82,20.46v55.22c0,7.5-5.32,16.71-11.82,20.46L92.92,156.81c-6.5,3.75-17.13,3.75-23.63,0L21.47,129.2c-6.49-3.75-11.81-13-11.81-20.46Z" transform="translate(-9.66 -2.64)"/><path class="cls-2" d="M81.11,144.3a11.12,11.12,0,0,1-5.52-1.4L31.1,117.21a11.53,11.53,0,0,1-5.51-9.55V56.29a11.53,11.53,0,0,1,5.51-9.55L75.6,21.05a11.75,11.75,0,0,1,11,0l44.49,25.69a11.51,11.51,0,0,1,5.51,9.55v51.37a11.52,11.52,0,0,1-5.5,9.55L86.62,142.9A11.08,11.08,0,0,1,81.11,144.3Zm-43.7-37.09,43.7,25.23,43.7-25.23V56.74L81.11,31.51,37.41,56.74Z" transform="translate(-9.66 -2.64)"/><path class="cls-1" d="M81.11,131.14a6.64,6.64,0,0,1-3.32-.89L28.18,101.61a6.65,6.65,0,0,1-3.33-5.76V38.57A6.65,6.65,0,0,1,35,32.89l46.16,28,46.16-28a6.65,6.65,0,0,1,10.09,5.68V95.85a6.64,6.64,0,0,1-3.32,5.76L84.43,130.25A6.69,6.69,0,0,1,81.11,131.14ZM38.14,92l43,24.81,43-24.81V50.38l-39.51,24a6.63,6.63,0,0,1-6.9,0l-39.52-24Z" transform="translate(-9.66 -2.64)"/><path class="cls-2" d="M136.62,110.62H124.81V63.83L84.17,88.51a5.88,5.88,0,0,1-6.13,0L37.41,63.83v46.79H25.59V53.33a5.92,5.92,0,0,1,9-5L81.11,76.55l46.54-28.27a5.91,5.91,0,0,1,9,5Z" transform="translate(-9.66 -2.64)"/></svg>
diff --git a/website/static/img/prettier.png b/website/static/img/users/prettier.png
similarity index 100%
rename from website/static/img/prettier.png
rename to website/static/img/users/prettier.png
diff --git a/website/static/img/pyre.svg b/website/static/img/users/pyre.svg
similarity index 100%
rename from website/static/img/pyre.svg
rename to website/static/img/users/pyre.svg
diff --git a/website/static/img/react-native-elements.png b/website/static/img/users/react-native-elements.png
similarity index 100%
rename from website/static/img/react-native-elements.png
rename to website/static/img/users/react-native-elements.png
diff --git a/website/static/img/react-native-ios-kit.svg b/website/static/img/users/react-native-ios-kit.svg
similarity index 100%
rename from website/static/img/react-native-ios-kit.svg
rename to website/static/img/users/react-native-ios-kit.svg
diff --git a/website/static/img/react-native.svg b/website/static/img/users/react-native.svg
similarity index 100%
rename from website/static/img/react-native.svg
rename to website/static/img/users/react-native.svg
diff --git a/website/static/img/reason-react.svg b/website/static/img/users/reason-react.svg
similarity index 100%
rename from website/static/img/reason-react.svg
rename to website/static/img/users/reason-react.svg
diff --git a/website/static/img/reason.svg b/website/static/img/users/reason.svg
similarity index 100%
rename from website/static/img/reason.svg
rename to website/static/img/users/reason.svg
diff --git a/website/static/img/rejoiner.svg b/website/static/img/users/rejoiner.svg
similarity index 100%
rename from website/static/img/rejoiner.svg
rename to website/static/img/users/rejoiner.svg
diff --git a/website/static/img/relay.svg b/website/static/img/users/relay.svg
similarity index 100%
rename from website/static/img/relay.svg
rename to website/static/img/users/relay.svg
diff --git a/website/static/img/warriorjs.svg b/website/static/img/users/warriorjs.svg
similarity index 100%
rename from website/static/img/warriorjs.svg
rename to website/static/img/users/warriorjs.svg
diff --git a/yarn.lock b/yarn.lock
index d735b252bf..3af33b9c19 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1221,7 +1221,7 @@ class-utils@^0.3.5:
     isobject "^3.0.0"
     static-extend "^0.1.1"
 
-classnames@^2.2.5:
+classnames@^2.2.6:
   version "2.2.6"
   resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.2.6.tgz#43935bffdd291f326dad0a205309b38d00f650ce"
 
@@ -4781,7 +4781,7 @@ preserve@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
 
-prettier@^1.9.1:
+prettier@^1.13.5:
   version "1.13.5"
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.13.5.tgz#7ae2076998c8edce79d63834e9b7b09fead6bfd0"
 
@@ -4930,7 +4930,7 @@ react-dev-utils@^5.0.1:
     strip-ansi "3.0.1"
     text-table "0.2.0"
 
-react-dom@^16.3.2:
+react-dom@^16.4.0:
   version "16.4.0"
   resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.4.0.tgz#099f067dd5827ce36a29eaf9a6cdc7cbf6216b1e"
   dependencies:
@@ -4943,7 +4943,7 @@ react-error-overlay@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-4.0.0.tgz#d198408a85b4070937a98667f500c832f86bd5d4"
 
-react@^16.3.2:
+react@^16.4.0:
   version "16.4.0"
   resolved "https://registry.yarnpkg.com/react/-/react-16.4.0.tgz#402c2db83335336fba1962c08b98c6272617d585"
   dependencies:
@@ -5944,7 +5944,7 @@ tr46@~0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
 
-tree-node-cli@^1.2.1:
+tree-node-cli@^1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/tree-node-cli/-/tree-node-cli-1.2.2.tgz#d8aa63f7ed4eeea02d047e0b30b662194d9ec4fc"
   dependencies: